You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/12/05 01:48:35 UTC
svn commit: r723537 [3/4] - in /tuscany/java/sca/itest: ./ callback-api/
callback-api/src/main/java/org/apache/tuscany/sca/test/
callback-api/src/test/java/org/apache/tuscany/sca/test/ callback-basic/
callback-basic/src/main/java/org/apache/tuscany/sca...
Modified: tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java (original)
+++ tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java Thu Dec 4 16:48:31 2008
@@ -19,25 +19,30 @@
package org.apache.tuscany.sca.itest.conversational;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
+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.Assert;
-import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
public class ConversationLifetimeTestCase {
- private SCADomain domain;
+ private static Node node;
- @Before
- public void setUp() throws Exception {
- domain = SCADomain.newInstance("conversationLifetime.composite");
+ @BeforeClass
+ public static void setUp() throws Exception {
+ String location = ContributionLocationHelper.getContributionLocation("conversationLifetime.composite");
+ node = NodeFactory.newInstance().createNode("conversationLifetime.composite", new Contribution("c1", location));
+ node.start();
}
- @After
- public void tearDown() throws Exception {
- if (domain != null) {
- domain.close();
+ @AfterClass
+ public static void tearDown() throws Exception {
+ if (node != null) {
+ node.stop();
}
}
@@ -64,7 +69,7 @@
*/
@Test
public void getConversationID() {
- CService service = domain.getService(CService.class, "ConversationalCComponent");
+ CService service = node.getService(CService.class, "ConversationalCComponent");
service.getState();
Assert.assertNull(service.getConversationID());
}
@@ -76,12 +81,12 @@
@Test
public void getConversationID2() {
String userProvidedID = "A conversation ID";
- CService service = domain.getService(CService.class, "ConversationalCComponent");
+ CService service = node.getService(CService.class, "ConversationalCComponent");
service.setConversationID(userProvidedID);
service.getState();
Assert.assertEquals(service.getConversationID(), userProvidedID);
}
-
+
/**
* Whether the conversation ID is chosen by the user or is generated by the system, the client
* may access the conversation ID by calling getConversationID() on the current conversation object.
@@ -89,13 +94,13 @@
*/
@Test
public void getConversationID3() {
- String userProvidedID = "A conversation ID";
- CService service = domain.getService(CService.class, "ConversationalCComponent");
+ String userProvidedID = "A conversation ID 3";
+ CService service = node.getService(CService.class, "ConversationalCComponent");
service.setConversationID(userProvidedID);
service.getState();
Assert.assertEquals(service.getConversationObjectConversationId(), userProvidedID);
}
-
+
/**
* Whether the conversation ID is chosen by the user or is generated by the system, the client
* may access the conversation ID by calling getConversationID() on the current conversation object.
@@ -103,11 +108,11 @@
*/
@Test
public void getConversationID4() {
- CService service = domain.getService(CService.class, "ConversationalCComponent");
+ CService service = node.getService(CService.class, "ConversationalCComponent");
service.getState();
Assert.assertNotNull(service.getConversationObjectConversationId());
- }
-
+ }
+
/**
* Java Common Annotations and APIs 1.00 Specification line 494-495 Verify:
* If a method is invoked on a service reference after an
@@ -116,7 +121,7 @@
*/
@Test
public void implicitStartNewConversationAfterEnd() {
- CService service = domain.getService(CService.class, "ConversationalCComponent");
+ CService service = node.getService(CService.class, "ConversationalCComponent");
service.getState();
Object firstID = service.getConversationObjectConversationId();
service.endConversationViaAnnotatedMethod();
@@ -132,7 +137,7 @@
*/
@Test
public void implicitStartNewConversationAfterEnd2() {
- CService service = domain.getService(CService.class, "ConversationalCComponent");
+ CService service = node.getService(CService.class, "ConversationalCComponent");
service.getState();
Object firstID = service.getConversationObjectConversationId();
service.endConversation();
@@ -148,12 +153,12 @@
*/
@Test
public void nullConversationIDAfterEndConversation() {
- CService service = domain.getService(CService.class, "ConversationalCComponent");
+ CService service = node.getService(CService.class, "ConversationalCComponent");
service.getState();
service.endConversationViaAnnotatedMethod();
Assert.assertNull(service.getConversationObjectConversationId());
}
-
+
/**
* Java Common Annotations and APIs 1.00 Specification line 495-497 Verify:
* If ServiceReference.getConversationID() is called after the
@@ -162,7 +167,7 @@
*/
@Test
public void nullConversationIDAfterEndConversation1a() {
- CService service = domain.getService(CService.class, "ConversationalCComponent");
+ CService service = node.getService(CService.class, "ConversationalCComponent");
service.setConversationID("User provided ID");
service.getState();
service.endConversationViaAnnotatedMethod();
@@ -178,12 +183,12 @@
*/
@Test
public void nullConversationIDAfterEndConversation2() {
- CService service = domain.getService(CService.class, "ConversationalCComponent");
+ CService service = node.getService(CService.class, "ConversationalCComponent");
service.getState();
service.endConversation();
Assert.assertNull(service.getConversationObjectConversationId());
}
-
+
/**
* Java Common Annotations and APIs 1.00 Specification line 495-497 Verify: If
* ServiceReference.getConversationID() is called after the
@@ -193,7 +198,7 @@
*/
@Test
public void nullConversationIDAfterEndConversation2a() {
- CService service = domain.getService(CService.class, "ConversationalCComponent");
+ CService service = node.getService(CService.class, "ConversationalCComponent");
service.setConversationID("User provided ID");
service.getState();
service.endConversation();
Modified: tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java (original)
+++ tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java Thu Dec 4 16:48:31 2008
@@ -19,11 +19,15 @@
package org.apache.tuscany.sca.itest.conversational;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.apache.tuscany.sca.itest.TestResult;
+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.After;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -31,29 +35,32 @@
*/
public class ConversationUniqueIdTestCase {
- private SCADomain domain;
+ private Node node;
@Before
public void setUp() throws Exception {
- domain = SCADomain.newInstance("ConversationUniqueId.composite");
+ String location = ContributionLocationHelper.getContributionLocation("ConversationUniqueId.composite");
+ node = NodeFactory.newInstance().createNode("ConversationUniqueId.composite", new Contribution("c1", location));
+ node.start();
}
@After
public void tearDown() throws Exception {
- if (domain != null) {
- domain.close();
+ if (node != null) {
+ node.stop();
}
}
+ @Ignore("I'm seeing NPE in GammaImpl.hasNext()")
@Test
public void testConversationUniqueId() {
- Alpha alpha = domain.getService(Alpha.class, "Alpha");
+ Alpha alpha = node.getService(Alpha.class, "Alpha");
int numConversations = 3;
-
- for(int i = 0; i < numConversations; ++i) {
+
+ for (int i = 0; i < numConversations; ++i) {
alpha.run(5);
}
-
+
// Wait for the conversations to complete
while (TestResult.getCompleted() < numConversations) {
try {
@@ -61,9 +68,9 @@
} catch (InterruptedException e) {
}
}
-
+
Assert.assertEquals(TestResult.results.size(), numConversations);
- for(Boolean value : TestResult.results.values()) {
+ for (Boolean value : TestResult.results.values()) {
Assert.assertTrue(value);
}
}
Modified: tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java (original)
+++ tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java Thu Dec 4 16:48:31 2008
@@ -19,29 +19,33 @@
package org.apache.tuscany.sca.itest.conversational;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
+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.Assert;
-import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.osoa.sca.ConversationEndedException;
public class ConversationalAgeTestCase {
- private SCADomain domain;
-
- @Before
- public void setUp() throws Exception {
- System.setProperty("org.apache.tuscany.sca.core.scope.ConversationalScopeContainer.ReaperInterval", "2");
- domain = SCADomain.newInstance("ConversationAge.composite");
+ private static Node node;
+ @BeforeClass
+ public static void setUp() throws Exception {
+ System.setProperty("org.apache.tuscany.sca.core.conversation.ConversationManager.ReaperInterval", "2");
+ String location = ContributionLocationHelper.getContributionLocation("ConversationAge.composite");
+ node = NodeFactory.newInstance().createNode("ConversationAge.composite", new Contribution("c1", location));
+ node.start();
}
- @After
- public void tearDown() throws Exception {
- System.clearProperty("org.apache.tuscany.sca.core.scope.ConversationalScopeContainer.ReaperInterval");
- if (domain != null) {
- domain.close();
+ @AfterClass
+ public static void tearDown() throws Exception {
+ System.clearProperty("org.apache.tuscany.sca.core.conversation.ConversationManager.ReaperInterval");
+ if (node != null) {
+ node.stop();
}
}
@@ -49,7 +53,7 @@
public void testMaxAge() throws InterruptedException {
ConversationalService conversationalService =
- domain.getService(ConversationalService.class, "ConversationAgeComponent");
+ node.getService(ConversationalService.class, "ConversationAgeComponent");
Assert.assertEquals(0, conversationalService.retrieveCount());
conversationalService.initializeCount(42);
@@ -67,7 +71,7 @@
public void testAgeExpired() throws InterruptedException {
ConversationalService conversationalService =
- domain.getService(ConversationalService.class, "ConversationAgeComponent");
+ node.getService(ConversationalService.class, "ConversationAgeComponent");
Assert.assertEquals(0, conversationalService.retrieveCount());
conversationalService.initializeCount(42);
@@ -86,7 +90,7 @@
public void testMaxIdle() throws InterruptedException {
ConversationalService conversationalService =
- domain.getService(ConversationalService.class, "ConversationIdleComponent");
+ node.getService(ConversationalService.class, "ConversationIdleComponent");
Assert.assertEquals(0, conversationalService.retrieveCount());
conversationalService.initializeCount(42);
Modified: tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java (original)
+++ tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java Thu Dec 4 16:48:31 2008
@@ -19,7 +19,10 @@
package org.apache.tuscany.sca.itest.conversational;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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.After;
import org.junit.Assert;
import org.junit.Before;
@@ -27,25 +30,26 @@
public class ConversationalJ2SETestCase {
- private SCADomain domain;
+ private Node node;
@Before
public void setUp() throws Exception {
- domain = SCADomain.newInstance("conversational.composite");
-
+ String location = ContributionLocationHelper.getContributionLocation("conversational.composite");
+ node = NodeFactory.newInstance().createNode("conversational.composite", new Contribution("c1", location));
+ node.start();
}
@After
public void tearDown() throws Exception {
- if (domain != null) {
- domain.close();
+ if (node != null) {
+ node.stop();
}
}
@Test
public void testStatefulConversation() {
ConversationalService conversationalService =
- domain.getService(ConversationalService.class, "ConversationalServiceStateful");
+ node.getService(ConversationalService.class, "ConversationalServiceStateful");
conversationalService.initializeCount(1);
Assert.assertEquals(1, conversationalService.retrieveCount());
@@ -66,7 +70,7 @@
@Test
public void testStatelessConversation() {
ConversationalService conversationalService =
- domain.getService(ConversationalService.class, "ConversationalServiceStateless");
+ node.getService(ConversationalService.class, "ConversationalServiceStateless");
conversationalService.initializeCount(1);
Assert.assertEquals(1, conversationalService.retrieveCount());
Modified: tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java (original)
+++ tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java Thu Dec 4 16:48:31 2008
@@ -19,9 +19,6 @@
package org.apache.tuscany.sca.itest.conversational;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
@@ -29,63 +26,71 @@
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
+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.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
public class ConversationalTestCase {
- private static SCADomain domain;
+ private static Node node;
private static ConversationalClient conversationalStatelessClientStatelessService;
private static ConversationalClient conversationalStatelessClientStatefulService;
private static ConversationalClient conversationalStatefulClientStatelessService;
- private static ConversationalClient conversationalStatefulClientStatefulService;
+ private static ConversationalClient conversationalStatefulClientStatefulService;
private static ConversationalClient conversationalStatelessClientRequestService;
- private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;
+ private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;
@BeforeClass
public static void setUp() throws Exception {
- try {
- domain = SCADomain.newInstance("conversational.composite");
-
- conversationalStatelessClientStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientStatelessService");
-
- conversationalStatelessClientStatefulService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientStatefulService");
-
- conversationalStatefulClientStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientStatelessService");
-
- conversationalStatefulClientStatefulService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientStatefulService");
- conversationalStatelessClientRequestService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientRequestService");
- conversationalStatefulClientNonConversationalCallbackStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientNonConversationalCallbackStatefulService");
-
- } catch(Exception ex) {
- System.err.println(ex.toString());
- }
-
+ try {
+ String location = ContributionLocationHelper.getContributionLocation("conversational.composite");
+ node = NodeFactory.newInstance().createNode("conversational.composite", new Contribution("c1", location));
+ node.start();
+
+ conversationalStatelessClientStatelessService =
+ node.getService(ConversationalClient.class, "ConversationalStatelessClientStatelessService");
+
+ conversationalStatelessClientStatefulService =
+ node.getService(ConversationalClient.class, "ConversationalStatelessClientStatefulService");
+
+ conversationalStatefulClientStatelessService =
+ node.getService(ConversationalClient.class, "ConversationalStatefulClientStatelessService");
+
+ conversationalStatefulClientStatefulService =
+ node.getService(ConversationalClient.class, "ConversationalStatefulClientStatefulService");
+ conversationalStatelessClientRequestService =
+ node.getService(ConversationalClient.class, "ConversationalStatelessClientRequestService");
+ conversationalStatefulClientNonConversationalCallbackStatelessService =
+ node.getService(ConversationalClient.class,
+ "ConversationalStatefulClientNonConversationalCallbackStatefulService");
+
+ } catch (Exception ex) {
+ System.err.println(ex.toString());
+ }
+
}
@AfterClass
public static void tearDown() throws Exception {
- domain.close();
+ node.stop();
}
-
+
private void resetCallStack() {
-
+
// reset the place where we record the sequence of calls passing
// through each component instance
ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
+ ConversationalServiceStatefulImpl.calls = new StringBuffer();
+ ConversationalClientStatelessImpl.calls = new StringBuffer();
+ ConversationalClientStatefulImpl.calls = new StringBuffer();
ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();
ConversationalServiceStatefulNonConversationalCallbackImpl.calls = new StringBuffer();
-
+
}
// stateless client stateful service tests
@@ -94,91 +99,96 @@
public void testStatelessStatefulConversationFromInjectedReference() {
int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatelessStatefulConversationFromInjectedReference2() {
int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference2();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatelessStatefulConversationFromServiceReference() {
int count = conversationalStatelessClientStatefulService.runConversationFromServiceReference();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatelessStatefulConversationWithUserDefinedConversationId() {
int count = conversationalStatelessClientStatefulService.runConversationWithUserDefinedConversationId();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatelessStatefulConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatelessClientStatefulService.runConversationCheckUserDefinedConversationId();
+ String conversationId =
+ conversationalStatelessClientStatefulService.runConversationCheckUserDefinedConversationId();
Assert.assertEquals("MyConversation2", conversationId);
- }
-
+ }
+
@Test
public void testStatelessStatefulConversationCheckingScope() {
resetCallStack();
conversationalStatelessClientStatefulService.runConversationCheckingScope();
- Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
+ Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
ConversationalServiceStatefulImpl.calls.toString());
- }
+ }
@Test
public void testStatelessStatefulConversationWithCallback() {
resetCallStack();
int count = conversationalStatelessClientStatefulService.runConversationWithCallback();
Assert.assertEquals(0, count);
-
- Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,",
- ConversationalClientStatelessImpl.calls.toString());
- }
-
+
+ Assert
+ .assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,",
+ ConversationalClientStatelessImpl.calls.toString());
+ }
+
//@Test
public void testStatelessStatefulConversationHavingPassedReference() {
int count = conversationalStatelessClientStatefulService.runConversationHavingPassedReference();
Assert.assertEquals(3, count);
- }
-
+ }
+
@Test
public void testStatelessStatefulConversationBusinessException() {
String message = conversationalStatelessClientStatefulService.runConversationBusinessException();
Assert.assertEquals("Business Exception", message);
- }
-
+ }
+
@Test
public void testStatelessStatefulConversationBusinessExceptionCallback() {
String message = conversationalStatelessClientStatefulService.runConversationBusinessExceptionCallback();
Assert.assertEquals("Business Exception", message);
- }
-
+ }
+
@Test
public void testStatelessStatefulConversationCallingEndedConversation() {
int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversation();
Assert.assertEquals(0, count);
- }
-
+ }
+
@Test
public void testStatelessStatefulConversationCallingEndedConversationCallback() {
int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallback();
Assert.assertEquals(0, count);
- }
-
+ }
+
@Test
public void testStatelessStatefulConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCheckConversationId();
+ String id =
+ conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCheckConversationId();
Assert.assertEquals(null, id);
- }
-
+ }
+
//@Test
public void testStatelessStatefulConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId();
+ String id =
+ conversationalStatelessClientStatefulService
+ .runConversationCallingEndedConversationCallbackCheckConversationId();
Assert.assertEquals(null, id);
- }
+ }
// stateless client stateless service tests
// ========================================
@@ -186,77 +196,85 @@
public void testStatelessStatelessConversationFromInjectedReference() {
int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference();
Assert.assertEquals(2, count);
- }
+ }
@Test
public void testStatelessStatelessConversationFromInjectedReference2() {
int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference2();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatelessStatelessConversationFromServiceReference() {
int count = conversationalStatelessClientStatelessService.runConversationFromServiceReference();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatelessStatelessConversationWithUserDefinedConversationId() {
int count = conversationalStatelessClientStatelessService.runConversationWithUserDefinedConversationId();
Assert.assertEquals(2, count);
- }
+ }
+
@Test
public void testStatelessStatelessConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatelessClientStatelessService.runConversationCheckUserDefinedConversationId();
+ String conversationId =
+ conversationalStatelessClientStatelessService.runConversationCheckUserDefinedConversationId();
Assert.assertEquals("MyConversation2", conversationId);
- }
-
+ }
+
@Test
public void testStatelessStatelessConversationCheckingScope() {
resetCallStack();
conversationalStatelessClientStatelessService.runConversationCheckingScope();
- Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,",
- ConversationalServiceStatelessImpl.calls.toString());
- }
-
+ Assert
+ .assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,",
+ ConversationalServiceStatelessImpl.calls.toString());
+ }
+
@Test
public void testStatelessStatelessConversationWithCallback() {
resetCallStack();
int count = conversationalStatelessClientStatelessService.runConversationWithCallback();
Assert.assertEquals(0, count);
-
- Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,",
- ConversationalClientStatelessImpl.calls.toString());
+
+ Assert
+ .assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,",
+ ConversationalClientStatelessImpl.calls.toString());
}
+
//@Test
public void testStatelessStatelessConversationHavingPassedReference() {
int count = conversationalStatelessClientStatelessService.runConversationHavingPassedReference();
Assert.assertEquals(3, count);
- }
+ }
@Test
public void testStatelessStatelessConversationCallingEndedConversation() {
int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversation();
Assert.assertEquals(-999, count);
- }
-
+ }
+
@Test
public void testStatelessStatelessConversationCallingEndedConversationCallback() {
int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallback();
Assert.assertEquals(0, count);
- }
-
+ }
+
@Test
public void testStatelessStatelessConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCheckConversationId();
+ String id =
+ conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCheckConversationId();
Assert.assertEquals(null, id);
- }
-
+ }
+
//@Test
public void testStatelessStatelessConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();
+ String id =
+ conversationalStatelessClientStatelessService
+ .runConversationCallingEndedConversationCallbackCheckConversationId();
Assert.assertEquals(null, id);
- }
+ }
// stateful client stateful service tests
// ======================================
@@ -264,348 +282,384 @@
public void testStatefulStatefulConversationFromInjectedReference() {
int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatefulStatefulConversationFromInjectedReference2() {
int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference2();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatefulStatefulConversationFromServiceReference() {
int count = conversationalStatefulClientStatefulService.runConversationFromServiceReference();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatefulStatefulConversationWithUserDefinedConversationId() {
int count = conversationalStatefulClientStatefulService.runConversationWithUserDefinedConversationId();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatefulStatefulConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatefulClientStatefulService.runConversationCheckUserDefinedConversationId();
+ String conversationId =
+ conversationalStatefulClientStatefulService.runConversationCheckUserDefinedConversationId();
Assert.assertEquals("MyConversation2", conversationId);
- }
-
+ }
+
@Test
public void testStatefulStatefulConversationCheckingScope() {
resetCallStack();
conversationalStatefulClientStatefulService.runConversationCheckingScope();
- Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
+ Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
ConversationalServiceStatefulImpl.calls.toString());
- }
+ }
@Test
public void testStatefulStatefulConversationWithCallback() {
resetCallStack();
int count = conversationalStatefulClientStatefulService.runConversationWithCallback();
Assert.assertEquals(4, count);
-
- Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
- ConversationalClientStatefulImpl.calls.toString());
- }
-
+
+ Assert
+ .assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
+ ConversationalClientStatefulImpl.calls.toString());
+ }
+
//@Test
public void testStatefulStatefulConversationHavingPassedReference() {
int count = conversationalStatefulClientStatefulService.runConversationHavingPassedReference();
Assert.assertEquals(3, count);
- }
-
+ }
+
@Test
public void testStatefulStatefulConversationCallingEndedConversation() {
int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversation();
Assert.assertEquals(0, count);
- }
+ }
@Test
public void testStatefulStatefulConversationCallingEndedConversationCallback() {
int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallback();
Assert.assertEquals(0, count);
- }
-
+ }
+
@Test
public void testStatefulStatefulConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCheckConversationId();
+ String id =
+ conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCheckConversationId();
Assert.assertEquals(null, id);
- }
-
+ }
+
@Test
public void testStatefulStatefulConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId();
+ String id =
+ conversationalStatefulClientStatefulService
+ .runConversationCallingEndedConversationCallbackCheckConversationId();
Assert.assertEquals(null, id);
- }
-
+ }
+
// stateful client stateless service tests
// =======================================
@Test
public void testStatefulStatelessConversationFromInjectedReference() {
int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatefulStatelessConversationFromInjectedReference2() {
int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference2();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatefulStatelessConversationFromServiceReference() {
int count = conversationalStatefulClientStatelessService.runConversationFromServiceReference();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatefulStatelessConversationWithUserDefinedConversationId() {
int count = conversationalStatefulClientStatelessService.runConversationWithUserDefinedConversationId();
Assert.assertEquals(2, count);
- }
+ }
@Test
public void testStatefulStatelessConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatefulClientStatelessService.runConversationCheckUserDefinedConversationId();
+ String conversationId =
+ conversationalStatefulClientStatelessService.runConversationCheckUserDefinedConversationId();
Assert.assertEquals("MyConversation2", conversationId);
- }
-
+ }
+
@Test
public void testStatefulStatelessConversationCheckingScope() {
resetCallStack();
conversationalStatefulClientStatelessService.runConversationCheckingScope();
- Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,",
- ConversationalServiceStatelessImpl.calls.toString());
- }
+ Assert
+ .assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,",
+ ConversationalServiceStatelessImpl.calls.toString());
+ }
@Test
public void testStatefulStatelessConversationWithCallback() {
resetCallStack();
int count = conversationalStatefulClientStatelessService.runConversationWithCallback();
Assert.assertEquals(4, count);
-
- Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
- ConversationalClientStatefulImpl.calls.toString());
- }
-
+
+ Assert
+ .assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
+ ConversationalClientStatefulImpl.calls.toString());
+ }
+
//@Test
public void testStatefulStatelessConversationHavingPassedReference() {
int count = conversationalStatefulClientStatelessService.runConversationHavingPassedReference();
Assert.assertEquals(3, count);
- }
-
+ }
+
@Test
public void testStatefulStatelessConversationCallingEndedConversation() {
int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversation();
Assert.assertEquals(-999, count);
- }
-
+ }
+
@Test
public void testStatefulStatelessConversationCallingEndedConversationCallback() {
int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallback();
Assert.assertEquals(0, count);
- }
-
+ }
+
@Test
public void testStatefulStatelessConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCheckConversationId();
+ String id =
+ conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCheckConversationId();
Assert.assertEquals(null, id);
- }
-
+ }
+
@Test
public void testStatefulStatelessConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();
+ String id =
+ conversationalStatefulClientStatelessService
+ .runConversationCallingEndedConversationCallbackCheckConversationId();
Assert.assertEquals(null, id);
- }
-
+ }
+
// stateless client request scope service tests
// ============================================
@Test
public void testStatelessRequestConversationFromInjectedReference() {
int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatelessRequestConversationFromInjectedReference2() {
int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference2();
Assert.assertEquals(1, count);
- }
-
+ }
+
@Test
public void testStatelessRequestConversationFromServiceReference() {
int count = conversationalStatelessClientRequestService.runConversationFromServiceReference();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatelessRequestConversationWithUserDefinedConversationId() {
int count = conversationalStatelessClientRequestService.runConversationWithUserDefinedConversationId();
Assert.assertEquals(2, count);
- }
-
+ }
+
//@Test
public void testStatelessRequestConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatelessClientRequestService.runConversationCheckUserDefinedConversationId();
+ String conversationId =
+ conversationalStatelessClientRequestService.runConversationCheckUserDefinedConversationId();
Assert.assertEquals("MyConversation2", conversationId);
- }
-
+ }
+
@Test
public void testStatelessRequestConversationCheckingScope() {
resetCallStack();
- ConversationalServiceRequestImpl.calls = new StringBuffer();
- conversationalStatelessClientRequestService.runConversationCheckingScope();
- Assert.assertEquals("initializeCount,incrementCount,retrieveCount,endConversation,",
- ConversationalServiceRequestImpl.calls.toString());
- }
+ ConversationalServiceRequestImpl.calls = new StringBuffer();
+ conversationalStatelessClientRequestService.runConversationCheckingScope();
+ Assert.assertEquals("initializeCount,incrementCount,retrieveCount,endConversation,",
+ ConversationalServiceRequestImpl.calls.toString());
+ }
@Test
public void testStatelessRequestConversationWithCallback() {
resetCallStack();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
+ ConversationalClientStatelessImpl.calls = new StringBuffer();
int count = conversationalStatelessClientRequestService.runConversationWithCallback();
Assert.assertEquals(0, count);
-
- Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,",
- ConversationalClientStatelessImpl.calls.toString());
- }
-
+
+ Assert
+ .assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,",
+ ConversationalClientStatelessImpl.calls.toString());
+ }
+
//@Test
public void testStatelessRequestConversationHavingPassedReference() {
int count = conversationalStatelessClientRequestService.runConversationHavingPassedReference();
Assert.assertEquals(3, count);
- }
-
+ }
+
@Test
public void testStatelessRequestConversationBusinessException() {
String message = conversationalStatelessClientRequestService.runConversationBusinessException();
Assert.assertEquals("Business Exception", message);
- }
-
+ }
+
@Test
public void testStatelessRequestConversationBusinessExceptionCallback() {
String message = conversationalStatelessClientRequestService.runConversationBusinessExceptionCallback();
Assert.assertEquals("Business Exception", message);
- }
-
+ }
+
@Test
public void testStatelessRequestConversationCallingEndedConversation() {
int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversation();
Assert.assertEquals(-999, count);
- }
-
+ }
+
@Test
public void testStatelessRequestConversationCallingEndedConversationCallback() {
int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallback();
Assert.assertEquals(0, count);
- }
-
+ }
+
@Test
public void testStatelessRequestConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCheckConversationId();
+ String id =
+ conversationalStatelessClientRequestService.runConversationCallingEndedConversationCheckConversationId();
Assert.assertEquals(null, id);
- }
-
+ }
+
//@Test
public void testStatelessRequestConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallbackCheckConversationId();
+ String id =
+ conversationalStatelessClientRequestService
+ .runConversationCallingEndedConversationCallbackCheckConversationId();
Assert.assertEquals(null, id);
- }
-
+ }
+
// stateful client non conversational callback stateful service tests
// ==================================================================
-
+
@Test
public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference();
+ int count =
+ conversationalStatefulClientNonConversationalCallbackStatelessService
+ .runConversationFromInjectedReference();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference2() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference2();
+ int count =
+ conversationalStatefulClientNonConversationalCallbackStatelessService
+ .runConversationFromInjectedReference2();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatefulNonConversationalCallbackStatefulConversationFromServiceReference() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromServiceReference();
+ int count =
+ conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromServiceReference();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatefulNonConversationalCallbackStatefulConversationWithUserDefinedConversationId() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithUserDefinedConversationId();
+ int count =
+ conversationalStatefulClientNonConversationalCallbackStatelessService
+ .runConversationWithUserDefinedConversationId();
Assert.assertEquals(2, count);
- }
-
+ }
+
@Test
public void testStatefulNonConversationalCallbackStatefulConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckUserDefinedConversationId();
+ String conversationId =
+ conversationalStatefulClientNonConversationalCallbackStatelessService
+ .runConversationCheckUserDefinedConversationId();
Assert.assertEquals("MyConversation2", conversationId);
- }
-
+ }
+
@Test
public void testStatefulNonConversationalCallbackStatefulConversationCheckingScope() {
resetCallStack();
- conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckingScope();
- Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
- ConversationalServiceStatefulNonConversationalCallbackImpl.calls.toString());
- }
+ conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckingScope();
+ Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
+ ConversationalServiceStatefulNonConversationalCallbackImpl.calls.toString());
+ }
@Test
public void testStatefulNonConversationalCallbackStatefulConversationWithCallback() {
resetCallStack();
int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithCallback();
Assert.assertEquals(0, count);
-
- Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,",
- ConversationalClientStatefulNonConversationalCallbackImpl.calls.toString());
- }
-
+
+ Assert
+ .assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,",
+ ConversationalClientStatefulNonConversationalCallbackImpl.calls.toString());
+ }
+
//@Test
public void testStatefulNonConversationalCallbackStatefulConversationHavingPassedReference() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationHavingPassedReference();
+ int count =
+ conversationalStatefulClientNonConversationalCallbackStatelessService
+ .runConversationHavingPassedReference();
Assert.assertEquals(0, count);
- }
-
+ }
+
@Test
public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversation() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversation();
+ int count =
+ conversationalStatefulClientNonConversationalCallbackStatelessService
+ .runConversationCallingEndedConversation();
Assert.assertEquals(0, count);
- }
-
+ }
+
@Test
public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallback() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallback();
+ int count =
+ conversationalStatefulClientNonConversationalCallbackStatelessService
+ .runConversationCallingEndedConversationCallback();
Assert.assertEquals(0, count);
- }
-
+ }
+
@Test
public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCheckConversationId();
+ String id =
+ conversationalStatefulClientNonConversationalCallbackStatelessService
+ .runConversationCallingEndedConversationCheckConversationId();
Assert.assertEquals(null, id);
- }
-
+ }
+
@Test
public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();
+ String id =
+ conversationalStatefulClientNonConversationalCallbackStatelessService
+ .runConversationCallingEndedConversationCallbackCheckConversationId();
Assert.assertEquals("MyConversation3", id);
- }
+ }
private static final String NEW_A_VALUE = "First Instance - TestCode Set state on A";
private static final String NEW_B_VALUE = "First Instance - TestCode Set state on B";
private static final String SECOND_NEW_A_VALUE = "Second Instance - TestCode Set state on A";
private static final String SECOND_NEW_B_VALUE = "Second Instance - TestCode Set state on B";
-
+
@Test
public void testMultipleConversations() {
//////////
// Tests on first instance
//////////
System.out.println("========= First instance tests =========");
- AService aService = domain.getService(AService.class, "ConversationalAComponent");
-
+ AService aService = node.getService(AService.class, "ConversationalAComponent");
+
// Make sure initial values are correct
Assert.assertEquals(Constants.A_INITIAL_VALUE, aService.getState());
Assert.assertEquals(Constants.B_INITIAL_VALUE, aService.getStateOnB());
@@ -613,28 +667,27 @@
// Set some new values
aService.setState(NEW_A_VALUE);
aService.setStateOnB(NEW_B_VALUE);
-
+
// Verify the set worked
Assert.assertEquals(NEW_A_VALUE, aService.getState());
Assert.assertEquals(NEW_B_VALUE, aService.getStateOnB());
-
//////////
// Tests on second instance
//////////
System.out.println("========= Second instance tests =========");
// Do another look up
- AService aService2 = domain.getService(AService.class, "ConversationalAComponent");
+ AService aService2 = node.getService(AService.class, "ConversationalAComponent");
// Make sure initial values are correct on the second instance
Assert.assertEquals(Constants.A_INITIAL_VALUE, aService2.getState());
Assert.assertEquals(Constants.B_INITIAL_VALUE, aService2.getStateOnB());
-
+
// Set some new values on the second instance
aService2.setState(SECOND_NEW_A_VALUE);
aService2.setStateOnB(SECOND_NEW_B_VALUE);
-
+
// Verify the set worked on the second instance
Assert.assertEquals(SECOND_NEW_A_VALUE, aService2.getState());
Assert.assertEquals(SECOND_NEW_B_VALUE, aService2.getStateOnB());
@@ -642,8 +695,8 @@
// Verify the values have not been changed on the first instance
Assert.assertEquals(NEW_A_VALUE, aService.getState());
Assert.assertEquals(NEW_B_VALUE, aService.getStateOnB());
-
+
System.out.println("========= Done instance tests =========");
}
-
+
}
Modified: tuscany/java/sca/itest/exceptions/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/exceptions/pom.xml?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/exceptions/pom.xml (original)
+++ tuscany/java/sca/itest/exceptions/pom.xml Thu Dec 4 16:48:31 2008
@@ -31,15 +31,23 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
+
</dependencies>
</project>
Modified: tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java (original)
+++ tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java Thu Dec 4 16:48:31 2008
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.test.exceptions;
-
public class Checked extends Exception {
private static final long serialVersionUID = -129752837478357452L;
Modified: tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java (original)
+++ tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java Thu Dec 4 16:48:31 2008
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.test.exceptions;
-
/**
* Local exception thrower
* @version $Rev$ $Date$
Modified: tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java (original)
+++ tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java Thu Dec 4 16:48:31 2008
@@ -91,7 +91,7 @@
}
- @Reference
+ @Reference
public void setExceptionThrower(ExceptionThrower exceptionThrower) {
this.exceptionThrower = exceptionThrower;
}
Modified: tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java (original)
+++ tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java Thu Dec 4 16:48:31 2008
@@ -92,7 +92,7 @@
}
- @Reference
+ @Reference
public void setExceptionThrower(ExceptionRemoteThrower exceptionThrower) {
this.exceptionThrower = exceptionThrower;
}
Modified: tuscany/java/sca/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java (original)
+++ tuscany/java/sca/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java Thu Dec 4 16:48:31 2008
@@ -18,56 +18,68 @@
*/
package org.apache.tuscany.sca.test.exceptions;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+
+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 ExceptionsTestCase {
-public class ExceptionsTestCase extends TestCase {
-
- private SCADomain domain;
+ private static Node node;
/**
* Test exception handling over a local interface
*/
+ @Test
public void testLocal() {
- ExceptionHandler exceptionHandler = domain.getService(ExceptionHandler.class, "main");
+ ExceptionHandler exceptionHandler = node.getService(ExceptionHandler.class, "main");
exceptionHandler.testing();
- assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood() );
+ assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood());
assertNotNull(exceptionHandler.getTheBad());
- assertEquals( Checked.class, exceptionHandler.getTheBad().getClass());
+ assertEquals(Checked.class, exceptionHandler.getTheBad().getClass());
assertSame(ExceptionThrower.BAD, exceptionHandler.getTheBad());
assertNotNull(exceptionHandler.getTheUgly());
- assertEquals( UnChecked.class, exceptionHandler.getTheUgly().getClass());
+ assertEquals(UnChecked.class, exceptionHandler.getTheUgly().getClass());
assertSame(ExceptionThrower.UGLY, exceptionHandler.getTheUgly());
}
-
+
/**
* Test exception handling over a remotable interface
*/
+ @Test
public void testRemote() {
- ExceptionHandler exceptionHandler = domain.getService(ExceptionHandler.class, "mainRemote");
+ ExceptionHandler exceptionHandler = node.getService(ExceptionHandler.class, "mainRemote");
exceptionHandler.testing();
- assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood() );
+ assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood());
assertNotNull(exceptionHandler.getTheBad());
- assertEquals( Checked.class, exceptionHandler.getTheBad().getClass());
+ assertEquals(Checked.class, exceptionHandler.getTheBad().getClass());
assertNotSame(ExceptionThrower.BAD, exceptionHandler.getTheBad());
assertNotNull(exceptionHandler.getTheUgly());
- assertEquals( UnChecked.class, exceptionHandler.getTheUgly().getClass());
-
+ assertEquals(UnChecked.class, exceptionHandler.getTheUgly().getClass());
+
// [rfeng] We're not in a position to copy non business exceptions
// assertNotSame(ExceptionThrower.UGLY, exceptionHandler.getTheUgly());
}
-
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("ExceptionTest.composite");
+ @BeforeClass
+ public static void setUp() throws Exception {
+ String location = ContributionLocationHelper.getContributionLocation("ExceptionTest.composite");
+ node = NodeFactory.newInstance().createNode("ExceptionTest.composite", new Contribution("c1", location));
+ node.start();
}
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ node.stop();
}
-
+
}
Modified: tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java (original)
+++ tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java Thu Dec 4 16:48:31 2008
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.sca.itest.interfaces;
-
/**
* only for callBack
*/
Modified: tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java (original)
+++ tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java Thu Dec 4 16:48:31 2008
@@ -33,7 +33,6 @@
this.field1 = field1;
}
- @Override
public boolean equals(Object o) {
if (o == this)
return true;
Modified: tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java (original)
+++ tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java Thu Dec 4 16:48:31 2008
@@ -47,6 +47,7 @@
public interface RemoteClientComponent {
String foo1(ParameterObject po);
+
String foo3(ParameterObject po);
String foo2(int i, String str1) throws Exception;
Modified: tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java (original)
+++ tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java Thu Dec 4 16:48:31 2008
@@ -41,7 +41,7 @@
po.field1 = "BComponent";
return "BComponent";
}
-
+
public String foo2(int i, String str) throws Exception {
return str + "BComponent" + i;
}
Modified: tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java (original)
+++ tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java Thu Dec 4 16:48:31 2008
@@ -33,6 +33,6 @@
void modifyParameter();
ParameterObject getPO();
-
+
String[] bar(int[][] intArray);
}
Modified: tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java (original)
+++ tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java Thu Dec 4 16:48:31 2008
@@ -23,7 +23,7 @@
*
* @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
*/
-public interface OneWayClient {
+public interface OneWayClient {
/**
* This method will invoke the doSomething() @OneWay method on the OneWayService
Modified: tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java (original)
+++ tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java Thu Dec 4 16:48:31 2008
@@ -18,11 +18,9 @@
*/
package org.apache.tuscany.sca.itest.oneway;
-
import org.osoa.sca.annotations.OneWay;
import org.osoa.sca.annotations.Remotable;
-
/**
* The service interface used when testing @OneWay interactions.
*
Modified: tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java (original)
+++ tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java Thu Dec 4 16:48:31 2008
@@ -23,7 +23,6 @@
import org.junit.Assert;
import org.osoa.sca.annotations.Reference;
-
/**
* The client for the oneway itest.
*
@@ -33,7 +32,7 @@
/**
* Injected reference to the OneWayService.
*/
- @Reference
+ @Reference
protected OneWayService oneWayService;
/**
Modified: tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java (original)
+++ tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java Thu Dec 4 16:48:31 2008
@@ -18,9 +18,9 @@
*/
package org.apache.tuscany.sca.itest.oneway.impl;
-import org.apache.tuscany.sca.itest.oneway.OneWayService;
+import java.util.concurrent.atomic.AtomicInteger;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
+import org.apache.tuscany.sca.itest.oneway.OneWayService;
/**
* The service for the oneway itest.
@@ -28,7 +28,6 @@
* @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
*/
-
public class OneWayServiceImpl implements OneWayService {
/**
@@ -53,8 +52,8 @@
public void doSomething(int count) {
CALL_COUNT.incrementAndGet();
- // System.out.println("Service: doSomething " + count + " callCount = " + callCount);
- // System.out.flush();
+ // System.out.println("Service: doSomething " + count + " callCount = " + callCount);
+ // System.out.flush();
}
/**
Modified: tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java (original)
+++ tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java Thu Dec 4 16:48:31 2008
@@ -25,15 +25,16 @@
import java.util.logging.LogRecord;
import java.util.logging.Logger;
-import junit.framework.Assert;
-
import org.apache.tuscany.sca.core.invocation.NonBlockingInterceptor;
import org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl;
import org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl;
import org.apache.tuscany.sca.node.Client;
+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.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -50,25 +51,30 @@
private static final int MAX_SLEEP_TIME = 10000;
private Node node;
-
+
/**
- * Initialise the SCADomain.
+ * Initialise the Node.
*
- * @throws Exception Failed to initialise the SCADomain
+ * @throws Exception Failed to initialise the Node
*/
@Before
public void setUp() throws Exception {
-
+
NodeFactory nodeFactory = NodeFactory.newInstance();
- node = nodeFactory.createSCANodeFromClassLoader("OneWayContribution/META-INF/sca-deployables/oneWay.composite", null);
+ String location =
+ ContributionLocationHelper
+ .getContributionLocation("OneWayContribution/META-INF/sca-deployables/oneWay.composite");
+ node =
+ nodeFactory.createNode("OneWayContribution/META-INF/sca-deployables/oneWay.composite",
+ new Contribution("c1", location));
node.start();
-
+
}
/**
- * This method will ensure that the SCADomain is shutdown.
+ * This method will ensure that the Node is shutdown.
*
- * @throws Exception Failed to shutdown the SCADomain
+ * @throws Exception Failed to shutdown the Node
*/
@After
public void tearDown() throws Exception {
@@ -83,14 +89,13 @@
*/
@Test
public void testOneWay() throws Exception {
- OneWayClient client =
- ((Client)node).getService(OneWayClient.class, "OneWayClientComponent");
+ OneWayClient client = ((Client)node).getService(OneWayClient.class, "OneWayClientComponent");
int count = 100;
for (int i = 0; i < 10; i++) {
- // System.out.println("Test: doSomething " + count);
- // System.out.flush();
+ // System.out.println("Test: doSomething " + count);
+ // System.out.flush();
client.doSomething(count);
// TUSCANY-2192 - We need to sleep to allow the @OneWay method calls to complete.
@@ -99,8 +104,7 @@
// This loop will wait for the required number of @OneWay method calls to
// have taken place or MAX_SLEEP_TIME to have passed.
long startSleep = System.currentTimeMillis();
- while (OneWayClientImpl.callCount != OneWayServiceImpl.CALL_COUNT.get()
- && System.currentTimeMillis() - startSleep < MAX_SLEEP_TIME) {
+ while (OneWayClientImpl.callCount != OneWayServiceImpl.CALL_COUNT.get() && System.currentTimeMillis() - startSleep < MAX_SLEEP_TIME) {
Thread.sleep(100);
// System.out.println("" + OneWayClientImpl.callCount + "," + OneWayServiceImpl.callCount);
}
@@ -119,9 +123,8 @@
*/
@Test
public void testOneWayUsingNonBlockingInterceptorThrowsAnException() {
- OneWayClient client =
- ((Client)node).getService(OneWayClient.class, "OneWayClientComponentSCABinding");
-
+ OneWayClient client = ((Client)node).getService(OneWayClient.class, "OneWayClientComponentSCABinding");
+
// We need to modify the JDK Logger for the NonBlockingInterceptor so we
// can check that it logs a message for the @OneWay invocation that throws
// an Exception
@@ -198,7 +201,7 @@
/**
* {@inheritDoc}
*/
- @Override
+
public void close() throws SecurityException {
// Nothing to do
}
@@ -206,7 +209,7 @@
/**
* {@inheritDoc}
*/
- @Override
+
public void flush() {
// Nothing to do
}
@@ -217,13 +220,12 @@
*
* @param record The Log Record that is being published
*/
- @Override
+
public void publish(LogRecord record) {
// The log message we are looking for is Severe
if (record.getLevel() == Level.SEVERE) {
- if (record.getThrown() != null
- && record.getThrown().toString().indexOf(
- OneWayServiceImpl.EXCEPTION_MESSAGE) != -1) {
+ if (record.getThrown() != null && record.getThrown().toString()
+ .indexOf(OneWayServiceImpl.EXCEPTION_MESSAGE) != -1) {
// We have found our Exception.
exceptionLogged.set(true);
}
Modified: tuscany/java/sca/itest/operation-overloading/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/operation-overloading/pom.xml?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/operation-overloading/pom.xml (original)
+++ tuscany/java/sca/itest/operation-overloading/pom.xml Thu Dec 4 16:48:31 2008
@@ -31,15 +31,23 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
+
</dependencies>
</project>
Modified: tuscany/java/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java (original)
+++ tuscany/java/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java Thu Dec 4 16:48:31 2008
@@ -18,20 +18,26 @@
*/
package org.apache.tuscany.sca.test.opoverload.impl;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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.apache.tuscany.sca.test.opoverload.OverloadASourceTarget;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+public class OverloadATestCase {
-public class OverloadATestCase extends TestCase {
-
- private SCADomain domain;
- private OverloadASourceTarget overloadA;
+ private static Node node;
+ private static OverloadASourceTarget overloadA;
/**
* Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This
* test verifies the values compared are same as the values retrieved from the SCA runtime.
*/
+ @Test
public void testOperationAall() {
String[] result = overloadA.operationAall();
assertEquals(5, result.length);
@@ -42,21 +48,25 @@
assertEquals(OverloadASourceTarget.opName + "four" + 4, result[4]);
}
+ @Test
public void testOperationAInt() {
String result = overloadA.operationA(29);
assertEquals(OverloadASourceTarget.opName + 29, result);
}
+ @Test
public void testOperationAString() {
String result = overloadA.operationA("rick:-)");
assertEquals(OverloadASourceTarget.opName + "rick:-)", result);
}
+ @Test
public void testOperationAIntString() {
String result = overloadA.operationA(123, "Tuscany");
assertEquals(OverloadASourceTarget.opName + 123 + "Tuscany", result);
}
+ @Test
public void testOperationStringInt() {
String result = overloadA.operationA("StringInt", 77);
assertEquals(OverloadASourceTarget.opName + "StringInt" + 77, result);
@@ -64,21 +74,25 @@
/**
* setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending
- * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and
+ * unit.framework.TestCase. So this method is used to create a test Embedded SCA node, to start the SCA node and
* to get a reference to the contribution service
*/
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("OperationOverload.composite");
- overloadA = domain.getService(OverloadASourceTarget.class, "OverloadASourceComponent");
+
+ @BeforeClass
+ public static void setUp() throws Exception {
+ String location = ContributionLocationHelper.getContributionLocation("OperationOverload.composite");
+ node = NodeFactory.newInstance().createNode("OperationOverload.composite", new Contribution("c1", location));
+ node.start();
+ overloadA = node.getService(OverloadASourceTarget.class, "OverloadASourceComponent");
}
/**
* tearDown() is a method in JUnit Frame Work which is executed after all other methods in the class extending
- * unit.framework.TestCase. So this method is used to close the SCA domain.
+ * unit.framework.TestCase. So this method is used to close the SCA node.
*/
- @Override
- protected void tearDown() throws Exception {
- domain.close();
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ node.stop();
}
}
Modified: tuscany/java/sca/itest/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/pom.xml?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/pom.xml (original)
+++ tuscany/java/sca/itest/pom.xml Thu Dec 4 16:48:31 2008
@@ -50,8 +50,6 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>builder</module>
- <module>callablereferences</module>
<module>callback-api</module>
<module>callback-basic</module>
<module>callback-complex-type</module>
@@ -61,22 +59,17 @@
<module>callback-set-callback</module>
<module>callback-set-conversation</module>
<module>component-type</module>
- <module>contribution</module>
- <module>contribution-import-export</module>
<module>conversations</module>
<module>exceptions</module>
- <module>extended-api</module>
<module>interfaces</module>
- <module>late-reference-resolution</module>
- <module>oneway</module>
<module>operation-overloading</module>
+<!-- wait until databinding-sdo is in
<module>properties</module>
- <module>recursive</module>
+-->
<module>recursive-multi-level</module>
<module>references</module>
- <module>serialization</module>
- <module>services</module>
<module>scopes</module>
+ <module>services</module>
<module>wires</module>
</modules>
</profile>