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 17:53:27 UTC
svn commit: r514190 - in /incubator/tuscany/java/sca/kernel:
core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalChangeSetMarshallerTest.java
spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalChangeSet.java
Author: meerajk
Date: Sat Mar 3 08:53:26 2007
New Revision: 514190
URL: http://svn.apache.org/viewvc?view=rev&rev=514190
Log:
more assertions for the marshaller test
Modified:
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/PhysicalChangeSet.java
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=514190&r1=514189&r2=514190
==============================================================================
--- 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 08:53:26 2007
@@ -35,7 +35,8 @@
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;
+import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
+import org.apache.tuscany.spi.model.physical.PhysicalWireDefinition;
/**
* Test case for Java physical change set marshaller.
@@ -92,22 +93,60 @@
JavaPhysicalReferenceDefinition ref = refs.iterator().next();
if("cmp1".equals(componentId)) {
assertEquals("rf1", ref.getName());
+ Set<PhysicalOperationDefinition> pods = ref.getOperations();
+ assertEquals(1, pods.size());
+ PhysicalOperationDefinition pod = pods.iterator().next();
+ assertEquals("op2", pod.getName());
} else {
assertEquals("rf2", ref.getName());
+ Set<PhysicalOperationDefinition> pods = ref.getOperations();
+ assertEquals(1, pods.size());
+ PhysicalOperationDefinition pod = pods.iterator().next();
+ assertEquals("op1", pod.getName());
}
- // TODO Fix defect
Set<JavaPhysicalServiceDefinition> svs = jpcd.getServices();
assertEquals(1, svs.size());
JavaPhysicalServiceDefinition sv = svs.iterator().next();
if("cmp1".equals(componentId)) {
assertEquals("sv1", sv.getName());
+ Set<PhysicalOperationDefinition> pods = sv.getOperations();
+ assertEquals(1, pods.size());
+ PhysicalOperationDefinition pod = pods.iterator().next();
+ assertEquals("op1", pod.getName());
} else {
assertEquals("sv2", sv.getName());
+ Set<PhysicalOperationDefinition> pods = sv.getOperations();
+ assertEquals(1, pods.size());
+ PhysicalOperationDefinition pod = pods.iterator().next();
+ assertEquals("op2", pod.getName());
}
}
+
+ Set<PhysicalWireDefinition> pwds = changeSet.getWireDefinitions();
+
assertEquals(2, changeSet.getWireDefinitions().size());
+ for(PhysicalWireDefinition pwd : pwds) {
+
+ String sourceUri = pwd.getSourceUri().toString();
+ String targetUri = pwd.getTargetUri().toString();
+
+ assertTrue(("cmp1#rf1".equals(sourceUri) &&
+ "cmp2#sv2".equals(targetUri)) ||
+ ("cmp2#rf2".equals(sourceUri) &&
+ "cmp1#sv1".equals(targetUri)));
+
+ Set<PhysicalOperationDefinition> pods = pwd.getOperations();
+ assertEquals(1, pods.size());
+ PhysicalOperationDefinition pod = pods.iterator().next();
+
+ if(sourceUri.equals("cmp1#rf1")) {
+ assertEquals("op2", pod.getName());
+ } else {
+ assertEquals("op1", pod.getName());
+ }
+ }
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalChangeSet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalChangeSet.java?view=diff&rev=514190&r1=514189&r2=514190
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalChangeSet.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalChangeSet.java Sat Mar 3 08:53:26 2007
@@ -42,7 +42,7 @@
* Get all the physical component definitions.
* @return Physical component definitions in the changeset.
*/
- public Set<? extends PhysicalComponentDefinition> getComponentDefinitions() {
+ public Set<PhysicalComponentDefinition> getComponentDefinitions() {
return Collections.unmodifiableSet(componentDefinitions);
}
@@ -50,7 +50,7 @@
* Get all the wire definitions.
* @return Wire definitions in the changeset.
*/
- public Set<? extends PhysicalWireDefinition> getWireDefinitions() {
+ public Set<PhysicalWireDefinition> getWireDefinitions() {
return Collections.unmodifiableSet(wireDefinitions);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org