Remove the old test and add it to the module build

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1171287 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 3 insertions, 141 deletions

diff --git a/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/layout/LayoutBuilderTest.java b/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/layout/LayoutBuilderTest.java
deleted file mode 100755
index 36ea55f5d1..0000000000
--- a/sca-java-2.x/trunk/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/layout/LayoutBuilderTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.apache.tuscany.sca.layout;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.impl.layout.ComponentEntity;
-import org.apache.tuscany.sca.impl.layout.CompositeEntity;
-import org.apache.tuscany.sca.impl.layout.Entity;
-import org.apache.tuscany.sca.impl.layout.LayoutBuilder;
-import org.junit.Before;
-import org.junit.Test;
-
-public class LayoutBuilderTest {
-
-    LayoutBuilder lb;
-    Entity[] ents;
-    Entity parent;
-    int[][] conns;
-
-    @Before
-    public void setUp() throws Exception {
-        parent = new CompositeEntity("composite");
-        parent.setX(200);
-        parent.setY(100);
-
-        ents = new Entity[5];
-        for (int i = 0; i < ents.length; i++) {
-            ents[i] = new ComponentEntity();
-            ents[i].setId(i);
-            ents[i].setParent(parent);
-        }
-
-    }
-
-    @Test
-    public void testPlaceEntities() throws Exception {
-        //setUp();
-        Assert.assertEquals(5, ents.length);
-        Assert.assertEquals(200, ents[0].getStartPosition());
-
-        conns = new int[5][5];
-        for (int i = 0; i < conns.length; i++) {
-            for (int j = 0; j < conns.length; j++) {
-                //int x = Math.getExponent(Math.random());
-                if (i == j - 1)
-                    conns[i][j] = 1;
-                else
-                    conns[i][j] = 0;
-            }
-        }
-
-        lb = new LayoutBuilder(ents, conns);
-
-        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());
-        Assert.assertEquals(0, ents[2].getLevel());
-        Assert.assertEquals(0, ents[3].getLevel());
-        Assert.assertEquals(0, ents[4].getLevel());
-
-        Assert.assertEquals(0, ents[0].getLane());
-        Assert.assertEquals(1, ents[1].getLane());
-        Assert.assertEquals(2, ents[2].getLane());
-        Assert.assertEquals(3, ents[3].getLane());
-        Assert.assertEquals(4, ents[4].getLane());
-
-    }
-
-    @Test
-    public void testPlaceEntities1() throws Exception {
-
-        conns = new int[5][5];
-        for (int i = 0; i < conns.length; i++) {
-            for (int j = 0; j < conns.length; j++) {
-                //int x = Math.getExponent(Math.random());
-                if (i == j - 1 || i == j - 4)
-                    conns[i][j] = 1;
-                else
-                    conns[i][j] = 0;
-            }
-        }
-        conns[3][4] = 0;
-
-        lb = new LayoutBuilder(ents, conns);
-
-        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());
-        Assert.assertEquals(0, ents[2].getLevel());
-        Assert.assertEquals(0, ents[3].getLevel());
-        Assert.assertEquals(1, ents[4].getLevel());
-
-        Assert.assertEquals(0, ents[0].getLane());
-        Assert.assertEquals(1, ents[1].getLane());
-        Assert.assertEquals(2, ents[2].getLane());
-        Assert.assertEquals(3, ents[3].getLane());
-        Assert.assertEquals(1, ents[4].getLane());
-
-    }
-
-    @Test
-    public void testPlaceEntities2() throws Exception {
-
-        conns = new int[5][5];
-        for (int i = 0; i < conns.length; i++) {
-            for (int j = 0; j < conns.length; j++) {
-                if (i * j > 2 && i * j <= 6)
-                    conns[i][j] = 1;
-                else
-                    conns[i][j] = 0;
-            }
-        }
-
-        lb = new LayoutBuilder(ents, conns);
-
-        ents = lb.placeEntities();
-
-        Assert.assertEquals(5, ents.length);
-        Assert.assertEquals(1, lb.getStartEnt().getId());
-
-        Assert.assertEquals(1, 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[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());
-
-    }
-}
diff --git a/sca-java-2.x/trunk/modules/pom.xml b/sca-java-2.x/trunk/modules/pom.xml
index 8f377028e3..6b92607c84 100644
--- a/sca-java-2.x/trunk/modules/pom.xml
+++ b/sca-java-2.x/trunk/modules/pom.xml
@@ -148,6 +148,9 @@
         <module>binding-corba</module>
         <module>binding-corba-runtime</module>
 
+        <!-- Composite diagram generator -->
+        <module>composite-diagram</module>
+
         <!-- 
             Runtime collection features