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 (file)
--- 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 {\r
 \r
        public static final String SERVER = "http://localhost:8080/jabaws";\r
 public class WSTesterTester {\r
 \r
        public static final String SERVER = "http://localhost:8080/jabaws";\r

+       // public static final String SERVER = "http://192.168.202.130/jabaws";\r

 \r
        // public static final String SERVER =\r
        // "http://nanna.cluster.lifesci.dundee.ac.uk:8080/jaba";\r
 \r
        // public static final String SERVER =\r
        // "http://nanna.cluster.lifesci.dundee.ac.uk:8080/jaba";\r

@@ -28,6 +29,7 @@ public class WSTesterTester {
                        assertTrue(tester.checkService(Services.JronnWS));\r
                        assertTrue(tester.checkService(Services.ClustalWS));\r
                        assertTrue(tester.checkService(Services.MuscleWS));\r
                        assertTrue(tester.checkService(Services.JronnWS));\r
                        assertTrue(tester.checkService(Services.ClustalWS));\r
                        assertTrue(tester.checkService(Services.MuscleWS));\r

+                       assertTrue(tester.checkService(Services.ClustalOWS));\r

                } catch (ConnectException e) {\r
                        e.printStackTrace();\r
                        fail(e.getMessage());\r
                } catch (ConnectException e) {\r
                        e.printStackTrace();\r
                        fail(e.getMessage());\r

diff --git a/testsrc/compbio/ws/server/RegistryWSTester.java b/testsrc/compbio/ws/server/RegistryWSTester.java
index 8608351..51bfa71 100644 (file)
--- a/testsrc/compbio/ws/server/RegistryWSTester.java
+++ b/testsrc/compbio/ws/server/RegistryWSTester.java
@@ -1,12 +1,12 @@
 package compbio.ws.server;\r
 \r
 package compbio.ws.server;\r
 \r

-import static org.testng.Assert.assertEquals;\r

 import static org.testng.Assert.assertNotNull;\r
 import static org.testng.Assert.assertTrue;\r
 import static org.testng.Assert.fail;\r
 \r
 import java.net.ConnectException;\r
 import static org.testng.Assert.assertNotNull;\r
 import static org.testng.Assert.assertTrue;\r
 import static org.testng.Assert.fail;\r
 \r
 import java.net.ConnectException;\r

-import java.util.EnumSet;\r
+import java.util.Arrays;\r
+import java.util.Set;\r

 \r
 import javax.xml.ws.WebServiceException;\r
 \r
 \r
 import javax.xml.ws.WebServiceException;\r
 \r

@@ -19,14 +19,17 @@ import compbio.ws.client.WSTesterTester;
 \r
 public class RegistryWSTester {\r
 \r
 \r
 public class RegistryWSTester {\r
 \r

-       @Test(groups = {AllTestSuit.test_group_webservices})\r
+       @Test(groups = {AllTestSuit.test_group_webservices,\r
+                       AllTestSuit.test_group_windows_only})\r

        public void testGetSupportedServices() {\r
                try {\r
                        compbio.data.msa.RegistryWS reg = Jws2Client\r
                                        .connectToRegistry(WSTesterTester.SERVER);\r
        public void testGetSupportedServices() {\r
                try {\r
                        compbio.data.msa.RegistryWS reg = Jws2Client\r
                                        .connectToRegistry(WSTesterTester.SERVER);\r

-                       assertEquals(EnumSet.of(Services.AAConWS, Services.JronnWS,\r
-                                       Services.MuscleWS, Services.ClustalWS),\r
-                                       reg.getSupportedServices());\r
+                       System.out.println(reg.getSupportedServices());\r
+                       Set<Services> supserv = reg.getSupportedServices();\r
+                       assertTrue(supserv.containsAll(Arrays.asList(new Services[]{\r
+                                       Services.AAConWS, Services.ClustalOWS, Services.IUPredWS,\r
+                                       Services.MuscleWS, Services.ClustalWS, Services.JronnWS})));\r

                } catch (ConnectException e) {\r
                        e.printStackTrace();\r
                        fail(e.getLocalizedMessage());\r
                } catch (ConnectException e) {\r
                        e.printStackTrace();\r
                        fail(e.getLocalizedMessage());\r