From e5b7380c874745c989d1816b8f552504f038e1bc Mon Sep 17 00:00:00 2001 From: lresende Date: Thu, 26 Sep 2013 20:33:20 +0000 Subject: 2.0 branch for possible maintenance release git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1526672 13f79535-47bb-0310-9956-ffa450edef68 --- .../2.0/testing/itest/policy/matching/pom.xml | 52 +++++++++ .../sca/policy/matching/helloworld/HelloWorld.java | 29 +++++ .../matching/helloworld/HelloWorldClient.java | 35 ++++++ .../matching/helloworld/HelloWorldService.java | 30 +++++ .../main/resources/META-INF/sca-contribution.xml | 23 ++++ ....apache.tuscany.sca.definitions.xml.Definitions | 17 +++ .../sca/policy/matching/helloworld/definitions.xml | 67 +++++++++++ .../matching/helloworld/helloworld.composite | 86 ++++++++++++++ .../sca/policy/matching/helloworld/helloworld.wsdl | 90 ++++++++++++++ .../sca/policy/matching/MatchingTestCase.java | 130 +++++++++++++++++++++ 10 files changed, 559 insertions(+) create mode 100644 sca-java-2.x/branches/2.0/testing/itest/policy/matching/pom.xml create mode 100644 sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java create mode 100644 sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java create mode 100644 sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java create mode 100644 sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions create mode 100644 sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml create mode 100644 sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite create mode 100644 sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl create mode 100644 sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java (limited to 'sca-java-2.x/branches/2.0/testing/itest/policy/matching') diff --git a/sca-java-2.x/branches/2.0/testing/itest/policy/matching/pom.xml b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/pom.xml new file mode 100644 index 0000000000..fb985a935e --- /dev/null +++ b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/pom.xml @@ -0,0 +1,52 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + itest-policy + 2.0 + ../pom.xml + + + itest-policy-matching + Apache Tuscany SCA iTest Policy Matching + + + + + org.apache.tuscany.sca + tuscany-base-runtime-pom + pom + 2.0 + + + + org.apache.tuscany.sca + tuscany-binding-ws-runtime-axis2 + 2.0 + + + + + + ${project.artifactId} + + diff --git a/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java new file mode 100644 index 0000000000..16db3fd9fc --- /dev/null +++ b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java @@ -0,0 +1,29 @@ +/* + * 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.policy.matching.helloworld; + +import org.oasisopen.sca.annotation.Remotable; + +@Remotable +public interface HelloWorld { + + String getGreetings(String s); + +} diff --git a/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java new file mode 100644 index 0000000000..d34591713b --- /dev/null +++ b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java @@ -0,0 +1,35 @@ +/* + * 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.policy.matching.helloworld; + +import org.oasisopen.sca.annotation.Reference; + +public class HelloWorldClient implements HelloWorld { + + @Reference + public HelloWorld helloWorld; + + public String getGreetings(String s) { + String response = helloWorld.getGreetings(s); + System.out.println("At client: " + response); + return response; + } + +} diff --git a/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java new file mode 100644 index 0000000000..31a2d2cb89 --- /dev/null +++ b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java @@ -0,0 +1,30 @@ +/* + * 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.policy.matching.helloworld; + +public class HelloWorldService implements HelloWorld { + + public String getGreetings(String s) { + String response = "Hello " + s; + System.out.println("At service: " + response); + return response; + } + +} diff --git a/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..6ae1c88c42 --- /dev/null +++ b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions new file mode 100644 index 0000000000..45b6be47b7 --- /dev/null +++ b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions @@ -0,0 +1,17 @@ +# 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. +org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml \ No newline at end of file diff --git a/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml new file mode 100644 index 0000000000..c70aae996b --- /dev/null +++ b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + FINE + LoggingMessages.properties + + + + + + + + + FINE + LoggingMessages.properties + + + + + + + \ No newline at end of file diff --git a/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite new file mode 100644 index 0000000000..7dfe083bae --- /dev/null +++ b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl new file mode 100644 index 0000000000..a352696b8e --- /dev/null +++ b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java new file mode 100644 index 0000000000..5b1f971a3a --- /dev/null +++ b/sca-java-2.x/branches/2.0/testing/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java @@ -0,0 +1,130 @@ +/* + * 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.policy.matching; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import org.apache.tuscany.sca.node.Contribution; +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.apache.tuscany.sca.policy.matching.helloworld.HelloWorld; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +/* + * Test the various conditions in the matching algorithm + * 1 - FAIL if there are intents that are mutually exclusive between reference and service + * 2 - PASS if there are no intents or policies present at reference and service + * 3 - FAIL if there are unresolved intents (intents with no policy set) at the reference (service should have been checked previously) + * 4 - PASS if there are no policies at reference and service (now we know all intents are resolved) + * 5 - FAIL if there are some policies on one side but not on the other + * 6 - PASS if the QName of the policy sets on each side match + * 7 - FAIL if the policy languages on both sides are different + * 8 - Perform policy specific match + */ +public class MatchingTestCase { + + private static Node node; + + + @BeforeClass + public static void setUp() throws Exception { + try { + node = NodeFactory.newInstance().createNode(new Contribution("test", "target/classes")); + node.start(); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + @Test + public void testMutuallyExclusiveIntents() throws Exception { + HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientMutuallyExclusiveIntents"); + try { + helloWorld.getGreetings("petra"); + fail("Exception expected"); + } catch (Exception ex) { + assertTrue(ex.getMessage().indexOf("No match because the following intents are mutually exclusive {http://tuscany.apache.org/xmlns/sca/1.1}testIntent3 {http://tuscany.apache.org/xmlns/sca/1.1}testIntent1") > -1); + } + } + + @Test + public void testNoIntentsOrPolicies() throws Exception { + HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientNoIntentsOrPolicies"); + assertEquals("Hello petra", helloWorld.getGreetings("petra")); + } + + @Test + public void testUnresolvedIntentsOnReference() throws Exception { + HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloUnresolvedIntentsOnReference"); + try { + helloWorld.getGreetings("petra"); + fail("Exception expected"); + } catch (Exception ex) { + assertTrue(ex.getMessage().indexOf("No match because there are unresolved intents [{http://tuscany.apache.org/xmlns/sca/1.1}testIntent2]") > -1); + } + } + + @Test + public void testIntentsButNoPolicies() throws Exception { + HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientIntentsButNoPolicies1"); + assertEquals("Hello petra", helloWorld.getGreetings("petra")); + + helloWorld = node.getService(HelloWorld.class, "HelloWorldClientIntentsButNoPolicies2"); + assertEquals("Hello petra", helloWorld.getGreetings("petra")); + } + + @Test + public void testSomePoliciesOnOneSideButNoneOnTheOther() throws Exception { + HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientSomePoliciesOnOneSideButNoneOnTheOther"); + assertEquals("Hello petra",helloWorld.getGreetings("petra")); + } + + @Test + public void testPolicySetQNameMatch() throws Exception { + HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientPolicySetQNameMatch"); + assertEquals("Hello petra", helloWorld.getGreetings("petra")); + } + + @Test + public void testDifferentPolicyLanguage() throws Exception { + try { + HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientDifferentPolicyLanguage"); + helloWorld.getGreetings("petra"); + fail("Exception expected"); + } catch (Exception ex) { + assertTrue(ex.getMessage().indexOf("No match because the policy sets on either side have policies in differnt languages {http://schemas.xmlsoap.org/ws/2004/09/policy}Policy and {http://tuscany.apache.org/xmlns/sca/1.1}jdkLogger") > -1); + } + } + + @Test + public void testPolicySpecificMatch() throws Exception { + // TODO + } + + @AfterClass + public static void tearDown() throws Exception { + node.stop(); + } + +} -- cgit v1.2.3