Author: jmarino
Date: Tue Jan 2 06:02:48 2007
New Revision: 491796
URL: http://svn.apache.org/viewvc?view=rev&rev=491796
Log:
remove dead code; consolidate test case
Removed:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceBinding.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AbstractLocalWiringTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeReferenceTestCase.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/LocalReferenceWiringTestCase.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/LocalReferenceWiringTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/LocalReferenceWiringTestCase.java?view=diff&rev=491796&r1=491795&r2=491796
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/LocalReferenceWiringTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/LocalReferenceWiringTestCase.java
Tue Jan 2 06:02:48 2007
@@ -2,17 +2,25 @@
import javax.xml.namespace.QName;
+import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.ReferenceBinding;
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.component.ServiceBinding;
-import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.TargetInvokerCreationException;
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.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.core.binding.local.LocalReferenceBinding;
+import org.apache.tuscany.core.binding.local.LocalServiceBinding;
+import org.apache.tuscany.core.implementation.composite.ReferenceImpl;
import org.apache.tuscany.core.implementation.composite.ServiceImpl;
import org.apache.tuscany.core.mock.binding.MockServiceBinding;
import org.apache.tuscany.core.wire.InboundInvocationChainImpl;
@@ -29,9 +37,10 @@
*
* @version $Rev$ $Date$
*/
-public class LocalReferenceWiringTestCase extends AbstractLocalWiringTestCase {
+public class LocalReferenceWiringTestCase extends
AbstractConnectorImplTestCase {
private Service service;
private Reference reference;
+ protected ReferenceBinding referenceBinding;
private AtomicComponent atomicComponent;
/**
@@ -121,7 +130,7 @@
EasyMock.replay(parent);
service = createLocalService(topComposite);
- reference = createLocalReference(parent,
AbstractLocalWiringTestCase.TARGET_NAME);
+ reference = createLocalReference(parent, TARGET_NAME);
}
private void createLocalReferenceToInvalidServiceConfiguration() throws
Exception {
@@ -139,7 +148,7 @@
EasyMock.replay(parent);
service = createService();
- reference = createLocalReference(parent,
AbstractLocalWiringTestCase.TARGET_NAME);
+ reference = createLocalReference(parent, TARGET_NAME);
}
private void createLocalReferenceToSiblingCompositeServiceConfiguration()
throws Exception {
@@ -240,6 +249,70 @@
Service service = new ServiceImpl(TARGET, null, contract);
service.addServiceBinding(serviceBinding);
return service;
+ }
+
+ /**
+ * Creates a service configured with the local binding and places an
invoker interceptor on the end of each outbound
+ * chain for invocation testing without needing to wire the service to a
target
+ *
+ * @throws org.apache.tuscany.core.builder.WireConnectException
+ *
+ */
+ private Service createLocalService(CompositeComponent parent) throws
WireConnectException {
+ LocalServiceBinding serviceBinding = new LocalServiceBinding(TARGET,
parent);
+ InboundInvocationChain targetInboundChain = new
InboundInvocationChainImpl(operation);
+ targetInboundChain.addInterceptor(new
SynchronousBridgingInterceptor());
+ InboundWire targetInboundWire = new InboundWireImpl();
+ targetInboundWire.setServiceContract(contract);
+ targetInboundWire.addInvocationChain(operation, targetInboundChain);
+ targetInboundWire.setContainer(serviceBinding);
+
+ OutboundInvocationChain targetOutboundChain = new
OutboundInvocationChainImpl(operation);
+ // place an invoker interceptor on the end
+ targetOutboundChain.addInterceptor(new InvokerInterceptor());
+ OutboundWire targetOutboundWire = new OutboundWireImpl();
+ targetOutboundWire.setServiceContract(contract);
+ targetOutboundWire.addInvocationChain(operation, targetOutboundChain);
+ targetOutboundWire.setContainer(serviceBinding);
+
+ serviceBinding.setInboundWire(targetInboundWire);
+ serviceBinding.setOutboundWire(targetOutboundWire);
+ // manually connect the service chains
+ connector.connect(targetInboundChain, targetOutboundChain);
+ Service service = new ServiceImpl(TARGET, null, contract);
+ service.addServiceBinding(serviceBinding);
+ return service;
+ }
+
+ private Reference createLocalReference(CompositeComponent parent,
QualifiedName target) throws Exception {
+ ReferenceBinding referenceBinding =
createLocalReferenceBinding(target);
+ Reference reference = new ReferenceImpl("foo", parent, contract);
+ reference.addReferenceBinding(referenceBinding);
+ return reference;
+ }
+
+ private ReferenceBinding createLocalReferenceBinding(QualifiedName target)
+ throws TargetInvokerCreationException {
+ referenceBinding = new LocalReferenceBinding("local", null);
+ InboundInvocationChain inboundChain = new
InboundInvocationChainImpl(operation);
+ InboundWire inboundWire = new InboundWireImpl();
+ inboundWire.setServiceContract(contract);
+ inboundWire.setContainer(referenceBinding);
+ inboundWire.addInvocationChain(operation, inboundChain);
+
+ OutboundInvocationChain outboundChain = new
OutboundInvocationChainImpl(operation);
+ // Outbound chains always contains at least one interceptor
+ outboundChain.addInterceptor(new SynchronousBridgingInterceptor());
+ OutboundWire outboundWire = new OutboundWireImpl();
+ outboundWire.setServiceContract(contract);
+ outboundWire.setTargetName(target);
+ outboundWire.addInvocationChain(operation, outboundChain);
+ outboundWire.setContainer(referenceBinding);
+
+ referenceBinding.setInboundWire(inboundWire);
+ referenceBinding.setOutboundWire(outboundWire);
+
+ return referenceBinding;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
