From 47f6879e357c5f878e3e43164e243cd41e056df0 Mon Sep 17 00:00:00 2001 From: slaws Date: Tue, 13 Jul 2010 09:12:08 +0000 Subject: TUSCANY-3616 - Add code to check that that interface contracts a reference and reference binding and at service and service binding match. Motivated by BWS_2007. TO do this properly we have to test that the interfaces are described using the same IDL and if not convert to WSDL1.1 are required by the SCA specifications. There are a lot of changes here as doing this upset quite a few tests. Further work is required to look at the details of our WSDL generation process which looks a little suspect around wrapper namespaces. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@963624 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tuscany/sca/itest/interfaces/LocalClientComponent.java | 6 +++--- .../tuscany/sca/itest/interfaces/LocalClientComponentImpl.java | 6 +++--- .../org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'sca-java-2.x/trunk/itest/interfaces') diff --git a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java index 5fc9ed51b3..3c7a398abd 100644 --- a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java +++ b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java @@ -28,11 +28,11 @@ public interface LocalClientComponent { String foo1(ParameterObject po); - String foo1(String str) throws Exception; + String foo2(String str) throws Exception; - String foo2(String str, int i); + String foo3(String str, int i); - String foo2(int i, String str) throws Exception; + String foo4(int i, String str) throws Exception; void callback(String str); diff --git a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java index 6cd937af12..fc88c4f119 100644 --- a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java +++ b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java @@ -35,15 +35,15 @@ public class LocalClientComponentImpl implements LocalClientComponent, LocalCall return "AComponent"; } - public String foo1(String str) throws Exception { + public String foo2(String str) throws Exception { return str + "AComponent"; } - public String foo2(String str, int i) { + public String foo3(String str, int i) { return str + "AComponent" + i; } - public String foo2(int i, String str) throws Exception { + public String foo4(int i, String str) throws Exception { return str + "AComponent" + i; } diff --git a/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java b/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java index d7ceeda6b6..d04351f51e 100644 --- a/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java +++ b/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java @@ -60,10 +60,10 @@ public class InterfacesTestCase { assertEquals("AComponent", local.foo1(po)); assertEquals("AComponent", po.field1); - assertEquals("AAComponent", local.foo1("A")); + assertEquals("AAComponent", local.foo2("A")); - assertEquals("AAComponent1", local.foo2("A", 1)); - assertEquals("AAComponent1", local.foo2(1, "A")); + assertEquals("AAComponent1", local.foo3("A", 1)); + assertEquals("AAComponent1", local.foo4(1, "A")); } catch (Exception e) { fail(); } -- cgit v1.2.3