summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-08-02 13:01:34 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-08-02 13:01:34 +0000
commit40dc8658b2cbf5856b5588a57ddcce62f46b1262 (patch)
treeab236c7a8ad3cd2dbb9534a166dac25436e8fbd2
parent96934d78d97077accdc392e858a3824d40e27cc1 (diff)
Remove the @IGnore from a test of a contribution which was using the data api, and updates for tests to use the new createStandaloneNode method
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@981497 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java8
1 files changed, 2 insertions, 6 deletions
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 d82287926b..eb1dd704ee 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
@@ -25,11 +25,8 @@ import junit.framework.Assert;
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import org.apache.tuscany.sca.monitor.ValidationException;
-import org.apache.tuscany.sca.node2.Node;
-import org.apache.tuscany.sca.node2.NodeFactory;
import org.apache.tuscany.sca.node2.impl.NodeImpl;
import org.apache.tuscany.sca.runtime.ActivationException;
-import org.junit.Ignore;
import org.junit.Test;
import org.oasisopen.sca.NoSuchDomainException;
import org.oasisopen.sca.NoSuchServiceException;
@@ -45,7 +42,6 @@ public class NodeTestCase {
// 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 node = NodeFactory.newInstance().createNode("default");
@@ -123,7 +119,7 @@ public class NodeTestCase {
@Test
public void testStaticCreate() {
- Node node = NodeFactory.createNode("helloworld.composite", "src/test/resources/sample-helloworld.jar");
+ Node node = NodeFactory.createStandaloneNode("helloworld.composite", "src/test/resources/sample-helloworld.jar");
List<String> cs = node.getInstalledContributions();
Assert.assertEquals(1, cs.size());
List<String> dcs = node.getDeployedCompostes(cs.get(0));
@@ -133,7 +129,7 @@ public class NodeTestCase {
@Test
public void testStaticCreateWithNullComposite() {
- Node node = NodeFactory.createNode(null, "src/test/resources/sample-helloworld.jar");
+ Node node = NodeFactory.createStandaloneNode(null, "src/test/resources/sample-helloworld.jar");
List<String> cs = node.getInstalledContributions();
Assert.assertEquals(1, cs.size());
List<String> dcs = node.getDeployedCompostes(cs.get(0));