X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=testsrc%2Fcompbio%2Fws%2Fclient%2FWSTesterTester.java;h=22ad22952be509115208d298c8ea95161b65a4ee;hb=2f848a9d2c1925a49357bbe56e62e089a0068c3a;hp=43204e5245c739016e9c4ce79cd8353ba47f4d42;hpb=a2619dbd95b874abd03ae551c02524fe09e9f631;p=jabaws.git

diff --git a/testsrc/compbio/ws/client/WSTesterTester.java b/testsrc/compbio/ws/client/WSTesterTester.java
index 43204e5..22ad229 100644
--- a/testsrc/compbio/ws/client/WSTesterTester.java
+++ b/testsrc/compbio/ws/client/WSTesterTester.java
@@ -1,32 +1,43 @@
 package compbio.ws.client;
 
 import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
 
 import java.io.PrintWriter;
+import java.net.ConnectException;
+
+import javax.xml.ws.WebServiceException;
 
 import org.testng.annotations.Test;
 
-import compbio.data.msa.JABAService;
 import compbio.metadata.AllTestSuit;
 
 public class WSTesterTester {
 
 	public static final String SERVER = "http://localhost:8080/jabaws";
+	// public static final String SERVER = "http://192.168.202.130/jabaws";
 
-	@Test(groups = {AllTestSuit.test_group_runner})
-	public void testAllWindowsWS() {
-		WSTester tester = new WSTester(new PrintWriter(System.out, true));
-		JABAService ws = Jws2Client.connect(SERVER, Services.AAConWS);
-		assertTrue(tester.checkService(ws));
-
-		ws = Jws2Client.connect(SERVER, Services.JronnWS);
-		assertTrue(tester.checkService(ws));
-
-		ws = Jws2Client.connect(SERVER, Services.ClustalWS);
-		assertTrue(tester.checkService(ws));
+	// public static final String SERVER =
+	// "http://nanna.cluster.lifesci.dundee.ac.uk:8080/jaba";
 
-		ws = Jws2Client.connect(SERVER, Services.MuscleWS);
-		assertTrue(tester.checkService(ws));
+	@Test(groups = {AllTestSuit.test_group_webservices})
+	public void testAllWindowsWS() {
+		WSTester tester = new WSTester(SERVER,
+				new PrintWriter(System.out, true));
+		try {
+			assertTrue(tester.checkService(Services.AAConWS));
+			assertTrue(tester.checkService(Services.JronnWS));
+			assertTrue(tester.checkService(Services.ClustalWS));
+			assertTrue(tester.checkService(Services.MuscleWS));
+			assertTrue(tester.checkService(Services.ClustalOWS));
+			assertTrue(tester.checkService(Services.IUPredWS));
+		} catch (ConnectException e) {
+			e.printStackTrace();
+			fail(e.getMessage());
+		} catch (WebServiceException e) {
+			e.printStackTrace();
+			fail(e.getMessage());
+		}
 
 		// Will throw UnsupportedRuntimeException on windows
 		// ws = Jws2Client.connect(SERVER, Services.MafftWS);
@@ -34,13 +45,19 @@ public class WSTesterTester {
 
 	}
 
-	@Test(groups = {AllTestSuit.test_group_non_windows})
+	@Test(groups = {AllTestSuit.test_group_webservices})
 	public void testAllWS() {
-		WSTester tester = new WSTester(new PrintWriter(System.out));
-
-		for (Services service : Services.values()) {
-			JABAService ws = Jws2Client.connect(SERVER, service);
-			assertTrue(tester.checkService(ws));
+		WSTester tester = new WSTester(SERVER, new PrintWriter(System.out));
+		try {
+			for (Services service : Services.values()) {
+				assertTrue(tester.checkService(service));
+			}
+		} catch (ConnectException e) {
+			e.printStackTrace();
+			fail(e.getMessage());
+		} catch (WebServiceException e) {
+			e.printStackTrace();
+			fail(e.getMessage());
 		}
 	}