You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/11/25 08:04:47 UTC
svn commit: r479093 [2/5] - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/component/scope/
kernel/core/src/main/java/org/apache/tuscany/core/idl/java/
kernel/core/src/main/java/org/apache/tuscany/core/implementation/...
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeContainerPersistenceTestCase.java Fri Nov 24 23:04:41 2006
@@ -44,8 +44,8 @@
* Verifies the scope container properly creates an instance
*/
public void testNotYetPersistedInMemory() {
- UUID id = UUID.randomUUID();
- context.setIdentifier(Scope.CONVERSATIONAL, id);
+ String id = UUID.randomUUID().toString();
+ context.setIdentifier(Scope.CONVERSATION, id);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
component.addListener(EasyMock.eq(container));
EasyMock.expect(component.createInstance()).andReturn(new Foo());
@@ -56,9 +56,9 @@
}
public void testPersistNewInMemory() throws Exception {
- UUID id = UUID.randomUUID();
- UUID id2 = UUID.randomUUID();
- context.setIdentifier(Scope.CONVERSATIONAL, id);
+ String id = UUID.randomUUID().toString();
+ String id2 = UUID.randomUUID().toString();
+ context.setIdentifier(Scope.CONVERSATION, id);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
component.addListener(EasyMock.eq(container));
EasyMock.replay(component);
@@ -68,14 +68,14 @@
container.persistNew(component, id, foo, System.currentTimeMillis() + 100000);
assertEquals(foo, container.getInstance(component));
container.persistNew(component, id2, foo2, System.currentTimeMillis() + 100000);
- context.setIdentifier(Scope.CONVERSATIONAL, id2);
+ context.setIdentifier(Scope.CONVERSATION, id2);
assertEquals(foo2, container.getInstance(component));
EasyMock.verify(component);
}
public void testPersistInMemory() throws Exception {
- UUID id = UUID.randomUUID();
- context.setIdentifier(Scope.CONVERSATIONAL, id);
+ String id = UUID.randomUUID().toString();
+ context.setIdentifier(Scope.CONVERSATION, id);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
component.addListener(EasyMock.eq(container));
EasyMock.replay(component);
@@ -89,8 +89,8 @@
}
public void testRemoveInMemory() throws Exception {
- UUID id = UUID.randomUUID();
- context.setIdentifier(Scope.CONVERSATIONAL, id);
+ String id = UUID.randomUUID().toString();
+ context.setIdentifier(Scope.CONVERSATION, id);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
component.addListener(EasyMock.eq(container));
EasyMock.expect(component.getName()).andReturn("foo").atLeastOnce();
@@ -101,7 +101,7 @@
assertEquals(foo, container.getInstance(component));
container.remove(component, id);
try {
- container.getPersistedInstance(component);
+ container.getAssociatedInstance(component);
fail();
} catch (TargetNotFoundException e) {
//expected
@@ -110,8 +110,8 @@
}
public void testRecreateAfterRemoveInMemory() throws Exception {
- UUID id = UUID.randomUUID();
- context.setIdentifier(Scope.CONVERSATIONAL, id);
+ String id = UUID.randomUUID().toString();
+ context.setIdentifier(Scope.CONVERSATION, id);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
component.addListener(EasyMock.eq(container));
EasyMock.expect(component.createInstance()).andReturn(new Foo());
@@ -128,9 +128,9 @@
}
public void testGetPersistedInstance() throws Exception {
- UUID id = UUID.randomUUID();
- UUID id2 = UUID.randomUUID();
- context.setIdentifier(Scope.CONVERSATIONAL, id);
+ String id = UUID.randomUUID().toString();
+ String id2 = UUID.randomUUID().toString();
+ context.setIdentifier(Scope.CONVERSATION, id);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.getName()).andReturn("foo").atLeastOnce();
component.addListener(EasyMock.eq(container));
@@ -138,11 +138,11 @@
container.register(component);
Foo foo = new Foo();
container.persistNew(component, id, foo, System.currentTimeMillis() + 100000);
- assertEquals(foo, container.getPersistedInstance(component));
- assertEquals(foo, container.getPersistedInstance(component));
- context.setIdentifier(Scope.CONVERSATIONAL, id2);
+ assertEquals(foo, container.getAssociatedInstance(component));
+ assertEquals(foo, container.getAssociatedInstance(component));
+ context.setIdentifier(Scope.CONVERSATION, id2);
try {
- container.getPersistedInstance(component);
+ container.getAssociatedInstance(component);
fail();
} catch (TargetNotFoundException e) {
//expected
@@ -162,7 +162,7 @@
protected void tearDown() throws Exception {
super.tearDown();
- context.clearIdentifier(Scope.CONVERSATIONAL);
+ context.clearIdentifier(Scope.CONVERSATION);
container.stop();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeInstanceLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeInstanceLifecycleTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeInstanceLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeInstanceLifecycleTestCase.java Fri Nov 24 23:04:41 2006
@@ -63,7 +63,7 @@
destroyOnlyContext.start();
Object conversation = new Object();
- ctx.setIdentifier(Scope.CONVERSATIONAL, conversation);
+ ctx.setIdentifier(Scope.CONVERSATION, conversation);
scope.onEvent(new ConversationStart(this, conversation));
ConversationalScopeInitDestroyComponent initDestroy =
(ConversationalScopeInitDestroyComponent) scope.getInstance(initDestroyContext);
@@ -107,7 +107,7 @@
scope.register(threeCtx);
Object conversation = new Object();
- ctx.setIdentifier(Scope.CONVERSATIONAL, conversation);
+ ctx.setIdentifier(Scope.CONVERSATION, conversation);
scope.onEvent(new ConversationStart(this, conversation));
OrderedInitPojo one = (OrderedInitPojo) scope.getInstance(oneCtx);
Assert.assertNotNull(one);
@@ -146,7 +146,7 @@
scope.register(threeCtx);
Object conversation = new Object();
- ctx.setIdentifier(Scope.CONVERSATIONAL, conversation);
+ ctx.setIdentifier(Scope.CONVERSATION, conversation);
scope.onEvent(new ConversationStart(this, conversation));
OrderedEagerInitPojo one = (OrderedEagerInitPojo) scope.getInstance(oneCtx);
Assert.assertNotNull(one);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeRestartTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeRestartTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeRestartTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ConversationalScopeRestartTestCase.java Fri Nov 24 23:04:41 2006
@@ -60,7 +60,7 @@
context.start();
Object conversation = new Object();
- ctx.setIdentifier(Scope.CONVERSATIONAL, conversation);
+ ctx.setIdentifier(Scope.CONVERSATION, conversation);
scope.onEvent(new ConversationStart(this, conversation));
Object instance = context.getServiceInstance();
assertSame(instance, context.getServiceInstance());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java Fri Nov 24 23:04:41 2006
@@ -18,11 +18,10 @@
*/
package org.apache.tuscany.core.component.scope;
-import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.component.SystemAtomicComponent;
+import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.model.Scope;
-import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.component.event.HttpSessionEnd;
@@ -47,46 +46,46 @@
HttpSessionScopeContainer scope = new HttpSessionScopeContainer(ctx);
scope.start();
- SystemAtomicComponent initDestroyContext = MockFactory.createAtomicComponent("InitDestroy",
+ SystemAtomicComponent initDestroyComponent = MockFactory.createAtomicComponent("InitDestroy",
scope,
RequestScopeInitDestroyComponent.class);
- initDestroyContext.start();
+ initDestroyComponent.start();
- SystemAtomicComponent initOnlyContext = MockFactory.createAtomicComponent("InitOnly",
+ SystemAtomicComponent initOnlyComponent = MockFactory.createAtomicComponent("InitOnly",
scope,
RequestScopeInitOnlyComponent.class);
- initOnlyContext.start();
+ initOnlyComponent.start();
- SystemAtomicComponent destroyOnlyContext = MockFactory.createAtomicComponent("DestroyOnly",
+ SystemAtomicComponent destroyOnlyComponent = MockFactory.createAtomicComponent("DestroyOnly",
scope,
RequestScopeDestroyOnlyComponent.class);
- destroyOnlyContext.start();
+ destroyOnlyComponent.start();
Object session = new Object();
ctx.setIdentifier(Scope.SESSION, session);
scope.onEvent(new HttpSessionStart(this, session));
RequestScopeInitDestroyComponent initDestroy =
- (RequestScopeInitDestroyComponent) scope.getInstance(initDestroyContext);
- Assert.assertNotNull(initDestroy);
+ (RequestScopeInitDestroyComponent) scope.getInstance(initDestroyComponent);
+ assertNotNull(initDestroy);
RequestScopeInitOnlyComponent initOnly =
- (RequestScopeInitOnlyComponent) scope.getInstance(initOnlyContext);
- Assert.assertNotNull(initOnly);
+ (RequestScopeInitOnlyComponent) scope.getInstance(initOnlyComponent);
+ assertNotNull(initOnly);
RequestScopeDestroyOnlyComponent destroyOnly =
- (RequestScopeDestroyOnlyComponent) scope.getInstance(destroyOnlyContext);
- Assert.assertNotNull(destroyOnly);
+ (RequestScopeDestroyOnlyComponent) scope.getInstance(destroyOnlyComponent);
+ assertNotNull(destroyOnly);
- Assert.assertTrue(initDestroy.isInitialized());
- Assert.assertTrue(initOnly.isInitialized());
- Assert.assertFalse(initDestroy.isDestroyed());
- Assert.assertFalse(destroyOnly.isDestroyed());
+ assertTrue(initDestroy.isInitialized());
+ assertTrue(initOnly.isInitialized());
+ assertFalse(initDestroy.isDestroyed());
+ assertFalse(destroyOnly.isDestroyed());
// expire module
scope.onEvent(new HttpSessionEnd(this, session));
- Assert.assertTrue(initDestroy.isDestroyed());
- Assert.assertTrue(destroyOnly.isDestroyed());
+ assertTrue(initDestroy.isDestroyed());
+ assertTrue(destroyOnly.isDestroyed());
scope.stop();
}
@@ -96,37 +95,37 @@
HttpSessionScopeContainer scope = new HttpSessionScopeContainer(ctx);
scope.start();
- SystemAtomicComponent oneCtx =
+ SystemAtomicComponent oneComponent =
MockFactory.createAtomicComponent("one", scope, OrderedInitPojoImpl.class);
- scope.register(oneCtx);
- SystemAtomicComponent twoCtx =
+ scope.register(oneComponent);
+ SystemAtomicComponent twoComponent =
MockFactory.createAtomicComponent("two", scope, OrderedInitPojoImpl.class);
- scope.register(twoCtx);
- SystemAtomicComponent threeCtx =
+ scope.register(twoComponent);
+ SystemAtomicComponent threeComponent =
MockFactory.createAtomicComponent("three", scope, OrderedInitPojoImpl.class);
- scope.register(threeCtx);
+ scope.register(threeComponent);
Object session = new Object();
ctx.setIdentifier(Scope.SESSION, session);
scope.onEvent(new HttpSessionStart(this, session));
- OrderedInitPojo one = (OrderedInitPojo) scope.getInstance(oneCtx);
- Assert.assertNotNull(one);
- Assert.assertEquals(1, one.getNumberInstantiated());
- Assert.assertEquals(1, one.getInitOrder());
-
- OrderedInitPojo two = (OrderedInitPojo) scope.getInstance(twoCtx);
- Assert.assertNotNull(two);
- Assert.assertEquals(2, two.getNumberInstantiated());
- Assert.assertEquals(2, two.getInitOrder());
-
- OrderedInitPojo three = (OrderedInitPojo) scope.getInstance(threeCtx);
- Assert.assertNotNull(three);
- Assert.assertEquals(3, three.getNumberInstantiated());
- Assert.assertEquals(3, three.getInitOrder());
+ OrderedInitPojo one = (OrderedInitPojo) scope.getInstance(oneComponent);
+ assertNotNull(one);
+ assertEquals(1, one.getNumberInstantiated());
+ assertEquals(1, one.getInitOrder());
+
+ OrderedInitPojo two = (OrderedInitPojo) scope.getInstance(twoComponent);
+ assertNotNull(two);
+ assertEquals(2, two.getNumberInstantiated());
+ assertEquals(2, two.getInitOrder());
+
+ OrderedInitPojo three = (OrderedInitPojo) scope.getInstance(threeComponent);
+ assertNotNull(three);
+ assertEquals(3, three.getNumberInstantiated());
+ assertEquals(3, three.getInitOrder());
// expire module
scope.onEvent(new HttpSessionEnd(this, session));
- Assert.assertEquals(0, one.getNumberInstantiated());
+ assertEquals(0, one.getNumberInstantiated());
scope.stop();
}
@@ -135,31 +134,31 @@
HttpSessionScopeContainer scope = new HttpSessionScopeContainer(ctx);
scope.start();
- SystemAtomicComponent oneCtx =
+ SystemAtomicComponent oneComponent =
MockFactory.createAtomicComponent("one", scope, OrderedEagerInitPojo.class);
- scope.register(oneCtx);
- SystemAtomicComponent twoCtx =
+ scope.register(oneComponent);
+ SystemAtomicComponent twoComponent =
MockFactory.createAtomicComponent("two", scope, OrderedEagerInitPojo.class);
- scope.register(twoCtx);
- SystemAtomicComponent threeCtx =
+ scope.register(twoComponent);
+ SystemAtomicComponent threeComponent =
MockFactory.createAtomicComponent("three", scope, OrderedEagerInitPojo.class);
- scope.register(threeCtx);
+ scope.register(threeComponent);
Object session = new Object();
ctx.setIdentifier(Scope.SESSION, session);
scope.onEvent(new HttpSessionStart(this, session));
- OrderedEagerInitPojo one = (OrderedEagerInitPojo) scope.getInstance(oneCtx);
- Assert.assertNotNull(one);
+ OrderedEagerInitPojo one = (OrderedEagerInitPojo) scope.getInstance(oneComponent);
+ assertNotNull(one);
- OrderedEagerInitPojo two = (OrderedEagerInitPojo) scope.getInstance(twoCtx);
- Assert.assertNotNull(two);
+ OrderedEagerInitPojo two = (OrderedEagerInitPojo) scope.getInstance(twoComponent);
+ assertNotNull(two);
- OrderedEagerInitPojo three = (OrderedEagerInitPojo) scope.getInstance(threeCtx);
- Assert.assertNotNull(three);
+ OrderedEagerInitPojo three = (OrderedEagerInitPojo) scope.getInstance(threeComponent);
+ assertNotNull(three);
// expire module
scope.onEvent(new HttpSessionEnd(this, session));
- Assert.assertEquals(0, one.getNumberInstantiated());
+ assertEquals(0, one.getNumberInstantiated());
scope.stop();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java Fri Nov 24 23:04:41 2006
@@ -57,26 +57,26 @@
Constructor<InitDestroyOnce> ctr = InitDestroyOnce.class.getConstructor((Class<?>[]) null);
configuration.setInstanceFactory(new PojoObjectFactory<InitDestroyOnce>(ctr));
configuration.setName("InitDestroy");
- SystemAtomicComponent context = new SystemAtomicComponentImpl(configuration);
- context.start();
+ SystemAtomicComponent component = new SystemAtomicComponentImpl(configuration);
+ component.start();
Object session = new Object();
ctx.setIdentifier(Scope.SESSION, session);
scope.onEvent(new HttpSessionStart(this, session));
- Object instance = context.getServiceInstance();
- assertSame(instance, context.getServiceInstance());
+ Object instance = component.getServiceInstance();
+ assertSame(instance, component.getServiceInstance());
scope.onEvent(new HttpSessionEnd(this, session));
scope.stop();
- context.stop();
+ component.stop();
scope.start();
scope.onEvent(new HttpSessionStart(this, session));
- context.start();
- assertNotSame(instance, context.getServiceInstance());
+ component.start();
+ assertNotSame(instance, component.getServiceInstance());
scope.onEvent(new HttpSessionEnd(this, session));
scope.stop();
- context.stop();
+ component.stop();
}
public static class InitDestroyOnce {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java Fri Nov 24 23:04:41 2006
@@ -19,10 +19,9 @@
package org.apache.tuscany.core.component.scope;
-import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.component.SystemAtomicComponent;
+import org.apache.tuscany.spi.component.WorkContext;
-import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.component.event.CompositeStart;
@@ -47,43 +46,43 @@
ModuleScopeContainer scope = new ModuleScopeContainer(ctx);
scope.start();
- SystemAtomicComponent initDestroyContext = MockFactory.createAtomicComponent("InitDestroy",
+ SystemAtomicComponent initDestroyComponent = MockFactory.createAtomicComponent("InitDestroy",
scope,
ModuleScopeInitDestroyComponent.class);
- initDestroyContext.start();
+ initDestroyComponent.start();
- SystemAtomicComponent initOnlyContext = MockFactory.createAtomicComponent("InitOnly",
+ SystemAtomicComponent initOnlyComponent = MockFactory.createAtomicComponent("InitOnly",
scope,
ModuleScopeInitOnlyComponent.class);
- initOnlyContext.start();
+ initOnlyComponent.start();
- SystemAtomicComponent destroyOnlyContext = MockFactory.createAtomicComponent("DestroyOnly",
+ SystemAtomicComponent destroyOnlyComponent = MockFactory.createAtomicComponent("DestroyOnly",
scope,
ModuleScopeDestroyOnlyComponent.class);
- destroyOnlyContext.start();
+ destroyOnlyComponent.start();
scope.onEvent(new CompositeStart(this, null));
ModuleScopeInitDestroyComponent initDestroy =
- (ModuleScopeInitDestroyComponent) scope.getInstance(initDestroyContext);
- Assert.assertNotNull(initDestroy);
+ (ModuleScopeInitDestroyComponent) scope.getInstance(initDestroyComponent);
+ assertNotNull(initDestroy);
- ModuleScopeInitOnlyComponent initOnly = (ModuleScopeInitOnlyComponent) scope.getInstance(initOnlyContext);
- Assert.assertNotNull(initOnly);
+ ModuleScopeInitOnlyComponent initOnly = (ModuleScopeInitOnlyComponent) scope.getInstance(initOnlyComponent);
+ assertNotNull(initOnly);
ModuleScopeDestroyOnlyComponent destroyOnly =
- (ModuleScopeDestroyOnlyComponent) scope.getInstance(destroyOnlyContext);
- Assert.assertNotNull(destroyOnly);
+ (ModuleScopeDestroyOnlyComponent) scope.getInstance(destroyOnlyComponent);
+ assertNotNull(destroyOnly);
- Assert.assertTrue(initDestroy.isInitialized());
- Assert.assertTrue(initOnly.isInitialized());
- Assert.assertFalse(initDestroy.isDestroyed());
- Assert.assertFalse(destroyOnly.isDestroyed());
+ assertTrue(initDestroy.isInitialized());
+ assertTrue(initOnly.isInitialized());
+ assertFalse(initDestroy.isDestroyed());
+ assertFalse(destroyOnly.isDestroyed());
// expire module
scope.onEvent(new CompositeStop(this, null));
- Assert.assertTrue(initDestroy.isDestroyed());
- Assert.assertTrue(destroyOnly.isDestroyed());
+ assertTrue(initDestroy.isDestroyed());
+ assertTrue(destroyOnly.isDestroyed());
scope.stop();
}
@@ -93,38 +92,38 @@
ModuleScopeContainer scope = new ModuleScopeContainer(ctx);
scope.start();
- SystemAtomicComponent oneCtx = MockFactory.createAtomicComponent("one",
+ SystemAtomicComponent oneComponent = MockFactory.createAtomicComponent("one",
scope,
OrderedInitPojoImpl.class);
- scope.register(oneCtx);
- SystemAtomicComponent twoCtx = MockFactory.createAtomicComponent("two",
+ scope.register(oneComponent);
+ SystemAtomicComponent twoComponent = MockFactory.createAtomicComponent("two",
scope,
OrderedInitPojoImpl.class);
- scope.register(twoCtx);
- SystemAtomicComponent threeCtx = MockFactory.createAtomicComponent("three",
+ scope.register(twoComponent);
+ SystemAtomicComponent threeComponent = MockFactory.createAtomicComponent("three",
scope,
OrderedInitPojoImpl.class);
- scope.register(threeCtx);
+ scope.register(threeComponent);
scope.onEvent(new CompositeStart(this, null));
- OrderedInitPojo one = (OrderedInitPojo) scope.getInstance(oneCtx);
- Assert.assertNotNull(one);
- Assert.assertEquals(1, one.getNumberInstantiated());
- Assert.assertEquals(1, one.getInitOrder());
-
- OrderedInitPojo two = (OrderedInitPojo) scope.getInstance(twoCtx);
- Assert.assertNotNull(two);
- Assert.assertEquals(2, two.getNumberInstantiated());
- Assert.assertEquals(2, two.getInitOrder());
-
- OrderedInitPojo three = (OrderedInitPojo) scope.getInstance(threeCtx);
- Assert.assertNotNull(three);
- Assert.assertEquals(3, three.getNumberInstantiated());
- Assert.assertEquals(3, three.getInitOrder());
+ OrderedInitPojo one = (OrderedInitPojo) scope.getInstance(oneComponent);
+ assertNotNull(one);
+ assertEquals(1, one.getNumberInstantiated());
+ assertEquals(1, one.getInitOrder());
+
+ OrderedInitPojo two = (OrderedInitPojo) scope.getInstance(twoComponent);
+ assertNotNull(two);
+ assertEquals(2, two.getNumberInstantiated());
+ assertEquals(2, two.getInitOrder());
+
+ OrderedInitPojo three = (OrderedInitPojo) scope.getInstance(threeComponent);
+ assertNotNull(three);
+ assertEquals(3, three.getNumberInstantiated());
+ assertEquals(3, three.getInitOrder());
// expire module
scope.onEvent(new CompositeStop(this, null));
- Assert.assertEquals(0, one.getNumberInstantiated());
+ assertEquals(0, one.getNumberInstantiated());
scope.stop();
}
@@ -133,32 +132,32 @@
ModuleScopeContainer scope = new ModuleScopeContainer(ctx);
scope.start();
- SystemAtomicComponent oneCtx = MockFactory.createAtomicComponent("one",
+ SystemAtomicComponent oneComponent = MockFactory.createAtomicComponent("one",
scope,
OrderedEagerInitPojo.class);
- scope.register(oneCtx);
- SystemAtomicComponent twoCtx = MockFactory.createAtomicComponent("two",
+ scope.register(oneComponent);
+ SystemAtomicComponent twoComponent = MockFactory.createAtomicComponent("two",
scope,
OrderedEagerInitPojo.class);
- scope.register(twoCtx);
- SystemAtomicComponent threeCtx = MockFactory.createAtomicComponent("three",
+ scope.register(twoComponent);
+ SystemAtomicComponent threeComponent = MockFactory.createAtomicComponent("three",
scope,
OrderedEagerInitPojo.class);
- scope.register(threeCtx);
+ scope.register(threeComponent);
scope.onEvent(new CompositeStart(this, null));
- OrderedEagerInitPojo one = (OrderedEagerInitPojo) scope.getInstance(oneCtx);
- Assert.assertNotNull(one);
+ OrderedEagerInitPojo one = (OrderedEagerInitPojo) scope.getInstance(oneComponent);
+ assertNotNull(one);
- OrderedEagerInitPojo two = (OrderedEagerInitPojo) scope.getInstance(twoCtx);
- Assert.assertNotNull(two);
+ OrderedEagerInitPojo two = (OrderedEagerInitPojo) scope.getInstance(twoComponent);
+ assertNotNull(two);
- OrderedEagerInitPojo three = (OrderedEagerInitPojo) scope.getInstance(threeCtx);
- Assert.assertNotNull(three);
+ OrderedEagerInitPojo three = (OrderedEagerInitPojo) scope.getInstance(threeComponent);
+ assertNotNull(three);
// expire module
scope.onEvent(new CompositeStop(this, null));
- Assert.assertEquals(0, one.getNumberInstantiated());
+ assertEquals(0, one.getNumberInstantiated());
scope.stop();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java Fri Nov 24 23:04:41 2006
@@ -55,24 +55,24 @@
Constructor<InitDestroyOnce> ctr = InitDestroyOnce.class.getConstructor((Class<?>[]) null);
configuration.setInstanceFactory(new PojoObjectFactory<InitDestroyOnce>(ctr));
configuration.setName("InitDestroy");
- SystemAtomicComponent context = new SystemAtomicComponentImpl(configuration);
- context.start();
+ SystemAtomicComponent component = new SystemAtomicComponentImpl(configuration);
+ component.start();
scope.onEvent(new CompositeStart(this, null));
- Object instance = context.getServiceInstance();
- assertSame(instance, context.getServiceInstance());
+ Object instance = component.getServiceInstance();
+ assertSame(instance, component.getServiceInstance());
scope.onEvent(new CompositeStop(this, null));
scope.stop();
- context.stop();
+ component.stop();
scope.start();
scope.onEvent(new CompositeStart(this, null));
- context.start();
- assertNotSame(instance, context.getServiceInstance());
+ component.start();
+ assertNotSame(instance, component.getServiceInstance());
scope.onEvent(new CompositeStop(this, null));
scope.stop();
- context.stop();
+ component.stop();
}
public static class InitDestroyOnce {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java Fri Nov 24 23:04:41 2006
@@ -21,7 +21,6 @@
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.component.SystemAtomicComponent;
-import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.component.event.RequestEnd;
@@ -46,40 +45,40 @@
RequestScopeContainer scope = new RequestScopeContainer(ctx);
scope.start();
- SystemAtomicComponent initDestroyContext = MockFactory
+ SystemAtomicComponent initDestroyComponent = MockFactory
.createAtomicComponent("InitDestroy", scope, RequestScopeInitDestroyComponent.class);
- initDestroyContext.start();
+ initDestroyComponent.start();
- SystemAtomicComponent initOnlyContext =
+ SystemAtomicComponent initOnlyComponent =
MockFactory.createAtomicComponent("InitOnly", scope, RequestScopeInitOnlyComponent.class);
- initOnlyContext.start();
+ initOnlyComponent.start();
- SystemAtomicComponent destroyOnlyContext = MockFactory
+ SystemAtomicComponent destroyOnlyComponent = MockFactory
.createAtomicComponent("DestroyOnly", scope, RequestScopeDestroyOnlyComponent.class);
- destroyOnlyContext.start();
+ destroyOnlyComponent.start();
scope.onEvent(new RequestStart(this));
RequestScopeInitDestroyComponent initDestroy =
- (RequestScopeInitDestroyComponent) scope.getInstance(initDestroyContext);
- Assert.assertNotNull(initDestroy);
+ (RequestScopeInitDestroyComponent) scope.getInstance(initDestroyComponent);
+ assertNotNull(initDestroy);
- RequestScopeInitOnlyComponent initOnly = (RequestScopeInitOnlyComponent) scope.getInstance(initOnlyContext);
- Assert.assertNotNull(initOnly);
+ RequestScopeInitOnlyComponent initOnly = (RequestScopeInitOnlyComponent) scope.getInstance(initOnlyComponent);
+ assertNotNull(initOnly);
RequestScopeDestroyOnlyComponent destroyOnly =
- (RequestScopeDestroyOnlyComponent) scope.getInstance(destroyOnlyContext);
- Assert.assertNotNull(destroyOnly);
+ (RequestScopeDestroyOnlyComponent) scope.getInstance(destroyOnlyComponent);
+ assertNotNull(destroyOnly);
- Assert.assertTrue(initDestroy.isInitialized());
- Assert.assertTrue(initOnly.isInitialized());
- Assert.assertFalse(initDestroy.isDestroyed());
- Assert.assertFalse(destroyOnly.isDestroyed());
+ assertTrue(initDestroy.isInitialized());
+ assertTrue(initOnly.isInitialized());
+ assertFalse(initDestroy.isDestroyed());
+ assertFalse(destroyOnly.isDestroyed());
// expire module
scope.onEvent(new RequestEnd(this));
- Assert.assertTrue(initDestroy.isDestroyed());
- Assert.assertTrue(destroyOnly.isDestroyed());
+ assertTrue(initDestroy.isDestroyed());
+ assertTrue(destroyOnly.isDestroyed());
scope.stop();
}
@@ -101,23 +100,23 @@
scope.onEvent(new RequestStart(this));
OrderedInitPojo one = (OrderedInitPojo) scope.getInstance(oneCtx);
- Assert.assertNotNull(one);
- Assert.assertEquals(1, one.getNumberInstantiated());
- Assert.assertEquals(1, one.getInitOrder());
+ assertNotNull(one);
+ assertEquals(1, one.getNumberInstantiated());
+ assertEquals(1, one.getInitOrder());
OrderedInitPojo two = (OrderedInitPojo) scope.getInstance(twoCtx);
- Assert.assertNotNull(two);
- Assert.assertEquals(2, two.getNumberInstantiated());
- Assert.assertEquals(2, two.getInitOrder());
+ assertNotNull(two);
+ assertEquals(2, two.getNumberInstantiated());
+ assertEquals(2, two.getInitOrder());
OrderedInitPojo three = (OrderedInitPojo) scope.getInstance(threeCtx);
- Assert.assertNotNull(three);
- Assert.assertEquals(3, three.getNumberInstantiated());
- Assert.assertEquals(3, three.getInitOrder());
+ assertNotNull(three);
+ assertEquals(3, three.getNumberInstantiated());
+ assertEquals(3, three.getInitOrder());
// expire module
scope.onEvent(new RequestEnd(this));
- Assert.assertEquals(0, one.getNumberInstantiated());
+ assertEquals(0, one.getNumberInstantiated());
scope.stop();
}
@@ -126,29 +125,29 @@
RequestScopeContainer scope = new RequestScopeContainer(ctx);
scope.start();
- SystemAtomicComponent oneCtx =
+ SystemAtomicComponent oneComponent =
MockFactory.createAtomicComponent("one", scope, OrderedEagerInitPojo.class);
- scope.register(oneCtx);
- SystemAtomicComponent twoCtx =
+ scope.register(oneComponent);
+ SystemAtomicComponent twoComponent =
MockFactory.createAtomicComponent("two", scope, OrderedEagerInitPojo.class);
- scope.register(twoCtx);
- SystemAtomicComponent threeCtx =
+ scope.register(twoComponent);
+ SystemAtomicComponent threeComponent =
MockFactory.createAtomicComponent("three", scope, OrderedEagerInitPojo.class);
- scope.register(threeCtx);
+ scope.register(threeComponent);
scope.onEvent(new RequestStart(this));
- OrderedEagerInitPojo one = (OrderedEagerInitPojo) scope.getInstance(oneCtx);
- Assert.assertNotNull(one);
+ OrderedEagerInitPojo one = (OrderedEagerInitPojo) scope.getInstance(oneComponent);
+ assertNotNull(one);
- OrderedEagerInitPojo two = (OrderedEagerInitPojo) scope.getInstance(twoCtx);
- Assert.assertNotNull(two);
+ OrderedEagerInitPojo two = (OrderedEagerInitPojo) scope.getInstance(twoComponent);
+ assertNotNull(two);
- OrderedEagerInitPojo three = (OrderedEagerInitPojo) scope.getInstance(threeCtx);
- Assert.assertNotNull(three);
+ OrderedEagerInitPojo three = (OrderedEagerInitPojo) scope.getInstance(threeComponent);
+ assertNotNull(three);
// expire module
scope.onEvent(new RequestEnd(this));
- Assert.assertEquals(0, one.getNumberInstantiated());
+ assertEquals(0, one.getNumberInstantiated());
scope.stop();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ScopeRegistryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ScopeRegistryTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ScopeRegistryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/ScopeRegistryTestCase.java Fri Nov 24 23:04:41 2006
@@ -38,7 +38,7 @@
ScopeRegistry scopeRegistry = new ScopeRegistryImpl(workContext);
scopeRegistry.registerFactory(Scope.REQUEST, new RequestScopeObjectFactory());
scopeRegistry.registerFactory(Scope.SESSION, new HttpSessionScopeObjectFactory(scopeRegistry));
- scopeRegistry.registerFactory(Scope.CONVERSATIONAL, new ConversationalScopeObjectFactory(scopeRegistry));
+ scopeRegistry.registerFactory(Scope.CONVERSATION, new ConversationalScopeObjectFactory(scopeRegistry));
ScopeContainer request = scopeRegistry.getScopeContainer(Scope.REQUEST);
assertTrue(request instanceof RequestScopeContainer);
assertSame(request, scopeRegistry.getScopeContainer(Scope.REQUEST));
@@ -46,9 +46,9 @@
assertTrue(session instanceof HttpSessionScopeContainer);
assertSame(session, scopeRegistry.getScopeContainer(Scope.SESSION));
assertNotSame(request, session);
- ScopeContainer conversation = scopeRegistry.getScopeContainer(Scope.CONVERSATIONAL);
+ ScopeContainer conversation = scopeRegistry.getScopeContainer(Scope.CONVERSATION);
assertTrue(conversation instanceof ConversationalScopeContainer);
- assertSame(conversation, scopeRegistry.getScopeContainer(Scope.CONVERSATIONAL));
+ assertSame(conversation, scopeRegistry.getScopeContainer(Scope.CONVERSATION));
assertNotSame(session, conversation);
}
@@ -65,10 +65,10 @@
// expected
}
ConversationalScopeObjectFactory convFactory = new ConversationalScopeObjectFactory(scopeRegistry);
- scopeRegistry.registerFactory(Scope.CONVERSATIONAL, convFactory);
- scopeRegistry.deregisterFactory(Scope.CONVERSATIONAL);
+ scopeRegistry.registerFactory(Scope.CONVERSATION, convFactory);
+ scopeRegistry.deregisterFactory(Scope.CONVERSATION);
try {
- scopeRegistry.getScopeContainer(Scope.CONVERSATIONAL);
+ scopeRegistry.getScopeContainer(Scope.CONVERSATION);
fail();
} catch (ScopeNotFoundException e) {
// expected
@@ -91,7 +91,7 @@
// expected
}
try {
- scopeRegistry.getScopeContainer(Scope.CONVERSATIONAL);
+ scopeRegistry.getScopeContainer(Scope.CONVERSATION);
fail();
} catch (ScopeNotFoundException e) {
// expected
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingInterceptorTestCase.java Fri Nov 24 23:04:41 2006
@@ -19,18 +19,12 @@
package org.apache.tuscany.core.databinding.impl;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
+import static org.apache.tuscany.spi.model.Operation.NO_CONVERSATION;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.databinding.Mediator;
@@ -40,7 +34,14 @@
import org.apache.tuscany.spi.wire.Interceptor;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.OutboundWire;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
import org.easymock.EasyMock;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
/**
*
@@ -70,9 +71,9 @@
new DataType<List<DataType<Class>>>("foo", Object[].class, types2);
Operation<Class> operation1 =
- new Operation<Class>("call", inputType1, type1, null, false, "xml:string");
+ new Operation<Class>("call", inputType1, type1, null, false, "xml:string", NO_CONVERSATION);
Operation<Class> operation2 =
- new Operation<Class>("call", inputType2, type2, null, false, "org.w3c.dom.Node");
+ new Operation<Class>("call", inputType2, type2, null, false, "org.w3c.dom.Node", NO_CONVERSATION);
DataType<DataType> outputType1 =
new DataType<DataType>("idl:output", Object.class, operation1.getOutputType());
@@ -89,20 +90,20 @@
interceptor = new DataBindingInteceptor(outboundWire, operation1, inboundWire, operation2);
Mediator mediator = createMock(Mediator.class);
- Object[] source = new Object[] {"<foo>bar</foo>"};
+ Object[] source = new Object[]{"<foo>bar</foo>"};
Foo foo = new Foo();
foo.bar = "bar";
- Object[] target = new Object[] {foo};
+ Object[] target = new Object[]{foo};
expect(mediator.mediate(EasyMock.same(source),
- EasyMock.same(inputType1),
- EasyMock.same(inputType2),
- EasyMock.isA(Map.class))).andReturn(target);
+ EasyMock.same(inputType1),
+ EasyMock.same(inputType2),
+ EasyMock.isA(Map.class))).andReturn(target);
// expect(mediator.mediate(target[0], type2,
// type1)).andReturn(source[0]);
expect(mediator.mediate(EasyMock.same(target[0]),
- EasyMock.eq(outputType2),
- EasyMock.eq(outputType1),
- EasyMock.isA(Map.class))).andReturn(source[0]);
+ EasyMock.eq(outputType2),
+ EasyMock.eq(outputType1),
+ EasyMock.isA(Map.class))).andReturn(source[0]);
replay(mediator);
interceptor.setMediator(mediator);
Message msg = createMock(Message.class);
@@ -116,7 +117,7 @@
replay(next);
interceptor.setNext(next);
interceptor.invoke(msg);
- String result = (String)msg.getBody();
+ String result = (String) msg.getBody();
Assert.assertEquals(source[0], result);
EasyMock.verify(mediator, msg, next);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingJavaInterfaceProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingJavaInterfaceProcessorTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingJavaInterfaceProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/impl/DataBindingJavaInterfaceProcessorTestCase.java Fri Nov 24 23:04:41 2006
@@ -19,6 +19,8 @@
package org.apache.tuscany.core.databinding.impl;
+import static org.apache.tuscany.spi.model.Operation.NO_CONVERSATION;
+
import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.Map;
@@ -53,8 +55,8 @@
DataBindingJavaInterfaceProcessor processor = new DataBindingJavaInterfaceProcessor();
JavaServiceContract contract = new JavaServiceContract(MockInterface.class);
Map<String, Operation<Type>> operations = new HashMap<String, Operation<Type>>();
- Operation<Type> operation = new Operation<Type>("call", null, null, null, false, null);
- Operation<Type> operation1 = new Operation<Type>("call1", null, null, null, false, null);
+ Operation<Type> operation = new Operation<Type>("call", null, null, null, false, null, NO_CONVERSATION);
+ Operation<Type> operation1 = new Operation<Type>("call1", null, null, null, false, null, NO_CONVERSATION);
operations.put("call", operation);
operations.put("call1", operation1);
contract.setOperations(operations);
Added: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java?view=auto&rev=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java Fri Nov 24 23:04:41 2006
@@ -0,0 +1,112 @@
+/*
+ * 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.core.idl.java;
+
+import org.osoa.sca.annotations.Conversation;
+import org.osoa.sca.annotations.EndConversation;
+import org.osoa.sca.annotations.Scope;
+
+import org.apache.tuscany.spi.idl.InvalidConversationalContractException;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
+import static org.apache.tuscany.spi.model.InteractionScope.CONVERSATIONAL;
+import static org.apache.tuscany.spi.model.InteractionScope.NONCONVERSATIONAL;
+import org.apache.tuscany.spi.model.Operation;
+import static org.apache.tuscany.spi.model.ServiceContract.UNDEFINED;
+
+import junit.framework.TestCase;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ConversationalIntrospectionTestCase extends TestCase {
+ private JavaInterfaceProcessorRegistryImpl registry = new JavaInterfaceProcessorRegistryImpl();
+
+ public void testServiceContractConversationalInformationIntrospection() throws Exception {
+ JavaServiceContract contract = registry.introspect(Foo.class);
+ assertEquals(UNDEFINED, contract.getMaxAge());
+ assertEquals(UNDEFINED, contract.getMaxIdleTime());
+ assertEquals(CONVERSATIONAL, contract.getInteractionScope());
+ int seq = contract.getOperations().get("operation").getConversationSequence();
+ assertEquals(Operation.CONVERSATION_CONTINUE, seq);
+ seq = contract.getOperations().get("endOperation").getConversationSequence();
+ assertEquals(Operation.CONVERSATION_END, seq);
+ }
+
+ public void testServiceContractConversationAnnotation() throws Exception {
+ JavaServiceContract contract = registry.introspect(FooConversation.class);
+ assertEquals(100000, contract.getMaxAge());
+ }
+
+ public void testBadServiceContract() throws Exception {
+ try {
+ registry.introspect(BadFoo.class);
+ fail();
+ } catch (InvalidConversationalContractException e) {
+ //expected
+ }
+ }
+
+ public void testBadConversationAnnotation() throws Exception {
+ try {
+ registry.introspect(BadFooConversation.class);
+ fail();
+ } catch (InvalidConversationalContractException e) {
+ //expected
+ }
+ }
+
+ public void testNonConversationalInformationIntrospection() throws Exception {
+ JavaServiceContract contract = registry.introspect(NonConversationalFoo.class);
+ assertEquals(UNDEFINED, contract.getMaxAge());
+ assertEquals(UNDEFINED, contract.getMaxIdleTime());
+ assertEquals(NONCONVERSATIONAL, contract.getInteractionScope());
+ int seq = contract.getOperations().get("operation").getConversationSequence();
+ assertEquals(Operation.NO_CONVERSATION, seq);
+ }
+
+ @Scope("CONVERSATION")
+ private interface Foo {
+ void operation();
+
+ @EndConversation
+ void endOperation();
+ }
+
+ @Scope("CONVERSATION")
+ @Conversation(maxAge = "100")
+ private interface FooConversation {
+ }
+
+
+ private interface BadFoo {
+ void operation();
+
+ @EndConversation
+ void endOperation();
+ }
+
+ @Conversation(maxAge = "100")
+ private interface BadFooConversation {
+ }
+
+ private interface NonConversationalFoo {
+ void operation();
+ }
+
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConversationalIntrospectionTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java?view=auto&rev=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java Fri Nov 24 23:04:41 2006
@@ -0,0 +1,110 @@
+/*
+ * 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.core.idl.java;
+
+import junit.framework.TestCase;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ConvertTimeMillisTestCase extends TestCase {
+ MockRegistry registy;
+
+ public void testConvertSeconds() throws Exception {
+ assertEquals(10000L, registy.convertTimeMillis("10 seconds"));
+ assertEquals(10000L, registy.convertTimeMillis("10 SECONDS"));
+ try {
+ registy.convertTimeMillis("10seconds");
+ fail();
+ } catch (NumberFormatException e) {
+ // expected
+ }
+ }
+
+ public void testConvertMinutes() throws Exception {
+ assertEquals(600000L, registy.convertTimeMillis("10 minutes"));
+ assertEquals(600000L, registy.convertTimeMillis("10 MINUTES"));
+ try {
+ registy.convertTimeMillis("10minutes");
+ fail();
+ } catch (NumberFormatException e) {
+ // expected
+ }
+ }
+
+ public void testConvertHours() throws Exception {
+ assertEquals(36000000L, registy.convertTimeMillis("10 hours"));
+ assertEquals(36000000L, registy.convertTimeMillis("10 HOURS"));
+ try {
+ registy.convertTimeMillis("10hours");
+ fail();
+ } catch (NumberFormatException e) {
+ // expected
+ }
+ }
+
+ public void testConvertDays() throws Exception {
+ assertEquals(864000000L, registy.convertTimeMillis("10 days"));
+ assertEquals(864000000L, registy.convertTimeMillis("10 DAYS"));
+ try {
+ registy.convertTimeMillis("10days");
+ fail();
+ } catch (NumberFormatException e) {
+ // expected
+ }
+ }
+
+ public void testConvertYears() throws Exception {
+ assertEquals(315360000000L, registy.convertTimeMillis("10 years"));
+ assertEquals(315360000000L, registy.convertTimeMillis("10 YEARS"));
+ try {
+ registy.convertTimeMillis("10years");
+ fail();
+ } catch (NumberFormatException e) {
+ // expected
+ }
+ }
+
+ public void testConvertDefault() throws Exception {
+ assertEquals(10000L, registy.convertTimeMillis("10 "));
+ assertEquals(10000L, registy.convertTimeMillis("10"));
+ }
+
+ public void testInvalid() throws Exception {
+ try {
+ registy.convertTimeMillis("foo");
+ fail();
+ } catch (NumberFormatException e) {
+ // expected
+ }
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ registy = new MockRegistry();
+ }
+
+ private class MockRegistry extends JavaInterfaceProcessorRegistryImpl {
+
+ @Override
+ protected long convertTimeMillis(String expr) throws NumberFormatException {
+ return super.convertTimeMillis(expr);
+ }
+ }
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTestCase.java Fri Nov 24 23:04:41 2006
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.core.implementation.composite;
+import static org.apache.tuscany.spi.model.Operation.NO_CONVERSATION;
+
import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.Map;
@@ -43,7 +45,7 @@
null,
null,
serviceContract);
- Operation operation = new Operation<Type>("sayHi", null, null, null, false, null);
+ Operation operation = new Operation<Type>("sayHi", null, null, null, false, null, NO_CONVERSATION);
OutboundInvocationChain chain = EasyMock.createMock(OutboundInvocationChain.class);
EasyMock.replay(chain);
Map<Operation<?>, OutboundInvocationChain> chains = new HashMap<Operation<?>, OutboundInvocationChain>();
@@ -65,7 +67,7 @@
null,
null,
serviceContract);
- Operation operation = new Operation<Type>("sayHi", null, null, null, false, null);
+ Operation operation = new Operation<Type>("sayHi", null, null, null, false, null, NO_CONVERSATION);
TargetInvoker targetInvoker = compositeReference.createCallbackTargetInvoker(serviceContract, operation);
assertNotNull(targetInvoker);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerBasicInvocationTestCase.java Fri Nov 24 23:04:41 2006
@@ -24,13 +24,12 @@
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.extension.ExecutionMonitor;
import org.apache.tuscany.spi.wire.InboundWire;
+import static org.apache.tuscany.spi.wire.TargetInvoker.NONE;
-import junit.framework.Assert;
import junit.framework.TestCase;
import org.easymock.classextension.EasyMock;
public class JavaTargetInvokerBasicInvocationTestCase extends TestCase {
-
private Method echoMethod;
private Method arrayMethod;
private Method nullParamMethod;
@@ -41,7 +40,6 @@
private WorkContext context;
private ExecutionMonitor monitor;
-
public JavaTargetInvokerBasicInvocationTestCase(String arg0) {
super(arg0);
}
@@ -67,8 +65,8 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.replay(component);
JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, wire, context, monitor);
- Object ret = invoker.invokeTarget("foo");
- Assert.assertEquals("foo", ret);
+ Object ret = invoker.invokeTarget("foo", NONE);
+ assertEquals("foo", ret);
}
public void testArrayInvoke() throws Throwable {
@@ -79,12 +77,12 @@
JavaTargetInvoker invoker = new JavaTargetInvoker(arrayMethod, component, wire, context, monitor);
String[] args = new String[]{"foo", "bar"};
- Object ret = invoker.invokeTarget(new Object[]{args});
+ Object ret = invoker.invokeTarget(new Object[]{args}, NONE);
String[] retA = (String[]) ret;
- Assert.assertNotNull(retA);
- Assert.assertEquals(2, retA.length);
- Assert.assertEquals("foo", retA[0]);
- Assert.assertEquals("bar", retA[1]);
+ assertNotNull(retA);
+ assertEquals(2, retA.length);
+ assertEquals("foo", retA[0]);
+ assertEquals("bar", retA[1]);
}
public void testNullInvoke() throws Throwable {
@@ -93,9 +91,9 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.replay(component);
JavaTargetInvoker invoker = new JavaTargetInvoker(nullParamMethod, component, wire, context, monitor);
- Object ret = invoker.invokeTarget(null);
+ Object ret = invoker.invokeTarget(null, NONE);
String retS = (String) ret;
- Assert.assertEquals("foo", retS);
+ assertEquals("foo", retS);
}
public void testPrimitiveInvoke() throws Throwable {
@@ -104,9 +102,9 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.replay(component);
JavaTargetInvoker invoker = new JavaTargetInvoker(primitiveMethod, component, wire, context, monitor);
- Object ret = invoker.invokeTarget(new Integer[]{1});
+ Object ret = invoker.invokeTarget(new Integer[]{1}, NONE);
Integer retI = (Integer) ret;
- Assert.assertEquals(1, retI.intValue());
+ assertEquals(1, retI.intValue());
}
public void testInvokeCheckedException() throws Throwable {
@@ -116,7 +114,7 @@
EasyMock.replay(component);
JavaTargetInvoker invoker = new JavaTargetInvoker(checkedMethod, component, wire, context, monitor);
try {
- invoker.invokeTarget(null);
+ invoker.invokeTarget(null, NONE);
} catch (InvocationTargetException e) {
if (e.getCause() != null && TestException.class.equals(e.getCause().getClass())) {
return;
@@ -134,7 +132,7 @@
EasyMock.replay(component);
JavaTargetInvoker invoker = new JavaTargetInvoker(runtimeMethod, component, wire, context, monitor);
try {
- invoker.invokeTarget(null);
+ invoker.invokeTarget(null, NONE);
} catch (InvocationTargetException e) {
if (e.getCause() != null && e.getCause() instanceof TestRuntimeException) {
return;
@@ -146,15 +144,15 @@
private class TestBean {
public String echo(String msg) throws Exception {
- Assert.assertEquals("foo", msg);
+ assertEquals("foo", msg);
return msg;
}
public String[] arrayEcho(String[] msg) throws Exception {
- Assert.assertNotNull(msg);
- Assert.assertEquals(2, msg.length);
- Assert.assertEquals("foo", msg[0]);
- Assert.assertEquals("bar", msg[1]);
+ assertNotNull(msg);
+ assertEquals(2, msg.length);
+ assertEquals("foo", msg[0]);
+ assertEquals("bar", msg[1]);
return msg;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerNonBlockingInvocationTestCase.java Fri Nov 24 23:04:41 2006
@@ -26,6 +26,7 @@
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.MessageImpl;
+import static org.apache.tuscany.spi.wire.TargetInvoker.NONE;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -101,7 +102,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.replay(component);
JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, wire, context, monitor);
- Object ret = invoker.invokeTarget("foo");
+ Object ret = invoker.invokeTarget("foo", NONE);
Assert.assertEquals("foo", ret);
}
@@ -113,7 +114,7 @@
JavaTargetInvoker invoker = new JavaTargetInvoker(arrayMethod, component, wire, context, monitor);
String[] args = new String[]{"foo", "bar"};
- Object ret = invoker.invokeTarget(new Object[]{args});
+ Object ret = invoker.invokeTarget(new Object[]{args}, NONE);
String[] retA = (String[]) ret;
Assert.assertNotNull(retA);
Assert.assertEquals(2, retA.length);
@@ -127,7 +128,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.replay(component);
JavaTargetInvoker invoker = new JavaTargetInvoker(nullParamMethod, component, wire, context, monitor);
- Object ret = invoker.invokeTarget(null);
+ Object ret = invoker.invokeTarget(null, NONE);
String retS = (String) ret;
Assert.assertEquals("foo", retS);
}
@@ -138,7 +139,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(bean);
EasyMock.replay(component);
JavaTargetInvoker invoker = new JavaTargetInvoker(primitiveMethod, component, wire, context, monitor);
- Object ret = invoker.invokeTarget(new Integer[]{1});
+ Object ret = invoker.invokeTarget(new Integer[]{1}, NONE);
Integer retI = (Integer) ret;
Assert.assertEquals(1, retI.intValue());
}
@@ -150,7 +151,7 @@
EasyMock.replay(component);
JavaTargetInvoker invoker = new JavaTargetInvoker(checkedMethod, component, wire, context, monitor);
try {
- invoker.invokeTarget(null);
+ invoker.invokeTarget(null, NONE);
} catch (InvocationTargetException e) {
if (e.getCause() != null && TestException.class.equals(e.getCause().getClass())) {
return;
@@ -168,7 +169,7 @@
EasyMock.replay(component);
JavaTargetInvoker invoker = new JavaTargetInvoker(runtimeMethod, component, wire, context, monitor);
try {
- invoker.invokeTarget(null);
+ invoker.invokeTarget(null, NONE);
} catch (InvocationTargetException e) {
if (e.getCause() != null && e.getCause() instanceof TestRuntimeException) {
return;
Added: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java?view=auto&rev=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java Fri Nov 24 23:04:41 2006
@@ -0,0 +1,97 @@
+/*
+ * 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.core.implementation.java;
+
+import org.apache.tuscany.spi.wire.Message;
+import org.apache.tuscany.spi.wire.MessageImpl;
+import org.apache.tuscany.spi.wire.TargetInvoker;
+
+import junit.framework.TestCase;
+import org.easymock.classextension.EasyMock;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JavaTargetInvokerSequenceTestCase extends TestCase {
+
+ public void testNoSequence() throws Exception {
+ Foo foo = EasyMock.createMock(Foo.class);
+ foo.invoke();
+ EasyMock.replay(foo);
+ JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+ EasyMock.expect(component.getTargetInstance()).andReturn(foo);
+ EasyMock.replay(component);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(Foo.class.getMethod("invoke"), component, null, null, null);
+ Message msg = new MessageImpl();
+ msg.setConversationSequence(TargetInvoker.NONE);
+ invoker.invoke(msg);
+ EasyMock.verify(foo);
+ EasyMock.verify(component);
+ }
+
+ public void testStartSequence() throws Exception {
+ Foo foo = EasyMock.createMock(Foo.class);
+ foo.invoke();
+ EasyMock.replay(foo);
+ JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+ EasyMock.expect(component.getTargetInstance()).andReturn(foo);
+ EasyMock.replay(component);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(Foo.class.getMethod("invoke"), component, null, null, null);
+ Message msg = new MessageImpl();
+ msg.setConversationSequence(TargetInvoker.START);
+ invoker.invoke(msg);
+ EasyMock.verify(foo);
+ EasyMock.verify(component);
+ }
+
+ public void testContinueSequence() throws Exception {
+ Foo foo = EasyMock.createMock(Foo.class);
+ foo.invoke();
+ EasyMock.replay(foo);
+ JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+ EasyMock.expect(component.getAssociatedTargetInstance()).andReturn(foo);
+ EasyMock.replay(component);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(Foo.class.getMethod("invoke"), component, null, null, null);
+ Message msg = new MessageImpl();
+ msg.setConversationSequence(TargetInvoker.CONTINUE);
+ invoker.invoke(msg);
+ EasyMock.verify(foo);
+ EasyMock.verify(component);
+ }
+
+ public void testEndSequence() throws Exception {
+ Foo foo = EasyMock.createMock(Foo.class);
+ foo.invoke();
+ EasyMock.replay(foo);
+ JavaAtomicComponent component = EasyMock.createMock(JavaAtomicComponent.class);
+ EasyMock.expect(component.getAssociatedTargetInstance()).andReturn(foo);
+ EasyMock.replay(component);
+ JavaTargetInvoker invoker = new JavaTargetInvoker(Foo.class.getMethod("invoke"), component, null, null, null);
+ Message msg = new MessageImpl();
+ msg.setConversationSequence(TargetInvoker.END);
+ invoker.invoke(msg);
+ EasyMock.verify(foo);
+ EasyMock.verify(component);
+ }
+
+
+ private interface Foo {
+ void invoke();
+ }
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerSequenceTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaTargetInvokerTestCase.java Fri Nov 24 23:04:41 2006
@@ -52,7 +52,7 @@
scope.register(component);
JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, component, null, null, null);
invoker.setCacheable(false);
- assertEquals("foo", invoker.invokeTarget("foo"));
+ assertEquals("foo", invoker.invokeTarget("foo", JavaTargetInvoker.NONE));
scope.stop();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/MediationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/MediationTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/MediationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/MediationTestCase.java Fri Nov 24 23:04:41 2006
@@ -20,6 +20,8 @@
import java.lang.reflect.Method;
+import static org.apache.tuscany.spi.wire.TargetInvoker.NONE;
+
import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.tuscany.core.mock.component.SimpleTargetImpl;
@@ -43,7 +45,7 @@
EasyMock.expect(component.getTargetInstance()).andReturn(new SimpleTargetImpl());
EasyMock.replay(component);
JavaTargetInvoker invoker = new JavaTargetInvoker(hello, component, null, null, null);
- Assert.assertEquals("foo", invoker.invokeTarget("foo"));
+ Assert.assertEquals("foo", invoker.invokeTarget("foo", NONE));
}
public interface Hello {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceTestCase.java Fri Nov 24 23:04:41 2006
@@ -58,7 +58,7 @@
@Callback(Bar.class)
@Remotable
- @Scope("CONVERSATIONAL")
+ @Scope("CONVERSATION")
public interface Foo {
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java Fri Nov 24 23:04:41 2006
@@ -58,7 +58,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
processor.visitClass(parent, Conversation.class, type, null);
- assertEquals(Scope.CONVERSATIONAL, type.getImplementationScope());
+ assertEquals(Scope.CONVERSATION, type.getImplementationScope());
}
public void testRequestScope() throws ProcessingException {
@@ -106,7 +106,7 @@
private class Session {
}
- @org.osoa.sca.annotations.Scope("CONVERSATIONAL")
+ @org.osoa.sca.annotations.Scope("CONVERSATION")
private class Conversation {
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeComponent.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeComponent.java Fri Nov 24 23:04:41 2006
@@ -23,7 +23,7 @@
/**
* @version $Rev: 430937 $ $Date: 2006-08-11 21:17:56 -0400 (Fri, 11 Aug 2006) $
*/
-@Scope("CONVERSATIONAL")
+@Scope("CONVERSATION")
public interface ConversationalScopeComponent {
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeComponentImpl.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeComponentImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeComponentImpl.java Fri Nov 24 23:04:41 2006
@@ -23,7 +23,7 @@
/**
* @version $Rev: 430937 $ $Date: 2006-08-11 21:17:56 -0400 (Fri, 11 Aug 2006) $
*/
-@Scope("CONVERSATIONAL")
+@Scope("CONVERSATION")
public class ConversationalScopeComponentImpl
implements ConversationalScopeComponent {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeDestroyOnlyComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeDestroyOnlyComponent.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeDestroyOnlyComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeDestroyOnlyComponent.java Fri Nov 24 23:04:41 2006
@@ -21,7 +21,7 @@
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.Scope;
-@Scope("CONVERSATIONAL")
+@Scope("CONVERSATION")
public class ConversationalScopeDestroyOnlyComponent
extends ConversationalScopeComponentImpl {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeInitDestroyComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeInitDestroyComponent.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeInitDestroyComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeInitDestroyComponent.java Fri Nov 24 23:04:41 2006
@@ -21,7 +21,7 @@
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.Scope;
-@Scope("CONVERSATIONAL")
+@Scope("CONVERSATION")
public class ConversationalScopeInitDestroyComponent
extends ConversationalScopeInitOnlyComponent {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeInitOnlyComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeInitOnlyComponent.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeInitOnlyComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/component/ConversationalScopeInitOnlyComponent.java Fri Nov 24 23:04:41 2006
@@ -21,7 +21,7 @@
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
-@Scope("CONVERSATIONAL")
+@Scope("CONVERSATION")
public class ConversationalScopeInitOnlyComponent
extends ConversationalScopeComponentImpl {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/wire/MockStaticInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/wire/MockStaticInvoker.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/wire/MockStaticInvoker.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/wire/MockStaticInvoker.java Fri Nov 24 23:04:41 2006
@@ -56,7 +56,7 @@
return isCacheable();
}
- public Object invokeTarget(final Object payload) throws InvocationTargetException {
+ public Object invokeTarget(final Object payload, final short sequence) throws InvocationTargetException {
try {
if (payload != null && !payload.getClass().isArray()) {
return operation.invoke(instance, payload);
@@ -70,7 +70,7 @@
public Message invoke(Message msg) throws InvocationRuntimeException {
try {
- Object resp = invokeTarget(msg.getBody());
+ Object resp = invokeTarget(msg.getBody(), TargetInvoker.NONE);
msg.setBody(resp);
} catch (InvocationTargetException e) {
msg.setBodyWithFault(e.getCause());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java?view=diff&rev=479093&r1=479092&r2=479093
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java Fri Nov 24 23:04:41 2006
@@ -40,7 +40,7 @@
store.init();
AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
EasyMock.replay(component);
- UUID id = UUID.randomUUID();
+ String id = UUID.randomUUID().toString();
Object value = new Object();
store.insertRecord(component, id, value, 1);
Thread.sleep(100);
@@ -54,7 +54,7 @@
store.init();
AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
EasyMock.replay(component);
- UUID id = UUID.randomUUID();
+ String id = UUID.randomUUID().toString();
Object value = new Object();
store.insertRecord(component, id, value, Store.NEVER);
Thread.sleep(100);
@@ -68,7 +68,7 @@
store.init();
AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
EasyMock.replay(component);
- UUID id = UUID.randomUUID();
+ String id = UUID.randomUUID().toString();
Object value = new Object();
store.insertRecord(component, id, value, Store.NEVER);
store.destroy();
@@ -80,7 +80,7 @@
store.init();
AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
EasyMock.replay(component);
- UUID id = UUID.randomUUID();
+ String id = UUID.randomUUID().toString();
Object value = new Object();
store.insertRecord(component, id, value, Store.NEVER);
try {
@@ -98,7 +98,7 @@
store.init();
AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
EasyMock.replay(component);
- UUID id = UUID.randomUUID();
+ String id = UUID.randomUUID().toString();
Object value = new Object();
Object newValue = new Object();
@@ -114,7 +114,7 @@
store.init();
AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
EasyMock.replay(component);
- UUID id = UUID.randomUUID();
+ String id = UUID.randomUUID().toString();
Object value = new Object();
store.insertRecord(component, id, value, Store.NEVER);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org