Expose a few methods of Client and WSTester as API for Jim, new distributables.

[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 64c70ab..8608351 100644 (file)
--- a/testsrc/compbio/ws/server/RegistryWSTester.java
+++ b/testsrc/compbio/ws/server/RegistryWSTester.java
@@ -5,8 +5,11 @@ import static org.testng.Assert.assertNotNull;
 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
 \r
+import javax.xml.ws.WebServiceException;\r
+\r
 import org.testng.annotations.Test;\r
 \r
 import compbio.metadata.AllTestSuit;\r
@@ -18,34 +21,66 @@ public class RegistryWSTester {
 \r
        @Test(groups = {AllTestSuit.test_group_webservices})\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
+                       assertEquals(EnumSet.of(Services.AAConWS, Services.JronnWS,\r
+                                       Services.MuscleWS, Services.ClustalWS),\r
+                                       reg.getSupportedServices());\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(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"},groups = {AllTestSuit.test_group_webservices})\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"},groups = {AllTestSuit.test_group_webservices})\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"},groups = {AllTestSuit.test_group_webservices})\r
+       @Test(dependsOnMethods = {"testTestService"}, groups = {AllTestSuit.test_group_webservices})\r
        public void testGetLastTested() {\r
                try {\r
                        Thread.sleep(1000);\r
@@ -53,16 +88,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(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