diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2012-01-26 10:24:43 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2012-01-26 10:24:43 +0000 |
| commit | 12034483696479a360d0f0f0ad6b9ed7f30d8413 (patch) | |
| tree | 423377318732cdf210fea1b3c95c573dc45e98d6 /sca-java-2.x/trunk/testing/itest/ws/wsdlgen | |
| parent | 500df32134a8b61a56326e7527924f8339a4192e (diff) | |
TUSCANY-3800, TUSCANY-3283, TUSCANY-3298 - more wsdlgen updates from 1.x.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1236129 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
5 files changed, 12 insertions, 7 deletions
diff --git a/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/main/java/datatypes/impl/GetDataServiceWithoutExceptionImpl.java b/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/main/java/datatypes/impl/GetDataServiceWithoutExceptionImpl.java index 3b597e9e8e..d28df3fbdd 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/main/java/datatypes/impl/GetDataServiceWithoutExceptionImpl.java +++ b/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/main/java/datatypes/impl/GetDataServiceWithoutExceptionImpl.java @@ -37,7 +37,7 @@ public class GetDataServiceWithoutExceptionImpl implements GetDataServiceWithout public DataObject getMessageSDO(String paramString) {
return null;
}
-
+
public List<DataObject> getMessageListSDOList(String paramString) {
return null;
}
diff --git a/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/main/resources/helloworld.composite index 0f668613d9..52b957d4a6 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/main/resources/helloworld.composite +++ b/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/main/resources/helloworld.composite @@ -27,7 +27,7 @@ <implementation.java class="helloworld.HelloWorldClientImpl" />
<service name="HelloWorldService">
<binding.sca/>
- </service>
+ </service>
<reference name="hwService">
<binding.ws uri="http://localhost:8085/HelloWorldServiceComponent"/>
</reference>
@@ -45,13 +45,11 @@ gen'd WSDL by setting the service interface to the RI WSDL. Tuscany should
generate a WSDL for the component and compare the two for compatibility
-->
-<!--
<component name="HelloWorldServiceCompatibilityComponent">
<implementation.java class="helloworld.HelloWorldImpl" />
<service name="HelloWorldService">
<interface.wsdl interface="http://helloworld/#wsdl.interface(HelloWorldImpl)"/>
- <binding.ws uri="http://localhost:8085/HelloWorldServiceComponent"/>
+ <binding.ws uri="http://localhost:8085/HelloWorldServiceCompatibilityComponent"/>
</service>
</component>
- -->
</composite>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/test/java/datatypes/DataTypesTestCase.java b/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/test/java/datatypes/DataTypesTestCase.java index 7132e6a77e..75a4c300b4 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/test/java/datatypes/DataTypesTestCase.java +++ b/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/test/java/datatypes/DataTypesTestCase.java @@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals; *
* @version $Rev: 814373 $ $Date: 2009-09-13 19:06:29 +0100 (Sun, 13 Sep 2009) $
*/
-@Ignore("In the process of porting from 1.x")
+//@Ignore("In the process of porting from 1.x")
public class DataTypesTestCase extends BaseFramework {
@Test
diff --git a/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/test/java/datatypes/DynamicSDOTestCase.java b/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/test/java/datatypes/DynamicSDOTestCase.java index 4a621c7498..1254d147ee 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/test/java/datatypes/DynamicSDOTestCase.java +++ b/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/test/java/datatypes/DynamicSDOTestCase.java @@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals; *
* @version $Rev: 814373 $ $Date: 2009-09-13 19:06:29 +0100 (Sun, 13 Sep 2009) $
*/
-@Ignore("In the process of porting from 1.x")
+//@Ignore("In the process of porting from 1.x")
public class DynamicSDOTestCase extends BaseFramework {
@Test
diff --git a/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/test/java/helloworld/WSDLGenTestCase.java b/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/test/java/helloworld/WSDLGenTestCase.java index 6fb6d89068..7fabf4cc92 100644 --- a/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/test/java/helloworld/WSDLGenTestCase.java +++ b/sca-java-2.x/trunk/testing/itest/ws/wsdlgen/src/test/java/helloworld/WSDLGenTestCase.java @@ -86,6 +86,13 @@ public class WSDLGenTestCase{ abean.setField3(bbean);
assertEquals("Hello Hello 3 4 1 2", helloWorldClient.getGreetingsDBean(abean));
+
+ try {
+ helloWorldClient.getGreetingsException("Fred");
+ fail("exception not returned");
+ } catch(Exception ex) {
+
+ }
}
@Test
|