X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=testsrc%2Fcompbio%2Fws%2Fclient%2FWSTesterTester.java;h=5fe0a35ed2a99f68fec0853a8a63cf4cf5a28640;hb=240b66f1f00dc336c81878ed949e52d738eadb50;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..5fe0a35 100644
--- a/testsrc/compbio/ws/client/WSTesterTester.java
+++ b/testsrc/compbio/ws/client/WSTesterTester.java
@@ -6,7 +6,6 @@ import java.io.PrintWriter;
 
 import org.testng.annotations.Test;
 
-import compbio.data.msa.JABAService;
 import compbio.metadata.AllTestSuit;
 
 public class WSTesterTester {
@@ -15,18 +14,13 @@ public class WSTesterTester {
 
 	@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));
+		WSTester tester = new WSTester(SERVER,
+				new PrintWriter(System.out, true));
 
-		ws = Jws2Client.connect(SERVER, Services.JronnWS);
-		assertTrue(tester.checkService(ws));
-
-		ws = Jws2Client.connect(SERVER, Services.ClustalWS);
-		assertTrue(tester.checkService(ws));
-
-		ws = Jws2Client.connect(SERVER, Services.MuscleWS);
-		assertTrue(tester.checkService(ws));
+		assertTrue(tester.checkService(Services.AAConWS));
+		assertTrue(tester.checkService(Services.JronnWS));
+		assertTrue(tester.checkService(Services.ClustalWS));
+		assertTrue(tester.checkService(Services.MuscleWS));
 
 		// Will throw UnsupportedRuntimeException on windows
 		// ws = Jws2Client.connect(SERVER, Services.MafftWS);
@@ -36,11 +30,9 @@ public class WSTesterTester {
 
 	@Test(groups = {AllTestSuit.test_group_non_windows})
 	public void testAllWS() {
-		WSTester tester = new WSTester(new PrintWriter(System.out));
-
+		WSTester tester = new WSTester(SERVER, new PrintWriter(System.out));
 		for (Services service : Services.values()) {
-			JABAService ws = Jws2Client.connect(SERVER, service);
-			assertTrue(tester.checkService(ws));
+			assertTrue(tester.checkService(service));
 		}
 	}