summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml')
-rw-r--r--branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java (renamed from branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java)6
-rw-r--r--branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java (renamed from branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java)117
-rw-r--r--branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java3
3 files changed, 52 insertions, 74 deletions
diff --git a/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java b/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java
index a205e16676..779f3cd352 100644
--- a/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
+++ b/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java
@@ -40,7 +40,7 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-public class ReadWriteAnyElementTestCase {
+public class AnyElementReadWriteTestCase {
private static final String XML_RECURSIVE_EXTENDED_ELEMENT =
"<?xml version='1.0' encoding='UTF-8'?>" +
"<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://temp\" name=\"RecursiveExtendedElement\">" +
@@ -111,8 +111,8 @@ public class ReadWriteAnyElementTestCase {
staxProcessor.write(composite, bos);
// used for debug comparison
- //System.out.println(XML_UNKNOWN_IMPL);
- //System.out.println(bos.toString());
+ System.out.println(XML_UNKNOWN_IMPL);
+ System.out.println(bos.toString());
assertEquals(XML_UNKNOWN_IMPL, bos.toString());
bos.close();
diff --git a/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java b/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
index 0930146a9d..387405fd8d 100644
--- a/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
+++ b/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
@@ -19,123 +19,100 @@
package org.apache.tuscany.sca.assembly.xml;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
import java.io.ByteArrayOutputStream;
-import java.io.StringReader;
+import java.io.InputStream;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamReader;
+import junit.framework.TestCase;
+
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.junit.Ignore;
-import org.junit.Test;
/**
* Test reading SCA XML assemblies.
*
* @version $Rev$ $Date$
*/
-public class ReadWriteAnyAttributeTestCase {
+public class ReadWriteAttributeTestCase extends TestCase {
+
+ private XMLInputFactory inputFactory;
+ private ExtensibleStAXArtifactProcessor staxProcessor;
+
private static final QName ATTRIBUTE = new QName("http://test", "customAttribute");
// implementation.java for CalculatorServiceComponent appears in a strange place as the
// java implementation extension is not loaded and hence they are loaded as any elements
private static final String XML = "<?xml version='1.0' encoding='UTF-8'?>"+
- "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" " +
- "xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\" " +
- "targetNamespace=\"http://calc\" " +
- "name=\"Calculator\">"+
- "<component name=\"AddServiceComponent\" xmlns:test=\"http://test\" test:customAttribute=\"customValue\">"+
+ "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://calc\" name=\"Calculator\">"+
+ "<service name=\"CalculatorService\" promote=\"CalculatorServiceComponent\">"+
+ "<interface.java interface=\"calculator.CalculatorService\" />"+
+ "</service>"+
+ "<component name=\"CalculatorServiceComponent\" customAttribute=\"customValue\">"+
+ "<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>";
-
- private XMLInputFactory inputFactory;
- private ExtensibleStAXArtifactProcessor staxProcessor;
-
-
- /**
- * Initialize the test environment
- * This takes care to register attribute processors when provided
- *
- * @param attributeProcessor
- * @throws Exception
- */
- private void init(StAXAttributeProcessor<?> attributeProcessor) throws Exception {
+ @Override
+ public void setUp() throws Exception {
ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
inputFactory = XMLInputFactory.newInstance();
StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
- if(attributeProcessor != null) {
- StAXAttributeProcessorExtensionPoint staxAttributeProcessors = extensionPoints.getExtensionPoint(StAXAttributeProcessorExtensionPoint.class);
- staxAttributeProcessors.addArtifactProcessor(attributeProcessor);
- }
+ StAXAttributeProcessorExtensionPoint staxAttributeProcessors = extensionPoints.getExtensionPoint(StAXAttributeProcessorExtensionPoint.class);
+ staxAttributeProcessors.addArtifactProcessor(new TestAttributeProcessor());
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance(), null);
+ }
+ @Override
+ public void tearDown() throws Exception {
}
- /**
- * Read and Write a composite that has a extended attribute
- * and a particular attribute processor
- * @throws Exception
- */
- @Test
- @Ignore
- public void testReadWriteCompositeWithAttributeProcessor() throws Exception {
- init(new TestAttributeProcessor());
-
- XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(XML));
+ public void testReadComposite() throws Exception {
+ InputStream is = getClass().getResourceAsStream("CalculatorExtended.composite");
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
Composite composite = (Composite) staxProcessor.read(reader);
assertNotNull(composite);
- reader.close();
-
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- staxProcessor.write(composite, bos);
-
- // used for debug comparison
- System.out.println(XML);
- System.out.println(bos.toString());
-
-
- assertEquals(XML, bos.toString());
+ is.close();
}
-
- /**
- * Read and Write a composite that has a extended attribute
- * but no particular processor for it
- * @throws Exception
- */
- @Test
- public void testDefaultReadWriteComposite() throws Exception {
- init(null);
-
- XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(XML));
+ public void testWriteComposite() throws Exception {
+ InputStream is = getClass().getResourceAsStream("CalculatorExtended.composite");
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
Composite composite = (Composite) staxProcessor.read(reader);
assertNotNull(composite);
- reader.close();
+ is.close();
ByteArrayOutputStream bos = new ByteArrayOutputStream();
staxProcessor.write(composite, bos);
+ System.out.println(bos.toString());
- // used for debug comparison
- System.out.println(XML);
- System.out.println(bos.toString());
-
-
- assertEquals(XML, bos.toString());
+ assertEquals(XML, bos.toString());
}
}
diff --git a/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java b/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
index 65bbf75cdf..691145a30e 100644
--- a/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
+++ b/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
@@ -47,7 +47,8 @@ public class TestAttributeProcessor extends BaseStAXArtifactProcessor implements
}
public void write(String value, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
- writer.writeAttribute(ATTRIBUTE.getPrefix(), ATTRIBUTE.getNamespaceURI(), ATTRIBUTE.getLocalPart(), value);
+ writer.setPrefix(ATTRIBUTE.getPrefix(), ATTRIBUTE.getNamespaceURI());
+ writer.writeAttribute(ATTRIBUTE.getLocalPart(), value);
}
public Class<String> getModelType() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 05:21:36 +0000