You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/05/27 08:14:45 UTC
svn commit: r409813 - in /incubator/tuscany/sandbox/jboynes/sca: ./
containers/container.spring/
containers/container.spring/src/test/java/org/apache/tuscany/container/spring/
test/ test/src/ test/src/main/ test/src/main/java/ test/src/main/java/org/
t...
Author: jmarino
Date: Fri May 26 23:14:44 2006
New Revision: 409813
URL: http://svn.apache.org/viewvc?rev=409813&view=rev
Log:
start of test framework project
Added:
incubator/tuscany/sandbox/jboynes/sca/test/
incubator/tuscany/sandbox/jboynes/sca/test/LICENSE.txt
incubator/tuscany/sandbox/jboynes/sca/test/pom.xml
incubator/tuscany/sandbox/jboynes/sca/test/src/
incubator/tuscany/sandbox/jboynes/sca/test/src/main/
incubator/tuscany/sandbox/jboynes/sca/test/src/main/java/
incubator/tuscany/sandbox/jboynes/sca/test/src/main/java/org/
incubator/tuscany/sandbox/jboynes/sca/test/src/main/java/org/apache/
incubator/tuscany/sandbox/jboynes/sca/test/src/main/java/org/apache/tuscany/
incubator/tuscany/sandbox/jboynes/sca/test/src/main/java/org/apache/tuscany/test/
incubator/tuscany/sandbox/jboynes/sca/test/src/main/java/org/apache/tuscany/test/ArtifactFactory.java
incubator/tuscany/sandbox/jboynes/sca/test/src/main/resources/
incubator/tuscany/sandbox/jboynes/sca/test/src/test/
incubator/tuscany/sandbox/jboynes/sca/test/src/test/java/
incubator/tuscany/sandbox/jboynes/sca/test/src/test/resources/
Modified:
incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/pom.xml
incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringCompositeBuilderTestCase.java
incubator/tuscany/sandbox/jboynes/sca/pom.xml
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/pom.xml?rev=409813&r1=409812&r2=409813&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/pom.xml Fri May 26 23:14:44 2006
@@ -49,6 +49,13 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-test</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringCompositeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringCompositeBuilderTestCase.java?rev=409813&r1=409812&r2=409813&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringCompositeBuilderTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringCompositeBuilderTestCase.java Fri May 26 23:14:44 2006
@@ -2,11 +2,11 @@
import java.net.URI;
import java.net.URISyntaxException;
-import java.lang.reflect.Method;
+import org.apache.tuscany.container.spring.mock.TestBean;
import org.apache.tuscany.container.spring.mock.TestBeanImpl;
import org.apache.tuscany.container.spring.mock.VMBinding;
-import org.apache.tuscany.container.spring.mock.TestBean;
+import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.builder.BuilderRegistry;
import org.apache.tuscany.spi.context.CompositeContext;
import org.apache.tuscany.spi.context.ServiceContext;
@@ -15,9 +15,7 @@
import org.apache.tuscany.spi.model.Component;
import org.apache.tuscany.spi.model.CompositeComponentType;
import org.apache.tuscany.spi.wire.SourceWire;
-import org.apache.tuscany.spi.QualifiedName;
-import org.apache.tuscany.core.wire.jdk.JDKSourceWire;
-import org.apache.tuscany.core.wire.SourceInvocationChainImpl;
+import org.apache.tuscany.test.ArtifactFactory;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
import org.springframework.beans.factory.config.BeanDefinition;
@@ -38,18 +36,15 @@
Component<SpringImplementation> component = new Component<SpringImplementation>("spring", impl);
Mock mock = mock(BuilderRegistry.class);
ServiceContextExtension<TestBean> serviceContext = new ServiceContextExtension<TestBean>("fooService", null, null);
- SourceWire<TestBean> wire = new JDKSourceWire<TestBean>();
- wire.setBusinessInterface(TestBean.class);
- Method m = TestBean.class.getMethod("echo",String.class);
- wire.addInvocationChain(m,new SourceInvocationChainImpl(m));
+ SourceWire<TestBean> wire = ArtifactFactory.createSourceWire("fooService", TestBean.class);
wire.setTargetName(new QualifiedName("foo"));
serviceContext.setSourceWire(wire);
mock.expects(atLeastOnce()).method("build").will(returnValue(serviceContext));
builder.setBuilderRegistry((BuilderRegistry) mock.proxy());
CompositeContext context = (CompositeContext) builder.build(null, component, null);
- ServiceContext service = (ServiceContext)context.getContext("fooService");
- TestBean bean = (TestBean)service.getService();
- assertEquals("foo",bean.echo("foo"));
+ ServiceContext service = (ServiceContext) context.getContext("fooService");
+ TestBean bean = (TestBean) service.getService();
+ assertEquals("foo", bean.echo("foo"));
}
@@ -73,7 +68,6 @@
componentType.add(service);
return componentType;
}
-
}
Modified: incubator/tuscany/sandbox/jboynes/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/pom.xml?rev=409813&r1=409812&r2=409813&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/pom.xml Fri May 26 23:14:44 2006
@@ -29,6 +29,7 @@
<modules>
<module>spi</module>
<module>core2</module>
+ <module>test</module>
<module>containers</module>
<module>commands/launcher</module>
<module>runtime/standalone</module>
Added: incubator/tuscany/sandbox/jboynes/sca/test/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/test/LICENSE.txt?rev=409813&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/test/LICENSE.txt (added)
+++ incubator/tuscany/sandbox/jboynes/sca/test/LICENSE.txt Fri May 26 23:14:44 2006
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
Added: incubator/tuscany/sandbox/jboynes/sca/test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/test/pom.xml?rev=409813&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/test/pom.xml (added)
+++ incubator/tuscany/sandbox/jboynes/sca/test/pom.xml Fri May 26 23:14:44 2006
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed 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.
+ -->
+<project>
+ <parent>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-sca</artifactId>
+ <version>SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>tuscany-test</artifactId>
+ <name>Tuscany Test</name>
+ <description>Tuscany Testcase Framework</description>
+ <version>SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-core</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: incubator/tuscany/sandbox/jboynes/sca/test/src/main/java/org/apache/tuscany/test/ArtifactFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/test/src/main/java/org/apache/tuscany/test/ArtifactFactory.java?rev=409813&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/test/src/main/java/org/apache/tuscany/test/ArtifactFactory.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/test/src/main/java/org/apache/tuscany/test/ArtifactFactory.java Fri May 26 23:14:44 2006
@@ -0,0 +1,91 @@
+package org.apache.tuscany.test;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.core.util.MethodHashMap;
+import org.apache.tuscany.core.wire.InvokerInterceptor;
+import org.apache.tuscany.core.wire.SourceInvocationChainImpl;
+import org.apache.tuscany.core.wire.TargetInvocationChainImpl;
+import org.apache.tuscany.core.wire.jdk.JDKSourceWire;
+import org.apache.tuscany.core.wire.jdk.JDKTargetWire;
+import org.apache.tuscany.spi.wire.SourceInvocationChain;
+import org.apache.tuscany.spi.wire.SourceWire;
+import org.apache.tuscany.spi.wire.TargetInvocationChain;
+import org.apache.tuscany.spi.wire.TargetWire;
+
+/**
+ * A factory for creating runtime artifacts to facilitate testing without directly instantiating core
+ * implementation classes
+ *
+ * @version $$Rev$$ $$Date$$
+ */
+public class ArtifactFactory {
+
+ private ArtifactFactory() {
+ }
+
+ /**
+ * Creates a target wire. After a wire is returned, client code must call
+ * {@link #completeTargetWire(org.apache.tuscany.spi.wire.TargetWire<T>)}. These two methods have been separated
+ * to allow wires to be decorated with interceptors or handlers prior to their completion
+ *
+ * @param serviceName the service name associated with the wire
+ * @param interfaze the interface associated with the wire
+ */
+ public static <T> TargetWire<T> createTargetWire(String serviceName, Class<T> interfaze) {
+ TargetWire<T> wire = new JDKTargetWire<T>();
+ wire.setBusinessInterface(interfaze);
+ wire.setServiceName(serviceName);
+ wire.addInvocationChains(createTargetInvocationChains(interfaze));
+ return wire;
+ }
+
+ /**
+ * Finalizes the target wire
+ */
+ public static <T> void completeTargetWire(TargetWire<T> wire) {
+ for (TargetInvocationChain chain : wire.getInvocationChains().values()) {
+ // add tail interceptor
+ chain.addInterceptor(new InvokerInterceptor());
+ }
+ }
+
+ /**
+ * Creates a source wire
+ * @param refName the reference name the wire is associated with on the client
+ * @param interfaze the interface associated with the wire
+ */
+ public static <T> SourceWire<T> createSourceWire(String refName, Class<T> interfaze) {
+ SourceWire<T> wire = new JDKSourceWire<T>();
+ wire.setReferenceName(refName);
+ wire.addInvocationChains(createSourceInvocationChains(interfaze));
+ wire.setBusinessInterface(interfaze);
+ return wire;
+ }
+
+ private static Map<Method, SourceInvocationChain> createSourceInvocationChains(Class<?> interfaze) {
+ Map<Method, SourceInvocationChain> invocations = new HashMap<Method, SourceInvocationChain>();
+ Method[] methods = interfaze.getMethods();
+ for (Method method : methods) {
+ SourceInvocationChain chain = new SourceInvocationChainImpl(method);
+ invocations.put(method, chain);
+ }
+ return invocations;
+ }
+
+ private static Map<Method, TargetInvocationChain> createTargetInvocationChains(Class<?> interfaze) {
+ Map<Method, TargetInvocationChain> invocations = new MethodHashMap<TargetInvocationChain>();
+ Method[] methods = interfaze.getMethods();
+ for (Method method : methods) {
+ TargetInvocationChain chain = new TargetInvocationChainImpl(method);
+ // add tail interceptor
+ chain.addInterceptor(new InvokerInterceptor());
+ invocations.put(method, chain);
+ }
+ return invocations;
+ }
+
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org