From 42f6010685593eb05e63b57c13f3dfc444059540 Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 12 Nov 2009 08:34:50 +0000 Subject: Delete RC tag git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835300 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/test/java/itest/nodes/Helloworld.java | 29 ------ .../tuscany/sca/domain/node/ConfigTestCase.java | 64 ------------- .../domain/node/MultipleNodesPerJVMTestCase.java | 91 ------------------ .../tuscany/sca/domain/node/OneNodeTestCase.java | 102 --------------------- .../sca/domain/node/StopStartNodesTestCase.java | 78 ---------------- 5 files changed, 364 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/itest/nodes/Helloworld.java delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java (limited to 'sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java') diff --git a/sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/itest/nodes/Helloworld.java b/sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/itest/nodes/Helloworld.java deleted file mode 100644 index ee15dfba12..0000000000 --- a/sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/itest/nodes/Helloworld.java +++ /dev/null @@ -1,29 +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.nodes; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Helloworld { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java deleted file mode 100644 index 1d31a5467f..0000000000 --- a/sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java +++ /dev/null @@ -1,64 +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 org.apache.tuscany.sca.domain.node; - -import static org.junit.Assert.assertEquals; - -import org.apache.tuscany.sca.domain.node.DomainNode; -import org.junit.Test; - -/** - * This shows how to test the Calculator service component. - */ -public class ConfigTestCase{ - - @Test - public void testConfig() throws Exception { - DomainNode domain = new DomainNode("foo://someDomain:1234?p1=x&p2=y"); - assertEquals(4, domain.getConfigAttributes().getAttributes().size()); - assertEquals("someDomain", domain.getDomainName()); - assertEquals("foo", domain.getConfigAttributes().getAttributes().get("domainScheme")); - assertEquals("someDomain", domain.getConfigAttributes().getAttributes().get("domainName")); - assertEquals("x", domain.getConfigAttributes().getAttributes().get("p1")); - assertEquals("y", domain.getConfigAttributes().getAttributes().get("p2")); - } - - @Test - public void testConfig1() throws Exception { - DomainNode domain = new DomainNode("foo:someDomain:1234?p1=x&p2=y"); - assertEquals(4, domain.getConfigAttributes().getAttributes().size()); - assertEquals("someDomain", domain.getDomainName()); - assertEquals("foo", domain.getConfigAttributes().getAttributes().get("domainScheme")); - assertEquals("someDomain", domain.getConfigAttributes().getAttributes().get("domainName")); - assertEquals("x", domain.getConfigAttributes().getAttributes().get("p1")); - assertEquals("y", domain.getConfigAttributes().getAttributes().get("p2")); - } - - @Test - public void testConfig2() throws Exception { - DomainNode domain = new DomainNode("foo:/someDomain:1234?p1=x&p2=y"); - assertEquals(4, domain.getConfigAttributes().getAttributes().size()); - assertEquals("someDomain", domain.getDomainName()); - assertEquals("foo", domain.getConfigAttributes().getAttributes().get("domainScheme")); - assertEquals("someDomain", domain.getConfigAttributes().getAttributes().get("domainName")); - assertEquals("x", domain.getConfigAttributes().getAttributes().get("p1")); - assertEquals("y", domain.getConfigAttributes().getAttributes().get("p2")); - } -} diff --git a/sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java deleted file mode 100644 index 20d7470a66..0000000000 --- a/sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java +++ /dev/null @@ -1,91 +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 org.apache.tuscany.sca.domain.node; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import itest.nodes.Helloworld; -import static org.junit.Assert.fail; - -import org.apache.tuscany.sca.domain.node.DomainNode; -import org.junit.After; -import org.junit.Test; -import org.oasisopen.sca.SCARuntimeException; -import org.oasisopen.sca.client.SCAClient; - -/** - * This shows how to test the Calculator service component. - */ -public class MultipleNodesPerJVMTestCase{ - - private static DomainNode clientNode; - private static DomainNode serviceNode; - - @Test - public void testTwoNodesSameDomain() throws Exception { - serviceNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); - clientNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); - - Helloworld service = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - - if (clientNode != null && clientNode.isStarted()) { - clientNode.stop(); - } - if (serviceNode != null && serviceNode.isStarted()) { - serviceNode.stop(); - } - } - - @Test - public void testTwoNodesDifferentDomains() throws Exception { - serviceNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); - Helloworld service = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - clientNode = new DomainNode("vm://barDomain", "target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); - Helloworld client = SCAClient.getService(Helloworld.class, "barDomain/HelloworldClient"); - assertNotNull(client); - - try { - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - fail(); - } catch (SCARuntimeException e) { - // FIXME: this gives an SCARuntimeException, would be better to be something like ServiceNotFoundException? - // expected - } - } - - @After - public void tearDownAfterClass() throws Exception { - if (clientNode != null && clientNode.isStarted()) { - clientNode.stop(); - } - if (serviceNode != null && serviceNode.isStarted()) { - serviceNode.stop(); - } - } -} diff --git a/sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java deleted file mode 100644 index a5c829b87f..0000000000 --- a/sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java +++ /dev/null @@ -1,102 +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 org.apache.tuscany.sca.domain.node; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; -import itest.nodes.Helloworld; - -import org.apache.tuscany.sca.domain.node.DomainNode; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; -import org.oasisopen.sca.client.SCAClient; - -/** - * This shows how to test the Calculator service component. - */ -public class OneNodeTestCase{ - - private static DomainNode domain; - private static String serviceContributionUri; - - @Before - public void setUpBeforeClass() throws Exception { - domain = new DomainNode(); - serviceContributionUri = domain.addContribution("target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); - domain.addContribution("target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); - } - - @Test - public void testService() throws Exception { - Helloworld service = SCAClient.getService(Helloworld.class, "defaultDomain/HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - } - - @Test - public void testClient() throws Exception { - Helloworld client = SCAClient.getService(Helloworld.class, "defaultDomain/HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - } - - @Test - public void testRemovingServiceContribution() throws Exception { - domain.removeContribution(serviceContributionUri); - try { - SCAClient.getService(Helloworld.class, "defaultDomain/HelloworldService"); - // FIXME: should this be NoSuchServiceException or ServiceNotFoundException? - } catch (NoSuchServiceException e) { - // expected - } - - Helloworld client = SCAClient.getService(Helloworld.class, "defaultDomain/HelloworldClient"); - assertNotNull(client); - try { - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - fail(); - } catch (Exception e) { - // FIXME: this gives an NPE, would be better to be something like ServiceNotFoundException - // expected - } - } - - @Test - public void testStoppingDomainNode() throws Exception { - domain.stop(); - try { - SCAClient.getService(Helloworld.class, "defaultDomain/HelloworldClient"); - fail(); - } catch (NoSuchDomainException e) { - // expected - } - } - - @After - public void tearDownAfterClass() throws Exception { - if (domain != null && domain.isStarted()) { - domain.stop(); - } - } -} diff --git a/sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java deleted file mode 100644 index 3ee89b0a04..0000000000 --- a/sca-java-2.x/tags/2.0-M4-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.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 org.apache.tuscany.sca.domain.node; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; -import itest.nodes.Helloworld; - -import org.junit.After; -import org.junit.Test; -import org.oasisopen.sca.client.SCAClient; - -/** - * This shows how to test the Calculator service component. - */ -public class StopStartNodesTestCase{ - - private static DomainNode clientNode; - private static DomainNode serviceNode; - - @Test - public void testTwoNodesSameDomain() throws Exception { - serviceNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); - clientNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); - - Helloworld service = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - - serviceNode.stop(); - - client = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldClient"); - assertNotNull(client); - try { - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - fail(); - } catch (Exception e) { - // expected - } - - serviceNode = new DomainNode("vm://fooDomain", "target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); - client = SCAClient.getService(Helloworld.class, "fooDomain/HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - } - - @After - public void tearDownAfterClass() throws Exception { - if (clientNode != null && clientNode.isStarted()) { - clientNode.stop(); - } - if (serviceNode != null && serviceNode.isStarted()) { - serviceNode.stop(); - } - } -} -- cgit v1.2.3