From ab6fca3a55bb4aa52c57a0c34a64b16b4371e2de Mon Sep 17 00:00:00 2001 From: antelder Date: Sat, 27 Nov 2010 10:21:07 +0000 Subject: Comment out the updateXxx methods for now as its not clear what they should do, and rename getDeployedComposites and getInstalledContributions to make it clearer what they do git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1039643 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tuscany/sca/node2/DeployerTestCase.java | 4 ++-- .../java/org/apache/tuscany/sca/node2/NodeTestCase.java | 16 ++++++++-------- .../org/apache/tuscany/sca/node2/NodeXMLTestCase.java | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'sca-java-2.x/trunk/modules/domain-node/src/test/java/org') 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 9c4de1c2bd..40509337c8 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 @@ -51,7 +51,7 @@ public class DeployerTestCase { monitor.analyzeProblems(); node.installContribution(contribution, null, true); - List ics = node.getInstalledContributions(); + List ics = node.getInstalledContributionURIs(); Assert.assertEquals(1, ics.size()); Assert.assertEquals("foo", ics.get(0)); } @@ -69,7 +69,7 @@ public class DeployerTestCase { monitor.analyzeProblems(); composite.setURI("helloworld2.composite"); node.start("foo", composite); - List dcs = node.getDeployedComposites("foo"); + List dcs = node.getStartedCompositeURIs("foo"); Assert.assertEquals(1, dcs.size()); 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 f050ad36a1..6637f05979 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 @@ -76,7 +76,7 @@ public class NodeTestCase { public void testGetInstalledContributions() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { Node node = NodeFactory.newInstance().createNode("default"); node.installContribution("foo", "src/test/resources/sample-helloworld-nodeployable.jar", null, null, true); - List ics = node.getInstalledContributions(); + List ics = node.getInstalledContributionURIs(); Assert.assertEquals(1, ics.size()); Assert.assertEquals("foo", ics.get(0)); } @@ -85,7 +85,7 @@ public class NodeTestCase { public void testGetDeployedCompostes() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, MalformedURLException, ActivationException, ValidationException { Node node = NodeFactory.newInstance().createNode("default"); node.installContribution("foo", "src/test/resources/sample-helloworld.jar", null, null, true); - List dcs = node.getDeployedComposites("foo"); + List dcs = node.getStartedCompositeURIs("foo"); Assert.assertEquals(1, dcs.size()); Assert.assertEquals("helloworld.composite", dcs.get(0)); } @@ -95,7 +95,7 @@ public class NodeTestCase { Node node = NodeFactory.newInstance().createNode("default"); node.installContribution("foo", "src/test/resources/sample-helloworld.jar", null, null, true); node.stop("foo", "helloworld.composite"); - List dcs = node.getDeployedComposites("foo"); + List dcs = node.getStartedCompositeURIs("foo"); Assert.assertEquals(0, dcs.size()); } @@ -104,7 +104,7 @@ public class NodeTestCase { Node node = NodeFactory.newInstance().createNode("default"); ((NodeImpl)node).installContribution("helloworld", "src/test/resources/sample-helloworld-nodeployable.jar", "src/test/resources/sca-contribution-generated.xml", null, true); - List dcs = node.getDeployedComposites("helloworld"); + List dcs = node.getStartedCompositeURIs("helloworld"); Assert.assertEquals(1, dcs.size()); Assert.assertEquals("helloworld.composite", dcs.get(0)); @@ -122,9 +122,9 @@ public class NodeTestCase { @Test public void testStaticCreate() { Node node = NodeFactory.newStandaloneNode("helloworld.composite", "src/test/resources/sample-helloworld.jar"); - List cs = node.getInstalledContributions(); + List cs = node.getInstalledContributionURIs(); Assert.assertEquals(1, cs.size()); - List dcs = node.getDeployedComposites(cs.get(0)); + List dcs = node.getStartedCompositeURIs(cs.get(0)); Assert.assertEquals(1, dcs.size()); Assert.assertEquals("helloworld.composite", dcs.get(0)); } @@ -132,9 +132,9 @@ public class NodeTestCase { @Test public void testStaticCreateWithNullComposite() { Node node = NodeFactory.newStandaloneNode(null, "src/test/resources/sample-helloworld.jar"); - List cs = node.getInstalledContributions(); + List cs = node.getInstalledContributionURIs(); Assert.assertEquals(1, cs.size()); - List dcs = node.getDeployedComposites(cs.get(0)); + List dcs = node.getStartedCompositeURIs(cs.get(0)); Assert.assertEquals(1, dcs.size()); Assert.assertEquals("helloworld.composite", dcs.get(0)); } diff --git a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeXMLTestCase.java b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeXMLTestCase.java index 110fbfd49e..5e265a0c8a 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeXMLTestCase.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeXMLTestCase.java @@ -33,10 +33,10 @@ public class NodeXMLTestCase { public void testHelloworldXML() throws ContributionReadException, ActivationException, ValidationException { Node node = NodeFactory.newInstance().createNodeFromXML("src/test/resources/helloworldNode.xml"); Assert.assertEquals("helloworld", node.getDomainName()); - List cs = node.getInstalledContributions(); + List cs = node.getInstalledContributionURIs(); Assert.assertEquals(1, cs.size()); Assert.assertEquals("sample-helloworld", cs.get(0)); - List compsoites = node.getDeployedComposites("sample-helloworld"); + List compsoites = node.getStartedCompositeURIs("sample-helloworld"); Assert.assertEquals(1, compsoites.size()); Assert.assertEquals("helloworld.composite", compsoites.get(0)); } -- cgit v1.2.3