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/02/03 04:16:22 UTC
svn commit: r502853 [5/7] - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/binding/local/
core/src/main/java/org/apache/tuscany/core/bootstrap/
core/src/main/java/org/apache/tuscany/core/builder/ core/src/main/java/or...
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessorTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessorTestCase.java Fri Feb 2 19:16:15 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.core.implementation.processor;
import java.lang.reflect.Constructor;
+import java.net.URI;
import java.util.Collection;
import java.util.List;
@@ -165,10 +166,10 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
JavaMappedReference ref = new JavaMappedReference();
- ref.setName("reference");
+ ref.setUri(URI.create("#reference"));
type.add(ref);
JavaMappedReference ref2 = new JavaMappedReference();
- ref2.setName("reference2");
+ ref2.setUri(URI.create("#reference2"));
type.add(ref2);
JavaMappedProperty<?> prop1 = new JavaMappedProperty();
prop1.setName("string1");
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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -1,9 +1,11 @@
package org.apache.tuscany.core.implementation.system.builder;
+import java.net.URI;
+
+import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
-import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
@@ -48,7 +50,7 @@
impl.setImplementationClass(SystemComponentBuilderResourceTestCase.Foo.class);
impl.setComponentType(type);
ComponentDefinition<SystemImplementation> definition =
- new ComponentDefinition<SystemImplementation>("foo", impl);
+ new ComponentDefinition<SystemImplementation>(URI.create("foo"), impl);
InboundWire wire = EasyMock.createMock(InboundWire.class);
EasyMock.expect(wire.getTargetService()).andReturn("result");
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentTestCase.java Fri Feb 2 19:16:15 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.core.implementation.system.component;
+import java.net.URI;
+
import org.apache.tuscany.spi.wire.OutboundWire;
import junit.framework.TestCase;
@@ -43,7 +45,7 @@
PojoConfiguration configuration = new PojoConfiguration();
configuration.setInstanceFactory(factory);
configuration.setInitInvoker(initInvoker);
- configuration.setName("foo");
+ configuration.setName(new URI("foo"));
SystemAtomicComponentImpl component = new SystemAtomicComponentImpl(configuration);
Foo foo = (Foo) component.createInstance();
component.init(foo);
@@ -55,7 +57,7 @@
PojoConfiguration configuration = new PojoConfiguration();
configuration.setInstanceFactory(factory);
configuration.setDestroyInvoker(destroyInvoker);
- configuration.setName("foo");
+ configuration.setName(new URI("foo"));
SystemAtomicComponentImpl component = new SystemAtomicComponentImpl(configuration);
Foo foo = (Foo) component.createInstance();
component.destroy(foo);
@@ -71,13 +73,14 @@
configuration.addConstructorParamType(String.class);
configuration.addConstructorParamName("ref");
configuration.addConstructorParamType(Foo.class);
- configuration.setName("foo");
+ configuration.setName(new URI("foo"));
SystemAtomicComponentImpl component = new SystemAtomicComponentImpl(configuration);
component.addPropertyFactory("foo", new SingletonObjectFactory<String>("baz"));
Foo target = new Foo();
OutboundWire wire = EasyMock.createMock(OutboundWire.class);
EasyMock.expect(wire.getTargetService()).andReturn(target);
- EasyMock.expect(wire.getReferenceName()).andReturn("ref").anyTimes();
+ URI uri = URI.create("#ref");
+ EasyMock.expect(wire.getUri()).andReturn(uri).anyTimes();
EasyMock.replay(wire);
component.addOutboundWire(wire);
Bar bar = (Bar) component.createInstance();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemAtomicComponentWireInvocationTestCase.java Fri Feb 2 19:16:15 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.core.implementation.system.component;
+import java.net.URI;
+
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.wire.OutboundWire;
@@ -45,11 +47,12 @@
PojoConfiguration configuration = new PojoConfiguration();
configuration.addReferenceSite("setTarget", SourceImpl.class.getMethod("setTarget", Target.class));
configuration.setInstanceFactory(new PojoObjectFactory<SourceImpl>(SourceImpl.class.getConstructor()));
- configuration.setName("source");
+ configuration.setName(new URI("source"));
AtomicComponent component = new SystemAtomicComponentImpl(configuration);
component.setScopeContainer(scope);
OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
- EasyMock.expect(outboundWire.getReferenceName()).andReturn("setTarget").atLeastOnce();
+ URI uri = URI.create("#setTarget");
+ EasyMock.expect(outboundWire.getUri()).andReturn(uri).atLeastOnce();
EasyMock.expect(outboundWire.getTargetService()).andReturn(target);
EasyMock.replay(outboundWire);
component.addOutboundWire(outboundWire);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/AbstractConversationTestCase.java Fri Feb 2 19:16:15 2007
@@ -48,7 +48,7 @@
protected void createRuntime() {
workContext = new WorkContextImpl();
WirePostProcessorRegistry processorRegistry = new WirePostProcessorRegistryImpl();
- connector = new ConnectorImpl(null, processorRegistry, null, workContext);
+ connector = new ConnectorImpl(null, processorRegistry, null, null, workContext);
store = new MemoryStore(EasyMock.createNiceMock(StoreMonitor.class));
container = new ConversationalScopeContainer(store, workContext, null);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationIdleExpireTestCase.java Fri Feb 2 19:16:15 2007
@@ -20,6 +20,7 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
+import java.net.URI;
import org.osoa.sca.annotations.EndConversation;
import org.osoa.sca.annotations.Scope;
@@ -108,7 +109,7 @@
private JavaAtomicComponent createMaxIdleTimeAtomicComponent() throws Exception {
PojoConfiguration configuration = new PojoConfiguration();
- configuration.setName("target");
+ configuration.setName(new URI("target"));
configuration.setMaxIdleTime(50);
configuration.setInstanceFactory(new MockPojoFactory(Object.class.getConstructor()));
JavaAtomicComponent component = new JavaAtomicComponent(configuration);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationMaxAgeExpireTestCase.java Fri Feb 2 19:16:15 2007
@@ -20,6 +20,7 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
+import java.net.URI;
import org.osoa.sca.annotations.EndConversation;
import org.osoa.sca.annotations.Scope;
@@ -108,7 +109,7 @@
private JavaAtomicComponent createMaxIdleTimeAtomicComponent() throws Exception {
PojoConfiguration configuration = new PojoConfiguration();
- configuration.setName("target");
+ configuration.setName(new URI("target"));
configuration.setMaxAge(50);
Constructor<Object> ctor = Object.class.getConstructor();
configuration.setInstanceFactory(new ConversationMaxAgeExpireTestCase.MockPojoFactory(ctor));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/conversation/ConversationStartStopEndTestCase.java Fri Feb 2 19:16:15 2007
@@ -20,6 +20,7 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
+import java.net.URI;
import org.osoa.sca.annotations.EndConversation;
import org.osoa.sca.annotations.Scope;
@@ -109,7 +110,7 @@
private JavaAtomicComponent createAtomicComponent() throws Exception {
PojoConfiguration configuration = new PojoConfiguration();
- configuration.setName("target");
+ configuration.setName(new URI("target"));
configuration.setInstanceFactory(new MockPojoFactory(Object.class.getConstructor()));
JavaAtomicComponent component = new JavaAtomicComponent(configuration);
component.setScopeContainer(container);
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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.core.integration.implementation.system.builder;
+import java.net.URI;
+
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -60,6 +62,7 @@
impl.setComponentType(type);
impl.setImplementationClass(Foo.class);
ComponentDefinition<SystemImplementation> definition = new ComponentDefinition<SystemImplementation>(impl);
+ definition.setName(URI.create("component"));
AtomicComponent component = builder.build(parent, definition, deploymentContext);
Foo foo = (Foo) component.createInstance();
assertEquals("foo", foo.getTest());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/mock/MockFactory.java Fri Feb 2 19:16:15 2007
@@ -19,6 +19,8 @@
package org.apache.tuscany.core.integration.mock;
import java.lang.reflect.Member;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -124,7 +126,7 @@
configuration.addReferenceSite(entry.getKey(), entry.getValue());
}
configuration.setWorkContext(new WorkContextImpl());
- configuration.setName(sourceName);
+ configuration.setName(new URI(sourceName));
JavaAtomicComponent sourceComponent = new JavaAtomicComponent(configuration);
sourceComponent.setScopeContainer(sourceScope);
OutboundWire outboundWire = createOutboundWire(targetName, sourceReferenceClass, sourceHeadInterceptor);
@@ -177,7 +179,7 @@
configuration.addReferenceSite(entry.getKey(), entry.getValue());
}
configuration.setWorkContext(new WorkContextImpl());
- configuration.setName(sourceName);
+ configuration.setName(new URI(sourceName));
JavaAtomicComponent sourceComponent = new JavaAtomicComponent(configuration);
sourceComponent.setScopeContainer(sourceScope);
@@ -206,7 +208,7 @@
InboundWire wire = new InboundWireImpl();
ServiceContract<?> contract = REGISTRY.introspect(interfaze);
wire.setServiceContract(contract);
- wire.setServiceName(serviceName);
+ wire.setUri(URI.create("#" + serviceName));
wire.addInvocationChains(createInboundChains(interfaze, interceptor));
return wire;
}
@@ -220,7 +222,7 @@
throws InvalidServiceContractException {
OutboundWire wire = new OutboundWireImpl();
- wire.setReferenceName(refName);
+ wire.setUri(URI.create("#" + refName));
Map<Operation<?>, OutboundInvocationChain> outboundChains = createOutboundChains(interfaze, interceptor);
wire.addInvocationChains(outboundChains);
ServiceContract<?> contract = REGISTRY.introspect(interfaze);
@@ -231,12 +233,12 @@
@SuppressWarnings("unchecked")
private static <T> JavaAtomicComponent createJavaComponent(String name, ScopeContainer scope, Class<T> clazz)
- throws NoSuchMethodException {
+ throws NoSuchMethodException, URISyntaxException {
PojoConfiguration configuration = new PojoConfiguration();
configuration.setInstanceFactory(new PojoObjectFactory(clazz.getConstructor()));
configuration.setWireService(WIRE_SERVICE);
configuration.setWorkContext(new WorkContextImpl());
- configuration.setName(name);
+ configuration.setName(new URI(name));
JavaAtomicComponent component = new JavaAtomicComponent(configuration);
component.setScopeContainer(scope);
return component;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/scope/ScopeReferenceTestCase.java Fri Feb 2 19:16:15 2007
@@ -35,8 +35,8 @@
import junit.framework.TestCase;
import org.apache.tuscany.core.component.WorkContextImpl;
-import org.apache.tuscany.core.component.event.CompositeStart;
-import org.apache.tuscany.core.component.event.CompositeStop;
+import org.apache.tuscany.core.component.event.ComponentStart;
+import org.apache.tuscany.core.component.event.ComponentStop;
import org.apache.tuscany.core.component.event.HttpSessionEnd;
import org.apache.tuscany.core.component.event.HttpSessionStart;
import org.apache.tuscany.core.component.event.RequestEnd;
@@ -70,7 +70,7 @@
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
scope, members, "target", Target.class, TargetImpl.class, scope);
- scope.onEvent(new CompositeStart(this, null));
+ scope.onEvent(new ComponentStart(this, null));
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
Source source = (Source) sourceComponent.getTargetInstance();
@@ -80,7 +80,7 @@
target.setString("foo");
assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
assertEquals("foo", source.getTarget().getString());
- scope.onEvent(new CompositeStop(this, null));
+ scope.onEvent(new ComponentStop(this, null));
scope.stop();
}
@@ -96,7 +96,7 @@
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
compositeScope, members, "target", Target.class, TargetImpl.class, sessionScope);
- compositeScope.onEvent(new CompositeStart(this, null));
+ compositeScope.onEvent(new ComponentStart(this, null));
Object session1 = new Object();
ctx.setIdentifier(Scope.SESSION, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
@@ -127,7 +127,7 @@
sessionScope.onEvent(new HttpSessionEnd(this, session2));
ctx.clearIdentifier(Scope.SESSION);
- compositeScope.onEvent(new CompositeStop(this, null));
+ compositeScope.onEvent(new ComponentStop(this, null));
sessionScope.stop();
compositeScope.stop();
}
@@ -144,7 +144,7 @@
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
compositeScope, members, "target", Target.class, TargetImpl.class, requestScope);
- compositeScope.onEvent(new CompositeStart(this, null));
+ compositeScope.onEvent(new ComponentStart(this, null));
requestScope.onEvent(new RequestStart(this));
AtomicComponent sourceComponent = contexts.get("source");
@@ -180,7 +180,7 @@
future.get();
assertEquals("foo", source.getTarget().getString());
requestScope.onEvent(new RequestEnd(this));
- compositeScope.onEvent(new CompositeStop(this, null));
+ compositeScope.onEvent(new ComponentStop(this, null));
requestScope.stop();
compositeScope.stop();
}
@@ -197,7 +197,7 @@
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
compositeScope, members, "target", Target.class, TargetImpl.class, statelessScope);
- compositeScope.onEvent(new CompositeStart(this, null));
+ compositeScope.onEvent(new ComponentStart(this, null));
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
@@ -212,7 +212,7 @@
assertFalse("foo".equals(target2.getString()));
source.getTarget().setString("bar");
assertFalse("bar".equals(source.getTarget().getString()));
- compositeScope.onEvent(new CompositeStop(this, null));
+ compositeScope.onEvent(new ComponentStop(this, null));
compositeScope.stop();
statelessScope.stop();
}
@@ -276,7 +276,7 @@
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
sessionScope, members, "target", Target.class, TargetImpl.class, compositeScope);
- compositeScope.onEvent(new CompositeStart(this, null));
+ compositeScope.onEvent(new ComponentStart(this, null));
Object session1 = new Object();
ctx.setIdentifier(Scope.SESSION, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
@@ -462,7 +462,7 @@
final ScopeContainer compositeScope = new CompositeScopeContainer(null);
requestScope.start();
compositeScope.start();
- compositeScope.onEvent(new CompositeStart(this, null));
+ compositeScope.onEvent(new ComponentStart(this, null));
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
requestScope, members, "target", Target.class, TargetImpl.class, compositeScope);
@@ -505,7 +505,7 @@
requestScope.onEvent(new RequestEnd(this));
requestScope.stop();
- compositeScope.onEvent(new CompositeStop(this, null));
+ compositeScope.onEvent(new ComponentStop(this, null));
compositeScope.stop();
}
@@ -736,7 +736,7 @@
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
statelessScope, members, "target", Target.class, TargetImpl.class, compositeScope);
- compositeScope.onEvent(new CompositeStart(this, null));
+ compositeScope.onEvent(new ComponentStart(this, null));
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
Source source = (Source) sourceComponent.getTargetInstance();
@@ -760,7 +760,7 @@
assertEquals("bar", target2.getString());
assertEquals("bar", source.getTarget().getString());
- compositeScope.onEvent(new CompositeStop(this, null));
+ compositeScope.onEvent(new ComponentStop(this, null));
compositeScope.stop();
statelessScope.stop();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java Fri Feb 2 19:16:15 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.core.loader;
+import java.net.URI;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
@@ -47,32 +48,38 @@
private XMLStreamReader reader;
private ServiceDefinition service;
private ReferenceDefinition reference;
+ private CompositeComponent parent;
public void testNoServiceBinding() throws Exception {
- loader.load(null, null, reader, null);
+ loader.load(parent, null, reader, null);
assert service.getBindings().isEmpty();
}
public void testNoReferenceBinding() throws Exception {
- loader.load(null, null, reader, null);
+ loader.load(parent, null, reader, null);
assert reference.getBindings().isEmpty();
}
protected void setUp() throws Exception {
super.setUp();
+ parent = EasyMock.createMock(CompositeComponent.class);
+ EasyMock.expect(parent.getUri()).andReturn(URI.create("parent"));
+ EasyMock.replay(parent);
service = new ServiceDefinition();
+ service.setUri(URI.create("service"));
reference = new ReferenceDefinition();
+ reference.setUri(URI.create("#ref"));
PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
type.add(service);
type.add(reference);
JavaImplementation impl = new JavaImplementation(null, type);
LoaderRegistry registry = EasyMock.createMock(LoaderRegistry.class);
- EasyMock.expect(registry.load((CompositeComponent) EasyMock.isNull(),
+ EasyMock.expect(registry.load(EasyMock.isA(CompositeComponent.class),
(ModelObject) EasyMock.isNull(),
EasyMock.isA(XMLStreamReader.class),
(DeploymentContext) EasyMock.isNull())).andReturn(impl);
- registry.loadComponentType((CompositeComponent) EasyMock.isNull(),
+ registry.loadComponentType(EasyMock.isA(CompositeComponent.class),
EasyMock.isA(Implementation.class),
(DeploymentContext) EasyMock.isNull());
EasyMock.replay(registry);
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java (from r501329, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderReferenceTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java?view=diff&rev=502853&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderReferenceTestCase.java&r1=501329&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java Fri Feb 2 19:16:15 2007
@@ -1,5 +1,6 @@
package org.apache.tuscany.core.loader;
+import java.net.URI;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
@@ -27,19 +28,20 @@
/**
* @version $Rev$ $Date$
*/
-public class ComponentLoaderReferenceTestCase extends TestCase {
+public class ComponentLoaderNoReferenceTestCase extends TestCase {
private static final QName COMPONENT = new QName(XML_NAMESPACE_1_0, "component");
private static final QName REFERENCE = new QName(XML_NAMESPACE_1_0, "reference");
private static final String NAME = "testComponent";
private ComponentLoader loader;
private XMLStreamReader reader;
+ private CompositeComponent parent;
/**
* Verifies an error is thrown when an attempt to configure a non-existent reference in SCDL is made
*/
public void testNoReferenceOnComponentType() throws LoaderException, XMLStreamException {
try {
- loader.load(null, null, reader, null);
+ loader.load(parent, null, reader, null);
fail();
} catch (UndefinedReferenceException e) {
// expected
@@ -69,16 +71,18 @@
EasyMock.expect(reader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.replay(reader);
LoaderRegistry mockRegistry = EasyMock.createMock(LoaderRegistry.class);
- mockRegistry.loadComponentType((CompositeComponent) isNull(),
+ mockRegistry.loadComponentType(EasyMock.isA(CompositeComponent.class),
EasyMock.isA(Implementation.class),
(DeploymentContext) isNull());
- EasyMock.expect(mockRegistry.load((CompositeComponent) isNull(),
+ EasyMock.expect(mockRegistry.load(EasyMock.isA(CompositeComponent.class),
(ModelObject) isNull(),
EasyMock.isA(XMLStreamReader.class),
(DeploymentContext) isNull())).andReturn(impl);
EasyMock.replay(mockRegistry);
loader = new ComponentLoader(mockRegistry, null);
-
+ parent = EasyMock.createMock(CompositeComponent.class);
+ EasyMock.expect(parent.getUri()).andReturn(URI.create("foo"));
+ EasyMock.replay(parent);
}
}
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoReferenceTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderRefTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderRefTestCase.java?view=auto&rev=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderRefTestCase.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderRefTestCase.java Fri Feb 2 19:16:15 2007
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.core.loader;
+
+import java.net.URI;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.spi.component.CompositeComponent;
+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.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.Property;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
+import org.apache.tuscany.spi.model.ReferenceTarget;
+import org.apache.tuscany.spi.model.ServiceDefinition;
+
+import junit.framework.TestCase;
+import org.apache.tuscany.core.implementation.java.JavaImplementation;
+import org.easymock.EasyMock;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ComponentLoaderRefTestCase extends TestCase {
+ private ComponentLoader loader;
+
+ public void testLoadReferenceNoFragment() throws LoaderException, XMLStreamException {
+ PojoComponentType<?, MockReferenceDefinition, Property<?>> type =
+ new PojoComponentType<ServiceDefinition, MockReferenceDefinition, Property<?>>();
+ MockReferenceDefinition reference = new MockReferenceDefinition();
+ reference.setUri(URI.create("#reference"));
+ type.add(reference);
+ JavaImplementation impl = new JavaImplementation();
+ impl.setComponentType(type);
+ ComponentDefinition<?> definition = new ComponentDefinition<JavaImplementation>(impl);
+ XMLStreamReader reader = EasyMock.createMock(XMLStreamReader.class);
+ EasyMock.expect(reader.getAttributeValue(null, "name")).andReturn("reference");
+ EasyMock.expect(reader.getElementText()).andReturn("target");
+ EasyMock.replay(reader);
+ loader.loadReference(reader, null, definition);
+ ReferenceTarget target = definition.getReferenceTargets().get("reference");
+ assertEquals(1, target.getTargets().size());
+ URI uri = target.getTargets().get(0);
+ assertEquals("target", uri.getPath());
+ assertNull(uri.getFragment());
+ EasyMock.verify(reader);
+ }
+
+ public void testLoadReferenceWithFragment() throws LoaderException, XMLStreamException {
+ PojoComponentType<?, MockReferenceDefinition, Property<?>> type =
+ new PojoComponentType<ServiceDefinition, MockReferenceDefinition, Property<?>>();
+ MockReferenceDefinition reference = new MockReferenceDefinition();
+ reference.setUri(URI.create("#reference"));
+ type.add(reference);
+ JavaImplementation impl = new JavaImplementation();
+ impl.setComponentType(type);
+ ComponentDefinition<?> definition = new ComponentDefinition<JavaImplementation>(impl);
+ XMLStreamReader reader = EasyMock.createMock(XMLStreamReader.class);
+ EasyMock.expect(reader.getAttributeValue(null, "name")).andReturn("reference");
+ EasyMock.expect(reader.getElementText()).andReturn("target#fragment");
+ EasyMock.replay(reader);
+ loader.loadReference(reader, null, definition);
+ ReferenceTarget target = definition.getReferenceTargets().get("reference");
+ assertEquals(1, target.getTargets().size());
+ URI uri = target.getTargets().get(0);
+ assertEquals("target", uri.getPath());
+ assertEquals("fragment", uri.getFragment());
+ EasyMock.verify(reader);
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ LoaderRegistry mockRegistry = EasyMock.createMock(LoaderRegistry.class);
+ loader = new ComponentLoader(mockRegistry, null);
+ CompositeComponent parent = EasyMock.createNiceMock(CompositeComponent.class);
+ URI uri = URI.create("foo");
+ EasyMock.expect(parent.getUri()).andReturn(uri).atLeastOnce();
+ EasyMock.replay(parent);
+ }
+
+ private class MockReferenceDefinition extends ReferenceDefinition {
+
+ }
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderRefTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderRefTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.core.loader;
+import java.net.URI;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
@@ -54,12 +55,14 @@
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 String FULL_NAME = "foo/testComponent";
private JavaImplementation impl;
private XMLStreamReader mockReader;
private LoaderRegistry mockRegistry;
private PropertyObjectFactory mockPropertyFactory;
private ComponentLoader loader;
+ private CompositeComponent parent;
public void testEmptyComponent() throws LoaderException, XMLStreamException {
EasyMock.expect(mockReader.getName()).andReturn(COMPONENT).atLeastOnce();
@@ -89,10 +92,9 @@
EasyMock.eq(mockReader),
EasyMock.isA(DeploymentContext.class))).andReturn(impl);
EasyMock.replay(mockRegistry);
- ComponentDefinition component = loader.load(EasyMock.createNiceMock(CompositeComponent.class),
- null, mockReader,
- EasyMock.createNiceMock(DeploymentContext.class));
- assertEquals(NAME, component.getName());
+ DeploymentContext ctx = EasyMock.createNiceMock(DeploymentContext.class);
+ ComponentDefinition component = loader.load(parent, null, mockReader, ctx);
+ assertEquals(FULL_NAME, component.getName().toString());
assertNull(component.getInitLevel());
}
@@ -123,10 +125,9 @@
EasyMock.eq(mockReader),
EasyMock.isA(DeploymentContext.class))).andReturn(impl);
EasyMock.replay(mockRegistry);
- ComponentDefinition component = loader.load(EasyMock.createNiceMock(CompositeComponent.class),
- null, mockReader,
- EasyMock.createNiceMock(DeploymentContext.class));
- assertEquals(NAME, component.getName());
+ DeploymentContext ctx = EasyMock.createNiceMock(DeploymentContext.class);
+ ComponentDefinition component = loader.load(parent, null, mockReader, ctx);
+ assertEquals(FULL_NAME, component.getName().toString());
assertEquals(Integer.valueOf(20), component.getInitLevel());
}
@@ -172,9 +173,8 @@
EasyMock.isA(DeploymentContext.class))).andReturn(impl);
EasyMock.replay(mockRegistry);
try {
- loader.load(EasyMock.createNiceMock(CompositeComponent.class),
- null, mockReader,
- EasyMock.createNiceMock(DeploymentContext.class));
+ DeploymentContext ctx = EasyMock.createNiceMock(DeploymentContext.class);
+ loader.load(parent, null, mockReader, ctx);
fail();
} catch (UnrecognizedElementException e) {
// expected
@@ -188,5 +188,9 @@
mockRegistry = EasyMock.createMock(LoaderRegistry.class);
mockPropertyFactory = EasyMock.createMock(PropertyObjectFactory.class);
loader = new ComponentLoader(mockRegistry, mockPropertyFactory);
+ parent = EasyMock.createNiceMock(CompositeComponent.class);
+ URI uri = URI.create("foo");
+ EasyMock.expect(parent.getUri()).andReturn(uri).atLeastOnce();
+ EasyMock.replay(parent);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderValidationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderValidationTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderValidationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderValidationTestCase.java Fri Feb 2 19:16:15 2007
@@ -33,12 +33,12 @@
PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
ReferenceDefinition refDefinition = new ReferenceDefinition();
- refDefinition.setName("name");
+ refDefinition.setUri(URI.create("#name"));
type.add(refDefinition);
JavaImplementation impl = new JavaImplementation(null, type);
ComponentDefinition<Implementation<?>> defn = new ComponentDefinition<Implementation<?>>(impl);
ReferenceTarget target = new ReferenceTarget();
- target.setReferenceName("name");
+ target.setReferenceName(URI.create("#name"));
defn.add(target);
loader.validate(defn);
}
@@ -47,7 +47,7 @@
PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
ReferenceDefinition refDefinition = new ReferenceDefinition();
- refDefinition.setName("name");
+ refDefinition.setUri(URI.create("#name"));
refDefinition.setRequired(true);
type.add(refDefinition);
JavaImplementation impl = new JavaImplementation(null, type);
@@ -64,7 +64,7 @@
PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
ReferenceDefinition refDefinition = new ReferenceDefinition();
- refDefinition.setName("name");
+ refDefinition.setUri(URI.create("#name"));
refDefinition.setRequired(false);
type.add(refDefinition);
JavaImplementation impl = new JavaImplementation(null, type);
@@ -76,14 +76,15 @@
PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
ReferenceDefinition refDefinition = new ReferenceDefinition();
- refDefinition.setName("r1");
+ URI uri = URI.create("#r1");
+ refDefinition.setUri(uri);
refDefinition.setRequired(true);
refDefinition.setMultiplicity(Multiplicity.ONE_N);
type.add(refDefinition);
JavaImplementation impl = new JavaImplementation(null, type);
ComponentDefinition<Implementation<?>> defn = new ComponentDefinition<Implementation<?>>(impl);
ReferenceTarget target = new ReferenceTarget();
- target.setReferenceName("r1");
+ target.setReferenceName(uri);
target.addTarget(URI.create("c1"));
target.addTarget(URI.create("c2"));
defn.add(target);
@@ -133,7 +134,7 @@
PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
ReferenceDefinition refDefinition = new ReferenceDefinition();
- refDefinition.setName("name");
+ refDefinition.setUri(URI.create("#name"));
refDefinition.setAutowire(true);
type.add(refDefinition);
JavaImplementation impl = new JavaImplementation(null, type);
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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.core.loader;
+import java.net.URI;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
@@ -25,6 +26,7 @@
import org.osoa.sca.Version;
+import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -46,11 +48,12 @@
*/
public class ReferenceLoaderTestCase extends TestCase {
private static final QName REFERENCE = new QName(Version.XML_NAMESPACE_1_0, "reference");
-
+ private static final String PARENT_NAME = "parent";
private ReferenceLoader loader;
private DeploymentContext deploymentContext;
private XMLStreamReader mockReader;
private LoaderRegistry mockRegistry;
+ private CompositeComponent parent;
public void testWithNoInterface() throws LoaderException, XMLStreamException {
String name = "referenceDefinition";
@@ -60,9 +63,9 @@
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.expect(mockReader.getName()).andReturn(REFERENCE).anyTimes();
EasyMock.replay(mockReader);
- ReferenceDefinition referenceDefinition = loader.load(null, null, mockReader, null);
+ ReferenceDefinition referenceDefinition = loader.load(parent, null, mockReader, null);
assertNotNull(referenceDefinition);
- assertEquals(name, referenceDefinition.getName());
+ assertEquals(PARENT_NAME + "#" + name, referenceDefinition.getUri().toString());
}
public void testComponentTypeService() throws LoaderException, XMLStreamException {
@@ -75,7 +78,7 @@
EasyMock.replay(mockReader);
ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
new ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
- ReferenceDefinition referenceDefinition = loader.load(null, type, mockReader, null);
+ ReferenceDefinition referenceDefinition = loader.load(parent, type, mockReader, null);
assertTrue(ReferenceDefinition.class.equals(referenceDefinition.getClass()));
}
@@ -91,10 +94,10 @@
BindingDefinition binding = new BindingDefinition() {
};
- EasyMock.expect(mockRegistry.load(null, null, mockReader, null)).andReturn(binding).times(2);
+ EasyMock.expect(mockRegistry.load(parent, null, mockReader, null)).andReturn(binding).times(2);
EasyMock.replay(mockRegistry);
- ReferenceDefinition referenceDefinition = loader.load(null, null, mockReader, null);
+ ReferenceDefinition referenceDefinition = loader.load(parent, null, mockReader, null);
assertEquals(2, referenceDefinition.getBindings().size());
}
@@ -106,15 +109,15 @@
EasyMock.expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
EasyMock.expect(mockReader.getAttributeValue(null, "multiplicity")).andReturn("0..1");
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.START_ELEMENT);
- EasyMock.expect(mockRegistry.load(null, null, mockReader, deploymentContext)).andReturn(sc);
+ EasyMock.expect(mockRegistry.load(parent, null, mockReader, deploymentContext)).andReturn(sc);
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.replay(mockReader);
EasyMock.replay(mockRegistry);
- ReferenceDefinition referenceDefinition = loader.load(null, null, mockReader, deploymentContext);
+ ReferenceDefinition referenceDefinition = loader.load(parent, null, mockReader, deploymentContext);
assertNotNull(referenceDefinition);
- assertEquals(name, referenceDefinition.getName());
+ assertEquals(PARENT_NAME + "#" + name, referenceDefinition.getUri().toString());
assertSame(sc, referenceDefinition.getServiceContract());
}
@@ -124,5 +127,8 @@
mockRegistry = EasyMock.createMock(LoaderRegistry.class);
loader = new ReferenceLoader(mockRegistry);
deploymentContext = new RootDeploymentContext(null, null, null, null);
+ parent = EasyMock.createMock(CompositeComponent.class);
+ EasyMock.expect(parent.getUri()).andReturn(URI.create(PARENT_NAME));
+ EasyMock.replay(parent);
}
}
Added: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java?view=auto&rev=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java Fri Feb 2 19:16:15 2007
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.core.loader;
+
+import java.net.URI;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.osoa.sca.Version;
+
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.loader.LoaderException;
+import org.apache.tuscany.spi.loader.LoaderRegistry;
+import org.apache.tuscany.spi.model.ServiceDefinition;
+
+import junit.framework.TestCase;
+import org.easymock.EasyMock;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ServiceLoaderReferenceTestCase extends TestCase {
+ private static final QName SERVICE = new QName(Version.XML_NAMESPACE_1_0, "service");
+ private static final QName REFERENCE = new QName(Version.XML_NAMESPACE_1_0, "reference");
+ private static final String PARENT_NAME = "parent";
+ private ServiceLoader loader;
+ private XMLStreamReader mockReader;
+ private CompositeComponent parent;
+
+ public void testReferenceNoFragment() throws LoaderException, XMLStreamException {
+ String name = "serviceDefinition";
+ EasyMock.expect(mockReader.getName()).andReturn(SERVICE);
+ EasyMock.expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
+ EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.START_ELEMENT);
+ EasyMock.expect(mockReader.getName()).andReturn(REFERENCE);
+ EasyMock.expect(mockReader.getElementText()).andReturn("target");
+ EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
+ EasyMock.expect(mockReader.getName()).andReturn(SERVICE);
+ EasyMock.replay(mockReader);
+ ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, null);
+ assertNotNull(serviceDefinition);
+ assertEquals("target", serviceDefinition.getTarget().getPath());
+ assertNull(serviceDefinition.getTarget().getFragment());
+ }
+
+ public void testReferenceWithFragment() throws LoaderException, XMLStreamException {
+ String name = "serviceDefinition";
+ EasyMock.expect(mockReader.getName()).andReturn(SERVICE);
+ EasyMock.expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
+ EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.START_ELEMENT);
+ EasyMock.expect(mockReader.getName()).andReturn(REFERENCE);
+ EasyMock.expect(mockReader.getElementText()).andReturn("target#fragment");
+ EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
+ EasyMock.expect(mockReader.getName()).andReturn(SERVICE);
+ EasyMock.replay(mockReader);
+ ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, null);
+ assertNotNull(serviceDefinition);
+ assertEquals("target", serviceDefinition.getTarget().getPath());
+ assertEquals("fragment", serviceDefinition.getTarget().getFragment());
+ }
+
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ mockReader = EasyMock.createStrictMock(XMLStreamReader.class);
+ LoaderRegistry mockRegistry = EasyMock.createMock(LoaderRegistry.class);
+ loader = new ServiceLoader(mockRegistry);
+ parent = EasyMock.createMock(CompositeComponent.class);
+ URI uri = URI.create(PARENT_NAME);
+ EasyMock.expect(parent.getUri()).andReturn(uri);
+ EasyMock.replay(parent);
+ }
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java Fri Feb 2 19:16:15 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.core.loader;
+import java.net.URI;
import javax.xml.namespace.QName;
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
@@ -26,6 +27,7 @@
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.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -52,11 +54,12 @@
private static final QName BINDING = new QName(XML_NAMESPACE_1_0, "binding.foo");
private static final QName REFERENCE = new QName(XML_NAMESPACE_1_0, "reference");
private static final QName INTERFACE_JAVA = new QName(XML_NAMESPACE_1_0, "interface.java");
-
+ private static final String PARENT_NAME = "parent";
private ServiceLoader loader;
private DeploymentContext deploymentContext;
private XMLStreamReader mockReader;
private LoaderRegistry mockRegistry;
+ private CompositeComponent parent;
public void testWithNoInterface() throws LoaderException, XMLStreamException {
String name = "serviceDefinition";
@@ -65,9 +68,9 @@
expect(mockReader.next()).andReturn(END_ELEMENT);
expect(mockReader.getName()).andReturn(SERVICE).anyTimes();
replay(mockReader);
- ServiceDefinition serviceDefinition = loader.load(null, null, mockReader, null);
+ ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, null);
assertNotNull(serviceDefinition);
- assertEquals(name, serviceDefinition.getName());
+ assertEquals(PARENT_NAME + "#" + name, serviceDefinition.getUri().toString());
}
public void testComponentTypeService() throws LoaderException, XMLStreamException {
@@ -79,7 +82,7 @@
replay(mockReader);
ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
new ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
- ServiceDefinition serviceDefinition = loader.load(null, type, mockReader, null);
+ ServiceDefinition serviceDefinition = loader.load(parent, type, mockReader, null);
assertTrue(ServiceDefinition.class.equals(serviceDefinition.getClass()));
}
@@ -97,10 +100,10 @@
BindingDefinition binding = new BindingDefinition() {
};
- expect(mockRegistry.load(null, null, mockReader, null)).andReturn(binding).times(2);
+ expect(mockRegistry.load(parent, null, mockReader, null)).andReturn(binding).times(2);
replay(mockRegistry);
- ServiceDefinition serviceDefinition = loader.load(null, null, mockReader, null);
+ ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, null);
assertEquals(2, serviceDefinition.getBindings().size());
}
@@ -113,7 +116,7 @@
expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
expect(mockReader.next()).andReturn(START_ELEMENT);
expect(mockReader.getName()).andReturn(INTERFACE_JAVA);
- expect(mockRegistry.load(null, null, mockReader, deploymentContext)).andReturn(sc);
+ expect(mockRegistry.load(parent, null, mockReader, deploymentContext)).andReturn(sc);
expect(mockReader.next()).andReturn(START_ELEMENT);
expect(mockReader.getName()).andReturn(REFERENCE);
expect(mockReader.getElementText()).andReturn(target);
@@ -125,9 +128,9 @@
replay(mockReader);
replay(mockRegistry);
- ServiceDefinition serviceDefinition = loader.load(null, null, mockReader, deploymentContext);
+ ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, deploymentContext);
assertNotNull(serviceDefinition);
- assertEquals(name, serviceDefinition.getName());
+ assertEquals(PARENT_NAME + "#" + name, serviceDefinition.getUri().toString());
assertSame(sc, serviceDefinition.getServiceContract());
}
@@ -139,16 +142,16 @@
expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
expect(mockReader.next()).andReturn(START_ELEMENT);
expect(mockReader.getName()).andReturn(INTERFACE_JAVA);
- expect(mockRegistry.load(null, null, mockReader, deploymentContext)).andReturn(sc);
+ expect(mockRegistry.load(parent, null, mockReader, deploymentContext)).andReturn(sc);
expect(mockReader.next()).andReturn(END_ELEMENT);
expect(mockReader.getName()).andReturn(SERVICE);
replay(mockReader);
replay(mockRegistry);
- ServiceDefinition serviceDefinition = loader.load(null, null, mockReader, deploymentContext);
+ ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, deploymentContext);
assertNotNull(serviceDefinition);
- assertEquals(name, serviceDefinition.getName());
+ assertEquals(PARENT_NAME + "#" + name, serviceDefinition.getUri().toString());
assertSame(sc, serviceDefinition.getServiceContract());
}
@@ -158,5 +161,9 @@
mockRegistry = EasyMock.createMock(LoaderRegistry.class);
loader = new ServiceLoader(mockRegistry);
deploymentContext = new RootDeploymentContext(null, null, null, null);
+ parent = EasyMock.createMock(CompositeComponent.class);
+ URI uri = URI.create(PARENT_NAME);
+ EasyMock.expect(parent.getUri()).andReturn(uri);
+ EasyMock.replay(parent);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java Fri Feb 2 19:16:15 2007
@@ -18,22 +18,14 @@
*/
package org.apache.tuscany.core.loader;
+import javax.xml.namespace.QName;
+import javax.xml.stream.Location;
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import org.easymock.EasyMock;
-
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
-
-import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.Location;
-import junit.framework.TestCase;
+import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -42,6 +34,13 @@
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.model.WireDefinition;
+import junit.framework.TestCase;
+import org.easymock.EasyMock;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+
/**
* @version $Rev: 471504 $ $Date: 2006-11-06 01:10:40 +0530 (Mon, 06 Nov 2006) $
*/
@@ -145,6 +144,27 @@
verify(registry, reader, context);
}
+ public void testWireSourceAndTargetFragments() throws LoaderException, XMLStreamException {
+ expect(reader.getName()).andReturn(WIRE);
+ expect(reader.next()).andReturn(START_ELEMENT);
+ expect(reader.getName()).andReturn(SOURCE_URI).times(1);
+ expect(reader.getElementText()).andReturn("source/reference").times(1);
+ expect(reader.next()).andReturn(END_ELEMENT);
+ expect(reader.next()).andReturn(START_ELEMENT);
+ expect(reader.getName()).andReturn(TARGET_URI).times(2);
+ expect(reader.getElementText()).andReturn("target/service").times(1);
+ expect(reader.next()).andReturn(END_ELEMENT);
+ expect(reader.next()).andReturn(END_ELEMENT);
+ expect(reader.getName()).andReturn(WIRE).anyTimes();
+ replay(registry, reader, context);
+ WireDefinition wireDef = loader.load(composite, null, reader, context);
+ assertNotNull(wireDef);
+ assertEquals("source", wireDef.getSource().getPath());
+ assertEquals("reference", wireDef.getSource().getFragment());
+ assertEquals("target", wireDef.getTarget().getPath());
+ assertEquals("service", wireDef.getTarget().getFragment());
+ }
+
protected void setUp() throws Exception {
super.setUp();
registry = createMock(LoaderRegistry.class);
@@ -156,4 +176,6 @@
composite = createMock(CompositeComponent.class);
loader = new WireLoader(registry);
}
+
+
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/binding/MockServiceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/binding/MockServiceBinding.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/binding/MockServiceBinding.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/mock/binding/MockServiceBinding.java Fri Feb 2 19:16:15 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.core.mock.binding;
+import java.net.URI;
import javax.xml.namespace.QName;
import org.apache.tuscany.spi.component.AbstractSCAObject;
@@ -40,8 +41,8 @@
private ServiceContract<?> bindingServiceContract;
- public MockServiceBinding() {
- super("foo", null);
+ public MockServiceBinding(URI uri) {
+ super(uri, null);
}
public QName getBindingType() {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStoreTestCase.java Fri Feb 2 19:16:15 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.core.services.store.memory;
+import java.net.URI;
import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -110,7 +111,8 @@
MemoryStore store = new MemoryStore(monitor);
store.setReaperInterval(10);
store.init();
- AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
+ AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
+ EasyMock.expect(component.getUri()).andReturn(URI.create("component"));
EasyMock.replay(component);
String id = UUID.randomUUID().toString();
Object value = new Object();
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=502853&r1=502852&r2=502853
==============================================================================
--- 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 Fri Feb 2 19:16:15 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.core.wire;
import java.lang.reflect.Method;
+import java.net.URI;
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.model.Operation;
@@ -56,6 +57,7 @@
OutboundWire wire = new OutboundWireImpl();
wire.addInvocationChain(operation, chain);
wire.setServiceContract(contract);
+ wire.setUri(URI.create("#wire"));
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(SimpleTarget.class, wire, null);
assertEquals("foo", handler.invoke(null, echo, new String[]{"foo"}));
assertEquals(1, interceptor.getCount());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java Fri Feb 2 19:16:15 2007
@@ -23,6 +23,7 @@
import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.Map;
+import java.net.URI;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
@@ -88,6 +89,7 @@
Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
chains.put(operation, createChain(checkedMethod, checkedOperation));
InboundWire wire = new InboundWireImpl();
+ wire.setUri(URI.create("#wire"));
wire.addInvocationChains(chains);
wire.setServiceContract(new ServiceContract<TestBean>(TestBean.class) {
});
@@ -112,6 +114,7 @@
Map<Operation<?>, InboundInvocationChain> chains = new HashMap<Operation<?>, InboundInvocationChain>();
chains.put(operation, createChain(runtimeMethod, runtimeOperation));
InboundWire wire = new InboundWireImpl();
+ wire.setUri(URI.create("#wire"));
wire.addInvocationChains(chains);
wire.setServiceContract(new ServiceContract<TestBean>(TestBean.class) {
});
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java Fri Feb 2 19:16:15 2007
@@ -20,6 +20,7 @@
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
+import java.net.URI;
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.model.Operation;
@@ -39,7 +40,6 @@
* @version $Rev$ $Date$
*/
public class OutboundInvocationErrorTestCase extends TestCase {
-
private Method checkedMethod;
private Method runtimeMethod;
private JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
@@ -64,6 +64,7 @@
OutboundWire wire = new OutboundWireImpl();
ServiceContract<?> contract = registry.introspect(TestBean.class);
wire.setServiceContract(contract);
+ wire.setUri(URI.create("#Wire"));
Operation operation = contract.getOperations().get("checkedException");
wire.addInvocationChain(operation, createChain(checkedMethod, operation));
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(TestBean.class, wire, null);
@@ -81,6 +82,7 @@
OutboundWire wire = new OutboundWireImpl();
ServiceContract<?> contract = registry.introspect(TestBean.class);
wire.setServiceContract(contract);
+ wire.setUri(URI.create("#Wire"));
Operation operation = contract.getOperations().get("runtimeException");
OutboundInvocationChain chain = createChain(runtimeMethod, operation);
wire.addInvocationChain(operation, chain);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java Fri Feb 2 19:16:15 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.core.wire;
import java.lang.reflect.Method;
+import java.net.URI;
import org.apache.tuscany.spi.idl.java.JavaIDLUtils;
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
@@ -49,15 +50,9 @@
super(arg0);
}
- public void setUp() throws Exception {
- super.setUp();
- JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
- contract = registry.introspect(SimpleTarget.class);
- hello = SimpleTarget.class.getMethod("hello", String.class);
- }
-
public void testBasicInvoke() throws Throwable {
OutboundWire wire = new OutboundWireImpl();
+ wire.setUri(URI.create("#wire"));
Operation operation = contract.getOperations().get("hello");
wire.addInvocationChain(operation, createChain(operation));
wire.setServiceContract(contract);
@@ -67,6 +62,7 @@
public void testErrorInvoke() throws Throwable {
OutboundWire wire = new OutboundWireImpl();
+ wire.setUri(URI.create("#wire"));
Operation operation = contract.getOperations().get("hello");
wire.addInvocationChain(operation, createChain(operation));
wire.setServiceContract(contract);
@@ -86,6 +82,7 @@
source.setTargetInvoker(invoker);
OutboundWire wire = new OutboundWireImpl();
+ wire.setUri(URI.create("#wire"));
wire.setServiceContract(contract);
wire.addInvocationChain(operation, source);
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(SimpleTarget.class, wire, null);
@@ -104,6 +101,7 @@
source.setTargetInvoker(invoker);
OutboundWire wire = new OutboundWireImpl();
+ wire.setUri(URI.create("#wire"));
wire.setServiceContract(contract);
wire.addInvocationChain(operation, source);
JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(SimpleTarget.class, wire, null);
@@ -129,4 +127,12 @@
source.setTargetInvoker(invoker);
return source;
}
+
+ public void setUp() throws Exception {
+ super.setUp();
+ JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
+ contract = registry.introspect(SimpleTarget.class);
+ hello = SimpleTarget.class.getMethod("hello", String.class);
+ }
+
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireServiceExtensionTestCase.java Fri Feb 2 19:16:15 2007
@@ -21,10 +21,10 @@
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.net.URI;
+import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import javax.xml.namespace.QName;
import org.apache.tuscany.spi.QualifiedName;
@@ -83,13 +83,14 @@
}
public void testCreateServiceWire() throws Exception {
- ServiceDefinition definition = new ServiceDefinition("foo", contract, false);
+ URI uri = URI.create("service#foo");
+ ServiceDefinition definition = new ServiceDefinition(uri, contract, false);
TargetInvoker invoker = EasyMock.createMock(TargetInvoker.class);
MessageImpl resp = new MessageImpl();
EasyMock.expect(invoker.invoke(EasyMock.isA(Message.class))).andReturn(resp);
EasyMock.replay(invoker);
InboundWire wire = wireService.createWire(definition);
- assertEquals("foo", wire.getServiceName());
+ assertEquals("service#foo", wire.getUri().toString());
assertEquals(1, wire.getInvocationChains().size());
assertEquals(contract, wire.getServiceContract());
InboundInvocationChain chain = wire.getInvocationChains().get(operation);
@@ -102,13 +103,13 @@
}
public void testCreateReferenceWire() throws Exception {
- ReferenceDefinition definition = new ReferenceDefinition("foo", contract);
+ ReferenceDefinition definition = new ReferenceDefinition(URI.create("foo"), contract);
ReferenceTarget target = new ReferenceTarget();
target.addTarget(new URI("bar"));
- target.setReferenceName("refName");
+ target.setReferenceName(URI.create("#refName"));
OutboundWire wire = wireService.createWire(target, definition).get(0);
- assertEquals("refName", wire.getReferenceName());
+ assertEquals("#refName", wire.getUri().toString());
assertEquals("bar", wire.getTargetName().toString());
assertFalse(wire.isAutowire());
assertEquals(1, wire.getInvocationChains().size());
@@ -133,35 +134,35 @@
}
public void testCreateAutowireReferenceWire() throws Exception {
- ReferenceDefinition definition = new ReferenceDefinition("foo", contract);
+ ReferenceDefinition definition = new ReferenceDefinition(URI.create("foo"), contract);
definition.setAutowire(true);
ReferenceTarget target = new ReferenceTarget();
- target.setReferenceName("refName");
+ target.setReferenceName(URI.create("#refName"));
OutboundWire wire = wireService.createWire(target, definition).get(0);
assertTrue(wire.isAutowire());
- assertEquals("refName", wire.getReferenceName());
+ assertEquals("#refName", wire.getUri().toString());
assertEquals(contract, wire.getServiceContract());
assertEquals(Callback.class, wire.getCallbackInterface());
}
-
+
public void testCreateReferenceMultipleWire() throws Exception {
- ReferenceDefinition definition = new ReferenceDefinition("foo", contract);
+ ReferenceDefinition definition = new ReferenceDefinition(URI.create("foo"), contract);
definition.setMultiplicity(Multiplicity.ONE_N);
ReferenceTarget target = new ReferenceTarget();
target.addTarget(new URI("bar"));
target.addTarget(new URI("bar2"));
- target.setReferenceName("refName");
+ target.setReferenceName(URI.create("refName"));
List<OutboundWire> wires = wireService.createWire(target, definition);
assertEquals(2, wires.size());
- }
+ }
public void testCreateComponentWires() throws Exception {
ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
new ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
- ReferenceDefinition referenceDefinition = new ReferenceDefinition("refName", contract);
+ ReferenceDefinition referenceDefinition = new ReferenceDefinition(URI.create("#.refName"), contract);
type.add(referenceDefinition);
- ServiceDefinition serviceDefinition = new ServiceDefinition("foo", contract, false);
+ ServiceDefinition serviceDefinition = new ServiceDefinition(URI.create("#foo"), contract, false);
type.add(serviceDefinition);
Implementation<ComponentType> impl = new Implementation<ComponentType>() {
@@ -169,10 +170,10 @@
impl.setComponentType(type);
ComponentDefinition<Implementation<ComponentType>> definition =
- new ComponentDefinition<Implementation<ComponentType>>("Foo", impl);
+ new ComponentDefinition<Implementation<ComponentType>>(URI.create("foo"), impl);
ReferenceTarget target = new ReferenceTarget();
target.addTarget(new URI("bar"));
- target.setReferenceName("refName");
+ target.setReferenceName(URI.create("#.refName"));
definition.add(target);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
@@ -185,7 +186,8 @@
}
public void testCreateReferenceBindingWire() throws Exception {
- ReferenceBinding binding = new MockReferenceBinding();
+ URI uri = new URI("foo");
+ ReferenceBinding binding = new MockReferenceBinding(uri);
QualifiedName qName = new QualifiedName("target");
wireService.createWires(binding, contract, qName);
@@ -193,6 +195,7 @@
InboundWire inboundWire = binding.getInboundWire();
assertEquals(1, inboundWire.getInvocationChains().size());
assertEquals(contract, inboundWire.getServiceContract());
+ assertEquals(uri, inboundWire.getUri());
assertEquals(binding, inboundWire.getContainer());
OutboundWire outboundWire = binding.getOutboundWire();
@@ -200,23 +203,25 @@
assertEquals(1, outboundWire.getInvocationChains().size());
assertEquals(contract, outboundWire.getServiceContract());
assertEquals(binding, outboundWire.getContainer());
+ assertEquals(uri, outboundWire.getUri());
}
public void testCreateServiceBindingWire() throws Exception {
- ServiceBinding binding = new MockServiceBinding();
-
+ URI uri = URI.create("foo");
+ ServiceBinding binding = new MockServiceBinding(uri);
wireService.createWires(binding, contract, "target");
InboundWire inboundWire = binding.getInboundWire();
assertEquals(1, inboundWire.getInvocationChains().size());
assertEquals(contract, inboundWire.getServiceContract());
assertEquals(binding, inboundWire.getContainer());
-
+ assertEquals(uri, inboundWire.getUri());
OutboundWire outboundWire = binding.getOutboundWire();
assertEquals("target", outboundWire.getTargetName().toString());
assertEquals(1, outboundWire.getInvocationChains().size());
assertEquals(contract, outboundWire.getServiceContract());
assertEquals(binding, outboundWire.getContainer());
+ assertEquals(uri, outboundWire.getUri());
assertEquals(1, outboundWire.getTargetCallbackInvocationChains().size());
}
@@ -271,16 +276,15 @@
}
private class MockReferenceBinding extends AbstractSCAObject implements ReferenceBinding {
- private ServiceContract<?> bindingServiceContract;
private InboundWire inboundWire;
private OutboundWire outboundWire;
- public MockReferenceBinding() {
- super("foo", null);
+ public MockReferenceBinding(URI uri) throws URISyntaxException {
+ super(uri, null);
}
public ServiceContract<?> getBindingServiceContract() {
- return bindingServiceContract;
+ return null;
}
public QName getBindingType() {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerSerializationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerSerializationTestCase.java?view=diff&rev=502853&r1=502852&r2=502853
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerSerializationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerSerializationTestCase.java Fri Feb 2 19:16:15 2007
@@ -4,6 +4,7 @@
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.SCAExternalizable;
@@ -38,7 +39,8 @@
protected void setUp() throws Exception {
super.setUp();
wire = EasyMock.createMock(InboundWire.class);
- EasyMock.expect(wire.getServiceName()).andReturn("foo").atLeastOnce();
+ URI uri = URI.create("#foo");
+ EasyMock.expect(wire.getUri()).andReturn(uri).atLeastOnce();
EasyMock.replay(wire);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(component.getInboundWire(EasyMock.eq("foo"))).andReturn(wire);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org