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/05/23 08:32:08 UTC
svn commit: r408838 - in /incubator/tuscany/sandbox/jboynes/sca:
containers/container.java/src/test/java/org/apache/tuscany/container/java/context/
containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/
containers/contai...
Author: jmarino
Date: Mon May 22 23:32:06 2006
New Revision: 408838
URL: http://svn.apache.org/viewvc?rev=408838&view=rev
Log:
testcase cleanup and move to jmock
Added:
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/AtomicContextWireInvocationTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/ReferenceWireTestCase.java
- copied, changed from r408827, incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/AtomicContextToReferenceContextTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/ServiceContextToAtomicContextTestCase.java
- copied, changed from r408827, incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/ServiceContextToAtomicContextTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemServiceWireTestCase.java
- copied, changed from r408827, incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/ServiceContextToReferenceContextTestCase.java
Removed:
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/JavaAtomicContextScopeTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockModelFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/mock/context/MockTargetWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/AsyncSource.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/AsyncSourceImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/AsyncTarget.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/AsyncTargetImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/context/MockCompositeContext.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/context/MockReferenceContext.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/context/scope/
Modified:
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/DifferentInterfaceWireTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/ReferenceInjectionTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/ConnectorTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicHttpSessionScopeTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicModuleScopeTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicRequestScopeTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockWireFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/policy/async/AsyncInterceptorTestCase.java
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/DifferentInterfaceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/DifferentInterfaceWireTestCase.java?rev=408838&r1=408837&r2=408838&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/DifferentInterfaceWireTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/DifferentInterfaceWireTestCase.java Mon May 22 23:32:06 2006
@@ -17,21 +17,19 @@
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.HashMap;
-import java.util.Map;
import java.util.List;
+import java.util.Map;
import junit.framework.TestCase;
import org.apache.tuscany.container.java.mock.MockContextFactory;
+import org.apache.tuscany.container.java.mock.components.OtherTarget;
+import org.apache.tuscany.container.java.mock.components.OtherTargetImpl;
import org.apache.tuscany.container.java.mock.components.Source;
import org.apache.tuscany.container.java.mock.components.SourceImpl;
import org.apache.tuscany.container.java.mock.components.Target;
-import org.apache.tuscany.container.java.mock.components.OtherTargetImpl;
-import org.apache.tuscany.container.java.mock.components.OtherTarget;
-import org.apache.tuscany.core.context.WorkContextImpl;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
import org.apache.tuscany.spi.context.AtomicContext;
import org.apache.tuscany.spi.context.ScopeContext;
-import org.apache.tuscany.spi.context.WorkContext;
/**
@@ -45,8 +43,7 @@
Map<String, Member> members = new HashMap<String, Member>();
Method m = SourceImpl.class.getMethod("setTarget", Target.class);
members.put("target", m);
- WorkContext ctx = new WorkContextImpl();
- ScopeContext scope = new ModuleScopeContext(ctx);
+ ScopeContext scope = new ModuleScopeContext(null);
scope.start();
Map<String, AtomicContext> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class, Target.class, scope,
members, "target", OtherTarget.class, OtherTargetImpl.class, scope);
@@ -62,18 +59,17 @@
Map<String, Member> members = new HashMap<String, Member>();
Method m = SourceImpl.class.getMethod("setTargets", List.class);
members.put("target", m);
- WorkContext ctx = new WorkContextImpl();
- ScopeContext scope = new ModuleScopeContext(ctx);
+ ScopeContext scope = new ModuleScopeContext(null);
scope.start();
Map<String, AtomicContext> contexts = MockContextFactory.createWiredMultiplicity("source", SourceImpl.class, Target.class, scope,
"target", OtherTarget.class, OtherTargetImpl.class, members, scope);
AtomicContext sourceContext = contexts.get("source");
Source source = (Source) sourceContext.getService(null);
List<Target> targets = source.getTargets();
- assertEquals(1,targets.size());
+ assertEquals(1, targets.size());
Target target = targets.get(0);
target.setString("foo");
- assertEquals("foo",target.getString());
+ assertEquals("foo", target.getString());
assertTrue(Proxy.isProxyClass(target.getClass()));
scope.stop();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/ReferenceInjectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/ReferenceInjectionTestCase.java?rev=408838&r1=408837&r2=408838&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/ReferenceInjectionTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/ReferenceInjectionTestCase.java Mon May 22 23:32:06 2006
@@ -8,15 +8,13 @@
import junit.framework.TestCase;
import org.apache.tuscany.container.java.mock.MockContextFactory;
+import org.apache.tuscany.container.java.mock.components.Source;
import org.apache.tuscany.container.java.mock.components.SourceImpl;
import org.apache.tuscany.container.java.mock.components.Target;
import org.apache.tuscany.container.java.mock.components.TargetImpl;
-import org.apache.tuscany.container.java.mock.components.Source;
-import org.apache.tuscany.core.context.WorkContextImpl;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
import org.apache.tuscany.spi.context.AtomicContext;
import org.apache.tuscany.spi.context.ScopeContext;
-import org.apache.tuscany.spi.context.WorkContext;
/**
* @version $$Rev$$ $$Date$$
@@ -26,13 +24,12 @@
private Map<String, Member> members;
public void testProxiedReferenceInjection() throws Exception {
- WorkContext ctx = new WorkContextImpl();
- ScopeContext scope = new ModuleScopeContext(ctx);
+ ScopeContext scope = new ModuleScopeContext(null);
scope.start();
- Map<String,AtomicContext> contexts = MockContextFactory.createWiredContexts("source",SourceImpl.class, scope,
- members, "target",Target.class,TargetImpl.class, scope);
+ Map<String, AtomicContext> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class, scope,
+ members, "target", Target.class, TargetImpl.class, scope);
AtomicContext sourceContext = contexts.get("source");
- Source source = (Source)sourceContext.getService(null);
+ Source source = (Source) sourceContext.getService(null);
Target target = source.getTarget();
assertTrue(Proxy.isProxyClass(target.getClass()));
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/ConnectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/ConnectorTestCase.java?rev=408838&r1=408837&r2=408838&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/ConnectorTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/ConnectorTestCase.java Mon May 22 23:32:06 2006
@@ -4,17 +4,15 @@
import java.util.List;
import junit.framework.TestCase;
-import org.apache.tuscany.core.context.WorkContextImpl;
import org.apache.tuscany.core.context.event.ModuleStart;
import org.apache.tuscany.core.context.event.ModuleStop;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
import org.apache.tuscany.core.mock.component.SimpleSource;
import org.apache.tuscany.core.mock.component.SimpleTarget;
import org.apache.tuscany.core.mock.context.MockAtomicContext;
+import org.apache.tuscany.core.mock.factories.MockWireFactory;
import org.apache.tuscany.core.mock.wire.MockHandler;
import org.apache.tuscany.core.mock.wire.MockSyncInterceptor;
-import org.apache.tuscany.core.mock.factories.MockWireFactory;
-import org.apache.tuscany.spi.context.WorkContext;
import org.apache.tuscany.spi.wire.Interceptor;
import org.apache.tuscany.spi.wire.MessageHandler;
import org.apache.tuscany.spi.wire.SourceWire;
@@ -28,8 +26,7 @@
@SuppressWarnings("unchecked")
public void testNoInterceptorsNoHandlers() throws Exception {
ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
+ ModuleScopeContext scopeContext = new ModuleScopeContext(null);
scopeContext.start();
MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null, null, null);
@@ -53,8 +50,7 @@
@SuppressWarnings("unchecked")
public void testSourceInterceptor() throws Exception {
ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
+ ModuleScopeContext scopeContext = new ModuleScopeContext(null);
scopeContext.start();
MockSyncInterceptor interceptor = new MockSyncInterceptor();
@@ -82,8 +78,7 @@
@SuppressWarnings("unchecked")
public void testTargetInterceptor() throws Exception {
ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
+ ModuleScopeContext scopeContext = new ModuleScopeContext(null);
scopeContext.start();
MockSyncInterceptor interceptor = new MockSyncInterceptor();
@@ -111,8 +106,7 @@
@SuppressWarnings("unchecked")
public void testSourceTargetInterceptor() throws Exception {
ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
+ ModuleScopeContext scopeContext = new ModuleScopeContext();
scopeContext.start();
MockSyncInterceptor sourceInterceptor = new MockSyncInterceptor();
@@ -145,8 +139,7 @@
@SuppressWarnings("unchecked")
public void testSourceInterceptorSourceRequestHandler() throws Exception {
ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
+ ModuleScopeContext scopeContext = new ModuleScopeContext(null);
scopeContext.start();
MockSyncInterceptor interceptor = new MockSyncInterceptor();
@@ -179,8 +172,7 @@
@SuppressWarnings("unchecked")
public void testTargetInterceptorTargetRequestHandler() throws Exception {
ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
+ ModuleScopeContext scopeContext = new ModuleScopeContext(null);
scopeContext.start();
MockSyncInterceptor interceptor = new MockSyncInterceptor();
@@ -189,7 +181,7 @@
MockHandler handler = new MockHandler();
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
handlers.add(handler);
- MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null,null, null);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null, null, null);
MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, interceptors, handlers, null);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
@@ -208,15 +200,13 @@
}
-
/**
* Verifies an invocation with a source interceptor and response handler
*/
@SuppressWarnings("unchecked")
public void testSourceInterceptorSourceResponseHandler() throws Exception {
ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
+ ModuleScopeContext scopeContext = new ModuleScopeContext(null);
scopeContext.start();
MockSyncInterceptor interceptor = new MockSyncInterceptor();
@@ -249,8 +239,7 @@
@SuppressWarnings("unchecked")
public void testTargetInterceptorTargetResponseHandler() throws Exception {
ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
+ ModuleScopeContext scopeContext = new ModuleScopeContext(null);
scopeContext.start();
MockSyncInterceptor interceptor = new MockSyncInterceptor();
@@ -283,8 +272,7 @@
@SuppressWarnings("unchecked")
public void testSourceInterceptorSourceRequestResponseHandler() throws Exception {
ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
+ ModuleScopeContext scopeContext = new ModuleScopeContext(null);
scopeContext.start();
MockSyncInterceptor interceptor = new MockSyncInterceptor();
@@ -317,8 +305,7 @@
@SuppressWarnings("unchecked")
public void testTargetInterceptorTargetRequestResponseHandler() throws Exception {
ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
+ ModuleScopeContext scopeContext = new ModuleScopeContext(null);
scopeContext.start();
MockSyncInterceptor interceptor = new MockSyncInterceptor();
@@ -351,8 +338,7 @@
@SuppressWarnings("unchecked")
public void testSourceRequestResponseHandler() throws Exception {
ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
+ ModuleScopeContext scopeContext = new ModuleScopeContext(null);
scopeContext.start();
MockHandler handler = new MockHandler();
@@ -380,14 +366,13 @@
@SuppressWarnings("unchecked")
public void testTargetRequestResponseHandler() throws Exception {
ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
+ ModuleScopeContext scopeContext = new ModuleScopeContext(null);
scopeContext.start();
MockHandler handler = new MockHandler();
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
handlers.add(handler);
- MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null, null,null);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null, null, null);
MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, null, handlers, handlers);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
@@ -409,8 +394,7 @@
@SuppressWarnings("unchecked")
public void testSourceRequestHandler() throws Exception {
ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
+ ModuleScopeContext scopeContext = new ModuleScopeContext(null);
scopeContext.start();
MockHandler handler = new MockHandler();
@@ -438,8 +422,7 @@
@SuppressWarnings("unchecked")
public void testTargetRequestHandler() throws Exception {
ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
+ ModuleScopeContext scopeContext = new ModuleScopeContext(null);
scopeContext.start();
MockHandler handler = new MockHandler();
@@ -467,14 +450,13 @@
@SuppressWarnings("unchecked")
public void testSourceResponseHandler() throws Exception {
ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
+ ModuleScopeContext scopeContext = new ModuleScopeContext(null);
scopeContext.start();
MockHandler handler = new MockHandler();
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
handlers.add(handler);
- MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null,null, handlers);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null, null, handlers);
MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, null, null, null);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
@@ -496,14 +478,13 @@
@SuppressWarnings("unchecked")
public void testTargetResponseHandler() throws Exception {
ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
+ ModuleScopeContext scopeContext = new ModuleScopeContext(null);
scopeContext.start();
MockHandler handler = new MockHandler();
List<MessageHandler> handlers = new ArrayList<MessageHandler>();
handlers.add(handler);
- MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null,null, null);
+ MockAtomicContext<SimpleSource> sourceContext = MockWireFactory.setupSource(scopeContext, null, null, null);
MockAtomicContext<SimpleTarget> targetContext = MockWireFactory.setupTarget(scopeContext, null, null, handlers);
for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicHttpSessionScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicHttpSessionScopeTestCase.java?rev=408838&r1=408837&r2=408838&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicHttpSessionScopeTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicHttpSessionScopeTestCase.java Mon May 22 23:32:06 2006
@@ -1,17 +1,15 @@
package org.apache.tuscany.core.context.scope;
import junit.framework.TestCase;
-import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.core.context.WorkContextImpl;
import org.apache.tuscany.core.context.event.HttpSessionEnd;
import org.apache.tuscany.core.injection.EventInvoker;
import org.apache.tuscany.core.injection.MethodEventInvoker;
import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.mock.component.SessionScopeInitDestroyComponent;
-import org.apache.tuscany.core.mock.context.MockCompositeContext;
-import org.apache.tuscany.core.system.context.SystemAtomicContextImpl;
import org.apache.tuscany.core.system.context.SystemAtomicContext;
-import org.apache.tuscany.spi.context.CompositeContext;
+import org.apache.tuscany.core.system.context.SystemAtomicContextImpl;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.context.WorkContext;
/**
@@ -25,13 +23,11 @@
public void testLifecycleManagement() throws Exception {
WorkContext workContext = new WorkContextImpl();
- CompositeContext currentModule = new MockCompositeContext(null, null);
HttpSessionScopeContext scopeContext = new HttpSessionScopeContext(workContext);
scopeContext.start();
SystemAtomicContext atomicContext = createContext();
atomicContext.setScopeContext(scopeContext);
// start the request
- workContext.setRemoteContext(currentModule);
Object session = new Object();
workContext.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session);
SessionScopeInitDestroyComponent o1 = (SessionScopeInitDestroyComponent) scopeContext.getInstance(atomicContext);
@@ -46,14 +42,12 @@
public void testSessionIsolation() throws Exception {
WorkContext workContext = new WorkContextImpl();
- CompositeContext currentModule = new MockCompositeContext(null, null);
HttpSessionScopeContext scopeContext = new HttpSessionScopeContext(workContext);
scopeContext.start();
SystemAtomicContext atomicContext = createContext();
atomicContext.setScopeContext(scopeContext);
- workContext.setRemoteContext(currentModule);
Object session1 = new Object();
workContext.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session1);
SessionScopeInitDestroyComponent o1 = (SessionScopeInitDestroyComponent) scopeContext.getInstance(atomicContext);
@@ -84,6 +78,6 @@
}
private SystemAtomicContext createContext() {
- return new SystemAtomicContextImpl("foo", null, SessionScopeInitDestroyComponent.class, factory, false, initInvoker, destroyInvoker, null,null);
+ return new SystemAtomicContextImpl("foo", null, SessionScopeInitDestroyComponent.class, factory, false, initInvoker, destroyInvoker, null, null);
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicModuleScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicModuleScopeTestCase.java?rev=408838&r1=408837&r2=408838&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicModuleScopeTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicModuleScopeTestCase.java Mon May 22 23:32:06 2006
@@ -1,17 +1,15 @@
package org.apache.tuscany.core.context.scope;
import junit.framework.TestCase;
-import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.core.context.WorkContextImpl;
import org.apache.tuscany.core.context.event.ModuleStop;
import org.apache.tuscany.core.injection.EventInvoker;
import org.apache.tuscany.core.injection.MethodEventInvoker;
import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.mock.component.ModuleScopeInitDestroyComponent;
-import org.apache.tuscany.core.mock.context.MockCompositeContext;
-import org.apache.tuscany.core.system.context.SystemAtomicContextImpl;
import org.apache.tuscany.core.system.context.SystemAtomicContext;
-import org.apache.tuscany.spi.context.CompositeContext;
+import org.apache.tuscany.core.system.context.SystemAtomicContextImpl;
+import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.context.WorkContext;
/**
@@ -25,26 +23,23 @@
public void testLifecycleManagement() throws Exception {
WorkContext workContext = new WorkContextImpl();
- CompositeContext currentModule = new MockCompositeContext(null, null);
ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
scopeContext.start();
SystemAtomicContext atomicContext = createContext();
atomicContext.setScopeContext(scopeContext);
// start the request
- workContext.setRemoteContext(currentModule);
ModuleScopeInitDestroyComponent o1 = (ModuleScopeInitDestroyComponent) scopeContext.getInstance(atomicContext);
assertTrue(o1.isInitialized());
assertFalse(o1.isDestroyed());
ModuleScopeInitDestroyComponent o2 = (ModuleScopeInitDestroyComponent) scopeContext.getInstance(atomicContext);
assertEquals(o1, o2);
- scopeContext.onEvent(new ModuleStop(this, currentModule));
+ scopeContext.onEvent(new ModuleStop(this, null));
assertTrue(o1.isDestroyed());
scopeContext.stop();
}
public void testModuleIsolation() throws Exception {
WorkContext workContext = new WorkContextImpl();
- CompositeContext currentModule = new MockCompositeContext(null, null);
ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
scopeContext.start();
@@ -53,14 +48,13 @@
SystemAtomicContext atomicContext2 = createContext();
atomicContext2.setScopeContext(scopeContext);
- workContext.setRemoteContext(currentModule);
ModuleScopeInitDestroyComponent o1 = (ModuleScopeInitDestroyComponent) scopeContext.getInstance(atomicContext);
assertTrue(o1.isInitialized());
assertFalse(o1.isDestroyed());
ModuleScopeInitDestroyComponent o2 = (ModuleScopeInitDestroyComponent) scopeContext.getInstance(atomicContext);
assertSame(o1, o2);
- scopeContext.onEvent(new ModuleStop(this, currentModule));
+ scopeContext.onEvent(new ModuleStop(this, null));
assertTrue(o1.isDestroyed());
scopeContext.stop();
}
@@ -77,6 +71,6 @@
}
private SystemAtomicContext createContext() {
- return new SystemAtomicContextImpl("foo", null, ModuleScopeInitDestroyComponent.class,factory, false, initInvoker, destroyInvoker, null,null);
+ return new SystemAtomicContextImpl("foo", null, ModuleScopeInitDestroyComponent.class, factory, false, initInvoker, destroyInvoker, null, null);
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicRequestScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicRequestScopeTestCase.java?rev=408838&r1=408837&r2=408838&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicRequestScopeTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/context/scope/BasicRequestScopeTestCase.java Mon May 22 23:32:06 2006
@@ -1,18 +1,14 @@
package org.apache.tuscany.core.context.scope;
import junit.framework.TestCase;
-import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.core.context.WorkContextImpl;
import org.apache.tuscany.core.context.event.RequestEnd;
import org.apache.tuscany.core.injection.EventInvoker;
import org.apache.tuscany.core.injection.MethodEventInvoker;
import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.mock.component.RequestScopeInitDestroyComponent;
-import org.apache.tuscany.core.mock.context.MockCompositeContext;
-import org.apache.tuscany.core.system.context.SystemAtomicContextImpl;
import org.apache.tuscany.core.system.context.SystemAtomicContext;
-import org.apache.tuscany.spi.context.CompositeContext;
-import org.apache.tuscany.spi.context.WorkContext;
+import org.apache.tuscany.core.system.context.SystemAtomicContextImpl;
+import org.apache.tuscany.spi.ObjectFactory;
/**
* @version $$Rev$$ $$Date$$
@@ -24,14 +20,11 @@
private ObjectFactory<?> factory;
public void testLifecycleManagement() throws Exception {
- WorkContext workContext = new WorkContextImpl();
- CompositeContext currentModule = new MockCompositeContext(null, null);
- RequestScopeContext scopeContext = new RequestScopeContext(workContext);
+ RequestScopeContext scopeContext = new RequestScopeContext(null);
scopeContext.start();
SystemAtomicContext atomicContext = createContext();
atomicContext.setScopeContext(scopeContext);
// start the request
- workContext.setRemoteContext(currentModule);
RequestScopeInitDestroyComponent o1 = (RequestScopeInitDestroyComponent) scopeContext.getInstance(atomicContext);
assertTrue(o1.isInitialized());
assertFalse(o1.isDestroyed());
@@ -43,15 +36,12 @@
}
public void testRequestIsolation() throws Exception {
- WorkContext workContext = new WorkContextImpl();
- CompositeContext currentModule = new MockCompositeContext(null, null);
- RequestScopeContext scopeContext = new RequestScopeContext(workContext);
+ RequestScopeContext scopeContext = new RequestScopeContext(null);
scopeContext.start();
SystemAtomicContext atomicContext = createContext();
atomicContext.setScopeContext(scopeContext);
- workContext.setRemoteContext(currentModule);
RequestScopeInitDestroyComponent o1 = (RequestScopeInitDestroyComponent) scopeContext.getInstance(atomicContext);
assertTrue(o1.isInitialized());
scopeContext.onEvent(new RequestEnd(this));
@@ -76,6 +66,6 @@
}
private SystemAtomicContext createContext() {
- return new SystemAtomicContextImpl("foo", null, RequestScopeInitDestroyComponent.class,factory, false, initInvoker, destroyInvoker, null,null);
+ return new SystemAtomicContextImpl("foo", null, RequestScopeInitDestroyComponent.class, factory, false, initInvoker, destroyInvoker, null, null);
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockWireFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockWireFactory.java?rev=408838&r1=408837&r2=408838&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockWireFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockWireFactory.java Mon May 22 23:32:06 2006
@@ -1,35 +1,31 @@
package org.apache.tuscany.core.mock.factories;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.lang.reflect.Method;
import java.lang.reflect.Constructor;
import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.mock.component.SimpleSource;
-import org.apache.tuscany.core.mock.component.SimpleTarget;
import org.apache.tuscany.core.mock.component.SimpleSourceImpl;
+import org.apache.tuscany.core.mock.component.SimpleTarget;
import org.apache.tuscany.core.mock.component.SimpleTargetImpl;
-import org.apache.tuscany.core.mock.component.AsyncTarget;
-import org.apache.tuscany.core.mock.component.AsyncSource;
-import org.apache.tuscany.core.mock.component.AsyncSourceImpl;
-import org.apache.tuscany.core.mock.component.AsyncTargetImpl;
import org.apache.tuscany.core.mock.context.MockAtomicContext;
-import org.apache.tuscany.core.injection.PojoObjectFactory;
-import org.apache.tuscany.core.wire.jdk.JDKSourceWire;
-import org.apache.tuscany.core.wire.jdk.JDKTargetWire;
+import org.apache.tuscany.core.wire.InvokerInterceptor;
import org.apache.tuscany.core.wire.SourceInvocationChainImpl;
import org.apache.tuscany.core.wire.TargetInvocationChainImpl;
-import org.apache.tuscany.core.wire.InvokerInterceptor;
+import org.apache.tuscany.core.wire.jdk.JDKSourceWire;
+import org.apache.tuscany.core.wire.jdk.JDKTargetWire;
+import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.context.ScopeContext;
import org.apache.tuscany.spi.wire.Interceptor;
import org.apache.tuscany.spi.wire.MessageHandler;
-import org.apache.tuscany.spi.wire.SourceWire;
import org.apache.tuscany.spi.wire.SourceInvocationChain;
+import org.apache.tuscany.spi.wire.SourceWire;
import org.apache.tuscany.spi.wire.TargetWire;
-import org.apache.tuscany.spi.QualifiedName;
/**
* A factory for constructing a wire between a {@link org.apache.tuscany.core.mock.component.SimpleSource} and
@@ -43,8 +39,8 @@
}
public static MockAtomicContext<SimpleSource> setupSource(ScopeContext scopeContext, List<Interceptor> interceptors,
- List<MessageHandler> requestHandlers,
- List<MessageHandler> responseHandlers) throws NoSuchMethodException {
+ List<MessageHandler> requestHandlers,
+ List<MessageHandler> responseHandlers) throws NoSuchMethodException {
Method echo = SimpleTarget.class.getMethod("echo", String.class);
List<Class<?>> sourceInterfaces = new ArrayList<Class<?>>();
@@ -81,8 +77,8 @@
}
public static MockAtomicContext<SimpleTarget> setupTarget(ScopeContext scopeContext, List<Interceptor> interceptors,
- List<MessageHandler> requestHandlers,
- List<MessageHandler> responseHandlers) throws NoSuchMethodException {
+ List<MessageHandler> requestHandlers,
+ List<MessageHandler> responseHandlers) throws NoSuchMethodException {
Method echo = SimpleTarget.class.getMethod("echo", String.class);
List<Class<?>> targetInterfaces = new ArrayList<Class<?>>();
@@ -115,83 +111,6 @@
target.setScopeContext(scopeContext);
return target;
}
-
-
- public static MockAtomicContext<AsyncSource> setupAsyncSource(ScopeContext scopeContext, List<Interceptor> interceptors,
- List<MessageHandler> requestHandlers,
- List<MessageHandler> responseHandlers) throws NoSuchMethodException {
- Method setter = AsyncTarget.class.getMethod("setString", String.class);
-
- List<Class<?>> sourceInterfaces = new ArrayList<Class<?>>();
- sourceInterfaces.add(AsyncSource.class);
- Constructor<AsyncSourceImpl> sourceCtr = AsyncSourceImpl.class.getConstructor();
- Map<String, Member> members = new HashMap<String, Member>();
- members.put("target", AsyncSourceImpl.class.getMethod("setTarget", AsyncTarget.class));
- MockAtomicContext<AsyncSource> source = new MockAtomicContext<AsyncSource>("source", sourceInterfaces, new PojoObjectFactory<AsyncSourceImpl>(sourceCtr),
- scopeContext.getScope(), members);
- SourceWire<AsyncTarget> sourceWire = new JDKSourceWire<AsyncTarget>();
- sourceWire.setBusinessInterface(AsyncTarget.class);
- sourceWire.setReferenceName("target");
- sourceWire.setTargetName(new QualifiedName("target/AsyncTarget"));
- SourceInvocationChain chain = new SourceInvocationChainImpl(setter);
- if (interceptors != null) {
- for (Interceptor interceptor : interceptors) {
- chain.addInterceptor(interceptor);
- }
- }
- if (requestHandlers != null) {
- for (MessageHandler handler : requestHandlers) {
- chain.addRequestHandler(handler);
- }
- }
- if (responseHandlers != null) {
- for (MessageHandler handler : responseHandlers) {
- chain.addResponseHandler(handler);
- }
- }
- sourceWire.addInvocationChain(setter, chain);
- source.addSourceWire(sourceWire);
- source.setScopeContext(scopeContext);
- return source;
- }
-
- public static MockAtomicContext<AsyncTarget> setupAsyncTarget(ScopeContext scopeContext, List<Interceptor> interceptors,
- List<MessageHandler> requestHandlers,
- List<MessageHandler> responseHandlers) throws NoSuchMethodException {
- Method echo = AsyncTarget.class.getMethod("setString", String.class);
-
- List<Class<?>> targetInterfaces = new ArrayList<Class<?>>();
- targetInterfaces.add(SimpleTarget.class);
- Constructor<AsyncTargetImpl> targetCtr = AsyncTargetImpl.class.getConstructor();
- MockAtomicContext<AsyncTarget> target = new MockAtomicContext<AsyncTarget>("target", targetInterfaces,
- new PojoObjectFactory<AsyncTargetImpl>(targetCtr),
- scopeContext.getScope(), null);
- TargetWire<AsyncTarget> targetWire = new JDKTargetWire<AsyncTarget>();
- targetWire.setBusinessInterface(AsyncTarget.class);
- targetWire.setServiceName("AsyncTarget");
- TargetInvocationChainImpl chain = new TargetInvocationChainImpl(echo);
- if (interceptors != null) {
- for (Interceptor interceptor : interceptors) {
- chain.addInterceptor(interceptor);
- }
- }
- if (requestHandlers != null) {
- for (MessageHandler handler : requestHandlers) {
- chain.addRequestHandler(handler);
- }
- }
- if (responseHandlers != null) {
- for (MessageHandler handler : responseHandlers) {
- chain.addResponseHandler(handler);
- }
- }
- chain.addInterceptor(new InvokerInterceptor()); // add tail interceptor
- targetWire.addInvocationChain(echo, chain);
- target.addTargetWire(targetWire);
- target.setScopeContext(scopeContext);
- return target;
- }
-
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/policy/async/AsyncInterceptorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/policy/async/AsyncInterceptorTestCase.java?rev=408838&r1=408837&r2=408838&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/policy/async/AsyncInterceptorTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/policy/async/AsyncInterceptorTestCase.java Mon May 22 23:32:06 2006
@@ -1,83 +1,47 @@
package org.apache.tuscany.core.policy.async;
-import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.CountDownLatch;
-import junit.framework.TestCase;
import org.apache.geronimo.connector.work.GeronimoWorkManager;
import org.apache.geronimo.transaction.context.TransactionContextManager;
-import org.apache.tuscany.core.builder.ConnectorImpl;
-import org.apache.tuscany.core.context.WorkContextImpl;
-import org.apache.tuscany.core.context.event.ModuleStart;
-import org.apache.tuscany.core.context.event.ModuleStop;
-import org.apache.tuscany.core.context.scope.ModuleScopeContext;
-import org.apache.tuscany.core.mock.component.AsyncSource;
-import org.apache.tuscany.core.mock.component.AsyncTarget;
-import org.apache.tuscany.core.mock.component.SimpleTarget;
-import org.apache.tuscany.core.mock.context.MockAtomicContext;
-import org.apache.tuscany.core.mock.factories.MockWireFactory;
-import org.apache.tuscany.core.mock.wire.MockSyncInterceptor;
-import org.apache.tuscany.core.mock.wire.MockHandler;
import org.apache.tuscany.core.monitor.NullMonitorFactory;
-import org.apache.tuscany.spi.context.WorkContext;
+import org.apache.tuscany.core.wire.MessageImpl;
import org.apache.tuscany.spi.wire.Interceptor;
-import org.apache.tuscany.spi.wire.SourceWire;
-import org.apache.tuscany.spi.wire.TargetWire;
-import org.apache.tuscany.spi.wire.MessageHandler;
+import org.apache.tuscany.spi.wire.Message;
+import org.jmock.Mock;
+import org.jmock.MockObjectTestCase;
+import org.jmock.core.Invocation;
+import org.jmock.core.Stub;
/**
* @version $$Rev$$ $$Date$$
*/
-public class AsyncInterceptorTestCase extends TestCase {
+public class AsyncInterceptorTestCase extends MockObjectTestCase {
private GeronimoWorkManager workManager;
@SuppressWarnings("unchecked")
public void testInvocation() throws Exception {
- ConnectorImpl connector = new ConnectorImpl();
- WorkContext workContext = new WorkContextImpl();
- ModuleScopeContext scopeContext = new ModuleScopeContext(workContext);
- scopeContext.start();
-
- List<Interceptor> sourceInterceptors = new ArrayList<Interceptor>();
- MockSyncInterceptor sourceInterceptor = new MockSyncInterceptor();
- sourceInterceptors.add(sourceInterceptor);
-
- MockHandler handler = new MockHandler();
- List<MessageHandler> handlers = new ArrayList<MessageHandler>();
- handlers.add(handler);
- MockAtomicContext<AsyncSource> sourceContext = MockWireFactory.setupAsyncSource(scopeContext, sourceInterceptors, handlers, handlers);
-
- List<Interceptor> targetInterceptors = new ArrayList<Interceptor>();
AsyncInterceptor asyncInterceptor = new AsyncInterceptor(workManager, new NullMonitorFactory().getMonitor(AsyncMonitor.class));
- targetInterceptors.add(asyncInterceptor);
- MockSyncInterceptor targetInterceptor = new MockSyncInterceptor();
- targetInterceptors.add(targetInterceptor);
-
- MockAtomicContext<AsyncTarget> targetContext = MockWireFactory.setupAsyncTarget(scopeContext, targetInterceptors, handlers, handlers);
- for (SourceWire<?> sourceWire : sourceContext.getSourceWires()) {
- TargetWire<SimpleTarget> targetWire = targetContext.getTargetWire(sourceWire.getTargetName().getPortName());
- connector.connect((SourceWire<SimpleTarget>) sourceWire, targetWire, targetContext, false);
- }
- targetContext.prepare();
-
- scopeContext.onEvent(new ModuleStart(this, null));
- AsyncTarget target = targetContext.getService();
- CountDownLatch startSignal = new CountDownLatch(1);
- CountDownLatch doneSignal = new CountDownLatch(1);
- target.setLatches(startSignal,doneSignal);
- assertNull(target.getString());
- AsyncSource source = sourceContext.getService();
- source.getTarget().setString("foo");
+ Message msg = new MessageImpl();
+ msg.setBody("foo");
+ final CountDownLatch startSignal = new CountDownLatch(1);
+ final CountDownLatch doneSignal = new CountDownLatch(1);
+ Mock mock = mock(Interceptor.class);
+ mock.expects(once()).method("invoke").with(eq(msg)).will(new Stub() {
+ public Object invoke(Invocation invocation) throws Throwable {
+ startSignal.await();
+ doneSignal.countDown();
+ return null;
+ }
+ public StringBuffer describeTo(StringBuffer stringBuffer) {
+ return null;
+ }
+ });
+ asyncInterceptor.setNext((Interceptor) mock.proxy());
+ asyncInterceptor.invoke(msg);
startSignal.countDown();
doneSignal.await();
- assertEquals("foo",target.getString());
- assertEquals(1,sourceInterceptor.getCount());
- assertEquals(1,targetInterceptor.getCount());
- assertEquals(4,handler.getCount());
- scopeContext.onEvent(new ModuleStop(this, null));
- scopeContext.stop();
}
protected void setUp() throws Exception {
Added: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/AtomicContextWireInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/AtomicContextWireInvocationTestCase.java?rev=408838&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/AtomicContextWireInvocationTestCase.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/AtomicContextWireInvocationTestCase.java Mon May 22 23:32:06 2006
@@ -0,0 +1,48 @@
+package org.apache.tuscany.core.system.wire;
+
+import java.lang.reflect.Member;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+
+import org.jmock.MockObjectTestCase;
+import org.jmock.Mock;
+import org.apache.tuscany.core.context.scope.ModuleScopeContext;
+import org.apache.tuscany.core.mock.component.Target;
+import org.apache.tuscany.core.mock.component.TargetImpl;
+import org.apache.tuscany.core.mock.component.SourceImpl;
+import org.apache.tuscany.core.mock.component.Source;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
+import org.apache.tuscany.core.system.context.SystemAtomicContext;
+import org.apache.tuscany.core.system.wire.SystemSourceWire;
+import org.apache.tuscany.spi.wire.TargetWire;
+import org.apache.tuscany.spi.wire.SourceWire;
+import org.apache.tuscany.spi.QualifiedName;
+
+/**
+ * Tests wiring from an system atomic context
+ *
+ * @version $$Rev$$ $$Date$$
+ */
+public class AtomicContextWireInvocationTestCase extends MockObjectTestCase {
+
+ public void testWireResolution() throws NoSuchMethodException {
+ ModuleScopeContext scope = new ModuleScopeContext(null);
+ scope.start();
+ Target target = new TargetImpl();
+ Mock mockWire = mock(TargetWire.class);
+ mockWire.expects(atLeastOnce()).method("getTargetService").will(returnValue(target));
+ TargetWire<Target> targetWire = (TargetWire<Target>) mockWire.proxy();
+ Map<String, Member> members = new HashMap<String, Member>();
+ members.put("setTarget", SourceImpl.class.getMethod("setTarget", Target.class));
+ List<Class<?>> interfaces = new ArrayList<Class<?>>();
+ interfaces.add(Source.class);
+ SystemAtomicContext sourceContext = MockContextFactory.createSystemAtomicContext("source", interfaces, SourceImpl.class, null, members);
+ SourceWire<Target> sourceWire = new SystemSourceWire<Target>("setTarget", new QualifiedName("service"), Target.class);
+ sourceWire.setTargetWire(targetWire);
+ sourceContext.addSourceWire(sourceWire);
+ sourceContext.setScopeContext(scope);
+ assertSame(((Source) sourceContext.getService()).getTarget(), target); // wires should pass back direct ref
+ }
+}
Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/ReferenceWireTestCase.java (from r408827, incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/AtomicContextToReferenceContextTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/ReferenceWireTestCase.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/ReferenceWireTestCase.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/AtomicContextToReferenceContextTestCase.java&r1=408827&r2=408838&rev=408838&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/AtomicContextToReferenceContextTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/ReferenceWireTestCase.java Mon May 22 23:32:06 2006
@@ -1,61 +1,32 @@
-package org.apache.tuscany.core.integration.system.context;
+package org.apache.tuscany.core.system.wire;
-import java.lang.reflect.Member;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.TestCase;
-import org.apache.tuscany.core.context.WorkContextImpl;
-import org.apache.tuscany.core.context.scope.ModuleScopeContext;
-import org.apache.tuscany.core.mock.factories.MockContextFactory;
-import org.apache.tuscany.core.mock.component.Source;
-import org.apache.tuscany.core.mock.component.SourceImpl;
import org.apache.tuscany.core.mock.component.Target;
import org.apache.tuscany.core.mock.component.TargetImpl;
-import org.apache.tuscany.core.mock.context.MockReferenceContext;
-import org.apache.tuscany.core.mock.context.MockTargetWire;
-import org.apache.tuscany.core.system.context.SystemAtomicContext;
-import org.apache.tuscany.core.system.context.SystemCompositeContext;
-import org.apache.tuscany.core.system.context.SystemCompositeContextImpl;
+import org.apache.tuscany.core.system.context.SystemReferenceContextImpl;
import org.apache.tuscany.core.system.wire.SystemSourceWire;
import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.context.WorkContext;
import org.apache.tuscany.spi.wire.SourceWire;
import org.apache.tuscany.spi.wire.TargetWire;
+import org.jmock.Mock;
+import org.jmock.MockObjectTestCase;
/**
- * Tests wireing from an atomic context to a reference context
+ * Tests wiring from a system atomic context
*
* @version $$Rev$$ $$Date$$
*/
-public class AtomicContextToReferenceContextTestCase extends TestCase {
-
- public void testWireResolution() throws NoSuchMethodException {
- WorkContext ctx = new WorkContextImpl();
- ModuleScopeContext scope = new ModuleScopeContext(ctx);
- SystemCompositeContext context = new SystemCompositeContextImpl(null, null, null);
- scope.start();
- MockReferenceContext<Target> serviceContext = new MockReferenceContext<Target>("service", context, Target.class);
- TargetWire<Target> targetWire = new MockTargetWire<Target>(Target.class, new TargetImpl());
- serviceContext.setTargetWire(targetWire);
- context.registerContext(serviceContext);
+public class ReferenceWireTestCase extends MockObjectTestCase {
- Map<String, Member> members = new HashMap<String, Member>();
- members.put("setTarget", SourceImpl.class.getMethod("setTarget", Target.class));
- List<Class<?>> interfaces = new ArrayList<Class<?>>();
- interfaces.add(Source.class);
- SystemAtomicContext sourceContext = MockContextFactory.createSystemAtomicContext("source", interfaces, SourceImpl.class, null, members);
+ public void testSReferenceWire() throws NoSuchMethodException {
+ Target target = new TargetImpl();
+ Mock mockWire = mock(TargetWire.class);
+ mockWire.expects(atLeastOnce()).method("getTargetService").will(returnValue(target));
+ TargetWire<Target> targetWire = (TargetWire<Target>) mockWire.proxy();
+ SystemReferenceContextImpl<Target> referenceContext = new SystemReferenceContextImpl<Target>("reference", Target.class, null);
+ referenceContext.setTargetWire(targetWire);
SourceWire<Target> sourceWire = new SystemSourceWire<Target>("setTarget", new QualifiedName("service"), Target.class);
sourceWire.setTargetWire(targetWire);
- sourceContext.addSourceWire(sourceWire);
- context.registerContext(sourceContext);
- sourceContext.setScopeContext(scope);
- context.start();
- MockReferenceContext serviceContext2 = (MockReferenceContext) context.getContext("service");
- assertSame(serviceContext, serviceContext2);
- Target target = (Target) serviceContext2.getService();
- assertSame(((Source) sourceContext.getService()).getTarget(), target);
+ assertSame(sourceWire.getTargetService(), target); // wires should pass back direct ref
}
-}
+
+}
\ No newline at end of file
Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/ServiceContextToAtomicContextTestCase.java (from r408827, incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/ServiceContextToAtomicContextTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/ServiceContextToAtomicContextTestCase.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/ServiceContextToAtomicContextTestCase.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/ServiceContextToAtomicContextTestCase.java&r1=408827&r2=408838&rev=408838&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/ServiceContextToAtomicContextTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/ServiceContextToAtomicContextTestCase.java Mon May 22 23:32:06 2006
@@ -1,22 +1,18 @@
-package org.apache.tuscany.core.integration.system.context;
+package org.apache.tuscany.core.system.wire;
import junit.framework.TestCase;
-import org.apache.tuscany.core.context.WorkContextImpl;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
-import org.apache.tuscany.core.mock.factories.MockContextFactory;
import org.apache.tuscany.core.mock.component.Target;
import org.apache.tuscany.core.mock.component.TargetImpl;
+import org.apache.tuscany.core.mock.factories.MockContextFactory;
import org.apache.tuscany.core.system.context.SystemAtomicContext;
-import org.apache.tuscany.core.system.context.SystemCompositeContext;
-import org.apache.tuscany.core.system.context.SystemCompositeContextImpl;
import org.apache.tuscany.core.system.context.SystemServiceContext;
import org.apache.tuscany.core.system.context.SystemServiceContextImpl;
import org.apache.tuscany.core.system.wire.SystemSourceWire;
import org.apache.tuscany.core.system.wire.SystemTargetWire;
-import org.apache.tuscany.spi.context.WorkContext;
+import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.wire.SourceWire;
import org.apache.tuscany.spi.wire.TargetWire;
-import org.apache.tuscany.spi.QualifiedName;
/**
* Tests a wire from a service context to an atomic context
@@ -26,22 +22,15 @@
public class ServiceContextToAtomicContextTestCase extends TestCase {
public void testWireResolution() throws NoSuchMethodException {
- WorkContext ctx = new WorkContextImpl();
- ModuleScopeContext scope = new ModuleScopeContext(ctx);
- SystemCompositeContext context = new SystemCompositeContextImpl(null, null, null);
+ ModuleScopeContext scope = new ModuleScopeContext(null);
scope.start();
SystemAtomicContext targetContext = MockContextFactory.createSystemAtomicContext("target", TargetImpl.class);
- context.registerContext(targetContext);
targetContext.setScopeContext(scope);
- TargetWire<Target> targetWire = new SystemTargetWire<Target>(Target.class,targetContext);
- SourceWire<Target> wire = new SystemSourceWire<Target>("service",new QualifiedName("target"),Target.class); //String referenceName, QualifiedName targetName, Class<T> businessInterface
+ TargetWire<Target> targetWire = new SystemTargetWire<Target>(Target.class, targetContext);
+ SourceWire<Target> wire = new SystemSourceWire<Target>("service", new QualifiedName("target"), Target.class); //String referenceName, QualifiedName targetName, Class<T> businessInterface
wire.setTargetWire(targetWire);
- SystemServiceContext<Target> serviceContext = new SystemServiceContextImpl<Target>("service", wire, context);
- context.registerContext(serviceContext);
- context.start();
- SystemServiceContext serviceContext2 = (SystemServiceContext) context.getContext("service");
- assertSame(serviceContext, serviceContext2);
- Target target = (Target) serviceContext2.getService();
+ SystemServiceContext<Target> serviceContext = new SystemServiceContextImpl<Target>("service", wire, null);
+ Target target = serviceContext.getService();
assertSame(targetContext.getService(), target);
}
}
Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemServiceWireTestCase.java (from r408827, incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/ServiceContextToReferenceContextTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemServiceWireTestCase.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemServiceWireTestCase.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/ServiceContextToReferenceContextTestCase.java&r1=408827&r2=408838&rev=408838&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/context/ServiceContextToReferenceContextTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemServiceWireTestCase.java Mon May 22 23:32:06 2006
@@ -1,46 +1,36 @@
-package org.apache.tuscany.core.integration.system.context;
+package org.apache.tuscany.core.system.wire;
-import junit.framework.TestCase;
-import org.apache.tuscany.core.context.WorkContextImpl;
-import org.apache.tuscany.core.context.scope.ModuleScopeContext;
import org.apache.tuscany.core.mock.component.Target;
import org.apache.tuscany.core.mock.component.TargetImpl;
-import org.apache.tuscany.core.mock.context.MockReferenceContext;
-import org.apache.tuscany.core.mock.context.MockTargetWire;
-import org.apache.tuscany.core.system.context.SystemCompositeContext;
-import org.apache.tuscany.core.system.context.SystemCompositeContextImpl;
-import org.apache.tuscany.core.system.context.SystemReferenceContext;
import org.apache.tuscany.core.system.context.SystemServiceContext;
import org.apache.tuscany.core.system.context.SystemServiceContextImpl;
import org.apache.tuscany.core.system.wire.SystemSourceWire;
+import org.apache.tuscany.core.system.wire.SystemTargetWire;
import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.context.WorkContext;
+import org.apache.tuscany.spi.context.ComponentContext;
import org.apache.tuscany.spi.wire.SourceWire;
import org.apache.tuscany.spi.wire.TargetWire;
+import org.jmock.Mock;
+import org.jmock.MockObjectTestCase;
/**
- * Tests wiring from a service context directly to an atomic context
- *
* @version $$Rev$$ $$Date$$
*/
-public class ServiceContextToReferenceContextTestCase extends TestCase {
+public class SystemServiceWireTestCase extends MockObjectTestCase {
public void testWireResolution() throws NoSuchMethodException {
- WorkContext ctx = new WorkContextImpl();
- ModuleScopeContext scope = new ModuleScopeContext(ctx);
- SystemCompositeContext context = new SystemCompositeContextImpl(null, null, null);
- scope.start();
- SystemReferenceContext<Target> referenceContext = new MockReferenceContext<Target>("reference", context, Target.class);
- context.registerContext(referenceContext);
- TargetWire<Target> targetWire = new MockTargetWire<Target>(Target.class, new TargetImpl());
- SourceWire<Target> wire = new SystemSourceWire<Target>("service", new QualifiedName("reference"), Target.class); //String referenceName, QualifiedName targetName, Class<T> businessInterface
- wire.setTargetWire(targetWire);
- SystemServiceContext<Target> serviceContext = new SystemServiceContextImpl<Target>("service", wire, context);
- context.registerContext(serviceContext);
- context.start();
- SystemServiceContext serviceContext2 = (SystemServiceContext) context.getContext("service");
- assertSame(serviceContext, serviceContext2);
- Target target = (Target) serviceContext2.getService();
- assertNotNull(target);
+ Target originalTarget = new TargetImpl();
+ // construct mock target
+ Mock mock = mock(ComponentContext.class);
+ mock.expects(once()).method("getService").will(returnValue(originalTarget));
+ ComponentContext<Target> context = (ComponentContext<Target>) mock.proxy();
+ TargetWire<Target> targetWire = new SystemTargetWire<Target>("Target",Target.class,context);
+
+ // create service with wire
+ SourceWire<Target> sourceWire = new SystemSourceWire<Target>("service", new QualifiedName("reference"), Target.class); //String referenceName, QualifiedName targetName, Class<T> businessInterface
+ sourceWire.setTargetWire(targetWire);
+ SystemServiceContext<Target> serviceContext = new SystemServiceContextImpl<Target>("service", sourceWire, null);
+ Target target = serviceContext.getService();
+ assertSame(target,originalTarget);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org