From 355268626d0493523956137113a8e61dcf615e46 Mon Sep 17 00:00:00 2001 From: antelder Date: Sat, 3 Jul 2010 06:30:18 +0000 Subject: Clean up factory instantiation, add a static helper to create simple nodes, and update impl to correctly resolve dependencies for installed contributions git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@960160 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tuscany/sca/node2/DeployerTestCase.java | 4 +- .../org/apache/tuscany/sca/node2/NodeTestCase.java | 72 ++++++++++++++-------- 2 files changed, 48 insertions(+), 28 deletions(-) (limited to 'sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany') 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 3fa60ca3ca..c66e1cacaa 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 @@ -42,7 +42,7 @@ public class DeployerTestCase { @Test public void testInstalledContribution() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException, MalformedURLException { - NodeFactory nodeFactory = new NodeFactory(); + NodeFactory nodeFactory = NodeFactory.newInstance(); Node node = nodeFactory.createNode("myDomain"); Deployer deployer = nodeFactory.getDeployer(); @@ -58,7 +58,7 @@ public class DeployerTestCase { @Test public void testAddDeploymentComposite() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException, MalformedURLException, XMLStreamException { - NodeFactory nodeFactory = new NodeFactory(); + NodeFactory nodeFactory = NodeFactory.newInstance(); Node node = nodeFactory.createNode("myDomain"); node.installContribution("foo", "src/test/resources/sample-helloworld-nodeployable.jar", null, null, true); 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 b92ebb39ce..9c19e3a8c4 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 @@ -38,30 +38,30 @@ public class NodeTestCase { @Test public void testInstallDeployable() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node section10 = NodeFactory.createNode(); - section10.installContribution("helloworld", "src/test/resources/sample-helloworld.jar", null, null, true); + Node node = NodeFactory.newInstance().createNode("default"); + node.installContribution("helloworld", "src/test/resources/sample-helloworld.jar", null, null, true); -// Helloworld helloworldService = section10.getService(Helloworld.class, "HelloworldComponent"); +// Helloworld helloworldService = node.getService(Helloworld.class, "HelloworldComponent"); // Assert.assertEquals("Hello petra", helloworldService.sayHello("petra")); } @Ignore("TODO: fails with Sun JDK due to SCA properties issue") @Test public void testInstallWithDependent() throws NoSuchServiceException, ContributionReadException, ActivationException, ValidationException { - Node section10 = NodeFactory.createNode(); - section10.installContribution("store", "/Tuscany/svn/2.x-trunk/itest/T3558/src/test/resources/sample-store.jar", null, null, true); - section10.installContribution("store-client", "/Tuscany/svn/2.x-trunk/itest/T3558/src/test/resources/sample-store-client.jar", null, null, true); + Node node = NodeFactory.newInstance().createNode("default"); + node.installContribution("store", "/Tuscany/svn/2.x-trunk/itest/T3558/src/test/resources/sample-store.jar", null, null, true); + node.installContribution("store-client", "/Tuscany/svn/2.x-trunk/itest/T3558/src/test/resources/sample-store-client.jar", null, null, true); -// Helloworld helloworldService = section10.getService(Helloworld.class, "HelloworldComponent"); +// Helloworld helloworldService = node.getService(Helloworld.class, "HelloworldComponent"); // Assert.assertEquals("Hello petra", helloworldService.sayHello("petra")); } @Test public void testInstallNoDeployable() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node section10 = NodeFactory.createNode(); - section10.installContribution("helloworld", "src/test/resources/sample-helloworld-nodeployable.jar", null, null, true); + Node node = NodeFactory.newInstance().createNode("default"); + node.installContribution("helloworld", "src/test/resources/sample-helloworld-nodeployable.jar", null, null, true); -// SCAClientFactory scaClientFactory = section10.getSCAClientFactory(); +// SCAClientFactory scaClientFactory = node.getSCAClientFactory(); // try { // scaClientFactory.getService(Helloworld.class, "HelloworldComponent"); // Assert.fail(); @@ -69,44 +69,44 @@ public class NodeTestCase { // // expected as there is no deployables // } - section10.addToDomainLevelComposite("helloworld" + "/helloworld.composite"); + node.addToDomainLevelComposite("helloworld" + "/helloworld.composite"); // Helloworld helloworldService = scaClientFactory.getService(Helloworld.class, "HelloworldComponent"); // Assert.assertEquals("Hello petra", helloworldService.sayHello("petra")); } @Test public void testGetInstalledContributions() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node section10 = NodeFactory.createNode(); - section10.installContribution("foo", "src/test/resources/sample-helloworld-nodeployable.jar", null, null, true); - List ics = section10.getInstalledContributions(); + Node node = NodeFactory.newInstance().createNode("default"); + node.installContribution("foo", "src/test/resources/sample-helloworld-nodeployable.jar", null, null, true); + List ics = node.getInstalledContributions(); Assert.assertEquals(1, ics.size()); Assert.assertEquals("foo", ics.get(0)); } @Test public void testGetDeployedCompostes() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, MalformedURLException, ActivationException, ValidationException { - Node section10 = NodeFactory.createNode(); - section10.installContribution("foo", "src/test/resources/sample-helloworld.jar", null, null, true); - List dcs = section10.getDeployedCompostes("foo"); + Node node = NodeFactory.newInstance().createNode("default"); + node.installContribution("foo", "src/test/resources/sample-helloworld.jar", null, null, true); + List dcs = node.getDeployedCompostes("foo"); Assert.assertEquals(1, dcs.size()); Assert.assertEquals("foo/helloworld.composite", dcs.get(0)); } @Test public void testRemoveComposte() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, MalformedURLException, ActivationException, ValidationException { - Node section10 = NodeFactory.createNode(); - section10.installContribution("foo", "src/test/resources/sample-helloworld.jar", null, null, true); - section10.removeFromDomainLevelComposite("foo/helloworld.composite"); - List dcs = section10.getDeployedCompostes("foo"); + Node node = NodeFactory.newInstance().createNode("default"); + node.installContribution("foo", "src/test/resources/sample-helloworld.jar", null, null, true); + node.removeFromDomainLevelComposite("foo/helloworld.composite"); + List dcs = node.getDeployedCompostes("foo"); Assert.assertEquals(0, dcs.size()); } @Test public void testInstallWithMetaData() throws ContributionReadException, ActivationException, ValidationException { - Node section10 = NodeFactory.createNode(); - ((NodeImpl)section10).installContribution("helloworld", "src/test/resources/sample-helloworld-nodeployable.jar", "src/test/resources/sca-contribution-generated.xml", null, true); + 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 = section10.getDeployedCompostes("helloworld"); + List dcs = node.getDeployedCompostes("helloworld"); Assert.assertEquals(1, dcs.size()); Assert.assertEquals("helloworld/helloworld.composite", dcs.get(0)); @@ -116,8 +116,28 @@ public class NodeTestCase { @Test public void testURI() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException { - Node section10 = NodeFactory.createNode(); - String uri = section10.installContribution("src/test/resources/sample-helloworld.jar"); + Node node = NodeFactory.newInstance().createNode("default"); + String uri = node.installContribution("src/test/resources/sample-helloworld.jar"); Assert.assertEquals("sample-helloworld", uri); } + + @Test + public void testStaticCreate() { + Node node = NodeFactory.createNode("helloworld.composite", "src/test/resources/sample-helloworld.jar"); + List cs = node.getInstalledContributions(); + Assert.assertEquals(1, cs.size()); + List dcs = node.getDeployedCompostes(cs.get(0)); + Assert.assertEquals(1, dcs.size()); + Assert.assertEquals("sample-helloworld/helloworld.composite", dcs.get(0)); + } + + @Test + public void testStaticCreateWithNullComposite() { + Node node = NodeFactory.createNode(null, "src/test/resources/sample-helloworld.jar"); + List cs = node.getInstalledContributions(); + Assert.assertEquals(1, cs.size()); + List dcs = node.getDeployedCompostes(cs.get(0)); + Assert.assertEquals(1, dcs.size()); + Assert.assertEquals("sample-helloworld/helloworld.composite", dcs.get(0)); + } } -- cgit v1.2.3