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 91ee328..51bfa71 100644 (file)
--- a/testsrc/compbio/ws/server/RegistryWSTester.java
+++ b/testsrc/compbio/ws/server/RegistryWSTester.java
@@ -1,11 +1,14 @@
 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.util.EnumSet;\r
+import java.net.ConnectException;\r
+import java.util.Arrays;\r
+import java.util.Set;\r
+\r
+import javax.xml.ws.WebServiceException;\r
 \r
 import org.testng.annotations.Test;\r
 \r
@@ -16,36 +19,71 @@ import compbio.ws.client.WSTesterTester;
 \r
 public class RegistryWSTester {\r
 \r
-       @Test(groups = {AllTestSuit.test_group_windows_only})\r
+       @Test(groups = {AllTestSuit.test_group_webservices,\r
+                       AllTestSuit.test_group_windows_only})\r
        public void testGetSupportedServices() {\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
+               try {\r
+                       compbio.data.msa.RegistryWS reg = Jws2Client\r
+                                       .connectToRegistry(WSTesterTester.SERVER);\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 (WebServiceException e) {\r
+                       e.printStackTrace();\r
+                       fail(e.getLocalizedMessage());\r
+               }\r
        }\r
-       @Test()\r
+       @Test(groups = {AllTestSuit.test_group_webservices})\r
        public void testTestService() {\r
-               compbio.data.msa.RegistryWS reg = Jws2Client\r
-                               .connectToRegistry(WSTesterTester.SERVER);\r
-               assertNotNull(reg.testService(Services.AAConWS));\r
+               compbio.data.msa.RegistryWS reg = null;\r
+               try {\r
+                       reg = Jws2Client.connectToRegistry(WSTesterTester.SERVER);\r
+                       assertNotNull(reg.testService(Services.AAConWS));\r
+               } catch (ConnectException e) {\r
+                       e.printStackTrace();\r
+                       fail(e.getLocalizedMessage());\r
+               } catch (WebServiceException e) {\r
+                       e.printStackTrace();\r
+                       fail(e.getLocalizedMessage());\r
+               }\r
        }\r
 \r
-       @Test(dependsOnMethods = {"testTestService"})\r
+       @Test(dependsOnMethods = {"testTestService"}, groups = {AllTestSuit.test_group_webservices})\r
        public void testIsOperating() {\r
-               compbio.data.msa.RegistryWS reg = Jws2Client\r
-                               .connectToRegistry(WSTesterTester.SERVER);\r
-               assertTrue(reg.isOperating(Services.AAConWS));\r
+               try {\r
+                       compbio.data.msa.RegistryWS reg = Jws2Client\r
+                                       .connectToRegistry(WSTesterTester.SERVER);\r
+                       assertTrue(reg.isOperating(Services.AAConWS));\r
+               } catch (ConnectException e) {\r
+                       e.printStackTrace();\r
+                       fail(e.getLocalizedMessage());\r
+               } catch (WebServiceException e) {\r
+                       e.printStackTrace();\r
+                       fail(e.getLocalizedMessage());\r
+               }\r
        }\r
 \r
-       @Test(dependsOnMethods = {"testTestService"})\r
+       @Test(dependsOnMethods = {"testTestService"}, groups = {AllTestSuit.test_group_webservices})\r
        public void testGetLastTestedOn() {\r
-               compbio.data.msa.RegistryWS reg = Jws2Client\r
-                               .connectToRegistry(WSTesterTester.SERVER);\r
-               assertNotNull(reg.getLastTestedOn(Services.AAConWS));\r
+               try {\r
+                       compbio.data.msa.RegistryWS reg = Jws2Client\r
+                                       .connectToRegistry(WSTesterTester.SERVER);\r
+                       assertNotNull(reg.getLastTestedOn(Services.AAConWS));\r
+               } catch (ConnectException e) {\r
+                       e.printStackTrace();\r
+                       fail(e.getLocalizedMessage());\r
+               } catch (WebServiceException e) {\r
+                       e.printStackTrace();\r
+                       fail(e.getLocalizedMessage());\r
+               }\r
        }\r
 \r
-       @Test(dependsOnMethods = {"testTestService"})\r
+       @Test(dependsOnMethods = {"testTestService"}, groups = {AllTestSuit.test_group_webservices})\r
        public void testGetLastTested() {\r
                try {\r
                        Thread.sleep(1000);\r
@@ -53,16 +91,32 @@ public class RegistryWSTester {
                        e.printStackTrace();\r
                        fail(e.getMessage());\r
                }\r
-               compbio.data.msa.RegistryWS reg = Jws2Client\r
-                               .connectToRegistry(WSTesterTester.SERVER);\r
-               System.out.println(reg.getLastTested(Services.AAConWS));\r
-               assertTrue(reg.getLastTested(Services.AAConWS) > 0);\r
+               try {\r
+                       compbio.data.msa.RegistryWS reg = Jws2Client\r
+                                       .connectToRegistry(WSTesterTester.SERVER);\r
+                       System.out.println(reg.getLastTested(Services.AAConWS));\r
+                       assertTrue(reg.getLastTested(Services.AAConWS) > 0);\r
+               } catch (ConnectException e) {\r
+                       e.printStackTrace();\r
+                       fail(e.getLocalizedMessage());\r
+               } catch (WebServiceException e) {\r
+                       e.printStackTrace();\r
+                       fail(e.getLocalizedMessage());\r
+               }\r
        }\r
 \r
-       @Test()\r
+       @Test(groups = {AllTestSuit.test_group_webservices})\r
        public void testTestAllServices() {\r
-               compbio.data.msa.RegistryWS reg = Jws2Client\r
-                               .connectToRegistry(WSTesterTester.SERVER);\r
-               System.out.println(reg.testAllServices());\r
+               try {\r
+                       compbio.data.msa.RegistryWS reg = Jws2Client\r
+                                       .connectToRegistry(WSTesterTester.SERVER);\r
+                       System.out.println(reg.testAllServices());\r
+               } catch (ConnectException e) {\r
+                       e.printStackTrace();\r
+                       fail(e.getLocalizedMessage());\r
+               } catch (WebServiceException e) {\r
+                       e.printStackTrace();\r
+                       fail(e.getLocalizedMessage());\r
+               }\r
        }\r
 }\r