From e96eacb5539837f536a515b56e381dec81dc5d08 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 2 Apr 2009 10:15:22 +0000
Subject: Clean up contribution itests for split into seperate itests

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@761232 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/test/java/ContributionFolderTestCase.java  |  38 ++++++++++++++++
 .../test/java/ContributionFolderTestCaseFIXME.java |  38 ----------------
 .../repository/folderWithJars/Calculator.composite |  49 +++++++++++++++++++++
 .../folderWithJars/META-INF/sca-contribution.xml   |  23 ++++++++++
 .../repository/folderWithJars/service.jar          | Bin 0 -> 2380 bytes
 .../repository/folderWithJars/serviceImpl.jar      | Bin 0 -> 4655 bytes
 .../folderWithJars/Calculator.composite            |  49 ---------------------
 .../folderWithJars/META-INF/sca-contribution.xml   |  23 ----------
 .../repository2/folderWithJars/service.jar         | Bin 2380 -> 0 bytes
 .../repository2/folderWithJars/serviceImpl.jar     | Bin 4655 -> 0 bytes
 10 files changed, 110 insertions(+), 110 deletions(-)
 create mode 100644 java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java
 delete mode 100644 java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCaseFIXME.java
 create mode 100644 java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
 create mode 100644 java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
 create mode 100644 java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
 create mode 100644 java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
 delete mode 100644 java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
 delete mode 100644 java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
 delete mode 100644 java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
 delete mode 100644 java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar

(limited to 'java/sca/itest/contribution-folder/src')

diff --git a/java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java b/java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java
new file mode 100644
index 0000000000..582b9cf5c1
--- /dev/null
+++ b/java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java
@@ -0,0 +1,38 @@
+
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+
+import calculator.CalculatorService;
+
+
+
+/**
+ * Test SCADomain.newInstance and invocation of a service.
+ * 
+ * @version $Rev: 608205 $ $Date: 2008-01-02 20:29:05 +0000 (Wed, 02 Jan 2008) $
+ */
+public class ContributionFolderTestCase extends TestCase {
+
+    private Node node;
+    
+    @Override
+    protected void setUp() throws Exception {
+		node = NodeFactory.newInstance().createNode(null, new Contribution("foo", "src/test/resources/repository"));
+        node.start();
+    }
+
+    public void testInvoke() throws Exception {
+        CalculatorService service = node.getService(CalculatorService.class, "CalculatorServiceComponent");
+        assertEquals(3.0, service.add(1, 2));
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        node.stop();
+    }
+
+}
diff --git a/java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCaseFIXME.java b/java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCaseFIXME.java
deleted file mode 100644
index 865d98558c..0000000000
--- a/java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCaseFIXME.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-import calculator.CalculatorService;
-
-
-
-/**
- * Test SCADomain.newInstance and invocation of a service.
- * 
- * @version $Rev: 608205 $ $Date: 2008-01-02 20:29:05 +0000 (Wed, 02 Jan 2008) $
- */
-public class ContributionFolderTestCaseFIXME extends TestCase {
-
-    private Node node;
-    
-    @Override
-    protected void setUp() throws Exception {
-		node = NodeFactory.newInstance().createNode(null, new Contribution("foo", "src/test/resources/repository2"));
-        node.start();
-    }
-
-    public void testInvoke() throws Exception {
-        CalculatorService service = node.getService(CalculatorService.class, "CalculatorServiceComponent");
-        assertEquals(3.0, service.add(1, 2));
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        node.stop();
-    }
-
-}
diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite b/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
new file mode 100644
index 0000000000..e11d44fe58
--- /dev/null
+++ b/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.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.    
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+           targetNamespace="http://sample"
+           xmlns:sample="http://sample"
+           name="Calculator">
+
+    <component name="CalculatorServiceComponent">
+		<implementation.java class="calculator.CalculatorServiceImpl"/>
+        <reference name="addService" target="AddServiceComponent" />
+        <reference name="subtractService" target="SubtractServiceComponent" />
+        <reference name="multiplyService" target="MultiplyServiceComponent" />
+        <reference name="divideService" target="DivideServiceComponent" />
+    </component>
+
+    <component name="AddServiceComponent">
+        <implementation.java class="calculator.AddServiceImpl"/>
+    </component>
+
+    <component name="SubtractServiceComponent">
+        <implementation.java class="calculator.SubtractServiceImpl"/>
+    </component>
+
+    <component name="MultiplyServiceComponent">
+        <implementation.java class="calculator.MultiplyServiceImpl"/>
+    </component>
+
+    <component name="DivideServiceComponent">
+        <implementation.java class="calculator.DivideServiceImpl"/>
+    </component>
+
+</composite>
diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml b/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..10140b7bc1
--- /dev/null
+++ b/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?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.    
+-->
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+              xmlns:sample="http://sample">
+   <deployable composite="sample:Calculator"/>
+</contribution>
\ No newline at end of file
diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar b/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
new file mode 100644
index 0000000000..fe264693fe
Binary files /dev/null and b/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar differ
diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar b/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
new file mode 100644
index 0000000000..d5dfb647d3
Binary files /dev/null and b/java/sca/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar differ
diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite b/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
deleted file mode 100644
index e11d44fe58..0000000000
--- a/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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://docs.oasis-open.org/ns/opencsa/sca/200903"
-           targetNamespace="http://sample"
-           xmlns:sample="http://sample"
-           name="Calculator">
-
-    <component name="CalculatorServiceComponent">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl"/>
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl"/>
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl"/>
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml b/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
deleted file mode 100644
index 10140b7bc1..0000000000
--- a/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.    
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-              xmlns:sample="http://sample">
-   <deployable composite="sample:Calculator"/>
-</contribution>
\ No newline at end of file
diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar b/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
deleted file mode 100644
index fe264693fe..0000000000
Binary files a/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar and /dev/null differ
diff --git a/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar b/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar
deleted file mode 100644
index d5dfb647d3..0000000000
Binary files a/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar and /dev/null differ
-- 
cgit v1.2.3