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/07/23 06:46:03 UTC
svn commit: r424672 [2/2] - in /incubator/tuscany/java/sca:
bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/
containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/
containers/container.spring/src/main/jav...
Modified: incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java?rev=424672&r1=424671&r2=424672&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java Sat Jul 22 21:46:01 2006
@@ -17,13 +17,16 @@
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import junit.framework.TestCase;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
/**
* @version $Rev$ $Date$
*/
-public class CompositeComponentExtensionTestCase extends MockObjectTestCase {
+public class CompositeComponentExtensionTestCase extends TestCase {
public void testGetScope() {
assertEquals(Scope.COMPOSITE, new Composite().getScope());
@@ -119,12 +122,15 @@
public void testGetServiceInstanceByName() {
Composite<?> composite = new Composite();
- Mock mock = mock(Service.class);
- mock.stubs().method("getName").will(returnValue("foo"));
- mock.stubs().method("getInterface").will(returnValue(Foo.class));
- mock.expects(once()).method("getServiceInstance").will(returnValue(new Foo() {
- }));
- Service service = (Service) mock.proxy();
+ Service service = createMock(Service.class);
+ service.getName();
+ expectLastCall().andReturn("foo").anyTimes();
+ service.getInterface();
+ expectLastCall().andReturn(Foo.class);
+ service.getServiceInstance();
+ expectLastCall().andReturn(new Foo() {
+ });
+ replay(service);
composite.register(service);
assertNotNull(composite.getServiceInstance("foo"));
}
@@ -160,9 +166,11 @@
return null;
}
};
- Mock mock = mock(RuntimeEventListener.class);
- mock.expects(once()).method("onEvent").with(eq(event));
- composite.addListener((RuntimeEventListener) mock.proxy());
+ RuntimeEventListener listener = createMock(RuntimeEventListener.class);
+ listener.onEvent(eq(event));
+ expectLastCall();
+ replay(listener);
+ composite.addListener(listener);
composite.onEvent(event);
}
@@ -198,22 +206,29 @@
}
private AtomicComponent getAtomic(String name) {
- Mock mock = mock(AtomicComponent.class);
- mock.stubs().method("getName").will(returnValue(name));
- return (AtomicComponent) mock.proxy();
+ AtomicComponent component = createMock(AtomicComponent.class);
+ component.getName();
+ expectLastCall().andReturn(name).anyTimes();
+ replay(component);
+ return component;
}
private Reference getReference(String name) {
- Mock mock = mock(Reference.class);
- mock.stubs().method("getName").will(returnValue(name));
- return (Reference) mock.proxy();
+ Reference reference = createMock(Reference.class);
+ reference.getName();
+ expectLastCall().andReturn(name).anyTimes();
+ replay(reference);
+ return reference;
}
private Service getService(String name, Class<?> interfaze) {
- Mock mock = mock(Service.class);
- mock.stubs().method("getName").will(returnValue(name));
- mock.stubs().method("getInterface").will(returnValue(interfaze));
- return (Service) mock.proxy();
+ Service service = createMock(Service.class);
+ service.getName();
+ expectLastCall().andReturn(name).anyTimes();
+ service.getInterface();
+ expectLastCall().andReturn(interfaze);
+ replay(service);
+ return service;
}
private interface Foo {
Modified: incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/LoaderExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/LoaderExtensionTestCase.java?rev=424672&r1=424671&r2=424672&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/LoaderExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/LoaderExtensionTestCase.java Sat Jul 22 21:46:01 2006
@@ -4,26 +4,31 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
-
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.model.ModelObject;
+import junit.framework.TestCase;
+import org.easymock.EasyMock;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.isA;
+
/**
* @version $Rev$ $Date$
*/
-public class LoaderExtensionTestCase extends MockObjectTestCase {
+public class LoaderExtensionTestCase extends TestCase {
+ @SuppressWarnings("unchecked")
public void testRegistrationDeregistration() throws Exception {
- Mock mock = mock(LoaderRegistry.class);
- mock.expects(once()).method("registerLoader");
- mock.expects(once()).method("unregisterLoader");
- LoaderRegistry registry = (LoaderRegistry) mock.proxy();
- LoaderExtensionTestCase.Extension loader = new LoaderExtensionTestCase.Extension(registry);
+ LoaderRegistry registry = EasyMock.createMock(LoaderRegistry.class);
+ registry.registerLoader(isA(QName.class), isA(Extension.class));
+ expectLastCall();
+ registry.unregisterLoader(isA(QName.class), isA(Extension.class));
+ expectLastCall();
+ EasyMock.replay(registry);
+ Extension loader = new Extension(registry);
loader.start();
loader.stop();
}
@@ -36,13 +41,13 @@
}
public QName getXMLType() {
- return null;
+ return new QName("");
}
public ModelObject load(CompositeComponent parent,
XMLStreamReader reader,
DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
- return null;
+ throw new AssertionError();
}
}
}
Modified: incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/ReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/ReferenceTestCase.java?rev=424672&r1=424671&r2=424672&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/ReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/ReferenceTestCase.java Sat Jul 22 21:46:01 2006
@@ -1,13 +1,23 @@
package org.apache.tuscany.spi.extension;
import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.wire.InboundInvocationChain;
+import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.InvocationChain;
+import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.WireService;
import junit.framework.TestCase;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
/**
* @version $Rev$ $Date$
@@ -27,16 +37,30 @@
}
-
public void testPrepare() throws Exception {
- TestReference ref = new TestReference(null, null, null);
- try {
- ref.prepare();
- fail();
- } catch (AssertionError e) {
- //expected
- }
-
+ Method method = getClass().getMethod("testPrepare");
+ InboundInvocationChain chain = createMock(InboundInvocationChain.class);
+ chain.setTargetInvoker(null);
+ expectLastCall();
+ chain.getMethod();
+ expectLastCall().andReturn(method);
+ chain.prepare();
+ expectLastCall();
+ InboundWire wire = createMock(InboundWire.class);
+ wire.getInvocationChains();
+ Map<Method, InvocationChain> chains = new HashMap<Method, InvocationChain>();
+ chains.put(method, chain);
+ expectLastCall().andReturn(chains);
+ OutboundWire outboundWire = createMock(OutboundWire.class);
+ outboundWire.getTargetName();
+ expectLastCall().andReturn(new QualifiedName("foo/bar"));
+ replay(chain);
+ replay(wire);
+ replay(outboundWire);
+ TestReference<?> ref = new TestReference(null, null, null);
+ ref.setInboundWire(wire);
+ ref.setOutboundWire(outboundWire);
+ ref.prepare();
}
private class TestReference<T> extends ReferenceExtension<T> {
Modified: incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/ServiceExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/ServiceExtensionTestCase.java?rev=424672&r1=424671&r2=424672&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/ServiceExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/spi/src/test/java/org/apache/tuscany/spi/extension/ServiceExtensionTestCase.java Sat Jul 22 21:46:01 2006
@@ -1,8 +1,12 @@
package org.apache.tuscany.spi.extension;
import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.wire.InboundWire;
import junit.framework.TestCase;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
/**
* @version $Rev$ $Date$
@@ -12,17 +16,16 @@
public void testScope() throws Exception {
ServiceExtension service = new ServiceExtension(null, null, null);
assertEquals(Scope.COMPOSITE, service.getScope());
-
}
public void testSetGetInterface() throws Exception {
- ServiceExtension service = new ServiceExtension(null, null, null);
- try {
- service.getInterface();
- fail();
- } catch (AssertionError e) {
- //expected
- }
+ InboundWire wire = createMock(InboundWire.class);
+ wire.getBusinessInterface();
+ expectLastCall().andReturn(getClass());
+ replay(wire);
+ ServiceExtension<?> service = new ServiceExtension(null, null, null);
+ service.setInboundWire(wire);
+ service.getInterface();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org