You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2007/01/27 00:28:58 UTC
svn commit: r500406 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/implementation/java/
test/java/org/apache/tuscany/core/implementation/composite/
test/java/org/apache/tuscany/core/implementation/java/ test/java/or...
Author: jboynes
Date: Fri Jan 26 15:28:54 2007
New Revision: 500406
URL: http://svn.apache.org/viewvc?view=rev&rev=500406
Log:
add constructor to JavaImplementation for properties and use them in unit tests
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementation.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementationLoader.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/CompositeLoaderWireResolutionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderPropertyTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderReferenceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderValidationTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementation.java?view=diff&rev=500406&r1=500405&r2=500406
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementation.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementation.java Fri Jan 26 15:28:54 2007
@@ -28,12 +28,27 @@
private String className;
private Class<?> implementationClass;
+ public JavaImplementation() {
+ }
+
+ public JavaImplementation(Class<?> implementationClass) {
+ this.implementationClass = implementationClass;
+ this.className = implementationClass.getName();
+ }
+
+ public JavaImplementation(Class<?> implementationClass, PojoComponentType componentType) {
+ super(componentType);
+ this.implementationClass = implementationClass;
+ this.className = implementationClass == null ? null : implementationClass.getName();
+ }
+
public String getClassName() {
return className;
}
public void setClassName(String className) {
this.className = className;
+ this.implementationClass = null;
}
public Class<?> getImplementationClass() {
@@ -42,5 +57,6 @@
public void setImplementationClass(Class<?> implementationClass) {
this.implementationClass = implementationClass;
+ this.className = implementationClass.getName();
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementationLoader.java?view=diff&rev=500406&r1=500405&r2=500406
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaImplementationLoader.java Fri Jan 26 15:28:54 2007
@@ -51,9 +51,11 @@
DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException {
assert IMPLEMENTATION_JAVA.equals(reader.getName());
- JavaImplementation implementation = new JavaImplementation();
String implClass = reader.getAttributeValue(null, "class");
Class<?> implementationClass = LoaderUtil.loadClass(implClass, deploymentContext.getClassLoader());
+
+ JavaImplementation implementation = new JavaImplementation();
+ implementation.setClassName(implClass);
implementation.setImplementationClass(implementationClass);
registry.loadComponentType(parent, implementation, deploymentContext);
LoaderUtil.skipToEndElement(reader);
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=500406&r1=500405&r2=500406
==============================================================================
--- 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 Fri Jan 26 15:28:54 2007
@@ -158,9 +158,7 @@
sourceType.add(sourceServiceDefinition);
sourceType.setConstructorDefinition(new ConstructorDefinition<SourceImpl>(SourceImpl.class.getConstructor()));
- JavaImplementation sourceImpl = new JavaImplementation();
- sourceImpl.setComponentType(sourceType);
- sourceImpl.setImplementationClass(SourceImpl.class);
+ JavaImplementation sourceImpl = new JavaImplementation(SourceImpl.class, sourceType);
ComponentDefinition<JavaImplementation> innerSourceComponentDefinition =
new ComponentDefinition<JavaImplementation>("InnerSourceComponent", sourceImpl);
ReferenceTarget refTarget = new ReferenceTarget();
@@ -189,9 +187,7 @@
targetType.add(serviceDefinition);
targetType.setConstructorDefinition(new ConstructorDefinition<TargetImpl>(TargetImpl.class.getConstructor()));
- JavaImplementation targetImpl = new JavaImplementation();
- targetImpl.setComponentType(targetType);
- targetImpl.setImplementationClass(TargetImpl.class);
+ JavaImplementation targetImpl = new JavaImplementation(TargetImpl.class, targetType);
return new ComponentDefinition<JavaImplementation>("TargetComponent", targetImpl);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java?view=diff&rev=500406&r1=500405&r2=500406
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java Fri Jan 26 15:28:54 2007
@@ -65,8 +65,7 @@
pojoComponentType1.add(pojoSvc1);
ReferenceDefinition pojoRef1 = new ReferenceDefinition("pojoRef1", null);
pojoComponentType1.add(pojoRef1);
- JavaImplementation pojoImpl1 = new JavaImplementation();
- pojoImpl1.setComponentType(pojoComponentType1);
+ JavaImplementation pojoImpl1 = new JavaImplementation(null, pojoComponentType1);
ComponentDefinition<JavaImplementation> component1 =
new ComponentDefinition<JavaImplementation>("Component1", pojoImpl1);
@@ -82,8 +81,7 @@
pojoComponentType2.add(pojoRef2);
ReferenceDefinition pojoRef3 = new ReferenceDefinition("pojoRef3", null);
pojoComponentType2.add(pojoRef3);
- JavaImplementation pojoImpl2 = new JavaImplementation();
- pojoImpl2.setComponentType(pojoComponentType2);
+ JavaImplementation pojoImpl2 = new JavaImplementation(null, pojoComponentType2);
ComponentDefinition<JavaImplementation> component2 =
new ComponentDefinition<JavaImplementation>("Component2", pojoImpl2);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java?view=diff&rev=500406&r1=500405&r2=500406
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaBuilderPropertyTestCase.java Fri Jan 26 15:28:54 2007
@@ -60,9 +60,7 @@
type.add(property);
type.setConstructorDefinition(new ConstructorDefinition<Foo>(Foo.class.getConstructor((Class[]) null)));
type.setImplementationScope(Scope.STATELESS);
- JavaImplementation impl = new JavaImplementation();
- impl.setComponentType(type);
- impl.setImplementationClass(Foo.class);
+ JavaImplementation impl = new JavaImplementation(Foo.class, type);
ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(impl);
PropertyValue propertyValue = new PropertyValue(property.getName(), property.getDefaultValueFactory());
definition.getPropertyValues().put(property.getName(), propertyValue);
@@ -83,9 +81,7 @@
type.add(property);
type.setConstructorDefinition(new ConstructorDefinition<FooInt>(FooInt.class.getConstructor((Class[]) null)));
type.setImplementationScope(Scope.STATELESS);
- JavaImplementation impl = new JavaImplementation();
- impl.setComponentType(type);
- impl.setImplementationClass(Foo.class);
+ JavaImplementation impl = new JavaImplementation(Foo.class, type);
ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(impl);
ObjectFactory<Integer> defaultValueFactory = property.getDefaultValueFactory();
PropertyValue<Integer> propertyValue = new PropertyValue<Integer>(property.getName(), defaultValueFactory);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java?view=diff&rev=500406&r1=500405&r2=500406
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderConversationIDTestCase.java Fri Jan 26 15:28:54 2007
@@ -58,9 +58,7 @@
type.setImplementationScope(Scope.STATELESS);
type.setConstructorDefinition(ctorDef);
- JavaImplementation impl = new JavaImplementation();
- impl.setImplementationClass(Foo.class);
- impl.setComponentType(type);
+ JavaImplementation impl = new JavaImplementation(Foo.class, type);
ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>("foo", impl);
CompositeComponent parent = EasyMock.createMock(CompositeComponent.class);
JavaAtomicComponent component = (JavaAtomicComponent) builder.build(parent, definition, null);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java?view=diff&rev=500406&r1=500405&r2=500406
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderMetadataTestCase.java Fri Jan 26 15:28:54 2007
@@ -105,9 +105,7 @@
serviceDefinition.setServiceContract(contract);
type.add(serviceDefinition);
type.setConstructorDefinition(new ConstructorDefinition<SourceImpl>(constructor));
- JavaImplementation sourceImpl = new JavaImplementation();
- sourceImpl.setComponentType(type);
- sourceImpl.setImplementationClass(SourceImpl.class);
+ JavaImplementation sourceImpl = new JavaImplementation(SourceImpl.class, type);
definition = new ComponentDefinition<JavaImplementation>(sourceImpl);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java?view=diff&rev=500406&r1=500405&r2=500406
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderReferenceTestCase.java Fri Jan 26 15:28:54 2007
@@ -78,9 +78,7 @@
serviceDefinition.setServiceContract(contract);
sourceType.add(serviceDefinition);
sourceType.setConstructorDefinition(new ConstructorDefinition<SourceImpl>(constructor));
- JavaImplementation sourceImpl = new JavaImplementation();
- sourceImpl.setComponentType(sourceType);
- sourceImpl.setImplementationClass(SourceImpl.class);
+ JavaImplementation sourceImpl = new JavaImplementation(SourceImpl.class, sourceType);
ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(sourceImpl);
JavaComponentBuilder builder = new JavaComponentBuilder();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java?view=diff&rev=500406&r1=500405&r2=500406
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilderResourceTestCase.java Fri Jan 26 15:28:54 2007
@@ -53,9 +53,7 @@
type.add(resource);
type.setImplementationScope(Scope.STATELESS);
type.setConstructorDefinition(ctorDef);
- JavaImplementation impl = new JavaImplementation();
- impl.setImplementationClass(Foo.class);
- impl.setComponentType(type);
+ JavaImplementation impl = new JavaImplementation(Foo.class, type);
ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>("foo", impl);
InboundWire resourceWire = EasyMock.createMock(InboundWire.class);
EasyMock.expect(resourceWire.getTargetService()).andReturn("result");
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java?view=diff&rev=500406&r1=500405&r2=500406
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/CallbackInvocationTestCase.java Fri Jan 26 15:28:54 2007
@@ -198,7 +198,7 @@
JavaMappedService mappedService = new JavaMappedService("Foo", contract, false, "callback", method);
type.getServices().put("Foo", mappedService);
- JavaImplementation impl = new JavaImplementation();
+ JavaImplementation impl = new JavaImplementation(FooImpl.class, type);
impl.setComponentType(type);
impl.setImplementationClass(FooImpl.class);
return new ComponentDefinition<JavaImplementation>("foo", impl);
@@ -222,7 +222,7 @@
ReferenceTarget refTarget = new ReferenceTarget();
refTarget.setReferenceName("foo");
refTarget.getTargets().add(new URI("foo"));
- JavaImplementation impl = new JavaImplementation();
+ JavaImplementation impl = new JavaImplementation(FooClient.class, type);
impl.setComponentType(type);
impl.setImplementationClass(FooClient.class);
ComponentDefinition<JavaImplementation> def = new ComponentDefinition<JavaImplementation>(name, impl);
@@ -248,9 +248,7 @@
ReferenceTarget refTarget = new ReferenceTarget();
refTarget.setReferenceName("foo");
refTarget.getTargets().add(new URI("foo"));
- JavaImplementation impl = new JavaImplementation();
- impl.setComponentType(type);
- impl.setImplementationClass(FooPlainClient.class);
+ JavaImplementation impl = new JavaImplementation(FooPlainClient.class, type);
ComponentDefinition<JavaImplementation> def = new ComponentDefinition<JavaImplementation>(name, impl);
def.getReferenceTargets().put("foo", refTarget);
return def;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java?view=diff&rev=500406&r1=500405&r2=500406
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderNoBindingTestCase.java Fri Jan 26 15:28:54 2007
@@ -66,8 +66,7 @@
new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
type.add(service);
type.add(reference);
- JavaImplementation impl = new JavaImplementation();
- impl.setComponentType(type);
+ JavaImplementation impl = new JavaImplementation(null, type);
LoaderRegistry registry = EasyMock.createMock(LoaderRegistry.class);
EasyMock.expect(registry.load((CompositeComponent) EasyMock.isNull(),
(ModelObject) EasyMock.isNull(),
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderPropertyTestCase.java?view=diff&rev=500406&r1=500405&r2=500406
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderPropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderPropertyTestCase.java Fri Jan 26 15:28:54 2007
@@ -54,7 +54,7 @@
property.setName("name");
property.setOverride(OverrideOptions.MAY);
type.add(property);
- JavaImplementation impl = new JavaImplementation();
+ JavaImplementation impl = new JavaImplementation(null, type);
impl.setComponentType(type);
ComponentDefinition<Implementation<?>> defn = new ComponentDefinition<Implementation<?>>(impl);
loader.populatePropertyValues(defn);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderReferenceTestCase.java?view=diff&rev=500406&r1=500405&r2=500406
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderReferenceTestCase.java Fri Jan 26 15:28:54 2007
@@ -31,7 +31,6 @@
private static final QName COMPONENT = new QName(XML_NAMESPACE_1_0, "component");
private static final QName REFERENCE = new QName(XML_NAMESPACE_1_0, "reference");
private static final String NAME = "testComponent";
- private static final JavaImplementation IMPL = new JavaImplementation();
private ComponentLoader loader;
private XMLStreamReader reader;
@@ -51,7 +50,7 @@
super.setUp();
PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> type =
new PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
- IMPL.setComponentType(type);
+ JavaImplementation impl = new JavaImplementation(null, type);
reader = EasyMock.createMock(XMLStreamReader.class);
EasyMock.expect(reader.getName()).andReturn(COMPONENT);
EasyMock.expect(reader.getAttributeValue((String) EasyMock.isNull(), EasyMock.isA(String.class)))
@@ -76,7 +75,7 @@
EasyMock.expect(mockRegistry.load((CompositeComponent) isNull(),
(ModelObject) isNull(),
EasyMock.isA(XMLStreamReader.class),
- (DeploymentContext) isNull())).andReturn(IMPL);
+ (DeploymentContext) isNull())).andReturn(impl);
EasyMock.replay(mockRegistry);
loader = new ComponentLoader(mockRegistry, null);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java?view=diff&rev=500406&r1=500405&r2=500406
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderTestCase.java Fri Jan 26 15:28:54 2007
@@ -54,7 +54,7 @@
public class ComponentLoaderTestCase extends TestCase {
private static final QName COMPONENT = new QName(XML_NAMESPACE_1_0, "component");
private static final String NAME = "testComponent";
- private static final Implementation IMPL = new JavaImplementation();
+ private JavaImplementation impl;
private XMLStreamReader mockReader;
private LoaderRegistry mockRegistry;
@@ -87,7 +87,7 @@
EasyMock.expect(mockRegistry.load(EasyMock.isA(CompositeComponent.class),
(ModelObject) isNull(),
EasyMock.eq(mockReader),
- EasyMock.isA(DeploymentContext.class))).andReturn(IMPL);
+ EasyMock.isA(DeploymentContext.class))).andReturn(impl);
EasyMock.replay(mockRegistry);
ComponentDefinition component = loader.load(EasyMock.createNiceMock(CompositeComponent.class),
null, mockReader,
@@ -121,7 +121,7 @@
EasyMock.expect(mockRegistry.load(EasyMock.isA(CompositeComponent.class),
(ModelObject) isNull(),
EasyMock.eq(mockReader),
- EasyMock.isA(DeploymentContext.class))).andReturn(IMPL);
+ EasyMock.isA(DeploymentContext.class))).andReturn(impl);
EasyMock.replay(mockRegistry);
ComponentDefinition component = loader.load(EasyMock.createNiceMock(CompositeComponent.class),
null, mockReader,
@@ -169,7 +169,7 @@
EasyMock.expect(mockRegistry.load(EasyMock.isA(CompositeComponent.class),
(ModelObject) isNull(),
EasyMock.eq(mockReader),
- EasyMock.isA(DeploymentContext.class))).andReturn(IMPL);
+ EasyMock.isA(DeploymentContext.class))).andReturn(impl);
EasyMock.replay(mockRegistry);
try {
loader.load(EasyMock.createNiceMock(CompositeComponent.class),
@@ -183,6 +183,7 @@
protected void setUp() throws Exception {
super.setUp();
+ impl = new JavaImplementation();
mockReader = EasyMock.createMock(XMLStreamReader.class);
mockRegistry = EasyMock.createMock(LoaderRegistry.class);
mockPropertyFactory = EasyMock.createMock(PropertyObjectFactory.class);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderValidationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderValidationTestCase.java?view=diff&rev=500406&r1=500405&r2=500406
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderValidationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderValidationTestCase.java Fri Jan 26 15:28:54 2007
@@ -35,8 +35,7 @@
ReferenceDefinition refDefinition = new ReferenceDefinition();
refDefinition.setName("name");
type.add(refDefinition);
- JavaImplementation impl = new JavaImplementation();
- impl.setComponentType(type);
+ JavaImplementation impl = new JavaImplementation(null, type);
ComponentDefinition<Implementation<?>> defn = new ComponentDefinition<Implementation<?>>(impl);
ReferenceTarget target = new ReferenceTarget();
target.setReferenceName("name");
@@ -51,8 +50,7 @@
refDefinition.setName("name");
refDefinition.setRequired(true);
type.add(refDefinition);
- JavaImplementation impl = new JavaImplementation();
- impl.setComponentType(type);
+ JavaImplementation impl = new JavaImplementation(null, type);
ComponentDefinition<Implementation<?>> defn = new ComponentDefinition<Implementation<?>>(impl);
try {
loader.validate(defn);
@@ -69,8 +67,7 @@
refDefinition.setName("name");
refDefinition.setRequired(false);
type.add(refDefinition);
- JavaImplementation impl = new JavaImplementation();
- impl.setComponentType(type);
+ JavaImplementation impl = new JavaImplementation(null, type);
ComponentDefinition<Implementation<?>> defn = new ComponentDefinition<Implementation<?>>(impl);
loader.validate(defn);
}
@@ -83,8 +80,7 @@
refDefinition.setRequired(true);
refDefinition.setMultiplicity(Multiplicity.ONE_N);
type.add(refDefinition);
- JavaImplementation impl = new JavaImplementation();
- impl.setComponentType(type);
+ JavaImplementation impl = new JavaImplementation(null, type);
ComponentDefinition<Implementation<?>> defn = new ComponentDefinition<Implementation<?>>(impl);
ReferenceTarget target = new ReferenceTarget();
target.setReferenceName("r1");
@@ -140,8 +136,7 @@
refDefinition.setName("name");
refDefinition.setAutowire(true);
type.add(refDefinition);
- JavaImplementation impl = new JavaImplementation();
- impl.setComponentType(type);
+ JavaImplementation impl = new JavaImplementation(null, type);
ComponentDefinition<Implementation<?>> defn = new ComponentDefinition<Implementation<?>>(impl);
loader.validate(defn);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org