summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/domain-node/src/test
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-07-05 18:59:18 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-07-05 18:59:18 +0000
commitd5bbdc51613f32dde2f8a4150443502f24dfb502 (patch)
tree529bc38162bba6d579f3a5fbce09f30182f9d096 /sca-java-2.x/trunk/modules/domain-node/src/test
parent31618013e7d0fc29de84aa2d38126f295886c1c8 (diff)
Change getDeployedComposites to return the composite relative uri instead of the absolute uri
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@960659 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/domain-node/src/test')
-rw-r--r--sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/DeployerTestCase.java2
-rw-r--r--sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java8
2 files changed, 5 insertions, 5 deletions
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/DeployerTestCase.java b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/DeployerTestCase.java
index c66e1cacaa..450e5a8b3e 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/DeployerTestCase.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/DeployerTestCase.java
@@ -71,7 +71,7 @@ public class DeployerTestCase {
node.addDeploymentComposite("foo", composite);
List<String> dcs = node.getDeployedCompostes("foo");
Assert.assertEquals(1, dcs.size());
- Assert.assertEquals("foo/helloworld2.composite", dcs.get(0));
+ Assert.assertEquals("helloworld2.composite", dcs.get(0));
}
}
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java
index 9c19e3a8c4..d82287926b 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java
@@ -89,7 +89,7 @@ public class NodeTestCase {
node.installContribution("foo", "src/test/resources/sample-helloworld.jar", null, null, true);
List<String> dcs = node.getDeployedCompostes("foo");
Assert.assertEquals(1, dcs.size());
- Assert.assertEquals("foo/helloworld.composite", dcs.get(0));
+ Assert.assertEquals("helloworld.composite", dcs.get(0));
}
@Test
@@ -108,7 +108,7 @@ public class NodeTestCase {
List<String> dcs = node.getDeployedCompostes("helloworld");
Assert.assertEquals(1, dcs.size());
- Assert.assertEquals("helloworld/helloworld.composite", dcs.get(0));
+ Assert.assertEquals("helloworld.composite", dcs.get(0));
// Helloworld helloworldService = scaClientFactory.getService(Helloworld.class, "HelloworldComponent");
// Assert.assertEquals("Hello petra", helloworldService.sayHello("petra"));
@@ -128,7 +128,7 @@ public class NodeTestCase {
Assert.assertEquals(1, cs.size());
List<String> dcs = node.getDeployedCompostes(cs.get(0));
Assert.assertEquals(1, dcs.size());
- Assert.assertEquals("sample-helloworld/helloworld.composite", dcs.get(0));
+ Assert.assertEquals("helloworld.composite", dcs.get(0));
}
@Test
@@ -138,6 +138,6 @@ public class NodeTestCase {
Assert.assertEquals(1, cs.size());
List<String> dcs = node.getDeployedCompostes(cs.get(0));
Assert.assertEquals(1, dcs.size());
- Assert.assertEquals("sample-helloworld/helloworld.composite", dcs.get(0));
+ Assert.assertEquals("helloworld.composite", dcs.get(0));
}
}