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

9 files changed, 172 insertions, 53 deletions

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 @@
         <version>2.0-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

-    <artifactId>itest-import-export-test-client</artifactId>

-    <name>Apache Tuscany SCA iTest Import Export Test Client</name>

+    <artifactId>itest-import-export-client</artifactId>

+    <name>Apache Tuscany SCA iTest Import Export Client</name>

 

     <dependencies>

         <dependency>

@@ -37,7 +37,7 @@
         </dependency>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>itest-import-export-test-iface-export</artifactId>

+            <artifactId>itest-import-export-iface-export</artifactId>

             <version>2.0-SNAPSHOT</version>

             <scope>provided</scope>

         </dependency>

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 @@
         <version>2.0-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

-    <artifactId>itest-test-import-export-iface-export</artifactId>

+    <artifactId>itest-import-export-iface-export</artifactId>

     <name>Apache Tuscany SCA iTest Import Export Test Iface Export</name>

 

     <dependencies>

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 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+    * 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.    

+-->

+<project>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

+        <groupId>org.apache.tuscany.sca</groupId>

+        <artifactId>tuscany-itest</artifactId>

+        <version>2.0-SNAPSHOT</version>

+        <relativePath>../pom.xml</relativePath>

+    </parent>

+    <packaging>pom</packaging>

+    <artifactId>itest-import-export</artifactId>

+    <name>Apache Tuscany SCA iTest Import Export</name>

+    

+  <modules>

+    <module>iface-export</module>

+    <module>service</module>

+    <module>client</module>

+    <module>test-export-local</module>

+  </modules>

+

+</project>

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 @@
         <version>2.0-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

-    <artifactId>itest-import-export-test-service</artifactId>

-    <name>Apache Tuscany SCA iTest import Export Test Service</name>

+    <artifactId>itest-import-export-service</artifactId>

+    <name>Apache Tuscany SCA iTest import Export Service</name>

 

     <dependencies>

         <dependency>

@@ -37,7 +37,7 @@
         </dependency>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>itest-import-export-test-iface-export</artifactId>

+            <artifactId>itest-import-export-iface-export</artifactId>

             <version>2.0-SNAPSHOT</version>

             <scope>provided</scope>

         </dependency>

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 @@
         <version>2.0-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

-    <artifactId>itest-nodes-export</artifactId>

-    <name>Apache Tuscany SCA iTest Nodes Export Local</name>

+    <artifactId>itest-import-export-test-export-local</artifactId>

+    <name>Apache Tuscany SCA iTest Import Export Test Export Local</name>

 

     <dependencies>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-client-impl</artifactId>

+            <artifactId>itest-import-export-client</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-endpoint-hazelcast</artifactId>

+            <artifactId>tuscany-sca-client-impl</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-sca-runtime-rmi</artifactId>

+            <artifactId>tuscany-endpoint-hazelcast</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

         <dependency>

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();

+        }

+    }

+}