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-06-28 11:01:55 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-06-28 11:01:55 +0000
commit01fbb79ad9521780dab73a7e3f17edf5bb6cc8b8 (patch)
treeadf48b8497400ebf6f81f7116835837c18255354 /sca-java-2.x/trunk/modules/domain-node/src/test
parentc593560785fbf06aff009e3a84470cb782004525 (diff)
More updates for new names
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@958541 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.java4
-rw-r--r--sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java (renamed from sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/Section10TestCase.java)23
2 files changed, 17 insertions, 10 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 3937c9f658..08b2e8ce5d 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
@@ -44,7 +44,7 @@ public class DeployerTestCase {
@Test
public void testInstalledContribution() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException, MalformedURLException {
- Node section10 = NodeFactory.createSection10();
+ Node section10 = NodeFactory.createNode();
Deployer deployer = section10.getDeployer();
Monitor monitor = deployer.createMonitor();
@@ -59,7 +59,7 @@ public class DeployerTestCase {
@Test
public void testAddDeploymentComposite() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException, MalformedURLException, XMLStreamException {
- Node section10 = NodeFactory.createSection10();
+ Node section10 = NodeFactory.createNode();
section10.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/Section10TestCase.java b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java
index f87b910f7a..b92ebb39ce 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/Section10TestCase.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java
@@ -34,11 +34,11 @@ import org.junit.Test;
import org.oasisopen.sca.NoSuchDomainException;
import org.oasisopen.sca.NoSuchServiceException;
-public class Section10TestCase {
+public class NodeTestCase {
@Test
public void testInstallDeployable() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException {
- Node section10 = NodeFactory.createSection10();
+ Node section10 = NodeFactory.createNode();
section10.installContribution("helloworld", "src/test/resources/sample-helloworld.jar", null, null, true);
// Helloworld helloworldService = section10.getService(Helloworld.class, "HelloworldComponent");
@@ -48,7 +48,7 @@ public class Section10TestCase {
@Ignore("TODO: fails with Sun JDK due to SCA properties issue")
@Test
public void testInstallWithDependent() throws NoSuchServiceException, ContributionReadException, ActivationException, ValidationException {
- Node section10 = NodeFactory.createSection10();
+ 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);
@@ -58,7 +58,7 @@ public class Section10TestCase {
@Test
public void testInstallNoDeployable() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException {
- Node section10 = NodeFactory.createSection10();
+ Node section10 = NodeFactory.createNode();
section10.installContribution("helloworld", "src/test/resources/sample-helloworld-nodeployable.jar", null, null, true);
// SCAClientFactory scaClientFactory = section10.getSCAClientFactory();
@@ -76,7 +76,7 @@ public class Section10TestCase {
@Test
public void testGetInstalledContributions() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException {
- Node section10 = NodeFactory.createSection10();
+ Node section10 = NodeFactory.createNode();
section10.installContribution("foo", "src/test/resources/sample-helloworld-nodeployable.jar", null, null, true);
List<String> ics = section10.getInstalledContributions();
Assert.assertEquals(1, ics.size());
@@ -85,7 +85,7 @@ public class Section10TestCase {
@Test
public void testGetDeployedCompostes() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, MalformedURLException, ActivationException, ValidationException {
- Node section10 = NodeFactory.createSection10();
+ Node section10 = NodeFactory.createNode();
section10.installContribution("foo", "src/test/resources/sample-helloworld.jar", null, null, true);
List<String> dcs = section10.getDeployedCompostes("foo");
Assert.assertEquals(1, dcs.size());
@@ -94,7 +94,7 @@ public class Section10TestCase {
@Test
public void testRemoveComposte() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, MalformedURLException, ActivationException, ValidationException {
- Node section10 = NodeFactory.createSection10();
+ Node section10 = NodeFactory.createNode();
section10.installContribution("foo", "src/test/resources/sample-helloworld.jar", null, null, true);
section10.removeFromDomainLevelComposite("foo/helloworld.composite");
List<String> dcs = section10.getDeployedCompostes("foo");
@@ -103,7 +103,7 @@ public class Section10TestCase {
@Test
public void testInstallWithMetaData() throws ContributionReadException, ActivationException, ValidationException {
- Node section10 = NodeFactory.createSection10();
+ Node section10 = NodeFactory.createNode();
((NodeImpl)section10).installContribution("helloworld", "src/test/resources/sample-helloworld-nodeployable.jar", "src/test/resources/sca-contribution-generated.xml", null, true);
List<String> dcs = section10.getDeployedCompostes("helloworld");
@@ -113,4 +113,11 @@ public class Section10TestCase {
// Helloworld helloworldService = scaClientFactory.getService(Helloworld.class, "HelloworldComponent");
// Assert.assertEquals("Hello petra", helloworldService.sayHello("petra"));
}
+
+ @Test
+ public void testURI() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException {
+ Node section10 = NodeFactory.createNode();
+ String uri = section10.installContribution("src/test/resources/sample-helloworld.jar");
+ Assert.assertEquals("sample-helloworld", uri);
+ }
}