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/03/15 09:15:46 UTC
svn commit: r518507 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/builder/
test/java/org/apache/tuscany/core/builder/
Author: jmarino
Date: Thu Mar 15 01:15:45 2007
New Revision: 518507
URL: http://svn.apache.org/viewvc?view=rev&rev=518507
Log:
add testcases for wire creation in connector; fix bug where interceptor builders were being dispatched to twice for callback chains
Added:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplCreateWireTestCase.java (with props)
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/ConnectorImplWireTestCase.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=518507&r1=518506&r2=518507
==============================================================================
--- 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 Mar 15 01:15:45 2007
@@ -285,14 +285,6 @@
}
wire.addInvocationChain(operation, chain);
}
- for (PhysicalOperationDefinition operation : definition.getCallbackOperations()) {
- InvocationChain chain = new InvocationChainImpl(operation);
- for (PhysicalInterceptorDefinition interceptorDefinition : operation.getInterceptors()) {
- Interceptor interceptor = interceptorBuilderRegistry.build(interceptorDefinition);
- chain.addInterceptor(interceptor);
- }
- wire.addInvocationChain(operation, chain);
- }
return wire;
}
Added: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplCreateWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplCreateWireTestCase.java?view=auto&rev=518507
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplCreateWireTestCase.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplCreateWireTestCase.java Thu Mar 15 01:15:45 2007
@@ -0,0 +1,109 @@
+/*
+ * 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.net.URI;
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.spi.builder.BuilderException;
+import org.apache.tuscany.spi.builder.interceptor.InterceptorBuilder;
+import org.apache.tuscany.spi.builder.interceptor.InterceptorBuilderRegistry;
+import org.apache.tuscany.spi.model.physical.PhysicalInterceptorDefinition;
+import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
+import org.apache.tuscany.spi.model.physical.PhysicalWireDefinition;
+import org.apache.tuscany.spi.model.physical.PhysicalWireSourceDefinition;
+import org.apache.tuscany.spi.model.physical.PhysicalWireTargetDefinition;
+import org.apache.tuscany.spi.wire.Wire;
+
+import junit.framework.TestCase;
+import org.apache.tuscany.core.builder.interceptor.InterceptorBuilderRegistryImpl;
+import org.easymock.EasyMock;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ConnectorImplCreateWireTestCase extends TestCase {
+
+ public void testCreateWire() throws Exception {
+ TestConnector connector = new TestConnector();
+ PhysicalWireDefinition definition = new PhysicalWireDefinition();
+ PhysicalWireSourceDefinition sourceDefinition = new PhysicalWireSourceDefinition();
+ sourceDefinition.setUri(URI.create("source"));
+ PhysicalWireTargetDefinition targetDefinition = new PhysicalWireTargetDefinition();
+ targetDefinition.setUri(URI.create("target"));
+ definition.setSource(sourceDefinition);
+ definition.setTarget(targetDefinition);
+ PhysicalOperationDefinition operation = new PhysicalOperationDefinition();
+ operation.setName("operation");
+ definition.addOperation(operation);
+ PhysicalOperationDefinition callback = new PhysicalOperationDefinition();
+ callback.setName("callback");
+ callback.setCallback(true);
+ definition.addOperation(callback);
+ Wire wire = connector.createWire(definition);
+ assertEquals(2, wire.getPhysicalInvocationChains().size());
+ }
+
+ public void testDispatchToBuilder() throws Exception {
+ QName qName = new QName("interceptor");
+ InterceptorBuilder builder = EasyMock.createMock(InterceptorBuilder.class);
+ EasyMock.expect(builder.build(EasyMock.isA(PhysicalInterceptorDefinition.class))).andReturn(null).times(2);
+ EasyMock.replay(builder);
+ InterceptorBuilderRegistryImpl regisry = new InterceptorBuilderRegistryImpl();
+ regisry.register(qName, builder);
+ TestConnector connector = new TestConnector(regisry);
+ PhysicalWireDefinition definition = new PhysicalWireDefinition();
+ PhysicalWireSourceDefinition sourceDefinition = new PhysicalWireSourceDefinition();
+ sourceDefinition.setUri(URI.create("source"));
+ PhysicalWireTargetDefinition targetDefinition = new PhysicalWireTargetDefinition();
+ targetDefinition.setUri(URI.create("target"));
+ definition.setSource(sourceDefinition);
+ definition.setTarget(targetDefinition);
+ PhysicalInterceptorDefinition interceptorDefinition = new PhysicalInterceptorDefinition();
+ interceptorDefinition.setBuilder(qName);
+
+ PhysicalOperationDefinition operation = new PhysicalOperationDefinition();
+ operation.setName("operation");
+ operation.addInterceptor(interceptorDefinition);
+ definition.addOperation(operation);
+ PhysicalOperationDefinition callback = new PhysicalOperationDefinition();
+ callback.setName("callback");
+ callback.setCallback(true);
+ callback.addInterceptor(interceptorDefinition);
+ definition.addOperation(callback);
+ Wire wire = connector.createWire(definition);
+ assertEquals(2, wire.getPhysicalInvocationChains().size());
+ }
+
+ private class TestConnector extends ConnectorImpl {
+
+ public TestConnector() {
+ super(null);
+ }
+
+ public TestConnector(InterceptorBuilderRegistry regisry) {
+ super(regisry, null, null, null, null, null);
+ }
+
+
+ public Wire createWire(PhysicalWireDefinition definition) throws BuilderException {
+ return super.createWire(definition);
+ }
+ }
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplCreateWireTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplCreateWireTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplWireTestCase.java?view=diff&rev=518507&r1=518506&r2=518507
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ConnectorImplWireTestCase.java Thu Mar 15 01:15:45 2007
@@ -47,7 +47,6 @@
private ServiceContract<?> contract;
public void testConnectWireDefinition() throws Exception {
-
AtomicComponent source = EasyMock.createMock(AtomicComponent.class);
EasyMock.expect(source.getUri()).andReturn(SOURCE_URI).atLeastOnce();
EasyMock.replay(source);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org