X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FAnnotationFileIOTest.java;h=a63923af60ca5cce0188bfb7b5d5a797648a1a82;hb=fa3e116cc4e6c0603454b10c3ce2425c59293256;hp=09624520c7ffbfa810365006bfa7189800ff54c4;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/test/jalview/io/AnnotationFileIOTest.java b/test/jalview/io/AnnotationFileIOTest.java index 0962452..a63923a 100644 --- 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 { @@ -51,7 +52,7 @@ public class AnnotationFileIOTest { "Test hiding/showing of insertions on sequence_ref", "examples/uniref50.fa", "examples/testdata/uniref50_seqref.jva" } }; - @Test + @Test(groups ={ "Functional" }) public void exampleAnnotationFileIO() throws Exception { for (String[] testPair : TestFiles) @@ -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(groups ={ "Functional" }) public static void testAnnotationFileIO(String testname, File f, File annotFile) { @@ -144,13 +147,13 @@ public class AnnotationFileIOTest FormatAdapter.PASTE)); // test for consistency in io - StockholmFileTest.testAlignmentEquivalence(al, al_new); + StockholmFileTest.testAlignmentEquivalence(al, al_new, false); return; } catch (Exception e) { e.printStackTrace(); } - fail("Test " + Assert.fail("Test " + testname + "\nCouldn't complete Annotation file roundtrip input/output/input test for '" + annotFile + "'.");