X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FMinJabawsClientTests.java;h=db5f9e4f9a01632da65c86716f0383211281a4f4;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=61f82031f62d21f6223d02be348f6b6ce518205c;hpb=ab22918ab8fc67d30dad1fb1ae0f37e51f49df95;p=jalview.git

diff --git a/test/jalview/ws/jabaws/MinJabawsClientTests.java b/test/jalview/ws/jabaws/MinJabawsClientTests.java
index 61f8203..db5f9e4 100644
--- a/test/jalview/ws/jabaws/MinJabawsClientTests.java
+++ b/test/jalview/ws/jabaws/MinJabawsClientTests.java
@@ -1,11 +1,34 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.jabaws;
 
 import static org.testng.AssertJUnit.assertEquals;
 
+import jalview.gui.JvOptionPane;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import compbio.data.msa.MsaWS;
@@ -18,40 +41,60 @@ import compbio.ws.client.Services;
 public class MinJabawsClientTests
 {
 
-	/**
-	 * simple test for the benefit of JAL-1338
-	 * @throws Exception
-	 */
-	@SuppressWarnings("rawtypes")
-  @Test(groups =
-  { "Network" })
-	public void msaTest() throws Exception {
-		String url;
-		RegistryWS registry = Jws2Client
-				.connectToRegistry(url = "http://www.compbio.dundee.ac.uk/jabaws");
-		if (registry != null) {
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
+  /**
+   * simple test for the benefit of JAL-1338
+   * 
+   * @throws Exception
+   */
+  @SuppressWarnings("rawtypes")
+  @Test(groups = { "Network" })
+  public void msaTest() throws Exception
+  {
+    String url;
+    RegistryWS registry = Jws2Client.connectToRegistry(
+            url = "http://www.compbio.dundee.ac.uk/jabaws");
+    if (registry != null)
+    {
 
-			MsaWS msaservice = null;
-			for (Services service : registry.getSupportedServices()) {
-				if (service.equals(Services.ClustalOWS)) {
-					msaservice = (MsaWS) Jws2Client.connect(url, service);
-					if (msaservice != null) {
-						break;
-					}
-				}
-			}
-			if (msaservice == null) {
-				Assert.fail("couldn't find a clustalO service on the public registry");
-			}
-			FastaSequence fsq = new FastaSequence("seqA",
-					"SESESESESESESESSESESSESESESESESESESESESEEEEEESSESESESESSSSESESESESESESE");
-			List<FastaSequence> iseqs = new ArrayList<FastaSequence>();
-			for (int i = 0; i < 9; i++) {
-				iseqs.add(new FastaSequence(fsq.getId() + i, fsq.getSequence()
-						+ fsq.getSequence().substring(i + 3, i + 3 + i)));
-			}
+      MsaWS msaservice = null;
+      for (Services service : registry.getSupportedServices())
+      {
+        if (service == null)
+        {
+          // the 'unsupported service'
+          continue;
+        }
+        if (service.equals(Services.ClustalOWS))
+        {
+          msaservice = (MsaWS) Jws2Client.connect(url, service);
+          if (msaservice != null)
+          {
+            break;
+          }
+        }
+      }
+      if (msaservice == null)
+      {
+        Assert.fail(
+                "couldn't find a clustalO service on the public registry");
+      }
+      FastaSequence fsq = new FastaSequence("seqA",
+              "SESESESESESESESSESESSESESESESESESESESESEEEEEESSESESESESSSSESESESESESESE");
+      List<FastaSequence> iseqs = new ArrayList<FastaSequence>();
+      for (int i = 0; i < 9; i++)
+      {
+        iseqs.add(new FastaSequence(fsq.getId() + i, fsq.getSequence()
+                + fsq.getSequence().substring(i + 3, i + 3 + i)));
+      }
 
-			String jobid = msaservice.align(iseqs);
+      String jobid = msaservice.align(iseqs);
       if (jobid != null)
       {
         JobStatus js = null;
@@ -86,8 +129,8 @@ public class MinJabawsClientTests
         // System.out.println(t.getFormattedFasta());
         // }
         // });
-			}
+      }
 
-		}
-	}
+    }
+  }
 }