X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=test%2Fjalview%2Fio%2FJSONFileTest.java;h=2e28e3a8b9d80fec49cecb2615947d52150a2fd0;hp=bce9795860519120f0e1d5f22a16b393e9866664;hb=44e5428356c618d139354d02bbfc2f9008ae50b6;hpb=4740ac2539b6c62c36a0c79ec6880237e50ea3f4

diff --git a/test/jalview/io/JSONFileTest.java b/test/jalview/io/JSONFileTest.java
index bce9795..2e28e3a 100644
--- a/test/jalview/io/JSONFileTest.java
+++ b/test/jalview/io/JSONFileTest.java
@@ -1,7 +1,8 @@
 package jalview.io;
 
 
-import static org.junit.Assert.assertNotNull;
+import static org.testng.AssertJUnit.assertNotNull;
+
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.Annotation;
@@ -18,10 +19,10 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.AssertJUnit;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 public class JSONFileTest
 {
@@ -42,7 +43,7 @@ public class JSONFileTest
   HashMap<String, AlignmentAnnotation> testAnnots = new HashMap<String, AlignmentAnnotation>();
   HashMap<String, SequenceGroup> testGrps = new HashMap<String, SequenceGroup>();
 
-  @Before
+  @BeforeMethod
   public void setup() throws Exception
   {
     // create and add sequences
@@ -145,7 +146,7 @@ public class JSONFileTest
     TEST_ANOT_HEIGHT = testAnnots.size();
   }
 
-  @After
+  @AfterMethod
   public void tearDown() throws Exception
   {
   }
@@ -170,34 +171,34 @@ public class JSONFileTest
     for (SequenceI seq : al.getSequences())
     {
       SequenceI expectedSeq = testSeqs.get(seq.getName());
-      Assert.assertTrue("Failed Sequence Test  for >>> " + seq.getName(),
+      AssertJUnit.assertTrue("Failed Sequence Test  for >>> " + seq.getName(),
               isSeqMatched(expectedSeq, seq));
       passedCount++;
     }
-    Assert.assertEquals("Some Sequences did not pass the test",
+    AssertJUnit.assertEquals("Some Sequences did not pass the test",
             TEST_SEQ_HEIGHT, passedCount);
 
     passedCount = 0;
     for (SequenceGroup seqGrp : al.getGroups())
     {
       SequenceGroup expectedGrp = testGrps.get(seqGrp.getName());
-      Assert.assertTrue(
+      AssertJUnit.assertTrue(
               "Failed SequenceGroup Test for >>> " + seqGrp.getName(),
               isGroupMatched(expectedGrp, seqGrp));
       passedCount++;
     }
-    Assert.assertEquals("Some SequenceGroups did not pass the test",
+    AssertJUnit.assertEquals("Some SequenceGroups did not pass the test",
             TEST_GRP_HEIGHT, passedCount);
 
     passedCount = 0;
     for (AlignmentAnnotation annot : al.getAlignmentAnnotation())
     {
       AlignmentAnnotation expectedAnnot = testAnnots.get(annot.label);
-      Assert.assertTrue("Failed AlignmentAnnotation Test for >>> "
+      AssertJUnit.assertTrue("Failed AlignmentAnnotation Test for >>> "
               + annot.label, isAnnotationMatched(expectedAnnot, annot));
       passedCount++;
     }
-    Assert.assertEquals("Some Sequences did not pass the test",
+    AssertJUnit.assertEquals("Some Sequences did not pass the test",
             TEST_ANOT_HEIGHT, passedCount);
 
     // af = new AlignFrame(al, 700, 500);