JAL-2089 patch broken merge to master for Release 2.10.0b1

[jalview.git] / test / jalview / ws / jws2 / ParameterUtilsTest.java

diff --git a/test/jalview/ws/jws2/ParameterUtilsTest.java b/test/jalview/ws/jws2/ParameterUtilsTest.java
index bf1b8ee..1e02213 100644 (file)
--- a/test/jalview/ws/jws2/ParameterUtilsTest.java
+++ b/test/jalview/ws/jws2/ParameterUtilsTest.java
@@ -20,16 +20,20 @@
  */
 package jalview.ws.jws2;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertTrue;
+
+import jalview.bin.Cache;
+import jalview.ws.jabaws.JalviewJabawsTestUtils;
+import jalview.ws.jws2.jabaws2.Jws2Instance;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 
 import compbio.metadata.Option;
 import compbio.metadata.Parameter;
@@ -37,10 +41,6 @@ import compbio.metadata.Preset;
 import compbio.metadata.PresetManager;
 import compbio.metadata.WrongParameterException;
 
-import jalview.bin.Cache;
-import jalview.ws.jabaws.JalviewJabawsTestUtils;
-import jalview.ws.jws2.jabaws2.Jws2Instance;
-
 public class ParameterUtilsTest
 {
   /*
@@ -51,15 +51,16 @@ public class ParameterUtilsTest
 
   private static Jws2Discoverer disc = null;
 
-  @BeforeClass
+  @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
     serviceTests.add("AAConWS".toLowerCase());
+    Cache.loadProperties("test/jalview/io/testProps.jvprops");
     Cache.initLogger();
     disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testWriteParameterSet() throws WrongParameterException
   {
     for (Jws2Instance service : disc.getServices())
@@ -96,8 +97,8 @@ public class ParameterUtilsTest
             String on = o.next();
             String sn = s.next();
             String st = t.next();
-            final String errorMsg = "Original was " + on + " Phase 1 wrote " + sn
-                    + "\tPhase 2 wrote " + st;
+            final String errorMsg = "Original was " + on
+                    + " Phase 1 wrote " + sn + "\tPhase 2 wrote " + st;
             assertEquals(errorMsg, sn, st);
             assertEquals(errorMsg, sn, on);
           }
@@ -119,7 +120,7 @@ public class ParameterUtilsTest
             || serviceTests.contains(service.serviceType.toLowerCase());
   }
 
-  @Test
+  @Test(groups = { "Functional" })
   public void testCopyOption()
   {
     for (Jws2Instance service : disc.getServices())
@@ -143,7 +144,7 @@ public class ParameterUtilsTest
 
   /**
    */
-  @Test
+  @Test(groups = { "Functional" })
   public void testCopyParameter()
   {
     for (Jws2Instance service : disc.getServices())