X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjws2%2FParameterUtilsTest.java;h=0802b8a52b16d4356df6e26c3bfbe4e172ad79f7;hb=334013f9dc7b599af9062ca053d9d091a474472e;hp=523ccb3c674c402274b41a4349044536bd901d35;hpb=28fda83cbef0c9c82cd09a343af4e1721085c104;p=jalview.git

diff --git a/test/jalview/ws/jws2/ParameterUtilsTest.java b/test/jalview/ws/jws2/ParameterUtilsTest.java
index 523ccb3..0802b8a 100644
--- a/test/jalview/ws/jws2/ParameterUtilsTest.java
+++ b/test/jalview/ws/jws2/ParameterUtilsTest.java
@@ -20,11 +20,15 @@
  */
 package jalview.ws.jws2;
 
+import java.util.Locale;
+
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertTrue;
 
 import jalview.bin.Cache;
+import jalview.bin.Console;
+import jalview.gui.JvOptionPane;
 import jalview.ws.jabaws.JalviewJabawsTestUtils;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
 
@@ -41,8 +45,21 @@ import compbio.metadata.Preset;
 import compbio.metadata.PresetManager;
 import compbio.metadata.WrongParameterException;
 
+/*
+ * All methods in this class are set to the Network group because setUpBeforeClass will fail
+ * if there is no network.
+ */
+@Test(singleThreaded = true)
 public class ParameterUtilsTest
 {
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   /*
    * To limit tests to specify services, add them to this list; leave list empty
    * to test all
@@ -54,12 +71,13 @@ public class ParameterUtilsTest
   @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
-    serviceTests.add("AAConWS".toLowerCase());
-    Cache.initLogger();
+    serviceTests.add("AAConWS".toLowerCase(Locale.ROOT));
+    Cache.loadProperties("test/jalview/io/testProps.jvprops");
+    Console.initLogger();
     disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
   }
 
-  @Test(groups ={ "Functional" })
+  @Test(groups = { "Network" })
   public void testWriteParameterSet() throws WrongParameterException
   {
     for (Jws2Instance service : disc.getServices())
@@ -96,8 +114,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);
           }
@@ -115,11 +133,11 @@ public class ParameterUtilsTest
    */
   public boolean isForTesting(Jws2Instance service)
   {
-    return serviceTests.size() == 0
-            || serviceTests.contains(service.serviceType.toLowerCase());
+    return serviceTests.size() == 0 || serviceTests
+            .contains(service.serviceType.toLowerCase(Locale.ROOT));
   }
 
-  @Test(groups ={ "Functional" })
+  @Test(groups = { "Network" })
   public void testCopyOption()
   {
     for (Jws2Instance service : disc.getServices())
@@ -143,7 +161,7 @@ public class ParameterUtilsTest
 
   /**
    */
-  @Test(groups ={ "Functional" })
+  @Test(groups = { "Network" })
   public void testCopyParameter()
   {
     for (Jws2Instance service : disc.getServices())