Merge branch 'features/mchmmer' into merge/wsinterfaces_mchmmer_JAL-3070_JAL-1950

[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 d24a790..66ce169 100644 (file)
--- a/test/jalview/ws/jws2/ParameterUtilsTest.java
+++ b/test/jalview/ws/jws2/ParameterUtilsTest.java
@@ -23,41 +23,59 @@ package jalview.ws.jws2;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertTrue;
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeClass;
+
+import jalview.bin.Cache;
+import jalview.gui.JvOptionPane;
+import jalview.ws.api.UIinfo;
+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.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
 import compbio.metadata.Option;
 import compbio.metadata.Parameter;
 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;
-
+/*
+ * 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
    */
-  private static List<String> serviceTests = new ArrayList<String>();
+  private static List<String> serviceTests = new ArrayList<>();
 
   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 = { "Network" })
   public void testWriteParameterSet() throws WrongParameterException
   {
     for (Jws2Instance service : disc.getServices())
@@ -94,8 +112,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);
           }
@@ -111,13 +129,13 @@ public class ParameterUtilsTest
    * @param service
    * @return
    */
-  public boolean isForTesting(Jws2Instance service)
+  public boolean isForTesting(UIinfo service)
   {
     return serviceTests.size() == 0
-            || serviceTests.contains(service.serviceType.toLowerCase());
+            || serviceTests.contains(service.getName().toLowerCase());
   }
 
-  @Test
+  @Test(groups = { "Network" })
   public void testCopyOption()
   {
     for (Jws2Instance service : disc.getServices())
@@ -141,7 +159,7 @@ public class ParameterUtilsTest
 
   /**
    */
-  @Test
+  @Test(groups = { "Network" })
   public void testCopyParameter()
   {
     for (Jws2Instance service : disc.getServices())