X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fgui%2FJws2ParamView.java;h=80b48c30408b229a67bbd56d5544eb628ada9c02;hb=9e338a58713e1f3a451aa34c5e6c488bdd6d8cab;hp=71a9ca487a214a9d89ce6782fe91daef77bee81f;hpb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;p=jalview.git diff --git a/test/jalview/ws/gui/Jws2ParamView.java b/test/jalview/ws/gui/Jws2ParamView.java index 71a9ca4..80b48c3 100644 --- a/test/jalview/ws/gui/Jws2ParamView.java +++ b/test/jalview/ws/gui/Jws2ParamView.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -21,6 +21,7 @@ package jalview.ws.gui; import jalview.bin.Cache; +import jalview.gui.JvOptionPane; import jalview.gui.WsJobParameters; import jalview.util.MessageManager; import jalview.ws.jabaws.JalviewJabawsTestUtils; @@ -46,6 +47,14 @@ import compbio.metadata.PresetManager; public class Jws2ParamView { + + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + /** * which services to test */ @@ -65,6 +74,7 @@ public class Jws2ParamView @BeforeClass(alwaysRun = true) public static void setUpBeforeClass() throws Exception { + Cache.loadProperties("test/jalview/io/testProps.jvprops"); Cache.initLogger(); disc = JalviewJabawsTestUtils.getJabawsDiscoverer(); } @@ -139,6 +149,7 @@ public class Jws2ParamView */ jf.addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) { thr.interrupt();