svn commit: r492489 - in /incubator/tuscany/java/sca/kernel/core/src: main/java/org/apache/tuscany/core/builder/ConnectorImpl.java test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java

[jmarino]

Author: jmarino
Date: Thu Jan  4 02:02:04 2007
New Revision: 492489

URL: http://svn.apache.org/viewvc?view=rev&rev=492489
Log:
more unit testing

Modified:
    
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
    
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java

Modified: 
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?view=diff&rev=492489&r1=492488&r2=492489
==============================================================================
--- 
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
 (original)
+++ 
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
 Thu Jan  4 02:02:04 2007
@@ -138,13 +138,13 @@
         assert source != null;
         SCAObject target = targetWire.getContainer();
         assert target != null;
-        ServiceContract contract = sourceWire.getServiceContract();
         Map<Operation<?>, InboundInvocationChain> targetChains = 
targetWire.getInvocationChains();
         if (sourceWire.getContainer() != null && 
sourceWire.getContainer().isSystem()) {
             sourceWire.setTargetWire(targetWire);
             // system services do not need to have their chains processed, 
return
             return;
         }
+        ServiceContract contract = sourceWire.getServiceContract();
         // match outbound to inbound chains
         for (OutboundInvocationChain outboundChain : 
sourceWire.getInvocationChains().values()) {
             Operation<?> operation = outboundChain.getOperation();

Modified: 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java?view=diff&rev=492489&r1=492488&r2=492489
==============================================================================
--- 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplTestCase.java
 Thu Jan  4 02:02:04 2007
@@ -35,6 +35,7 @@
 import org.apache.tuscany.core.wire.InvokerInterceptor;
 import org.apache.tuscany.core.wire.OutboundInvocationChainImpl;
 import org.apache.tuscany.core.wire.SynchronousBridgingInterceptor;
+import org.apache.tuscany.core.wire.OutboundWireImpl;
 import org.easymock.EasyMock;
 
 /**
@@ -65,7 +66,6 @@
         inboundWire.setContainer(container);
         OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
         outboundWire.setTargetWire(EasyMock.eq(inboundWire));
-        EasyMock.expect(outboundWire.getServiceContract()).andReturn(null);
         
EasyMock.expect(outboundWire.getContainer()).andReturn(container).atLeastOnce();
         EasyMock.replay(outboundWire);
 
@@ -121,6 +121,36 @@
         } catch (WireConnectException e) {
             // expected
         }
+    }
+
+    public void testInboundOutboundSystemWireOptimization() throws Exception {
+        SCAObject container = EasyMock.createMock(SCAObject.class);
+        EasyMock.expect(container.isSystem()).andReturn(true);
+        EasyMock.replay(container);
+        InboundWire inboundWire = EasyMock.createMock(InboundWire.class);
+        inboundWire.setTargetWire(EasyMock.isA(OutboundWire.class));
+        
EasyMock.expect(inboundWire.getContainer()).andReturn(container).atLeastOnce();
+        EasyMock.replay(inboundWire);
+        OutboundWire outboundWire = new OutboundWireImpl();
+        outboundWire.setContainer(container);
+        connector.connect(inboundWire, outboundWire, true);
+        EasyMock.verify(inboundWire);
+        EasyMock.verify(container);
+    }
+
+    public void testOutboundInboundSystemWireOptimization() throws Exception {
+        SCAObject container = EasyMock.createMock(SCAObject.class);
+        EasyMock.expect(container.isSystem()).andReturn(true);
+        EasyMock.replay(container);
+        OutboundWire outboundWire = EasyMock.createMock(OutboundWire.class);
+        outboundWire.setTargetWire(EasyMock.isA(InboundWire.class));
+        
EasyMock.expect(outboundWire.getContainer()).andReturn(container).atLeastOnce();
+        EasyMock.replay(outboundWire);
+        InboundWire inboundWire = new InboundWireImpl();
+        inboundWire.setContainer(container);
+        connector.connect(outboundWire, inboundWire, true);
+        EasyMock.verify(outboundWire);
+        EasyMock.verify(container);
     }
 
     public void testInvalidConnectObject() throws Exception {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]