X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FParsePropertiesTest.java;fp=test%2Fjalview%2Fanalysis%2FParsePropertiesTest.java;h=90faedc65a45efac90f27c6154c0ad080dcdf605;hb=44e5428356c618d139354d02bbfc2f9008ae50b6;hp=a01d255f7ee4436f0adf13b55517ccdf47d291ac;hpb=4740ac2539b6c62c36a0c79ec6880237e50ea3f4;p=jalview.git diff --git a/test/jalview/analysis/ParsePropertiesTest.java b/test/jalview/analysis/ParsePropertiesTest.java index a01d255..90faedc 100644 --- a/test/jalview/analysis/ParsePropertiesTest.java +++ b/test/jalview/analysis/ParsePropertiesTest.java @@ -1,18 +1,18 @@ package jalview.analysis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - -import java.util.List; - -import org.junit.Before; -import org.junit.Test; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertNull; import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceI; +import java.util.List; + +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + public class ParsePropertiesTest { @@ -23,7 +23,7 @@ public class ParsePropertiesTest /** * Construct an alignment with 4 sequences with varying description format */ - @Before + @BeforeMethod public void setUp() { SequenceI[] seqs = new SequenceI[]