X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FAnnotatedPDBFileInputTest.java;fp=test%2Fjalview%2Fio%2FAnnotatedPDBFileInputTest.java;h=576201a63c4d199f3216345fac56840ba289c329;hb=3412b273e964fb1a9d22564b04a5f0c827ec2461;hp=ef88ca5700abfbfefd055a9b9795e68458a3e457;hpb=4bba61a3c701f83bdcb6707c4d9f17a1f5faaa04;p=jalview.git diff --git a/test/jalview/io/AnnotatedPDBFileInputTest.java b/test/jalview/io/AnnotatedPDBFileInputTest.java index ef88ca5..576201a 100644 --- a/test/jalview/io/AnnotatedPDBFileInputTest.java +++ b/test/jalview/io/AnnotatedPDBFileInputTest.java @@ -1,16 +1,16 @@ package jalview.io; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertNotNull; +import static org.testng.AssertJUnit.assertTrue; import java.io.File; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.Assert; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; import jalview.bin.Cache; import jalview.datamodel.AlignmentAnnotation; @@ -32,7 +32,7 @@ public class AnnotatedPDBFileInputTest String pdbId; - @Before + @BeforeMethod public void setup() throws Exception { Cache.applicationProperties.setProperty("STRUCT_FROM_PDB", @@ -60,7 +60,7 @@ public class AnnotatedPDBFileInputTest { for (int q = p + 1; q < avec.length; q++) { - assertNotEquals( + Assert.assertNotEquals( "Found a duplicate annotation row " + avec[p].label, avec[p], avec[q]); }