Fixes to testcase, take into account the new WS

[jabaws.git] / testsrc / compbio / ws / server / RegistryWSTester.java

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
-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 java.util.EnumSet;\r
+import java.util.Arrays;\r
+import java.util.Set;\r
 \r
 import javax.xml.ws.WebServiceException;\r
 \r
@@ -19,14 +19,17 @@ import compbio.ws.client.WSTesterTester;
 \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
-                       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