X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FAlignmentAnnotationUtilsTest.java;fp=test%2Fjalview%2Fanalysis%2FAlignmentAnnotationUtilsTest.java;h=606a840907b48fbee053ea126eb6333e09377b55;hb=44e5428356c618d139354d02bbfc2f9008ae50b6;hp=c34bb688f365cc263b588a724654302505df56cd;hpb=4740ac2539b6c62c36a0c79ec6880237e50ea3f4;p=jalview.git diff --git a/test/jalview/analysis/AlignmentAnnotationUtilsTest.java b/test/jalview/analysis/AlignmentAnnotationUtilsTest.java index c34bb68..606a840 100644 --- a/test/jalview/analysis/AlignmentAnnotationUtilsTest.java +++ b/test/jalview/analysis/AlignmentAnnotationUtilsTest.java @@ -1,8 +1,14 @@ 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 jalview.datamodel.AlignmentAnnotation; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.Annotation; +import jalview.datamodel.SequenceI; +import jalview.io.AppletFormatAdapter; import java.io.IOException; import java.util.ArrayList; @@ -12,14 +18,8 @@ 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; -import jalview.datamodel.SequenceI; -import jalview.io.AppletFormatAdapter; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; public class AlignmentAnnotationUtilsTest { @@ -118,7 +118,7 @@ public class AlignmentAnnotationUtilsTest * * @throws IOException */ - @Before + @BeforeMethod public void setUp() throws IOException { alignment = new jalview.io.FormatAdapter().readFile(TEST_DATA,