From e4ce65b9ffcbf94fcf8f34ed644ea52c283194ef Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 26 Mar 2010 09:56:16 +0000 Subject: Updates to get the basic one node test working again after the renames git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@927752 13f79535-47bb-0310-9956-ffa450edef68 --- .../trunk/itest/import-export/client/pom.xml | 6 +- .../src/main/java/itest/test/TestClientImpl.java | 28 +++----- .../client/src/main/java/itest/test/TestIt.java | 26 ++++++++ .../trunk/itest/import-export/iface-export/pom.xml | 2 +- sca-java-2.x/trunk/itest/import-export/pom.xml | 39 +++++++++++ .../trunk/itest/import-export/service/pom.xml | 6 +- .../itest/import-export/test-export-local/pom.xml | 10 +-- .../src/test/java/itest/OneNodeTestCase.java | 30 ++------- .../src/test/java/itest/TwoNodesTestCase.java | 78 ++++++++++++++++++++++ 9 files changed, 172 insertions(+), 53 deletions(-) create mode 100644 sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java create mode 100644 sca-java-2.x/trunk/itest/import-export/pom.xml create mode 100644 sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/TwoNodesTestCase.java (limited to 'sca-java-2.x') diff --git a/sca-java-2.x/trunk/itest/import-export/client/pom.xml b/sca-java-2.x/trunk/itest/import-export/client/pom.xml index 4000c9bab0..350ce2a755 100644 --- a/sca-java-2.x/trunk/itest/import-export/client/pom.xml +++ b/sca-java-2.x/trunk/itest/import-export/client/pom.xml @@ -25,8 +25,8 @@ 2.0-SNAPSHOT ../pom.xml - itest-import-export-test-client - Apache Tuscany SCA iTest Import Export Test Client + itest-import-export-client + Apache Tuscany SCA iTest Import Export Client @@ -37,7 +37,7 @@ org.apache.tuscany.sca - itest-import-export-test-iface-export + itest-import-export-iface-export 2.0-SNAPSHOT provided diff --git a/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java b/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java index 8b98aa9f3e..ee5e346bcf 100644 --- a/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java +++ b/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java @@ -23,14 +23,11 @@ import itest.iface.NonSimpleType; import itest.iface.SomeException; import itest.iface.TestService; -import org.oasisopen.sca.annotation.EagerInit; -import org.oasisopen.sca.annotation.Init; import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.Service; -@Scope("COMPOSITE") -@EagerInit -public class TestClientImpl implements TestService { +@Service(TestIt.class) +public class TestClientImpl implements TestIt, TestService { @Reference protected TestService service; @@ -47,22 +44,19 @@ public class TestClientImpl implements TestService { return service.testCT(name); } - @Init - public void init() { + public boolean testIt() { try { System.out.println(sayHello("petra")); - } catch (Exception e) { - e.printStackTrace(); - } - try { System.out.println(testCT(new NonSimpleType("beate")).getName()); + try { + System.out.println(testCT(new NonSimpleType("bang")).getName()); + } catch (SomeException e) { + // expected + } + return true; } catch (Exception e) { e.printStackTrace(); - } - try { - System.out.println(testCT(new NonSimpleType("bang")).getName()); - } catch (Exception e) { - e.printStackTrace(); + return false; } } } diff --git a/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java b/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java new file mode 100644 index 0000000000..5623be9d9a --- /dev/null +++ b/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.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 itest.test; + +public interface TestIt { + + boolean testIt(); + +} diff --git a/sca-java-2.x/trunk/itest/import-export/iface-export/pom.xml b/sca-java-2.x/trunk/itest/import-export/iface-export/pom.xml index 930ab45946..2b764cdb0f 100644 --- a/sca-java-2.x/trunk/itest/import-export/iface-export/pom.xml +++ b/sca-java-2.x/trunk/itest/import-export/iface-export/pom.xml @@ -25,7 +25,7 @@ 2.0-SNAPSHOT ../pom.xml - itest-test-import-export-iface-export + itest-import-export-iface-export Apache Tuscany SCA iTest Import Export Test Iface Export diff --git a/sca-java-2.x/trunk/itest/import-export/pom.xml b/sca-java-2.x/trunk/itest/import-export/pom.xml new file mode 100644 index 0000000000..b9f2b79970 --- /dev/null +++ b/sca-java-2.x/trunk/itest/import-export/pom.xml @@ -0,0 +1,39 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-itest + 2.0-SNAPSHOT + ../pom.xml + + pom + itest-import-export + Apache Tuscany SCA iTest Import Export + + + iface-export + service + client + test-export-local + + + diff --git a/sca-java-2.x/trunk/itest/import-export/service/pom.xml b/sca-java-2.x/trunk/itest/import-export/service/pom.xml index 66067762c2..190699fe97 100644 --- a/sca-java-2.x/trunk/itest/import-export/service/pom.xml +++ b/sca-java-2.x/trunk/itest/import-export/service/pom.xml @@ -25,8 +25,8 @@ 2.0-SNAPSHOT ../pom.xml - itest-import-export-test-service - Apache Tuscany SCA iTest import Export Test Service + itest-import-export-service + Apache Tuscany SCA iTest import Export Service @@ -37,7 +37,7 @@ org.apache.tuscany.sca - itest-import-export-test-iface-export + itest-import-export-iface-export 2.0-SNAPSHOT provided diff --git a/sca-java-2.x/trunk/itest/import-export/test-export-local/pom.xml b/sca-java-2.x/trunk/itest/import-export/test-export-local/pom.xml index d983dab59b..47d3c1fea4 100644 --- a/sca-java-2.x/trunk/itest/import-export/test-export-local/pom.xml +++ b/sca-java-2.x/trunk/itest/import-export/test-export-local/pom.xml @@ -25,23 +25,23 @@ 2.0-SNAPSHOT ../pom.xml - itest-nodes-export - Apache Tuscany SCA iTest Nodes Export Local + itest-import-export-test-export-local + Apache Tuscany SCA iTest Import Export Test Export Local org.apache.tuscany.sca - tuscany-sca-client-impl + itest-import-export-client 2.0-SNAPSHOT org.apache.tuscany.sca - tuscany-endpoint-hazelcast + tuscany-sca-client-impl 2.0-SNAPSHOT org.apache.tuscany.sca - tuscany-binding-sca-runtime-rmi + tuscany-endpoint-hazelcast 2.0-SNAPSHOT diff --git a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/OneNodeTestCase.java index 13a7e9f9fc..b3de5110ea 100644 --- a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/OneNodeTestCase.java +++ b/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/OneNodeTestCase.java @@ -19,8 +19,9 @@ package itest; -//import static org.junit.Assert.assertEquals; -//import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import itest.test.TestIt; + import java.net.URI; import org.apache.tuscany.sca.node.Node; @@ -29,39 +30,20 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -/** - * This shows how to test the Calculator service component. - */ public class OneNodeTestCase{ - private static final URI DOMAIN_URI = URI.create("OneNodeTestCase"); private static Node node; @BeforeClass public static void setUpBeforeClass() throws Exception { - node = NodeFactory.getInstance().createNode(DOMAIN_URI, "../test-iface-export/target/classes", "../test-service/target/classes", "../test-client/target/classes"); + node = NodeFactory.newInstance().createNode(URI.create("OneNodeTestCase"), "../iface-export/target/classes", "../service/target/classes", "../client/target/classes"); node.start(); } @Test public void testNode() throws Exception { - -// Helloworld service = node.getService(Helloworld.class, "HelloworldService"); -// assertNotNull(service); -// assertEquals("Hello Petra", service.sayHello("Petra")); -// -// Helloworld client = node.getService(Helloworld.class, "HelloworldClient"); -// assertNotNull(client); -// assertEquals("Hi Hello Petra", client.sayHello("Petra")); -// -// Helloworld scaClientService = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldService"); -// assertNotNull(scaClientService); -// assertEquals("Hello Petra", scaClientService.sayHello("Petra")); -// -// Helloworld scaClientClient = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldClient"); -// assertNotNull(scaClientClient); -// assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra")); - + TestIt service = node.getService(TestIt.class, "TestClient"); + assertTrue(service.testIt()); } @AfterClass diff --git a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/TwoNodesTestCase.java b/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/TwoNodesTestCase.java new file mode 100644 index 0000000000..ef7df127f9 --- /dev/null +++ b/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/TwoNodesTestCase.java @@ -0,0 +1,78 @@ +/* + * 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 itest; + +//import static org.junit.Assert.assertEquals; +//import static org.junit.Assert.assertNotNull; +import java.net.URI; + +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; + +/** + * This shows how to test the Calculator service component. + */ +public class TwoNodesTestCase{ + + private static final URI DOMAIN_URI = URI.create("OneNodeTestCase"); + private static Node node1, node2; + + @BeforeClass + public static void setUpBeforeClass() throws Exception { + } + + @Test + public void testNode() throws Exception { + node1 = NodeFactory.getInstance().createNode(DOMAIN_URI, "../test-iface-export/target/classes"); + node1.start(); + node2 = NodeFactory.getInstance().createNode(DOMAIN_URI, "../test-service/target/classes"); + node2.start(); + +// Helloworld service = node2.getService(Helloworld.class, "HelloworldService"); +// assertNotNull(service); +// assertEquals("Hello Petra", service.sayHello("Petra")); +// +// Helloworld client = node.getService(Helloworld.class, "HelloworldClient"); +// assertNotNull(client); +// assertEquals("Hi Hello Petra", client.sayHello("Petra")); +// +// Helloworld scaClientService = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldService"); +// assertNotNull(scaClientService); +// assertEquals("Hello Petra", scaClientService.sayHello("Petra")); +// +// Helloworld scaClientClient = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldClient"); +// assertNotNull(scaClientClient); +// assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra")); + + } + + @AfterClass + public static void tearDownAfterClass() throws Exception { + if (node2 != null) { + node2.stop(); + } + if (node1 != null) { + node1.stop(); + } + } +} -- cgit v1.2.3