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/02/11 23:27:36 UTC
svn commit: r506157 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/builder/
core/src/test/java/org/apache/tuscany/core/builder/
core/src/test/java/org/apache/tuscany/core/implementation/composite/
spi/src/main/java/...
Author: jmarino
Date: Sun Feb 11 14:27:35 2007
New Revision: 506157
URL: http://svn.apache.org/viewvc?view=rev&rev=506157
Log:
remove need for CompositeComponent.getChild() and fix handling of service and reference fragment names now that child components are no longer registered with their parents
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
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/LocalReferenceWiringTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/DuplicateRegistrationTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.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/builder/BuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java?view=diff&rev=506157&r1=506156&r2=506157
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java Sun Feb 11 14:27:35 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.core.builder;
import java.net.URI;
-import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.Map;
@@ -27,7 +26,6 @@
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.BindingBuilder;
-import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.builder.BuilderException;
import org.apache.tuscany.spi.builder.BuilderInstantiationException;
import org.apache.tuscany.spi.builder.BuilderRegistry;
@@ -36,10 +34,10 @@
import org.apache.tuscany.spi.builder.ScopeNotFoundException;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.RegistrationException;
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.RegistrationException;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.component.Service;
@@ -73,7 +71,7 @@
private ComponentManager componentManager;
private final Map<Class<? extends Implementation<?>>, ComponentBuilder<? extends Implementation<?>>>
- componentBuilders =
+ componentBuilders =
new HashMap<Class<? extends Implementation<?>>, ComponentBuilder<? extends Implementation<?>>>();
private final Map<Class<? extends BindingDefinition>, BindingBuilder<? extends BindingDefinition>> bindingBuilders =
new HashMap<Class<? extends BindingDefinition>, BindingBuilder<? extends BindingDefinition>>();
@@ -167,7 +165,7 @@
public Service build(CompositeComponent parent,
ServiceDefinition serviceDefinition,
DeploymentContext deploymentContext) throws BuilderException {
- String name = serviceDefinition.getUri().getFragment();
+ URI uri = serviceDefinition.getUri();
ServiceContract<?> serviceContract = serviceDefinition.getServiceContract();
if (serviceDefinition.getBindings().isEmpty()) {
// if no bindings are configured, default to the local binding.
@@ -178,13 +176,7 @@
}
}
URI targetUri = serviceDefinition.getTarget();
- URI serviceUri;
- try {
- serviceUri = new URI(name);
- } catch (URISyntaxException e) {
- throw new BuilderConfigException(e);
- }
- Service service = new ServiceImpl(serviceUri, parent, serviceContract, targetUri);
+ Service service = new ServiceImpl(uri, parent, serviceContract, targetUri);
for (BindingDefinition definition : serviceDefinition.getBindings()) {
Class<?> bindingClass = definition.getClass();
// noinspection SuspiciousMethodCalls
@@ -195,13 +187,12 @@
ServiceBinding binding =
bindingBuilder.build(parent, serviceDefinition, definition, deploymentContext);
if (wireService != null) {
- URI uri = serviceDefinition.getTarget();
- if (uri == null) {
- throw new MissingWireTargetException("Service uri not specified");
+ if (targetUri == null) {
+ throw new MissingWireTargetException("Service target uri not specified");
}
//String path = uri.getPath();
ServiceContract<?> contract = serviceDefinition.getServiceContract();
- wireService.createWires(binding, contract, uri.toString());
+ wireService.createWires(binding, contract, targetUri.toString());
}
service.addServiceBinding(binding);
}
@@ -212,7 +203,7 @@
public Reference build(CompositeComponent parent,
ReferenceDefinition referenceDefinition,
DeploymentContext context) throws BuilderException {
- String name = referenceDefinition.getUri().getFragment();
+ URI uri = referenceDefinition.getUri();
ServiceContract<?> contract = referenceDefinition.getServiceContract();
if (referenceDefinition.getBindings().isEmpty()) {
// if no bindings are configured, default to the local binding.
@@ -223,13 +214,7 @@
}
}
- URI referenceUri;
- try {
- referenceUri = new URI(name);
- } catch (URISyntaxException e) {
- throw new BuilderConfigException(e);
- }
- Reference reference = new ReferenceImpl(referenceUri, parent, contract);
+ Reference reference = new ReferenceImpl(uri, parent, contract);
for (BindingDefinition bindingDefinition : referenceDefinition.getBindings()) {
Class<?> bindingClass = bindingDefinition.getClass();
// noinspection SuspiciousMethodCalls
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=506157&r1=506156&r2=506157
==============================================================================
--- 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 Sun Feb 11 14:27:35 2007
@@ -70,6 +70,7 @@
*/
public abstract class AbstractConnectorImplTestCase extends TestCase {
protected static final URI TARGET = URI.create("target");
+ protected static final URI SERVICE_TARGET = URI.create("#target");
protected static final String TARGET_FRAGMENT = "Foo";
protected static final URI TARGET_NAME = URI.create("target#Foo");
protected static final String RESPONSE = "response";
@@ -176,11 +177,11 @@
*
*/
protected Service createLocalService(CompositeComponent parent) throws WireConnectException {
- LocalServiceBinding serviceBinding = new LocalServiceBinding(TARGET, parent);
+ LocalServiceBinding serviceBinding = new LocalServiceBinding(SERVICE_TARGET, parent);
InboundInvocationChain targetInboundChain = new InboundInvocationChainImpl(operation);
targetInboundChain.addInterceptor(new SynchronousBridgingInterceptor());
InboundWire localServiceInboundWire = new InboundWireImpl();
- localServiceInboundWire.setUri(TARGET);
+ localServiceInboundWire.setUri(SERVICE_TARGET);
localServiceInboundWire.setServiceContract(contract);
localServiceInboundWire.addInvocationChain(operation, targetInboundChain);
localServiceInboundWire.setContainer(serviceBinding);
@@ -197,7 +198,7 @@
serviceBinding.setOutboundWire(targetOutboundWire);
// manually connect the service chains
connector.connect(targetInboundChain, targetOutboundChain);
- Service service = new ServiceImpl(TARGET, null, contract);
+ Service service = new ServiceImpl(SERVICE_TARGET, null, contract);
service.addServiceBinding(serviceBinding);
return service;
}
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=506157&r1=506156&r2=506157
==============================================================================
--- 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 Sun Feb 11 14:27:35 2007
@@ -90,7 +90,7 @@
private Reference createLocalReference(CompositeComponent parent, URI target) throws Exception {
- URI uri = URI.create("reference");
+ URI uri = URI.create("#reference");
referenceBinding = createLocalReferenceBinding(uri, target);
Reference reference = new ReferenceImpl(uri, parent, contract);
reference.addReferenceBinding(referenceBinding);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java?view=diff&rev=506157&r1=506156&r2=506157
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java Sun Feb 11 14:27:35 2007
@@ -23,7 +23,6 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainerMonitor;
-import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
@@ -93,7 +92,7 @@
mgr.register(component); // manually register this
component.start();
CompositeComponent sourceComponent = (CompositeComponent) mgr.getComponent(SOURCE_COMPONENT);
- assertTrue(sourceComponent.getChild("InnerSourceService") instanceof Service);
+ assertNotNull(sourceComponent.getInboundWire("InnerSourceService"));
AtomicComponent innerSourceComponent = (AtomicComponent) mgr.getComponent(INNER_SOURCE_COMPONENT);
Source innerSourceInstance = (Source) deploymentContext.getCompositeScope().getInstance(innerSourceComponent);
assertNotNull(innerSourceInstance);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java?view=diff&rev=506157&r1=506156&r2=506157
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplBasicTestCase.java Sun Feb 11 14:27:35 2007
@@ -62,7 +62,7 @@
EasyMock.expectLastCall().andReturn(Collections.emptyList()).atLeastOnce();
EasyMock.replay(service);
composite.register(service);
- composite.register(getReference("bar"));
+ composite.register(getReference("#bar"));
}
public void testOnEvent() {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java?view=diff&rev=506157&r1=506156&r2=506157
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java Sun Feb 11 14:27:35 2007
@@ -19,12 +19,20 @@
package org.apache.tuscany.core.implementation.composite;
import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
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.wire.OutboundWire;
+import org.apache.tuscany.spi.wire.Wire;
import junit.framework.TestCase;
+import org.apache.tuscany.core.wire.InboundWireImpl;
+import org.apache.tuscany.core.wire.OutboundWireImpl;
import org.easymock.EasyMock;
/**
@@ -34,22 +42,38 @@
public void testRegisterService() throws Exception {
CompositeComponent parent = new CompositeComponentImpl(URI.create("foo"), null, null);
+ List<ServiceBinding> bindings = new ArrayList<ServiceBinding>();
+ InboundWireImpl wire = new InboundWireImpl(Wire.LOCAL_BINDING);
+ ServiceBinding binding = EasyMock.createMock(ServiceBinding.class);
+ bindings.add(binding);
+ EasyMock.expect(binding.getInboundWire()).andReturn(wire);
+ EasyMock.replay(binding);
Service service = EasyMock.createMock(Service.class);
- EasyMock.expect(service.getUri()).andReturn(URI.create("bar")).atLeastOnce();
+ EasyMock.expect(service.getServiceBindings()).andReturn(bindings);
+ EasyMock.expect(service.getUri()).andReturn(URI.create("#bar")).atLeastOnce();
EasyMock.replay(service);
parent.register(service);
- assertNotNull(parent.getChild("bar"));
+ assertNotNull(parent.getInboundWire("bar"));
EasyMock.verify(service);
}
public void testRegisterReference() throws Exception {
CompositeComponent parent = new CompositeComponentImpl(URI.create("foo"), null, null);
- Reference service = EasyMock.createMock(Reference.class);
- EasyMock.expect(service.getUri()).andReturn(URI.create("bar")).atLeastOnce();
- EasyMock.replay(service);
- parent.register(service);
- assertNotNull(parent.getChild("bar"));
- EasyMock.verify(service);
+
+ List<ReferenceBinding> bindings = new ArrayList<ReferenceBinding>();
+ OutboundWire wire = new OutboundWireImpl(Wire.LOCAL_BINDING);
+ ReferenceBinding binding = EasyMock.createMock(ReferenceBinding.class);
+ EasyMock.expect(binding.getOutboundWire()).andReturn(wire);
+ bindings.add(binding);
+ EasyMock.replay(binding);
+
+ Reference reference = EasyMock.createMock(Reference.class);
+ EasyMock.expect(reference.getReferenceBindings()).andReturn(bindings);
+ EasyMock.expect(reference.getUri()).andReturn(URI.create("#bar")).atLeastOnce();
+ EasyMock.replay(reference);
+ parent.register(reference);
+ assertNotNull(parent.getOutboundWires().get("bar").get(0));
+ EasyMock.verify(reference);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/DuplicateRegistrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/DuplicateRegistrationTestCase.java?view=diff&rev=506157&r1=506156&r2=506157
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/DuplicateRegistrationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/DuplicateRegistrationTestCase.java Sun Feb 11 14:27:35 2007
@@ -40,12 +40,12 @@
parent.start();
Service service1 = EasyMock.createMock(Service.class);
- EasyMock.expect(service1.getUri()).andReturn(URI.create("service")).atLeastOnce();
+ EasyMock.expect(service1.getUri()).andReturn(URI.create("#service")).atLeastOnce();
service1.stop();
EasyMock.replay(service1);
Service service2 = EasyMock.createMock(Service.class);
- EasyMock.expect(service2.getUri()).andReturn(URI.create("service")).atLeastOnce();
+ EasyMock.expect(service2.getUri()).andReturn(URI.create("#service")).atLeastOnce();
service2.stop();
EasyMock.replay(service2);
@@ -64,12 +64,12 @@
parent.start();
Reference reference1 = EasyMock.createMock(Reference.class);
- EasyMock.expect(reference1.getUri()).andReturn(URI.create("reference")).atLeastOnce();
+ EasyMock.expect(reference1.getUri()).andReturn(URI.create("#reference")).atLeastOnce();
reference1.stop();
EasyMock.replay(reference1);
Reference reference2 = EasyMock.createMock(Reference.class);
- EasyMock.expect(reference2.getUri()).andReturn(URI.create("reference")).atLeastOnce();
+ EasyMock.expect(reference2.getUri()).andReturn(URI.create("#reference")).atLeastOnce();
reference2.stop();
EasyMock.replay(reference2);
@@ -89,12 +89,12 @@
parent.start();
Service service1 = EasyMock.createMock(Service.class);
- EasyMock.expect(service1.getUri()).andReturn(URI.create("child")).atLeastOnce();
+ EasyMock.expect(service1.getUri()).andReturn(URI.create("#child")).atLeastOnce();
service1.stop();
EasyMock.replay(service1);
Reference service2 = EasyMock.createMock(Reference.class);
- EasyMock.expect(service2.getUri()).andReturn(URI.create("child")).atLeastOnce();
+ EasyMock.expect(service2.getUri()).andReturn(URI.create("#child")).atLeastOnce();
service2.stop();
EasyMock.replay(service2);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java?view=diff&rev=506157&r1=506156&r2=506157
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java Sun Feb 11 14:27:35 2007
@@ -58,11 +58,6 @@
void register(Reference reference) throws RegistrationException;
/**
- * Returns the child associated with a given name
- */
- SCAObject getChild(String name);
-
- /**
* Returns the services for the component
*
* @return the services for the component
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?view=diff&rev=506157&r1=506156&r2=506157
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java Sun Feb 11 14:27:35 2007
@@ -40,7 +40,6 @@
import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.event.Event;
import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.util.UriHelper;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.Wire;
@@ -81,18 +80,9 @@
return Collections.unmodifiableList(references);
}
-
- public SCAObject getChild(String name) {
- return children.get(name);
- }
-
public void register(Service service) throws RegistrationException {
- String name;
- if (service.getUri().getFragment() != null) {
- name = service.getUri().getFragment();
- } else {
- name = UriHelper.getBaseName(service.getUri());
- }
+ String name = service.getUri().getFragment();
+ assert name != null;
if (children.get(name) != null) {
String uri = service.getUri().toString();
throw new DuplicateNameException("A service or reference is already registered with the name", uri);
@@ -104,12 +94,8 @@
}
public void register(Reference reference) throws RegistrationException {
- String name;
- if (reference.getUri().getFragment() != null) {
- name = reference.getUri().getFragment();
- } else {
- name = UriHelper.getBaseName(reference.getUri());
- }
+ String name = reference.getUri().getFragment();
+ assert name != null;
if (children.get(name) != null) {
String uri = reference.getUri().toString();
throw new DuplicateNameException("A service or reference is already registered with the name", uri);
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=506157&r1=506156&r2=506157
==============================================================================
--- 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 Feb 11 14:27:35 2007
@@ -89,13 +89,13 @@
public void testMoreThanOneServiceGetDefault() throws Exception {
Service service1 = EasyMock.createMock(Service.class);
- EasyMock.expect(service1.getUri()).andReturn(URI.create("service1")).atLeastOnce();
+ EasyMock.expect(service1.getUri()).andReturn(URI.create("#service1")).atLeastOnce();
service1.getServiceBindings();
EasyMock.expectLastCall().andReturn(Collections.emptyList()).atLeastOnce();
EasyMock.replay(service1);
Service service2 = EasyMock.createMock(Service.class);
- EasyMock.expect(service2.getUri()).andReturn(URI.create("service2")).atLeastOnce();
+ EasyMock.expect(service2.getUri()).andReturn(URI.create("#service2")).atLeastOnce();
service2.getServiceBindings();
EasyMock.expectLastCall().andReturn(Collections.emptyList()).atLeastOnce();
EasyMock.replay(service2);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org