summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.x/itest/validation/src
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2009-09-13 22:01:04 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2009-09-13 22:01:04 +0000
commit946292048c3c76c0fbc0d0f54fd52598bce6e305 (patch)
tree5838be1070740e351c0fb7c3c1ecbaecdb97ccbc /branches/sca-java-1.x/itest/validation/src
parent47cb8396ed8b45189c38990a27e3145f5a61c6b4 (diff)
Copy r797997, r798040 and r798050 changes from 1.5.1 branch to 1.x branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@814393 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/itest/validation/src')
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java2
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
index 94e11f9590..61c30913cf 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
@@ -54,7 +54,7 @@ public class DuplicateReferenceNameTestCase extends TestCase {
node.start();
calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
} catch (ServiceRuntimeException ex) {
- if (ex.getMessage().equals("org.osoa.sca.ServiceRuntimeException: Duplicate component reference name: Component = CalculatorServiceComponent Reference = addService")){
+ if (ex.getMessage().equals("org.apache.tuscany.sca.monitor.MonitorRuntimeException: Duplicate component reference name: Component = CalculatorServiceComponent Reference = addService")){
duplicateReferenceException = true;
}
}
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
index 60b08764c1..91c7e41e9e 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
@@ -60,7 +60,7 @@ public class XSDValidationTestCase extends TestCase {
public void testCalculator() throws Exception {
- assertEquals("org.osoa.sca.ServiceRuntimeException: Unexpected <binding> element found. It should appear inside a <service> or <reference> element.", startUpException.getMessage());
+ assertEquals("org.apache.tuscany.sca.monitor.MonitorRuntimeException: Unexpected <binding> element found. It should appear inside a <service> or <reference> element.", startUpException.getMessage());
}