X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FAlignmentAnnotationUtilsTest.java;h=34d2f32cfeb3234c6fff141bcb2d8474c8479c8a;hb=3412b273e964fb1a9d22564b04a5f0c827ec2461;hp=c34bb688f365cc263b588a724654302505df56cd;hpb=4bba61a3c701f83bdcb6707c4d9f17a1f5faaa04;p=jalview.git diff --git a/test/jalview/analysis/AlignmentAnnotationUtilsTest.java b/test/jalview/analysis/AlignmentAnnotationUtilsTest.java index c34bb68..34d2f32 100644 --- a/test/jalview/analysis/AlignmentAnnotationUtilsTest.java +++ b/test/jalview/analysis/AlignmentAnnotationUtilsTest.java @@ -1,9 +1,10 @@ package jalview.analysis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertTrue; +import org.testng.annotations.Test; +import org.testng.annotations.BeforeMethod; import java.io.IOException; import java.util.ArrayList; import java.util.BitSet; @@ -12,9 +13,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Before; -import org.junit.Test; - import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; import jalview.datamodel.Annotation; @@ -118,7 +116,7 @@ public class AlignmentAnnotationUtilsTest * * @throws IOException */ - @Before + @BeforeMethod public void setUp() throws IOException { alignment = new jalview.io.FormatAdapter().readFile(TEST_DATA,