From d5f1d093fe6fa491cdec392dca7137639e98d149 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 15 Sep 2008 00:26:00 +0000 Subject: Pulled a recent revision of trunk into the sca-android branch, to apply the android patches from JIRA TUSCANY-2440 to it. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695318 13f79535-47bb-0310-9956-ffa450edef68 --- .../das/DASImplementationProcessorTestCase.java | 179 +++++++++++++++++++++ .../sca/implementation/das/DASTestCase.java | 73 +++++++++ .../implementation/das/company/CompanyService.java | 33 ++++ .../das/company/CompanyServiceTestCase.java | 62 +++++++ 4 files changed, 347 insertions(+) create mode 100644 branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASImplementationProcessorTestCase.java create mode 100644 branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASTestCase.java create mode 100644 branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyService.java create mode 100644 branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyServiceTestCase.java (limited to 'branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das') diff --git a/branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASImplementationProcessorTestCase.java b/branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASImplementationProcessorTestCase.java new file mode 100644 index 0000000000..8659280891 --- /dev/null +++ b/branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASImplementationProcessorTestCase.java @@ -0,0 +1,179 @@ +/* + * 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.implementation.das; + +import java.io.StringReader; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamReader; + +import junit.framework.TestCase; + +import org.apache.tuscany.sca.assembly.AssemblyFactory; +import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory; +import org.apache.tuscany.sca.assembly.xml.Constants; +import org.apache.tuscany.sca.contribution.DefaultModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.data.engine.config.ConnectionInfo; +import org.apache.tuscany.sca.data.engine.config.ConnectionProperties; +import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory; +import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; +import org.apache.tuscany.sca.monitor.Monitor; +import org.apache.tuscany.sca.monitor.MonitorFactory; +import org.apache.tuscany.sca.monitor.Problem; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl; +import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl; + +/** + * @version $Rev$ $Date$ + */ +public class DASImplementationProcessorTestCase extends TestCase { + + protected static final QName IMPLEMENTATION_DAS = new QName(Constants.SCA10_TUSCANY_NS, "implementation.das"); + + private static final String COMPOSITE_USING_DATASOURCE = + "" + + "" + + " " + + " " + + " " + + " " + + ""; + + private static final String COMPOSITE_USING_CONNECTION_PROPERTIES = + "" + + "" + + " " + + " " + + " " + + " " + + " " + + " " + + ""; + + private static final String INVALID_XML = + "" + + "" + + " " + + " " + + " " + + " " + + ""; + + private XMLInputFactory xmlFactory; + private ModelFactoryExtensionPoint modelFactories; + private Monitor monitor; + + @Override + protected void setUp() throws Exception { + super.setUp(); + xmlFactory = XMLInputFactory.newInstance(); + // Create a monitor + MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl(); + if (monitorFactory != null) + this.monitor = monitorFactory.createMonitor(); + modelFactories = new DefaultModelFactoryExtensionPoint(); + AssemblyFactory assemblyFactory = new DefaultAssemblyFactory(); + modelFactories.addFactory(assemblyFactory); + JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory(); + modelFactories.addFactory(javaFactory); + } + + public void testLoadCompositeUsingDatasource() throws Exception { + XMLStreamReader reader = xmlFactory.createXMLStreamReader(new StringReader(COMPOSITE_USING_DATASOURCE)); + + DASImplementationProcessor dataProcessor = new DASImplementationProcessor(modelFactories, monitor); + + while(true) { + int event = reader.next(); + if(event == XMLStreamConstants.START_ELEMENT && IMPLEMENTATION_DAS.equals(reader.getName())) { + break; + } + } + + DASImplementation implementation = dataProcessor.read(reader); + + assertNotNull(implementation); + assertEquals("config.xml", implementation.getConfig()); + assertEquals("rdb", implementation.getDataAccessType()); + + ConnectionInfo connInfo = implementation.getConnectionInfo(); + assertNotNull(connInfo); + assertEquals("dataSource", connInfo.getDataSource()); + + ConnectionProperties connProperties = connInfo.getConnectionProperties(); + assertNull(connProperties); + } + + public void testLoadCompositeUsingConnectionProperties() throws Exception { + XMLStreamReader reader = xmlFactory.createXMLStreamReader(new StringReader(COMPOSITE_USING_CONNECTION_PROPERTIES)); + + DASImplementationProcessor dataProcessor = new DASImplementationProcessor(modelFactories, monitor); + + while(true) { + int event = reader.next(); + if(event == XMLStreamConstants.START_ELEMENT && IMPLEMENTATION_DAS.equals(reader.getName())) { + break; + } + } + + DASImplementation implementation = dataProcessor.read(reader); + + assertNotNull(implementation); + assertEquals("config.xml", implementation.getConfig()); + assertEquals("rdb", implementation.getDataAccessType()); + + ConnectionInfo connInfo = implementation.getConnectionInfo(); + assertNotNull(connInfo); + assertNull("dataSource", connInfo.getDataSource()); + + ConnectionProperties connProperties = connInfo.getConnectionProperties(); + assertNotNull(connProperties); + assertEquals("driverClass",connProperties.getDriverClass()); + assertEquals("databaseURL",connProperties.getDatabaseURL()); + assertEquals(1,connProperties.getLoginTimeout().intValue()); + } + + /** + * Test loading an INVALID implementation.das element from a contribution metadata stream + */ + public void testLoadInvalid() throws Exception { + XMLStreamReader reader = xmlFactory.createXMLStreamReader(new StringReader(INVALID_XML)); + + DASImplementationProcessor dataProcessor = new DASImplementationProcessor(modelFactories, monitor); + + while(true) { + int event = reader.next(); + if(event == XMLStreamConstants.START_ELEMENT && IMPLEMENTATION_DAS.equals(reader.getName())) { + break; + } + } + + dataProcessor.read(reader); + Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem(); + assertNotNull(problem); + assertEquals("DataAccessTypeAttributeMissing", problem.getMessageId()); + } +} diff --git a/branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASTestCase.java b/branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASTestCase.java new file mode 100644 index 0000000000..7d8b4181c1 --- /dev/null +++ b/branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASTestCase.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 org.apache.tuscany.sca.implementation.das; + +import junit.framework.TestCase; + +import org.apache.tuscany.sca.host.embedded.SCADomain; + +import commonj.sdo.DataObject; + +/** + * Tests the DAS service + * + * @version $Rev$ $Date$ + */ +public class DASTestCase extends TestCase { + + private SCADomain scaDomain; + private DAS dasService; + + /** + * @throws java.lang.Exception + */ + @Override + protected void setUp() throws Exception { + scaDomain = SCADomain.newInstance("das.composite"); + dasService = scaDomain.getService(DAS.class, "DASServiceComponent/DAS"); + + } + + /** + * @throws java.lang.Exception + */ + @Override + protected void tearDown() throws Exception { + scaDomain.close(); + } + + + public void testExecuteCommand() throws Exception { + String commandName = "all companies"; + + DataObject resultRoot= dasService.executeCommand(commandName); + assertNotNull(resultRoot); + assertEquals(3, resultRoot.getList("COMPANY").size()); + } + + public void testExecuteCommandWithFilter() throws Exception { + String commandName = "all companies"; + + DataObject resultRoot= dasService.executeCommand(commandName, "COMPANY[1]"); + assertNotNull(resultRoot); + } + + +} diff --git a/branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyService.java b/branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyService.java new file mode 100644 index 0000000000..63d0c92683 --- /dev/null +++ b/branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyService.java @@ -0,0 +1,33 @@ +/* + * 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.implementation.das.company; + +import org.apache.tuscany.sca.implementation.das.annotations.Command; + +import commonj.sdo.DataObject; + +/** + * + * @version $Rev$ $Date$ + */ +public interface CompanyService { + @Command(query="select * from COMPANY") + DataObject getCompanies(); +} diff --git a/branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyServiceTestCase.java b/branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyServiceTestCase.java new file mode 100644 index 0000000000..565a930ebe --- /dev/null +++ b/branches/sca-android/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyServiceTestCase.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 org.apache.tuscany.sca.implementation.das.company; + +import junit.framework.TestCase; + +import org.apache.tuscany.sca.host.embedded.SCADomain; + +import commonj.sdo.DataObject; + +/** + * Tests the DAS service + * + * @version $Rev$ $Date$ + */ +public class CompanyServiceTestCase extends TestCase { + + private SCADomain scaDomain; + private CompanyService dasCompanyService; + + /** + * @throws java.lang.Exception + */ + @Override + protected void setUp() throws Exception { + scaDomain = SCADomain.newInstance("company.composite"); + dasCompanyService = scaDomain.getService(CompanyService.class, "CompanyServiceComponent/CompanyService"); + } + + /** + * @throws java.lang.Exception + */ + @Override + protected void tearDown() throws Exception { + scaDomain.close(); + } + + public void testGetCompanies() throws Exception { + DataObject root = dasCompanyService.getCompanies(); + assertNotNull(root); + String nome = root.getString("COMPANY[1]/NAME"); + assertEquals("ACME Publishing", root.getString("COMPANY[1]/NAME")); + } + +} -- cgit v1.2.3