diff options
Diffstat (limited to '')
6 files changed, 85 insertions, 60 deletions
diff --git a/java/sca/itest/recursive-multi-level/pom.xml b/java/sca/itest/recursive-multi-level/pom.xml index aeb3e4a570..d6013dbcfa 100644 --- a/java/sca/itest/recursive-multi-level/pom.xml +++ b/java/sca/itest/recursive-multi-level/pom.xml @@ -31,15 +31,31 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> + <artifactId>tuscany-node-api</artifactId> <version>2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-node-impl</artifactId> + <version>2.0-SNAPSHOT</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> + <scope>test</scope> + </dependency> + + <!-- XPathFactory --> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.1</version> + <scope>test</scope> + </dependency> + </dependencies> </project> diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java index 214d4d8a1f..986c8305dd 100644 --- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java +++ b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java @@ -19,8 +19,8 @@ package mysca.test.myservice; - public interface MyService { String getLocation(); + String getYear(); } diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java index 51948a3b81..87773d8361 100644 --- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java +++ b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java @@ -22,27 +22,21 @@ package mysca.test.myservice; import org.osoa.sca.annotations.Property; import org.osoa.sca.annotations.Service; -import mysca.test.myservice.MyService; - @Service(MyService.class) public class MyServiceImpl implements MyService { - - @Property(name="location") - protected String location = "ABC"; - @Property(name="year") + @Property(name = "location") + protected String location = "ABC"; + + @Property(name = "year") protected String year = "2006"; - - public String getLocation() - { - return location; + public String getLocation() { + return location; } - public String getYear() - { + public String getYear() { return year; } - } diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java index 08df8ade17..261eff2584 100644 --- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java +++ b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java @@ -21,5 +21,6 @@ package mysca.test.myservice; public interface MySimpleTotalService { String getLocation(); + String getYear(); } diff --git a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java index 2ad9f815f0..a9afe052ba 100644 --- a/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java +++ b/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java @@ -22,24 +22,17 @@ package mysca.test.myservice; import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Service; -import mysca.test.myservice.MyService; -import mysca.test.myservice.MySimpleTotalService; - @Service(MySimpleTotalService.class) -public class MySimpleTotalServiceImpl implements MySimpleTotalService -{ +public class MySimpleTotalServiceImpl implements MySimpleTotalService { // default required==true so it is 1:1 @Reference public MyService myService; - - public String getLocation() - { + public String getLocation() { return myService.getLocation(); } - public String getYear() - { + public String getYear() { return myService.getYear(); } diff --git a/java/sca/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/java/sca/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java index d8d6fe0dc5..da14cdef13 100644 --- a/java/sca/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java +++ b/java/sca/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java @@ -18,51 +18,72 @@ */ package test.sca.tests; -import org.apache.tuscany.sca.host.embedded.SCADomain; - +import static org.junit.Assert.assertEquals; import mysca.test.myservice.MySimpleTotalService; -import junit.framework.TestCase; +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 extends TestCase -{ - private SCADomain domain1; - private SCADomain domain2; - private SCADomain domain3; - private MySimpleTotalService myService1; - private MySimpleTotalService myService2; - private MySimpleTotalService myService3; +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; - protected void setUp() throws Exception { - super.setUp(); - domain1 = SCADomain.newInstance("TotalService1Auto.composite"); - domain2 = SCADomain.newInstance("TotalService2Auto.composite"); - domain3 = SCADomain.newInstance("TotalService3Auto.composite"); + @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 = domain1.getService(MySimpleTotalService.class, "TotalServiceComponentLevel1Auto"); - myService2 = domain2.getService(MySimpleTotalService.class, "TotalServiceInRecursive2Auto/MyServiceLevel1Auto"); - myService3 = domain3.getService(MySimpleTotalService.class, "TotalServiceInRecursive3Auto/MyServiceLevel2Auto"); + myService1 = node1.getService(MySimpleTotalService.class, "TotalServiceComponentLevel1Auto"); + myService2 = node2.getService(MySimpleTotalService.class, "TotalServiceInRecursive2Auto/MyServiceLevel1Auto"); + myService3 = node3.getService(MySimpleTotalService.class, "TotalServiceInRecursive3Auto/MyServiceLevel2Auto"); } - - public void testLevel1() - { - assertEquals("Level 1",myService1.getLocation()); - assertEquals("2001",myService1.getYear()); + + @Test + public void testLevel1() { + assertEquals("Level 1", myService1.getLocation()); + assertEquals("2001", myService1.getYear()); } - - public void testLevel2() - { - assertEquals("Default 2",myService2.getLocation()); - assertEquals("1992",myService2.getYear()); + + @Test + public void testLevel2() { + assertEquals("Default 2", myService2.getLocation()); + assertEquals("1992", myService2.getYear()); } - public void testLevel3() - { - assertEquals("Default 3",myService3.getLocation()); - assertEquals("1993",myService3.getYear()); + @Test + public void testLevel3() { + assertEquals("Default 3", myService3.getLocation()); + assertEquals("1993", myService3.getYear()); + } + + @AfterClass + public static void tearDown() { + node1.stop(); + node2.stop(); + node3.stop(); } } |