Author: jboynes
Date: Fri Apr 14 10:08:20 2006
New Revision: 394141
URL: http://svn.apache.org/viewcvs?rev=394141&view=rev
Log:
more test case for loaders
Added:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java
(with props)
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java
(with props)
Removed:
incubator/tuscany/java/sca/core/src/test/resources/org/apache/tuscany/core/loader/
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoaderTestCase.java
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java?rev=394141&r1=394140&r2=394141&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java
Fri Apr 14 10:08:20 2006
@@ -43,12 +43,8 @@
/**
* @version $Rev$ $Date$
*/
-public class ComponentLoaderTestCase extends TestCase {
+public class ComponentLoaderTestCase extends LoaderTestSupport {
private ComponentLoader loader;
- private XMLInputFactory xmlFactory;
- private SystemAssemblyFactory assemblyFactory;
- private ResourceLoader resourceLoader;
- private AssemblyContext modelContext;
private ComponentTypeIntrospector introspector;
public void testStringProperty() throws XMLStreamException,
ConfigurationLoadException {
@@ -85,8 +81,7 @@
}
private void loadProperties(String xml, Component component) throws
XMLStreamException, ConfigurationLoadException {
- XMLStreamReader reader = xmlFactory.createXMLStreamReader(new
StringReader(xml));
- reader.next();
+ XMLStreamReader reader = getReader(xml);
loader.loadProperties(reader, resourceLoader, component);
component.initialize(modelContext);
}
@@ -107,12 +102,8 @@
protected void setUp() throws Exception {
super.setUp();
- xmlFactory = XMLInputFactory.newInstance();
- assemblyFactory = new SystemAssemblyFactoryImpl();
- resourceLoader = new ResourceLoaderImpl(getClass().getClassLoader());
loader = new ComponentLoader();
loader.setFactory(assemblyFactory);
- modelContext = new AssemblyContextImpl(assemblyFactory, null,
resourceLoader);
introspector = new Java5ComponentTypeIntrospector(assemblyFactory);
}
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoaderTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoaderTestCase.java?rev=394141&r1=394140&r2=394141&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoaderTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoaderTestCase.java
Fri Apr 14 10:08:20 2006
@@ -16,69 +16,34 @@
*/
package org.apache.tuscany.core.loader.assembly;
-import junit.framework.TestCase;
-import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
-import org.apache.tuscany.core.config.ConfigurationLoadException;
-import org.apache.tuscany.core.loader.assembly.AbstractLoader;
-import org.apache.tuscany.core.loader.assembly.ComponentTypeLoader;
-import org.apache.tuscany.core.loader.assembly.ServiceLoader;
-import org.apache.tuscany.core.loader.impl.StAXLoaderRegistryImpl;
-import org.apache.tuscany.core.system.assembly.impl.SystemAssemblyFactoryImpl;
-import org.apache.tuscany.model.assembly.ComponentInfo;
-import org.apache.tuscany.model.assembly.Service;
-
-import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import javax.xml.namespace.QName;
+
+import org.apache.tuscany.core.config.ConfigurationLoadException;
+import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.Service;
/**
* @version $Rev$ $Date$
*/
-public class ComponentTypeLoaderTestCase extends TestCase {
- private XMLInputFactory xmlFactory;
- private StAXLoaderRegistryImpl registry;
- private SystemAssemblyFactoryImpl assemblyFactory;
- private ResourceLoaderImpl resourceLoader;
+public class ComponentTypeLoaderTestCase extends LoaderTestSupport {
public void testMinimal() throws XMLStreamException,
ConfigurationLoadException {
- XMLStreamReader is =
xmlFactory.createXMLStreamReader(getClass().getResourceAsStream("minimal.componentType"));
- is.next();
- ComponentInfo type = (ComponentInfo) registry.load(is, resourceLoader);
+ XMLStreamReader reader = getReader("<componentType
xmlns='http://www.osoa.org/xmlns/sca/0.9'><service
name='service1'/></componentType>");
+ ComponentInfo type = (ComponentInfo) registry.load(reader,
resourceLoader);
type.initialize(null);
assertNotNull(type);
assertEquals(1, type.getServices().size());
Service service = type.getService("service1");
assertEquals("service1", service.getName());
- assertEquals(XMLStreamConstants.END_DOCUMENT, is.next());
+ assertEquals(XMLStreamConstants.END_DOCUMENT, reader.next());
}
protected void setUp() throws Exception {
super.setUp();
- xmlFactory = XMLInputFactory.newInstance();
- assemblyFactory = new SystemAssemblyFactoryImpl();
- registry = new StAXLoaderRegistryImpl();
- registry.setMonitor(NULL_MONITOR);
- register(new ComponentTypeLoader());
- register(new ServiceLoader());
- resourceLoader = new ResourceLoaderImpl(getClass().getClassLoader());
- }
-
- private void register(AbstractLoader<?> loader) {
- loader.setFactory(assemblyFactory);
- loader.setRegistry(registry);
- loader.start();
+ registerLoader(new ComponentTypeLoader());
+ registerLoader(new ServiceLoader());
}
- private static final StAXLoaderRegistryImpl.Monitor NULL_MONITOR = new
StAXLoaderRegistryImpl.Monitor() {
- public void registeringLoader(QName xmlType) {
- }
-
- public void unregisteringLoader(QName xmlType) {
- }
-
- public void elementLoad(QName xmlType) {
- }
- };
}
Added:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java?rev=394141&view=auto
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java
(added)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java
Fri Apr 14 10:08:20 2006
@@ -0,0 +1,44 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * 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.
+ */
+package org.apache.tuscany.core.loader.assembly;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.tuscany.model.assembly.EntryPoint;
+import org.apache.tuscany.core.config.ConfigurationLoadException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class EntryPointLoaderTestCase extends LoaderTestSupport {
+
+ public void testMinimal() throws XMLStreamException,
ConfigurationLoadException {
+ String xml = "<entryPoint xmlns='http://www.osoa.org/xmlns/sca/0.9'
name='test'></entryPoint>";
+ XMLStreamReader reader = getReader(xml);
+ EntryPoint ep = (EntryPoint) registry.load(reader, resourceLoader);
+ assertNotNull(ep);
+ assertEquals("test", ep.getName());
+ assertEquals(XMLStreamConstants.END_DOCUMENT, reader.next());
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ registerLoader(new EntryPointLoader());
+ }
+}
Propchange:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Added:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java?rev=394141&view=auto
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java
(added)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java
Fri Apr 14 10:08:20 2006
@@ -0,0 +1,79 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * 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.
+ */
+package org.apache.tuscany.core.loader.assembly;
+
+import java.io.StringReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.common.resource.ResourceLoader;
+import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
+import org.apache.tuscany.core.system.assembly.SystemAssemblyFactory;
+import org.apache.tuscany.core.system.assembly.impl.SystemAssemblyFactoryImpl;
+import org.apache.tuscany.core.loader.impl.StAXLoaderRegistryImpl;
+import org.apache.tuscany.model.assembly.AssemblyContext;
+import org.apache.tuscany.model.assembly.impl.AssemblyContextImpl;
+
+/**
+ * Base class for loader tests with common fixture elements.
+ *
+ * @version $Rev$ $Date$
+ */
+public abstract class LoaderTestSupport extends TestCase {
+ protected SystemAssemblyFactory assemblyFactory;
+ protected ResourceLoader resourceLoader;
+ protected AssemblyContext modelContext;
+ protected XMLInputFactory xmlFactory;
+ protected StAXLoaderRegistryImpl registry;
+
+ protected static final StAXLoaderRegistryImpl.Monitor NULL_MONITOR = new
StAXLoaderRegistryImpl.Monitor() {
+ public void registeringLoader(QName xmlType) {
+ }
+
+ public void unregisteringLoader(QName xmlType) {
+ }
+
+ public void elementLoad(QName xmlType) {
+ }
+ };
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ assemblyFactory = new SystemAssemblyFactoryImpl();
+ resourceLoader = new ResourceLoaderImpl(getClass().getClassLoader());
+ modelContext = new AssemblyContextImpl(assemblyFactory, null,
resourceLoader);
+ xmlFactory = XMLInputFactory.newInstance();
+ registry = new StAXLoaderRegistryImpl();
+ registry.setMonitor(NULL_MONITOR);
+ }
+
+ protected XMLStreamReader getReader(String xml) throws XMLStreamException {
+ XMLStreamReader reader = xmlFactory.createXMLStreamReader(new
StringReader(xml));
+ reader.next();
+ return reader;
+ }
+
+ protected void registerLoader(AbstractLoader<?> loader) {
+ loader.setFactory(assemblyFactory);
+ loader.setRegistry(registry);
+ loader.start();
+ }
+}
Propchange:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/LoaderTestSupport.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
