Author: jmarino
Date: Tue Feb 28 19:26:46 2006
New Revision: 381890
URL: http://svn.apache.org/viewcvs?rev=381890&view=rev
Log:
more cleanup of MockFactory methods
Modified:
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java
Modified:
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java?rev=381890&r1=381889&r2=381890&view=diff
==============================================================================
---
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java
(original)
+++
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/JavaBuilderContextIntegrationTestCase.java
Tue Feb 28 19:26:46 2006
@@ -41,7 +41,6 @@
import org.apache.tuscany.core.system.builder.SystemComponentContextBuilder;
import org.apache.tuscany.core.system.builder.SystemEntryPointBuilder;
import org.apache.tuscany.core.system.builder.SystemExternalServiceBuilder;
-import org.apache.tuscany.model.assembly.Scope;
/**
* Verifies that the aggregate context implementation and java component
builders construct references properly
@@ -89,7 +88,7 @@
runtime.addBuilder(new JavaTargetWireBuilder());
runtime.start();
runtime.getRootContext().registerModelObject(
- MockFactory.createAggregateComponent("test.module",
Scope.AGGREGATE));
+ MockFactory.createAggregateComponent("test.module"));
AggregateContext child = (AggregateContext)
runtime.getRootContext().getContext("test.module");
child.registerModelObject(MockFactory.createModule());
child.fireEvent(EventContext.MODULE_START, null);
@@ -131,7 +130,7 @@
runtime.addBuilder(new JavaTargetWireBuilder());
runtime.start();
runtime.getRootContext().registerModelObject(
- MockFactory.createAggregateComponent("test.module",
Scope.AGGREGATE));
+ MockFactory.createAggregateComponent("test.module"));
AggregateContext child = (AggregateContext)
runtime.getRootContext().getContext("test.module");
child.registerModelObject(MockFactory.createModule());
child.fireEvent(EventContext.MODULE_START, null);
@@ -176,7 +175,7 @@
runtime.addBuilder(new JavaTargetWireBuilder());
runtime.start();
runtime.getRootContext().registerModelObject(
- MockFactory.createAggregateComponent("test.module",
Scope.AGGREGATE));
+ MockFactory.createAggregateComponent("test.module"));
AggregateContext child = (AggregateContext)
runtime.getRootContext().getContext("test.module");
child.registerModelObject(MockFactory.createModule());
child.fireEvent(EventContext.MODULE_START, null);
@@ -219,7 +218,7 @@
runtime.start();
runtime.getRootContext().registerModelObject(
- MockFactory.createAggregateComponent("test.module",
Scope.AGGREGATE));
+ MockFactory.createAggregateComponent("test.module"));
AggregateContext child = (AggregateContext)
runtime.getRootContext().getContext("test.module");
child.registerModelObject(MockFactory.createModule());
child.fireEvent(EventContext.MODULE_START, null);
Modified:
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java?rev=381890&r1=381889&r2=381890&view=diff
==============================================================================
---
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java
(original)
+++
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/EntryPointToJavaTestCase.java
Tue Feb 28 19:26:46 2006
@@ -44,7 +44,6 @@
import org.apache.tuscany.core.system.builder.SystemComponentContextBuilder;
import org.apache.tuscany.core.system.builder.SystemEntryPointBuilder;
import org.apache.tuscany.core.system.builder.SystemExternalServiceBuilder;
-import org.apache.tuscany.model.assembly.Scope;
/**
*
@@ -91,7 +90,7 @@
runtime.addBuilder(new FooBindingWireBuilder());
runtime.start();
runtime.getRootContext().registerModelObject(
- MockFactory.createAggregateComponent("test.module",
Scope.AGGREGATE));
+ MockFactory.createAggregateComponent("test.module"));
AggregateContext child = (AggregateContext)
runtime.getRootContext().getContext("test.module");
child.registerModelObject(MockFactory.createModuleWithEntryPoint());
child.fireEvent(EventContext.MODULE_START, null);
Modified:
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java?rev=381890&r1=381889&r2=381890&view=diff
==============================================================================
---
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java
(original)
+++
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/integration/binding/JavaToExternalServiceTestCase.java
Tue Feb 28 19:26:46 2006
@@ -41,7 +41,6 @@
import org.apache.tuscany.core.system.builder.SystemComponentContextBuilder;
import org.apache.tuscany.core.system.builder.SystemEntryPointBuilder;
import org.apache.tuscany.core.system.builder.SystemExternalServiceBuilder;
-import org.apache.tuscany.model.assembly.Scope;
/**
*
@@ -82,7 +81,7 @@
runtime.addBuilder(new FooBindingWireBuilder());
runtime.start();
runtime.getRootContext().registerModelObject(
- MockFactory.createAggregateComponent("test.module",
Scope.AGGREGATE));
+ MockFactory.createAggregateComponent("test.module"));
AggregateContext child = (AggregateContext)
runtime.getRootContext().getContext("test.module");
child.registerModelObject(MockFactory.createModuleWithExternalService());
child.fireEvent(EventContext.MODULE_START, null);
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=381890&r1=381889&r2=381890&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
Tue Feb 28 19:26:46 2006
@@ -32,6 +32,7 @@
import org.apache.tuscany.container.java.mock.components.GenericComponent;
import org.apache.tuscany.container.java.mock.components.HelloWorldClient;
import
org.apache.tuscany.container.java.mock.components.ModuleScopeComponentImpl;
+import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.RuntimeConfiguration;
import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
@@ -108,13 +109,9 @@
}
/**
- * Creates a system
- * @param name
- * @param scope
- * @return
- * @throws ClassNotFoundException
+ * Creates an aggregate component with the given name
*/
- public static Component createAggregateComponent(String name, Scope scope)
throws ClassNotFoundException {
+ public static Component createAggregateComponent(String name) {
Component sc = sc = systemFactory.createModuleComponent();
SystemImplementation impl = systemFactory.createSystemImplementation();
impl.setImplementationClass(AggregateContextImpl.class);
@@ -122,7 +119,7 @@
Service s = systemFactory.createService();
JavaServiceContract ji = systemFactory.createJavaServiceContract();
s.setServiceContract(ji);
- ji.setScope(scope);
+ ji.setScope(Scope.AGGREGATE);
impl.setComponentType(systemFactory.createComponentType());
impl.getComponentType().getServices().add(s);
sc.setName(name);
@@ -133,8 +130,7 @@
/**
* Creates an external service configured with the 'Foo' test binding
*/
- public static ExternalService createFooBindingExternalService(String name,
Class interfaz) throws NoSuchMethodException,
- ClassNotFoundException {
+ public static ExternalService createFooBindingExternalService(String name,
Class interfaz) {
ExternalService es = factory.createExternalService();
es.setName(name);
Service s = factory.createService();
@@ -150,8 +146,10 @@
return es;
}
- public static EntryPoint createFooBindingEntryPoint(String name, Class
interfaz) throws NoSuchMethodException,
- ClassNotFoundException {
+ /**
+ * Creates an entry point with the given name configured with the given
interface and the [EMAIL PROTECTED] FooBinding}
+ */
+ public static EntryPoint createFooBindingEntryPoint(String name, Class
interfaz) {
EntryPoint ep = factory.createEntryPoint();
ep.setName(name);
Service s = factory.createService();
@@ -197,7 +195,6 @@
configuredReference.getTargetConfiguredServices().add(cService);
ep.setConfiguredReference(configuredReference);
- // /
Service epService = systemFactory.createService();
epService.setServiceContract(contract);
@@ -205,15 +202,12 @@
epCService.initialize(MockFactory.assemblyContext);
epCService.setService(epService);
- //
-
ep.setConfiguredService(epCService);
SystemBinding binding = systemFactory.createSystemBinding();
ep.getBindings().add(binding);
if (target != null) {
if (target instanceof Component) {
((Component) target).getConfiguredServices().add(cService);
- // cService.
} else if (target instanceof ExternalService) {
((ExternalService) target).setConfiguredService(cService);
}
@@ -224,7 +218,7 @@
}
/**
- * Creates an external service
+ * Creates an external service configured with a [EMAIL PROTECTED]
SystemBinding}
*/
public static ExternalService createESSystemBinding(String name, String
refName) {
ExternalService es = systemFactory.createExternalService();
@@ -238,7 +232,10 @@
return es;
}
- public static Module createModule() throws Exception {
+ /**
+ * Creates a module with a Java-based "target" component wired to a
"source"
+ */
+ public static Module createModule() {
Component sourceComponent = createComponent("source",
ModuleScopeComponentImpl.class, Scope.MODULE);
Component targetComponent = createComponent("target",
ModuleScopeComponentImpl.class, Scope.MODULE);
@@ -273,7 +270,11 @@
return module;
}
- public static Module createModuleWithExternalService() throws Exception {
+ /**
+ * Creates a module with a Java-based source component wired to a "target"
external service configured with the
+ * [EMAIL PROTECTED] FooBinding}
+ */
+ public static Module createModuleWithExternalService() {
Component sourceComponent = createComponent("source",
HelloWorldClient.class, Scope.MODULE);
ExternalService targetES = createFooBindingExternalService("target",
HelloWorldService.class);
@@ -307,7 +308,11 @@
return module;
}
- public static Module createModuleWithEntryPoint() throws Exception {
+ /**
+ * Creates a module with an entry point named "source" configured with the
[EMAIL PROTECTED] FooBinding} wired to a Java-based
+ * component names "target"
+ */
+ public static Module createModuleWithEntryPoint() {
EntryPoint sourceEP = createFooBindingEntryPoint("source",
HelloWorldService.class);
Component targetComponent = createComponent("target",
HelloWorldImpl.class, Scope.MODULE);
@@ -342,7 +347,10 @@
return module;
}
- public static List<RuntimeConfigurationBuilder> createBuilders() {
+ /**
+ * Returns a collection of bootstrap configuration builders
+ */
+ public static List<RuntimeConfigurationBuilder> createSystemBuilders() {
List<RuntimeConfigurationBuilder> builders = new ArrayList();
builders.add((new SystemComponentContextBuilder()));
builders.add(new SystemEntryPointBuilder());
@@ -354,16 +362,14 @@
* Creates an aggregate runtime configuration
*
* @param name the name of the component
- * @param scope the scope of the component implementation
* @param aggregateContext the containing aggregate context
- * @throws NoSuchMethodException
- * @throws ClassNotFoundException
+ * @throws BuilderException
* @see RuntimeConfiguration
*/
- public static RuntimeConfiguration<InstanceContext>
createAggregateConfiguration(String name, Scope scope, AggregateContext
aggregateContext)
- throws NoSuchMethodException, ClassNotFoundException {
+ public static RuntimeConfiguration<InstanceContext>
createAggregateConfiguration(String name,
+ AggregateContext aggregateContext) throws BuilderException {
- Component sc = createAggregateComponent(name, scope);
+ Component sc = createAggregateComponent(name);
SystemComponentContextBuilder builder = new
SystemComponentContextBuilder();
builder.build(sc, aggregateContext);
return (RuntimeConfiguration<InstanceContext>)
sc.getComponentImplementation().getRuntimeConfiguration();
@@ -376,7 +382,7 @@
* @param implType the POJO class
* @param scope the component scope
* @param moduleComponentContext the containing aggregate context
- * @throws NoSuchMethodException
+ * @throws NoSuchMethodException if the POJO does not have a default
noi-args constructor
*/
public static JavaComponentContext createPojoContext(String name, Class
implType, Scope scope,
AggregateContext moduleComponentContext) throws
NoSuchMethodException {
@@ -424,11 +430,9 @@
injectors.add(injector);
}
}
-
boolean stateless = (scope == Scope.INSTANCE);
JavaComponentContext context = new JavaComponentContext("foo", new
PojoObjectFactory(JavaIntrospectionHelper
.getDefaultConstructor(implType), null, injectors), eagerInit,
initInvoker, destroyInvoker, stateless);
-
return context;
}
Modified:
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java?rev=381890&r1=381889&r2=381890&view=diff
==============================================================================
---
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java
(original)
+++
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/scopes/AggregateScopeTestCase.java
Tue Feb 28 19:26:46 2006
@@ -51,8 +51,7 @@
AggregateContext moduleComponentCtx = new AggregateContextImpl();
moduleComponentCtx.setName("testMC");
AggregateScopeContext scopeContainer = new AggregateScopeContext(ctx);
-
scopeContainer.registerConfiguration(MockFactory.createAggregateConfiguration("AggregateComponent",
Scope.AGGREGATE,
- moduleComponentCtx));
+
scopeContainer.registerConfiguration(MockFactory.createAggregateConfiguration("AggregateComponent",
moduleComponentCtx));
scopeContainer.start();
AggregateContext child = (AggregateContext)
scopeContainer.getContext("AggregateComponent");
List<Extensible> models = createAssembly(moduleComponentCtx);
@@ -104,8 +103,7 @@
AggregateContext moduleComponentCtx = new AggregateContextImpl();
moduleComponentCtx.setName("testMC");
AggregateScopeContext scopeContainer = new AggregateScopeContext(ctx);
-
scopeContainer.registerConfiguration(MockFactory.createAggregateConfiguration("AggregateComponent",
Scope.AGGREGATE,
- moduleComponentCtx));
+
scopeContainer.registerConfiguration(MockFactory.createAggregateConfiguration("AggregateComponent",
moduleComponentCtx));
scopeContainer.start();
AggregateContext child = (AggregateContext)
scopeContainer.getContext("AggregateComponent");
List<Extensible> parts = createAssembly(moduleComponentCtx);
@@ -127,8 +125,7 @@
AggregateContext moduleComponentCtx = new AggregateContextImpl();
moduleComponentCtx.setName("testMC");
AggregateScopeContext scopeContainer = new AggregateScopeContext(ctx);
-
scopeContainer.registerConfiguration(MockFactory.createAggregateConfiguration("AggregateComponent",
Scope.AGGREGATE,
- moduleComponentCtx));
+
scopeContainer.registerConfiguration(MockFactory.createAggregateConfiguration("AggregateComponent",
moduleComponentCtx));
scopeContainer.start();
scopeContainer.onEvent(EventContext.MODULE_START, null);
QualifiedName name = new
QualifiedName("AggregateComponent/TestService1");
@@ -148,8 +145,7 @@
scopeContainer.start();
scopeContainer.onEvent(EventContext.MODULE_START, null);
-
scopeContainer.registerConfiguration(MockFactory.createAggregateConfiguration("AggregateComponent",
Scope.AGGREGATE,
- moduleComponentCtx));
+
scopeContainer.registerConfiguration(MockFactory.createAggregateConfiguration("AggregateComponent",
moduleComponentCtx));
QualifiedName name = new
QualifiedName("AggregateComponent/TestService1");
AggregateContext componentCtx = (AggregateContext)
scopeContainer.getContext("AggregateComponent");
scopeContainer.onEvent(EventContext.MODULE_STOP, null);
