Return-Path: Delivered-To: apmail-tuscany-commits-archive@www.apache.org Received: (qmail 85373 invoked from network); 4 Sep 2009 00:03:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Sep 2009 00:03:07 -0000 Received: (qmail 26049 invoked by uid 500); 4 Sep 2009 00:03:07 -0000 Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org Received: (qmail 26013 invoked by uid 500); 4 Sep 2009 00:03:07 -0000 Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tuscany.apache.org Delivered-To: mailing list commits@tuscany.apache.org Received: (qmail 26004 invoked by uid 99); 4 Sep 2009 00:03:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Sep 2009 00:03:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Sep 2009 00:02:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D32122388872; Fri, 4 Sep 2009 00:02:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r811176 - in /tuscany/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http: operationselector/jsonrpc/impl/ wireformat/jsonrpc/impl/ Date: Fri, 04 Sep 2009 00:02:35 -0000 To: commits@tuscany.apache.org From: lresende@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090904000235.D32122388872@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: lresende Date: Fri Sep 4 00:02:35 2009 New Revision: 811176 URL: http://svn.apache.org/viewvc?rev=811176&view=rev Log: TUSCANY-3259 - Adding new tests to verify operationSelector and wireFormat elements are being written to composite Modified: tuscany/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java tuscany/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java Modified: tuscany/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java?rev=811176&r1=811175&r2=811176&view=diff ============================================================================== --- tuscany/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java (original) +++ tuscany/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java Fri Sep 4 00:02:35 2009 @@ -22,9 +22,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import java.io.ByteArrayOutputStream; import java.io.StringReader; import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamReader; import org.apache.tuscany.sca.assembly.Composite; @@ -33,7 +35,6 @@ import org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelector; import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint; 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.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.core.UtilityExtensionPoint; @@ -52,26 +53,28 @@ public class JSONRPCOperationSelectorProcessorTestCase { public static final String COMPOSITE_WITH_OPERATION_SELECTOR = - "" - + "" - + " " - + " " - + " " - + " " - + " " - + " " - + " " - + " " + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + ""; private static XMLInputFactory inputFactory; - private static StAXArtifactProcessor staxProcessor; + private static XMLOutputFactory outputFactory; + private static ExtensibleStAXArtifactProcessor staxProcessor; private static Monitor monitor; @BeforeClass public static void setUp() throws Exception { DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); inputFactory = XMLInputFactory.newInstance(); + outputFactory = XMLOutputFactory.newInstance(); // Create a monitor UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl(); @@ -80,7 +83,7 @@ utilities.addUtility(monitorFactory); } StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints); - staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, monitor); + staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, monitor); } @@ -100,5 +103,24 @@ OperationSelector operationSelector = binding.getOperationSelector(); assertEquals(JSONRPCOperationSelector.class, operationSelector.getClass().getInterfaces()[0]); - } + } + + @Test + public void testWriteWireFormat() throws Exception { + XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(COMPOSITE_WITH_OPERATION_SELECTOR)); + + 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(COMPOSITE_WITH_OPERATION_SELECTOR); + // System.out.println(bos.toString()); + + assertEquals(COMPOSITE_WITH_OPERATION_SELECTOR, bos.toString()); + + } } Modified: tuscany/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java?rev=811176&r1=811175&r2=811176&view=diff ============================================================================== --- tuscany/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java (original) +++ tuscany/branches/sca-java-1.x/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java Fri Sep 4 00:02:35 2009 @@ -22,9 +22,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import java.io.ByteArrayOutputStream; import java.io.StringReader; import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamReader; import org.apache.tuscany.sca.assembly.Composite; @@ -52,26 +54,28 @@ public class JSONRPCWireFormatProcessorTestCase { public static final String COMPOSITE_WITH_WIRE_FORMAT = - "" - + "" - + " " - + " " - + " " - + " " - + " " - + " " - + " " - + " " - + ""; - + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + ""; + private static XMLInputFactory inputFactory; - private static StAXArtifactProcessor staxProcessor; + private static XMLOutputFactory outputFactory; + private static ExtensibleStAXArtifactProcessor staxProcessor; private static Monitor monitor; @BeforeClass public static void setUp() throws Exception { DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); inputFactory = XMLInputFactory.newInstance(); + outputFactory = XMLOutputFactory.newInstance(); // Create a monitor UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); MonitorFactory monitorFactory = new DefaultMonitorFactoryImpl(); @@ -80,7 +84,7 @@ utilities.addUtility(monitorFactory); } StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(extensionPoints); - staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, monitor); + staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, monitor); } @@ -104,5 +108,24 @@ WireFormat responseWireFormat = binding.getResponseWireFormat(); assertEquals(JSONRPCWireFormat.class, responseWireFormat.getClass().getInterfaces()[0]); + } + + @Test + public void testWriteWireFormat() throws Exception { + XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(COMPOSITE_WITH_WIRE_FORMAT)); + + 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(COMPOSITE_WITH_WIRE_FORMAT); + // System.out.println(bos.toString()); + + assertEquals(COMPOSITE_WITH_WIRE_FORMAT, bos.toString()); + } }