From ddce09144c53a0edd85f5929605cd3d3191d4ea4 Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 10 Feb 2011 08:36:51 +0000 Subject: Copy trunk to beta2 release branch. (I've not yet changed the version so that would need to be done first before the branch is used) git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1069272 13f79535-47bb-0310-9956-ffa450edef68 --- .../testing/itest/recursive-multi-level/pom.xml | 39 +++++++++ .../main/java/mysca/test/myservice/MyService.java | 26 ++++++ .../java/mysca/test/myservice/MyServiceImpl.java | 42 ++++++++++ .../mysca/test/myservice/MySimpleTotalService.java | 28 +++++++ .../test/myservice/MySimpleTotalServiceImpl.java | 46 +++++++++++ .../src/main/resources/TotalService1Auto.composite | 53 +++++++++++++ .../src/main/resources/TotalService2Auto.composite | 49 ++++++++++++ .../src/main/resources/TotalService3Auto.composite | 52 ++++++++++++ .../java/test/sca/tests/MultiLevelTestCase.java | 92 ++++++++++++++++++++++ 9 files changed, 427 insertions(+) create mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/pom.xml create mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java create mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java create mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java create mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java create mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite create mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite create mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite create mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java (limited to 'sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level') diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/pom.xml b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/pom.xml new file mode 100644 index 0000000000..0006664647 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/pom.xml @@ -0,0 +1,39 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-itest + 2.0-SNAPSHOT + + + itest-recursive-multi-level + Apache Tuscany SCA iTest Builder Recusive Multi-Level + + + + org.apache.tuscany.sca + tuscany-base-runtime-pom + pom + 2.0-SNAPSHOT + + + diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java new file mode 100644 index 0000000000..986c8305dd --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java @@ -0,0 +1,26 @@ +/* + * 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 mysca.test.myservice; + +public interface MyService { + String getLocation(); + + String getYear(); +} diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java new file mode 100644 index 0000000000..6cad998042 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.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 mysca.test.myservice; + +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; + +@Service(MyService.class) +public class MyServiceImpl implements MyService { + + @Property(name = "location") + protected String location = "ABC"; + + @Property(name = "year") + protected String year = "2006"; + + public String getLocation() { + return location; + } + + public String getYear() { + return year; + } + +} diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java new file mode 100644 index 0000000000..a10a430473 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java @@ -0,0 +1,28 @@ +/* + * 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 mysca.test.myservice; + +public interface MySimpleTotalService { + String getLocation(); + + String getYear(); + + String getYear2(); +} diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java new file mode 100644 index 0000000000..d00b016e34 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java @@ -0,0 +1,46 @@ +/* + * 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 mysca.test.myservice; + +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; + +@Service(MySimpleTotalService.class) +public class MySimpleTotalServiceImpl implements MySimpleTotalService { + // default required==true so it is 1:1 + @Reference + public MyService myService; + + @Reference + private MyService myService2; + + public String getLocation() { + return myService.getLocation(); + } + + public String getYear() { + return myService.getYear(); + } + + public String getYear2() { + return myService2.getYear(); + } + +} diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite new file mode 100644 index 0000000000..9ff53cca08 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite @@ -0,0 +1,53 @@ + + + + + Level 1 + 2001 + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite new file mode 100644 index 0000000000..cf8506b4e7 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite @@ -0,0 +1,49 @@ + + + + + Level 2 + 2002 + + + + Default 2 + 1992 + + + + + + + + + + + + + \ No newline at end of file diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite new file mode 100644 index 0000000000..7386404e71 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite @@ -0,0 +1,52 @@ + + + + + Level 3 + 2003 + + + + Default 3 + 1993 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java new file mode 100644 index 0000000000..2dc13c4f42 --- /dev/null +++ b/sca-java-2.x/branches/2.0-Beta2/testing/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java @@ -0,0 +1,92 @@ +/* + * 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 test.sca.tests; + +import static org.junit.Assert.assertEquals; +import mysca.test.myservice.MySimpleTotalService; + +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.ContributionLocationHelper; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Tests to make sure that autowiring and recusive composite work together + * + */ +public class MultiLevelTestCase { + private static Node node1; + private static Node node2; + private static Node node3; + private static MySimpleTotalService myService1; + private static MySimpleTotalService myService2; + private static MySimpleTotalService myService3; + + @BeforeClass + public static void setUp() throws Exception { + String location = ContributionLocationHelper.getContributionLocation("TotalService1Auto.composite"); + Contribution contribution = new Contribution("c1", location); + try { + node1 = NodeFactory.newInstance().createNode("TotalService1Auto.composite", contribution); + } catch (Exception e) { + e.printStackTrace(); + } + node2 = NodeFactory.newInstance().createNode("TotalService2Auto.composite", contribution); + node3 = NodeFactory.newInstance().createNode("TotalService3Auto.composite", contribution); + + node1.start(); + node2.start(); + node3.start(); + + myService1 = node1.getService(MySimpleTotalService.class, "TotalServiceComponentLevel1Auto"); + myService2 = node2.getService(MySimpleTotalService.class, "TotalServiceInRecursive2Auto/MyServiceLevel1Auto"); + myService3 = node3.getService(MySimpleTotalService.class, "TotalServiceInRecursive3Auto/MyServiceLevel2Auto"); + } + + @Test + public void testLevel1() { + assertEquals("Level 1", myService1.getLocation()); + assertEquals("2001", myService1.getYear()); + assertEquals("2001", myService1.getYear2()); + } + + @Test + public void testLevel2() { + assertEquals("Default 2", myService2.getLocation()); + assertEquals("1992", myService2.getYear()); + assertEquals("2002", myService2.getYear2()); + } + + @Test + public void testLevel3() { + assertEquals("Default 3", myService3.getLocation()); + assertEquals("1993", myService3.getYear()); + assertEquals("2003", myService3.getYear2()); + } + + @AfterClass + public static void tearDown() { + node1.stop(); + node2.stop(); + node3.stop(); + } +} -- cgit v1.2.3