X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FMinJabawsClientTests.java;h=5a6289df5e994c1eef78bb23bef7a2a9446aca15;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=244ee4fd050a4dba7c4a2ea51020b63f1eab9f04;hpb=3412b273e964fb1a9d22564b04a5f0c827ec2461;p=jalview.git
diff --git a/test/jalview/ws/jabaws/MinJabawsClientTests.java b/test/jalview/ws/jabaws/MinJabawsClientTests.java
index 244ee4f..5a6289d 100644
--- a/test/jalview/ws/jabaws/MinJabawsClientTests.java
+++ b/test/jalview/ws/jabaws/MinJabawsClientTests.java
@@ -1,11 +1,33 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.ws.jabaws;
import static org.testng.AssertJUnit.assertEquals;
-import org.testng.annotations.Test;
-import org.testng.Assert;
+
import java.util.ArrayList;
import java.util.List;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
import compbio.data.msa.MsaWS;
import compbio.data.msa.RegistryWS;
import compbio.data.sequence.FastaSequence;
@@ -13,41 +35,50 @@ import compbio.metadata.JobStatus;
import compbio.ws.client.Jws2Client;
import compbio.ws.client.Services;
-public class MinJabawsClientTests {
+public class MinJabawsClientTests
+{
- /**
- * simple test for the benefit of JAL-1338
- * @throws Exception
- */
- @SuppressWarnings("rawtypes")
- @Test
- public void msaTest() throws Exception {
- String url;
- RegistryWS registry = Jws2Client
- .connectToRegistry(url = "http://www.compbio.dundee.ac.uk/jabaws");
- if (registry != null) {
+ /**
+ * 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 iseqs = new ArrayList();
- 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.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 iseqs = new ArrayList();
+ 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;
@@ -82,8 +113,8 @@ public class MinJabawsClientTests {
// System.out.println(t.getFormattedFasta());
// }
// });
- }
+ }
- }
- }
+ }
+ }
}