JWS-61 test demonstrating compound option value problem with JABAWS client

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

diff --git a/testsrc/compbio/ws/client/TestAAConWS.java b/testsrc/compbio/ws/client/TestAAConWS.java
index 488d239..b6be0d7 100644 (file)
--- a/testsrc/compbio/ws/client/TestAAConWS.java
+++ b/testsrc/compbio/ws/client/TestAAConWS.java
@@ -3,13 +3,16 @@ package compbio.ws.client;
 import static org.testng.Assert.assertEquals;\r
 import static org.testng.Assert.assertNotNull;\r
 import static org.testng.Assert.fail;\r
-\r
+import static org.testng.Assert.assertTrue;\r
 import java.io.File;\r
 import java.io.FileInputStream;\r
 import java.io.FileNotFoundException;\r
 import java.io.IOException;\r
+import java.net.ConnectException;\r
 import java.util.List;\r
 \r
+import javax.xml.ws.WebServiceException;\r
+\r
 import org.testng.annotations.BeforeTest;\r
 import org.testng.annotations.Test;\r
 \r
@@ -19,8 +22,11 @@ import compbio.data.sequence.ConservationMethod;
 import compbio.data.sequence.FastaSequence;\r
 import compbio.data.sequence.ScoreManager;\r
 import compbio.data.sequence.SequenceUtil;\r
+import compbio.metadata.AllTestSuit;\r
 import compbio.metadata.JobSubmissionException;\r
 import compbio.metadata.LimitExceededException;\r
+import compbio.metadata.Option;\r
+import compbio.metadata.Preset;\r
 import compbio.metadata.PresetManager;\r
 import compbio.metadata.ResultNotAvailableException;\r
 import compbio.metadata.RunnerConfig;\r
@@ -33,7 +39,7 @@ public class TestAAConWS {
 \r
        SequenceAnnotation<AACon> msaws;\r
 \r
-       @BeforeTest\r
+       @BeforeTest(groups = {AllTestSuit.test_group_webservices})\r
        void initConnection() {\r
                /*\r
                 * URL url = null; try { url = new\r
@@ -44,13 +50,20 @@ public class TestAAConWS {
                 * QName(namespace, "AAConWS"); Service serv = Service.create(url,\r
                 * qname); msaws = serv.getPort(new QName(namespace, "AAConWSPort"),\r
                 * Annotation.class);\r
-                */\r
-               JABAService client = Jws2Client.connect("http://localhost:8080/jabaws",\r
-                               Services.AAConWS);\r
-               msaws = (SequenceAnnotation<AACon>) client;\r
+                */try {\r
+                       JABAService client = Jws2Client.connect(\r
+                                       "http://localhost:8080/jabaws", Services.AAConWS);\r
+                       msaws = (SequenceAnnotation<AACon>) client;\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
-       @Test\r
+       @Test(groups = {AllTestSuit.test_group_webservices})\r
        public void testAnalize() throws FileNotFoundException, IOException {\r
 \r
                /*\r
@@ -123,7 +136,17 @@ public class TestAAConWS {
                }\r
 \r
        }\r
-       @Test\r
+       @Test(groups = {AllTestSuit.test_group_webservices})\r
+       public void testRecoverArgsForPreset() throws Exception {\r
+               PresetManager<AACon> presets = msaws.getPresets();\r
+               for (Preset<AACon> preset:presets.getPresets())\r
+               {\r
+                       List<Option<AACon>> args = preset.getArguments(msaws.getRunnerOptions());\r
+                       List opts = preset.getOptions();\r
+                       assertTrue(args.size()>=opts.size(),"Couldn't recover all Option items for preset "+preset.getName());\r
+               }\r
+       }\r
+       @Test(groups = {AllTestSuit.test_group_webservices})\r
        public void testPresetAnalize() throws FileNotFoundException, IOException {\r
 \r
                String CURRENT_DIRECTORY = SysPrefs.getCurrentDirectory()\r
@@ -175,7 +198,7 @@ public class TestAAConWS {
 \r
        }\r
 \r
-       @Test\r
+       @Test(groups = {AllTestSuit.test_group_webservices})\r
        public void testCustomAnalize() throws FileNotFoundException, IOException {\r
 \r
                String CURRENT_DIRECTORY = SysPrefs.getCurrentDirectory()\r