Author: antelder
Date: Thu Jul 19 08:14:46 2007
New Revision: 557654
URL: http://svn.apache.org/viewvc?view=rev&rev=557654
Log:
Add a conversational j2se client test
Added:
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScope.java
(with props)
Modified:
incubator/tuscany/java/sca/itest/conversations/src/main/resources/conversational.composite
incubator/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETest.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
Added:
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScope.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScope.java?view=auto&rev=557654
==============================================================================
---
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScope.java
(added)
+++
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScope.java
Thu Jul 19 08:14:46 2007
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.itest.conversational.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.itest.conversational.ConversationalService;
+import org.osoa.sca.annotations.ConversationID;
+import org.osoa.sca.annotations.Service;
+
[EMAIL PROTECTED](ConversationalService.class)
+public class ConversationalServiceStatelessScope implements
ConversationalService {
+
+ @ConversationID
+ String cid;
+
+ static Map<String, Integer> state = new HashMap<String, Integer>();
+
+ public void destroy() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void endConversation() {
+ state.remove(cid);
+ }
+
+ public void endConversationCallback() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void incrementCount() {
+ state.put(cid, Integer.valueOf(state.get(cid)+1));
+ }
+
+ public void incrementCountCallback() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void init() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void initializeCount(int count) {
+ state.put(cid, Integer.valueOf(count));
+ }
+
+ public void initializeCountCallback(int count) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public int retrieveCount() {
+ return state.get(cid);
+ }
+
+ public int retrieveCountCallback() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+}
Propchange:
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScope.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScope.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
incubator/tuscany/java/sca/itest/conversations/src/main/resources/conversational.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/main/resources/conversational.composite?view=diff&rev=557654&r1=557653&r2=557654
==============================================================================
---
incubator/tuscany/java/sca/itest/conversations/src/main/resources/conversational.composite
(original)
+++
incubator/tuscany/java/sca/itest/conversations/src/main/resources/conversational.composite
Thu Jul 19 08:14:46 2007
@@ -35,4 +35,8 @@
<implementation.java
class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl"/>
</component>
+ <component name="ConversationalServiceStateless">
+ <implementation.java
class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessScope"/>
+ </component>
+
</composite>
Modified:
incubator/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETest.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETest.java?view=diff&rev=557654&r1=557653&r2=557654
==============================================================================
---
incubator/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETest.java
(original)
+++
incubator/tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETest.java
Thu Jul 19 08:14:46 2007
@@ -28,23 +28,25 @@
public class ConversationalJ2SETest {
private SCADomain domain;
- private ConversationalService conversationalService;
@Before
public void setUp() throws Exception {
domain = SCADomain.newInstance("conversational.composite");
- conversationalService = domain.getService(ConversationalService.class,
-
"ConversationalServiceStateful");
}
@After
public void tearDown() throws Exception {
- domain.close();
+ if (domain != null) {
+ domain.close();
+ }
}
-
+
@Test
public void testStatefulConversation() {
+ ConversationalService conversationalService =
+ domain.getService(ConversationalService.class,
"ConversationalServiceStateful");
+
conversationalService.initializeCount(1);
Assert.assertEquals(1, conversationalService.retrieveCount());
conversationalService.incrementCount();
@@ -52,13 +54,31 @@
conversationalService.endConversation();
Assert.assertEquals(0, conversationalService.retrieveCount());
-
+
+ conversationalService.initializeCount(4);
+ Assert.assertEquals(4, conversationalService.retrieveCount());
+ conversationalService.incrementCount();
+ Assert.assertEquals(5, conversationalService.retrieveCount());
+ conversationalService.endConversation();
+
+ }
+
+ @Test
+ public void testStatelessConversation() {
+ ConversationalService conversationalService =
+ domain.getService(ConversationalService.class,
"ConversationalServiceStateless");
+
+ conversationalService.initializeCount(1);
+ Assert.assertEquals(1, conversationalService.retrieveCount());
+ conversationalService.incrementCount();
+ Assert.assertEquals(2, conversationalService.retrieveCount());
+ conversationalService.endConversation();
+
conversationalService.initializeCount(4);
Assert.assertEquals(4, conversationalService.retrieveCount());
conversationalService.incrementCount();
Assert.assertEquals(5, conversationalService.retrieveCount());
conversationalService.endConversation();
-
- }
+ }
}
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java?view=diff&rev=557654&r1=557653&r2=557654
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
Thu Jul 19 08:14:46 2007
@@ -96,7 +96,6 @@
}
public void remove() throws PersistenceException {
- throw new UnsupportedOperationException("Scope does not support
persistence");
}
public void returnWrapper(InstanceWrapper wrapper, KEY contextId) throws
TargetDestructionException {
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java?view=diff&rev=557654&r1=557653&r2=557654
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
Thu Jul 19 08:14:46 2007
@@ -44,7 +44,7 @@
public InstanceWrapper getAssociatedWrapper(KEY contextId)
throws TargetResolutionException {
- throw new UnsupportedOperationException();
+ return getWrapper(contextId);
}
public void returnWrapper(InstanceWrapper wrapper, KEY contextId)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
