You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/03/03 16:49:15 UTC
svn commit: r514175 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/model/physical/java/
core/src/test/java/org/apache/tuscany/core/marshaller/
spi/src/main/java/org/apache/tuscany/spi/model/physical/
Author: meerajk
Date: Sat Mar 3 07:49:14 2007
New Revision: 514175
URL: http://svn.apache.org/viewvc?view=rev&rev=514175
Log:
Parameterized PCD with PSD and PRD and added more assertions in the test, however there is a defect to fix
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java?view=diff&rev=514175&r1=514174&r2=514175
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/model/physical/java/JavaPhysicalComponentDefinition.java Sat Mar 3 07:49:14 2007
@@ -25,7 +25,7 @@
*
* @version $Rev$ $Date$
*/
-public class JavaPhysicalComponentDefinition extends PhysicalComponentDefinition {
+public class JavaPhysicalComponentDefinition extends PhysicalComponentDefinition<JavaPhysicalServiceDefinition, JavaPhysicalReferenceDefinition> {
// The byte code for the instance factory
private byte[] instanceFactoryByteCode;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java?view=diff&rev=514175&r1=514174&r2=514175
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java Sat Mar 3 07:49:14 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.core.marshaller;
import java.io.InputStream;
+import java.util.Set;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
@@ -28,8 +29,13 @@
import org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalComponentDefinitionMarshaller;
import org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalReferenceDefinitionMarshaller;
import org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalServiceDefinitionMarshaller;
+import org.apache.tuscany.core.model.physical.java.JavaPhysicalComponentDefinition;
+import org.apache.tuscany.core.model.physical.java.JavaPhysicalReferenceDefinition;
+import org.apache.tuscany.core.model.physical.java.JavaPhysicalServiceDefinition;
import org.apache.tuscany.spi.marshaller.ModelMarshallerRegistry;
import org.apache.tuscany.spi.model.physical.PhysicalChangeSet;
+import org.apache.tuscany.spi.model.physical.PhysicalComponentDefinition;
+import org.apache.tuscany.spi.model.physical.PhysicalReferenceDefinition;
/**
* Test case for Java physical change set marshaller.
@@ -71,7 +77,36 @@
PhysicalChangeSet changeSet = registry.unmarshallChangeSet(reader);
assertNotNull(changeSet);
- assertEquals(2, changeSet.getComponentDefinitions().size());
+ Set<? extends PhysicalComponentDefinition> pcds = changeSet.getComponentDefinitions();
+ assertEquals(2, pcds.size());
+ for(PhysicalComponentDefinition pcd : pcds) {
+
+ assertTrue(pcd instanceof JavaPhysicalComponentDefinition);
+ String componentId = pcd.getComponentId().toString();
+ assertTrue("cmp1".equals(componentId) || "cmp2".equals(componentId));
+
+ JavaPhysicalComponentDefinition jpcd = (JavaPhysicalComponentDefinition) pcd;
+
+ Set<JavaPhysicalReferenceDefinition> refs = jpcd.getReferences();
+ assertEquals(1, refs.size());
+ JavaPhysicalReferenceDefinition ref = refs.iterator().next();
+ if("cmp1".equals(componentId)) {
+ assertEquals("rf1", ref.getName());
+ } else {
+ assertEquals("rf2", ref.getName());
+ }
+
+ // TODO Fix defect
+ /*Set<JavaPhysicalServiceDefinition> svs = jpcd.getServices();
+ assertEquals(1, svs.size());
+ JavaPhysicalServiceDefinition sv = svs.iterator().next();
+ if("cmp1".equals(componentId)) {
+ assertEquals("sv1", ref.getName());
+ } else {
+ assertEquals("sv2", ref.getName());
+ }*/
+
+ }
assertEquals(2, changeSet.getWireDefinitions().size());
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java?view=diff&rev=514175&r1=514174&r2=514175
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java Sat Mar 3 07:49:14 2007
@@ -30,16 +30,16 @@
*
* @version $Rev$ $Date$
*/
-public abstract class PhysicalComponentDefinition extends ModelObject {
+public abstract class PhysicalComponentDefinition<PSD extends PhysicalServiceDefinition, PRD extends PhysicalReferenceDefinition> extends ModelObject {
// Component Id.
private URI componentId;
// Services exposed by this component
- private Set<PhysicalServiceDefinition> services = new HashSet<PhysicalServiceDefinition>();
+ private Set<PSD> services = new HashSet<PSD>();
// References exposed by this component
- private Set<PhysicalReferenceDefinition> references = new HashSet<PhysicalReferenceDefinition>();
+ private Set<PRD> references = new HashSet<PRD>();
/**
* Gets the component id.
@@ -61,7 +61,7 @@
* Returns the service definitions available for this component.
* @return Service definitions for this operation.
*/
- public Set<PhysicalServiceDefinition> getServices() {
+ public Set<PSD> getServices() {
return Collections.unmodifiableSet(services);
}
@@ -69,7 +69,7 @@
* Adds a service definition to the component.
* @param service Service definition to be added to the component.
*/
- public void addService(PhysicalServiceDefinition service) {
+ public void addService(PSD service) {
services.add(service);
}
@@ -77,7 +77,7 @@
* Returns the reference definitions available for this component.
* @return Reference definitions for this operation.
*/
- public Set<PhysicalReferenceDefinition> getReferences() {
+ public Set<PRD> getReferences() {
return Collections.unmodifiableSet(references);
}
@@ -85,7 +85,7 @@
* Adds a reference definition to the component.
* @param reference Reference definition to be added to the component.
*/
- public void addReference(PhysicalReferenceDefinition reference) {
+ public void addReference(PRD reference) {
references.add(reference);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org