X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fgui%2FJws2ParamView.java;h=1cf1e5f4d0442e51244b4916dc4fe86d5c626ec4;hb=53ff9242cb709fe1e8470c5e88ecf8a8ae783b19;hp=4c67d2578426d467bc8fb53117191c7c30ae3982;hpb=86c580ce122275898f6ecb1a3d70d32fd79d5815;p=jalview.git

diff --git a/test/jalview/ws/gui/Jws2ParamView.java b/test/jalview/ws/gui/Jws2ParamView.java
index 4c67d25..1cf1e5f 100644
--- a/test/jalview/ws/gui/Jws2ParamView.java
+++ b/test/jalview/ws/gui/Jws2ParamView.java
@@ -20,6 +20,14 @@
  */
 package jalview.ws.gui;
 
+import jalview.bin.Cache;
+import jalview.gui.WsJobParameters;
+import jalview.util.MessageManager;
+import jalview.ws.jabaws.JalviewJabawsTestUtils;
+import jalview.ws.jws2.JabaPreset;
+import jalview.ws.jws2.Jws2Discoverer;
+import jalview.ws.jws2.jabaws2.Jws2Instance;
+
 import java.awt.BorderLayout;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -30,21 +38,12 @@ import java.util.List;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 
 import compbio.metadata.Preset;
 import compbio.metadata.PresetManager;
 
-import jalview.bin.Cache;
-import jalview.gui.WsJobParameters;
-import jalview.util.MessageManager;
-import jalview.ws.jabaws.JalviewJabawsTestUtils;
-import jalview.ws.jws2.JabaPreset;
-import jalview.ws.jws2.Jws2Discoverer;
-import jalview.ws.jws2.jabaws2.Jws2Instance;
-
 public class Jws2ParamView
 {
   /**
@@ -63,7 +62,7 @@ public class Jws2ParamView
 
   public static Jws2Discoverer disc = null;
 
-  @BeforeClass
+  @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
     Cache.initLogger();
@@ -71,11 +70,11 @@ public class Jws2ParamView
   }
 
   /**
-   * 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
-  @Ignore
+
+  @Test(groups = { "Interactive" }, enabled = true)
   public void testJws2Gui()
   {
     Iterator<String> presetEnum = presetTests.iterator();
@@ -121,8 +120,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();