From df85b4ebd77c4c6449739e99e44e989ffaf19e0a Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 16 Apr 2010 07:21:35 +0000 Subject: Remove import-export tests, doesn't look like Tuscany will likely supprt this properly across nodes without huge changes git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@934701 13f79535-47bb-0310-9956-ffa450edef68 --- .../trunk/itest/import-export/client/pom.xml | 45 ------------ .../src/main/java/itest/test/TestClientImpl.java | 62 ---------------- .../client/src/main/java/itest/test/TestIt.java | 26 ------- .../main/resources/META-INF/sca-contribution.xml | 24 ------- .../src/main/resources/test-client.composite | 29 -------- .../trunk/itest/import-export/iface-export/pom.xml | 39 ---------- .../src/main/java/itest/iface/NonSimpleType.java | 40 ----------- .../src/main/java/itest/iface/SomeException.java | 41 ----------- .../src/main/java/itest/iface/TestService.java | 31 -------- .../main/resources/META-INF/sca-contribution.xml | 23 ------ sca-java-2.x/trunk/itest/import-export/pom.xml | 39 ---------- .../trunk/itest/import-export/service/pom.xml | 45 ------------ .../src/main/java/itest/test/TestServiceImpl.java | 42 ----------- .../main/resources/META-INF/sca-contribution.xml | 24 ------- .../src/main/resources/test-service.composite | 28 -------- .../itest/import-export/test-export-local/pom.xml | 77 -------------------- .../java/itest/MultipleLocalNodes2TestCase.java | 83 ---------------------- .../java/itest/MultipleLocalNodesTestCase.java | 78 -------------------- .../src/test/java/itest/OneNodeTestCase.java | 55 -------------- .../src/test/java/itest/TwoNodesTestCase.java | 78 -------------------- 20 files changed, 909 deletions(-) delete mode 100644 sca-java-2.x/trunk/itest/import-export/client/pom.xml delete mode 100644 sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java delete mode 100644 sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java delete mode 100644 sca-java-2.x/trunk/itest/import-export/client/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/trunk/itest/import-export/client/src/main/resources/test-client.composite delete mode 100644 sca-java-2.x/trunk/itest/import-export/iface-export/pom.xml delete mode 100644 sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/NonSimpleType.java delete mode 100644 sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/SomeException.java delete mode 100644 sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/TestService.java delete mode 100644 sca-java-2.x/trunk/itest/import-export/iface-export/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/trunk/itest/import-export/pom.xml delete mode 100644 sca-java-2.x/trunk/itest/import-export/service/pom.xml delete mode 100644 sca-java-2.x/trunk/itest/import-export/service/src/main/java/itest/test/TestServiceImpl.java delete mode 100644 sca-java-2.x/trunk/itest/import-export/service/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/trunk/itest/import-export/service/src/main/resources/test-service.composite delete mode 100644 sca-java-2.x/trunk/itest/import-export/test-export-local/pom.xml delete mode 100644 sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/MultipleLocalNodes2TestCase.java delete mode 100644 sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/MultipleLocalNodesTestCase.java delete mode 100644 sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/OneNodeTestCase.java delete 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 deleted file mode 100644 index 350ce2a755..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/client/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0-SNAPSHOT - ../pom.xml - - itest-import-export-client - Apache Tuscany SCA iTest Import Export Client - - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-SNAPSHOT - provided - - - org.apache.tuscany.sca - 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 deleted file mode 100644 index ee5e346bcf..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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; - -import itest.iface.NonSimpleType; -import itest.iface.SomeException; -import itest.iface.TestService; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -@Service(TestIt.class) -public class TestClientImpl implements TestIt, TestService { - - @Reference - protected TestService service; - - public TestClientImpl() { - } - - public String sayHello(String name) { - return service.sayHello(name); - } - - public NonSimpleType testCT(NonSimpleType name) throws SomeException { - System.out.println(name.getClass().getClassLoader()); - return service.testCT(name); - } - - public boolean testIt() { - try { - System.out.println(sayHello("petra")); - 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(); - 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 deleted file mode 100644 index 5623be9d9a..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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/client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/import-export/client/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 903995e557..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/client/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/sca-java-2.x/trunk/itest/import-export/client/src/main/resources/test-client.composite b/sca-java-2.x/trunk/itest/import-export/client/src/main/resources/test-client.composite deleted file mode 100644 index b4f23b0818..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/client/src/main/resources/test-client.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - 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 deleted file mode 100644 index 2b764cdb0f..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/iface-export/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0-SNAPSHOT - ../pom.xml - - itest-import-export-iface-export - Apache Tuscany SCA iTest Import Export Test Iface Export - - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-SNAPSHOT - provided - - - diff --git a/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/NonSimpleType.java b/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/NonSimpleType.java deleted file mode 100644 index 6d75a43b2b..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/NonSimpleType.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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.iface; - -public class NonSimpleType { - - protected String name; - - public NonSimpleType() { - } - - public NonSimpleType(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/SomeException.java b/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/SomeException.java deleted file mode 100644 index 1cbeee7020..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/SomeException.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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.iface; - -public class SomeException extends Exception { - - public SomeException() { - super(); - } - - public SomeException(String msg) { - super(msg); - } - - - public SomeException(Exception cause) { - super(cause); - } - - public SomeException(String msg, Exception cause) { - super(msg, cause); - } - -} diff --git a/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/TestService.java b/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/TestService.java deleted file mode 100644 index 4aeab0ffda..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/java/itest/iface/TestService.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.iface; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface TestService { - - String sayHello(String name); - - NonSimpleType testCT(NonSimpleType name) throws SomeException; - -} diff --git a/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 5f1cc96bef..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/iface-export/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/import-export/pom.xml b/sca-java-2.x/trunk/itest/import-export/pom.xml deleted file mode 100644 index b9f2b79970..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - 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 deleted file mode 100644 index 190699fe97..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/service/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0-SNAPSHOT - ../pom.xml - - itest-import-export-service - Apache Tuscany SCA iTest import Export Service - - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-SNAPSHOT - provided - - - org.apache.tuscany.sca - itest-import-export-iface-export - 2.0-SNAPSHOT - provided - - - diff --git a/sca-java-2.x/trunk/itest/import-export/service/src/main/java/itest/test/TestServiceImpl.java b/sca-java-2.x/trunk/itest/import-export/service/src/main/java/itest/test/TestServiceImpl.java deleted file mode 100644 index 3cc185d085..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/service/src/main/java/itest/test/TestServiceImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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; - -import itest.iface.NonSimpleType; -import itest.iface.SomeException; -import itest.iface.TestService; - -public class TestServiceImpl implements TestService { - - public TestServiceImpl() { - } - - public String sayHello(String name) { - return "Hello " + name; - } - - public NonSimpleType testCT(NonSimpleType name) throws SomeException { - if ("bang".equals(name.getName())) { - throw new SomeException("bang"); - } - - return new NonSimpleType("Hello " + name.getName()); - } -} diff --git a/sca-java-2.x/trunk/itest/import-export/service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/import-export/service/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 903995e557..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/service/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/sca-java-2.x/trunk/itest/import-export/service/src/main/resources/test-service.composite b/sca-java-2.x/trunk/itest/import-export/service/src/main/resources/test-service.composite deleted file mode 100644 index 5bf1f666e3..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/service/src/main/resources/test-service.composite +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - 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 deleted file mode 100644 index 47d3c1fea4..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/test-export-local/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0-SNAPSHOT - ../pom.xml - - itest-import-export-test-export-local - Apache Tuscany SCA iTest Import Export Test Export Local - - - - org.apache.tuscany.sca - itest-import-export-client - 2.0-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-sca-client-impl - 2.0-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-endpoint-hazelcast - 2.0-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-node-impl - 2.0-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 2.0-SNAPSHOT - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.5 - - - **/*TestCase.java - - brief - false - once - -ea -Xmx256m - off - - - - - diff --git a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/MultipleLocalNodes2TestCase.java b/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/MultipleLocalNodes2TestCase.java deleted file mode 100644 index 77f0319237..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/MultipleLocalNodes2TestCase.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * 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 MultipleLocalNodes2TestCase{ - - private static final URI DOMAIN_URI = URI.create("OneNodeTestCase"); - private static Node ifaceNode, serviceNode, clientNode; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - ifaceNode = NodeFactory.getInstance().createNode(DOMAIN_URI, "../test-iface-export/target/classes"); - ifaceNode.start(); - serviceNode = NodeFactory.getInstance().createNode(DOMAIN_URI, "../test-service/target/classes"); - serviceNode.start(); - clientNode = NodeFactory.getInstance().createNode(DOMAIN_URI, "../test-client/target/classes"); - clientNode.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")); - - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (serviceNode != null) { - serviceNode.stop(); - } - if (clientNode != null) { - clientNode.stop(); - } - if (ifaceNode != null) { - ifaceNode.stop(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/MultipleLocalNodesTestCase.java b/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/MultipleLocalNodesTestCase.java deleted file mode 100644 index 5ca30bdc47..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/MultipleLocalNodesTestCase.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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 MultipleLocalNodesTestCase{ - - private static final URI DOMAIN_URI = URI.create("OneNodeTestCase"); - private static Node ifaceNode, serviceNode, clientNode; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - serviceNode = NodeFactory.getInstance().createNode(DOMAIN_URI, "../test-iface-export/target/classes", "../test-service/target/classes"); - serviceNode.start(); - clientNode = NodeFactory.getInstance().createNode(DOMAIN_URI, "../test-iface-export/target/classes", "../test-client/target/classes"); - clientNode.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")); - - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (serviceNode != null) { - serviceNode.stop(); - } - if (clientNode != null) { - clientNode.stop(); - } - } -} 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 deleted file mode 100644 index b3de5110ea..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/OneNodeTestCase.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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.assertTrue; -import itest.test.TestIt; - -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; - -public class OneNodeTestCase{ - - private static Node node; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - 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 { - TestIt service = node.getService(TestIt.class, "TestClient"); - assertTrue(service.testIt()); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (node != null) { - node.stop(); - } - } -} 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 deleted file mode 100644 index ef7df127f9..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/TwoNodesTestCase.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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