diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules/composite-diagram/src/test')
2 files changed, 34 insertions, 21 deletions
diff --git a/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/LayoutBuilderTestCase.java b/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/LayoutBuilderTestCase.java index 8faaddfa19..542de3de00 100755 --- a/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/LayoutBuilderTestCase.java +++ b/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/LayoutBuilderTestCase.java @@ -20,10 +20,6 @@ package org.apache.tuscany.sca.diagram.layout; import junit.framework.Assert; -import org.apache.tuscany.sca.diagram.layout.ComponentEntity; -import org.apache.tuscany.sca.diagram.layout.CompositeEntity; -import org.apache.tuscany.sca.diagram.layout.Entity; -import org.apache.tuscany.sca.diagram.layout.LayoutBuilder; import org.junit.Before; import org.junit.Test; @@ -66,12 +62,11 @@ public class LayoutBuilderTestCase { } } - lb = new LayoutBuilder(ents, conns); + lb = new LayoutBuilder(ents, conns, 4); ents = lb.placeEntities(); Assert.assertEquals(5, ents.length); - Assert.assertEquals(0, lb.getStartEnt().getId()); Assert.assertEquals(0, ents[0].getLevel()); Assert.assertEquals(0, ents[1].getLevel()); @@ -102,12 +97,11 @@ public class LayoutBuilderTestCase { } conns[3][4] = 0; - lb = new LayoutBuilder(ents, conns); + lb = new LayoutBuilder(ents, conns, 4); ents = lb.placeEntities(); Assert.assertEquals(5, ents.length); - Assert.assertEquals(0, lb.getStartEnt().getId()); Assert.assertEquals(0, ents[0].getLevel()); Assert.assertEquals(0, ents[1].getLevel()); @@ -136,24 +130,23 @@ public class LayoutBuilderTestCase { } } - lb = new LayoutBuilder(ents, conns); + lb = new LayoutBuilder(ents, conns, 4); ents = lb.placeEntities(); Assert.assertEquals(5, ents.length); - Assert.assertEquals(1, lb.getStartEnt().getId()); - Assert.assertEquals(1, ents[0].getLevel()); + Assert.assertEquals(0, ents[0].getLevel()); Assert.assertEquals(0, ents[1].getLevel()); Assert.assertEquals(0, ents[2].getLevel()); Assert.assertEquals(0, ents[3].getLevel()); - Assert.assertEquals(1, ents[4].getLevel()); + Assert.assertEquals(0, ents[4].getLevel()); Assert.assertEquals(0, ents[0].getLane()); - Assert.assertEquals(0, ents[1].getLane()); - Assert.assertEquals(2, ents[2].getLane()); - Assert.assertEquals(1, ents[3].getLane()); - Assert.assertEquals(1, ents[4].getLane()); + Assert.assertEquals(1, ents[1].getLane()); + Assert.assertEquals(3, ents[2].getLane()); + Assert.assertEquals(4, ents[3].getLane()); + Assert.assertEquals(2, ents[4].getLane()); } } diff --git a/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/Calculator2.xml b/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/Calculator2.xml index ff2723dac7..81384ef840 100755 --- a/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/Calculator2.xml +++ b/sca-java-2.x/trunk/modules/composite-diagram/src/test/resources/input/Calculator2.xml @@ -17,10 +17,8 @@ * specific language governing permissions and limitations * under the License. --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="Calculator2"> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://sample" + xmlns:sample="http://sample" name="Calculator2"> <component name="CalculatorServiceComponent"> <implementation.java class="calculator.CalculatorServiceImpl" /> @@ -28,11 +26,17 @@ <reference name="subtractService" target="SubtractServiceComponent" /> <reference name="multiplyService" target="MultiplyServiceComponent" /> <reference name="divideService" target="DivideServiceComponent" /> - + <reference name="addService2" target="AddServiceComponent2" /> <reference name="subtractService2" target="SubtractServiceComponent2" /> <reference name="multiplyService2" target="MultiplyServiceComponent2" /> <reference name="divideService2" target="DivideServiceComponent2" /> + + <reference name="addService3" target="AddServiceComponent3" /> + <reference name="subtractService3" target="SubtractServiceComponent3" /> + <reference name="multiplyService3" target="MultiplyServiceComponent3" /> + <reference name="divideService3" target="DivideServiceComponent3" /> + </component> <component name="AddServiceComponent"> @@ -67,4 +71,20 @@ <implementation.java class="calculator.DivideServiceImpl" /> </component> + <component name="AddServiceComponent3"> + <implementation.java class="calculator.AddServiceImpl" /> + </component> + + <component name="SubtractServiceComponent3"> + <implementation.java class="calculator.SubtractServiceImpl" /> + </component> + + <component name="MultiplyServiceComponent3"> + <implementation.java class="calculator.MultiplyServiceImpl" /> + </component> + + <component name="DivideServiceComponent3"> + <implementation.java class="calculator.DivideServiceImpl" /> + </component> + </composite>
\ No newline at end of file |