Author: antelder
Date: Fri Mar 26 09:56:16 2010
New Revision: 927752
URL: http://svn.apache.org/viewvc?rev=927752&view=rev
Log:
Updates to get the basic one node test working again after the renames
Added:
tuscany/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java
tuscany/sca-java-2.x/trunk/itest/import-export/pom.xml
tuscany/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/TwoNodesTestCase.java
Modified:
tuscany/sca-java-2.x/trunk/itest/import-export/client/pom.xml
tuscany/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java
tuscany/sca-java-2.x/trunk/itest/import-export/iface-export/pom.xml
tuscany/sca-java-2.x/trunk/itest/import-export/service/pom.xml
tuscany/sca-java-2.x/trunk/itest/import-export/test-export-local/pom.xml
tuscany/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/OneNodeTestCase.java
Modified: tuscany/sca-java-2.x/trunk/itest/import-export/client/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/import-export/client/pom.xml?rev=927752&r1=927751&r2=927752&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/import-export/client/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/import-export/client/pom.xml Fri Mar 26
09:56:16 2010
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java?rev=927752&r1=927751&r2=927752&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java
Fri Mar 26 09:56:16 2010
@@ -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 T
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;
}
}
}
Added:
tuscany/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java?rev=927752&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java
(added)
+++
tuscany/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java
Fri Mar 26 09:56:16 2010
@@ -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();
+
+}
Modified: tuscany/sca-java-2.x/trunk/itest/import-export/iface-export/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/import-export/iface-export/pom.xml?rev=927752&r1=927751&r2=927752&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/import-export/iface-export/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/itest/import-export/iface-export/pom.xml Fri Mar
26 09:56:16 2010
@@ -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>
Added: tuscany/sca-java-2.x/trunk/itest/import-export/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/import-export/pom.xml?rev=927752&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/import-export/pom.xml (added)
+++ tuscany/sca-java-2.x/trunk/itest/import-export/pom.xml Fri Mar 26 09:56:16
2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/import-export/service/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/import-export/service/pom.xml?rev=927752&r1=927751&r2=927752&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/import-export/service/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/import-export/service/pom.xml Fri Mar 26
09:56:16 2010
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/import-export/test-export-local/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/import-export/test-export-local/pom.xml?rev=927752&r1=927751&r2=927752&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/import-export/test-export-local/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/itest/import-export/test-export-local/pom.xml
Fri Mar 26 09:56:16 2010
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/OneNodeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/OneNodeTestCase.java?rev=927752&r1=927751&r2=927752&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/OneNodeTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/OneNodeTestCase.java
Fri Mar 26 09:56:16 2010
@@ -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
Added:
tuscany/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/TwoNodesTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/TwoNodesTestCase.java?rev=927752&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/TwoNodesTestCase.java
(added)
+++
tuscany/sca-java-2.x/trunk/itest/import-export/test-export-local/src/test/java/itest/TwoNodesTestCase.java
Fri Mar 26 09:56:16 2010
@@ -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();
+ }
+ }
+}
