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/02/22 01:51:03 UTC
svn commit: r379641 [3/3] - in /incubator/tuscany/java/sca/core/src:
main/java/org/apache/tuscany/core/builder/
main/java/org/apache/tuscany/core/builder/impl/
main/java/org/apache/tuscany/core/context/
main/java/org/apache/tuscany/core/context/impl/ m...
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextTestCase.java?rev=379641&r1=379640&r2=379641&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextTestCase.java Tue Feb 21 16:50:58 2006
@@ -18,10 +18,10 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.ContextConstants;
import org.apache.tuscany.core.context.impl.AggregateContextImpl;
import org.apache.tuscany.core.context.impl.EventContextImpl;
import org.apache.tuscany.core.mock.MockConfigContext;
@@ -30,8 +30,7 @@
import org.apache.tuscany.core.mock.component.ModuleScopeSystemComponentImpl;
import org.apache.tuscany.model.assembly.Component;
import org.apache.tuscany.model.assembly.EntryPoint;
-import org.apache.tuscany.model.assembly.ScopeEnum;
-import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
+import org.apache.tuscany.model.assembly.Scope;
/**
* Tests the system aggregate context
@@ -48,13 +47,13 @@
system.start();
Component aggregateComponent = MockSystemAssemblyFactory.createComponent("system.child",
- AggregateContextImpl.class.getName(), ContextConstants.AGGREGATE_SCOPE_ENUM);
+ AggregateContextImpl.class.getName(), Scope.AGGREGATE);
system.registerModelObject(aggregateComponent);
AggregateContext childContext = (AggregateContext) system.getContext("system.child");
Assert.assertNotNull(childContext);
Component component = MockSystemAssemblyFactory.createComponent("TestService1", ModuleScopeSystemComponentImpl.class.getName(),
- ScopeEnum.MODULE_LITERAL);
+ Scope.MODULE);
EntryPoint ep = MockSystemAssemblyFactory.createEntryPoint("TestService1EP", ModuleScopeSystemComponent.class,
"TestService1", component);
childContext.registerModelObject(component);
@@ -71,7 +70,7 @@
null, new SystemScopeStrategy(), new EventContextImpl(), new MockConfigContext(builders), new NullMonitorFactory());
Component component = MockSystemAssemblyFactory.createComponent("TestService1", ModuleScopeSystemComponentImpl.class
- .getName(), ScopeEnum.MODULE_LITERAL);
+ .getName(), Scope.MODULE);
EntryPoint ep = MockSystemAssemblyFactory.createEntryPoint("TestService1EP", ModuleScopeSystemComponent.class,
"TestService1", component);
system.registerModelObject(component);
@@ -90,7 +89,7 @@
null, new SystemScopeStrategy(), new EventContextImpl(), new MockConfigContext(builders), new NullMonitorFactory());
Component component = MockSystemAssemblyFactory.createComponent("TestService1", ModuleScopeSystemComponentImpl.class
- .getName(), ScopeEnum.MODULE_LITERAL);
+ .getName(), Scope.MODULE);
system.registerModelObject(component);
system.start();
system.fireEvent(EventContext.MODULE_START, null);
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateHierarchyTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateHierarchyTestCase.java?rev=379641&r1=379640&r2=379641&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateHierarchyTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateHierarchyTestCase.java Tue Feb 21 16:50:58 2006
@@ -17,16 +17,16 @@
import junit.framework.Assert;
+import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
import org.apache.tuscany.core.context.AbstractAggregateHierarchyTests;
import org.apache.tuscany.core.context.AggregateContext;
-import org.apache.tuscany.core.context.ContextConstants;
import org.apache.tuscany.core.context.impl.AggregateContextImpl;
import org.apache.tuscany.core.context.impl.EventContextImpl;
import org.apache.tuscany.core.context.scope.DefaultScopeStrategy;
import org.apache.tuscany.core.mock.MockConfigContext;
import org.apache.tuscany.core.mock.MockSystemAssemblyFactory;
-import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
+import org.apache.tuscany.model.assembly.Scope;
/**
* Performs testing of various hierarchical scenarios
@@ -38,11 +38,11 @@
protected AggregateContext createContextHierachy() throws Exception {
- List<RuntimeConfigurationBuilder> builders = MockSystemAssemblyFactory.createBuilders();
+ List<RuntimeConfigurationBuilder> mockBuilders = MockSystemAssemblyFactory.createBuilders();
AggregateContext parent = new SystemAggregateContextImpl("test.parent", null, null, new DefaultScopeStrategy(),
- new EventContextImpl(), new MockConfigContext(builders), new NullMonitorFactory());
+ new EventContextImpl(), new MockConfigContext(mockBuilders), new NullMonitorFactory());
parent.registerModelObject(MockSystemAssemblyFactory.createComponent("test.child", AggregateContextImpl.class.getName(),
- ContextConstants.AGGREGATE_SCOPE_ENUM));
+ Scope.AGGREGATE));
parent.start();
AggregateContext child = (AggregateContext) parent.getContext("test.child");
Assert.assertNotNull(child);
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemBootstrapTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemBootstrapTestCase.java?rev=379641&r1=379640&r2=379641&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemBootstrapTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemBootstrapTestCase.java Tue Feb 21 16:50:58 2006
@@ -18,30 +18,28 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.context.AutowireContext;
import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.ContextConstants;
import org.apache.tuscany.core.context.impl.AggregateContextImpl;
import org.apache.tuscany.core.mock.MockSystemAssemblyFactory;
import org.apache.tuscany.core.mock.component.GenericSystemComponent;
import org.apache.tuscany.core.mock.component.ModuleScopeSystemComponent;
import org.apache.tuscany.core.mock.component.ModuleScopeSystemComponentImpl;
-import org.apache.tuscany.core.system.assembly.pojo.PojoSystemBinding;
import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.core.runtime.RuntimeContextImpl;
+import org.apache.tuscany.core.system.assembly.SystemAssemblyFactory;
+import org.apache.tuscany.core.system.assembly.impl.SystemAssemblyFactoryImpl;
import org.apache.tuscany.model.assembly.Component;
+import org.apache.tuscany.model.assembly.ConfiguredService;
+import org.apache.tuscany.model.assembly.EntryPoint;
import org.apache.tuscany.model.assembly.ExternalService;
import org.apache.tuscany.model.assembly.Module;
+import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.Service;
-import org.apache.tuscany.model.assembly.pojo.PojoConfiguredService;
-import org.apache.tuscany.model.assembly.pojo.PojoEntryPoint;
-import org.apache.tuscany.model.assembly.pojo.PojoInterface;
-import org.apache.tuscany.model.assembly.pojo.PojoInterfaceType;
-import org.apache.tuscany.model.assembly.pojo.PojoJavaInterface;
-import org.apache.tuscany.model.assembly.pojo.PojoService;
-import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
+import org.apache.tuscany.model.types.java.JavaServiceContract;
/**
* Tests bootstrapping a system module
@@ -50,6 +48,8 @@
*/
public class SystemBootstrapTestCase extends TestCase {
private List<RuntimeConfigurationBuilder> builders;
+
+ private SystemAssemblyFactory factory = new SystemAssemblyFactoryImpl();
/**
* Simulates booting a runtime process
@@ -66,7 +66,7 @@
// create a test module
Component moduleComponent = MockSystemAssemblyFactory.createComponent("module", AggregateContextImpl.class
- .getName(), ContextConstants.AGGREGATE_SCOPE_ENUM);
+ .getName(), Scope.AGGREGATE);
runtimeContext.registerModelObject(moduleComponent);
AggregateContextImpl moduleContext = (AggregateContextImpl) runtimeContext.getContext("module");
Assert.assertNotNull(moduleContext);
@@ -93,30 +93,27 @@
AggregateContext system = runtime.getSystemContext();
system.registerModelObject(MockSystemAssemblyFactory.createSystemModule());
system.registerModelObject(MockSystemAssemblyFactory.createComponent("module2", SystemAggregateContextImpl.class
- .getName(), ContextConstants.AGGREGATE_SCOPE_ENUM));
+ .getName(), Scope.AGGREGATE));
AggregateContext systemModule2 = (AggregateContext) system.getContext("module2");
systemModule2.registerModelObject(MockSystemAssemblyFactory.createSystemChildModule());
- PojoEntryPoint ep = MockSystemAssemblyFactory.createEntryPoint("TestService2EP", ModuleScopeSystemComponent.class, "ref");
- ep.addBinding(new PojoSystemBinding());
- Service service = new PojoService();
+ EntryPoint ep = MockSystemAssemblyFactory.createEntryPoint("TestService2EP", ModuleScopeSystemComponent.class, "ref");
+ ep.getBindings().add(factory.createSystemBinding());
+ Service service = factory.createService();
service.setName("module2/TestService2EP");
- ((PojoConfiguredService) ep.getConfiguredReference().getTargetConfiguredServices().get(0)).setService(service);
- PojoInterface inter = new PojoJavaInterface();
- PojoInterfaceType interType = new PojoInterfaceType();
- interType.setInstanceClass(ModuleScopeSystemComponentImpl.class);
- inter.setInterfaceType(interType);
+ JavaServiceContract inter = factory.createJavaServiceContract();
+ inter.setInterface(ModuleScopeSystemComponentImpl.class);
service.setServiceContract(inter);
- ep.setServiceContract(inter);
+ ((ConfiguredService) ep.getConfiguredReference().getTargetConfiguredServices().get(0)).setService(service);
system.registerModelObject(ep);
system.fireEvent(EventContext.MODULE_START, null);
Assert.assertNotNull(system.locateInstance("TestService1"));
Assert.assertNotNull(system.locateInstance("TestService2EP"));
- Assert.assertNotNull(((AutowireContext) system).resolveInstance(ModuleScopeSystemComponentImpl.class));
+ Assert.assertNotNull(((AutowireContext) system).resolveInstance(ModuleScopeSystemComponent.class));
// create a test module
Component moduleComponent = MockSystemAssemblyFactory.createComponent("test.module", AggregateContextImpl.class
- .getName(), ContextConstants.AGGREGATE_SCOPE_ENUM);
+ .getName(), Scope.AGGREGATE);
runtime.registerModelObject(moduleComponent);
AggregateContextImpl moduleContext = (AggregateContextImpl) runtime.getContext("test.module");
Assert.assertNotNull(moduleContext);
@@ -129,41 +126,6 @@
system.fireEvent(EventContext.MODULE_STOP, null);
runtime.stop();
}
-
-// public void testT() throws Exception{
-//
-// List<RuntimeConfigurationBuilder> builders = new ArrayList();
-// builders.add((new SystemComponentContextBuilder()));
-// builders.add(new SystemEntryPointBuilder());
-// builders.add(new SystemExternalServiceBuilder());
-//
-// RuntimeContext runtimeContext = new RuntimeContextImpl(new NullMonitorFactory(), builders, null);
-// runtimeContext.start();
-// // create the system context
-// Component component = MockSystemAssemblyFactory.createComponent(RuntimeContext.SYSTEM,
-// SystemAggregateComponentContextImpl.class.getName(), ModuleConstants.AGGREGATE_SCOPE_ENUM);
-// runtimeContext.registerModelObject(component);
-// AggregateComponentContext systemContext = runtimeContext.getSystemContext();
-// Assert.assertNotNull(systemContext);
-// Module systemModule = MockSystemAssemblyFactory.createSystemModule();
-// systemContext.registerModelObject(systemModule);
-//
-// // create a test module
-// Component moduleComponent = MockSystemAssemblyFactory.createComponent("module", AggregateComponentContextImpl.class
-// .getName(), ModuleConstants.AGGREGATE_SCOPE_ENUM);
-// runtimeContext.registerModelObject(moduleComponent);
-// AggregateComponentContextImpl moduleContext = (AggregateComponentContextImpl) runtimeContext.getContext("module");
-// Assert.assertNotNull(moduleContext);
-// ExternalService es = MockSystemAssemblyFactory.createExternalService("TestServiceES", "tuscany.system/TestService1xEP");
-// moduleContext.registerModelObject(es);
-//
-// // start the modules and test inter-module system wires
-// systemContext.fireEvent(EventContext.MODULE_START, null);
-// moduleContext.fireEvent(EventContext.MODULE_START, null);
-//
-// moduleContext.locateService("TestServiceES");
-// }
-
protected void setUp() throws Exception {
super.setUp();