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 22:39:21 UTC
svn commit: r409003 - in
/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java:
context/ integration/context/ mock/ mock/binding/ mock/components/
mock/wire/ wire/
Author: jmarino
Date: Tue May 23 13:39:19 2006
New Revision: 409003
URL: http://svn.apache.org/viewvc?rev=409003&view=rev
Log:
cleanup container.java testcases
Added:
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/JavaSourceWireTestCase.java
- copied, changed from r408996, incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/JavaToReferenceTestCase.java
Removed:
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/JavaToReferenceTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockReferenceContext.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/components/SimpleSource.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/components/SimpleSourceImpl.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/components/SimpleTarget.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/components/SimpleTargetImpl.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/wire/
Modified:
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/wire/JavaTargetInvokerTestCase.java
Copied: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/JavaSourceWireTestCase.java (from r408996, incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/JavaToReferenceTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/JavaSourceWireTestCase.java?p2=incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/JavaSourceWireTestCase.java&p1=incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/JavaToReferenceTestCase.java&r1=408996&r2=409003&rev=409003&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/JavaToReferenceTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/JavaSourceWireTestCase.java Tue May 23 13:39:19 2006
@@ -1,132 +1,46 @@
-package org.apache.tuscany.container.java.integration.context;
+package org.apache.tuscany.container.java.context;
import java.lang.reflect.Member;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
import org.apache.tuscany.container.java.context.JavaAtomicContext;
import org.apache.tuscany.container.java.mock.MockContextFactory;
-import org.apache.tuscany.container.java.mock.MockReferenceContext;
-import org.apache.tuscany.container.java.mock.components.SimpleSource;
-import org.apache.tuscany.container.java.mock.components.SimpleSourceImpl;
-import org.apache.tuscany.container.java.mock.components.SimpleTarget;
-import org.apache.tuscany.core.builder.Connector;
-import org.apache.tuscany.core.builder.ConnectorImpl;
-import org.apache.tuscany.core.context.WorkContextImpl;
-import org.apache.tuscany.core.context.event.HttpSessionEnd;
-import org.apache.tuscany.core.context.event.HttpSessionStart;
-import org.apache.tuscany.core.context.event.ModuleStart;
-import org.apache.tuscany.core.context.event.ModuleStop;
-import org.apache.tuscany.core.context.event.RequestEnd;
-import org.apache.tuscany.core.context.event.RequestStart;
-import org.apache.tuscany.core.context.scope.HttpSessionScopeContext;
+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.core.context.scope.ModuleScopeContext;
-import org.apache.tuscany.core.context.scope.RequestScopeContext;
-import org.apache.tuscany.core.context.scope.StatelessScopeContext;
-import org.apache.tuscany.core.system.context.SystemCompositeContext;
-import org.apache.tuscany.core.system.context.SystemCompositeContextImpl;
-import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.context.CompositeContext;
-import org.apache.tuscany.spi.context.ScopeContext;
-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;
/**
* Validates wiring from a Java atomic contexts by scope to a reference context
*
* @version $$Rev$$ $$Date$$
*/
-public class JavaToReferenceTestCase extends TestCase {
- private WorkContext workContext;
- private SystemCompositeContext parent;
+public class JavaSourceWireTestCase extends MockObjectTestCase {
- public void testFromStatelessScope() throws Exception {
- StatelessScopeContext scope = new StatelessScopeContext(workContext);
+ public void testReferenceSet() throws Exception {
+ ModuleScopeContext scope = new ModuleScopeContext(null);
scope.start();
- setupComposite(parent, scope);
- parent.start();
- SimpleSource source = (SimpleSource) parent.getContext("source").getService();
- assertEquals("hello", source.invokeHello());
- SimpleTarget target = (SimpleTarget) parent.getContext("target").getService();
- assertEquals("hello", target.echo("hello"));
- parent.stop();
- scope.stop();
- }
-
- public void testFromRequestScope() throws Exception {
- final RequestScopeContext scope = new RequestScopeContext(workContext);
- scope.start();
- setupComposite(parent, scope);
- parent.start();
- scope.onEvent(new RequestStart(this));
- SimpleSource source = (SimpleSource) parent.getContext("source").getService();
- assertEquals("hello", source.invokeHello());
- SimpleTarget target = (SimpleTarget) parent.getContext("target").getService();
- assertEquals("hello", target.echo("hello"));
- scope.onEvent(new RequestEnd(this));
- parent.stop();
- scope.stop();
- }
-
- public void testFromSessionScope() throws Exception {
- HttpSessionScopeContext scope = new HttpSessionScopeContext(workContext);
- scope.start();
- setupComposite(parent, scope);
- parent.start();
- Object session1 = new Object();
- workContext.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session1);
- scope.onEvent(new HttpSessionStart(this, session1));
- SimpleSource source = (SimpleSource) parent.getContext("source").getService();
- assertEquals("hello", source.invokeHello());
- SimpleTarget target = (SimpleTarget) parent.getContext("target").getService();
- assertEquals("hello", target.echo("hello"));
- workContext.clearIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER);
- scope.onEvent(new HttpSessionEnd(this, session1));
- parent.stop();
- scope.stop();
- }
-
- public void testFromModuleScope() throws Exception {
- ModuleScopeContext scope = new ModuleScopeContext(workContext);
- scope.start();
- setupComposite(parent, scope);
- parent.start();
- scope.onEvent(new ModuleStart(this, parent));
- SimpleSource source = (SimpleSource) parent.getContext("source").getService();
- assertEquals("hello", source.invokeHello());
- SimpleTarget target = (SimpleTarget) parent.getContext("target").getService();
- assertEquals("hello", target.echo("hello"));
- scope.onEvent(new ModuleStop(this, parent));
- parent.stop();
- scope.stop();
- }
-
- private void setupComposite(CompositeContext<?> parent, ScopeContext scope) throws NoSuchMethodException {
- Connector connector = new ConnectorImpl();
-
+ Target target = new TargetImpl();
Map<String, Member> members = new HashMap<String, Member>();
- members.put("target", SimpleSourceImpl.class.getMethod("setTarget", SimpleTarget.class));
- JavaAtomicContext<?> sourceContext = MockContextFactory.createJavaAtomicContext("source", parent, SimpleSourceImpl.class, SimpleSource.class,
+ members.put("target", SourceImpl.class.getMethod("setTarget", Target.class));
+ JavaAtomicContext<?> sourceContext = MockContextFactory.createJavaAtomicContext("source", null,
+ SourceImpl.class, Source.class,
scope.getScope(), false, null, null, null, members);
- SourceWire<SimpleTarget> sourceWire = MockContextFactory.createSourceWire("target", SimpleTarget.class);
- sourceWire.setTargetName(new QualifiedName("target/Target"));
- sourceContext.addSourceWire(sourceWire);
+
+ Mock mock = mock(SourceWire.class);
+ mock.expects(atLeastOnce()).method("getTargetService").will(returnValue(target));
+ mock.expects(atLeastOnce()).method("getReferenceName").will(returnValue("target"));
+ SourceWire<Target> wire = (SourceWire<Target>) mock.proxy();
+ sourceContext.addSourceWire(wire);
+
sourceContext.setScopeContext(scope);
- TargetWire targetWire = MockContextFactory.createTargetWire("Target", SimpleTarget.class);
- MockReferenceContext referenceContext = new MockReferenceContext("target", parent, targetWire);
- parent.registerContext(sourceContext);
- parent.registerContext(referenceContext);
-
- connector.connect(sourceContext);
- referenceContext.prepare();
- sourceContext.prepare();
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- workContext = new WorkContextImpl();
- parent = new SystemCompositeContextImpl(null, null, null);
+ Source source = (Source) sourceContext.getService();
+ assertSame(target, source.getTarget());
+ scope.stop();
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/wire/JavaTargetInvokerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/wire/JavaTargetInvokerTestCase.java?rev=409003&r1=409002&r2=409003&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/wire/JavaTargetInvokerTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/wire/JavaTargetInvokerTestCase.java Tue May 23 13:39:19 2006
@@ -19,19 +19,14 @@
import java.lang.reflect.Method;
import junit.framework.Assert;
-import junit.framework.TestCase;
import org.apache.tuscany.container.java.context.JavaAtomicContext;
-import org.apache.tuscany.container.java.mock.components.SimpleTarget;
-import org.apache.tuscany.container.java.mock.components.SimpleTargetImpl;
import org.apache.tuscany.container.java.mock.MockContextFactory;
-import org.apache.tuscany.container.java.wire.JavaTargetInvoker;
-import org.apache.tuscany.core.context.WorkContextImpl;
import org.apache.tuscany.core.context.scope.ModuleScopeContext;
-import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.context.ScopeContext;
-import org.apache.tuscany.spi.context.WorkContext;
+import org.apache.tuscany.spi.model.Scope;
+import org.jmock.MockObjectTestCase;
-public class JavaTargetInvokerTestCase extends TestCase {
+public class JavaTargetInvokerTestCase extends MockObjectTestCase {
private Method echoMethod;
@@ -44,22 +39,27 @@
}
public void setUp() throws Exception {
- echoMethod = SimpleTarget.class.getDeclaredMethod("echo", String.class);
+ echoMethod = Echo.class.getDeclaredMethod("echo", String.class);
Assert.assertNotNull(echoMethod);
}
public void testScopedInvoke() throws Exception {
- WorkContext ctx = new WorkContextImpl();
- ScopeContext scope = new ModuleScopeContext(ctx);
+ ScopeContext scope = new ModuleScopeContext(null);
scope.start();
- JavaAtomicContext context = MockContextFactory.createJavaAtomicContext("foo", SimpleTargetImpl.class, Scope.MODULE);
+ JavaAtomicContext context = MockContextFactory.createJavaAtomicContext("foo", Echo.class, Scope.MODULE);
scope.register(context);
context.setScopeContext(scope);
JavaTargetInvoker invoker = new JavaTargetInvoker(echoMethod, context);
invoker.setCacheable(false);
- Object ret = invoker.invokeTarget("foo");
- assertEquals("foo", ret);
+ assertEquals("foo", invoker.invokeTarget("foo"));
scope.stop();
+ }
+
+ public static class Echo {
+ public String echo(String message) throws Exception {
+ return message;
+ }
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org