X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fjmol%2FPDBFileWithJmolTest.java;fp=test%2Fjalview%2Fext%2Fjmol%2FPDBFileWithJmolTest.java;h=06272175a970f676483fbe9da5b6f62233b581bf;hb=44e5428356c618d139354d02bbfc2f9008ae50b6;hp=ae50bdf9030b95e8612eb3216d980754e4bac4dc;hpb=4740ac2539b6c62c36a0c79ec6880237e50ea3f4;p=jalview.git diff --git a/test/jalview/ext/jmol/PDBFileWithJmolTest.java b/test/jalview/ext/jmol/PDBFileWithJmolTest.java index ae50bdf..0627217 100644 --- a/test/jalview/ext/jmol/PDBFileWithJmolTest.java +++ b/test/jalview/ext/jmol/PDBFileWithJmolTest.java @@ -20,15 +20,8 @@ */ package jalview.ext.jmol; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.util.Vector; - -import org.junit.Before; -import org.junit.Test; - -import MCview.PDBfile; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertTrue; import jalview.bin.Cache; import jalview.datamodel.Alignment; @@ -38,6 +31,13 @@ import jalview.gui.AlignFrame; import jalview.io.AppletFormatAdapter; import jalview.io.FileLoader; +import java.util.Vector; + +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import MCview.PDBfile; + /** * @author jimp * @@ -50,7 +50,7 @@ public class PDBFileWithJmolTest // "./examples/DNMT1_MOUSE.pdb" // }; - @Before + @BeforeMethod public void setUp() { Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",