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/03/19 20:45:42 UTC
svn commit: r520066 - in
/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation:
java/PhysicalBuilderTestCase.java system/builder/PhysicalBuilderTestCase.java
Author: jboynes
Date: Mon Mar 19 12:45:41 2007
New Revision: 520066
URL: http://svn.apache.org/viewvc?view=rev&rev=520066
Log:
clean up a little
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java?view=diff&rev=520066&r1=520065&r2=520066
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java Mon Mar 19 12:45:41 2007
@@ -75,18 +75,9 @@
private PhysicalChangeSet pcs;
public void testWireTwoComponents() throws Exception {
- JavaPhysicalWireSourceDefinition wireSource = new JavaPhysicalWireSourceDefinition();
- wireSource.setUri(sourceId.resolve("#target"));
- wireSource.setOptimizable(true);
- JavaPhysicalWireTargetDefinition wireTarget = new JavaPhysicalWireTargetDefinition();
- wireTarget.setUri(targetId);
- PhysicalWireDefinition wireDefinition = new PhysicalWireDefinition();
- wireDefinition.setSource(wireSource);
- wireDefinition.setTarget(wireTarget);
-
pcs.addComponentDefinition(createSourceComponentDefinition());
pcs.addComponentDefinition(createTargetComponentDefinition());
- pcs.addWireDefinition(wireDefinition);
+ pcs.addWireDefinition(createOptimizedWire());
deployer.applyChangeSet(pcs);
WorkContext workContext = new SimpleWorkContext();
@@ -130,6 +121,18 @@
target.setScope(Scope.COMPOSITE);
target.setInstanceFactoryProviderDefinition(targetProviderDefinition);
return target;
+ }
+
+ private PhysicalWireDefinition createOptimizedWire() {
+ JavaPhysicalWireSourceDefinition wireSource = new JavaPhysicalWireSourceDefinition();
+ wireSource.setUri(sourceId.resolve("#target"));
+ wireSource.setOptimizable(true);
+ JavaPhysicalWireTargetDefinition wireTarget = new JavaPhysicalWireTargetDefinition();
+ wireTarget.setUri(targetId);
+ PhysicalWireDefinition wireDefinition = new PhysicalWireDefinition();
+ wireDefinition.setSource(wireSource);
+ wireDefinition.setTarget(wireTarget);
+ return wireDefinition;
}
protected void setUp() throws Exception {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java?view=diff&rev=520066&r1=520065&r2=520066
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java Mon Mar 19 12:45:41 2007
@@ -75,17 +75,9 @@
private PhysicalChangeSet pcs;
public void testWireTwoComponents() throws Exception {
- SystemPhysicalWireSourceDefinition wireSource = new SystemPhysicalWireSourceDefinition();
- wireSource.setUri(sourceId.resolve("#target"));
- SystemPhysicalWireTargetDefinition wireTarget = new SystemPhysicalWireTargetDefinition();
- wireTarget.setUri(targetId);
- PhysicalWireDefinition wireDefinition = new PhysicalWireDefinition();
- wireDefinition.setSource(wireSource);
- wireDefinition.setTarget(wireTarget);
-
pcs.addComponentDefinition(createSourceComponentDefinition());
pcs.addComponentDefinition(createTargetComponentDefinition());
- pcs.addWireDefinition(wireDefinition);
+ pcs.addWireDefinition(createWireDefinition());
deployer.applyChangeSet(pcs);
WorkContext workContext = new SimpleWorkContext();
@@ -129,6 +121,17 @@
target.setScope(Scope.COMPOSITE);
target.setInstanceFactoryProviderDefinition(targetProviderDefinition);
return target;
+ }
+
+ private PhysicalWireDefinition createWireDefinition() {
+ SystemPhysicalWireSourceDefinition wireSource = new SystemPhysicalWireSourceDefinition();
+ wireSource.setUri(sourceId.resolve("#target"));
+ SystemPhysicalWireTargetDefinition wireTarget = new SystemPhysicalWireTargetDefinition();
+ wireTarget.setUri(targetId);
+ PhysicalWireDefinition wireDefinition = new PhysicalWireDefinition();
+ wireDefinition.setSource(wireSource);
+ wireDefinition.setTarget(wireTarget);
+ return wireDefinition;
}
protected void setUp() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org