From: pvtroshin <pvtroshin@e3abac25-378b-4346-85de-24260fe3988d>
Date: Thu, 11 Aug 2011 10:45:09 +0000 (+0000)
Subject: Fixes to testcase, take into account the new WS
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=dc8f4078acc94bd711079355d3cdf60dde467dae;p=jabaws.git

Fixes to testcase, take into account the new WS

git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4487 e3abac25-378b-4346-85de-24260fe3988d
---

diff --git a/testsrc/compbio/ws/client/WSTesterTester.java b/testsrc/compbio/ws/client/WSTesterTester.java
index b8cf29d..c8b250e 100644
--- a/testsrc/compbio/ws/client/WSTesterTester.java
+++ b/testsrc/compbio/ws/client/WSTesterTester.java
@@ -15,6 +15,7 @@ import compbio.metadata.AllTestSuit;
 public class WSTesterTester {
 
 	public static final String SERVER = "http://localhost:8080/jabaws";
+	// public static final String SERVER = "http://192.168.202.130/jabaws";
 
 	// public static final String SERVER =
 	// "http://nanna.cluster.lifesci.dundee.ac.uk:8080/jaba";
@@ -28,6 +29,7 @@ public class WSTesterTester {
 			assertTrue(tester.checkService(Services.JronnWS));
 			assertTrue(tester.checkService(Services.ClustalWS));
 			assertTrue(tester.checkService(Services.MuscleWS));
+			assertTrue(tester.checkService(Services.ClustalOWS));
 		} catch (ConnectException e) {
 			e.printStackTrace();
 			fail(e.getMessage());
diff --git a/testsrc/compbio/ws/server/RegistryWSTester.java b/testsrc/compbio/ws/server/RegistryWSTester.java
index 8608351..51bfa71 100644
--- a/testsrc/compbio/ws/server/RegistryWSTester.java
+++ b/testsrc/compbio/ws/server/RegistryWSTester.java
@@ -1,12 +1,12 @@
 package compbio.ws.server;
 
-import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
 import java.net.ConnectException;
-import java.util.EnumSet;
+import java.util.Arrays;
+import java.util.Set;
 
 import javax.xml.ws.WebServiceException;
 
@@ -19,14 +19,17 @@ import compbio.ws.client.WSTesterTester;
 
 public class RegistryWSTester {
 
-	@Test(groups = {AllTestSuit.test_group_webservices})
+	@Test(groups = {AllTestSuit.test_group_webservices,
+			AllTestSuit.test_group_windows_only})
 	public void testGetSupportedServices() {
 		try {
 			compbio.data.msa.RegistryWS reg = Jws2Client
 					.connectToRegistry(WSTesterTester.SERVER);
-			assertEquals(EnumSet.of(Services.AAConWS, Services.JronnWS,
-					Services.MuscleWS, Services.ClustalWS),
-					reg.getSupportedServices());
+			System.out.println(reg.getSupportedServices());
+			Set<Services> supserv = reg.getSupportedServices();
+			assertTrue(supserv.containsAll(Arrays.asList(new Services[]{
+					Services.AAConWS, Services.ClustalOWS, Services.IUPredWS,
+					Services.MuscleWS, Services.ClustalWS, Services.JronnWS})));
 		} catch (ConnectException e) {
 			e.printStackTrace();
 			fail(e.getLocalizedMessage());