summaryrefslogtreecommitdiffstats
path: root/java/sca/itest/callback-api/src
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2008-12-05 00:48:31 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2008-12-05 00:48:31 +0000
commitf44c07576a61f6f4915ea8fd2aa5af9fee71745f (patch)
treeda023390d4bb97f353cdff9e6ca11a3f2eb9236b /java/sca/itest/callback-api/src
parent10a9f2e5c0be26d6a44f1f90b677b9c5b7f985a9 (diff)
Convert, clean and bring up a set of itests
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723537 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/itest/callback-api/src')
-rw-r--r--java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java3
-rw-r--r--java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java40
2 files changed, 25 insertions, 18 deletions
diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
index 274984abb3..0535ceb826 100644
--- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
@@ -18,8 +18,7 @@
*/
package org.apache.tuscany.sca.test;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
diff --git a/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
index 9471049c74..75fab95efb 100644
--- a/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
+++ b/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
@@ -18,13 +18,17 @@
*/
package org.apache.tuscany.sca.test;
-import junit.framework.TestCase;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+public class CallBackApiTestCase {
-public class CallBackApiTestCase extends TestCase {
-
- private static SCADomain domain;
+ private static Node node;
private CallBackApiClient aCallBackClient;
/**
@@ -35,28 +39,32 @@ public class CallBackApiTestCase extends TestCase {
* 2. Test in which the target does not call back to the client <br>
* 3. Test in which the target calls back multiple times to the client.
*/
+ @Test
public void testCallBackBasic() {
+ aCallBackClient = node.getService(CallBackApiClient.class, "CallBackApiClient");
aCallBackClient.run();
}
/**
- * This function creates the SCADomain instance and gets an Instance of CallBackApiClient.class
+ * This function creates the Node instance and gets an Instance of CallBackApiClient.class
*/
- @Override
- protected void setUp() throws Exception {
- if (domain == null) {
- domain = SCADomain.newInstance("CallBackApiTest.composite");
- }
- aCallBackClient = domain.getService(CallBackApiClient.class, "CallBackApiClient");
+ @BeforeClass
+ public static void setUp() throws Exception {
+ if (node == null) {
+ String location = ContributionLocationHelper.getContributionLocation("CallBackApiTest.composite");
+ node = NodeFactory.newInstance().createNode("CallBackApiTest.composite", new Contribution("c1", location));
+ node.start();
+ }
}
/**
- * This function destroys the SCADomain instance that was created in setUp()
+ * This function destroys the Node instance that was created in setUp()
*/
- @Override
- protected void tearDown() throws Exception {
- domain.close();
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ node.stop();
}
}