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/01/07 10:09:48 UTC
svn commit: r493685 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/implementation/composite/
core/src/test/java/org/apache/tuscany/core/implementation/composite/
spi/src/test/java/org/apache/tuscany/spi/extension/
Author: jmarino
Date: Sun Jan 7 01:09:48 2007
New Revision: 493685
URL: http://svn.apache.org/viewvc?view=rev&rev=493685
Log:
fix default service locate
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContext.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContextTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContext.java?view=diff&rev=493685&r1=493684&r2=493685
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContext.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContext.java Sun Jan 7 01:09:48 2007
@@ -63,13 +63,10 @@
InboundWire wire;
if (child instanceof CompositeComponent) {
CompositeComponent childComposite = (CompositeComponent) child;
- child = childComposite.getChild(qName.getPortName());
- if (child == null) {
+ wire = childComposite.getInboundWire(qName.getPortName());
+ if (wire == null) {
throw new ServiceRuntimeException("Service not found [" + serviceName + "]");
- } else if (!(child instanceof Service)) {
- throw new ServiceRuntimeException("Child not a service [" + serviceName + "]");
}
- wire = getInboundWire(child, name, "");
} else {
wire = getInboundWire(child, name, qName.getPortName());
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContextTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContextTestCase.java?view=diff&rev=493685&r1=493684&r2=493685
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContextTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeContextTestCase.java Sun Jan 7 01:09:48 2007
@@ -201,17 +201,10 @@
public void testCompositeLocate() throws Exception {
InboundWire wire = EasyMock.createMock(InboundWire.class);
- EasyMock.expect(wire.getBindingType()).andReturn(InboundWire.LOCAL_BINDING);
EasyMock.expect(wire.isOptimizable()).andReturn(false);
EasyMock.replay(wire);
- ServiceBinding serviceBinding = EasyMock.createMock(ServiceBinding.class);
- serviceBinding.setService(EasyMock.isA(Service.class));
- EasyMock.expect(serviceBinding.getInboundWire()).andReturn(wire).atLeastOnce();
- EasyMock.replay(serviceBinding);
- Service service = new ServiceImpl("Foo", null, null);
- service.addServiceBinding(serviceBinding);
CompositeComponent child = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(child.getChild("Bar")).andReturn(service);
+ EasyMock.expect(child.getInboundWire("Bar")).andReturn(wire);
EasyMock.replay(child);
CompositeComponent composite = EasyMock.createMock(CompositeComponent.class);
EasyMock.expect(composite.getChild("Foo")).andReturn(child);
@@ -229,12 +222,11 @@
EasyMock.verify(composite);
EasyMock.verify(wire);
EasyMock.verify(child);
- EasyMock.verify(serviceBinding);
}
public void testCompositeLocateNotAService() throws Exception {
CompositeComponent child = EasyMock.createMock(CompositeComponent.class);
- EasyMock.expect(child.getChild("Bar")).andReturn(EasyMock.createNiceMock(AtomicComponent.class));
+ EasyMock.expect(child.getInboundWire("Bar")).andReturn(null);
EasyMock.replay(child);
CompositeComponent composite = EasyMock.createMock(CompositeComponent.class);
EasyMock.expect(composite.getChild("Foo")).andReturn(child);
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java?view=diff&rev=493685&r1=493684&r2=493685
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/CompositeComponentExtensionTestCase.java Sun Jan 7 01:09:48 2007
@@ -22,6 +22,8 @@
import java.util.Collections;
import java.util.List;
+import javax.xml.namespace.QName;
+
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.Service;
@@ -61,6 +63,26 @@
EasyMock.replay(service);
composite.register(service);
assertEquals(wire, composite.getInboundWire(null));
+ }
+
+ public void testNoLocalBinding() throws Exception {
+ InboundWire wire = EasyMock.createMock(InboundWire.class);
+ EasyMock.expect(wire.getServiceContract()).andReturn(contract).atLeastOnce();
+ EasyMock.expect(wire.getBindingType()).andReturn(new QName("foo","foo")).atLeastOnce();
+ EasyMock.replay(wire);
+ ServiceBinding binding = EasyMock.createMock(ServiceBinding.class);
+ EasyMock.expect(binding.getInboundWire()).andReturn(wire).atLeastOnce();
+ EasyMock.replay(binding);
+ Service service = EasyMock.createMock(Service.class);
+ EasyMock.expect(service.getName()).andReturn("service").atLeastOnce();
+ EasyMock.expect(service.isSystem()).andReturn(false).atLeastOnce();
+ service.getServiceBindings();
+ List<ServiceBinding> bindings = new ArrayList<ServiceBinding>();
+ bindings.add(binding);
+ EasyMock.expectLastCall().andReturn(bindings).atLeastOnce();
+ EasyMock.replay(service);
+ composite.register(service);
+ assertNull(composite.getInboundWire("service"));
}
public void testDefaultSystemInboundWire() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org