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/17 09:35:25 UTC
svn commit: r508732 [6/8] - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/binding/local/
kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/
kernel/core/src/main/java/org/apache/tuscany/core/builder/ kernel/...
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=508732&r1=508731&r2=508732
==============================================================================
--- 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 Sat Feb 17 00:35:19 2007
@@ -26,15 +26,16 @@
import org.osoa.sca.annotations.Scope;
import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.component.AtomicComponent;
import static org.apache.tuscany.spi.model.Scope.CONVERSATION;
-import org.apache.tuscany.spi.wire.InboundWire;
-import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.Wire;
+import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.integration.mock.MockFactory;
-import org.apache.tuscany.core.wire.jdk.JDKOutboundInvocationHandler;
+import org.apache.tuscany.core.wire.jdk.JDKInvocationHandler;
import org.easymock.classextension.EasyMock;
/**
@@ -46,9 +47,9 @@
* @version $Rev$ $Date$
*/
public class ConversationStartStopEndTestCase extends AbstractConversationTestCase {
- private OutboundWire owire;
+ protected AtomicComponent target;
private FooImpl targetInstance;
- private JDKOutboundInvocationHandler handler;
+ private JDKInvocationHandler handler;
private Method operation1;
private Method operation2;
private Method endOperation;
@@ -83,16 +84,11 @@
EasyMock.replay(targetInstance);
// create target component mock
target = createAtomicComponent();
- // create source component mock
- JavaAtomicComponent source = EasyMock.createMock(JavaAtomicComponent.class);
- EasyMock.expect(source.getUri()).andReturn(URI.create("source")).atLeastOnce();
- EasyMock.replay(source);
-
- owire = MockFactory.createOutboundWire("foo", Foo.class);
- owire.setTargetUri(URI.create("foo#bar"));
- InboundWire iwire = MockFactory.createInboundWire("foo", Foo.class);
- connector.connect(source, owire, target, iwire, false);
- handler = new JDKOutboundInvocationHandler(Foo.class, owire, workContext);
+ Wire wire = MockFactory.createWire("foo", Foo.class);
+ for (InvocationChain chain : wire.getInvocationChains().values()) {
+ chain.setTargetInvoker(target.createTargetInvoker("foo", chain.getOperation()));
+ }
+ handler = new JDKInvocationHandler(Foo.class, wire, workContext);
operation1 = Foo.class.getMethod("operation1");
operation2 = Foo.class.getMethod("operation2");
endOperation = Foo.class.getMethod("end");
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=508732&r1=508731&r2=508732
==============================================================================
--- 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 Sat Feb 17 00:35:19 2007
@@ -32,24 +32,19 @@
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.wire.InboundInvocationChain;
-import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.Interceptor;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
-import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.InvocationChain;
+import org.apache.tuscany.spi.wire.Wire;
import org.apache.tuscany.spi.wire.WireService;
-import org.apache.tuscany.core.builder.ConnectorImpl;
import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
import org.apache.tuscany.core.implementation.PojoConfiguration;
import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
import org.apache.tuscany.core.injection.PojoObjectFactory;
-import org.apache.tuscany.core.wire.InboundInvocationChainImpl;
-import org.apache.tuscany.core.wire.InboundWireImpl;
+import org.apache.tuscany.core.wire.InvocationChainImpl;
import org.apache.tuscany.core.wire.InvokerInterceptor;
-import org.apache.tuscany.core.wire.OutboundInvocationChainImpl;
-import org.apache.tuscany.core.wire.OutboundWireImpl;
+import org.apache.tuscany.core.wire.WireImpl;
import org.apache.tuscany.core.wire.jdk.JDKWireService;
/**
@@ -59,24 +54,12 @@
private static final WireService WIRE_SERVICE = new JDKWireService(new WorkContextImpl(), null);
private static final JavaInterfaceProcessorRegistry REGISTRY = new JavaInterfaceProcessorRegistryImpl();
- private static final ConnectorImpl CONNECTOR = new ConnectorImpl(null);
private MockFactory() {
}
/**
* Wires two components together where the reference interface is the same as target service
- *
- * @param sourceName
- * @param sourceClass
- * @param sourceScope
- * @param members
- * @param targetName
- * @param targetService
- * @param targetClass
- * @param targetScope
- * @return
- * @throws Exception
*/
public static Map<String, AtomicComponent> createWiredComponents(String sourceName,
Class<?> sourceClass,
@@ -93,10 +76,9 @@
null,
members,
targetName,
- targetService,
targetClass,
- targetScope,
- null);
+ targetScope
+ );
}
@@ -106,17 +88,14 @@
ScopeContainer sourceScope,
Interceptor sourceHeadInterceptor,
Map<String, Member> members,
- String targetName, Class<?> targetService,
+ String targetName,
Class<?> targetClass,
- ScopeContainer targetScope,
- Interceptor targetHeadInterceptor)
+ ScopeContainer targetScope
+ )
throws Exception {
JavaAtomicComponent targetComponent =
createJavaComponent(targetName, targetScope, targetClass);
- String serviceName = targetService.getName().substring(targetService.getName().lastIndexOf('.') + 1);
- InboundWire inboundWire = createInboundWire(serviceName, targetService, targetHeadInterceptor);
- targetComponent.addInboundWire(inboundWire);
PojoConfiguration configuration = new PojoConfiguration();
configuration.setInstanceFactory(new PojoObjectFactory(sourceClass.getConstructor()));
configuration.setWireService(WIRE_SERVICE);
@@ -127,33 +106,22 @@
configuration.setName(new URI(sourceName));
JavaAtomicComponent sourceComponent = new JavaAtomicComponent(configuration);
sourceComponent.setScopeContainer(sourceScope);
- OutboundWire outboundWire = createOutboundWire(targetName, sourceReferenceClass, sourceHeadInterceptor);
- sourceComponent.addOutboundWire(outboundWire);
- outboundWire.setTargetUri(URI.create(targetName + "#" + serviceName));
+ Wire wire = createWire(targetName, sourceReferenceClass, sourceHeadInterceptor);
+ for (InvocationChain chain : wire.getInvocationChains().values()) {
+ chain.setTargetInvoker(targetComponent.createTargetInvoker(targetName, chain.getOperation()));
+ }
+ sourceComponent.attachWire(wire);
targetScope.register(targetComponent);
sourceScope.register(sourceComponent);
- CONNECTOR.connect(sourceComponent, outboundWire, targetComponent, inboundWire, false);
- Map<String, AtomicComponent> contexts = new HashMap<String, AtomicComponent>();
- contexts.put(sourceName, sourceComponent);
- contexts.put(targetName, targetComponent);
- return contexts;
+ Map<String, AtomicComponent> components = new HashMap<String, AtomicComponent>();
+ components.put(sourceName, sourceComponent);
+ components.put(targetName, targetComponent);
+ return components;
}
/**
- * Wires two contexts using a multiplicity reference
- *
- * @param sourceName
- * @param sourceClass
- * @param sourceReferenceClass
- * @param sourceScope
- * @param targetName
- * @param targetService
- * @param targetClass
- * @param members
- * @param targetScope
- * @return
- * @throws Exception
+ * Wires two components using a multiplicity reference
*/
@SuppressWarnings("unchecked")
public static Map<String, AtomicComponent> createWiredMultiplicity(String sourceName, Class<?> sourceClass,
@@ -166,8 +134,6 @@
JavaAtomicComponent targetComponent =
createJavaComponent(targetName, targetScope, targetClass);
String serviceName = targetService.getName().substring(targetService.getName().lastIndexOf('.') + 1);
- InboundWire inboundWire = createInboundWire(serviceName, targetService, null);
- targetComponent.addInboundWire(inboundWire);
PojoConfiguration configuration = new PojoConfiguration();
configuration.setInstanceFactory(new PojoObjectFactory(sourceClass.getConstructor()));
configuration.setWireService(WIRE_SERVICE);
@@ -179,52 +145,38 @@
JavaAtomicComponent sourceComponent = new JavaAtomicComponent(configuration);
sourceComponent.setScopeContainer(sourceScope);
- OutboundWire outboundWire = createOutboundWire(targetName, sourceReferenceClass, null);
- outboundWire.setTargetUri(URI.create(targetName + "#" + serviceName));
- List<OutboundWire> factories = new ArrayList<OutboundWire>();
- factories.add(outboundWire);
- sourceComponent.addOutboundWires(factories);
+ Wire wire = createWire(targetName, sourceReferenceClass, null);
+ wire.setTargetUri(URI.create(targetName + "#" + serviceName));
+ for (InvocationChain chain : wire.getInvocationChains().values()) {
+ chain.setTargetInvoker(targetComponent.createTargetInvoker("target", chain.getOperation()));
+ }
+ List<Wire> wires = new ArrayList<Wire>();
+ wires.add(wire);
+ sourceComponent.attachWires(wires);
targetScope.register(targetComponent);
sourceScope.register(sourceComponent);
- CONNECTOR.connect(sourceComponent, outboundWire, targetComponent, inboundWire, false);
+
Map<String, AtomicComponent> components = new HashMap<String, AtomicComponent>();
components.put(sourceName, sourceComponent);
components.put(targetName, targetComponent);
return components;
}
- public static <T> InboundWire createInboundWire(String serviceName, Class<T> interfaze)
+ public static <T> Wire createWire(String serviceName, Class<T> interfaze)
throws InvalidServiceContractException {
- return createInboundWire(serviceName, interfaze, null);
+ return createWire(serviceName, interfaze, null);
}
- public static <T> InboundWire createInboundWire(String serviceName, Class<T> interfaze, Interceptor interceptor)
+ public static <T> Wire createWire(String serviceName, Class<T> interfaze, Interceptor interceptor)
throws InvalidServiceContractException {
- InboundWire wire = new InboundWireImpl();
+ Wire wire = new WireImpl();
ServiceContract<?> contract = REGISTRY.introspect(interfaze);
- wire.setServiceContract(contract);
+ wire.setSourceContract(contract);
wire.setSourceUri(URI.create("#" + serviceName));
- createInboundChains(interfaze, interceptor, wire);
- return wire;
- }
-
- public static <T> OutboundWire createOutboundWire(String refName, Class<T> interfaze)
- throws InvalidServiceContractException {
- return createOutboundWire(refName, interfaze, null);
- }
-
- public static <T> OutboundWire createOutboundWire(String refName, Class<T> interfaze, Interceptor interceptor)
- throws InvalidServiceContractException {
-
- OutboundWire wire = new OutboundWireImpl();
- wire.setSourceUri(URI.create("#" + refName));
- createOutboundChains(interfaze, interceptor, wire);
- ServiceContract<?> contract = REGISTRY.introspect(interfaze);
- wire.setServiceContract(contract);
+ createChains(interfaze, interceptor, wire);
return wire;
}
-
@SuppressWarnings("unchecked")
private static <T> JavaAtomicComponent createJavaComponent(String name, ScopeContainer scope, Class<T> clazz)
throws NoSuchMethodException, URISyntaxException {
@@ -239,30 +191,18 @@
return component;
}
- private static void createOutboundChains(Class<?> interfaze, Interceptor interceptor, OutboundWire wire)
- throws InvalidServiceContractException {
- ServiceContract<?> contract = REGISTRY.introspect(interfaze);
- for (Operation<?> operation : contract.getOperations().values()) {
- OutboundInvocationChain chain = new OutboundInvocationChainImpl(operation);
- if (interceptor != null) {
- chain.addInterceptor(interceptor);
- }
- wire.addOutboundInvocationChain(operation, chain);
- }
- }
-
- private static void createInboundChains(Class<?> interfaze, Interceptor interceptor, InboundWire wire)
+ private static void createChains(Class<?> interfaze, Interceptor interceptor, Wire wire)
throws InvalidServiceContractException {
ServiceContract<?> contract = REGISTRY.introspect(interfaze);
for (Operation<?> method : contract.getOperations().values()) {
- InboundInvocationChain chain = new InboundInvocationChainImpl(method);
+ InvocationChain chain = new InvocationChainImpl(method);
if (interceptor != null) {
chain.addInterceptor(interceptor);
}
// add tail interceptor
chain.addInterceptor(new InvokerInterceptor());
- wire.addInboundInvocationChain(method, chain);
+ wire.addInvocationChain(method, chain);
}
}
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=508732&r1=508731&r2=508732
==============================================================================
--- 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 Sat Feb 17 00:35:19 2007
@@ -58,7 +58,6 @@
* @version $Rev$ $Date$
*/
public class ScopeReferenceTestCase extends TestCase {
-
private Map<String, Member> members;
/**
@@ -68,8 +67,13 @@
ScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
- Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
- scope, members, "target", Target.class, TargetImpl.class, scope);
+ Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source",
+ SourceImpl.class,
+ scope, members,
+ "target",
+ Target.class,
+ TargetImpl.class,
+ scope);
scope.onEvent(new ComponentStart(this, null));
AtomicComponent sourceComponent = contexts.get("source");
AtomicComponent targetComponent = contexts.get("target");
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/DifferentInterfaceWireTestCase.java Sat Feb 17 00:35:19 2007
@@ -62,10 +62,9 @@
null,
members,
"target",
- OtherTarget.class,
OtherTargetImpl.class,
- scope,
- null);
+ scope
+ );
AtomicComponent sourceComponent = contexts.get("source");
Source source = (Source) sourceComponent.getTargetInstance();
Target target = source.getTarget();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/oneway/OneWayWireToJavaInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/oneway/OneWayWireToJavaInvocationTestCase.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/oneway/OneWayWireToJavaInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/wire/oneway/OneWayWireToJavaInvocationTestCase.java Sat Feb 17 00:35:19 2007
@@ -27,12 +27,10 @@
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.services.work.WorkScheduler;
-import org.apache.tuscany.spi.wire.InboundInvocationChain;
-import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.MessageImpl;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
import org.apache.tuscany.spi.wire.TargetInvoker;
import junit.framework.TestCase;
@@ -41,10 +39,9 @@
import org.apache.tuscany.core.implementation.java.JavaTargetInvoker;
import org.apache.tuscany.core.services.work.jsr237.Jsr237WorkScheduler;
import org.apache.tuscany.core.services.work.jsr237.workmanager.ThreadPoolWorkManager;
-import org.apache.tuscany.core.wire.InboundInvocationChainImpl;
+import org.apache.tuscany.core.wire.InvocationChainImpl;
import org.apache.tuscany.core.wire.InvokerInterceptor;
-import org.apache.tuscany.core.wire.NonBlockingBridgingInterceptor;
-import org.apache.tuscany.core.wire.OutboundInvocationChainImpl;
+import org.apache.tuscany.core.wire.NonBlockingInterceptor;
import org.easymock.classextension.EasyMock;
/**
@@ -56,7 +53,7 @@
private WorkScheduler scheduler;
private WorkContext context;
private CountDownLatch latch;
- private OutboundInvocationChain ochain;
+ private InvocationChain ochain;
private JavaTargetInvoker invoker;
private JavaAtomicComponent component;
private AsyncTarget target;
@@ -85,14 +82,13 @@
EasyMock.replay(component);
Method method = AsyncTarget.class.getMethod("invoke");
method.setAccessible(true);
- InboundWire inboundWire = EasyMock.createMock(InboundWire.class);
ExecutionMonitor monitor = EasyMock.createNiceMock(ExecutionMonitor.class);
- invoker = new JavaTargetInvoker(method, component, inboundWire, context, monitor);
+ invoker = new JavaTargetInvoker(method, component, context, monitor);
Operation<Type> operation = new Operation<Type>("invoke", null, null, null, false, null, TargetInvoker.NONE);
- ochain = new OutboundInvocationChainImpl(operation);
- NonBlockingBridgingInterceptor bridgeInterceptor = new NonBlockingBridgingInterceptor(scheduler, context);
+ ochain = new InvocationChainImpl(operation);
+ NonBlockingInterceptor bridgeInterceptor = new NonBlockingInterceptor(scheduler, context);
ochain.addInterceptor(bridgeInterceptor);
- InboundInvocationChain ichain = new InboundInvocationChainImpl(operation);
+ InvocationChain ichain = new InvocationChainImpl(operation);
WaitInterceptor waitInterceptor = new WaitInterceptor();
InvokerInterceptor invokerInterceptor = new InvokerInterceptor();
ichain.addInterceptor(waitInterceptor);
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=508732&r1=508731&r2=508732
==============================================================================
--- 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 Sat Feb 17 00:35:19 2007
@@ -68,7 +68,9 @@
expect(mockReader.next()).andReturn(END_ELEMENT);
expect(mockReader.getName()).andReturn(SERVICE).anyTimes();
replay(mockReader);
- ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, null);
+ DeploymentContext context = EasyMock.createMock(DeploymentContext.class);
+ context.getPathNames();
+ ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, deploymentContext);
assertNotNull(serviceDefinition);
assertEquals(PARENT_NAME + "#" + name, serviceDefinition.getUri().toString());
}
@@ -82,7 +84,7 @@
replay(mockReader);
ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
new ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
- ServiceDefinition serviceDefinition = loader.load(parent, type, mockReader, null);
+ ServiceDefinition serviceDefinition = loader.load(parent, type, mockReader, deploymentContext);
assertTrue(ServiceDefinition.class.equals(serviceDefinition.getClass()));
}
@@ -100,10 +102,10 @@
BindingDefinition binding = new BindingDefinition() {
};
- expect(mockRegistry.load(parent, null, mockReader, null)).andReturn(binding).times(2);
+ expect(mockRegistry.load(parent, null, mockReader, deploymentContext)).andReturn(binding).times(2);
replay(mockRegistry);
- ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, null);
+ ServiceDefinition serviceDefinition = loader.load(parent, null, mockReader, deploymentContext);
assertEquals(2, serviceDefinition.getBindings().size());
}
@@ -161,6 +163,7 @@
mockRegistry = EasyMock.createMock(LoaderRegistry.class);
loader = new ServiceLoader(mockRegistry);
deploymentContext = new RootDeploymentContext(null, null, null, null);
+ deploymentContext.getPathNames().add(PARENT_NAME);
parent = EasyMock.createMock(CompositeComponent.class);
URI uri = URI.create(PARENT_NAME);
EasyMock.expect(parent.getUri()).andReturn(uri).atLeastOnce();
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=508732&r1=508731&r2=508732
==============================================================================
--- 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 Sat Feb 17 00:35:19 2007
@@ -22,23 +22,18 @@
import javax.xml.namespace.QName;
import org.apache.tuscany.spi.component.AbstractSCAObject;
-import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.component.TargetInvokerCreationException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.wire.InboundWire;
-import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.Wire;
/**
* @version $Rev$ $Date$
*/
public class MockServiceBinding extends AbstractSCAObject implements ServiceBinding {
- private InboundWire inboundWire;
- private OutboundWire outboundWire;
- private ServiceContract<?> bindingServiceContract;
-
+ private Wire wire;
public MockServiceBinding(URI uri) {
super(uri);
@@ -48,32 +43,20 @@
return null;
}
- public void setService(Service service) {
- }
-
public ServiceContract<?> getBindingServiceContract() {
- return bindingServiceContract;
- }
-
- public InboundWire getInboundWire() {
- return inboundWire;
- }
-
- public void setInboundWire(InboundWire inboundWire) {
- this.inboundWire = inboundWire;
+ return null;
}
- public OutboundWire getOutboundWire() {
- return outboundWire;
+ public Wire getWire() {
+ return wire;
}
- public void setOutboundWire(OutboundWire outboundWire) {
- this.outboundWire = outboundWire;
+ public void setWire(Wire wire) {
+ this.wire = wire;
}
- public TargetInvoker createTargetInvoker(ServiceContract contract, Operation operation)
+ public TargetInvoker createTargetInvoker(String targetName, Operation operation)
throws TargetInvokerCreationException {
return null;
}
-
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/ContentTypeDescriberImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/ContentTypeDescriberImplTestCase.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/ContentTypeDescriberImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/ContentTypeDescriberImplTestCase.java Sat Feb 17 00:35:19 2007
@@ -20,8 +20,6 @@
import java.net.URL;
-import org.apache.tuscany.core.services.deployment.ContentTypeDescriberImpl;
-
import junit.framework.TestCase;
public class ContentTypeDescriberImplTestCase extends TestCase {
@@ -40,7 +38,7 @@
public void testDefaultContentType() throws Exception {
URL artifactURL = getClass().getResource("test.ext");
assertEquals("application/v.tuscany.ext", contentTypeBuilder.getContentType(artifactURL,
- "application/v.tuscany.ext"));
+ "application/v.tuscany.ext"));
}
protected void setUp() throws Exception {
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=508732&r1=508731&r2=508732
==============================================================================
--- 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 Sat Feb 17 00:35:19 2007
@@ -24,8 +24,8 @@
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
-import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.InvocationChain;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
@@ -33,7 +33,7 @@
import org.apache.tuscany.core.mock.component.SimpleTargetImpl;
import org.apache.tuscany.core.mock.wire.MockStaticInvoker;
import org.apache.tuscany.core.mock.wire.MockSyncInterceptor;
-import org.apache.tuscany.core.wire.jdk.JDKOutboundInvocationHandler;
+import org.apache.tuscany.core.wire.jdk.JDKInvocationHandler;
/**
* @version $$Rev$$ $$Date$$
@@ -47,18 +47,17 @@
ServiceContract<?> contract = registry.introspect(SimpleTarget.class);
Operation<?> operation = contract.getOperations().get("echo");
MockStaticInvoker invoker = new MockStaticInvoker(echo, new SimpleTargetImpl());
- OutboundInvocationChain chain = new OutboundInvocationChainImpl(operation);
+ InvocationChain chain = new InvocationChainImpl(operation);
MockSyncInterceptor interceptor = new MockSyncInterceptor();
chain.addInterceptor(interceptor);
- chain.setTargetInterceptor(new InvokerInterceptor());
+ chain.addInterceptor(new InvokerInterceptor());
chain.setTargetInvoker(invoker);
- chain.prepare();
//chains.put(echo, chain);
- OutboundWire wire = new OutboundWireImpl();
- wire.addOutboundInvocationChain(operation, chain);
- wire.setServiceContract(contract);
+ Wire wire = new WireImpl();
+ wire.addInvocationChain(operation, chain);
+ wire.setSourceContract(contract);
wire.setSourceUri(URI.create("#wire"));
- JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(SimpleTarget.class, wire, null);
+ JDKInvocationHandler handler = new JDKInvocationHandler(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/ContractCompatibilityTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/ContractCompatibilityTestCase.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/ContractCompatibilityTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/ContractCompatibilityTestCase.java Sat Feb 17 00:35:19 2007
@@ -26,23 +26,15 @@
import java.util.Map;
import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.ReferenceBinding;
-import org.apache.tuscany.spi.component.ServiceBinding;
-import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.spi.model.Operation;
import static org.apache.tuscany.spi.model.Operation.NO_CONVERSATION;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.model.ServiceDefinition;
-import org.apache.tuscany.spi.wire.InboundInvocationChain;
-import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.ChainHolder;
import org.apache.tuscany.spi.wire.IncompatibleServiceContractException;
-import org.apache.tuscany.spi.wire.OutboundChainHolder;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
import org.apache.tuscany.spi.wire.ProxyCreationException;
import org.apache.tuscany.spi.wire.Wire;
-import org.apache.tuscany.spi.wire.WireInvocationHandler;
import org.apache.tuscany.spi.wire.WireService;
import junit.framework.TestCase;
@@ -357,42 +349,17 @@
throw new UnsupportedOperationException();
}
- public <T> T createProxy(Class<T> interfaze, Wire wire, Map<Method, OutboundChainHolder> mapping)
+ public <T> T createProxy(Class<T> interfaze, Wire wire, Map<Method, ChainHolder> mapping)
throws ProxyCreationException {
throw new UnsupportedOperationException();
}
- public Object createCallbackProxy(Class<?> interfaze, InboundWire wire) throws ProxyCreationException {
- throw new UnsupportedOperationException();
- }
-
-
- public WireInvocationHandler createHandler(Class<?> interfaze, Wire wire) {
- throw new UnsupportedOperationException();
- }
-
- public OutboundInvocationChain createOutboundChain(Operation<?> operation) {
- throw new UnsupportedOperationException();
- }
-
- public InboundInvocationChain createInboundChain(Operation<?> operation) {
- throw new UnsupportedOperationException();
- }
-
- public InboundWire createWire(ServiceDefinition service) {
- throw new UnsupportedOperationException();
- }
-
- public void createWires(AtomicComponent component, ComponentDefinition<?> definition) {
- throw new UnsupportedOperationException();
+ public Object createCallbackProxy(Class<?> interfaze, List<Wire> wires) throws ProxyCreationException {
+ return null;
}
public void createWires(ReferenceBinding referenceBinding, ServiceContract<?> contract,
QualifiedName targetName) {
- throw new UnsupportedOperationException();
- }
-
- public void createWires(ServiceBinding serviceBinding, ServiceContract<?> contract, String targetName) {
throw new UnsupportedOperationException();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationErrorTestCase.java Sat Feb 17 00:35:19 2007
@@ -23,10 +23,9 @@
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.wire.InboundInvocationChain;
+import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.MessageImpl;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
import junit.framework.TestCase;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
@@ -65,18 +64,17 @@
*/
public void testInvokeWithInterceptors() throws Exception {
Operation operation = contract.getOperations().get("hello");
- OutboundInvocationChain source = new OutboundInvocationChainImpl(operation);
+ InvocationChain source = new InvocationChainImpl(operation);
MockSyncInterceptor sourceInterceptor = new MockSyncInterceptor();
source.addInterceptor(sourceInterceptor);
- InboundInvocationChain target = new InboundInvocationChainImpl(operation);
+ InvocationChain target = new InvocationChainImpl(operation);
MockSyncInterceptor targetInterceptor = new MockSyncInterceptor();
target.addInterceptor(targetInterceptor);
target.addInterceptor(new InvokerInterceptor());
// connect the source to the target
- source.setTargetInterceptor(target.getHeadInterceptor());
- source.prepare();
+ source.addInterceptor(target.getHeadInterceptor());
MockStaticInvoker invoker = new MockStaticInvoker(hello, new SimpleTargetImpl());
source.setTargetInvoker(invoker);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InvocationConfigurationTestCase.java Sat Feb 17 00:35:19 2007
@@ -24,10 +24,9 @@
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.wire.InboundInvocationChain;
+import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.MessageImpl;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
import junit.framework.TestCase;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
@@ -68,18 +67,17 @@
* Tests basic wiring of a source to a target, including handlers and interceptors
*/
public void testInvokeWithInterceptors() throws Exception {
- OutboundInvocationChain source = new OutboundInvocationChainImpl(operation);
+ InvocationChain source = new InvocationChainImpl(operation);
MockSyncInterceptor sourceInterceptor = new MockSyncInterceptor();
source.addInterceptor(sourceInterceptor);
- InboundInvocationChain target = new InboundInvocationChainImpl(operation);
+ InvocationChain target = new InvocationChainImpl(operation);
MockSyncInterceptor targetInterceptor = new MockSyncInterceptor();
target.addInterceptor(targetInterceptor);
target.addInterceptor(new InvokerInterceptor());
// connect the source to the target
- source.setTargetInterceptor(target.getHeadInterceptor());
- source.prepare();
+ source.addInterceptor(target.getHeadInterceptor());
MockStaticInvoker invoker = new MockStaticInvoker(hello, new SimpleTargetImpl());
source.setTargetInvoker(invoker);
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InvocationHandlerTestCase.java (from r507339, 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/InvocationHandlerTestCase.java?view=diff&rev=508732&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationHandlerTestCase.java&r1=507339&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InvocationHandlerTestCase.java&r2=508732
==============================================================================
--- 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/InvocationHandlerTestCase.java Sat Feb 17 00:35:19 2007
@@ -25,9 +25,8 @@
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.wire.InboundInvocationChain;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
-import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.InvocationChain;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
@@ -35,38 +34,38 @@
import org.apache.tuscany.core.mock.component.SimpleTargetImpl;
import org.apache.tuscany.core.mock.wire.MockStaticInvoker;
import org.apache.tuscany.core.mock.wire.MockSyncInterceptor;
-import org.apache.tuscany.core.wire.jdk.JDKOutboundInvocationHandler;
+import org.apache.tuscany.core.wire.jdk.JDKInvocationHandler;
-public class OutboundInvocationHandlerTestCase extends TestCase {
+public class InvocationHandlerTestCase extends TestCase {
private Method hello;
private ServiceContract<?> contract;
- public OutboundInvocationHandlerTestCase() {
+ public InvocationHandlerTestCase() {
super();
}
- public OutboundInvocationHandlerTestCase(String arg0) {
+ public InvocationHandlerTestCase(String arg0) {
super(arg0);
}
public void testBasicInvoke() throws Throwable {
- OutboundWire wire = new OutboundWireImpl();
+ Wire wire = new WireImpl();
wire.setSourceUri(URI.create("#wire"));
Operation operation = contract.getOperations().get("hello");
- wire.addOutboundInvocationChain(operation, createChain(operation));
- wire.setServiceContract(contract);
- JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(SimpleTarget.class, wire, null);
+ wire.addInvocationChain(operation, createChain(operation));
+ wire.setSourceContract(contract);
+ JDKInvocationHandler handler = new JDKInvocationHandler(SimpleTarget.class, wire, null);
assertEquals("foo", handler.invoke(hello, new Object[]{"foo"}));
}
public void testErrorInvoke() throws Throwable {
- OutboundWire wire = new OutboundWireImpl();
+ Wire wire = new WireImpl();
wire.setSourceUri(URI.create("#wire"));
Operation operation = contract.getOperations().get("hello");
- wire.addOutboundInvocationChain(operation, createChain(operation));
- wire.setServiceContract(contract);
- JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(SimpleTarget.class, wire, null);
+ wire.addInvocationChain(operation, createChain(operation));
+ wire.setSourceContract(contract);
+ JDKInvocationHandler handler = new JDKInvocationHandler(SimpleTarget.class, wire, null);
try {
handler.invoke(hello, new Object[]{});
fail("Expected " + IllegalArgumentException.class.getName());
@@ -77,15 +76,15 @@
public void testDirectErrorInvoke() throws Throwable {
Operation operation = contract.getOperations().get("hello");
- OutboundInvocationChain source = new OutboundInvocationChainImpl(operation);
+ InvocationChain source = new InvocationChainImpl(operation);
MockStaticInvoker invoker = new MockStaticInvoker(hello, new SimpleTargetImpl());
source.setTargetInvoker(invoker);
- OutboundWire wire = new OutboundWireImpl();
+ Wire wire = new WireImpl();
wire.setSourceUri(URI.create("#wire"));
- wire.setServiceContract(contract);
- wire.addOutboundInvocationChain(operation, source);
- JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(SimpleTarget.class, wire, null);
+ wire.setSourceContract(contract);
+ wire.addInvocationChain(operation, source);
+ JDKInvocationHandler handler = new JDKInvocationHandler(SimpleTarget.class, wire, null);
try {
assertEquals("foo", handler.invoke(hello, new Object[]{}));
fail("Expected " + IllegalArgumentException.class.getName());
@@ -96,35 +95,28 @@
public void testDirectInvoke() throws Throwable {
Operation operation = contract.getOperations().get("hello");
- OutboundInvocationChain source = new OutboundInvocationChainImpl(operation);
+ InvocationChain source = new InvocationChainImpl(operation);
MockStaticInvoker invoker = new MockStaticInvoker(hello, new SimpleTargetImpl());
source.setTargetInvoker(invoker);
- OutboundWire wire = new OutboundWireImpl();
+ Wire wire = new WireImpl();
wire.setSourceUri(URI.create("#wire"));
- wire.setServiceContract(contract);
- wire.addOutboundInvocationChain(operation, source);
- JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(SimpleTarget.class, wire, null);
+ wire.setSourceContract(contract);
+ wire.addInvocationChain(operation, source);
+ JDKInvocationHandler handler = new JDKInvocationHandler(SimpleTarget.class, wire, null);
assertEquals("foo", handler.invoke(hello, new Object[]{"foo"}));
}
- private OutboundInvocationChain createChain(Operation operation) {
- OutboundInvocationChain source = new OutboundInvocationChainImpl(operation);
- MockSyncInterceptor sourceInterceptor = new MockSyncInterceptor();
- source.addInterceptor(sourceInterceptor);
-
- InboundInvocationChain target = new InboundInvocationChainImpl(operation);
+ private InvocationChain createChain(Operation operation) {
+ InvocationChain chain = new InvocationChainImpl(operation);
MockSyncInterceptor targetInterceptor = new MockSyncInterceptor();
- target.addInterceptor(targetInterceptor);
- target.addInterceptor(new InvokerInterceptor());
+ chain.addInterceptor(targetInterceptor);
+ chain.addInterceptor(new InvokerInterceptor());
- // connect the source to the target
- source.setTargetInterceptor(targetInterceptor);
- source.prepare();
Method method = JavaIDLUtils.findMethod(operation, SimpleTarget.class.getMethods());
MockStaticInvoker invoker = new MockStaticInvoker(method, new SimpleTargetImpl());
- source.setTargetInvoker(invoker);
- return source;
+ chain.setTargetInvoker(invoker);
+ return chain;
}
public void setUp() throws Exception {
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InvocationHandlerTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/InvocationHandlerTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingInterceptorTestCase.java (from r507339, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingInterceptorTestCase.java?view=diff&rev=508732&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java&r1=507339&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingInterceptorTestCase.java&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingBridgingInterceptorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingInterceptorTestCase.java Sat Feb 17 00:35:19 2007
@@ -38,7 +38,7 @@
/**
* @version $Rev$ $Date$
*/
-public class NonBlockingBridgingInterceptorTestCase extends TestCase {
+public class NonBlockingInterceptorTestCase extends TestCase {
public void testInvoke() throws Exception {
WorkScheduler scheduler = createMock(WorkScheduler.class);
@@ -61,14 +61,14 @@
Interceptor next = EasyMock.createMock(Interceptor.class);
EasyMock.expect(next.invoke(EasyMock.eq(msg))).andReturn(msg);
EasyMock.replay(next);
- Interceptor interceptor = new NonBlockingBridgingInterceptor(scheduler, context, next);
+ Interceptor interceptor = new NonBlockingInterceptor(scheduler, context, next);
interceptor.invoke(msg);
verify(context);
verify(next);
}
public void testOptimizable() {
- NonBlockingBridgingInterceptor interceptor = new NonBlockingBridgingInterceptor(null, null);
+ NonBlockingInterceptor interceptor = new NonBlockingInterceptor(null, null);
assertFalse(interceptor.isOptimizable());
}
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingInterceptorTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingInterceptorTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactoryTestCase.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OptimizedWireObjectFactoryTestCase.java Sat Feb 17 00:35:19 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.core.wire;
-import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
import org.easymock.EasyMock;
@@ -30,8 +30,8 @@
public void testGetInstance() throws Exception {
Foo foo = new Foo();
- OutboundWire wire = EasyMock.createMock(OutboundWire.class);
- EasyMock.expect(wire.getTargetService()).andReturn(foo);
+ Wire wire = EasyMock.createMock(Wire.class);
+ EasyMock.expect(wire.getTargetInstance()).andReturn(foo);
EasyMock.replay(wire);
OptimizedWireObjectFactory<Foo> factory = new OptimizedWireObjectFactory<Foo>(Foo.class, wire);
assertEquals(foo, factory.getInstance());
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireImplTestCase.java (from r507339, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundWireTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireImplTestCase.java?view=diff&rev=508732&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundWireTestCase.java&r1=507339&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireImplTestCase.java&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/OutboundWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireImplTestCase.java Sat Feb 17 00:35:19 2007
@@ -18,21 +18,33 @@
*/
package org.apache.tuscany.core.wire;
-import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
+import org.easymock.EasyMock;
/**
* @version $Rev$ $Date$
*/
-public class OutboundWireTestCase extends TestCase {
+public class WireImplTestCase extends TestCase {
/**
* Tests that the target wire returns null if there is no connected wire. This behavior is needed for optional
* autowires.
*/
- public void testGetNonExistentTargetService() throws Exception {
- OutboundWire wire = new OutboundWireImpl();
- assertNull(wire.getTargetService());
+ public void testGetNonExistentTarget() throws Exception {
+ Wire wire = new WireImpl();
+ assertNull(wire.getTargetInstance());
}
+
+ public void testTargetInstance() throws Exception {
+ Wire wire = new WireImpl();
+ AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
+ EasyMock.expect(component.getTargetInstance()).andReturn(new Object());
+ EasyMock.replay(component);
+ wire.setTarget(component);
+ assertNotNull(wire.getTargetInstance());
+ }
+
}
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireImplTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireImplTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java Sat Feb 17 00:35:19 2007
@@ -26,9 +26,9 @@
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
-import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.spi.wire.InvocationChain;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
import org.easymock.EasyMock;
@@ -41,11 +41,11 @@
@SuppressWarnings({"unchecked"})
public void testCreateInstance() throws Exception {
Operation<Type> op = new Operation<Type>("hello", null, null, null);
- OutboundInvocationChain chain = new OutboundInvocationChainImpl(op);
- OutboundWire wire = EasyMock.createMock(OutboundWire.class);
- Map<Operation<?>, OutboundInvocationChain> chains = new HashMap<Operation<?>, OutboundInvocationChain>();
+ InvocationChain chain = new InvocationChainImpl(op);
+ Wire wire = EasyMock.createMock(Wire.class);
+ Map<Operation<?>, InvocationChain> chains = new HashMap<Operation<?>, InvocationChain>();
chains.put(op, chain);
- EasyMock.expect(wire.getOutboundInvocationChains()).andReturn(chains);
+ EasyMock.expect(wire.getInvocationChains()).andReturn(chains);
EasyMock.expect(wire.isOptimizable()).andReturn(false);
EasyMock.replay(wire);
WireService service = EasyMock.createMock(WireService.class);
@@ -66,11 +66,11 @@
@SuppressWarnings("unchecked")
public void testOptimizedCreateInstance() throws Exception {
ServiceContract<?> contract = new JavaServiceContract(Foo.class);
- OutboundWire wire = EasyMock.createMock(OutboundWire.class);
+ Wire wire = EasyMock.createMock(Wire.class);
EasyMock.expect(wire.isOptimizable()).andReturn(true);
- EasyMock.expect(wire.getServiceContract()).andReturn(contract).atLeastOnce();
- EasyMock.expect(wire.getOutboundInvocationChains()).andReturn((Map) Collections.emptyMap());
- EasyMock.expect(wire.getTargetService()).andReturn(new Foo() {
+ EasyMock.expect(wire.getSourceContract()).andReturn(contract).atLeastOnce();
+ EasyMock.expect(wire.getInvocationChains()).andReturn((Map) Collections.emptyMap());
+ EasyMock.expect(wire.getTargetInstance()).andReturn(new Foo() {
public void hello() {
}
});
@@ -87,10 +87,10 @@
@SuppressWarnings("unchecked")
public void testCannotOptimizeDifferentContractsCreateInstance() throws Exception {
ServiceContract<?> contract = new JavaServiceContract(Object.class);
- OutboundWire wire = EasyMock.createMock(OutboundWire.class);
+ Wire wire = EasyMock.createMock(Wire.class);
EasyMock.expect(wire.isOptimizable()).andReturn(true);
- EasyMock.expect(wire.getServiceContract()).andReturn(contract).atLeastOnce();
- EasyMock.expect(wire.getOutboundInvocationChains()).andReturn((Map) Collections.emptyMap());
+ EasyMock.expect(wire.getSourceContract()).andReturn(contract).atLeastOnce();
+ EasyMock.expect(wire.getInvocationChains()).andReturn((Map) Collections.emptyMap());
EasyMock.replay(wire);
WireService service = EasyMock.createMock(WireService.class);
service.createProxy(EasyMock.eq(Foo.class), EasyMock.eq(wire), EasyMock.isA(Map.class));
@@ -110,10 +110,10 @@
@SuppressWarnings("unchecked")
public void testNoJavaInterfaceCreateInstance() throws Exception {
ServiceContract<?> contract = new JavaServiceContract();
- OutboundWire wire = EasyMock.createMock(OutboundWire.class);
+ Wire wire = EasyMock.createMock(Wire.class);
EasyMock.expect(wire.isOptimizable()).andReturn(true);
- EasyMock.expect(wire.getServiceContract()).andReturn(contract).atLeastOnce();
- EasyMock.expect(wire.getOutboundInvocationChains()).andReturn((Map) Collections.emptyMap());
+ EasyMock.expect(wire.getSourceContract()).andReturn(contract).atLeastOnce();
+ EasyMock.expect(wire.getInvocationChains()).andReturn((Map) Collections.emptyMap());
EasyMock.replay(wire);
WireService service = EasyMock.createMock(WireService.class);
service.createProxy(EasyMock.eq(Foo.class), EasyMock.eq(wire), EasyMock.isA(Map.class));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java Sat Feb 17 00:35:19 2007
@@ -21,15 +21,12 @@
import java.lang.reflect.Type;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.model.Operation;
import static org.apache.tuscany.spi.model.Operation.NO_CONVERSATION;
-import org.apache.tuscany.spi.wire.InboundInvocationChain;
-import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Message;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
-import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
import org.easymock.EasyMock;
@@ -45,57 +42,24 @@
public void foo() {
}
- public void testSourceWireInterceptorOptimization() throws Exception {
+ public void testWireInterceptorOptimization() throws Exception {
AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
EasyMock.replay(component);
- OutboundWire wire = new OutboundWireImpl();
- OutboundInvocationChain chain = new OutboundInvocationChainImpl(operation);
+ Wire wire = new WireImpl();
+ InvocationChain chain = new InvocationChainImpl(operation);
chain.addInterceptor(new OptimizableInterceptor());
- wire.addOutboundInvocationChain(operation, chain);
+ wire.addInvocationChain(operation, chain);
assertTrue(WireUtils.isOptimizable(wire));
}
- public void testSourceWireNonInterceptorOptimization() throws Exception {
+ public void testWireNonInterceptorOptimization() throws Exception {
AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
EasyMock.replay(component);
- OutboundWire wire = new OutboundWireImpl();
- OutboundInvocationChain chain = new OutboundInvocationChainImpl(operation);
+ Wire wire = new WireImpl();
+ InvocationChain chain = new InvocationChainImpl(operation);
chain.addInterceptor(new NonOptimizableInterceptor());
- wire.addOutboundInvocationChain(operation, chain);
+ wire.addInvocationChain(operation, chain);
assertFalse(WireUtils.isOptimizable(wire));
- }
-
- public void testTargetWireInterceptorOptimization() throws Exception {
- AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
- EasyMock.expect(component.isOptimizable()).andReturn(true);
- EasyMock.replay(component);
- InboundWire wire = new InboundWireImpl();
- InboundInvocationChain chain = new InboundInvocationChainImpl(operation);
- chain.addInterceptor(new OptimizableInterceptor());
- wire.addInboundInvocationChain(operation, chain);
- assertTrue(WireUtils.isOptimizable(component, wire));
-
- }
-
- public void testTargetWireNoOptimizationNonAtomicContainer() throws Exception {
- Component component = EasyMock.createNiceMock(Component.class);
- EasyMock.expect(component.isOptimizable()).andReturn(true);
- EasyMock.replay(component);
- InboundWire wire = new InboundWireImpl();
- InboundInvocationChain chain = new InboundInvocationChainImpl(operation);
- chain.addInterceptor(new OptimizableInterceptor());
- wire.addInboundInvocationChain(operation, chain);
- assertTrue(WireUtils.isOptimizable(component, wire));
- }
-
- public void testTargetWireNonInterceptorOptimization() throws Exception {
- AtomicComponent component = EasyMock.createNiceMock(AtomicComponent.class);
- EasyMock.replay(component);
- InboundWire wire = new InboundWireImpl();
- InboundInvocationChain chain = new InboundInvocationChainImpl(operation);
- chain.addInterceptor(new NonOptimizableInterceptor());
- wire.addInboundInvocationChain(operation, chain);
- assertFalse(WireUtils.isOptimizable(component, wire));
}
protected void tearDown() throws Exception {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java Sat Feb 17 00:35:19 2007
@@ -23,11 +23,9 @@
import java.util.Map;
import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.wire.InboundInvocationChain;
-import org.apache.tuscany.spi.wire.InboundWire;
-import org.apache.tuscany.spi.wire.OutboundChainHolder;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
-import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.ChainHolder;
+import org.apache.tuscany.spi.wire.InvocationChain;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
@@ -38,20 +36,20 @@
private Method m;
public void testCreateInterfaceToWireMapping() throws Exception {
- OutboundWire wire = new OutboundWireImpl();
+ Wire wire = new WireImpl();
Operation<Type> op = new Operation<Type>("hello", null, null, null);
- OutboundInvocationChain chain = new OutboundInvocationChainImpl(op);
- wire.addOutboundInvocationChain(op, chain);
- Map<Method, OutboundChainHolder> chains = WireUtils.createInterfaceToWireMapping(Foo.class, wire);
+ InvocationChain chain = new InvocationChainImpl(op);
+ wire.addInvocationChain(op, chain);
+ Map<Method, ChainHolder> chains = WireUtils.createInterfaceToWireMapping(Foo.class, wire);
assertEquals(1, chains.size());
assertNotNull(chains.get(m));
}
public void testCreateInterfaceToWireMappingNoOperation() throws Exception {
- OutboundWire wire = new OutboundWireImpl();
+ Wire wire = new WireImpl();
Operation<Type> op = new Operation<Type>("goodbye", null, null, null);
- OutboundInvocationChain chain = new OutboundInvocationChainImpl(op);
- wire.addOutboundInvocationChain(op, chain);
+ InvocationChain chain = new InvocationChainImpl(op);
+ wire.addInvocationChain(op, chain);
try {
WireUtils.createInterfaceToWireMapping(Foo.class, wire);
fail();
@@ -60,21 +58,21 @@
}
}
- public void testCreateInboundMapping() throws Exception {
- InboundWire wire = new InboundWireImpl();
+ public void testCreateMapping() throws Exception {
+ Wire wire = new WireImpl();
Operation<Type> op = new Operation<Type>("hello", null, null, null);
- InboundInvocationChain chain = new InboundInvocationChainImpl(op);
- wire.addInboundInvocationChain(op, chain);
- Map<Method, InboundInvocationChain> chains = WireUtils.createInboundMapping(wire, new Method[]{m});
+ InvocationChain chain = new InvocationChainImpl(op);
+ wire.addInvocationChain(op, chain);
+ Map<Method, InvocationChain> chains = WireUtils.createInboundMapping(wire, new Method[]{m});
assertEquals(1, chains.size());
assertNotNull(chains.get(m));
}
- public void testCreateInboundMappingNoOperation() throws Exception {
- InboundWire wire = new InboundWireImpl();
+ public void testCreateMappingNoOperation() throws Exception {
+ Wire wire = new WireImpl();
Operation<Type> op = new Operation<Type>("goodbye", null, null, null);
- InboundInvocationChain chain = new InboundInvocationChainImpl(op);
- wire.addInboundInvocationChain(op, chain);
+ InvocationChain chain = new InvocationChainImpl(op);
+ wire.addInvocationChain(op, chain);
try {
WireUtils.createInboundMapping(wire, new Method[]{m});
fail();
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=508732&r1=508731&r2=508732
==============================================================================
--- 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 Sat Feb 17 00:35:19 2007
@@ -5,25 +5,29 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.SCAExternalizable;
import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
import org.apache.tuscany.core.component.WorkContextImpl;
+import org.apache.tuscany.core.wire.WireImpl;
import org.easymock.EasyMock;
/**
* @version $Rev$ $Date$
*/
public class JDKCallbackInvocationHandlerSerializationTestCase extends TestCase {
- private InboundWire wire;
private WorkContext workContext;
+ private List<Wire> wires;
+ private AtomicComponent component;
public void testSerializeDeserialize() throws Exception {
- JDKCallbackInvocationHandler handler = new JDKCallbackInvocationHandler(wire, workContext);
+ JDKCallbackInvocationHandler handler = new JDKCallbackInvocationHandler(wires, workContext);
ByteArrayOutputStream stream = new ByteArrayOutputStream();
ObjectOutputStream ostream = new ObjectOutputStream(stream);
ostream.writeObject(handler);
@@ -33,17 +37,20 @@
externalizable.setWorkContext(workContext);
externalizable.reactivate();
- EasyMock.verify(wire);
+ EasyMock.verify(component);
}
protected void setUp() throws Exception {
super.setUp();
- wire = EasyMock.createMock(InboundWire.class);
URI uri = URI.create("#foo");
- EasyMock.expect(wire.getSourceUri()).andReturn(uri).atLeastOnce();
- EasyMock.replay(wire);
- AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
- EasyMock.expect(component.getInboundWire(EasyMock.eq("foo"))).andReturn(wire);
+ Wire wire = new WireImpl();
+ wire.setSourceUri(uri);
+ wires = new ArrayList<Wire>();
+ wires.add(wire);
+ List<Wire> wireList = new ArrayList<Wire>();
+ wireList.add(wire);
+ component = EasyMock.createMock(AtomicComponent.class);
+ EasyMock.expect(component.getWires("foo")).andReturn(wireList);
EasyMock.replay(component);
workContext = new WorkContextImpl();
workContext.setCurrentAtomicComponent(component);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerTestCase.java?view=diff&rev=508732&r1=508731&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKCallbackInvocationHandlerTestCase.java Sat Feb 17 00:35:19 2007
@@ -20,12 +20,15 @@
import java.lang.reflect.Proxy;
import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
import org.apache.tuscany.core.component.WorkContextImpl;
-import org.apache.tuscany.core.wire.InboundWireImpl;
+import org.apache.tuscany.core.wire.WireImpl;
/**
* @version $Rev$ $Date$
@@ -33,19 +36,25 @@
public class JDKCallbackInvocationHandlerTestCase extends TestCase {
public void testToString() {
- InboundWireImpl wire = new InboundWireImpl();
- wire.setSourceUri(URI.create("#wire"));
- wire.setServiceContract(new JavaServiceContract(Foo.class));
- JDKCallbackInvocationHandler handler = new JDKCallbackInvocationHandler(wire, new WorkContextImpl());
+ Wire wire = new WireImpl();
+ URI uri = URI.create("#wire");
+ wire.setSourceUri(uri);
+ List<Wire> wires = new ArrayList<Wire>();
+ wires.add(wire);
+ wire.setSourceContract(new JavaServiceContract(Foo.class));
+ JDKCallbackInvocationHandler handler = new JDKCallbackInvocationHandler(wires, new WorkContextImpl());
Foo foo = (Foo) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Foo.class}, handler);
assertNotNull(foo.toString());
}
public void testHashCode() {
- InboundWireImpl wire = new InboundWireImpl();
- wire.setServiceContract(new JavaServiceContract(Foo.class));
- wire.setSourceUri(URI.create("#wire"));
- JDKCallbackInvocationHandler handler = new JDKCallbackInvocationHandler(wire, new WorkContextImpl());
+ Wire wire = new WireImpl();
+ wire.setSourceContract(new JavaServiceContract(Foo.class));
+ URI uri = URI.create("#wire");
+ wire.setSourceUri(uri);
+ List<Wire> wires = new ArrayList<Wire>();
+ wires.add(wire);
+ JDKCallbackInvocationHandler handler = new JDKCallbackInvocationHandler(wires, new WorkContextImpl());
Foo foo = (Foo) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{Foo.class}, handler);
assertNotNull(foo.hashCode());
}
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java (from r507339, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerProxyTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java?view=diff&rev=508732&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerProxyTestCase.java&r1=507339&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerProxyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java Sat Feb 17 00:35:19 2007
@@ -24,51 +24,51 @@
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
import org.apache.tuscany.spi.model.Operation;
+import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.MessageImpl;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
-import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
-import org.apache.tuscany.core.wire.OutboundInvocationChainImpl;
-import org.apache.tuscany.core.wire.OutboundWireImpl;
+import org.apache.tuscany.core.wire.InvocationChainImpl;
+import org.apache.tuscany.core.wire.WireImpl;
import org.easymock.EasyMock;
/**
* @version $Rev$ $Date$
*/
-public class JDKOutboundInvocationHandlerProxyTestCase extends TestCase {
-
+public class JDKInvocationHandlerProxyTestCase extends TestCase {
private JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
- private OutboundWire wire;
private Method clientHello;
- private TargetInvoker targetInvoker;
+ /**
+ * Verifies a handler configured to use a different interface than the wire target can dispatch
+ */
public void testDifferentInterface() throws Throwable {
- JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(Client.class, wire, null);
+ Wire wire = new WireImpl();
+ JavaServiceContract contract = registry.introspect(Target.class);
+ for (Operation<?> operation : contract.getOperations().values()) {
+ InvocationChain chain = new InvocationChainImpl(operation);
+ wire.addInvocationChain(operation, chain);
+ }
+ wire.setSourceContract(contract);
+ wire.setSourceUri(URI.create("foo#bar"));
+ TargetInvoker targetInvoker = EasyMock.createMock(TargetInvoker.class);
+ EasyMock.expect(targetInvoker.invokeTarget(EasyMock.isNull(), EasyMock.eq(TargetInvoker.NONE)))
+ .andReturn(new MessageImpl());
+ EasyMock.expect(targetInvoker.isCacheable()).andReturn(false);
+ EasyMock.replay(targetInvoker);
+ wire.getInvocationChains().values().iterator().next().setTargetInvoker(targetInvoker);
+
+ JDKInvocationHandler handler = new JDKInvocationHandler(Client.class, wire, null);
handler.invoke(null, clientHello, null);
EasyMock.verify(targetInvoker);
}
protected void setUp() throws Exception {
super.setUp();
- wire = new OutboundWireImpl();
- JavaServiceContract contract = registry.introspect(Target.class);
- for (Operation<?> operation : contract.getOperations().values()) {
- OutboundInvocationChain chain = new OutboundInvocationChainImpl(operation);
- wire.addOutboundInvocationChain(operation, chain);
- targetInvoker = EasyMock.createMock(TargetInvoker.class);
- EasyMock.expect(targetInvoker.invokeTarget(EasyMock.isNull(), EasyMock.eq(TargetInvoker.NONE)))
- .andReturn(new MessageImpl());
- EasyMock.expect(targetInvoker.isCacheable()).andReturn(false);
- EasyMock.replay(targetInvoker);
- chain.setTargetInvoker(targetInvoker);
- }
- wire.setServiceContract(contract);
- wire.setSourceUri(URI.create("foo#bar"));
clientHello = Client.class.getMethod("hello");
-
}
private interface Target {
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerProxyTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerSerializationTestCase.java (from r507339, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerSerializationTestCase.java?view=diff&rev=508732&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java&r1=507339&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerSerializationTestCase.java&r2=508732
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandlerSerializationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerSerializationTestCase.java Sat Feb 17 00:35:19 2007
@@ -22,11 +22,11 @@
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.net.URI;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.SCAObject;
@@ -35,36 +35,36 @@
import org.apache.tuscany.spi.model.Operation;
import static org.apache.tuscany.spi.model.Operation.NO_CONVERSATION;
import org.apache.tuscany.spi.model.ServiceContract;
+import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.MessageImpl;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
-import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
import org.apache.tuscany.core.component.WorkContextImpl;
+import org.apache.tuscany.core.wire.InvocationChainImpl;
import org.apache.tuscany.core.wire.InvokerInterceptor;
-import org.apache.tuscany.core.wire.OutboundInvocationChainImpl;
import org.easymock.EasyMock;
/**
* @version $Rev$ $Date$
*/
-public class JDKOutboundInvocationHandlerSerializationTestCase extends TestCase {
- private OutboundWire wire;
+public class JDKInvocationHandlerSerializationTestCase extends TestCase {
+ private Wire wire;
private WorkContext workContext;
private TargetInvoker invoker;
public void testSerializeDeserialize() throws Throwable {
- JDKOutboundInvocationHandler handler =
- new JDKOutboundInvocationHandler(Foo.class, wire, workContext);
+ JDKInvocationHandler handler =
+ new JDKInvocationHandler(Foo.class, wire, workContext);
handler.invoke(Foo.class.getMethod("invoke"), null);
ByteArrayOutputStream stream = new ByteArrayOutputStream();
ObjectOutputStream ostream = new ObjectOutputStream(stream);
ostream.writeObject(handler);
ObjectInputStream istream = new ObjectInputStream(new ByteArrayInputStream(stream.toByteArray()));
- JDKOutboundInvocationHandler externalizable = (JDKOutboundInvocationHandler) istream.readObject();
+ JDKInvocationHandler externalizable = (JDKInvocationHandler) istream.readObject();
externalizable.setWorkContext(workContext);
externalizable.reactivate();
@@ -82,8 +82,8 @@
contract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
EasyMock.expect(container.getUri()).andReturn(URI.create("bar")).atLeastOnce();
- wire = EasyMock.createMock(OutboundWire.class);
- Map<Operation<?>, OutboundInvocationChain> map = new HashMap<Operation<?>, OutboundInvocationChain>();
+ wire = EasyMock.createMock(Wire.class);
+ Map<Operation<?>, InvocationChain> map = new HashMap<Operation<?>, InvocationChain>();
Operation<Object> operation = new Operation<Object>("invoke", null, null, null, false, null, NO_CONVERSATION);
ServiceContract<Object> opContract = new ServiceContract<Object>() {
};
@@ -91,17 +91,15 @@
contract.setInteractionScope(InteractionScope.NONCONVERSATIONAL);
operation.setServiceContract(opContract);
map.put(operation, createChain(operation));
- EasyMock.expect(wire.getServiceContract()).andReturn(contract).atLeastOnce();
+ EasyMock.expect(wire.getSourceContract()).andReturn(contract).atLeastOnce();
URI uri = URI.create("#foo");
EasyMock.expect(wire.getSourceUri()).andReturn(uri).atLeastOnce();
- EasyMock.expect(wire.getOutboundInvocationChains()).andReturn(map).times(2);
+ EasyMock.expect(wire.getInvocationChains()).andReturn(map).times(2);
EasyMock.replay(wire);
- Map<String, List<OutboundWire>> wires = new HashMap<String, List<OutboundWire>>();
- List<OutboundWire> list = new ArrayList<OutboundWire>();
+ List<Wire> list = new ArrayList<Wire>();
list.add(wire);
- wires.put("foo", list);
AtomicComponent component = EasyMock.createMock(AtomicComponent.class);
- EasyMock.expect(component.getOutboundWires()).andReturn(wires);
+ EasyMock.expect(component.getWires("foo")).andReturn(list);
EasyMock.replay(component);
workContext = new WorkContextImpl();
workContext.setCurrentAtomicComponent(component);
@@ -112,15 +110,14 @@
workContext.setCurrentAtomicComponent(null);
}
- private OutboundInvocationChain createChain(Operation operation) {
+ private InvocationChain createChain(Operation operation) {
invoker = EasyMock.createMock(TargetInvoker.class);
EasyMock.expect(invoker.invoke(EasyMock.isA(Message.class))).andReturn(new MessageImpl()).times(2);
EasyMock.expect(invoker.isCacheable()).andReturn(false).atLeastOnce();
EasyMock.replay(invoker);
- OutboundInvocationChain chain = new OutboundInvocationChainImpl(operation);
+ InvocationChain chain = new InvocationChainImpl(operation);
chain.setTargetInvoker(invoker);
chain.addInterceptor(new InvokerInterceptor());
- chain.prepare();
return chain;
}
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerSerializationTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/wire/jdk/JDKInvocationHandlerSerializationTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org