svn commit: r293057 - in /beehive/trunk/wsm/test: build.xml src/junit-server/org/apache/beehive/wsm/test/controls/SimpleControlsTest.java

[ek...@apache.org]

Author: ekoneil
Date: Sat Oct  1 19:10:35 2005
New Revision: 293057

URL: http://svn.apache.org/viewcvs?rev=293057&view=rev
Log:
Automate the simple WSM test that uses a control from an annotated web service.

Also fixes the build so that the client and server sides can be run independently.

BB: self
Test: WSM pass


Modified:
    beehive/trunk/wsm/test/build.xml
    beehive/trunk/wsm/test/src/junit-server/org/apache/beehive/wsm/test/controls/SimpleControlsTest.java

Modified: beehive/trunk/wsm/test/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/test/build.xml?rev=293057&r1=293056&r2=293057&view=diff
==============================================================================
--- beehive/trunk/wsm/test/build.xml (original)
+++ beehive/trunk/wsm/test/build.xml Sat Oct  1 19:10:35 2005
@@ -74,7 +74,6 @@
         <echo message="----------------------------------------------------------------"/>
         <echo message="build   - Build all classes needed for running the tests."/>
         <echo message="clean   - Delete all classes needed for running the tests."/>
-        <echo message="run.drt - Run the drts."/>
         <echo message="drt     - Run 'build', 'run.drt'."/>
         <echo message="----------------------------------------------------------------"/>
     </target>
@@ -89,13 +88,15 @@
         <antcall target="build.junit"/>
         <antcall target="drt.junit"/>
         <antcall target="build.webapp"/>
+        <antcall target="build.webapp.client"/>
         <antcall target="drt.server"/>
         <echo message="--------------------------------------------------"/>
         <echo message="|         WSM DRT ending                         |"/>
         <echo message="--------------------------------------------------"/>
     </target>
 
-    <target name="clean" depends="clean.junit,clean.webapp">
+    <target name="clean" depends="clean.webapp">
+        <delete file="${build.dir}"/>
         <delete file="velocity.log"/>
         <delete dir="${webapp.dir}/WEB-INF/attachments"/>
         <delete dir="${webapp.dir}/WEB-INF/temp"/>
@@ -184,13 +185,21 @@
             <sequential>
                 <antcall target="ensure.deployed"/>
                 <echo message="JUnit logs in: ${drt.logs}"/>
-                <!-- once the webapp has started, create service clients -->
 
-                <!-- generate service clients -->
+                <!-- execute JUnit tests -->
+                <antcall target="junit.server"/>
 
-                <!-- build tests + service clients -->
+                <antcall target="undeploy"/>
+                <echo message="stopping Web container"/>
+                <stop-server />
+            </sequential>
+        </parallel>
+        <fail if="wsmdrtserverfailed" message="The WSM Tests failed"/>
+    </target>
+
+    <target name="junit.server" description="Execute the JUnit tests against a running server">
+        <mkdir dir="${drt.logs}"/>
 
-                <!-- execute JUnit tests -->
                 <junit failureproperty="wsmdrtserverfailed" printsummary="on" tempdir="${build.dir}" fork="yes">
                     <sysproperty key="wsm.test.url" value="${webapp.waitfor.url}"/>
                     <formatter type="plain"/>
@@ -206,19 +215,9 @@
                         </fileset>
                     </batchtest>
                 </junit>
-                <antcall target="undeploy"/>
-                <echo message="stopping Web container"/>
-                <stop-server />
-            </sequential>
-        </parallel>
-        <fail if="wsmdrtserverfailed" message="The WSM Tests failed"/>
     </target>
 
-    <target name="clean.junit">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="build.webapp">
+    <target name="build.webapp.client" description="Build the client-side JUnit tests">
         <mkdir dir="${junit-server.classes}"/>
 
         <javac srcdir="${junit-server.src}"
@@ -228,7 +227,9 @@
                optimize="on"
                verbose="false"
                failonerror="true"/>
+    </target>
 
+    <target name="build.webapp">
         <ant dir="webapp/" target="build"/>
     </target>
 

Modified: beehive/trunk/wsm/test/src/junit-server/org/apache/beehive/wsm/test/controls/SimpleControlsTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/test/src/junit-server/org/apache/beehive/wsm/test/controls/SimpleControlsTest.java?rev=293057&r1=293056&r2=293057&view=diff
==============================================================================
--- beehive/trunk/wsm/test/src/junit-server/org/apache/beehive/wsm/test/controls/SimpleControlsTest.java (original)
+++ beehive/trunk/wsm/test/src/junit-server/org/apache/beehive/wsm/test/controls/SimpleControlsTest.java Sat Oct  1 19:10:35 2005
@@ -20,6 +20,10 @@
 import java.net.URL;
 import java.io.InputStream;
 import javax.wsdl.Definition;
+import javax.xml.namespace.QName;
+
+import org.apache.axis.client.Call;
+import org.apache.axis.client.Service;
 
 import junit.framework.TestCase;
 
@@ -33,12 +37,19 @@
         throws Exception {
 
         /* todo: replace with some SOAPTestCase infrastructure */
-        URL url = new URL("http://localhost:8080/wsmWeb/webservice/ControlTestService.jws?wsdl");
+        String endpoint = "http://localhost:8080/wsmWeb/webservice/ControlTestService.jws";
 
-        System.out.println("url: " + url.toString());
+        System.out.println("endpoint URL: " + endpoint);
 
         /* todo: SOAP request */
-
-        /* todo: response validation */
+        Service service = new Service();
+        Call call = (Call)service.createCall();
+        
+	call.setTargetEndpointAddress(new java.net.URL(endpoint));
+	call.setOperationName(new QName("http://soapinterop.org/", "sayHello"));
+
+	String ret = (String)call.invoke(new Object[] {"Homer"});
+	System.out.println("ret: " + ret);
+	assertEquals("Hello, Homer", ret);
     }
 }