X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fio%2FAnnotatedPDBFileInputTest.java;h=1c6a4898962aa5c23776cd205d270649b1b5611c;hb=9238f37da75fca644d970371f6b8e99144070bce;hp=ef88ca5700abfbfefd055a9b9795e68458a3e457;hpb=b5893211716553a96176a37f7c6e293cd6618559;p=jalview.git diff --git a/test/jalview/io/AnnotatedPDBFileInputTest.java b/test/jalview/io/AnnotatedPDBFileInputTest.java index ef88ca5..1c6a489 100644 --- a/test/jalview/io/AnnotatedPDBFileInputTest.java +++ b/test/jalview/io/AnnotatedPDBFileInputTest.java @@ -1,16 +1,8 @@ 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 java.io.File; - -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertNotNull; +import static org.testng.AssertJUnit.assertTrue; import jalview.bin.Cache; import jalview.datamodel.AlignmentAnnotation; @@ -23,6 +15,14 @@ import jalview.gui.Desktop; import jalview.structure.StructureMapping; import jalview.structure.StructureSelectionManager; +import java.io.File; + +import org.junit.Assert; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + public class AnnotatedPDBFileInputTest { @@ -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]); }