X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fws%2Fgui%2FJws2ParamView.java;h=d672ab6863f7dd45469cc7e5169b35e6b99453e8;hb=dde303bc73617ab4eb3e681e67cf899e6a971318;hp=a3ae56d2895516ae104930907c0220ef6848d24e;hpb=c93b9ad2ebfab4cad4608a8890132918589576be;p=jalview.git diff --git a/test/jalview/ws/gui/Jws2ParamView.java b/test/jalview/ws/gui/Jws2ParamView.java index a3ae56d..d672ab6 100644 --- a/test/jalview/ws/gui/Jws2ParamView.java +++ b/test/jalview/ws/gui/Jws2ParamView.java @@ -62,19 +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(enabled = false) + @Test(groups = { "Interactive" }, enabled = true) public void testJws2Gui() { Iterator presetEnum = presetTests.iterator(); @@ -120,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(); @@ -139,6 +140,7 @@ public class Jws2ParamView */ jf.addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) { thr.interrupt();