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

[jalview.git] / test / jalview / ws / gui / Jws2ParamView.java

diff --git a/test/jalview/ws/gui/Jws2ParamView.java b/test/jalview/ws/gui/Jws2ParamView.java
index b22f0f7..d672ab6 100644 (file)
--- a/test/jalview/ws/gui/Jws2ParamView.java
+++ b/test/jalview/ws/gui/Jws2ParamView.java
@@ -62,20 +62,20 @@ public class Jws2ParamView
 
   public static Jws2Discoverer disc = null;
 
-  @BeforeClass
+  @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
+    Cache.loadProperties("test/jalview/io/testProps.jvprops");
     Cache.initLogger();
     disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
   }
 
   /**
-   * This test marked Ignore as it appears to need user action to complete
+   * This test marked Interactive as it appears to need user action to complete
    * rather than hang
    */
 
-  @Test(groups =
-  { "Functional" }, enabled = false)
+  @Test(groups = { "Interactive" }, enabled = true)
   public void testJws2Gui()
   {
     Iterator<String> presetEnum = presetTests.iterator();
@@ -121,8 +121,8 @@ public class Jws2ParamView
           WsJobParameters pgui = new WsJobParameters(service,
                   new JabaPreset(service, pr));
           JFrame jf = new JFrame(MessageManager.formatMessage(
-                  "label.ws_parameters_for", new String[]
-                  { service.getActionText() }));
+                  "label.ws_parameters_for",
+                  new String[] { service.getActionText() }));
           jf.setSize(700, 800);
           JPanel cont = new JPanel(new BorderLayout());
           pgui.validate();
@@ -140,6 +140,7 @@ public class Jws2ParamView
            */
           jf.addWindowListener(new WindowAdapter()
           {
+            @Override
             public void windowClosing(WindowEvent e)
             {
               thr.interrupt();