tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r529798 - in /incubator/tuscany/java/sca/itest/wsdl/src: main/resources/WSDLTest.composite test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
Date Tue, 17 Apr 2007 22:51:38 GMT
Author: antelder
Date: Tue Apr 17 15:51:23 2007
New Revision: 529798

URL: http://svn.apache.org/viewvc?view=rev&rev=529798
Log:
WSDL itests, update for all databinding and endpoint URI fixes. All tests now pass.

Modified:
    incubator/tuscany/java/sca/itest/wsdl/src/main/resources/WSDLTest.composite
    incubator/tuscany/java/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java

Modified: incubator/tuscany/java/sca/itest/wsdl/src/main/resources/WSDLTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/wsdl/src/main/resources/WSDLTest.composite?view=diff&rev=529798&r1=529797&r2=529798
==============================================================================
--- incubator/tuscany/java/sca/itest/wsdl/src/main/resources/WSDLTest.composite (original)
+++ incubator/tuscany/java/sca/itest/wsdl/src/main/resources/WSDLTest.composite Tue Apr 17
15:51:23 2007
@@ -23,68 +23,68 @@
    
     <service name="HelloWorldService1a2a3a4a" promote="Component2a3a4a" >
         <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldService1a2a3a4a"/>
     </service>
     <service name="HelloWorldService1a2a3a4b" promote="Component2a3a4b" >
         <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldService1a2a3a4b"/>
     </service>
     <service name="HelloWorldService1a2a3b4a" promote="Component2a3b4a" >
         <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldService1a2a3b4a"/>
     </service>
     <service name="HelloWorldService1a2a3b4b" promote="Component2a3b4b" >
         <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldService1a2a3b4b"/>
     </service>
     <service name="HelloWorldService1a2b3a4a" promote="Component2b3a4a" >
         <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldService1a2b3a4a"/>
     </service>
     <service name="HelloWorldService1a2b3a4b" promote="Component2b3a4b" >
         <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldService1a2b3a4b"/>
     </service>
     <service name="HelloWorldService1a2b3b4a" promote="Component2b3b4a" >
         <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldService1a2b3b4a"/>
     </service>
     <service name="HelloWorldService1a2b3b4b" promote="Component2b3b4b" >
         <interface.java interface="helloworld.HelloWorldService" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldService1a2b3b4b"/>
     </service>
 
     <service name="HelloWorldService1b2a3a4a" promote="Component2a3a4a" >
         <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldService1b2a3a4a"/>
     </service>
     <service name="HelloWorldService1b2a3a4b" promote="Component2a3a4b" >
         <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldService1b2a3a4b"/>
     </service>
     <service name="HelloWorldService1b2a3b4a" promote="Component2a3b4a" >
         <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldService1b2a3b4a"/>
     </service>
     <service name="HelloWorldService1b2a3b4b" promote="Component2a3b4b" >
         <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldService1b2a3b4b"/>
     </service>
     <service name="HelloWorldService1b2b3a4a" promote="Component2b3a4a" >
         <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldService1b2b3a4a"/>
     </service>
     <service name="HelloWorldService1b2b3a4b" promote="Component2b3a4b" >
         <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldService1b2b3a4b"/>
     </service>
     <service name="HelloWorldService1b2b3b4a" promote="Component2b3b4a" >
         <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldService1b2b3b4a"/>
     </service>
     <service name="HelloWorldService1b2b3b4b" promote="Component2b3b4b" >
         <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldService1b2b3b4b"/>
     </service>
 
     <component name="Component2a3a4a">
@@ -167,7 +167,7 @@
     <service name="HelloWorldWebService"  promote="HelloWorldServiceComponent" >
         <!-- interface.java interface="helloworld.HelloWorldService" / -->
         <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"  />
-        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
uri="../HelloWorldWebService"/>
     </service>
 
     <component name="HelloWorldServiceComponent">

Modified: incubator/tuscany/java/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java?view=diff&rev=529798&r1=529797&r2=529798
==============================================================================
--- incubator/tuscany/java/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
(original)
+++ incubator/tuscany/java/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
Tue Apr 17 15:51:23 2007
@@ -36,43 +36,41 @@
  */
 public class WSDLTestCase extends TestCase {
 
-    public void testClient1a2a3a4a()  {
-//        HelloWorldService client = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2a3a4a");
-//        assertEquals("Hi petra", client.getGreetings("petra"));
-//        HelloWorldService client1 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2a3a4b");
-//        assertEquals("Hi petra", client1.getGreetings("petra"));
-//        HelloWorldService client2 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2a3b4a");
-//        assertEquals("Hi petra", client2.getGreetings("petra"));
-//        HelloWorldService client3 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2a3b4b");
-//        assertEquals("Hi petra", client3.getGreetings("petra"));
-//        HelloWorldService client4 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2b3a4a");
-//        assertEquals("Hi petra", client4.getGreetings("petra"));
-//        HelloWorldService client5 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2b3a4b");
-//        assertEquals("Hi petra", client5.getGreetings("petra"));
-//        HelloWorldService client6 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2b3b4a");
-//        assertEquals("Hi petra", client6.getGreetings("petra"));
-//        HelloWorldService client7 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2b3b4b");
-//        assertEquals("Hi petra", client7.getGreetings("petra"));
-//        HelloWorldService client8 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1b2a3a4a");
-//        assertEquals("Hi petra", client8.getGreetings("petra"));
+    public void testAllClients()  {
+        HelloWorldService client = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2a3a4a");
+        assertEquals("Hi petra", client.getGreetings("petra"));
+        HelloWorldService client1 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2a3a4b");
+        assertEquals("Hi petra", client1.getGreetings("petra"));
+        HelloWorldService client2 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2a3b4a");
+        assertEquals("Hi petra", client2.getGreetings("petra"));
+        HelloWorldService client3 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2a3b4b");
+        assertEquals("Hi petra", client3.getGreetings("petra"));
+        HelloWorldService client4 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2b3a4a");
+        assertEquals("Hi petra", client4.getGreetings("petra"));
+        HelloWorldService client5 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2b3a4b");
+        assertEquals("Hi petra", client5.getGreetings("petra"));
+        HelloWorldService client6 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2b3b4a");
+        assertEquals("Hi petra", client6.getGreetings("petra"));
+        HelloWorldService client7 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2b3b4b");
+        assertEquals("Hi petra", client7.getGreetings("petra"));
+        HelloWorldService client8 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1b2a3a4a");
+        assertEquals("Hi petra", client8.getGreetings("petra"));
         HelloWorldService client9 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1b2a3a4b");
         assertEquals("Hi petra", client9.getGreetings("petra"));
-//        HelloWorldService client10 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1b2a3b4a");
-//        assertEquals("Hi petra", client10.getGreetings("petra"));
+        HelloWorldService client10 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1b2a3b4a");
+        assertEquals("Hi petra", client10.getGreetings("petra"));
         HelloWorldService client11 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1b2a3b4b");
         assertEquals("Hi petra", client11.getGreetings("petra"));
-//TODO: TUSCANY-1124 DataBindingInterceptor incorrect when binding.ws wired to java component
using interface.wsdl 
-//     HelloWorldService client12 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1b2b3a4a");
-//      assertEquals("Hi petra", client12.getGreetings("petra"));
-      HelloWorldService client13 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1b2b3a4b");
-      assertEquals("Hi petra", client13.getGreetings("petra"));
-//      HelloWorldService client14 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1b2b3b4a");
-//      assertEquals("Hi petra", client14.getGreetings("petra"));
-      HelloWorldService client15 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1b2b3b4b");
-      assertEquals("Hi petra", client15.getGreetings("petra"));
+        HelloWorldService client12 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1b2b3a4a");
+        assertEquals("Hi petra", client12.getGreetings("petra"));
+        HelloWorldService client13 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1b2b3a4b");
+        assertEquals("Hi petra", client13.getGreetings("petra"));
+        HelloWorldService client14 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1b2b3b4a");
+        assertEquals("Hi petra", client14.getGreetings("petra"));
+        HelloWorldService client15 = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1b2b3b4b");
+        assertEquals("Hi petra", client15.getGreetings("petra"));
     }
 
-    // TODO: TUSCANY-1125, Testcases fail with out of heap space if too many individual test
run in one testcase 
 //    public void testClient1a2a3a4a()  {
 //        HelloWorldService client = CurrentCompositeContext.getContext().locateService(HelloWorldService.class,
"Client1a2a3a4a");
 //        assertEquals("Hi petra", client.getGreetings("petra"));



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message