Author: slaws
Date: Wed Apr 27 10:23:03 2011
New Revision: 1097065
URL: http://svn.apache.org/viewvc?rev=1097065&view=rev
Log:
Fix up the tests to use the iface contribution appropriately
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java?rev=1097065&r1=1097064&r2=1097065&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java
Wed Apr 27 10:23:03 2011
@@ -45,8 +45,9 @@ public class ClientTestCase{
@BeforeClass
public static void setUpBeforeClass() throws Exception {
node = TuscanyRuntime.newInstance().createNode(domainURI);
+ node.installContribution("../helloworld-iface/target/classes");
node.installContribution("../helloworld-service/target/classes");
- node.installContribution("../helloworld-client/target/classes");
+ node.installContribution("../helloworld-client/target/classes");
}
@Test
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java?rev=1097065&r1=1097064&r2=1097065&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java
Wed Apr 27 10:23:03 2011
@@ -42,7 +42,7 @@ public class OneNodeTestCase{
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- node = NodeFactory.getInstance().createNode(domainURI,
"../helloworld-service/target/classes", "../helloworld-client/target/classes");
+ node = NodeFactory.getInstance().createNode(domainURI,
"../helloworld-service/target/classes", "../helloworld-client/target/classes",
"../helloworld-iface/target/classes");
node.start();
}
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java?rev=1097065&r1=1097064&r2=1097065&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java
Wed Apr 27 10:23:03 2011
@@ -43,9 +43,9 @@ public class TwoNodeTestCase{
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- serviceNode = NodeFactory.getInstance().createNode(domainURI,
"../helloworld-service/target/classes");
+ serviceNode = NodeFactory.getInstance().createNode(domainURI,
"../helloworld-service/target/classes", "../helloworld-iface/target/classes");
serviceNode.start();
- clientNode = NodeFactory.getInstance().createNode(domainURI,
"../helloworld-client/target/classes");
+ clientNode = NodeFactory.getInstance().createNode(domainURI,
"../helloworld-client/target/classes", "../helloworld-iface/target/classes");
clientNode.start();
}
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java?rev=1097065&r1=1097064&r2=1097065&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
Wed Apr 27 10:23:03 2011
@@ -43,10 +43,10 @@ public class TwoRemoteNodesTestCase{
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- serviceNode =
NodeFactory.newInstance().createNode(URI.create("tuscany:TwoRemoteNodesTestCase"),
"../helloworld-service/target/classes");
+ serviceNode =
NodeFactory.newInstance().createNode(URI.create("tuscany:TwoRemoteNodesTestCase"),
"../helloworld-service/target/classes", "../helloworld-iface/target/classes");
serviceNode.start();
- clientNode =
NodeFactory.getInstance().createNode(URI.create("tuscany:TwoRemoteNodesTestCase"),
"../helloworld-client/target/classes");
+ clientNode =
NodeFactory.getInstance().createNode(URI.create("tuscany:TwoRemoteNodesTestCase"),
"../helloworld-client/target/classes", "../helloworld-iface/target/classes");
clientNode.start();
}
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java?rev=1097065&r1=1097064&r2=1097065&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java
Wed Apr 27 10:23:03 2011
@@ -42,7 +42,7 @@ public class OneNodeTestCase{
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- node = NodeFactory.getInstance().createNode(domainURI,
"../helloworld-service/target/classes", "../helloworld-client/target/classes");
+ node = NodeFactory.getInstance().createNode(domainURI,
"../helloworld-service/target/classes", "../helloworld-client/target/classes",
"../helloworld-iface/target/classes");
node.start();
}
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java?rev=1097065&r1=1097064&r2=1097065&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java
Wed Apr 27 10:23:03 2011
@@ -43,9 +43,9 @@ public class TwoNodeTestCase{
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- serviceNode = NodeFactory.getInstance().createNode(domainURI,
"../helloworld-service/target/classes");
+ serviceNode = NodeFactory.getInstance().createNode(domainURI,
"../helloworld-service/target/classes", "../helloworld-iface/target/classes");
serviceNode.start();
- clientNode = NodeFactory.getInstance().createNode(domainURI,
"../helloworld-client/target/classes");
+ clientNode = NodeFactory.getInstance().createNode(domainURI,
"../helloworld-client/target/classes", "../helloworld-iface/target/classes");
clientNode.start();
}
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java?rev=1097065&r1=1097064&r2=1097065&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
Wed Apr 27 10:23:03 2011
@@ -45,6 +45,7 @@ public class OneNodeTestCase{
System.setProperty("org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint.enabled",
"false");
NodeFactory factory = NodeFactory.newInstance();
node = factory.createNode(
+ new Contribution("iface", getJar("../helloworld-iface/target")),
new Contribution("service",
getJar("../helloworld-service/target")),
new Contribution("client",
getJar("../helloworld-client/target")));
node.start();
