JAL-1759 merge from develop

[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 c9ab630..301c70d 100644 (file)
--- a/test/jalview/ext/jmol/PDBFileWithJmolTest.java
+++ b/test/jalview/ext/jmol/PDBFileWithJmolTest.java
@@ -20,8 +20,10 @@
  */
 package jalview.ext.jmol;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
+import jalview.bin.Cache;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SequenceI;
@@ -31,7 +33,8 @@ import jalview.io.FileLoader;
 
 import java.util.Vector;
 
-import org.junit.Test;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 import MCview.PDBfile;
 
@@ -47,7 +50,16 @@ public class PDBFileWithJmolTest
   // "./examples/DNMT1_MOUSE.pdb"
   // };
 
-  @Test
+  @BeforeMethod
+  public void setUp()
+  {
+    Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
+            Boolean.TRUE.toString());
+    Cache.applicationProperties.setProperty("ADD_SS_ANN",
+            Boolean.TRUE.toString());
+  }
+
+  @Test(groups ={ "Functional" })
   public void testAlignmentLoader() throws Exception
   {
     for (String f : testFile)
@@ -59,7 +71,7 @@ public class PDBFileWithJmolTest
     }
   }
 
-  @Test
+  @Test(groups ={ "Functional" })
   public void testFileParser() throws Exception
   {
     for (String pdbStr : testFile)