Merge branch 'develop' into features/JAL-892varnaToProject

[jalview.git] / test / jalview / io / AnnotationFileIOTest.java

diff --git a/test/jalview/io/AnnotationFileIOTest.java b/test/jalview/io/AnnotationFileIOTest.java
index 0e066c2..d36a82b 100644 (file)
--- a/test/jalview/io/AnnotationFileIOTest.java
+++ b/test/jalview/io/AnnotationFileIOTest.java
@@ -20,9 +20,9 @@
  */
 package jalview.io;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
+
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.ColumnSelection;
 import jalview.io.AnnotationFile.ViewDef;
@@ -30,7 +30,8 @@ import jalview.io.AnnotationFile.ViewDef;
 import java.io.File;
 import java.util.Hashtable;
 
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 public class AnnotationFileIOTest
 {
@@ -84,7 +85,7 @@ public class AnnotationFileIOTest
     {
       e.printStackTrace();
     }
-    fail("Couln't read the alignment in file '" + f.toString() + "'");
+    Assert.fail("Couln't read the alignment in file '" + f.toString() + "'");
     return null;
   }
 
@@ -98,6 +99,8 @@ public class AnnotationFileIOTest
    *          - label for IO class used to write and read back in the data from
    *          f
    */
+
+  // @Test
   public static void testAnnotationFileIO(String testname, File f,
           File annotFile)
   {
@@ -150,7 +153,7 @@ public class AnnotationFileIOTest
     {
       e.printStackTrace();
     }
-    fail("Test "
+    Assert.fail("Test "
             + testname
             + "\nCouldn't complete Annotation file roundtrip input/output/input test for '"
             + annotFile + "'.");