tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r1164123 [4/4] - in /tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src: main/java/org/apache/tuscany/sca/impl/artifacts/ main/java/org/apache/tuscany/sca/impl/diagram/ main/java/org/apache/tuscany/sca/impl/html/...
Date Thu, 01 Sep 2011 15:57:26 GMT
Modified: tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/test/java/org/apache/tuscany/sca/layout/LayoutBuilderTest.java
URL: http://svn.apache.org/viewvc/tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/test/java/org/apache/tuscany/sca/layout/LayoutBuilderTest.java?rev=1164123&r1=1164122&r2=1164123&view=diff
==============================================================================
--- tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/test/java/org/apache/tuscany/sca/layout/LayoutBuilderTest.java
(original)
+++ tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/test/java/org/apache/tuscany/sca/layout/LayoutBuilderTest.java
Thu Sep  1 15:57:25 2011
@@ -1,6 +1,5 @@
 package org.apache.tuscany.sca.layout;
 
-import static org.junit.Assert.*;
 import junit.framework.Assert;
 
 import org.apache.tuscany.sca.impl.layout.ComponentEntity;
@@ -12,133 +11,131 @@ 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());
-		
-	}
+    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());
+
+    }
 }



Mime
View raw message