Author: jmarino
Date: Sun Nov 26 01:56:46 2006
New Revision: 479322
URL: http://svn.apache.org/viewvc?view=rev&rev=479322
Log:
fix generics usage
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeLoaderWireResolutionTestCase.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java?view=diff&rev=479322&r1=479321&r2=479322
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/idl/java/ConvertTimeMillisTestCase.java
Sun Nov 26 01:56:46 2006
@@ -24,7 +24,7 @@
* @version $Rev$ $Date$
*/
public class ConvertTimeMillisTestCase extends TestCase {
- MockRegistry registy;
+ private MockRegistry registy;
public void testConvertSeconds() throws Exception {
assertEquals(10000L, registy.convertTimeMillis("10 seconds"));
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=479322&r1=479321&r2=479322
==============================================================================
---
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
Sun Nov 26 01:56:46 2006
@@ -24,10 +24,12 @@
import org.apache.tuscany.spi.implementation.java.PojoComponentType;
import org.apache.tuscany.spi.loader.InvalidWireException;
+import org.apache.tuscany.spi.model.Binding;
import org.apache.tuscany.spi.model.BindlessServiceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.CompositeComponentType;
+import org.apache.tuscany.spi.model.Property;
import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.ServiceDefinition;
import org.apache.tuscany.spi.model.WireDefinition;
@@ -39,28 +41,29 @@
* This class tests the wire resolution function of the composite loader
*/
public class CompositeLoaderWireResolutionTestCase extends TestCase {
- private CompositeComponentType composite;
+ private CompositeComponentType<ServiceDefinition, ReferenceDefinition,
Property<?>> componentType;
private CompositeLoader compositeLoader = new CompositeLoader(null, null);
- @SuppressWarnings("unchecked")
public void setUp() throws Exception {
- composite = new CompositeComponentType();
- composite.setName("TestComposite");
+ componentType = new CompositeComponentType<ServiceDefinition,
ReferenceDefinition, Property<?>>();
+ componentType.setName("TestComposite");
//add a service to the composite
ServiceDefinition serviceDefn = new
ServiceDefinition("compositeService1", null, true);
BindlessServiceDefinition bindlessSvcDefn = new
BindlessServiceDefinition("bindlessSvc", null, true, null);
- BoundServiceDefinition boundSvcDefn = new
BoundServiceDefinition("boundSvc", null, true, null, null);
- BoundServiceDefinition boundSvcDefnWithTarget =
- new BoundServiceDefinition("boundSvcWithTarget", null, true, null,
new URI("orgTarget"));
- composite.add(serviceDefn);
- composite.add(boundSvcDefn);
- composite.add(bindlessSvcDefn);
- composite.add(boundSvcDefnWithTarget);
+ BoundServiceDefinition<Binding> boundSvcDefn =
+ new BoundServiceDefinition<Binding>("boundSvc", null, true, null,
null);
+ BoundServiceDefinition<Binding> boundSvcDefnWithTarget =
+ new BoundServiceDefinition<Binding>("boundSvcWithTarget", null,
true, null, new URI("orgTarget"));
+ componentType.add(serviceDefn);
+ componentType.add(boundSvcDefn);
+ componentType.add(bindlessSvcDefn);
+ componentType.add(boundSvcDefnWithTarget);
ReferenceDefinition compositeReference = new
ReferenceDefinition("compositeReference", null);
- composite.add(compositeReference);
+ componentType.add(compositeReference);
- PojoComponentType pojoComponentType1 = new PojoComponentType();
+ PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>
pojoComponentType1 =
+ new PojoComponentType<ServiceDefinition, ReferenceDefinition,
Property<?>>();
ServiceDefinition pojoSvc1 = new ServiceDefinition("pojoSvc1", null,
false);
pojoComponentType1.add(pojoSvc1);
ReferenceDefinition pojoRef1 = new ReferenceDefinition("pojoRef1",
null);
@@ -68,10 +71,12 @@
JavaImplementation pojoImpl1 = new JavaImplementation();
pojoImpl1.setComponentType(pojoComponentType1);
- ComponentDefinition component1 = new ComponentDefinition("Component1",
pojoImpl1);
- composite.add(component1);
+ ComponentDefinition<JavaImplementation> component1 =
+ new ComponentDefinition<JavaImplementation>("Component1",
pojoImpl1);
+ componentType.add(component1);
- PojoComponentType pojoComponentType2 = new PojoComponentType();
+ PojoComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>
pojoComponentType2 =
+ new PojoComponentType<ServiceDefinition, ReferenceDefinition,
Property<?>>();
ServiceDefinition pojoSvc2 = new ServiceDefinition("pojoSvc2", null,
false);
pojoComponentType2.add(pojoSvc2);
ServiceDefinition pojoSvc3 = new ServiceDefinition("pojoSvc3", null,
false);
@@ -83,140 +88,130 @@
JavaImplementation pojoImpl2 = new JavaImplementation();
pojoImpl2.setComponentType(pojoComponentType2);
- ComponentDefinition component2 = new ComponentDefinition("Component2",
pojoImpl2);
- composite.add(component2);
+ ComponentDefinition<JavaImplementation> component2 =
+ new ComponentDefinition<JavaImplementation>("Component2",
pojoImpl2);
+ componentType.add(component2);
}
- @SuppressWarnings("unchecked")
public void testCompositeSvc2CompositeReferenceWire() throws Exception {
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("compositeService1"));
wireDefn.setTarget(new URI("compositeReference"));
- composite.add(wireDefn);
- compositeLoader.resolveWires(composite);
+ componentType.add(wireDefn);
+ compositeLoader.resolveWires(componentType);
}
- @SuppressWarnings("unchecked")
public void testCompositeSvc2ComponentValid() throws Exception {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("compositeService1"));
wireDefn.setTarget(new URI("Component1"));
- composite.add(wireDefn);
- compositeLoader.resolveWires(composite);
+ componentType.add(wireDefn);
+ compositeLoader.resolveWires(componentType);
}
- @SuppressWarnings("unchecked")
public void testCompositeSvc2ComponentQualifiedValid() throws Exception {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("compositeService1"));
wireDefn.setTarget(new URI("Component2/pojoSvc3"));
- composite.add(wireDefn);
- compositeLoader.resolveWires(composite);
+ componentType.add(wireDefn);
+ compositeLoader.resolveWires(componentType);
}
- @SuppressWarnings("unchecked")
public void testCompositeSvc2ComponentQualifiedInvalid() throws
URISyntaxException {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("compositeService1"));
wireDefn.setTarget(new URI("Component2/pojoSvc5"));
- composite.add(wireDefn);
+ componentType.add(wireDefn);
try {
- compositeLoader.resolveWires(composite);
+ compositeLoader.resolveWires(componentType);
fail();
} catch (InvalidWireException e) {
// expected
}
}
- @SuppressWarnings("unchecked")
public void testCompositeSvc2ComponentUnQualifiedInvalid() throws
URISyntaxException {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("compositeService1"));
wireDefn.setTarget(new URI("Component2"));
- composite.add(wireDefn);
+ componentType.add(wireDefn);
try {
- compositeLoader.resolveWires(composite);
+ compositeLoader.resolveWires(componentType);
fail();
} catch (InvalidWireException e) {
// expected
}
}
- @SuppressWarnings("unchecked")
public void testComponent2CompositeReferenceValid() throws Exception {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("Component1"));
wireDefn.setTarget(new URI("compositeReference"));
- composite.add(wireDefn);
- compositeLoader.resolveWires(composite);
+ componentType.add(wireDefn);
+ compositeLoader.resolveWires(componentType);
}
- @SuppressWarnings("unchecked")
public void testComponent2CompositeReferenceQualifiedValid() throws
Exception {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("Component2/pojoRef3"));
wireDefn.setTarget(new URI("compositeReference"));
- composite.add(wireDefn);
- compositeLoader.resolveWires(composite);
+ componentType.add(wireDefn);
+ compositeLoader.resolveWires(componentType);
}
- @SuppressWarnings("unchecked")
public void testComponent2CompositeReferenceUnQualifiedInvalid() throws
URISyntaxException {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("Component2"));
wireDefn.setTarget(new URI("compositeReference"));
- composite.add(wireDefn);
+ componentType.add(wireDefn);
try {
- compositeLoader.resolveWires(composite);
+ compositeLoader.resolveWires(componentType);
fail();
} catch (InvalidWireException e) {
// expected
}
}
- @SuppressWarnings("unchecked")
public void testComponent2ComponentQualifedValid() throws Exception {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("Component1"));
wireDefn.setTarget(new URI("Component2/pojoSvc3"));
- composite.add(wireDefn);
- compositeLoader.resolveWires(composite);
+ componentType.add(wireDefn);
+ compositeLoader.resolveWires(componentType);
}
- @SuppressWarnings("unchecked")
public void testComponent2ComponentUnQualifedInvalid() throws
URISyntaxException {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("Component1"));
wireDefn.setTarget(new URI("Component2"));
- composite.add(wireDefn);
+ componentType.add(wireDefn);
try {
- compositeLoader.resolveWires(composite);
+ compositeLoader.resolveWires(componentType);
fail();
} catch (InvalidWireException e) {
// expected
}
}
- @SuppressWarnings("unchecked")
public void testInvalidWireDefinitions() throws URISyntaxException {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("undefinedSource"));
wireDefn.setTarget(new URI("compositeReference"));
- composite.add(wireDefn);
+ componentType.add(wireDefn);
try {
- compositeLoader.resolveWires(composite);
+ compositeLoader.resolveWires(componentType);
fail();
} catch (InvalidWireException e) {
// expected
@@ -225,8 +220,8 @@
try {
wireDefn.setSource(new URI("compositeService1"));
wireDefn.setTarget(new URI("undefinedTarget"));
- composite.add(wireDefn);
- compositeLoader.resolveWires(composite);
+ componentType.add(wireDefn);
+ compositeLoader.resolveWires(componentType);
fail();
} catch (InvalidWireException e) {
// expected
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
