Fixes to testcase, take into account the new WS

[jabaws.git] / testsrc / compbio / ws / client / WSTesterTester.java

diff --git a/testsrc/compbio/ws/client/WSTesterTester.java b/testsrc/compbio/ws/client/WSTesterTester.java
index 144c7b2..c8b250e 100644 (file)
--- a/testsrc/compbio/ws/client/WSTesterTester.java
+++ b/testsrc/compbio/ws/client/WSTesterTester.java
@@ -1,8 +1,12 @@
 package compbio.ws.client;\r
 \r
 import static org.testng.Assert.assertTrue;\r
+import static org.testng.Assert.fail;\r
 \r
 import java.io.PrintWriter;\r
+import java.net.ConnectException;\r
+\r
+import javax.xml.ws.WebServiceException;\r
 \r
 import org.testng.annotations.Test;\r
 \r
@@ -11,16 +15,28 @@ import compbio.metadata.AllTestSuit;
 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
        @Test(groups = {AllTestSuit.test_group_webservices})\r
        public void testAllWindowsWS() {\r
                WSTester tester = new WSTester(SERVER,\r
                                new PrintWriter(System.out, true));\r
-\r
-               assertTrue(tester.checkService(Services.AAConWS));\r
-               assertTrue(tester.checkService(Services.JronnWS));\r
-               assertTrue(tester.checkService(Services.ClustalWS));\r
-               assertTrue(tester.checkService(Services.MuscleWS));\r
+               try {\r
+                       assertTrue(tester.checkService(Services.AAConWS));\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 (WebServiceException e) {\r
+                       e.printStackTrace();\r
+                       fail(e.getMessage());\r
+               }\r
 \r
                // Will throw UnsupportedRuntimeException on windows\r
                // ws = Jws2Client.connect(SERVER, Services.MafftWS);\r
@@ -31,8 +47,16 @@ public class WSTesterTester {
        @Test(groups = {AllTestSuit.test_group_webservices})\r
        public void testAllWS() {\r
                WSTester tester = new WSTester(SERVER, new PrintWriter(System.out));\r
-               for (Services service : Services.values()) {\r
-                       assertTrue(tester.checkService(service));\r
+               try {\r
+                       for (Services service : Services.values()) {\r
+                               assertTrue(tester.checkService(service));\r
+                       }\r
+               } catch (ConnectException e) {\r
+                       e.printStackTrace();\r
+                       fail(e.getMessage());\r
+               } catch (WebServiceException e) {\r
+                       e.printStackTrace();\r
+                       fail(e.getMessage());\r
                }\r
        }\r
 \r