summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/testing
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2012-02-21 11:29:58 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2012-02-21 11:29:58 +0000
commite4d4979293ce33727d6867b7304ab5c693af39ba (patch)
treed4a633a098500fb272147dd36833ea471bfc47af /sca-java-2.x/trunk/testing
parent02951937a75982962471a0b77a99ce1e179832bd (diff)
TUSCANY-4005 - swap the test around so that the code that raises an error if a reference target containing only a component name matches a component with multiple services comes after the code that matches interfaces and policy
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1291714 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/testing')
-rw-r--r--sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/HelloworldServiceAgain.java2
-rw-r--r--sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceClientImpl.java2
-rw-r--r--sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceImpl.java3
3 files changed, 2 insertions, 5 deletions
diff --git a/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/HelloworldServiceAgain.java b/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/HelloworldServiceAgain.java
index 614232c01e..e3205559d2 100644
--- a/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/HelloworldServiceAgain.java
+++ b/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/HelloworldServiceAgain.java
@@ -20,6 +20,6 @@ package itest;
public interface HelloworldServiceAgain {
- String sayHelloAgain(String name);
+ String sayHello(String name);
}
diff --git a/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceClientImpl.java b/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceClientImpl.java
index 9313500e72..f2617d8a7c 100644
--- a/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceClientImpl.java
+++ b/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceClientImpl.java
@@ -32,7 +32,7 @@ public class MultipleServiceClientImpl implements HelloworldService {
public HelloworldServiceAgain helloWorld;
public String sayHello(String name) {
- return "Hello " + helloWorld.sayHelloAgain(name);
+ return "Hello " + helloWorld.sayHello(name);
}
}
diff --git a/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceImpl.java b/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceImpl.java
index a7001c327d..6dab51f527 100644
--- a/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceImpl.java
+++ b/sca-java-2.x/trunk/testing/itest/scaclient-api/src/main/java/itest/MultipleServiceImpl.java
@@ -31,7 +31,4 @@ public class MultipleServiceImpl implements HelloworldService, HelloworldService
return "Hello " + name;
}
- public String sayHelloAgain(String name) {
- return "Hello again " + name;
- }
}