Author: jmarino
Date: Thu Jan  4 03:04:44 2007
New Revision: 492520

URL: http://svn.apache.org/viewvc?view=rev&rev=492520
Log:
separate out callback connection test cases

Added:
    
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/CallbackConnectionTestCase.java
   (with props)
Modified:
    
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AbstractConnectorImplTestCase.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/test/java/org/apache/tuscany/core/builder/AbstractConnectorImplTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AbstractConnectorImplTestCase.java?view=diff&rev=492520&r1=492519&r2=492520
==============================================================================
--- 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AbstractConnectorImplTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/AbstractConnectorImplTestCase.java
 Thu Jan  4 03:04:44 2007
@@ -63,7 +63,7 @@
         super.setUp();
         WireService wireService = new JDKWireService(null, null);
         connector = new ConnectorImpl(wireService, null, null, null);
-        contract = new 
JavaServiceContract(AbstractConnectorImplTestCase.Foo.class);
+        contract = new JavaServiceContract(Foo.class);
         operation = new Operation<Type>("bar", null, null, null);
     }
 

Added: 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/CallbackConnectionTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/CallbackConnectionTestCase.java?view=auto&rev=492520
==============================================================================
--- 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/CallbackConnectionTestCase.java
 (added)
+++ 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/CallbackConnectionTestCase.java
 Thu Jan  4 03:04:44 2007
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.core.builder;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.spi.component.AtomicComponent;
+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.InboundInvocationChain;
+import org.apache.tuscany.spi.wire.InboundWire;
+import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.TargetInvoker;
+import org.apache.tuscany.spi.wire.WireService;
+
+import junit.framework.TestCase;
+import org.apache.tuscany.core.wire.InboundWireImpl;
+import org.apache.tuscany.core.wire.OutboundWireImpl;
+import org.apache.tuscany.core.wire.jdk.JDKWireService;
+import org.easymock.EasyMock;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class CallbackConnectionTestCase extends TestCase {
+    private Operation<Type> operation;
+    private ServiceContract<Type> contract;
+    private ConnectorImpl connector;
+
+    public void testAtomicOutboundInboundCallbackConnect() throws Exception {
+        AtomicComponent container = EasyMock.createMock(AtomicComponent.class);
+        EasyMock.expect(container.isSystem()).andReturn(false).anyTimes();
+        EasyMock.expect(container.getName()).andReturn("source").atLeastOnce();
+        EasyMock.expect(container.createTargetInvoker(EasyMock.eq("bar"),
+            EasyMock.isA(Operation.class),
+            (InboundWire) 
EasyMock.isNull())).andReturn(EasyMock.createNiceMock(TargetInvoker.class));
+        EasyMock.replay(container);
+
+        InboundWire inboundWire = new InboundWireImpl();
+        inboundWire.setContainer(container);
+        inboundWire.setServiceContract(contract);
+        OutboundWire outboundWire = new OutboundWireImpl();
+        outboundWire.setContainer(container);
+        outboundWire.setServiceContract(contract);
+
+        InboundInvocationChain inboundChain = 
EasyMock.createMock(InboundInvocationChain.class);
+        
EasyMock.expect(inboundChain.getOperation()).andReturn(operation).anyTimes();
+        Interceptor interceptor = EasyMock.createNiceMock(Interceptor.class);
+        
EasyMock.expect(inboundChain.getHeadInterceptor()).andReturn(interceptor);
+        EasyMock.replay(inboundChain);
+        Map<Operation<?>, InboundInvocationChain> chains = new 
HashMap<Operation<?>, InboundInvocationChain>();
+        chains.put(operation, inboundChain);
+        outboundWire.addTargetCallbackInvocationChains(chains);
+
+        connector.connect(outboundWire, inboundWire, true);
+        EasyMock.verify(inboundChain);
+        EasyMock.verify(container);
+
+    }
+
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        WireService wireService = new JDKWireService(null, null);
+        connector = new ConnectorImpl(wireService, null, null, null);
+        operation = new Operation<Type>("bar", null, null, null);
+        contract = new JavaServiceContract();
+        Map<String, Operation<Type>> ops = new HashMap<String, 
Operation<Type>>();
+        ops.put("bar", operation);
+        contract.setCallbackOperations(ops);
+    }
+
+}

Propchange: 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/CallbackConnectionTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/CallbackConnectionTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

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=492520&r1=492519&r2=492520
==============================================================================
--- 
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 03:04:44 2007
@@ -160,41 +160,6 @@
         EasyMock.verify(container);
     }
 
-    public void testOutboundInboundCallbackConnect() throws Exception {
-        AtomicComponent container = EasyMock.createMock(AtomicComponent.class);
-        EasyMock.expect(container.isSystem()).andReturn(false).anyTimes();
-        EasyMock.expect(container.getName()).andReturn("source").atLeastOnce();
-        EasyMock.expect(container.createTargetInvoker(EasyMock.eq("bar"),
-            EasyMock.isA(Operation.class),
-            (InboundWire) 
EasyMock.isNull())).andReturn(EasyMock.createNiceMock(TargetInvoker.class));
-        EasyMock.replay(container);
-        Operation<Type> operation = new Operation<Type>("bar", null, null, 
null);
-        ServiceContract<Type> contract = new JavaServiceContract();
-        Map<String, Operation<Type>> ops = new HashMap<String, 
Operation<Type>>();
-        ops.put("bar", operation);
-        contract.setCallbackOperations(ops);
-        InboundWire inboundWire = new InboundWireImpl();
-        inboundWire.setContainer(container);
-        inboundWire.setServiceContract(contract);
-        OutboundWire outboundWire = new OutboundWireImpl();
-        outboundWire.setContainer(container);
-        outboundWire.setServiceContract(contract);
-
-        InboundInvocationChain inboundChain = 
EasyMock.createMock(InboundInvocationChain.class);
-        
EasyMock.expect(inboundChain.getOperation()).andReturn(operation).anyTimes();
-        Interceptor interceptor = EasyMock.createNiceMock(Interceptor.class);
-        
EasyMock.expect(inboundChain.getHeadInterceptor()).andReturn(interceptor);
-        EasyMock.replay(inboundChain);
-        Map<Operation<?>, InboundInvocationChain> chains = new 
HashMap<Operation<?>, InboundInvocationChain>();
-        chains.put(operation, inboundChain);
-        outboundWire.addTargetCallbackInvocationChains(chains);
-
-        connector.connect(outboundWire, inboundWire, true);
-        EasyMock.verify(inboundChain);
-        EasyMock.verify(container);
-
-    }
-
     public void testIncompatibleInboundOutboundWiresConnect() throws Exception 
{
         Operation<Type> operation = new Operation<Type>("bar", null, null, 
null);
         InboundWire inboundWire = new InboundWireImpl();



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

Reply via email to