Merge branch 'develop' into features/JAL-892varnaToProject

[jalview.git] / test / jalview / ext / jmol / PDBFileWithJmolTest.java

diff --git a/test/jalview/ext/jmol/PDBFileWithJmolTest.java b/test/jalview/ext/jmol/PDBFileWithJmolTest.java
index ae50bdf..0627217 100644 (file)
--- 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",