From 5963a2d3d6860fe57afc138f095bf2d2eb5a7b80 Mon Sep 17 00:00:00 2001 From: lresende Date: Mon, 7 Oct 2013 22:23:21 +0000 Subject: Official Tuscany 2.0.1 Release git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1530096 13f79535-47bb-0310-9956-ffa450edef68 --- .../tags/2.0.1-RC1/testing/itest/scdl/pom.xml | 59 ----------- .../sca/itest/scdl/ContributionTestCase.java | 80 --------------- .../tuscany/sca/itest/scdl/SCDLTestCase.java | 109 --------------------- .../itest/scdl/ValidateDependenciesTestCase.java | 60 ------------ .../sample-binding-sca-calculator-contribution.jar | Bin 11431 -> 0 bytes .../itest/scdl/src/test/resources/test.composite | 50 ---------- 6 files changed, 358 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/pom.xml delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/resources/sample-binding-sca-calculator-contribution.jar delete mode 100644 sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/resources/test.composite (limited to 'sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl') diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/pom.xml deleted file mode 100644 index d40977818f..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 2.0.1 - ../pom.xml - - - itest-scdl - Apache Tuscany SCA iTest SCDL - - - - org.apache.tuscany.sca - tuscany-base-runtime - 2.0.1 - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - compile - - copy-dependencies - - - - - - - - diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java deleted file mode 100644 index 64329a3303..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java +++ /dev/null @@ -1,80 +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.itest.scdl; - -import java.io.File; -import java.net.URL; -import java.util.Arrays; -import java.util.List; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Implementation; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.deployment.DefaultDeployer; -import org.apache.tuscany.sca.deployment.Deployer; -import org.apache.tuscany.sca.implementation.java.JavaImplementation; -import org.apache.tuscany.sca.monitor.Monitor; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * Test case for reading and writing SCDL - */ -public class ContributionTestCase { - - @Test - public void testRead() throws Exception { - Deployer deployer = new DefaultDeployer(); - File file = new File("src/test/resources/sample-binding-sca-calculator-contribution.jar"); - URL url = file.toURI().toURL(); - Monitor monitor = deployer.createMonitor(); - Contribution contribution = deployer.loadContribution(url.toURI(), url, monitor); - deployer.build(Arrays.asList(contribution), Arrays.asList(contribution), null, monitor); - - // Ferkle around in the contribution verifying it looks as expected - Assert.assertNotNull(contribution); - List deployables = contribution.getDeployables(); - Assert.assertEquals(2, deployables.size()); - Composite calculatorComposte = deployables.get(0); - Assert.assertEquals("Calculator", calculatorComposte.getName().getLocalPart()); - Assert.assertEquals(5, calculatorComposte.getComponents().size()); - Component calcComp = calculatorComposte.getComponent("CalculatorServiceComponent"); - Assert.assertNotNull(calcComp); - Assert.assertEquals(4, calcComp.getReferences().size()); - Reference ref = calcComp.getReference("addService"); - Assert.assertEquals("AddServiceComponent", ref.getTargets().get(0).getName()); - Implementation impl = calcComp.getImplementation(); - Assert.assertTrue(impl instanceof JavaImplementation); - Assert.assertEquals("calculator.CalculatorServiceImpl", ((JavaImplementation)impl).getJavaClass().getName()); - } - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } -} diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java deleted file mode 100644 index 7dd52c5942..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java +++ /dev/null @@ -1,109 +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.itest.scdl; - -import java.net.URI; -import java.net.URL; -import java.util.Arrays; - -import javax.xml.stream.XMLStreamException; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.binding.jms.JMSBinding; -import org.apache.tuscany.sca.binding.jsonp.JSONPBinding; -import org.apache.tuscany.sca.binding.rmi.RMIBinding; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.deployment.Deployer; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.Problem; -import org.junit.Test; - -/** - * Test case for reading and writing a composite - */ -public class SCDLTestCase { - - @Test - public void testRead() throws ContributionReadException, XMLStreamException { - ExtensionPointRegistry registry = new DefaultExtensionPointRegistry(); - Deployer deployer = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(Deployer.class); - - URL r = getClass().getResource("/test.composite"); - Composite composite = deployer.loadXMLDocument(r, null); - Assert.assertNotNull(composite); - - Component JavaComp = composite.getComponent("JavaComponent"); - Assert.assertNotNull(JavaComp); - - Component bpelComp = composite.getComponent("BPELComponent"); - Assert.assertNotNull(bpelComp); - - Service jsonpService = composite.getService("JSONPService"); - Assert.assertNotNull(jsonpService); - Assert.assertEquals(1, jsonpService.getBindings().size()); - JSONPBinding jsonpBinding = jsonpService.getBinding(JSONPBinding.class); - Assert.assertNotNull(jsonpBinding); - - Service jmsService = composite.getService("JMSService"); - Assert.assertNotNull(jmsService); - Assert.assertEquals(1, jmsService.getBindings().size()); - JMSBinding jmsBinding = jmsService.getBinding(JMSBinding.class); - Assert.assertNotNull(jmsBinding); - - Service rmiService = composite.getService("RMIService"); - Assert.assertNotNull(rmiService); - Assert.assertEquals(1, rmiService.getBindings().size()); - RMIBinding rmiBinding = rmiService.getBinding(RMIBinding.class); - Assert.assertNotNull(rmiBinding); - -// TODO: WS binding drags in entire runtime -// Service wsService = composite.getService("WSService"); -// Assert.assertNotNull(wsService); -// Assert.assertEquals(1, wsService.getBindings().size()); -// WSBinding wsBinding = wsService.getBinding(WSBinding.class); -// Assert.assertNotNull(wsBinding); - } - - @Test - public void testBuild() throws Exception { - ExtensionPointRegistry registry = new DefaultExtensionPointRegistry(); - Deployer deployer = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(Deployer.class); - URL r = getClass().getResource("/test.composite"); - r = new URL(r, "../"); - Monitor monitor = deployer.createMonitor(); - Contribution contribution = deployer.loadContribution(URI.create("c1"), r, monitor); - deployer.build(Arrays.asList(contribution), Arrays.asList(contribution), null, monitor); - int i = 0; - for (Problem p : monitor.getProblems()) { - System.err.println(i + ": " + p); - i++; - } - Assert.assertTrue(i > 0); - } - -} diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java deleted file mode 100644 index 8b8abd3a4e..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java +++ /dev/null @@ -1,60 +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.itest.scdl; - -import java.io.File; - -import junit.framework.Assert; - -import org.junit.Test; - -/** - * Test case for verifying only SCDL jars are needed - * - * Uses maven-dependency-plugin config in the pom.xml - * - * Current required jars are: - * - * asm-3.1.jar - * cglib-2.2.jar - * junit-4.8.1.jar - * tuscany-base-runtime-2.0-SNAPSHOT.jar - * wsdl4j-1.6.2.jar - * XmlSchema-1.4.3.jar - * - */ -public class ValidateDependenciesTestCase { - - @Test - public void countDependencies() { - - File dependenciesDir = new File("target/dependency"); - Assert.assertTrue(dependenciesDir.exists()); - - File[] dependencyFiles = dependenciesDir.listFiles(); - String vend = System.getProperty("java.vendor"); - - if(vend.equals("IBM Corporation")) { - Assert.assertEquals(12, dependencyFiles.length); - } else { - Assert.assertEquals(8, dependencyFiles.length); - } - } -} diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/resources/sample-binding-sca-calculator-contribution.jar b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/resources/sample-binding-sca-calculator-contribution.jar deleted file mode 100644 index 8a79413c1b..0000000000 Binary files a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/resources/sample-binding-sca-calculator-contribution.jar and /dev/null differ diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/resources/test.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/resources/test.composite deleted file mode 100644 index 6fa81b6e47..0000000000 --- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/scdl/src/test/resources/test.composite +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3