From 132aa8a77685ec92bc90c03f987650d275a7b639 Mon Sep 17 00:00:00 2001 From: lresende Date: Mon, 30 Sep 2013 06:59:11 +0000 Subject: 2.0.1 RC1 release tag git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1527464 13f79535-47bb-0310-9956-ffa450edef68 --- .../diagram/layout/DiagramGeneratorTestCase.java | 55 +++++++ .../sca/diagram/layout/LayoutBuilderTestCase.java | 176 +++++++++++++++++++++ .../tuscany/sca/diagram/test/HelloWorld.java | 37 +++++ .../tuscany/sca/diagram/test/HelloWorld2Impl.java | 39 +++++ .../tuscany/sca/diagram/test/HelloWorldImpl.java | 42 +++++ 5 files changed, 349 insertions(+) create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/DiagramGeneratorTestCase.java create mode 100755 sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/LayoutBuilderTestCase.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld2Impl.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorldImpl.java (limited to 'sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org') diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/DiagramGeneratorTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/DiagramGeneratorTestCase.java new file mode 100644 index 0000000000..d53cecac38 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/DiagramGeneratorTestCase.java @@ -0,0 +1,55 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tuscany.sca.diagram.layout; + +import java.io.File; +import java.io.FileWriter; + +import org.apache.tuscany.sca.diagram.main.Main; +import org.apache.tuscany.sca.diagram.test.HelloWorld; +import org.apache.tuscany.sca.node.NodeFactory; +import org.apache.tuscany.sca.node.configuration.NodeConfiguration; +import org.junit.Test; + +public class DiagramGeneratorTestCase { + + @Test + public final void testFiles() throws Exception { + for (File xml : new File("src/test/resources/input").listFiles()) { + if (xml.getName().endsWith(".xml")) { + System.out.println(xml); + Main.generate(new File("target"), null, true, false, false, xml.toString()); + } + } + } + + @Test + public final void testNode() throws Exception { + NodeConfiguration config = NodeFactory.getInstance().createNodeConfiguration(); + config.addContribution(new File("target/test-classes/contribution").toURI().toURL()); + + String svg = Main.generateDiagram(config, HelloWorld.class.getClassLoader(), null); + + System.out.println(svg); + FileWriter fw = new FileWriter("target/node.svg"); + fw.write(svg); + fw.close(); + } + +} diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/LayoutBuilderTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/LayoutBuilderTestCase.java new file mode 100755 index 0000000000..17e690ca71 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/layout/LayoutBuilderTestCase.java @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tuscany.sca.diagram.layout; + +import java.util.Arrays; +import java.util.List; + +import junit.framework.Assert; + +import org.junit.Before; +import org.junit.Test; + +public class LayoutBuilderTestCase { + + 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, 4); + + ents = lb.placeEntities(); + + Assert.assertEquals(5, ents.length); + + 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, 4); + + ents = lb.placeEntities(); + + Assert.assertEquals(5, ents.length); + + 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, 4); + + ents = lb.placeEntities(); + + Assert.assertEquals(5, ents.length); + + 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(3, ents[2].getLane()); + Assert.assertEquals(4, ents[3].getLane()); + Assert.assertEquals(2, ents[4].getLane()); + + } + + @Test + public void testPlaceEntities3() throws Exception { + + /* + * 0----1---2 + * | | + * +---3---4 + */ + conns = new int[5][5]; + conns[0][1] = 1; + conns[0][3] = 1; + conns[1][2] = 1; + conns[1][3] = 1; + conns[2][4] = 1; + + lb = new LayoutBuilder(ents, conns, 4); + List sorted = lb.sortEntities(); + Assert.assertEquals(Arrays.asList(0, 1, 3, 2, 4), sorted); + + } +} diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld.java b/sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld.java new file mode 100644 index 0000000000..d9ee85e2ca --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld.java @@ -0,0 +1,37 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.diagram.test; + +import org.oasisopen.sca.annotation.Remotable; + +/** + * HelloWorld interface + */ +@Remotable +public interface HelloWorld { + String hello(String name); + + Message echo(Message msg); + + public class Message { + public String name; + public String message; + } +} diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld2Impl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld2Impl.java new file mode 100644 index 0000000000..22216c105e --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorld2Impl.java @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.diagram.test; + +import org.oasisopen.sca.annotation.AllowsPassByReference; + +/** + * HelloWorld2Impl + */ +@AllowsPassByReference +public class HelloWorld2Impl implements HelloWorld { + + public String hello(String name) { + String msg = "Hello " + name; + return msg; + } + + @Override + public Message echo(Message msg) { + return msg; + } +} diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorldImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorldImpl.java new file mode 100644 index 0000000000..89a0da0093 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/composite-diagram/src/test/java/org/apache/tuscany/sca/diagram/test/HelloWorldImpl.java @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.diagram.test; + +import org.oasisopen.sca.annotation.AllowsPassByReference; +import org.oasisopen.sca.annotation.Reference; + +/** + * HelloWorldImpl + */ +@AllowsPassByReference +public class HelloWorldImpl implements HelloWorld { + @Reference + private HelloWorld delegate; + + public String hello(String name) { + String msg = delegate.hello(name); + return msg; + } + + @Override + public Message echo(Message msg) { + return delegate.echo(msg); + } +} -- cgit v1.2.3