From 2cbfd9f776009f8af15d49fb77009ee486dc6806 Mon Sep 17 00:00:00 2001 From: slaws Date: Fri, 5 Aug 2011 12:49:16 +0000 Subject: TUSCANY-3907 - Fix up and appropriate what was the recursive-ws to become an implementation-composite test. Initially I needed a test to look into the problem described by TUSCANY-3907 and found that recursive-ws want actually in the build and hadn't been ported properly to 2.x. It seems more widely useful that just ws testing hence the name change. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1154191 13f79535-47bb-0310-9956-ffa450edef68 --- .../bindingoverride/BindingOverrideTestCase.java | 62 ++++++++++++++++ .../src/test/java/policy/PolicyTestCase.java | 82 ++++++++++++++++++++++ .../java/recursive/ComposerClientTestCase.java | 68 ++++++++++++++++++ .../recursive/CompositeMulitStartTestCase.java | 73 +++++++++++++++++++ 4 files changed, 285 insertions(+) create mode 100644 sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java/bindingoverride/BindingOverrideTestCase.java create mode 100644 sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java/policy/PolicyTestCase.java create mode 100644 sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java/recursive/ComposerClientTestCase.java create mode 100644 sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java/recursive/CompositeMulitStartTestCase.java (limited to 'sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java') diff --git a/sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java/bindingoverride/BindingOverrideTestCase.java b/sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java/bindingoverride/BindingOverrideTestCase.java new file mode 100644 index 0000000000..1012233984 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java/bindingoverride/BindingOverrideTestCase.java @@ -0,0 +1,62 @@ +/* + * 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 bindingoverride; + +import java.io.File; + +import junit.framework.Assert; + + +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.apache.tuscany.sca.node.Contribution; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import policy.Target; + +public class BindingOverrideTestCase{ + + private Node node; + private Target targetClient; + + @Before + public void setUp() throws Exception { + try { + NodeFactory factory = NodeFactory.newInstance(); + node = factory.createNode(new File("src/main/resources/bindingoverride/OuterComposite.composite").toURI().toURL().toString(), + new Contribution("TestContribution", new File("src/main/resources/bindingoverride/").toURI().toURL().toString())); + node.start(); + targetClient = node.getService(Target.class, "OuterClientComponent"); + } catch(Exception ex) { + System.out.println(ex.toString()); + } + } + + @After + public void tearDown() throws Exception { + node.stop(); + } + + @Test + public void test() throws Exception { + Assert.assertEquals("Target: Hello Target: Hello Fred!!", targetClient.hello("Fred")); + } +} diff --git a/sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java/policy/PolicyTestCase.java b/sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java/policy/PolicyTestCase.java new file mode 100644 index 0000000000..0cf1496489 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java/policy/PolicyTestCase.java @@ -0,0 +1,82 @@ +/* + * 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 policy; + +import java.io.File; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.assembly.Component; +import org.apache.tuscany.sca.assembly.impl.CompositeImpl; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.impl.NodeImpl; +import org.apache.tuscany.sca.node.NodeFactory; +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.policy.PolicySet; +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +@Ignore("Doesn't work after porting") +public class PolicyTestCase{ + + private Node node; + private Target targetClient; + + @Before + public void setUp() throws Exception { + try { + NodeFactory factory = NodeFactory.newInstance(); + node = factory.createNode(new File("src/main/resources/policy/PolicyOuterComposite.composite").toURI().toURL().toString(), + new Contribution("TestContribution", new File("src/main/resources/policy/").toURI().toURL().toString())); + node.start(); + targetClient = node.getService(Target.class, "TargetClientComponent"); + } catch(Exception ex) { + System.out.println(ex.toString()); + } + } + + @After + public void tearDown() throws Exception { + node.stop(); + } + + @Test + public void test() throws Exception { + //Check that the binding policy sets do flow down to the component but not down to the + //component inside implementation.composite + Component outerComponent = ((NodeImpl)node).getDomainComposite().getComponent("OuterTargetServiceComponent"); + + // The outer component service bindings should have policy sets attached + Assert.assertEquals(1, outerComponent.getServices().get(0).getPolicySets().size()); + + Component component = ((CompositeImpl)outerComponent.getImplementation()).getComponents().get(0); + + // The original inner component service binding should not have policy sets attached + Assert.assertEquals(0, ((PolicySet)component.getServices().get(0).getBindings().get(0)).getReferencedPolicySets().size()); + + // The promoted inner component service binding should have policy sets attached + Assert.assertEquals(1, ((PolicySet)component.getServices().get(1).getBindings().get(0)).getReferencedPolicySets().size()); + + String result = targetClient.hello("Fred"); + + System.out.println(result); + } +} diff --git a/sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java/recursive/ComposerClientTestCase.java b/sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java/recursive/ComposerClientTestCase.java new file mode 100644 index 0000000000..aeac1950f6 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java/recursive/ComposerClientTestCase.java @@ -0,0 +1,68 @@ +/* + * 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 recursive; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.Node; +import org.apache.tuscany.sca.TuscanyRuntime; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import recursive.Composer; + +/** + * Test case for hweb service client + */ +public class ComposerClientTestCase { + + private Node node; + private Composer composer; + + @Before + public void startClient() throws Exception { + try { + TuscanyRuntime tuscanyRuntime = TuscanyRuntime.newInstance(); + node = tuscanyRuntime.createNode("myDomain"); + + node.installContribution("contrib1", "src/main/resources/recursive", null, null); + node.startComposite("contrib1", "Outer.composite"); + node.startComposite("contrib1", "Client.composite"); + + composer = node.getService(Composer.class, "ClientComponent/Composer"); + + } catch (Throwable e) { + e.printStackTrace(); + } + } + + @Test + public void testWSClient() throws Exception { + String msg = composer.Compose("ABC"); + Assert.assertEquals("Composed: ABC", msg); + } + + @After + public void stopClient() throws Exception { + node.stop(); + } + +} diff --git a/sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java/recursive/CompositeMulitStartTestCase.java b/sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java/recursive/CompositeMulitStartTestCase.java new file mode 100644 index 0000000000..8e5a2af5d7 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/implementation-composite/src/test/java/recursive/CompositeMulitStartTestCase.java @@ -0,0 +1,73 @@ +/* + * 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 recursive; + + +import junit.framework.Assert; + +import org.apache.tuscany.sca.Node; +import org.apache.tuscany.sca.TuscanyRuntime; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import recursive.Composer; + +/** + * TUSCANY-3907 + * Tests that a composite can be started at the top level and as a nested composite without + * have the fact the the composite will be built twice mess things up + */ +public class CompositeMulitStartTestCase { + + private Node node; + private Composer composer; + + @Before + public void startClient() throws Exception { + try { + TuscanyRuntime tuscanyRuntime = TuscanyRuntime.newInstance(); + node = tuscanyRuntime.createNode("myDomain"); + + node.installContribution("contrib1", "src/main/resources/recursive", null, null); + + node.startComposite("contrib1", "Inner.composite"); + node.startComposite("contrib1", "Outer.composite"); + node.startComposite("contrib1", "Client.composite"); + + composer = node.getService(Composer.class, "ClientComponent/Composer"); + + } catch (Throwable e) { + e.printStackTrace(); + } + } + + @Test + public void testWSClient() throws Exception { + String msg = composer.Compose("ABC"); + Assert.assertEquals("Composed: ABC", msg); + } + + @After + public void stopClient() throws Exception { + node.stop(); + } + +} -- cgit v1.2.3