Merge branch 'hotfix/JAL-1521' into Release_2_8_2_Branch

[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 dedc27c..1e72fae 100644 (file)
--- a/test/jalview/ws/gui/Jws2ParamView.java
+++ b/test/jalview/ws/gui/Jws2ParamView.java
@@ -1,7 +1,29 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.ws.gui;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 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;
@@ -12,11 +34,11 @@ import java.awt.event.WindowListener;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Vector;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import compbio.metadata.Option;
@@ -27,12 +49,6 @@ import compbio.metadata.PresetManager;
 public class Jws2ParamView
 {
   /**
-   * test servers
-   */
-  public static String[] serviceUrls = new String[]
-  { "http://localhost:8080/jabaws" };
-
-  /**
    * which services to test
    */
   public static List<String> serviceTests = new ArrayList<String>();
@@ -46,33 +62,18 @@ public class Jws2ParamView
     serviceTests.add("AAConWS".toLowerCase());
   }
 
+  public static Jws2Discoverer disc = null;
+
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception
+  {
+    disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
+
+  }
+
   @Test
   public void testJws2Gui()
   {
-    jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer
-            .getDiscoverer();
-    int p = 0;
-    String svcurls="";
-    Vector<String> services = new Vector<String>();
-    for (String url : serviceUrls)
-    {
-      svcurls+=url+"; ";
-      services.add(url);
-    }
-    ;
-    Jws2Discoverer.setServiceUrls(services);
-
-    try
-    {
-      disc.run();
-    } catch (Exception e)
-    {
-      System.err.println("Aborting. Problem discovering services. Tried "+svcurls);
-      e.printStackTrace();
-      return;
-    }
-    assertTrue("Failed to discover any services at ",
-            disc.getServices().size() > 0);
     Jws2Instance lastserv = null;
     Iterator<String> presetEnum = presetTests.iterator();
     for (Jws2Instance service : disc.getServices())
@@ -205,8 +206,7 @@ public class Jws2ParamView
             }
             WsJobParameters pgui = new WsJobParameters(lastserv,
                     new JabaPreset(lastserv, pr));
-            JFrame jf = new JFrame("Parameters for "
-                    + lastserv.getActionText());
+            JFrame jf = new JFrame(MessageManager.formatMessage("label.ws_parameters_for", new String[]{lastserv.getActionText()}));
             JPanel cont = new JPanel(new BorderLayout());
             pgui.validate();
             cont.setPreferredSize(pgui.getPreferredSize());