summaryrefslogtreecommitdiffstats
path: root/java/sca/itest/conversations/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/conversations/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/conversations/src')
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java3
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java2
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java10
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java1
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java17
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java54
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java4
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java29
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java29
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java4
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java17
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java13
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java7
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java3
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java3
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java7
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java12
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java4
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java12
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java262
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java253
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java243
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java13
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java67
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java79
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java82
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java67
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java22
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java9
-rw-r--r--java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java4
-rw-r--r--java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java20
-rw-r--r--java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java61
-rw-r--r--java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java29
-rw-r--r--java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java38
-rw-r--r--java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java20
-rw-r--r--java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java535
36 files changed, 1061 insertions, 974 deletions
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
index 8e98b9cbd4..946ad93d7d 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
@@ -26,10 +26,11 @@ import java.util.Hashtable;
public class TestResult {
public static Hashtable<Object, Boolean> results = new Hashtable<Object, Boolean>();
private static int completed = 0;
+
public static synchronized void updateCompleted() {
++completed;
}
-
+
public static synchronized int getCompleted() {
return completed;
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
index 77d7f4c007..eeb7aa98e2 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
@@ -25,7 +25,7 @@ import org.osoa.sca.annotations.Conversational;
*/
@Conversational
public interface BService {
-
+
/**
* Returns the state for this service.
*
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
index a6dbf56797..e8887071c3 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
@@ -29,14 +29,14 @@ public interface CService {
String getState();
void setState(String aState);
-
+
Object getConversationID();
-
+
Object getConversationObjectConversationId();
-
+
void setConversationID(String theID);
-
+
void endConversation();
-
+
void endConversationViaAnnotatedMethod();
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index 53dadc3dc7..f0f5ac041d 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
@@ -25,5 +25,6 @@ import org.osoa.sca.annotations.Conversational;
public interface ConversationIdService {
String getCIDField();
+
String getCIDSetter();
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index 8cad88d2f4..089c2eb58c 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
@@ -22,7 +22,6 @@ import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.EndsConversation;
import org.osoa.sca.annotations.Remotable;
-
/**
* The callback interface used when testing conversational callbacks
*
@@ -31,19 +30,19 @@ import org.osoa.sca.annotations.Remotable;
@Remotable
@Conversational
public interface ConversationalCallback {
-
+
public void init();
-
+
public void destroy();
-
+
public void initializeCount(int count);
-
+
public void incrementCount();
-
+
public int retrieveCount();
-
- public void businessException() throws Exception;
-
+
+ public void businessException() throws Exception;
+
@EndsConversation
public String endConversation();
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index 2532346349..d4086d63d9 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
@@ -28,23 +28,39 @@ import org.osoa.sca.annotations.Remotable;
*/
@Remotable
-public interface ConversationalClient {
-
- public int runConversationFromInjectedReference();
- public int runConversationFromInjectedReference2();
- public int runConversationFromServiceReference();
- public int runConversationWithUserDefinedConversationId();
- public String runConversationCheckUserDefinedConversationId();
- public int runConversationCheckingScope();
- public int runConversationWithCallback();
- public int runConversationHavingPassedReference();
- public String runConversationBusinessException();
- public String runConversationBusinessExceptionCallback();
- public int runConversationCallingEndedConversation();
- public int runConversationCallingEndedConversationCallback();
- public String runConversationCallingEndedConversationCheckConversationId();
- public String runConversationCallingEndedConversationCallbackCheckConversationId();
- public int runConversationAgeTimeout();
- public int runConversationIdleTimeout();
- public int runConversationPrincipleError();
+public interface ConversationalClient {
+
+ public int runConversationFromInjectedReference();
+
+ public int runConversationFromInjectedReference2();
+
+ public int runConversationFromServiceReference();
+
+ public int runConversationWithUserDefinedConversationId();
+
+ public String runConversationCheckUserDefinedConversationId();
+
+ public int runConversationCheckingScope();
+
+ public int runConversationWithCallback();
+
+ public int runConversationHavingPassedReference();
+
+ public String runConversationBusinessException();
+
+ public String runConversationBusinessExceptionCallback();
+
+ public int runConversationCallingEndedConversation();
+
+ public int runConversationCallingEndedConversationCallback();
+
+ public String runConversationCallingEndedConversationCheckConversationId();
+
+ public String runConversationCallingEndedConversationCallbackCheckConversationId();
+
+ public int runConversationAgeTimeout();
+
+ public int runConversationIdleTimeout();
+
+ public int runConversationPrincipleError();
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index 8f008fa711..44a7be9a7a 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
@@ -29,8 +29,8 @@ import org.osoa.sca.annotations.Remotable;
*/
@Remotable
-public interface ConversationalReferenceClient {
-
+public interface ConversationalReferenceClient {
+
public void incrementCount(CallableReference<ConversationalService> conversationalService);
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index 546382cfd1..b24dc70a70 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
@@ -23,7 +23,6 @@ import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.EndsConversation;
import org.osoa.sca.annotations.Remotable;
-
/**
* The service interface used when testing conversations
*
@@ -33,30 +32,30 @@ import org.osoa.sca.annotations.Remotable;
@Conversational
@Callback(ConversationalCallback.class)
public interface ConversationalService {
-
+
public void init();
-
+
public void destroy();
-
+
public void initializeCount(int count);
-
+
public void incrementCount();
-
+
public int retrieveCount();
-
- public void businessException() throws Exception;
-
+
+ public void businessException() throws Exception;
+
public void initializeCountCallback(int count);
-
+
public void incrementCountCallback();
-
+
public int retrieveCountCallback();
-
- public void businessExceptionCallback() throws Exception;
-
+
+ public void businessExceptionCallback() throws Exception;
+
@EndsConversation
public String endConversation();
-
+
public String endConversationCallback();
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index f1a21cc18f..2dc3c3e604 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
@@ -23,7 +23,6 @@ import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.EndsConversation;
import org.osoa.sca.annotations.Remotable;
-
/**
* The service interface used when testing conversations
*
@@ -33,30 +32,30 @@ import org.osoa.sca.annotations.Remotable;
@Conversational
@Callback(NonConversationalCallback.class)
public interface ConversationalServiceNonConversationalCallback {
-
+
public void init();
-
+
public void destroy();
-
+
public void initializeCount(int count);
-
+
public void incrementCount();
-
+
public int retrieveCount();
-
- public void businessException() throws Exception;
-
+
+ public void businessException() throws Exception;
+
public void initializeCountCallback(int count);
-
+
public void incrementCountCallback();
-
+
public int retrieveCountCallback();
-
- public void businessExceptionCallback() throws Exception;
-
+
+ public void businessExceptionCallback() throws Exception;
+
@EndsConversation
public String endConversation();
-
+
public String endConversationCallback();
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
index 74afbfb763..e7295a6aee 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
@@ -26,7 +26,7 @@ import org.osoa.sca.annotations.EndsConversation;
*/
@Conversational
public interface DService {
-
+
/**
* Returns the state for this service.
*
@@ -40,7 +40,7 @@ public interface DService {
* @param aState The state for this service
*/
void setState(String aState);
-
+
@EndsConversation
void endConversationViaAnnotatedMethod();
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index 3ce3e3ada7..d7b2248165 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
@@ -20,7 +20,6 @@ package org.apache.tuscany.sca.itest.conversational;
import org.osoa.sca.annotations.Remotable;
-
/**
* The callback interface used when testing conversational callbacks
*
@@ -28,19 +27,19 @@ import org.osoa.sca.annotations.Remotable;
*/
@Remotable
public interface NonConversationalCallback {
-
+
public void init();
-
+
public void destroy();
-
+
public void initializeCount(int count);
-
+
public void incrementCount();
-
+
public int retrieveCount();
-
- public void businessException() throws Exception;
-
+
+ public void businessException() throws Exception;
+
public String endConversation();
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
index 95c9c7ae6e..3b71679675 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
@@ -18,9 +18,6 @@
*/
package org.apache.tuscany.sca.itest.conversational.impl;
-import java.lang.reflect.Proxy;
-import org.apache.tuscany.sca.core.invocation.JDKInvocationHandler;
-
import org.apache.tuscany.sca.itest.conversational.AService;
import org.apache.tuscany.sca.itest.conversational.BService;
import org.apache.tuscany.sca.itest.conversational.Constants;
@@ -40,12 +37,12 @@ public class AServiceImpl implements AService {
* The state
*/
private String state = Constants.A_INITIAL_VALUE;
-
+
/**
* The reference to the other service
*/
private BService b;
-
+
/**
* Constructor
*
@@ -58,12 +55,12 @@ public class AServiceImpl implements AService {
* Inject the reference to the other service
* @param aB The other service.
*/
- @Reference(name="b")
+ @Reference(name = "b")
public void setB(BService aB) {
System.out.println("---> Setting reference to B on " + this + " to " + aB);
this.b = aB;
}
-
+
/**
* Returns the state for this service.
*
@@ -99,7 +96,7 @@ public class AServiceImpl implements AService {
public void setStateOnB(String aState) {
b.setState(aState);
}
-
+
/**
* Sets the conversation ID for this service
* @param id The Conversation ID
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
index a5f37f7a52..1a3cc562d6 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
@@ -39,10 +39,10 @@ import org.osoa.sca.annotations.Service;
public class AlphaImpl implements Alpha {
@Reference
public Beta beta;
-
+
@Context
protected ComponentContext componentContext;
-
+
public void run(int param) {
CallableReference<Gamma> gammaRef = null;
boolean testPassed = true;
@@ -61,8 +61,7 @@ public class AlphaImpl implements Alpha {
} finally {
TestResult.updateCompleted();
if (gammaRef != null) {
- TestResult.results.put(gammaRef.getConversation()
- .getConversationID(), testPassed);
+ TestResult.results.put(gammaRef.getConversation().getConversationID(), testPassed);
gammaRef.getService().stop();
}
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
index c1e27641ef..fd3734a953 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.sca.itest.conversational.impl;
-
import org.apache.tuscany.sca.itest.conversational.BService;
import org.apache.tuscany.sca.itest.conversational.Constants;
import org.osoa.sca.annotations.ConversationID;
@@ -43,7 +42,7 @@ public class BServiceImpl implements BService {
public BServiceImpl() {
System.out.println("---> BServiceImpl constructor for " + this);
}
-
+
/**
* Returns the state for this service.
*
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
index 900b8f743f..e2bca68220 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
@@ -42,8 +42,7 @@ public class BetaImpl implements Beta {
public Gamma gamma;
public CallableReference<Gamma> getRef(int param) {
- ServiceReference<Gamma> gammaRef = componentContext
- .getServiceReference(Gamma.class, "gamma");
+ ServiceReference<Gamma> gammaRef = componentContext.getServiceReference(Gamma.class, "gamma");
Gamma g = gammaRef.getService();
g.start(param);
return gammaRef;
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
index b21f956bd9..d13ff53350 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
@@ -47,7 +47,6 @@ public class CServiceImpl implements CService {
dServiceRef.getService().setState(aState);
}
-
/*
* When the coversationId is set manually the client may access the
* conversation id that will be used by the reference using
@@ -56,15 +55,15 @@ public class CServiceImpl implements CService {
public Object getConversationID() {
return dServiceRef.getConversationID();
}
-
+
/*
* Whether the conversation ID is chosen by the client or is generated by
* the system, the client may access the conversation ID by calling
* Conversation.getConversationID().
- */
+ */
public Object getConversationObjectConversationId() {
// TODO Auto-generated method stub
- if (dServiceRef.getConversation() != null){
+ if (dServiceRef.getConversation() != null) {
return dServiceRef.getConversation().getConversationID();
} else {
return null;
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 9deef312ac..8dccf41820 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
@@ -26,16 +26,16 @@ import org.osoa.sca.annotations.Service;
@Service(ConversationalService.class)
@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="1 seconds")
+@ConversationAttributes(maxAge = "1 seconds")
public class ConversationAgeComponentImpl implements ConversationalService {
private int count;
-
- public void businessException() throws Exception {
+
+ public void businessException() throws Exception {
+ }
+
+ public void businessExceptionCallback() throws Exception {
}
-
- public void businessExceptionCallback() throws Exception {
- }
public void destroy() {
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index cffa76186a..efbae3ad16 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
@@ -32,14 +32,14 @@ public class ConversationIdComponentImpl implements ConversationIdService {
public String cid;
private String setterCid;
-
+
public String getCIDField() {
return cid;
}
+
public String getCIDSetter() {
return setterCid;
}
-
@ConversationID
public void setCID(String cid) {
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index 1272c7ab7f..0604d0ca98 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
@@ -26,17 +26,17 @@ import org.osoa.sca.annotations.Service;
@Service(ConversationalService.class)
@Scope("CONVERSATION")
-@ConversationAttributes(maxIdleTime="1 seconds")
+@ConversationAttributes(maxIdleTime = "1 seconds")
public class ConversationMaxIdleComponentImpl implements ConversationalService {
private int count;
- public void businessException() throws Exception {
+ public void businessException() throws Exception {
}
-
- public void businessExceptionCallback() throws Exception {
- }
-
+
+ public void businessExceptionCallback() throws Exception {
+ }
+
public void destroy() {
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 847b038881..08d618018d 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
@@ -39,280 +39,284 @@ import org.osoa.sca.annotations.Service;
* @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
*/
-@Service(interfaces={ConversationalClient.class})
+@Service(interfaces = {ConversationalClient.class})
@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
- maxIdleTime="5 minutes",
- singlePrincipal=false)
+@ConversationAttributes(maxAge = "10 minutes", maxIdleTime = "5 minutes", singlePrincipal = false)
public class ConversationalClientStatefulImpl implements ConversationalClient, ConversationalCallback {
-
+
@Context
protected ComponentContext componentContext;
-
- @Reference
+
+ @Reference
protected ConversationalService conversationalService;
-
- @Reference
+
+ @Reference
protected ConversationalService conversationalService2;
-
+
@Reference
protected ConversationalReferenceClient conversationalReferenceClient;
-
+
private int clientCount = 0;
- private int callbackCount = 0;
-
-
+ private int callbackCount = 0;
+
// a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
+ public static StringBuffer calls = new StringBuffer();
+
// From ConversationalClient
- public int runConversationFromInjectedReference(){
- calls.append("runConversationFromInjectedReference,");
- conversationalService.initializeCount(1);
- conversationalService.incrementCount();
- clientCount = conversationalService.retrieveCount();
- conversationalService.endConversation();
-
- return clientCount;
- }
- public int runConversationFromInjectedReference2(){
+ public int runConversationFromInjectedReference() {
+ calls.append("runConversationFromInjectedReference,");
+ conversationalService.initializeCount(1);
+ conversationalService.incrementCount();
+ clientCount = conversationalService.retrieveCount();
+ conversationalService.endConversation();
+
+ return clientCount;
+ }
+
+ public int runConversationFromInjectedReference2() {
calls.append("runConversationFromInjectedReference2,");
-
+
conversationalService2.initializeCount(1);
conversationalService2.incrementCount();
-
+
// stick in a call to the first reference to
// make sure the two references don't clash
conversationalService.initializeCount(1);
-
+
clientCount = conversationalService2.retrieveCount();
conversationalService2.endConversation();
-
+
// end the conversation through the first reference
conversationalService.endConversation();
-
+
return clientCount;
- }
- public int runConversationFromServiceReference(){
+ }
+
+ public int runConversationFromServiceReference() {
calls.append("runConversationFromServiceReference,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
-
+
// serviceReference.getConversation().end();
-
+
return clientCount;
- }
- public int runConversationWithUserDefinedConversationId(){
+ }
+
+ public int runConversationWithUserDefinedConversationId() {
calls.append("runConversationWithUserDefinedConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
serviceReference.setConversationID("MyConversation1");
-
+
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
-
+
// serviceReference.getConversation().end();
-
+
return clientCount;
- }
- public String runConversationCheckUserDefinedConversationId(){
+ }
+
+ public String runConversationCheckUserDefinedConversationId() {
calls.append("runConversationCheckUserDefinedConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
serviceReference.setConversationID("MyConversation2");
-
+
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
clientCount = callableReference.retrieveCount();
-
+
String clientConversationId = serviceReference.getConversationID().toString();
String serverConversationId = callableReference.endConversation();
-
- if (clientConversationId.equals("MyConversation2") &&
- serverConversationId.equals("MyConversation2") ) {
+
+ if (clientConversationId.equals("MyConversation2") && serverConversationId.equals("MyConversation2")) {
return clientConversationId;
} else {
- return "client = " + clientConversationId +
- "server = " + serverConversationId;
- }
-
- }
- public int runConversationCheckingScope(){
+ return "client = " + clientConversationId + "server = " + serverConversationId;
+ }
+
+ }
+
+ public int runConversationCheckingScope() {
calls.append("runConversationCheckingScope,");
// run a conversation
return runConversationFromInjectedReference();
-
+
// test will then use a static method to find out how many times
// init/destroy were called
- }
- public int runConversationWithCallback(){
- calls.append("runConversationWithCallback,");
- callbackCount = 2;
+ }
+
+ public int runConversationWithCallback() {
+ calls.append("runConversationWithCallback,");
+ callbackCount = 2;
conversationalService.initializeCountCallback(1);
conversationalService.incrementCountCallback();
clientCount = conversationalService.retrieveCountCallback();
conversationalService.endConversationCallback();
-
+
return clientCount;
- }
- public int runConversationHavingPassedReference(){
+ }
+
+ public int runConversationHavingPassedReference() {
calls.append("runConversationHavingPassedReference,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
conversationalReferenceClient.incrementCount(serviceReference);
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
-
+
serviceReference.getConversation().end();
-
+
return clientCount;
}
- public String runConversationBusinessException(){
- calls.append("runConversationbusinessException,");
+
+ public String runConversationBusinessException() {
+ calls.append("runConversationbusinessException,");
try {
conversationalService.initializeCount(1);
conversationalService.businessException();
clientCount = conversationalService.retrieveCount();
conversationalService.endConversation();
- } catch(Exception ex) {
+ } catch (Exception ex) {
return ex.getMessage();
}
-
+
return "No Exception Returned";
}
-
- public String runConversationBusinessExceptionCallback(){
+
+ public String runConversationBusinessExceptionCallback() {
calls.append("runConversationbusinessExceptionCallback,");
try {
conversationalService.initializeCountCallback(1);
conversationalService.businessExceptionCallback();
clientCount = conversationalService.retrieveCountCallback();
conversationalService.endConversationCallback();
- } catch(Exception ex) {
+ } catch (Exception ex) {
return ex.getMessage();
}
-
+
return "No Exception Returned";
- }
-
- public int runConversationCallingEndedConversation(){
+ }
+
+ public int runConversationCallingEndedConversation() {
calls.append("runConversationCallingEndedConversation,");
conversationalService.initializeCount(1);
conversationalService.endConversation();
return conversationalService.retrieveCount();
- }
-
- public int runConversationCallingEndedConversationCallback(){
+ }
+
+ public int runConversationCallingEndedConversationCallback() {
calls.append("runConversationCallingEndedConversationCallback,");
conversationalService.initializeCountCallback(1);
conversationalService.endConversationCallback();
return conversationalService.retrieveCountCallback();
- }
-
- public String runConversationCallingEndedConversationCheckConversationId(){
+ }
+
+ public String runConversationCallingEndedConversationCheckConversationId() {
calls.append("runConversationCallingEndedConversationCheckConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
serviceReference.setConversationID("MyConversation3");
-
+
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
-
- if (serviceReference.getConversation() ==null ) {
+
+ if (serviceReference.getConversation() == null) {
return null;
} else {
return serviceReference.getConversation().getConversationID().toString();
}
- }
-
- public String runConversationCallingEndedConversationCallbackCheckConversationId(){
+ }
+
+ public String runConversationCallingEndedConversationCallbackCheckConversationId() {
calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
serviceReference.setConversationID("MyConversation3");
-
+
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
clientCount = callableReference.retrieveCount();
callableReference.endConversationCallback();
-
- if (serviceReference.getConversation() ==null ) {
+
+ if (serviceReference.getConversation() == null) {
return null;
} else {
return serviceReference.getConversation().getConversationID().toString();
}
- }
-
- public int runConversationAgeTimeout(){
+ }
+
+ public int runConversationAgeTimeout() {
calls.append("runConversationAgeTimeout,");
// done in other testing
return clientCount;
}
- public int runConversationIdleTimeout(){
+
+ public int runConversationIdleTimeout() {
calls.append("runConversationIdleTimeout,");
// done in other testing
return clientCount;
}
- public int runConversationPrincipleError(){
+
+ public int runConversationPrincipleError() {
calls.append("runConversationPrincipleError,");
// TODO - when policy framework is done
return clientCount;
}
-
-
+
// From ConversationalCallback
@Init
- public void init(){
+ public void init() {
calls.append("init,");
}
-
+
@Destroy
- public void destroy(){
- calls.append("destroy,");
+ public void destroy() {
+ calls.append("destroy,");
}
-
- public void initializeCount(int count){
+
+ public void initializeCount(int count) {
calls.append("initializeCount,");
callbackCount += count;
}
-
- public void incrementCount(){
+
+ public void incrementCount() {
calls.append("incrementCount,");
callbackCount++;
}
-
- public int retrieveCount(){
+
+ public int retrieveCount() {
calls.append("retrieveCount,");
- return callbackCount;
+ return callbackCount;
}
-
+
public void businessException() throws Exception {
throw new Exception("Business Exception");
- }
-
- public String endConversation(){
+ }
+
+ public String endConversation() {
calls.append("endConversation,");
callbackCount = 0;
return null;
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index b77e4c0194..7dbf7bcd3e 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
@@ -39,270 +39,277 @@ import org.osoa.sca.annotations.Service;
* @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
*/
-@Service(interfaces={ConversationalClient.class})
+@Service(interfaces = {ConversationalClient.class})
@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
- maxIdleTime="5 minutes",
- singlePrincipal=false)
-public class ConversationalClientStatefulNonConversationalCallbackImpl implements ConversationalClient, NonConversationalCallback {
-
+@ConversationAttributes(maxAge = "10 minutes", maxIdleTime = "5 minutes", singlePrincipal = false)
+public class ConversationalClientStatefulNonConversationalCallbackImpl implements ConversationalClient,
+ NonConversationalCallback {
+
@Context
protected ComponentContext componentContext;
-
- @Reference
+
+ @Reference
protected ConversationalService conversationalService;
-
- @Reference
+
+ @Reference
protected ConversationalService conversationalService2;
-
+
@Reference
protected ConversationalReferenceClient conversationalReferenceClient;
-
+
private int clientCount = 0;
- private int callbackCount = 0;
-
-
+ private int callbackCount = 0;
+
// a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
+ public static StringBuffer calls = new StringBuffer();
+
// From ConversationalClient
- public int runConversationFromInjectedReference(){
- calls.append("runConversationFromInjectedReference,");
- conversationalService.initializeCount(1);
- conversationalService.incrementCount();
- clientCount = conversationalService.retrieveCount();
- conversationalService.endConversation();
-
- return clientCount;
- }
- public int runConversationFromInjectedReference2(){
+ public int runConversationFromInjectedReference() {
+ calls.append("runConversationFromInjectedReference,");
+ conversationalService.initializeCount(1);
+ conversationalService.incrementCount();
+ clientCount = conversationalService.retrieveCount();
+ conversationalService.endConversation();
+
+ return clientCount;
+ }
+
+ public int runConversationFromInjectedReference2() {
calls.append("runConversationFromInjectedReference2,");
-
+
conversationalService2.initializeCount(1);
conversationalService2.incrementCount();
-
+
// stick in a call to the first reference to
// make sure the two references don't clash
conversationalService.initializeCount(1);
-
+
clientCount = conversationalService2.retrieveCount();
conversationalService2.endConversation();
-
+
// end the conversation through the first reference
conversationalService.endConversation();
-
+
return clientCount;
- }
- public int runConversationFromServiceReference(){
+ }
+
+ public int runConversationFromServiceReference() {
calls.append("runConversationFromServiceReference,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
-
+
// serviceReference.getConversation().end();
-
+
return clientCount;
- }
- public int runConversationWithUserDefinedConversationId(){
+ }
+
+ public int runConversationWithUserDefinedConversationId() {
calls.append("runConversationWithUserDefinedConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
serviceReference.setConversationID("MyConversation1");
-
+
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
-
+
// serviceReference.getConversation().end();
-
+
return clientCount;
- }
- public String runConversationCheckUserDefinedConversationId(){
+ }
+
+ public String runConversationCheckUserDefinedConversationId() {
calls.append("runConversationCheckUserDefinedConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
serviceReference.setConversationID("MyConversation2");
-
+
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
clientCount = callableReference.retrieveCount();
return callableReference.endConversation();
-
- }
- public int runConversationCheckingScope(){
+
+ }
+
+ public int runConversationCheckingScope() {
calls.append("runConversationCheckingScope,");
// run a conversation
return runConversationFromInjectedReference();
-
+
// test will then use a static method to find out how many times
// init/destroy were called
- }
- public int runConversationWithCallback(){
- calls.append("runConversationWithCallback,");
- callbackCount = 2;
+ }
+
+ public int runConversationWithCallback() {
+ calls.append("runConversationWithCallback,");
+ callbackCount = 2;
conversationalService.initializeCountCallback(1);
conversationalService.incrementCountCallback();
clientCount = conversationalService.retrieveCountCallback();
conversationalService.endConversationCallback();
-
+
return clientCount;
- }
- public int runConversationHavingPassedReference(){
+ }
+
+ public int runConversationHavingPassedReference() {
calls.append("runConversationHavingPassedReference,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
conversationalReferenceClient.incrementCount(serviceReference);
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
-
+
// serviceReference.getConversation().end();
-
+
return clientCount;
}
- public String runConversationBusinessException(){
- calls.append("runConversationbusinessException,");
+
+ public String runConversationBusinessException() {
+ calls.append("runConversationbusinessException,");
try {
conversationalService.initializeCount(1);
conversationalService.businessException();
clientCount = conversationalService.retrieveCount();
conversationalService.endConversation();
- } catch(Exception ex) {
+ } catch (Exception ex) {
return ex.getMessage();
}
-
+
return "No Exception Returned";
}
-
- public String runConversationBusinessExceptionCallback(){
+
+ public String runConversationBusinessExceptionCallback() {
calls.append("runConversationbusinessExceptionCallback,");
try {
conversationalService.initializeCountCallback(1);
conversationalService.businessExceptionCallback();
clientCount = conversationalService.retrieveCountCallback();
conversationalService.endConversationCallback();
- } catch(Exception ex) {
+ } catch (Exception ex) {
return ex.getMessage();
}
-
+
return "No Exception Returned";
- }
-
- public String runConversationCallingEndedConversationCheckConversationId(){
+ }
+
+ public String runConversationCallingEndedConversationCheckConversationId() {
calls.append("runConversationCallingEndedConversationCheckConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
serviceReference.setConversationID("MyConversation3");
-
+
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
-
- if (serviceReference.getConversation() ==null ) {
+
+ if (serviceReference.getConversation() == null) {
return null;
} else {
return serviceReference.getConversation().getConversationID().toString();
}
- }
-
- public String runConversationCallingEndedConversationCallbackCheckConversationId(){
+ }
+
+ public String runConversationCallingEndedConversationCallbackCheckConversationId() {
calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
serviceReference.setConversationID("MyConversation3");
-
+
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
clientCount = callableReference.retrieveCount();
callableReference.endConversationCallback();
-
- if (serviceReference.getConversation() ==null ) {
+
+ if (serviceReference.getConversation() == null) {
return null;
} else {
return serviceReference.getConversation().getConversationID().toString();
}
- }
-
- public int runConversationCallingEndedConversation(){
+ }
+
+ public int runConversationCallingEndedConversation() {
calls.append("runConversationCallingEndedConversation,");
conversationalService.initializeCount(1);
conversationalService.endConversation();
return conversationalService.retrieveCount();
- }
-
- public int runConversationCallingEndedConversationCallback(){
+ }
+
+ public int runConversationCallingEndedConversationCallback() {
calls.append("runConversationCallingEndedConversationCallback,");
conversationalService.initializeCountCallback(1);
conversationalService.endConversationCallback();
return conversationalService.retrieveCountCallback();
- }
-
- public int runConversationAgeTimeout(){
+ }
+
+ public int runConversationAgeTimeout() {
calls.append("runConversationAgeTimeout,");
// done in other testing
return clientCount;
}
- public int runConversationIdleTimeout(){
+
+ public int runConversationIdleTimeout() {
calls.append("runConversationIdleTimeout,");
// done in other testing
return clientCount;
}
- public int runConversationPrincipleError(){
+
+ public int runConversationPrincipleError() {
calls.append("runConversationPrincipleError,");
// TODO - when policy framework is done
return clientCount;
}
-
-
+
// From ConversationalCallback
@Init
- public void init(){
+ public void init() {
calls.append("init,");
}
-
+
@Destroy
- public void destroy(){
- calls.append("destroy,");
+ public void destroy() {
+ calls.append("destroy,");
}
-
- public void initializeCount(int count){
+
+ public void initializeCount(int count) {
calls.append("initializeCount,");
callbackCount += count;
}
-
- public void incrementCount(){
+
+ public void incrementCount() {
calls.append("incrementCount,");
callbackCount++;
}
-
- public int retrieveCount(){
+
+ public int retrieveCount() {
calls.append("retrieveCount,");
- return callbackCount;
+ return callbackCount;
}
-
+
public void businessException() throws Exception {
throw new Exception("Business Exception");
- }
-
- public String endConversation(){
+ }
+
+ public String endConversation() {
calls.append("endConversation,");
return null;
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index 5b3906fc2c..ddfed4519f 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
@@ -37,278 +37,283 @@ import org.osoa.sca.annotations.Service;
* @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
*/
-@Service(interfaces={ConversationalClient.class})
+@Service(interfaces = {ConversationalClient.class})
public class ConversationalClientStatelessImpl implements ConversationalClient, ConversationalCallback {
-
+
@Context
protected ComponentContext componentContext;
-
- @Reference
+
+ @Reference
protected ConversationalService conversationalService;
-
- @Reference
+
+ @Reference
protected ConversationalService conversationalService2;
-
+
@Reference
protected ConversationalReferenceClient conversationalReferenceClient;
-
+
private int clientCount = 0;
private int callbackCount = 0;
-
+
// a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
+ public static StringBuffer calls = new StringBuffer();
+
// From ConversationalClient
- public int runConversationFromInjectedReference(){
+ public int runConversationFromInjectedReference() {
calls.append("runConversationFromInjectedReference,");
conversationalService.initializeCount(1);
conversationalService.incrementCount();
clientCount = conversationalService.retrieveCount();
conversationalService.endConversation();
-
+
return clientCount;
}
- public int runConversationFromInjectedReference2(){
- calls.append("runConversationFromInjectedReference2,");
+
+ public int runConversationFromInjectedReference2() {
+ calls.append("runConversationFromInjectedReference2,");
// now test the second reference
conversationalService2.initializeCount(1);
conversationalService2.incrementCount();
-
+
// stick in a call to the first reference to
// make sure the two references don't clash
conversationalService.initializeCount(1);
-
+
clientCount = conversationalService2.retrieveCount();
conversationalService2.endConversation();
-
+
// end the conversation through the first reference
conversationalService.endConversation();
-
+
return clientCount;
}
- public int runConversationFromServiceReference(){
+
+ public int runConversationFromServiceReference() {
calls.append("runConversationFromServiceReference,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
-
+
// serviceReference.getConversation().end();
-
+
return clientCount;
- }
- public int runConversationWithUserDefinedConversationId(){
+ }
+
+ public int runConversationWithUserDefinedConversationId() {
calls.append("runConversationWithUserDefinedConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
serviceReference.setConversationID("MyConversation1");
-
+
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
-
+
// serviceReference.getConversation().end();
-
+
return clientCount;
- }
- public String runConversationCheckUserDefinedConversationId(){
+ }
+
+ public String runConversationCheckUserDefinedConversationId() {
calls.append("runConversationCheckUserDefinedConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
serviceReference.setConversationID("MyConversation2");
-
+
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
clientCount = callableReference.retrieveCount();
-
+
String clientConversationId = serviceReference.getConversationID().toString();
String serverConfersationId = callableReference.endConversation();
-
- if (clientConversationId.equals("MyConversation2") &&
- serverConfersationId.equals("MyConversation2") ) {
+
+ if (clientConversationId.equals("MyConversation2") && serverConfersationId.equals("MyConversation2")) {
return clientConversationId;
} else {
- return "client = " + clientConversationId +
- "server = " + serverConfersationId;
- }
- }
- public int runConversationCheckingScope(){
+ return "client = " + clientConversationId + "server = " + serverConfersationId;
+ }
+ }
+
+ public int runConversationCheckingScope() {
calls.append("runConversationCheckingScope,");
// run a conversation
return runConversationFromInjectedReference();
-
+
// test will then use a static method to find out how many times
// init/destroy were called
}
- public int runConversationWithCallback(){
+
+ public int runConversationWithCallback() {
calls.append("runConversationWithCallback,");
conversationalService.initializeCountCallback(1);
conversationalService.incrementCountCallback();
clientCount = conversationalService.retrieveCountCallback();
conversationalService.endConversationCallback();
-
+
return clientCount;
- }
-
- public int runConversationHavingPassedReference(){
+ }
+
+ public int runConversationHavingPassedReference() {
calls.append("runConversationHavingPassedReference,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
conversationalReferenceClient.incrementCount(serviceReference);
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
-
+
serviceReference.getConversation().end();
-
+
return clientCount;
- }
-
- public String runConversationBusinessException(){
- calls.append("runConversationbusinessException,");
- try {
+ }
+
+ public String runConversationBusinessException() {
+ calls.append("runConversationbusinessException,");
+ try {
conversationalService.initializeCount(1);
conversationalService.businessException();
clientCount = conversationalService.retrieveCount();
conversationalService.endConversation();
- } catch(Exception ex) {
- return ex.getMessage();
- }
-
+ } catch (Exception ex) {
+ return ex.getMessage();
+ }
+
return "No Exception Returned";
}
-
- public String runConversationBusinessExceptionCallback(){
+
+ public String runConversationBusinessExceptionCallback() {
calls.append("runConversationbusinessExceptionCallback,");
try {
conversationalService.initializeCountCallback(1);
conversationalService.businessExceptionCallback();
clientCount = conversationalService.retrieveCountCallback();
conversationalService.endConversationCallback();
- } catch(Exception ex) {
+ } catch (Exception ex) {
return ex.getMessage();
}
-
+
return "No Exception Returned";
- }
-
- public int runConversationCallingEndedConversation(){
+ }
+
+ public int runConversationCallingEndedConversation() {
calls.append("runConversationCallingEndedConversation,");
conversationalService.initializeCount(1);
conversationalService.endConversation();
return conversationalService.retrieveCount();
- }
-
- public int runConversationCallingEndedConversationCallback(){
+ }
+
+ public int runConversationCallingEndedConversationCallback() {
calls.append("runConversationCallingEndedConversationCallback,");
conversationalService.initializeCountCallback(1);
conversationalService.endConversationCallback();
return conversationalService.retrieveCountCallback();
- }
-
- public String runConversationCallingEndedConversationCheckConversationId(){
+ }
+
+ public String runConversationCallingEndedConversationCheckConversationId() {
calls.append("runConversationCallingEndedConversationCheckConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
serviceReference.setConversationID("MyConversation3");
-
+
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
clientCount = callableReference.retrieveCount();
callableReference.endConversation();
-
- if (serviceReference.getConversation() ==null ) {
+
+ if (serviceReference.getConversation() == null) {
return null;
} else {
return serviceReference.getConversation().getConversationID().toString();
}
- }
-
- public String runConversationCallingEndedConversationCallbackCheckConversationId(){
+ }
+
+ public String runConversationCallingEndedConversationCallbackCheckConversationId() {
calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");
- ServiceReference<ConversationalService> serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
+ ServiceReference<ConversationalService> serviceReference =
+ componentContext.getServiceReference(ConversationalService.class, "conversationalService");
serviceReference.setConversationID("MyConversation3");
-
+
ConversationalService callableReference = serviceReference.getService();
-
+
callableReference.initializeCount(1);
callableReference.incrementCount();
clientCount = callableReference.retrieveCount();
callableReference.endConversationCallback();
-
- if (serviceReference.getConversation() ==null ) {
+
+ if (serviceReference.getConversation() == null) {
return null;
} else {
return serviceReference.getConversation().getConversationID().toString();
- }
- }
-
- public int runConversationAgeTimeout(){
+ }
+ }
+
+ public int runConversationAgeTimeout() {
calls.append("runConversationAgeTimeout,");
// done in other testing
return clientCount;
}
- public int runConversationIdleTimeout(){
+
+ public int runConversationIdleTimeout() {
calls.append("runConversationIdleTimeout,");
// done in other testing
return clientCount;
}
- public int runConversationPrincipleError(){
+
+ public int runConversationPrincipleError() {
calls.append("runConversationPrincipleError,");
// TODO - when policy framework is done
return clientCount;
}
-
-
+
// From ConversationalCallback
@Init
- public void init(){
+ public void init() {
calls.append("init,");
}
-
+
@Destroy
- public void destroy(){
+ public void destroy() {
calls.append("destroy,");
-
+
}
-
- public void initializeCount(int count){
+
+ public void initializeCount(int count) {
calls.append("initializeCount,");
callbackCount = 0;
}
-
- public void incrementCount(){
+
+ public void incrementCount() {
calls.append("incrementCount,");
callbackCount++;
}
-
- public int retrieveCount(){
+
+ public int retrieveCount() {
calls.append("retrieveCount,");
- return callbackCount;
+ return callbackCount;
}
-
+
public void businessException() throws Exception {
throw new Exception("Business Exception");
- }
-
- public String endConversation(){
+ }
+
+ public String endConversation() {
calls.append("endConversation,");
callbackCount = 0;
return null;
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 8fe7c5b6ba..14487dcf69 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
@@ -30,14 +30,13 @@ import org.osoa.sca.annotations.Service;
* @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
*/
-@Service(interfaces={ConversationalReferenceClient.class})
-public class ConversationalReferenceClientImpl implements ConversationalReferenceClient{
-
- public void incrementCount(CallableReference<ConversationalService> conversationalService){
+@Service(interfaces = {ConversationalReferenceClient.class})
+public class ConversationalReferenceClientImpl implements ConversationalReferenceClient {
+
+ public void incrementCount(CallableReference<ConversationalService> conversationalService) {
ConversationalService callableReference = conversationalService.getService();
-
- callableReference.incrementCount();
- }
+ callableReference.incrementCount();
+ }
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index 9a25f0f59a..60638d70f9 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
@@ -29,7 +29,6 @@ import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-
/**
* The service used when testing stateful conversations
*
@@ -38,86 +37,86 @@ import org.osoa.sca.annotations.Service;
@Service(ConversationalService.class)
@Scope("REQUEST")
public class ConversationalServiceRequestImpl implements ConversationalService {
-
+
@ConversationID
protected String conversationId;
-
+
@Callback
- protected ConversationalCallback conversationalCallback;
-
+ protected ConversationalCallback conversationalCallback;
+
// static area in which to hold conversational data
private static HashMap<String, Integer> conversationalState = new HashMap<String, Integer>();
-
+
// a static member variable that records the number of times this service is called
public static StringBuffer calls = new StringBuffer();
-
+
@Init
- public void init(){
+ public void init() {
calls.append("init,");
}
-
+
@Destroy
- public void destroy(){
+ public void destroy() {
calls.append("destroy,");
}
-
- public void initializeCount(int count){
+
+ public void initializeCount(int count) {
calls.append("initializeCount,");
- Integer conversationalCount = new Integer(count);
+ Integer conversationalCount = new Integer(count);
conversationalState.put(conversationId, conversationalCount);
}
-
- public void incrementCount(){
+
+ public void incrementCount() {
calls.append("incrementCount,");
Integer conversationalCount = conversationalState.get(conversationId);
conversationalCount++;
conversationalState.put(conversationId, conversationalCount);
}
-
- public int retrieveCount(){
+
+ public int retrieveCount() {
calls.append("retrieveCount,");
Integer count = conversationalState.get(conversationId);
- if (count != null){
+ if (count != null) {
return count.intValue();
} else {
return -999;
}
}
-
+
public void businessException() throws Exception {
throw new Exception("Business Exception");
- }
-
- public void initializeCountCallback(int count){
+ }
+
+ public void initializeCountCallback(int count) {
calls.append("initializeCountCallback,");
initializeCount(count);
conversationalCallback.initializeCount(count);
}
-
- public void incrementCountCallback(){
+
+ public void incrementCountCallback() {
calls.append("incrementCountCallback,");
incrementCount();
conversationalCallback.incrementCount();
}
-
- public int retrieveCountCallback(){
+
+ public int retrieveCountCallback() {
calls.append("retrieveCountCallback,");
return conversationalCallback.retrieveCount();
}
-
+
public void businessExceptionCallback() throws Exception {
- calls.append("businessExceptionCallback,");
+ calls.append("businessExceptionCallback,");
conversationalCallback.businessException();
}
-
- public String endConversation(){
+
+ public String endConversation() {
calls.append("endConversation,");
conversationalState.remove(conversationId);
return conversationId;
}
-
- public String endConversationCallback(){
- calls.append("endConversationCallback,");
+
+ public String endConversationCallback() {
+ calls.append("endConversationCallback,");
return conversationalCallback.endConversation();
- }
+ }
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index efcbdff06f..cf95cc83f3 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
@@ -28,7 +28,6 @@ import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-
/**
* The service used when testing stateful conversations
*
@@ -36,82 +35,80 @@ import org.osoa.sca.annotations.Service;
*/
@Service(ConversationalService.class)
@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
- maxIdleTime="5 minutes",
- singlePrincipal=false)
+@ConversationAttributes(maxAge = "10 minutes", maxIdleTime = "5 minutes", singlePrincipal = false)
public class ConversationalServiceStatefulImpl implements ConversationalService {
@ConversationID
protected String conversationId;
-
+
@Callback
- protected ConversationalCallback conversationalCallback;
-
+ protected ConversationalCallback conversationalCallback;
+
// local count - accumulates during the conversation
private int count = 0;
-
+
// a static member variable that records the number of times this service is called
public static StringBuffer calls = new StringBuffer();
-
+
@Init
- public void init(){
+ public void init() {
calls.append("init,");
}
-
+
@Destroy
- public void destroy(){
+ public void destroy() {
calls.append("destroy,");
}
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
+
+ public void initializeCount(int count) {
+ calls.append("initializeCount,");
this.count = count;
}
-
- public void incrementCount(){
- calls.append("incrementCount,");
+
+ public void incrementCount() {
+ calls.append("incrementCount,");
count++;
}
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
+
+ public int retrieveCount() {
+ calls.append("retrieveCount,");
return count;
}
-
+
public void businessException() throws Exception {
throw new Exception("Business Exception");
- }
-
- public void initializeCountCallback(int count){
- calls.append("initializeCountCallback,");
+ }
+
+ public void initializeCountCallback(int count) {
+ calls.append("initializeCountCallback,");
this.count = count;
conversationalCallback.initializeCount(count);
}
-
- public void incrementCountCallback(){
- calls.append("incrementCountCallback,");
+
+ public void incrementCountCallback() {
+ calls.append("incrementCountCallback,");
count++;
conversationalCallback.incrementCount();
}
-
- public int retrieveCountCallback(){
- calls.append("retrieveCountCallback,");
+
+ public int retrieveCountCallback() {
+ calls.append("retrieveCountCallback,");
return conversationalCallback.retrieveCount();
}
-
+
public void businessExceptionCallback() throws Exception {
- calls.append("businessExceptionCallback,");
+ calls.append("businessExceptionCallback,");
conversationalCallback.businessException();
- }
-
- public String endConversation(){
- calls.append("endConversation,");
+ }
+
+ public String endConversation() {
+ calls.append("endConversation,");
count = 0;
return conversationId;
}
-
- public String endConversationCallback(){
- calls.append("endConversationCallback,");
+
+ public String endConversationCallback() {
+ calls.append("endConversationCallback,");
return conversationalCallback.endConversation();
}
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index 8454b3846b..ebb474e3fe 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
@@ -28,7 +28,6 @@ import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-
/**
* The service used when testing stateful conversations
*
@@ -36,82 +35,81 @@ import org.osoa.sca.annotations.Service;
*/
@Service(ConversationalServiceNonConversationalCallback.class)
@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
- maxIdleTime="5 minutes",
- singlePrincipal=false)
-public class ConversationalServiceStatefulNonConversationalCallbackImpl implements ConversationalServiceNonConversationalCallback {
+@ConversationAttributes(maxAge = "10 minutes", maxIdleTime = "5 minutes", singlePrincipal = false)
+public class ConversationalServiceStatefulNonConversationalCallbackImpl implements
+ ConversationalServiceNonConversationalCallback {
@ConversationID
protected String conversationId;
-
+
@Callback
- protected NonConversationalCallback nonConversationalCallback;
-
+ protected NonConversationalCallback nonConversationalCallback;
+
// local count - accumulates during the conversation
private int count = 0;
-
+
// a static member variable that records the number of times this service is called
public static StringBuffer calls = new StringBuffer();
-
+
@Init
- public void init(){
+ public void init() {
calls.append("init,");
}
-
+
@Destroy
- public void destroy(){
+ public void destroy() {
calls.append("destroy,");
}
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
+
+ public void initializeCount(int count) {
+ calls.append("initializeCount,");
this.count = count;
}
-
- public void incrementCount(){
- calls.append("incrementCount,");
+
+ public void incrementCount() {
+ calls.append("incrementCount,");
count++;
}
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
+
+ public int retrieveCount() {
+ calls.append("retrieveCount,");
return count;
}
-
+
public void businessException() throws Exception {
throw new Exception("Business Exception");
- }
-
- public void initializeCountCallback(int count){
- calls.append("initializeCountCallback,");
+ }
+
+ public void initializeCountCallback(int count) {
+ calls.append("initializeCountCallback,");
this.count = count;
nonConversationalCallback.initializeCount(count);
}
-
- public void incrementCountCallback(){
- calls.append("incrementCountCallback,");
+
+ public void incrementCountCallback() {
+ calls.append("incrementCountCallback,");
count++;
nonConversationalCallback.incrementCount();
}
-
- public int retrieveCountCallback(){
- calls.append("retrieveCountCallback,");
+
+ public int retrieveCountCallback() {
+ calls.append("retrieveCountCallback,");
return nonConversationalCallback.retrieveCount();
}
-
+
public void businessExceptionCallback() throws Exception {
- calls.append("businessExceptionCallback,");
+ calls.append("businessExceptionCallback,");
nonConversationalCallback.businessException();
- }
-
- public String endConversation(){
- calls.append("endConversation,");
+ }
+
+ public String endConversation() {
+ calls.append("endConversation,");
count = 0;
return conversationId;
}
-
- public String endConversationCallback(){
- calls.append("endConversationCallback,");
+
+ public String endConversationCallback() {
+ calls.append("endConversationCallback,");
return nonConversationalCallback.endConversation();
}
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index 07186c91e1..ac8e7c8d18 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
@@ -29,7 +29,6 @@ import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-
/**
* The service used when testing stateful conversations
*
@@ -38,86 +37,86 @@ import org.osoa.sca.annotations.Service;
@Service(ConversationalService.class)
@Scope("STATELESS")
public class ConversationalServiceStatelessImpl implements ConversationalService {
-
+
@ConversationID
protected String conversationId;
-
+
@Callback
- protected ConversationalCallback conversationalCallback;
-
+ protected ConversationalCallback conversationalCallback;
+
// static area in which to hold conversational data
private static HashMap<String, Integer> conversationalState = new HashMap<String, Integer>();
-
+
// a static member variable that records the number of times this service is called
public static StringBuffer calls = new StringBuffer();
-
+
@Init
- public void init(){
+ public void init() {
calls.append("init,");
}
-
+
@Destroy
- public void destroy(){
+ public void destroy() {
calls.append("destroy,");
}
-
- public void initializeCount(int count){
+
+ public void initializeCount(int count) {
calls.append("initializeCount,");
- Integer conversationalCount = new Integer(count);
+ Integer conversationalCount = new Integer(count);
conversationalState.put(conversationId, conversationalCount);
}
-
- public void incrementCount(){
+
+ public void incrementCount() {
calls.append("incrementCount,");
Integer conversationalCount = conversationalState.get(conversationId);
conversationalCount++;
conversationalState.put(conversationId, conversationalCount);
}
-
- public int retrieveCount(){
+
+ public int retrieveCount() {
calls.append("retrieveCount,");
Integer count = conversationalState.get(conversationId);
- if (count != null){
+ if (count != null) {
return count.intValue();
} else {
return -999;
}
}
-
+
public void businessException() throws Exception {
throw new Exception("Business Exception");
- }
-
- public void initializeCountCallback(int count){
+ }
+
+ public void initializeCountCallback(int count) {
calls.append("initializeCountCallback,");
initializeCount(count);
conversationalCallback.initializeCount(count);
}
-
- public void incrementCountCallback(){
+
+ public void incrementCountCallback() {
calls.append("incrementCountCallback,");
incrementCount();
conversationalCallback.incrementCount();
}
-
- public int retrieveCountCallback(){
+
+ public int retrieveCountCallback() {
calls.append("retrieveCountCallback,");
return conversationalCallback.retrieveCount();
}
-
+
public void businessExceptionCallback() throws Exception {
- calls.append("businessExceptionCallback,");
+ calls.append("businessExceptionCallback,");
conversationalCallback.businessException();
}
-
- public String endConversation(){
+
+ public String endConversation() {
calls.append("endConversation,");
conversationalState.remove(conversationId);
return conversationId;
}
-
- public String endConversationCallback(){
- calls.append("endConversationCallback,");
+
+ public String endConversationCallback() {
+ calls.append("endConversationCallback,");
return conversationalCallback.endConversation();
- }
+ }
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index 344aa99dff..3abeda9ba3 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
@@ -33,10 +33,10 @@ public class ConversationalServiceStatelessScopeImpl implements ConversationalSe
protected String cid;
static Map<String, Integer> state = new HashMap<String, Integer>();
-
+
public void destroy() {
// TODO Auto-generated method stub
-
+
}
public String endConversation() {
@@ -47,25 +47,25 @@ public class ConversationalServiceStatelessScopeImpl implements ConversationalSe
public String endConversationCallback() {
// TODO Auto-generated method stub
return null;
-
+
}
public void incrementCount() {
- state.put(cid, Integer.valueOf(state.get(cid)+1));
+ state.put(cid, Integer.valueOf(state.get(cid) + 1));
}
public void businessException() throws Exception {
throw new Exception("Business Exception");
}
-
+
public void incrementCountCallback() {
// TODO Auto-generated method stub
-
+
}
public void init() {
// TODO Auto-generated method stub
-
+
}
public void initializeCount(int count) {
@@ -74,12 +74,12 @@ public class ConversationalServiceStatelessScopeImpl implements ConversationalSe
public void initializeCountCallback(int count) {
// TODO Auto-generated method stub
-
+
}
-
+
public void businessExceptionCallback() throws Exception {
throw new Exception("Business Exception");
- }
+ }
public int retrieveCount() {
return state.get(cid);
@@ -89,5 +89,5 @@ public class ConversationalServiceStatelessScopeImpl implements ConversationalSe
// TODO Auto-generated method stub
return 0;
}
-
+
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
index 8d79bb75e8..610a81aaa8 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
@@ -18,11 +18,8 @@
*/
package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.Constants;
import org.apache.tuscany.sca.itest.conversational.DService;
import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.EndsConversation;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
@@ -62,10 +59,10 @@ public class DServiceImpl implements DService {
*/
@ConversationID
public void setConversationID(String id) {
- System.out.println ("Setting conversation ID at service = " + id );
+ System.out.println("Setting conversation ID at service = " + id);
}
-
+
public void endConversationViaAnnotatedMethod() {
- System.out.println ("Annotated Ends Conversation");
+ System.out.println("Annotated Ends Conversation");
}
}
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
index d1b769216b..67305698f1 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
@@ -37,7 +37,7 @@ public class GammaImpl implements Gamma {
public String conversationId;
private ArrayList<Record> list;
-
+
public void start(int param) {
list = new ArrayList<Record>();
fillList(param, conversationId);
@@ -54,7 +54,7 @@ public class GammaImpl implements Gamma {
public void stop() {
list = null;
}
-
+
private void fillList(int param, String cid) {
for (int i = 0; i < param; i++) {
Record record = new Record();
diff --git a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
index 3e750bdd1e..e64a9acbe2 100644
--- a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
+++ b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
@@ -19,8 +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;
@@ -28,25 +30,25 @@ import org.junit.Test;
public class ConversationIdTestCase {
- private SCADomain domain;
+ private Node node;
@Before
public void setUp() throws Exception {
- domain = SCADomain.newInstance("conversationId.composite");
-
+ String location = ContributionLocationHelper.getContributionLocation("conversationId.composite");
+ node = NodeFactory.newInstance().createNode("conversationId.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 testConversationId() {
- ConversationIdService service =
- domain.getService(ConversationIdService.class, "ConversationIdComponent");
+ ConversationIdService service = node.getService(ConversationIdService.class, "ConversationIdComponent");
Assert.assertNotNull(service.getCIDField());
Assert.assertNotNull(service.getCIDSetter());
}
diff --git a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
index 326a833a42..2b1aea3ff3 100644
--- a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
+++ b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
@@ -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 @@ public class ConversationLifetimeTestCase {
*/
@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 @@ public class ConversationLifetimeTestCase {
@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 @@ public class ConversationLifetimeTestCase {
*/
@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 @@ public class ConversationLifetimeTestCase {
*/
@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 @@ public class ConversationLifetimeTestCase {
*/
@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 @@ public class ConversationLifetimeTestCase {
*/
@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 @@ public class ConversationLifetimeTestCase {
*/
@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 @@ public class ConversationLifetimeTestCase {
*/
@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 @@ public class ConversationLifetimeTestCase {
*/
@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 @@ public class ConversationLifetimeTestCase {
*/
@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();
diff --git a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
index 431962221a..f9bb69aa30 100644
--- a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
+++ b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
@@ -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 @@ import org.junit.Test;
*/
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 @@ public class ConversationUniqueIdTestCase {
} catch (InterruptedException e) {
}
}
-
+
Assert.assertEquals(TestResult.results.size(), numConversations);
- for(Boolean value : TestResult.results.values()) {
+ for (Boolean value : TestResult.results.values()) {
Assert.assertTrue(value);
}
}
diff --git a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
index cc31c77873..58afba0d10 100644
--- a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
+++ b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
@@ -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 class ConversationalAgeTestCase {
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 class ConversationalAgeTestCase {
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 class ConversationalAgeTestCase {
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);
diff --git a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
index 8480e04028..ee1bf84fc4 100644
--- a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
+++ b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
@@ -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 @@ import org.junit.Test;
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 @@ public class ConversationalJ2SETestCase {
@Test
public void testStatelessConversation() {
ConversationalService conversationalService =
- domain.getService(ConversationalService.class, "ConversationalServiceStateless");
+ node.getService(ConversationalService.class, "ConversationalServiceStateless");
conversationalService.initializeCount(1);
Assert.assertEquals(1, conversationalService.retrieveCount());
diff --git a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
index da359bc296..56bca7ac78 100644
--- a/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
+++ b/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
@@ -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.ConversationalServiceReq
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 class ConversationalTestCase {
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 class ConversationalTestCase {
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 class ConversationalTestCase {
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 @@ public class ConversationalTestCase {
// 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 @@ public class ConversationalTestCase {
// 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 =========");
}
-
+
}