You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sv...@apache.org on 2006/11/19 12:03:13 UTC
svn commit: r476795 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/implementation/composite/
main/java/org/apache/tuscany/core/loader/
test/java/org/apache/tuscany/core/implementation/composite/
test/java/org/apache...
Author: svkrish
Date: Sun Nov 19 03:03:10 2006
New Revision: 476795
URL: http://svn.apache.org/viewvc?view=rev&rev=476795
Log:
Fixed for -Psourcecheck aberrations
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.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/loader/WireLoaderTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java?view=diff&rev=476795&r1=476794&r2=476795
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeLoader.java Sun Nov 19 03:03:10 2006
@@ -58,17 +58,19 @@
/**
* Loads a composite component definition from an XML-based assembly file
- *
+ *
* @version $Rev$ $Date$
*/
public class CompositeLoader extends LoaderExtension<CompositeComponentType> {
public static final QName COMPOSITE = new QName(XML_NAMESPACE_1_0, "composite");
+
public static final String URI_DELIMITER = "/";
private final ArtifactRepository artifactRepository;
- public CompositeLoader(@Autowire LoaderRegistry registry,
- @Autowire ArtifactRepository artifactRepository) {
+ public CompositeLoader(@Autowire
+ LoaderRegistry registry, @Autowire
+ ArtifactRepository artifactRepository) {
super(registry);
this.artifactRepository = artifactRepository;
}
@@ -77,12 +79,10 @@
return COMPOSITE;
}
- public CompositeComponentType load(CompositeComponent parent,
- ModelObject object, XMLStreamReader reader,
- DeploymentContext deploymentContext)
- throws XMLStreamException, LoaderException {
+ public CompositeComponentType load(CompositeComponent parent, ModelObject object, XMLStreamReader reader,
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> composite =
- new CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
+ new CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>>();
composite.setName(reader.getAttributeValue(null, "name"));
boolean done = false;
while (!done) {
@@ -111,14 +111,14 @@
if (artifact.getUrl() != null) {
ClassLoader classLoader = deploymentContext.getClassLoader();
if (classLoader instanceof CompositeClassLoader) {
- CompositeClassLoader ccl = (CompositeClassLoader)classLoader;
+ CompositeClassLoader ccl = (CompositeClassLoader) classLoader;
for (URL dep : artifact.getUrls()) {
ccl.addURL(dep);
}
}
}
} else if (o instanceof WireDefinition) {
- composite.add((WireDefinition) o);
+ composite.add((WireDefinition) o);
} else {
// HACK: [rfeng] Add as an unknown model extension
if (o != null) {
@@ -129,9 +129,9 @@
break;
case END_ELEMENT:
if (COMPOSITE.equals(reader.getName())) {
- //if there are wire defintions then link them up to the relevant components
- resolveWires(composite);
- verifyCompositeCompleteness(composite);
+ // if there are wire defintions then link them up to the relevant components
+ resolveWires(composite);
+ verifyCompositeCompleteness(composite);
done = true;
break;
}
@@ -142,143 +142,140 @@
}
return composite;
}
-
- protected void resolveWires(CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> composite)
- throws InvalidWireException {
- List<WireDefinition> wireDefns = composite.getDeclaredWires();
- String sourceSCAObjectName = null;
- String componentReferenceName = null;
- int index = -1;
- ComponentDefinition componentDefinition = null;
- ServiceDefinition serviceDefinition = null;
-
- for ( WireDefinition aWireDefn : wireDefns ) {
- //first validate the target before finding the source
+ protected void resolveWires(CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> composite)
+ throws InvalidWireException {
+ List<WireDefinition> wireDefns = composite.getDeclaredWires();
+ String sourceSCAObjectName = null;
+ String componentReferenceName = null;
+ int index = -1;
+ ComponentDefinition componentDefinition = null;
+ ServiceDefinition serviceDefinition = null;
+
+ for (WireDefinition aWireDefn : wireDefns) {
+
+ // first validate the target before finding the source
validateTarget(aWireDefn.getTarget(), composite);
-
+
sourceSCAObjectName = aWireDefn.getSource().toString();
serviceDefinition = composite.getDeclaredServices().get(sourceSCAObjectName);
- if ( serviceDefinition != null ) {
- if ( serviceDefinition instanceof BoundServiceDefinition ) {
- ((BoundServiceDefinition)serviceDefinition).setTarget(aWireDefn.getTarget());
- } else if ( serviceDefinition instanceof BindlessServiceDefinition ) {
- ((BoundServiceDefinition)serviceDefinition).setTarget(aWireDefn.getTarget());
+ if (serviceDefinition != null) {
+ if (serviceDefinition instanceof BoundServiceDefinition) {
+ ((BoundServiceDefinition) serviceDefinition).setTarget(aWireDefn.getTarget());
+ } else if (serviceDefinition instanceof BindlessServiceDefinition) {
+ ((BoundServiceDefinition) serviceDefinition).setTarget(aWireDefn.getTarget());
} else {
- BindlessServiceDefinition bindlessSvcDefn =
- new BindlessServiceDefinition(serviceDefinition.getName(),
- serviceDefinition.getServiceContract(),
- false,
- aWireDefn.getTarget());
+ BindlessServiceDefinition bindlessSvcDefn =
+ new BindlessServiceDefinition(serviceDefinition.getName(), serviceDefinition
+ .getServiceContract(), false, aWireDefn.getTarget());
composite.getDeclaredServices().put(sourceSCAObjectName, bindlessSvcDefn);
}
} else {
- if ( (index = sourceSCAObjectName.indexOf(URI_DELIMITER)) != -1 ) {
+ if ((index = sourceSCAObjectName.indexOf(URI_DELIMITER)) != -1) {
componentReferenceName = sourceSCAObjectName.substring(index + 1);
sourceSCAObjectName = sourceSCAObjectName.substring(0, index);
}
-
+
componentDefinition = composite.getDeclaredComponents().get(sourceSCAObjectName);
- if ( componentDefinition != null ) {
- componentDefinition.add(createReferenceTarget(componentReferenceName,
- aWireDefn.getTarget(),
- componentDefinition));
+ if (componentDefinition != null) {
+ componentDefinition.add(createReferenceTarget(componentReferenceName, aWireDefn.getTarget(),
+ componentDefinition));
} else {
- InvalidWireException le = new InvalidWireException("Unable to resolve wire source '" + sourceSCAObjectName +
- "' in composite " + composite.getName());
+ InvalidWireException le =
+ new InvalidWireException("Unable to resolve wire source '" + sourceSCAObjectName
+ + "' in composite " + composite.getName());
le.addContextName("composite=" + composite.getName());
le.setIdentifier(sourceSCAObjectName);
throw le;
}
}
- }
+ }
}
-
- private ReferenceTarget createReferenceTarget(String componentReferenceName,
- URI target,
- ComponentDefinition componentDefn)
- throws InvalidWireException {
- ComponentType componentType = componentDefn.getImplementation().getComponentType();
- if ( componentReferenceName == null ) {
- //if there is ambiguity in determining the source of the wire or
- //there is no reference to be wired
- if ( componentType.getReferences().size() > 1 ||
- componentType.getReferences().isEmpty() ) {
- InvalidWireException le =
- new InvalidWireException("Unable to determine unique component reference for wire...");
- le.addContextName("loading wire defintions for " + componentDefn.getName());
- le.setIdentifier(componentDefn.getName() + "/?->" + target.toString());
+
+ private ReferenceTarget createReferenceTarget(String componentReferenceName, URI target,
+ ComponentDefinition componentDefn) throws InvalidWireException {
+ ComponentType componentType = componentDefn.getImplementation().getComponentType();
+ if (componentReferenceName == null) {
+ // if there is ambiguity in determining the source of the wire or
+ // there is no reference to be wired
+ if (componentType.getReferences().size() > 1 || componentType.getReferences().isEmpty()) {
+ InvalidWireException le =
+ new InvalidWireException("Unable to determine unique component reference for wire...");
+ le.addContextName("loading wire defintions for " + componentDefn.getName());
+ le.setIdentifier(componentDefn.getName() + "/?->" + target.toString());
throw le;
} else {
- componentReferenceName =
- ((ReferenceDefinition)componentType.getReferences().values().iterator().next()).getName();
+ componentReferenceName =
+ ((ReferenceDefinition) componentType.getReferences().values().iterator().next()).getName();
}
- }
-
- ReferenceTarget referenceTarget = new ReferenceTarget();
+ }
+
+ ReferenceTarget referenceTarget = new ReferenceTarget();
referenceTarget.setReferenceName(componentReferenceName);
referenceTarget.addTarget(target);
return referenceTarget;
}
-
- protected void verifyCompositeCompleteness(CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> composite)
- throws InvalidServiceException {
- //check if all of the composites services have been wired
- for ( ServiceDefinition svcDefn : composite.getDeclaredServices().values() ) {
- if ( svcDefn instanceof BoundServiceDefinition &&
- ((BoundServiceDefinition)svcDefn).getTarget() == null ) {
- InvalidServiceException le = new InvalidServiceException("Composite service not wired to any target...");
- le.addContextName("loading composite " + composite.getName());
+
+ protected void verifyCompositeCompleteness(
+ CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> composite)
+ throws InvalidServiceException {
+ // check if all of the composites services have been wired
+ for (ServiceDefinition svcDefn : composite.getDeclaredServices().values()) {
+ if (svcDefn instanceof BoundServiceDefinition && ((BoundServiceDefinition) svcDefn).getTarget() == null) {
+ InvalidServiceException le =
+ new InvalidServiceException("Composite service not wired to any target...");
+ le.addContextName("loading composite " + composite.getName());
le.setIdentifier(svcDefn.getName());
throw le;
- }
- }
+ }
+ }
}
-
- private void validateTarget(URI target,
- CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> composite )
- throws InvalidWireException {
+
+ private void validateTarget(URI target,
+ CompositeComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> composite)
+ throws InvalidWireException {
String targetSCAObjectName = target.toString();
-
- //if target is not a reference of the composite
- if ( composite.getReferences().get(targetSCAObjectName) == null ) {
+
+ // if target is not a reference of the composite
+ if (composite.getReferences().get(targetSCAObjectName) == null) {
String componentServiceName = null;
int index = -1;
-
- //if target is qualified
- if ( (index = targetSCAObjectName.indexOf(URI_DELIMITER)) != -1 ) {
+
+ // if target is qualified
+ if ((index = targetSCAObjectName.indexOf(URI_DELIMITER)) != -1) {
componentServiceName = targetSCAObjectName.substring(index + 1);
targetSCAObjectName = targetSCAObjectName.substring(0, index);
}
-
- ComponentDefinition componentDefinition =
- composite.getDeclaredComponents().get(targetSCAObjectName);
- //if a target component exists in this composite
- if ( componentDefinition != null ) {
- if ( componentServiceName == null ) {
- if ( componentDefinition.getImplementation().getComponentType().getServices().size() > 1 ||
- componentDefinition.getImplementation().getComponentType().getServices().isEmpty() ) {
- InvalidWireException le =
- new InvalidWireException("Ambiguous target '" + componentDefinition.getName() +
- "' for wire definitions in composite - " + composite.getName());
+
+ ComponentDefinition componentDefinition = composite.getDeclaredComponents().get(targetSCAObjectName);
+ // if a target component exists in this composite
+ if (componentDefinition != null) {
+ if (componentServiceName == null) {
+ if (componentDefinition.getImplementation().getComponentType().getServices().size() > 1
+ || componentDefinition.getImplementation().getComponentType().getServices().isEmpty()) {
+ InvalidWireException le =
+ new InvalidWireException("Ambiguous target '" + componentDefinition.getName()
+ + "' for wire definitions in composite - " + composite.getName());
le.addContextName("loading composite " + composite.getName());
le.setIdentifier(componentDefinition.getName());
throw le;
- }
- } else {
- if ( componentDefinition.getImplementation().getComponentType().getServices().get(componentServiceName) == null ) {
- InvalidWireException le =
- new InvalidWireException("Invalid target '" + targetSCAObjectName + "/" +
- componentServiceName + "' for wire definitions in composite - " + composite.getName());
+ }
+ } else {
+ if (componentDefinition.getImplementation().getComponentType().getServices().get(
+ componentServiceName) == null) {
+ InvalidWireException le =
+ new InvalidWireException("Invalid target '" + targetSCAObjectName + "/"
+ + componentServiceName + "' for wire definitions in composite - "
+ + composite.getName());
le.addContextName("loading composite " + composite.getName());
le.setIdentifier(targetSCAObjectName + "/" + componentServiceName);
throw le;
}
- }
+ }
} else {
- InvalidWireException le =
- new InvalidWireException("Invalid target '" + targetSCAObjectName +
- "' for wire definitions in composite - " + composite.getName());
+ InvalidWireException le =
+ new InvalidWireException("Invalid target '" + targetSCAObjectName
+ + "' for wire definitions in composite - " + composite.getName());
le.addContextName("loading composite " + composite.getName());
le.setIdentifier(targetSCAObjectName);
throw le;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java?view=diff&rev=476795&r1=476794&r2=476795
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java Sun Nov 19 03:03:10 2006
@@ -45,15 +45,17 @@
/**
* Loads a service definition from an XML-based assembly file
- *
+ *
* @version $Rev$ $Date$
*/
public class ServiceLoader extends LoaderExtension<ServiceDefinition> {
private static final QName SERVICE = new QName(XML_NAMESPACE_1_0, "service");
+
private static final QName REFERENCE = new QName(XML_NAMESPACE_1_0, "reference");
- @Constructor({"registry"})
- public ServiceLoader(@Autowire LoaderRegistry registry) {
+ @Constructor( { "registry" })
+ public ServiceLoader(@Autowire
+ LoaderRegistry registry) {
super(registry);
}
@@ -61,10 +63,8 @@
return SERVICE;
}
- public ServiceDefinition load(CompositeComponent parent,
- ModelObject object, XMLStreamReader reader,
- DeploymentContext deploymentContext)
- throws XMLStreamException, LoaderException {
+ public ServiceDefinition load(CompositeComponent parent, ModelObject object, XMLStreamReader reader,
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
assert SERVICE.equals(reader.getName());
String name = reader.getAttributeValue(null, "name");
String target = null;
@@ -92,28 +92,23 @@
case END_ELEMENT:
if (SERVICE.equals(reader.getName())) {
if (binding != null) {
- /*if (target == null) {
- InvalidReferenceException e = new InvalidReferenceException("No target for service ");
- e.setIdentifier(name);
- throw e;
- }*/
- URI targetURI = null;
- if ( target != null ) {
- try {
- targetURI = new URI(target);
- } catch (URISyntaxException e) {
- InvalidReferenceException ire = new InvalidReferenceException(target);
- ire.setIdentifier(name);
- throw ire;
- }
- }
+ /*
+ * if (target == null) { InvalidReferenceException e = new InvalidReferenceException("No target for service ");
+ * e.setIdentifier(name); throw e; }
+ */
+ URI targetURI = null;
+ if (target != null) {
+ try {
+ targetURI = new URI(target);
+ } catch (URISyntaxException e) {
+ InvalidReferenceException ire = new InvalidReferenceException(target);
+ ire.setIdentifier(name);
+ throw ire;
+ }
+ }
// FIXME need a way to specify "remotable" on a service
- return new BoundServiceDefinition<Binding>(name,
- serviceContract,
- false,
- binding,
- targetURI);
+ return new BoundServiceDefinition<Binding>(name, serviceContract, false, binding, targetURI);
} else if (target != null) {
URI targetURI;
try {
@@ -123,7 +118,7 @@
ire.setIdentifier(name);
throw ire;
}
-
+
return new BindlessServiceDefinition(name, serviceContract, false, targetURI);
} else {
// FIXME need a way to specify "remotable" on a service
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java?view=diff&rev=476795&r1=476794&r2=476795
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/WireLoader.java Sun Nov 19 03:03:10 2006
@@ -42,16 +42,19 @@
/**
* Loads a wire from an XML-based assembly file
- *
+ *
* @version $Rev: 465084 $ $Date: 2006-10-18 04:00:49 +0530 (Wed, 18 Oct 2006) $
*/
public class WireLoader extends LoaderExtension<WireDefinition> {
public static final QName WIRE = new QName(XML_NAMESPACE_1_0, "wire");
+
public static final QName SOURCE_URI = new QName(XML_NAMESPACE_1_0, "source.uri");
+
public static final QName TARGET_URI = new QName(XML_NAMESPACE_1_0, "target.uri");
- @Constructor({"registry"})
- public WireLoader(@Autowire LoaderRegistry registry) {
+ @Constructor( { "registry" })
+ public WireLoader(@Autowire
+ LoaderRegistry registry) {
super(registry);
}
@@ -59,61 +62,58 @@
return WIRE;
}
- public WireDefinition load(CompositeComponent parent,
- ModelObject object, XMLStreamReader reader,
- DeploymentContext deploymentContext
- )
- throws XMLStreamException, LoaderException {
+ public WireDefinition load(CompositeComponent parent, ModelObject object, XMLStreamReader reader,
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
assert WIRE.equals(reader.getName());
-
+
WireDefinition wireDefn = null;
URI sourceURI = null;
URI targetURI = null;
String uriString = null;
-
+
while (true) {
switch (reader.next()) {
case START_ELEMENT:
- try {
- if ( reader.getName().equals(SOURCE_URI) ) {
+ try {
+ if (reader.getName().equals(SOURCE_URI)) {
uriString = reader.getElementText();
- if ( uriString != null && uriString.trim().length() > 0 ) {
- sourceURI = new URI(uriString);
- } else {
- throw(new InvalidWireException("Source not defined " +
- " inside 'Wire' definition in composite " + parent.getName()));
- }
- } else if ( reader.getName().equals(TARGET_URI) ) {
+ if (uriString != null && uriString.trim().length() > 0) {
+ sourceURI = new URI(uriString);
+ } else {
+ throw new InvalidWireException("Source not defined "
+ + " inside 'Wire' definition in composite " + parent.getName());
+ }
+ } else if (reader.getName().equals(TARGET_URI)) {
uriString = reader.getElementText();
- if ( uriString != null && uriString.trim().length() > 0 ) {
- targetURI = new URI(uriString);
- } else {
- throw(new InvalidWireException("Target not defined " +
- " inside 'Wire' definition in composite " + parent.getName()));
- }
- } else {
- throw(new InvalidWireException("Unrecognized Element " + reader.getName() +
- " inside 'Wire' definition in composite " + parent.getName()));
- }
- } catch ( URISyntaxException e ) {
- throw(new InvalidWireException("Exception loading wire info from scdl due to problems " +
- "with source or target URIs - " + e));
- }
-
+ if (uriString != null && uriString.trim().length() > 0) {
+ targetURI = new URI(uriString);
+ } else {
+ throw new InvalidWireException("Target not defined "
+ + " inside 'Wire' definition in composite " + parent.getName());
+ }
+ } else {
+ throw new InvalidWireException("Unrecognized Element " + reader.getName()
+ + " inside 'Wire' definition in composite " + parent.getName());
+ }
+ } catch (URISyntaxException e) {
+ throw new InvalidWireException("Exception loading wire info from scdl due to problems "
+ + "with source or target URIs - " + e);
+ }
+
reader.next();
break;
case END_ELEMENT:
- if ( reader.getName().equals(WIRE)) {
- if ( sourceURI != null && targetURI != null ) {
- wireDefn = new WireDefinition();
- wireDefn.setSource(sourceURI);
- wireDefn.setTarget(targetURI);
- } else {
- throw(new InvalidWireException("Incomplete Wire Element Defintion " +
- " in composite " + parent.getName()));
- }
- return wireDefn;
- }
+ if (reader.getName().equals(WIRE)) {
+ if (sourceURI != null && targetURI != null) {
+ wireDefn = new WireDefinition();
+ wireDefn.setSource(sourceURI);
+ wireDefn.setTarget(targetURI);
+ } else {
+ throw new InvalidWireException("Incomplete Wire Element Defintion " + " in composite "
+ + parent.getName());
+ }
+ return wireDefn;
+ }
}
}
}
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=476795&r1=476794&r2=476795
==============================================================================
--- 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 19 03:03:10 2006
@@ -40,7 +40,7 @@
*
*/
public class CompositeLoaderWireResolutionTestCase extends TestCase {
- private CompositeComponentType composite = null;
+ private CompositeComponentType composite;
private CompositeLoader compositeLoader = new CompositeLoader(null, null);
@SuppressWarnings("unchecked")
@@ -69,7 +69,7 @@
JavaImplementation pojoImpl1 = new JavaImplementation();
pojoImpl1.setComponentType(pojoComponentType1);
- ComponentDefinition component1 = new ComponentDefinition("Component1",pojoImpl1);
+ ComponentDefinition component1 = new ComponentDefinition("Component1", pojoImpl1);
composite.add(component1);
PojoComponentType pojoComponentType2 = new PojoComponentType();
@@ -84,7 +84,7 @@
JavaImplementation pojoImpl2 = new JavaImplementation();
pojoImpl2.setComponentType(pojoComponentType2);
- ComponentDefinition component2 = new ComponentDefinition("Component2",pojoImpl2);
+ ComponentDefinition component2 = new ComponentDefinition("Component2", pojoImpl2);
composite.add(component2);
}
@@ -104,7 +104,7 @@
}
@SuppressWarnings("unchecked")
- public void testCompositeSvc2Component_valid() throws URISyntaxException {
+ public void testCompositeSvc2ComponentValid() throws URISyntaxException {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("compositeService1"));
@@ -121,7 +121,7 @@
}
@SuppressWarnings("unchecked")
- public void testCompositeSvc2ComponentQualified_valid() throws URISyntaxException {
+ public void testCompositeSvc2ComponentQualifiedValid() throws URISyntaxException {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("compositeService1"));
@@ -139,7 +139,7 @@
}
@SuppressWarnings("unchecked")
- public void testCompositeSvc2ComponentQualified_invalid() throws URISyntaxException {
+ public void testCompositeSvc2ComponentQualifiedInvalid() throws URISyntaxException {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("compositeService1"));
@@ -157,7 +157,7 @@
}
@SuppressWarnings("unchecked")
- public void testCompositeSvc2ComponentUnQualified_invalid() throws URISyntaxException {
+ public void testCompositeSvc2ComponentUnQualifiedInvalid() throws URISyntaxException {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("compositeService1"));
@@ -175,7 +175,7 @@
}
@SuppressWarnings("unchecked")
- public void testComponent2CompositeReference_valid() throws URISyntaxException {
+ public void testComponent2CompositeReferenceValid() throws URISyntaxException {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("Component1"));
@@ -193,7 +193,7 @@
}
@SuppressWarnings("unchecked")
- public void testComponent2CompositeReferenceQualified_valid() throws URISyntaxException {
+ public void testComponent2CompositeReferenceQualifiedValid() throws URISyntaxException {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("Component2/pojoRef3"));
@@ -211,7 +211,7 @@
}
@SuppressWarnings("unchecked")
- public void testComponent2CompositeReferenceUnQualified_invalid() throws URISyntaxException {
+ public void testComponent2CompositeReferenceUnQualifiedInvalid() throws URISyntaxException {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("Component2"));
@@ -230,7 +230,7 @@
}
@SuppressWarnings("unchecked")
- public void testComponent2ComponentQualifed_valid() throws URISyntaxException {
+ public void testComponent2ComponentQualifedValid() throws URISyntaxException {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("Component1"));
@@ -249,7 +249,7 @@
}
@SuppressWarnings("unchecked")
- public void testComponent2ComponentUnQualifed_invalid() throws URISyntaxException {
+ public void testComponent2ComponentUnQualifedInvalid() throws URISyntaxException {
//undefined source and targets
WireDefinition wireDefn = new WireDefinition();
wireDefn.setSource(new URI("Component1"));
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java?view=diff&rev=476795&r1=476794&r2=476795
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/WireLoaderTestCase.java Sun Nov 19 03:03:10 2006
@@ -37,9 +37,6 @@
import org.apache.tuscany.spi.loader.InvalidWireException;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
-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;
/**
@@ -47,126 +44,132 @@
*/
public class WireLoaderTestCase extends TestCase {
private static final QName WIRE = new QName(XML_NAMESPACE_1_0, "wire");
+
private static final QName SOURCE_URI = new QName(XML_NAMESPACE_1_0, "source.uri");
+
private static final QName TARGET_URI = new QName(XML_NAMESPACE_1_0, "target.uri");
-
+
private LoaderRegistry registry;
+
private WireLoader loader;
+
private XMLStreamReader reader;
+
private DeploymentContext context;
+
private CompositeComponent composite;
public void testValidWire() throws LoaderException, XMLStreamException {
-
+
expect(reader.getName()).andReturn(WIRE);
- expect(reader.next()).andReturn(START_ELEMENT);
+ expect(reader.next()).andReturn(START_ELEMENT);
expect(reader.getName()).andReturn(SOURCE_URI).times(1);
expect(reader.getElementText()).andReturn("source").times(1);
expect(reader.next()).andReturn(END_ELEMENT);
-
+
expect(reader.next()).andReturn(START_ELEMENT);
expect(reader.getName()).andReturn(TARGET_URI).times(2);
expect(reader.getElementText()).andReturn("target").times(1);
expect(reader.next()).andReturn(END_ELEMENT);
expect(reader.next()).andReturn(END_ELEMENT);
-
+
expect(reader.getName()).andReturn(WIRE).anyTimes();
-
+
replay(registry, reader, context);
WireDefinition wireDef = loader.load(composite, null, reader, context);
-
+
assertNotNull(wireDef);
verify(registry, reader, context);
}
-
- public void testInValidWire_NoSourceElement() throws LoaderException, XMLStreamException {
+
+ public void testInValidWireNoSourceElement() throws LoaderException, XMLStreamException {
expect(reader.getName()).andReturn(WIRE).times(1);
- expect(reader.next()).andReturn(START_ELEMENT);
+ expect(reader.next()).andReturn(START_ELEMENT);
expect(reader.getName()).andReturn(TARGET_URI).times(2);
expect(reader.getElementText()).andReturn("target").times(1);
expect(reader.next()).andReturn(END_ELEMENT);
-
+
expect(reader.next()).andReturn(END_ELEMENT);
expect(reader.getName()).andReturn(WIRE).anyTimes();
-
+
replay(registry, reader, context);
try {
- loader.load(composite, null, reader, context);
- fail();
- } catch ( InvalidWireException e ) {
- //expected behaviour
+ loader.load(composite, null, reader, context);
+ fail();
+ } catch (InvalidWireException e) {
+ //expected behaviour
//System.out.println(e);
}
verify(registry, reader, context);
}
-
- public void testInValidWire_NoTargetElement() throws LoaderException, XMLStreamException {
+
+ public void testInValidWireNoTargetElement() throws LoaderException, XMLStreamException {
expect(reader.getName()).andReturn(WIRE).times(1);
- expect(reader.next()).andReturn(START_ELEMENT);
+ expect(reader.next()).andReturn(START_ELEMENT);
expect(reader.getName()).andReturn(SOURCE_URI).times(1);
expect(reader.getElementText()).andReturn("source").times(1);
expect(reader.next()).andReturn(END_ELEMENT);
-
+
expect(reader.next()).andReturn(END_ELEMENT);
expect(reader.getName()).andReturn(WIRE).anyTimes();
-
+
replay(registry, reader, context);
try {
- loader.load(composite, null, reader, context);
- fail();
- } catch ( InvalidWireException e ) {
- //expected behaviour
+ loader.load(composite, null, reader, context);
+ fail();
+ } catch (InvalidWireException e) {
+ //expected behaviour
}
verify(registry, reader, context);
}
-
- public void testInValidWire_NoSourceSpecified() throws LoaderException, XMLStreamException {
+
+ public void testInValidWireNoSourceSpecified() throws LoaderException, XMLStreamException {
expect(reader.getName()).andReturn(WIRE).times(1);
- expect(reader.next()).andReturn(START_ELEMENT);
+ expect(reader.next()).andReturn(START_ELEMENT);
expect(reader.getName()).andReturn(SOURCE_URI).times(1);
expect(reader.getElementText()).andReturn("").times(1);
expect(reader.next()).andReturn(END_ELEMENT);
-
+
expect(reader.next()).andReturn(START_ELEMENT);
expect(reader.getName()).andReturn(TARGET_URI).times(2);
expect(reader.getElementText()).andReturn("target").times(1);
expect(reader.next()).andReturn(END_ELEMENT);
expect(reader.next()).andReturn(END_ELEMENT);
-
+
expect(reader.getName()).andReturn(WIRE).anyTimes();
-
+
replay(registry, reader, context);
try {
- loader.load(composite, null, reader, context);
- fail();
- } catch ( InvalidWireException e ) {
- //expected behaviour
+ loader.load(composite, null, reader, context);
+ fail();
+ } catch (InvalidWireException e) {
+ //expected behaviour
//System.out.println(e);
}
//verify(registry, reader, context);
}
-
- public void testInValidWire_NoTargetSpecified() throws LoaderException, XMLStreamException {
+
+ public void testInValidWireNoTargetSpecified() throws LoaderException, XMLStreamException {
expect(reader.getName()).andReturn(WIRE).times(1);
- expect(reader.next()).andReturn(START_ELEMENT);
+ expect(reader.next()).andReturn(START_ELEMENT);
expect(reader.getName()).andReturn(SOURCE_URI).times(1);
expect(reader.getElementText()).andReturn("source").times(1);
expect(reader.next()).andReturn(END_ELEMENT);
-
+
expect(reader.next()).andReturn(START_ELEMENT);
expect(reader.getName()).andReturn(TARGET_URI).times(2);
expect(reader.getElementText()).andReturn("").times(1);
expect(reader.next()).andReturn(END_ELEMENT);
expect(reader.next()).andReturn(END_ELEMENT);
-
+
expect(reader.getName()).andReturn(WIRE).anyTimes();
-
+
replay(registry, reader, context);
try {
- loader.load(composite, null, reader, context);
- fail();
- } catch ( InvalidWireException e ) {
- //expected behaviour
+ loader.load(composite, null, reader, context);
+ fail();
+ } catch (InvalidWireException e) {
+ //expected behaviour
}
//verify(registry, reader, context);
}
@@ -177,7 +180,7 @@
reader = createMock(XMLStreamReader.class);
context = createMock(DeploymentContext.class);
composite = createMock(CompositeComponent.class);
-
+
loader = new WireLoader(registry);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org