Author: jsdelfino
Date: Sun Sep 21 14:13:32 2008
New Revision: 697611
URL: http://svn.apache.org/viewvc?rev=697611&view=rev
Log:
Removed unknown element from readattributes test case, as that test case is not
supposed to test that. Fixed spelling mistake in test class name.
Added:
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestReadWriteUnknownElement.java
Modified:
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
Modified:
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java?rev=697611&r1=697610&r2=697611&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
(original)
+++
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
Sun Sep 21 14:13:32 2008
@@ -51,9 +51,7 @@
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\">"+
- "<service name=\"CalculatorService\"
promote=\"CalculatorServiceComponent\">"+
- "<interface.java
xmlns=\"http://www.osoa.org/xmlns/sca/1.0\";
interface=\"calculator.CalculatorService\" />"+
- "</service>"+
+ "<service name=\"CalculatorService\"
promote=\"CalculatorServiceComponent\" />"+
"<component name=\"CalculatorServiceComponent\"
customAttribute=\"customValue\">"+
"<reference name=\"addService\"
target=\"AddServiceComponent\" />"+
"<reference name=\"subtractService\"
target=\"SubtractServiceComponent\" />"+
@@ -101,6 +99,7 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream();
staxProcessor.write(composite, bos);
+ System.out.println(XML);
System.out.println(bos.toString());
assertEquals(XML, bos.toString());
Added:
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestReadWriteUnknownElement.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestReadWriteUnknownElement.java?rev=697611&view=auto
==============================================================================
---
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestReadWriteUnknownElement.java
(added)
+++
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestReadWriteUnknownElement.java
Sun Sep 21 14:13:32 2008
@@ -0,0 +1,53 @@
+package org.apache.tuscany.sca.assembly.xml;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+
+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.StAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.junit.Test;
+
+public class TestReadWriteUnknownElement extends TestCase {
+
+ private XMLInputFactory inputFactory;
+ 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\"><service name=\"CalculatorService\"
promote=\"CalculatorServiceComponent\"><interface.java
xmlns=\"http://www.osoa.org/xmlns/sca/1.0\";
interface=\"calculator.CalculatorService\" /></service><component
name=\"CalculatorServiceComponent\"><reference name=\"addService\"
target=\"AddServiceComponent\" /><reference name=\"subtractService\"
target=\"SubtractServiceComponent\" /><reference name=\"multiplyService\"
target=\"MultiplyServiceComponent\" /><reference name=\"divideService\"
target=\"DivideServiceComponent\" /></component><component
name=\"AddServiceComponent\" /><component name=\"SubtractServiceComponent\"
/><component name=\"MultiplyServiceComponent\" /><component
name=\"DivideServiceComponent\" /><x:unknownElement xmlns:x=\"http://x\";
uknAttr=\"attribute1\"><x:subU
nknownElement1 uknAttr1=\"attribute1\" /><x:subUnknownElement2
/></x:unknownElement></composite>";
+ private ExtensibleStAXArtifactProcessor staxProcessor;
+
+ @Override
+ public void setUp() throws Exception {
+ ExtensionPointRegistry extensionPoints = new
DefaultExtensionPointRegistry();
+ inputFactory = XMLInputFactory.newInstance();
+ StAXArtifactProcessorExtensionPoint staxProcessors =
extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+ staxProcessor = new
ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(),
XMLOutputFactory.newInstance(), null);
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ }
+
+ @Test
+ public void testReadWriteComposite() throws Exception{
+ InputStream is =
getClass().getResourceAsStream("Calculator.composite");
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
+ Composite composite = (Composite)staxProcessor.read(reader);
+ assertNotNull(composite);
+
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ staxProcessor.write(composite, bos);
+ System.out.println(bos.toString());
+ assertEquals(XML,bos.toString());
+ bos.close();
+
+ is.close();
+ }
+
+}
Modified:
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java?rev=697611&r1=697610&r2=697611&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
(original)
+++
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
Sun Sep 21 14:13:32 2008
@@ -46,7 +46,6 @@
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.definitions.SCADefinitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;
Modified:
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java?rev=697611&r1=697610&r2=697611&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
(original)
+++
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
Sun Sep 21 14:13:32 2008
@@ -49,7 +49,6 @@
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.definitions.SCADefinitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
import org.apache.tuscany.sca.monitor.impl.DefaultMonitorFactoryImpl;
