Tweaked ASM_0002_TestCase.

Added ASM_0005_TestCase

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@731582 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 141 insertions, 1 deletions

diff --git a/java/sca/stest/sampleTest/src/main/java/test/TestInvocation.class b/java/sca/stest/sampleTest/src/main/java/test/TestInvocation.class
new file mode 100644
index 0000000000..64e43c20c9
--- /dev/null
+++ b/java/sca/stest/sampleTest/src/main/java/test/TestInvocation.class
diff --git a/java/sca/stest/sampleTest/src/main/resources/TestComposite2.composite b/java/sca/stest/sampleTest/src/main/resources/TestComposite2.composite
new file mode 100644
index 0000000000..0ab8d35f66
--- /dev/null
+++ b/java/sca/stest/sampleTest/src/main/resources/TestComposite2.composite
@@ -0,0 +1,43 @@
+<?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.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           targetNamespace="http://oasis/tests"
+           xmlns:sample="http://oasis/tests"
+           name="TestComposite2">

+           
+	<service name="Service1" promote="TestComponent1/Service1">
+		<interface.java interface="test.Service1"></interface.java>
+	</service>
+	
+	<service name="Service1" promote="TestComponent1/Service1">
+		<interface.java interface="test.Service1"></interface.java>
+	</service>

+
+    <property name="serviceName" type="string"/>

+ 
+    <component name="TestComponent1">
+		<implementation.java class="test.service1Impl"/>
+        <service name="Service1">

+        	<interface.java interface="test.Service1"></interface.java>

+        </service>
+        <property name="serviceName" source="$serviceName"/>
+    </component>
+
+</composite>
diff --git a/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0002.composite b/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0002.composite
index bc6f7d0a67..f33e1436f5 100644
--- a/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0002.composite
+++ b/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0002.composite
@@ -17,6 +17,10 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
+<!--
+ ASM_0002_TestCase tests that component with a single reference can be wired to a single
+ component service in the same composite.
+-->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
            targetNamespace="http://oasis/tests"
            xmlns:tns="http://oasis/tests"
diff --git a/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0005.composite b/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0005.composite
new file mode 100644
index 0000000000..ab7a907c75
--- /dev/null
+++ b/java/sca/stest/sampleTest/src/main/resources/Test_ASM_0005.composite
@@ -0,0 +1,49 @@
+<?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.    

+-->

+<!-- Test that a component with multiple <service/> elements must have unique @name attributes for each 

+     service - negative test that has a component with 2 services with the same name   -->

+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

+           targetNamespace="http://oasis/tests"

+           xmlns:tns="http://oasis/tests"

+           xmlns:sample="http://oasis/tests"

+           name="TEST_ASM_0005">

+           

+    <component name="TestClient">

+		<implementation.composite name="tns:TestClient_0002"/>

+		<service name="TestInvocation">

+			<interface.java interface="test.TestInvocation"/>

+            <binding.ws/>

+		</service>

+        <reference name="reference1" target="TestComponent1/Service1" />

+        <property name="testName">ASM_0005</property>

+    </component>

+

+    <component name="TestComponent1">

+		<implementation.composite name="tns:TestComposite2"/>

+        <service name="Service1">

+        	<interface.java interface="test.Service1"></interface.java>

+        </service>

+        <service name="Service1">

+        	<interface.java interface="test.Service1"></interface.java>

+        </service>

+        <property name="serviceName">service1</property>

+    </component>

+    

+</composite>

diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java
index bd4fe79747..600d859e38 100644
--- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java
+++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java
@@ -23,7 +23,7 @@ import test.ASM_0002_Client;
 import testClient.TestInvocation;

 

 /**

- * A generic test client based on Tuscany APIs

+ * ASM_0002_TestCase

  */

 public class ASM_0002_TestCase extends BaseJAXWSTestCase {

 

diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java
new file mode 100644
index 0000000000..718eb73908
--- /dev/null
+++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java
@@ -0,0 +1,44 @@
+/*

+ * 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 client;

+

+

+import test.ASM_0002_Client;

+import testClient.TestInvocation;

+

+/**

+ * Client for ASM_0005_TestCase, which checks that a component with multiple <service/>

+ * elements with the same @name attribute is an error

+ */

+public class ASM_0005_TestCase extends BaseJAXWSTestCase {

+

+ 

+    protected TestConfiguration getTestConfiguration() {

+    	TestConfiguration config = new TestConfiguration();

+    	config.testName 		= "ASM_0005";

+    	config.input 			= "request";

+    	config.output 			= "exception";

+    	config.composite 		= "Test_ASM_0005.composite";

+    	config.testServiceName 	= "TestClient";

+    	config.testClass 		= ASM_0002_Client.class;

+    	config.serviceInterface = TestInvocation.class;

+    	return config;

+    }

+    

+} // end class Test_ASM_0003