You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/04/05 08:08:41 UTC
svn commit: r525717 [4/4] - in /incubator/tuscany/java/sca/modules/core: ./
src/main/java/org/apache/tuscany/core/binding/local/
src/main/java/org/apache/tuscany/core/bootstrap/
src/main/java/org/apache/tuscany/core/builder/ src/main/java/org/apache/tu...
Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatterTestCase.java?view=diff&rev=525717&r1=525716&r2=525717
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatterTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/IncompatibleServiceContractExceptionFormatterTestCase.java Wed Apr 4 23:08:37 2007
@@ -21,12 +21,18 @@
import java.io.PrintWriter;
import java.io.StringWriter;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.wire.IncompatibleServiceContractException;
-
import junit.framework.TestCase;
+
+import org.apache.tuscany.assembly.AssemblyFactory;
+import org.apache.tuscany.assembly.ComponentService;
+import org.apache.tuscany.assembly.Contract;
+import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
import org.apache.tuscany.host.monitor.FormatterRegistry;
+import org.apache.tuscany.idl.Operation;
+import org.apache.tuscany.idl.impl.OperationImpl;
+import org.apache.tuscany.idl.java.JavaInterface;
+import org.apache.tuscany.idl.java.impl.DefaultJavaFactory;
+import org.apache.tuscany.spi.wire.IncompatibleServiceContractException;
import org.easymock.EasyMock;
/**
@@ -34,49 +40,55 @@
*/
public class IncompatibleServiceContractExceptionFormatterTestCase extends TestCase {
FormatterRegistry registry = EasyMock.createNiceMock(FormatterRegistry.class);
- IncompatibleServiceContractExceptionFormatter formatter =
- new IncompatibleServiceContractExceptionFormatter(registry);
+ IncompatibleContractExceptionFormatter formatter = new IncompatibleContractExceptionFormatter(registry);
+
+ private <S> ComponentService createContract(Class<S> type) {
+ AssemblyFactory factory = new DefaultAssemblyFactory();
+ ComponentService contract = factory.createComponentService();
+ JavaInterface javaInterface = new DefaultJavaFactory().createJavaInterface();
+ javaInterface.setJavaClass(type);
+ contract.setInterface(javaInterface);
+ return contract;
+ }
public void testFormat() throws Exception {
- ServiceContract<Object> source = new ServiceContract<Object>() {
- };
- source.setInterfaceName("sourceInterface");
- ServiceContract<Object> target = new ServiceContract<Object>() {
- };
- target.setInterfaceName("targetInterface");
- Operation<Object> sourceOp = new Operation<Object>("sourceOp", null, null, null);
- Operation<Object> targetOp = new Operation<Object>("targetOp", null, null, null);
+ Contract source = createContract(Foo.class);
+ Contract target = createContract(Bar.class);
+ Operation sourceOp = new OperationImpl("sourceOp");
+ Operation targetOp = new OperationImpl("targetOp");
- IncompatibleServiceContractException e =
- new IncompatibleServiceContractException("message", source, target, sourceOp, targetOp);
+ IncompatibleServiceContractException e = new IncompatibleServiceContractException("message", source, target,
+ sourceOp, targetOp);
StringWriter writer = new StringWriter();
PrintWriter pw = new PrintWriter(writer);
formatter.write(pw, e);
String buffer = writer.toString();
assertTrue(buffer.indexOf("message") >= 0);
- assertTrue(buffer.indexOf("sourceInterface") >= 0);
- assertTrue(buffer.indexOf("targetInterface") >= 0);
+ assertTrue(buffer.indexOf("Foo") >= 0);
+ assertTrue(buffer.indexOf("Bar") >= 0);
assertTrue(buffer.indexOf("sourceOp") >= 0);
assertTrue(buffer.indexOf("targetOp") >= 0);
}
-
public void testFormatNulls() throws Exception {
- ServiceContract<Object> source = new ServiceContract<Object>() {
- };
- source.setInterfaceName("sourceInterface");
- ServiceContract<Object> target = new ServiceContract<Object>() {
- };
- target.setInterfaceName("targetInterface");
+ Contract source = createContract(Foo.class);
+ Contract target = createContract(Bar.class);
- IncompatibleServiceContractException e =
- new IncompatibleServiceContractException("message", source, target);
+ IncompatibleServiceContractException e = new IncompatibleServiceContractException("message", source, target);
StringWriter writer = new StringWriter();
PrintWriter pw = new PrintWriter(writer);
formatter.write(pw, e);
String buffer = writer.toString();
assertTrue(buffer.indexOf("message") >= 0);
- assertTrue(buffer.indexOf("sourceInterface") >= 0);
- assertTrue(buffer.indexOf("targetInterface") >= 0);
+ assertTrue(buffer.indexOf("Foo") >= 0);
+ assertTrue(buffer.indexOf("Bar") >= 0);
+ }
+
+ private static interface Foo {
+
+ }
+
+ private static interface Bar {
+
}
}
Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/InvocationChainImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/InvocationChainImplTestCase.java?view=diff&rev=525717&r1=525716&r2=525717
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/InvocationChainImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/InvocationChainImplTestCase.java Wed Apr 4 23:08:37 2007
@@ -18,14 +18,12 @@
*/
package org.apache.tuscany.core.wire;
-import java.lang.reflect.Type;
+import junit.framework.TestCase;
-import org.apache.tuscany.spi.model.Operation;
+import org.apache.tuscany.idl.impl.OperationImpl;
import org.apache.tuscany.spi.wire.Interceptor;
-import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.InvocationChain;
-
-import junit.framework.TestCase;
+import org.apache.tuscany.spi.wire.Message;
/**
* @version $Rev$ $Date$
@@ -33,7 +31,7 @@
public class InvocationChainImplTestCase extends TestCase {
public void testInsertAtPos() throws Exception {
- InvocationChain chain = new InvocationChainImpl(new Operation<Type>("foo", null, null, null));
+ InvocationChain chain = new InvocationChainImpl(new OperationImpl("foo"));
Interceptor inter3 = new MockInterceptor();
Interceptor inter2 = new MockInterceptor();
Interceptor inter1 = new MockInterceptor();
@@ -47,7 +45,7 @@
}
public void testInsertAtEnd() throws Exception {
- InvocationChain chain = new InvocationChainImpl(new Operation<Type>("foo", null, null, null));
+ InvocationChain chain = new InvocationChainImpl(new OperationImpl("foo"));
Interceptor inter2 = new MockInterceptor();
Interceptor inter1 = new MockInterceptor();
chain.addInterceptor(0, inter1);
@@ -79,6 +77,5 @@
return false;
}
}
-
}
Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingInterceptorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingInterceptorTestCase.java?view=diff&rev=525717&r1=525716&r2=525717
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingInterceptorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/NonBlockingInterceptorTestCase.java Wed Apr 4 23:08:37 2007
@@ -18,21 +18,21 @@
*/
package org.apache.tuscany.core.wire;
-import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.services.work.WorkScheduler;
-import org.apache.tuscany.spi.wire.Interceptor;
-import org.apache.tuscany.spi.wire.Message;
-import org.apache.tuscany.spi.wire.MessageImpl;
-
-import junit.framework.TestCase;
-import org.easymock.EasyMock;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.getCurrentArguments;
import static org.easymock.EasyMock.isA;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.spi.Scope;
+import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.services.work.WorkScheduler;
+import org.apache.tuscany.spi.wire.Interceptor;
+import org.apache.tuscany.spi.wire.Message;
+import org.apache.tuscany.spi.wire.MessageImpl;
+import org.easymock.EasyMock;
import org.easymock.IAnswer;
/**
Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java?view=diff&rev=525717&r1=525716&r2=525717
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireObjectFactoryTestCase.java Wed Apr 4 23:08:37 2007
@@ -18,19 +18,21 @@
*/
package org.apache.tuscany.core.wire;
-import java.lang.reflect.Type;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-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.ProxyService;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.assembly.ComponentService;
+import org.apache.tuscany.assembly.impl.ComponentServiceImpl;
+import org.apache.tuscany.idl.Operation;
+import org.apache.tuscany.idl.impl.OperationImpl;
+import org.apache.tuscany.idl.java.JavaInterface;
+import org.apache.tuscany.idl.java.impl.JavaInterfaceImpl;
import org.apache.tuscany.spi.wire.InvocationChain;
+import org.apache.tuscany.spi.wire.ProxyService;
import org.apache.tuscany.spi.wire.Wire;
-
-import junit.framework.TestCase;
import org.easymock.EasyMock;
/**
@@ -40,10 +42,10 @@
@SuppressWarnings({"unchecked"})
public void testCreateInstance() throws Exception {
- Operation<Type> op = new Operation<Type>("hello", null, null, null);
+ Operation op = new OperationImpl("hello");
InvocationChain chain = new InvocationChainImpl(op);
Wire wire = EasyMock.createMock(Wire.class);
- Map<Operation<?>, InvocationChain> chains = new HashMap<Operation<?>, InvocationChain>();
+ Map<Operation, InvocationChain> chains = new HashMap<Operation, InvocationChain>();
chains.put(op, chain);
EasyMock.expect(wire.getInvocationChains()).andReturn(chains);
EasyMock.expect(wire.isOptimizable()).andReturn(false);
@@ -65,10 +67,11 @@
@SuppressWarnings("unchecked")
public void testOptimizedCreateInstance() throws Exception {
- ServiceContract<?> contract = new JavaServiceContract(Foo.class);
+ ComponentService service = createContract(Foo.class);
+
Wire wire = EasyMock.createMock(Wire.class);
EasyMock.expect(wire.isOptimizable()).andReturn(true);
- EasyMock.expect(wire.getSourceContract()).andReturn(contract).atLeastOnce();
+ EasyMock.expect(wire.getSourceContract()).andReturn(service).atLeastOnce();
EasyMock.expect(wire.getInvocationChains()).andReturn((Map) Collections.emptyMap());
EasyMock.expect(wire.getTargetInstance()).andReturn(new Foo() {
public void hello() {
@@ -81,12 +84,21 @@
}
+ private ComponentService createContract(Class cls) {
+ JavaInterface jInterface = new JavaInterfaceImpl();
+ jInterface.setJavaClass(cls);
+ ComponentService service = new ComponentServiceImpl();
+ service.setInterface(jInterface);
+ service.setName(cls.getSimpleName());
+ return service;
+ }
+
/**
* Verifies that a proxy is created when the required client contract is different than the wire contract
*/
@SuppressWarnings("unchecked")
public void testCannotOptimizeDifferentContractsCreateInstance() throws Exception {
- ServiceContract<?> contract = new JavaServiceContract(Object.class);
+ ComponentService contract = createContract(Object.class);
Wire wire = EasyMock.createMock(Wire.class);
EasyMock.expect(wire.isOptimizable()).andReturn(true);
EasyMock.expect(wire.getSourceContract()).andReturn(contract).atLeastOnce();
@@ -109,7 +121,7 @@
@SuppressWarnings("unchecked")
public void testNoJavaInterfaceCreateInstance() throws Exception {
- ServiceContract<?> contract = new JavaServiceContract();
+ ComponentService contract = createContract(Object.class);
Wire wire = EasyMock.createMock(Wire.class);
EasyMock.expect(wire.isOptimizable()).andReturn(true);
EasyMock.expect(wire.getSourceContract()).andReturn(contract).atLeastOnce();
Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java?view=diff&rev=525717&r1=525716&r2=525717
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java Wed Apr 4 23:08:37 2007
@@ -20,15 +20,15 @@
import java.lang.reflect.Type;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.idl.Operation;
+import org.apache.tuscany.idl.impl.OperationImpl;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.model.Operation;
-import static org.apache.tuscany.spi.model.Operation.NO_CONVERSATION;
import org.apache.tuscany.spi.wire.Interceptor;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.Wire;
-
-import junit.framework.TestCase;
import org.easymock.EasyMock;
/**
@@ -68,8 +68,9 @@
protected void setUp() throws Exception {
super.setUp();
- operation = new Operation<Type>("foo", null, null, null, false, null, NO_CONVERSATION);
-
+ operation = new OperationImpl();
+ operation.setName("foo");
+ operation.setConversationSequence(Operation.ConversationSequence.NO_CONVERSATION);
}
private class OptimizableInterceptor implements Interceptor {
Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java?view=diff&rev=525717&r1=525716&r2=525717
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/wire/WireUtilsTestCase.java Wed Apr 4 23:08:37 2007
@@ -19,16 +19,16 @@
package org.apache.tuscany.core.wire;
import java.lang.reflect.Method;
-import java.lang.reflect.Type;
import java.util.Map;
-import org.apache.tuscany.spi.model.Operation;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.idl.Operation;
+import org.apache.tuscany.idl.impl.OperationImpl;
import org.apache.tuscany.spi.wire.ChainHolder;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.Wire;
-import junit.framework.TestCase;
-
/**
* @version $Rev$ $Date$
*/
@@ -37,7 +37,8 @@
public void testCreateInterfaceToWireMapping() throws Exception {
Wire wire = new WireImpl();
- Operation<Type> op = new Operation<Type>("hello", null, null, null);
+ Operation op = new OperationImpl();
+ op.setName("hello");
InvocationChain chain = new InvocationChainImpl(op);
wire.addInvocationChain(op, chain);
Map<Method, ChainHolder> chains = WireUtils.createInterfaceToWireMapping(Foo.class, wire);
@@ -47,7 +48,8 @@
public void testCreateInterfaceToWireMappingNoOperation() throws Exception {
Wire wire = new WireImpl();
- Operation<Type> op = new Operation<Type>("goodbye", null, null, null);
+ Operation op = new OperationImpl();
+ op.setName("goodbye");
InvocationChain chain = new InvocationChainImpl(op);
wire.addInvocationChain(op, chain);
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org