X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FDisorderAnnotExportImport.java;h=c1847229cf2e2480da460f222af11310adae2009;hb=3412b273e964fb1a9d22564b04a5f0c827ec2461;hp=e561479beec1700ad8f2a11292e753ceb3296d54;hpb=4bba61a3c701f83bdcb6707c4d9f17a1f5faaa04;p=jalview.git diff --git a/test/jalview/ws/jabaws/DisorderAnnotExportImport.java b/test/jalview/ws/jabaws/DisorderAnnotExportImport.java index e561479..c184722 100644 --- a/test/jalview/ws/jabaws/DisorderAnnotExportImport.java +++ b/test/jalview/ws/jabaws/DisorderAnnotExportImport.java @@ -20,9 +20,12 @@ */ package jalview.ws.jabaws; -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 org.testng.annotations.AfterClass; +import org.testng.annotations.Test; +import org.testng.annotations.BeforeClass; +import org.testng.Assert; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; import jalview.io.AnnotationFile; @@ -35,10 +38,6 @@ import jalview.ws.jws2.jabaws2.Jws2Instance; import java.util.ArrayList; import java.util.List; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - public class DisorderAnnotExportImport { public static String testseqs = "examples/uniref50.fa"; @@ -157,7 +156,7 @@ public class DisorderAnnotExportImport { e.printStackTrace(); } - fail("Test " + Assert.fail("Test " + testname + "\nCouldn't complete Annotation file roundtrip input/output/input test."); }