X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FAlignmentTest.java;h=fc73307100d18679d456d0673b1e8aa59c132608;hb=3412b273e964fb1a9d22564b04a5f0c827ec2461;hp=df98af9ff3a308f36b8ff0c2f353729407df55df;hpb=4bba61a3c701f83bdcb6707c4d9f17a1f5faaa04;p=jalview.git diff --git a/test/jalview/datamodel/AlignmentTest.java b/test/jalview/datamodel/AlignmentTest.java index df98af9..fc73307 100644 --- a/test/jalview/datamodel/AlignmentTest.java +++ b/test/jalview/datamodel/AlignmentTest.java @@ -1,8 +1,10 @@ package jalview.datamodel; -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 jalview.io.AppletFormatAdapter; import jalview.io.FormatAdapter; import jalview.util.MapList; @@ -10,9 +12,6 @@ import jalview.util.MapList; import java.io.IOException; import java.util.Iterator; -import org.junit.Before; -import org.junit.Test; - /** * Unit tests for Alignment datamodel. * @@ -78,7 +77,7 @@ public class AlignmentTest * Read in Stockholm format test data including secondary structure * annotations. */ - @Before + @BeforeMethod public void setUp() throws IOException { al = loadAlignment(TEST_DATA, "STH");