Re-enable the wsdl first contribution and the test case that launches it

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@955162 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 125 insertions, 143 deletions

diff --git a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java
new file mode 100644
index 0000000000..8763f08c71
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java
@@ -0,0 +1,125 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package org.apache.tuscany.sca.binding.ws.launcher.axis2;

+

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertTrue;

+import static org.junit.Assert.fail;

+import junit.framework.TestCase;

+

+import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher;

+import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher;

+import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar;

+import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo;

+import org.apache.tuscany.sca.node.Contribution;

+import org.apache.tuscany.sca.node.Node;

+import org.apache.tuscany.sca.node.NodeFactory;

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Ignore;

+import org.junit.Test;

+

+public class WSDLFirstTestCase extends TestCase {

+

+    private Node node;

+    private HelloWorldServiceLauncher externalService;

+    private HelloWorldClientLauncher externalClient;

+

+    @Before

+    public void setUp() throws Exception {

+        // Start the external service

+        externalService = new HelloWorldServiceLauncher();

+        externalService.createService();

+       

+        // Start the SCA contribution

+        node = NodeFactory.newInstance().createNode(new Contribution("wsdl-first", "../contribution-wsdl-first/target/itest-ws-contribution-wsdl-first.jar"));

+        node.start();

+        

+        // start the external client

+        try {

+            externalClient = new HelloWorldClientLauncher();

+            externalClient.createClient();

+        } catch (Exception ex) {

+            ex.printStackTrace();

+            throw ex;

+        }

+    }

+

+/*

+    @Test

+    public void testWait() throws Exception {

+        System.out.println("Press a key");

+        System.in.read();

+    }

+*/

+  

+    @Test

+    public void testGetGreetings() throws Exception {

+        assertEquals("Hello Fred", externalClient.getGreetings("Fred"));

+    }

+    

+    @Test

+    @Ignore

+    public void testGetGreetingsException() throws Exception {

+        try {

+            externalClient.getGreetingsException("Fred");

+        } catch (Exception ex) {

+            return;

+        }

+        

+        fail("expecting exception");

+    }

+    

+    @Test

+    public void testGetGreetingsComplex() throws Exception {        

+        Foo f = new Foo();

+        Bar b1 = new Bar();

+        b1.setS("petra");

+        b1.setX(1);

+        b1.setY(new Integer(2));

+        b1.setB(Boolean.TRUE);

+        Bar b2 = new Bar();

+        b2.setS("beate");

+        b2.setX(3);

+        b2.setY(new Integer(4));

+        b2.setB(Boolean.FALSE);

+        f.getBars().add(b1);

+        f.getBars().add(b2);

+       

+        Foo f2 = externalClient.getGreetingsComplex(f);

+

+        assertEquals("petra", f2.getBars().get(0).getS());

+        assertEquals(1, f2.getBars().get(0).getX());

+        assertEquals(2, f2.getBars().get(0).getY().intValue());

+        assertTrue(f2.getBars().get(0).isB());

+        assertEquals("simon", f2.getBars().get(2).getS());

+        assertEquals(7, f2.getBars().get(2).getX());

+        assertEquals(8, f2.getBars().get(2).getY().intValue());

+        assertTrue(f2.getBars().get(2).isB().booleanValue());

+    }  

+    

+    @After

+    public void tearDown() throws Exception {

+        node.stop();

+        externalClient.destroyClient();

+        externalService.destoryService();

+    }

+

+}

diff --git a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCaseOFF.java b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCaseOFF.java
deleted file mode 100644
index 2cf2422c8f..0000000000
--- a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCaseOFF.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-

-package org.apache.tuscany.sca.binding.ws.launcher.axis2;

-

-import junit.framework.TestCase;

-

-import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher;

-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-public class WSDLFirstTestCaseOFF extends TestCase {

-

-    private Node node;

-

-    @Override

-    protected void setUp() throws Exception {

-        // Start the external service

-        HelloWorldServiceLauncher.main(null);

-       

-        // Start the SCA contribution

-        node = NodeFactory.newInstance().createNode(new Contribution("common", "../common-contribution/target/classes"),

-                                                    new Contribution("wsdl-first", "../wsdl-first-contribution/target/classes"));

-        node.start();

-    }

-    

-    public void testCalculator() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    }  

-    

-/*    

-    public void testWait1() throws Exception {

-        System.out.println("Press a key");

-        System.in.read();

-    } 

-

-    public void testCalculator1() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    }     

-    

-    public void testCalculator2() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    }  

-    

-    public void testCalculator3() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    }  

-    

-    public void testCalculator4() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    }    

-    

-    public void testCalculator5() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    } 

-    

-    public void testCalculator6() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    } 

-    

-    public void testCalculator7() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    } 

-    

-    public void testCalculator8() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    } 

-    

-    public void testCalculator9() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    } 

-    

-    public void testCalculator10() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    } 

-    

-    public void testCalculator11() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    }  

-    

-    public void testCalculator12() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    }  

-    

-    public void testCalculator13() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    }  

-    

-    public void testCalculator14() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    }    

-    

-    public void testCalculator15() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    } 

-    

-    public void testCalculator16() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    } 

-    

-    public void testCalculator17() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    } 

-    

-    public void testCalculator18() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    } 

-    

-    public void testCalculator19() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    } 

-    

-    public void testCalculator20() throws Exception {

-        HelloWorldClientLauncher.main(null);

-    } 

-*/

-   

-    

-    @Override

-    protected void tearDown() throws Exception {

-        node.stop();

-        node = null;

-    }

-

-}