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 2007/03/01 00:49:47 UTC
svn commit: r513069 - in
/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core:
implementation/java/ implementation/system/builder/ loader/
Author: jmarino
Date: Wed Feb 28 15:49:46 2007
New Revision: 513069
URL: http://svn.apache.org/viewvc?view=rev&rev=513069
Log:
cleanup unit tests to remove unnecessary mocks
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java?view=diff&rev=513069&r1=513068&r2=513069
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java Wed Feb 28 15:49:46 2007
@@ -23,7 +23,6 @@
import org.osoa.sca.annotations.ConversationID;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.component.WorkContext;
@@ -63,7 +62,6 @@
JavaImplementation impl = new JavaImplementation(Foo.class, type);
URI uri = URI.create("foo");
ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(uri, impl);
- Component parent = EasyMock.createMock(Component.class);
JavaAtomicComponent component = (JavaAtomicComponent) builder.build(definition, null);
Foo foo = (Foo) component.createInstance();
assertEquals("convID", foo.conversationID);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java?view=diff&rev=513069&r1=513068&r2=513069
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java Wed Feb 28 15:49:46 2007
@@ -20,7 +20,6 @@
import java.net.URI;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.host.ResourceHost;
@@ -64,12 +63,9 @@
EasyMock.expect(resourceWire.getTargetInstance()).andReturn("result");
EasyMock.replay(resourceWire);
- Component parent = EasyMock.createMock(Component.class);
- EasyMock.replay(parent);
JavaAtomicComponent component = (JavaAtomicComponent) builder.build(definition, null);
Foo foo = (Foo) component.createInstance();
assertEquals("result", foo.resource);
- EasyMock.verify(parent);
}
private static class Foo {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java?view=diff&rev=513069&r1=513068&r2=513069
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderResourceTestCase.java Wed Feb 28 15:49:46 2007
@@ -4,7 +4,6 @@
import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -60,13 +59,10 @@
EasyMock.expect(wire.getTargetInstance()).andReturn("result");
EasyMock.replay(wire);
- Component parent = EasyMock.createMock(Component.class);
- EasyMock.replay(parent);
AtomicComponent component = builder.build(definition, ctx);
SystemComponentBuilderResourceTestCase.Foo foo =
(SystemComponentBuilderResourceTestCase.Foo) component.createInstance();
assertEquals("result", foo.resource);
- EasyMock.verify(parent);
}
private static class Foo {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java?view=diff&rev=513069&r1=513068&r2=513069
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ReferenceLoaderTestCase.java Wed Feb 28 15:49:46 2007
@@ -26,7 +26,6 @@
import org.osoa.sca.Constants;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -53,7 +52,6 @@
private ReferenceLoader loader;
private XMLStreamReader mockReader;
private LoaderRegistry mockRegistry;
- private Component parent;
private DeploymentContext ctx;
public void testWithNoInterface() throws LoaderException, XMLStreamException {
@@ -132,9 +130,6 @@
mockReader = EasyMock.createStrictMock(XMLStreamReader.class);
mockRegistry = EasyMock.createMock(LoaderRegistry.class);
loader = new ReferenceLoader(mockRegistry);
- parent = EasyMock.createMock(Component.class);
- EasyMock.expect(parent.getUri()).andReturn(URI.create(COMPONENT_NAME));
- EasyMock.replay(parent);
ctx = EasyMock.createMock(DeploymentContext.class);
EasyMock.expect(ctx.getComponentId()).andReturn(componentId);
EasyMock.replay(ctx);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org