Author: jmarino
Date: Wed Mar 1 07:42:19 2006
New Revision: 382064
URL: http://svn.apache.org/viewcvs?rev=382064&view=rev
Log:
removal of duplicate code in core tests; test packaging refactor
Added:
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockScopeContext.java
- copied, changed from r381940,
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/invocation/mock/MockScopeContext.java
Removed:
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/invocation/mock/MockScopeContext.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/model/
Modified:
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilderTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/handler/ScopedPojoInvokerTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java
Modified:
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilderTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilderTestCase.java?rev=382064&r1=382063&r2=382064&view=diff
==============================================================================
---
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilderTestCase.java
(original)
+++
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaComponentContextBuilderTestCase.java
Wed Mar 1 07:42:19 2006
@@ -10,11 +10,10 @@
import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
import org.apache.tuscany.container.java.invocation.mock.MockSyncInterceptor;
-import org.apache.tuscany.container.java.mock.MockFactory;
import org.apache.tuscany.container.java.mock.MockConfigContext;
+import org.apache.tuscany.container.java.mock.MockFactory;
import org.apache.tuscany.container.java.mock.components.GenericComponent;
import org.apache.tuscany.container.java.mock.components.ModuleScopeComponent;
-import
org.apache.tuscany.container.java.mock.components.ModuleScopeComponentImpl;
import org.apache.tuscany.core.builder.RuntimeConfiguration;
import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
import org.apache.tuscany.core.builder.impl.HierarchicalBuilder;
@@ -34,15 +33,9 @@
import org.apache.tuscany.model.assembly.AssemblyFactory;
import org.apache.tuscany.model.assembly.AssemblyModelContext;
import org.apache.tuscany.model.assembly.Component;
-import org.apache.tuscany.model.assembly.ConfiguredReference;
-import org.apache.tuscany.model.assembly.ConfiguredService;
import org.apache.tuscany.model.assembly.Module;
-import org.apache.tuscany.model.assembly.Reference;
-import org.apache.tuscany.model.assembly.Scope;
-import org.apache.tuscany.model.assembly.Service;
import org.apache.tuscany.model.assembly.impl.AssemblyFactoryImpl;
import org.apache.tuscany.model.assembly.impl.AssemblyModelContextImpl;
-import org.apache.tuscany.model.types.java.JavaServiceContract;
public class JavaComponentContextBuilderTestCase extends TestCase {
@@ -66,7 +59,7 @@
ScopeStrategy strategy = new DefaultScopeStrategy();
DefaultWireBuilder wireBuilder = new DefaultWireBuilder();
wireBuilder.addWireBuilder(javaWireBuilder);
- Module module = createModule();
+ Module module = MockFactory.createModule();
EventContext eCtx = new EventContextImpl();
ScopeContext scopeContext = new ModuleScopeContext(eCtx);
scopeContext.start();
@@ -110,45 +103,7 @@
}
}
}
-
-
-
-
- public Module createModule() throws Exception {
- Component sourceComponent = MockFactory.createComponent("source",
ModuleScopeComponentImpl.class,Scope.MODULE);
- Component targetComponent = MockFactory.createComponent("target",
ModuleScopeComponentImpl.class,Scope.MODULE);
-
- Service targetService = factory.createService();
- JavaServiceContract targetContract =
factory.createJavaServiceContract();
- targetContract.setInterface(GenericComponent.class);
- targetService.setServiceContract(targetContract);
- targetService.setName("GenericComponent");
- ConfiguredService cTargetService = factory.createConfiguredService();
- cTargetService.setService(targetService);
- cTargetService.initialize(assemblyContext);
- targetComponent.getConfiguredServices().add(cTargetService);
- targetComponent.initialize(assemblyContext);
-
- Reference ref = factory.createReference();
- ConfiguredReference cref = factory.createConfiguredReference();
- ref.setName("setGenericComponent");
- JavaServiceContract inter = factory.createJavaServiceContract();
- inter.setInterface(GenericComponent.class);
- ref.setServiceContract(inter);
- cref.setReference(ref);
- cref.getTargetConfiguredServices().add(cTargetService);
- cref.initialize(assemblyContext);
- sourceComponent.getConfiguredReferences().add(cref);
- sourceComponent.initialize(assemblyContext);
-
- Module module = factory.createModule();
- module.setName("test.module");
- module.getComponents().add(sourceComponent);
- module.getComponents().add(targetComponent);
- return module;
- }
-
private static AggregateContext createContext() {
return new AggregateContextImpl("test.parent", null, new
DefaultScopeStrategy(), new EventContextImpl(),
new MockConfigContext(null), new NullMonitorFactory());
Modified:
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java?rev=382064&r1=382063&r2=382064&view=diff
==============================================================================
---
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java
(original)
+++
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaTargetWireBuilderTestCase.java
Wed Mar 1 07:42:19 2006
@@ -9,10 +9,10 @@
import
org.apache.tuscany.container.java.config.JavaComponentRuntimeConfiguration;
import org.apache.tuscany.container.java.invocation.mock.MockHandler;
-import org.apache.tuscany.container.java.invocation.mock.MockScopeContext;
import org.apache.tuscany.container.java.invocation.mock.MockSyncInterceptor;
import org.apache.tuscany.container.java.invocation.mock.SimpleTarget;
import org.apache.tuscany.container.java.invocation.mock.SimpleTargetImpl;
+import org.apache.tuscany.container.java.mock.MockScopeContext;
import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
Modified:
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/handler/ScopedPojoInvokerTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/handler/ScopedPojoInvokerTestCase.java?rev=382064&r1=382063&r2=382064&view=diff
==============================================================================
---
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/handler/ScopedPojoInvokerTestCase.java
(original)
+++
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/handler/ScopedPojoInvokerTestCase.java
Wed Mar 1 07:42:19 2006
@@ -22,8 +22,8 @@
import junit.framework.TestCase;
import org.apache.tuscany.container.java.handler.ScopedJavaComponentInvoker;
-import org.apache.tuscany.container.java.invocation.mock.MockScopeContext;
import org.apache.tuscany.container.java.invocation.mock.SimpleTarget;
+import org.apache.tuscany.container.java.mock.MockScopeContext;
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.context.ScopeContext;
Modified:
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java?rev=382064&r1=382063&r2=382064&view=diff
==============================================================================
---
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java
(original)
+++
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java
Wed Mar 1 07:42:19 2006
@@ -496,15 +496,6 @@
}
/**
- * Returns a collection of bootstrap and Java runtime configuration
builders
- */
- public static List<RuntimeConfigurationBuilder>
createJavaAndSystemBuilders() {
- List<RuntimeConfigurationBuilder> builders = createSystemBuilders();
-
- return builders;
- }
-
- /**
* Creates a default [EMAIL PROTECTED] RuntimeContext} configured with
support for Java component implementations
*
* @throws ConfigurationException
Copied:
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockScopeContext.java
(from r381940,
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/invocation/mock/MockScopeContext.java)
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockScopeContext.java?p2=incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockScopeContext.java&p1=incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/invocation/mock/MockScopeContext.java&r1=381940&r2=382064&rev=382064&view=diff
==============================================================================
---
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/invocation/mock/MockScopeContext.java
(original)
+++
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockScopeContext.java
Wed Mar 1 07:42:19 2006
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tuscany.container.java.invocation.mock;
+package org.apache.tuscany.container.java.mock;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.tuscany.container.java.invocation.mock.SimpleTargetImpl;
import org.apache.tuscany.core.builder.RuntimeConfiguration;
import org.apache.tuscany.core.context.InstanceContext;
import org.apache.tuscany.core.context.EventException;
