Author: jboynes
Date: Tue Jul 18 17:28:09 2006
New Revision: 423307
URL: http://svn.apache.org/viewvc?rev=423307&view=rev
Log:
replace jmock with easymock
Modified:
incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/pom.xml
incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java
incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
Modified:
incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/pom.xml?rev=423307&r1=423306&r2=423307&view=diff
==============================================================================
--- incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/pom.xml
(original)
+++ incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/pom.xml
Tue Jul 18 17:28:09 2006
@@ -59,6 +59,11 @@
<version>${sca.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
</dependencies>
</project>
Modified:
incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java?rev=423307&r1=423306&r2=423307&view=diff
==============================================================================
---
incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java
(original)
+++
incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java
Tue Jul 18 17:28:09 2006
@@ -3,17 +3,19 @@
import java.util.ArrayList;
import java.util.List;
+import junit.framework.TestCase;
+
import org.apache.tuscany.container.groovy.injectors.SingletonInjector;
import org.apache.tuscany.container.groovy.mock.Greeting;
import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.wire.WireService;
import org.apache.tuscany.test.ArtifactFactory;
-import org.jmock.MockObjectTestCase;
/**
* @version $$Rev$$ $$Date$$
*/
-public class PropertyTestCase extends MockObjectTestCase {
+public class PropertyTestCase extends TestCase {
private static final String SCRIPT = "import
org.apache.tuscany.container.groovy.mock.Greeting;"
+ "class Foo implements Greeting{"
@@ -33,8 +35,15 @@
services.add(Greeting.class);
List<PropertyInjector> injectors = new ArrayList<PropertyInjector>();
injectors.add(new SingletonInjector("property", "bar"));
- GroovyAtomicComponent<Greeting> context = new
GroovyAtomicComponent<Greeting>("source", PropertyTestCase.SCRIPT,
- services, Scope.MODULE, injectors, null, scope,
ArtifactFactory.createWireService());
+ WireService wireService = ArtifactFactory.createWireService();
+ GroovyAtomicComponent<Greeting> context = new
GroovyAtomicComponent<Greeting>("source",
+
PropertyTestCase.SCRIPT,
+
services,
+
Scope.MODULE,
+
injectors,
+
null,
+
scope,
+
wireService);
scope.register(context);
Greeting greeting = context.getServiceInstance();
assertEquals("bar", greeting.greet("foo"));
Modified:
incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java?rev=423307&r1=423306&r2=423307&view=diff
==============================================================================
---
incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
(original)
+++
incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
Tue Jul 18 17:28:09 2006
@@ -4,7 +4,7 @@
import java.util.List;
import groovy.lang.GroovyObject;
-import org.jmock.MockObjectTestCase;
+import junit.framework.TestCase;
import org.apache.tuscany.container.groovy.mock.Greeting;
import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
@@ -14,7 +14,7 @@
/**
* @version $$Rev$$ $$Date$$
*/
-public class ScriptInvokeTestCase extends MockObjectTestCase {
+public class ScriptInvokeTestCase extends TestCase {
private String script2 = "def greet(name) { return name }";
@@ -27,7 +27,7 @@
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Greeting.class);
GroovyAtomicComponent<GroovyObject> context = new
GroovyAtomicComponent<GroovyObject>("source", script2,
- services, Scope.MODULE, null, null, scope,
ArtifactFactory.createWireService());
+
services, Scope.MODULE, null, null, scope,
ArtifactFactory.createWireService());
scope.register(context);
GroovyObject object = context.getServiceInstance();
assertEquals("foo", object.invokeMethod("greet", "foo"));
Modified:
incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java?rev=423307&r1=423306&r2=423307&view=diff
==============================================================================
---
incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
(original)
+++
incubator/tuscany/sandbox/chianti/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
Tue Jul 18 17:28:09 2006
@@ -3,9 +3,12 @@
import java.util.ArrayList;
import java.util.List;
+import junit.framework.TestCase;
+import static org.easymock.EasyMock.*;
+import org.easymock.IArgumentMatcher;
+
import org.apache.tuscany.container.groovy.mock.Greeting;
import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
-
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.InboundInvocationChain;
import org.apache.tuscany.spi.wire.InboundWire;
@@ -15,15 +18,11 @@
import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.test.ArtifactFactory;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
-import org.jmock.core.Invocation;
-import org.jmock.core.Stub;
/**
* @version $$Rev$$ $$Date$$
*/
-public class WireTestCase extends MockObjectTestCase {
+public class WireTestCase extends TestCase {
private static final String SCRIPT = "import
org.apache.tuscany.container.groovy.mock.Greeting;"
+ "class Foo implements Greeting{"
@@ -55,23 +54,17 @@
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Greeting.class);
GroovyAtomicComponent<Greeting> context = new
GroovyAtomicComponent<Greeting>("source", SCRIPT,
- services, Scope.MODULE, null, null, scope,
ArtifactFactory.createWireService());
+
services, Scope.MODULE, null, null, scope,
ArtifactFactory.createWireService());
OutboundWire<?> wire = ArtifactFactory.createOutboundWire("wire",
Greeting.class);
ArtifactFactory.terminateWire(wire);
- Mock mock = mock(TargetInvoker.class);
-
mock.expects(atLeastOnce()).method("isCacheable").will(returnValue(false));
- mock.expects(atLeastOnce()).method("invoke").will(new Stub() {
- public Object invoke(Invocation invocation) throws Throwable {
- Message msg = new MessageImpl();
- msg.setBody("foo");
- return msg;
- }
- public StringBuffer describeTo(StringBuffer stringBuffer) {
- return null;
- }
- });
- TargetInvoker invoker = (TargetInvoker) mock.proxy();
+ TargetInvoker invoker = createMock(TargetInvoker.class);
+ expect(invoker.isCacheable()).andReturn(false);
+ Message response = new MessageImpl();
+ response.setBody("foo");
+ expect(invoker.invoke(eqMessage())).andReturn(response);
+ replay(invoker);
+
for (OutboundInvocationChain chain :
wire.getInvocationChains().values()) {
chain.setTargetInvoker(invoker);
}
@@ -79,9 +72,29 @@
context.addOutboundWire(wire);
Greeting greeting = context.getServiceInstance();
assertEquals("foo", greeting.greet("foo"));
+ verify(invoker);
+
scope.stop();
}
+ // todo this could be generalized and moved to test module
+ public static Message eqMessage() {
+ reportMatcher(new IArgumentMatcher() {
+ public boolean matches(Object object) {
+ if (!(object instanceof Message)) {
+ return false;
+ }
+ final Message msg = (Message) object;
+ Object[] body = (Object[]) msg.getBody();
+ return "foo".equals(body[0]);
+ }
+
+ public void appendTo(StringBuffer stringBuffer) {
+ }
+ });
+ return null;
+ }
+
/**
* Tests a basic invocation to a target
@@ -92,7 +105,7 @@
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Greeting.class);
GroovyAtomicComponent<Greeting> context = new
GroovyAtomicComponent<Greeting>("source", SCRIPT2, services,
- Scope.MODULE, null, null, scope,
ArtifactFactory.createWireService());
+
Scope.MODULE, null, null, scope, ArtifactFactory.createWireService());
scope.register(context);
TargetInvoker invoker =
context.createTargetInvoker("greeting",
Greeting.class.getMethod("greet", String.class));
@@ -110,7 +123,7 @@
List<Class<?>> services = new ArrayList<Class<?>>();
services.add(Greeting.class);
GroovyAtomicComponent<Greeting> context = new
GroovyAtomicComponent<Greeting>("source", SCRIPT2,
- services, Scope.MODULE, null, null, scope,
ArtifactFactory.createWireService());
+
services, Scope.MODULE, null, null, scope,
ArtifactFactory.createWireService());
scope.register(context);
InboundWire<?> wire = ArtifactFactory.createInboundWire("Greeting",
Greeting.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
