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/09/10 11:57:49 UTC
svn commit: r441935 [2/2] - in /incubator/tuscany/java/sca: ./ idl/wsdl/
kernel/ kernel/core/
kernel/core/src/main/java/org/apache/tuscany/core/implementation/
kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/
kernel/core/src/...
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundToInboundTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundToInboundTestCase.java?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundToInboundTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundToInboundTestCase.java Sun Sep 10 02:57:47 2006
@@ -20,27 +20,28 @@
import org.apache.tuscany.spi.QualifiedName;
+import junit.framework.TestCase;
import org.apache.tuscany.core.mock.component.Target;
import org.apache.tuscany.core.mock.component.TargetImpl;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.easymock.EasyMock;
/**
* Tests connecting an outbound system wire to an inbound system wire
*
* @version $$Rev$$ $$Date$$
*/
-public class SystemOutboundToInboundTestCase extends MockObjectTestCase {
+public class SystemOutboundToInboundTestCase extends TestCase {
public void testWire() throws NoSuchMethodException {
Target target = new TargetImpl();
- Mock mockWire = mock(SystemInboundWire.class);
- mockWire.expects(atLeastOnce()).method("getTargetService").will(returnValue(target));
- SystemInboundWire inboundWire = (SystemInboundWire) mockWire.proxy();
- SystemOutboundWire outboundWire =
- new SystemOutboundWireImpl("setTarget", new QualifiedName("service"), Target.class);
+ SystemInboundWire inboundWire = EasyMock.createMock(SystemInboundWire.class);
+ EasyMock.expect(inboundWire.getTargetService()).andReturn(target);
+ EasyMock.replay(inboundWire);
+ QualifiedName qName = new QualifiedName("service");
+ SystemOutboundWire outboundWire = new SystemOutboundWireImpl("setTarget", qName, Target.class);
outboundWire.setTargetWire(inboundWire);
assertSame(outboundWire.getTargetService(), target);
+ EasyMock.verify(inboundWire);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemServiceComponentWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemServiceComponentWireTestCase.java?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemServiceComponentWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemServiceComponentWireTestCase.java Sun Sep 10 02:57:47 2006
@@ -18,31 +18,31 @@
*/
package org.apache.tuscany.core.implementation.system.wire;
-import org.apache.tuscany.core.mock.component.Target;
-import org.apache.tuscany.core.mock.component.TargetImpl;
+import junit.framework.TestCase;
import org.apache.tuscany.core.implementation.system.component.SystemService;
import org.apache.tuscany.core.implementation.system.component.SystemServiceImpl;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.apache.tuscany.core.mock.component.Target;
+import org.apache.tuscany.core.mock.component.TargetImpl;
+import org.easymock.EasyMock;
/**
* Verifies that a system context interacts correctly with configured, connected inbound and outbound system wires
*
* @version $$Rev$$ $$Date$$
*/
-public class SystemServiceComponentWireTestCase extends MockObjectTestCase {
+public class SystemServiceComponentWireTestCase extends TestCase {
public void testServiceContext() throws NoSuchMethodException {
Target target = new TargetImpl();
- Mock mockWire = mock(SystemOutboundWire.class);
- mockWire.expects(atLeastOnce()).method("getTargetService").will(returnValue(target));
- SystemOutboundWire outboundWire = (SystemOutboundWire) mockWire.proxy();
-
+ SystemOutboundWire outboundWire = EasyMock.createMock(SystemOutboundWire.class);
+ EasyMock.expect(outboundWire.getTargetService()).andReturn(target);
+ EasyMock.replay(outboundWire);
SystemInboundWire wire = new SystemInboundWireImpl("Target", Target.class);
SystemService serviceContext = new SystemServiceImpl("service", null);
serviceContext.setInboundWire(wire);
serviceContext.setOutboundWire(outboundWire);
wire.setTargetWire(outboundWire);
assertSame(target, serviceContext.getServiceInstance());
+ EasyMock.verify(outboundWire);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/JNDIObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/JNDIObjectFactoryTestCase.java?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/JNDIObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/JNDIObjectFactoryTestCase.java Sun Sep 10 02:57:47 2006
@@ -23,26 +23,27 @@
import org.apache.tuscany.spi.ObjectCreationException;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import junit.framework.TestCase;
+import org.easymock.EasyMock;
/**
* @version $Rev$ $Date$
*/
-public class JNDIObjectFactoryTestCase extends MockObjectTestCase {
+public class JNDIObjectFactoryTestCase extends TestCase {
public void testGetInstance() throws Exception {
- Mock mock = mock(Context.class);
- mock.expects(once()).method("lookup").with(eq("foo")).will(returnValue(new Foo()));
- Context ctx = (Context) mock.proxy();
+ Context ctx = EasyMock.createMock(Context.class);
+ EasyMock.expect(ctx.lookup(EasyMock.eq("foo"))).andReturn(new Foo());
+ EasyMock.replay(ctx);
JNDIObjectFactory<Foo> factory = new JNDIObjectFactory<Foo>(ctx, "foo");
assertTrue(factory.getInstance() instanceof Foo); // must do an instanceof b/c of type erasure
+ EasyMock.verify(ctx);
}
public void testGetInstanceError() throws Exception {
- Mock mock = mock(Context.class);
- mock.expects(once()).method("lookup").with(eq("foo")).will(throwException(new NamingException()));
- Context ctx = (Context) mock.proxy();
+ Context ctx = EasyMock.createMock(Context.class);
+ EasyMock.expect(ctx.lookup(EasyMock.eq("foo"))).andThrow(new NamingException());
+ EasyMock.replay(ctx);
JNDIObjectFactory<Foo> factory = new JNDIObjectFactory<Foo>(ctx, "foo");
try {
factory.getInstance();
@@ -50,6 +51,7 @@
} catch (ObjectCreationException e) {
//expected
}
+ EasyMock.verify(ctx);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/MethodEventInvokerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/MethodEventInvokerTestCase.java?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/MethodEventInvokerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/MethodEventInvokerTestCase.java Sun Sep 10 02:57:47 2006
@@ -20,12 +20,12 @@
import java.lang.reflect.Method;
-import org.jmock.MockObjectTestCase;
+import junit.framework.TestCase;
/**
* @version $Rev$ $Date$
*/
-public class MethodEventInvokerTestCase extends MockObjectTestCase {
+public class MethodEventInvokerTestCase extends TestCase {
private Method privateMethod;
private Method exceptionMethod;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/MethodInjectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/MethodInjectorTestCase.java?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/MethodInjectorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/injection/MethodInjectorTestCase.java Sun Sep 10 02:57:47 2006
@@ -23,12 +23,12 @@
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
-import org.jmock.MockObjectTestCase;
+import junit.framework.TestCase;
/**
* @version $Rev$ $Date$
*/
-public class MethodInjectorTestCase extends MockObjectTestCase {
+public class MethodInjectorTestCase extends TestCase {
private Method fooMethod;
private Method privateMethod;
private Method exceptionMethod;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java Sun Sep 10 02:57:47 2006
@@ -18,35 +18,35 @@
*/
package org.apache.tuscany.core.integration.implementation.java.builder;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
+import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
+import org.apache.tuscany.spi.implementation.java.PojoComponentType;
+import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
+import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.model.ServiceDefinition;
+import junit.framework.TestCase;
import org.apache.tuscany.core.component.AutowireComponent;
import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.component.scope.ScopeRegistryImpl;
import org.apache.tuscany.core.component.scope.StatelessScopeObjectFactory;
import org.apache.tuscany.core.deployer.RootDeploymentContext;
-import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
-import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
import org.apache.tuscany.core.implementation.java.JavaComponentBuilder;
import org.apache.tuscany.core.implementation.java.JavaImplementation;
import org.apache.tuscany.core.injection.SingletonObjectFactory;
-import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.ScopeRegistry;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.ReferenceDefinition;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.model.ServiceDefinition;
+import org.easymock.EasyMock;
/**
* Verifies that the system builder handles configured properties correctly
*
* @version $Rev$ $Date$
*/
-public class JavaBuilderPropertyTestCase extends MockObjectTestCase {
+public class JavaBuilderPropertyTestCase extends TestCase {
private DeploymentContext deploymentContext;
private CompositeComponent parent;
@@ -62,7 +62,7 @@
property.setDefaultValueFactory(new SingletonObjectFactory<String>("foo"));
property.setMember(JavaBuilderPropertyTestCase.Foo.class.getMethod("setTest", String.class));
type.add(property);
- type.setConstructorDefinition(new ConstructorDefinition<Foo>(Foo.class.getConstructor((Class[])null)));
+ type.setConstructorDefinition(new ConstructorDefinition<Foo>(Foo.class.getConstructor((Class[]) null)));
type.setImplementationScope(Scope.STATELESS);
JavaImplementation impl = new JavaImplementation();
impl.setComponentType(type);
@@ -76,8 +76,7 @@
protected void setUp() throws Exception {
super.setUp();
deploymentContext = new RootDeploymentContext(null, null, null, null);
- Mock mock = mock(AutowireComponent.class);
- parent = (CompositeComponent) mock.proxy();
+ parent = EasyMock.createNiceMock(AutowireComponent.class);
registry = new ScopeRegistryImpl(new WorkContextImpl());
new StatelessScopeObjectFactory(registry);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java Sun Sep 10 02:57:47 2006
@@ -18,32 +18,30 @@
*/
package org.apache.tuscany.core.integration.implementation.system.builder;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
-
-import org.apache.tuscany.core.component.AutowireComponent;
-import org.apache.tuscany.core.deployer.RootDeploymentContext;
-import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
-import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
-
-import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-
-import org.apache.tuscany.core.implementation.system.builder.SystemComponentBuilder;
-import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
-import org.apache.tuscany.core.injection.SingletonObjectFactory;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
+import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
+import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.ServiceDefinition;
+import junit.framework.TestCase;
+import org.apache.tuscany.core.component.AutowireComponent;
+import org.apache.tuscany.core.deployer.RootDeploymentContext;
+import org.apache.tuscany.core.implementation.system.builder.SystemComponentBuilder;
+import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
+import org.apache.tuscany.core.injection.SingletonObjectFactory;
+import org.easymock.EasyMock;
+
/**
* Verifies that the system builder handles configured properties correctly
*
* @version $Rev$ $Date$
*/
-public class SystemBuilderPropertyTestCase extends MockObjectTestCase {
+public class SystemBuilderPropertyTestCase extends TestCase {
DeploymentContext deploymentContext;
CompositeComponent parent;
@@ -53,7 +51,7 @@
SystemComponentBuilder builder = new SystemComponentBuilder();
PojoComponentType<ServiceDefinition, ReferenceDefinition, JavaMappedProperty<?>> type =
new PojoComponentType<ServiceDefinition, ReferenceDefinition, JavaMappedProperty<?>>();
- type.setConstructorDefinition(new ConstructorDefinition<Foo>(Foo.class.getConstructor((Class[])null)));
+ type.setConstructorDefinition(new ConstructorDefinition<Foo>(Foo.class.getConstructor((Class[]) null)));
JavaMappedProperty<String> property = new JavaMappedProperty<String>();
property.setName("test");
property.setDefaultValueFactory(new SingletonObjectFactory<String>("foo"));
@@ -71,8 +69,7 @@
protected void setUp() throws Exception {
super.setUp();
deploymentContext = new RootDeploymentContext(null, null, null, null);
- Mock mock = mock(AutowireComponent.class);
- parent = (CompositeComponent) mock.proxy();
+ parent = EasyMock.createNiceMock(AutowireComponent.class);
}
private static class Foo {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java Sun Sep 10 02:57:47 2006
@@ -25,6 +25,9 @@
import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.loader.StAXPropertyFactory;
@@ -33,53 +36,73 @@
import org.apache.tuscany.spi.model.Property;
import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.ServiceDefinition;
-import org.apache.tuscany.spi.implementation.java.PojoComponentType;
+import junit.framework.TestCase;
import org.apache.tuscany.core.implementation.java.JavaImplementation;
import org.easymock.EasyMock;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
/**
* @version $Rev$ $Date$
*/
-public class ComponentLoaderTestCase extends MockObjectTestCase {
+public class ComponentLoaderTestCase extends TestCase {
private static final QName COMPONENT = new QName(XML_NAMESPACE_1_0, "component");
private static final String NAME = "testComponent";
private static final Implementation IMPL = new JavaImplementation();
- private Mock mockReader;
- private Mock mockRegistry;
- private Mock mockPropertyFactory;
+ private XMLStreamReader mockReader;
+ private LoaderRegistry mockRegistry;
+ private StAXPropertyFactory mockPropertyFactory;
private ComponentLoader loader;
public void testEmptyComponent() throws LoaderException, XMLStreamException {
- mockReader.expects(atLeastOnce()).method("getName").will(returnValue(COMPONENT));
- mockReader.expects(atLeastOnce()).method("getAttributeValue")
- .with(ANYTHING, ANYTHING)
- .will(onConsecutiveCalls(returnValue(NAME), returnValue(null)));
- mockReader.expects(once()).method("nextTag").will(returnValue(0));
- mockReader.expects(once()).method("next").will(returnValue(XMLStreamConstants.END_ELEMENT));
- mockRegistry.expects(once()).method("loadComponentType");
- mockRegistry.expects(once()).method("load").will(returnValue(IMPL));
- ComponentDefinition component = loader.load(null, (XMLStreamReader) mockReader.proxy(), null);
+ EasyMock.expect(mockReader.getName()).andReturn(COMPONENT).atLeastOnce();
+ EasyMock.expect(mockReader.getAttributeValue((String) EasyMock.isNull(), EasyMock.isA(String.class)))
+ .andReturn(NAME);
+ EasyMock.expect(mockReader.getAttributeValue((String) EasyMock.isNull(), EasyMock.eq("initLevel")))
+ .andReturn(null);
+ EasyMock.expect(mockReader.getAttributeValue(EasyMock.isA(String.class), EasyMock.isA(String.class)))
+ .andReturn(null);
+ EasyMock.expect(mockReader.nextTag()).andReturn(0);
+ EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
+ EasyMock.replay(mockReader);
+ mockRegistry.loadComponentType(EasyMock.isA(CompositeComponent.class),
+ EasyMock.isA(Implementation.class),
+ EasyMock.isA(DeploymentContext.class));
+
+ EasyMock.expect(mockRegistry.load(EasyMock.isA(CompositeComponent.class),
+ EasyMock.eq(mockReader),
+ EasyMock.isA(DeploymentContext.class))).andReturn(IMPL);
+ EasyMock.replay(mockRegistry);
+ ComponentDefinition component = loader.load(EasyMock.createNiceMock(CompositeComponent.class),
+ mockReader,
+ EasyMock.createNiceMock(DeploymentContext.class));
assertEquals(NAME, component.getName());
assertNull(component.getInitLevel());
}
public void testInitValue20() throws LoaderException, XMLStreamException {
- mockReader.expects(atLeastOnce()).method("getName").will(returnValue(COMPONENT));
- mockReader.expects(atLeastOnce()).method("getAttributeValue")
- .with(ANYTHING, ANYTHING)
- .will(onConsecutiveCalls(returnValue(NAME), returnValue("20")));
- mockReader.expects(once()).method("nextTag").will(returnValue(0));
- mockReader.expects(once()).method("next").will(returnValue(XMLStreamConstants.END_ELEMENT));
- mockRegistry.expects(once()).method("loadComponentType");
- mockRegistry.expects(once()).method("load").will(returnValue(IMPL));
- ComponentDefinition component = loader.load(null, (XMLStreamReader) mockReader.proxy(), null);
+ EasyMock.expect(mockReader.getName()).andReturn(COMPONENT).atLeastOnce();
+ EasyMock.expect(mockReader.getAttributeValue((String) EasyMock.isNull(), EasyMock.isA(String.class)))
+ .andReturn(NAME);
+ EasyMock.expect(mockReader.getAttributeValue((String) EasyMock.isNull(), EasyMock.eq("initLevel")))
+ .andReturn("20");
+ EasyMock.expect(mockReader.nextTag()).andReturn(0);
+ EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
+ EasyMock.replay(mockReader);
+
+ mockRegistry.loadComponentType(EasyMock.isA(CompositeComponent.class),
+ EasyMock.isA(Implementation.class),
+ EasyMock.isA(DeploymentContext.class));
+ EasyMock.expect(mockRegistry.load(EasyMock.isA(CompositeComponent.class),
+ EasyMock.eq(mockReader),
+ EasyMock.isA(DeploymentContext.class))).andReturn(IMPL);
+ EasyMock.replay(mockRegistry);
+ ComponentDefinition component = loader.load(EasyMock.createNiceMock(CompositeComponent.class),
+ mockReader,
+ EasyMock.createNiceMock(DeploymentContext.class));
assertEquals(NAME, component.getName());
assertEquals(Integer.valueOf(20), component.getInitLevel());
}
@@ -104,10 +127,9 @@
protected void setUp() throws Exception {
super.setUp();
- mockReader = mock(XMLStreamReader.class);
- mockRegistry = mock(LoaderRegistry.class);
- mockPropertyFactory = mock(StAXPropertyFactory.class);
- loader = new ComponentLoader((LoaderRegistry) mockRegistry.proxy(),
- (StAXPropertyFactory) mockPropertyFactory.proxy());
+ mockReader = EasyMock.createMock(XMLStreamReader.class);
+ mockRegistry = EasyMock.createMock(LoaderRegistry.class);
+ mockPropertyFactory = EasyMock.createMock(StAXPropertyFactory.class);
+ loader = new ComponentLoader(mockRegistry, mockPropertyFactory);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/StringParserPropertyFactoryTestCase.java Sun Sep 10 02:57:47 2006
@@ -23,52 +23,55 @@
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.model.Property;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import junit.framework.TestCase;
+import org.easymock.EasyMock;
/**
* @version $Rev$ $Date$
*/
-public class StringParserPropertyFactoryTestCase extends MockObjectTestCase {
+public class StringParserPropertyFactoryTestCase extends TestCase {
public void testInteger() throws Exception {
- Mock mock = mock(XMLStreamReader.class);
- mock.expects(once()).method("getElementText").will(returnValue("1"));
- XMLStreamReader reader = (XMLStreamReader) mock.proxy();
+ XMLStreamReader reader = EasyMock.createMock(XMLStreamReader.class);
+ EasyMock.expect(reader.getElementText()).andReturn("1");
+ EasyMock.replay(reader);
StringParserPropertyFactory factory = new StringParserPropertyFactory();
Property<Integer> property = new Property<Integer>();
property.setJavaType(Integer.class);
ObjectFactory<Integer> oFactory = factory.createObjectFactory(reader, property);
assertEquals(1, oFactory.getInstance().intValue());
+ EasyMock.verify(reader);
}
public void testPrimitiveInt() throws Exception {
- Mock mock = mock(XMLStreamReader.class);
- mock.expects(once()).method("getElementText").will(returnValue("1"));
- XMLStreamReader reader = (XMLStreamReader) mock.proxy();
+ XMLStreamReader reader = EasyMock.createMock(XMLStreamReader.class);
+ EasyMock.expect(reader.getElementText()).andReturn("1");
+ EasyMock.replay(reader);
StringParserPropertyFactory factory = new StringParserPropertyFactory();
Property<Integer> property = new Property<Integer>();
property.setJavaType(Integer.TYPE);
ObjectFactory<Integer> oFactory = factory.createObjectFactory(reader, property);
assertEquals(1, oFactory.getInstance().intValue());
+ EasyMock.verify(reader);
}
public void testString() throws Exception {
- Mock mock = mock(XMLStreamReader.class);
- mock.expects(once()).method("getElementText").will(returnValue("1"));
- XMLStreamReader reader = (XMLStreamReader) mock.proxy();
+ XMLStreamReader reader = EasyMock.createMock(XMLStreamReader.class);
+ EasyMock.expect(reader.getElementText()).andReturn("1");
+ EasyMock.replay(reader);
StringParserPropertyFactory factory = new StringParserPropertyFactory();
Property<String> property = new Property<String>();
property.setJavaType(String.class);
ObjectFactory<String> oFactory = factory.createObjectFactory(reader, property);
assertEquals("1", oFactory.getInstance());
+ EasyMock.verify(reader);
}
public void testByteArray() throws Exception {
- Mock mock = mock(XMLStreamReader.class);
- mock.expects(once()).method("getElementText").will(returnValue("1"));
- XMLStreamReader reader = (XMLStreamReader) mock.proxy();
+ XMLStreamReader reader = EasyMock.createMock(XMLStreamReader.class);
+ EasyMock.expect(reader.getElementText()).andReturn("1");
+ EasyMock.replay(reader);
StringParserPropertyFactory factory = new StringParserPropertyFactory();
Property<byte[]> property = new Property<byte[]>();
property.setJavaType(byte[].class);
@@ -81,39 +84,43 @@
fail();
}
}
+ EasyMock.verify(reader);
}
public void testBoolean() throws Exception {
- Mock mock = mock(XMLStreamReader.class);
- mock.expects(once()).method("getElementText").will(returnValue("true"));
- XMLStreamReader reader = (XMLStreamReader) mock.proxy();
+ XMLStreamReader reader = EasyMock.createMock(XMLStreamReader.class);
+ EasyMock.expect(reader.getElementText()).andReturn("true");
+ EasyMock.replay(reader);
StringParserPropertyFactory factory = new StringParserPropertyFactory();
Property<Boolean> property = new Property<Boolean>();
property.setJavaType(Boolean.class);
ObjectFactory<Boolean> oFactory = factory.createObjectFactory(reader, property);
assertTrue(oFactory.getInstance());
+ EasyMock.verify(reader);
}
public void testPrimitiveBoolean() throws Exception {
- Mock mock = mock(XMLStreamReader.class);
- mock.expects(once()).method("getElementText").will(returnValue("true"));
- XMLStreamReader reader = (XMLStreamReader) mock.proxy();
+ XMLStreamReader reader = EasyMock.createMock(XMLStreamReader.class);
+ EasyMock.expect(reader.getElementText()).andReturn("true");
+ EasyMock.replay(reader);
StringParserPropertyFactory factory = new StringParserPropertyFactory();
Property<Boolean> property = new Property<Boolean>();
property.setJavaType(Boolean.TYPE);
ObjectFactory<Boolean> oFactory = factory.createObjectFactory(reader, property);
assertTrue(oFactory.getInstance());
+ EasyMock.verify(reader);
}
public void testStringConstructor() throws Exception {
- Mock mock = mock(XMLStreamReader.class);
- mock.expects(once()).method("getElementText").will(returnValue("test"));
- XMLStreamReader reader = (XMLStreamReader) mock.proxy();
+ XMLStreamReader reader = EasyMock.createMock(XMLStreamReader.class);
+ EasyMock.expect(reader.getElementText()).andReturn("test");
+ EasyMock.replay(reader);
StringParserPropertyFactory factory = new StringParserPropertyFactory();
Property<Foo> property = new Property<Foo>();
property.setJavaType(Foo.class);
ObjectFactory<Foo> oFactory = factory.createObjectFactory(reader, property);
assertEquals("test", oFactory.getInstance().getFoo());
+ EasyMock.verify(reader);
}
private static class Foo {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/BasicReferenceInvocationHandlerTestCase.java Sun Sep 10 02:57:47 2006
@@ -26,6 +26,7 @@
import org.apache.tuscany.spi.wire.OutboundInvocationChain;
import org.apache.tuscany.spi.wire.OutboundWire;
+import junit.framework.TestCase;
import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
import org.apache.tuscany.core.mock.component.SimpleTarget;
@@ -33,12 +34,11 @@
import org.apache.tuscany.core.mock.wire.MockStaticInvoker;
import org.apache.tuscany.core.mock.wire.MockSyncInterceptor;
import org.apache.tuscany.core.wire.jdk.JDKOutboundInvocationHandler;
-import org.jmock.MockObjectTestCase;
/**
* @version $$Rev$$ $$Date$$
*/
-public class BasicReferenceInvocationHandlerTestCase extends MockObjectTestCase {
+public class BasicReferenceInvocationHandlerTestCase extends TestCase {
private Method echo;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerTestCase.java?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandlerTestCase.java Sun Sep 10 02:57:47 2006
@@ -29,6 +29,7 @@
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.InboundInvocationChain;
+import junit.framework.TestCase;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
import org.apache.tuscany.core.mock.component.SimpleTarget;
import org.apache.tuscany.core.mock.component.SimpleTargetImpl;
@@ -36,14 +37,13 @@
import org.apache.tuscany.core.mock.wire.MockSyncInterceptor;
import org.apache.tuscany.core.wire.InboundInvocationChainImpl;
import org.apache.tuscany.core.wire.InvokerInterceptor;
-import org.jmock.MockObjectTestCase;
/**
* Verifies invocations on inbound wires
*
* @version $$Rev$$ $$Date$$
*/
-public class JDKInboundInvocationHandlerTestCase extends MockObjectTestCase {
+public class JDKInboundInvocationHandlerTestCase extends TestCase {
private Method echo;
private Operation operation;
Modified: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/rmi/RMIHost.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/rmi/RMIHost.java?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/rmi/RMIHost.java (original)
+++ incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/rmi/RMIHost.java Sun Sep 10 02:57:47 2006
@@ -25,25 +25,25 @@
*/
public interface RMIHost {
- final int RMI_DEFAULT_PORT = 1099;
+ int RMI_DEFAULT_PORT = 1099;
// registers an RMI service with the given name and port
void registerService(String serviceName, int port, Remote serviceObject) throws RMIHostException,
- RMIHostRuntimeException;
+ RMIHostRuntimeException;
// registers an RMI service with the given name and default port (1099)
void registerService(String serviceName, Remote serviceObject) throws RMIHostException,
- RMIHostRuntimeException;
+ RMIHostRuntimeException;
// unregister a service registered under the given service name and port number
void unregisterService(String serviceName, int port) throws RMIHostException,
- RMIHostRuntimeException;
+ RMIHostRuntimeException;
// unregister a service registered under the given service name and defalut port number (1099)
void unregisterService(String serviceName) throws RMIHostException,
- RMIHostRuntimeException;
+ RMIHostRuntimeException;
//find a remote service hosted on the given host, port and service name
Remote findService(String host, String port, String svcName) throws RMIHostException,
- RMIHostRuntimeException;
+ RMIHostRuntimeException;
}
Modified: incubator/tuscany/java/sca/kernel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/pom.xml?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/kernel/pom.xml (original)
+++ incubator/tuscany/java/sca/kernel/pom.xml Sun Sep 10 02:57:47 2006
@@ -85,12 +85,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>1.0.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.2</version>
Modified: incubator/tuscany/java/sca/kernel/spi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/pom.xml?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/pom.xml (original)
+++ incubator/tuscany/java/sca/kernel/spi/pom.xml Sun Sep 10 02:57:47 2006
@@ -47,10 +47,11 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaIDLUtils.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaIDLUtils.java?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaIDLUtils.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/java/JavaIDLUtils.java Sun Sep 10 02:57:47 2006
@@ -73,10 +73,10 @@
*
* @return true if the operation matches, false if does not
*/
- private static boolean match(Operation<?> operation, Method method) {
+ private static <T> boolean match(Operation<T> operation, Method method) {
Class<?>[] params = method.getParameterTypes();
- DataType inputType = operation.getInputType();
- List<DataType<?>> types = (List<DataType<?>>) inputType.getLogical();
+ DataType<List<DataType<T>>> inputType = operation.getInputType();
+ List<DataType<T>> types = inputType.getLogical();
boolean found = true;
if (types.size() == params.length && method.getName().equals(operation.getName())) {
for (int i = 0; i < params.length; i++) {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessorExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessorExtension.java?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessorExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessorExtension.java Sun Sep 10 02:57:47 2006
@@ -59,7 +59,8 @@
}
public <T> void visitSuperClass(CompositeComponent parent, Class<T> clazz,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
+ PojoComponentType<JavaMappedService,
+ JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
}
@@ -71,7 +72,8 @@
}
public <T> void visitConstructor(CompositeComponent parent, Constructor<T> constructor,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
+ PojoComponentType<JavaMappedService,
+ JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
}
Modified: incubator/tuscany/java/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/pom.xml?view=diff&rev=441935&r1=441934&r2=441935
==============================================================================
--- incubator/tuscany/java/sca/pom.xml (original)
+++ incubator/tuscany/java/sca/pom.xml Sun Sep 10 02:57:47 2006
@@ -95,12 +95,7 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>1.0.1</version>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org