Modified: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLHelperTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLHelperTestCase.java?view=diff&rev=509148&r1=509147&r2=509148 ============================================================================== --- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLHelperTestCase.java (original) +++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLHelperTestCase.java Mon Feb 19 02:32:13 2007 @@ -25,11 +25,14 @@ import java.util.HashMap; import java.util.Map; -import org.apache.tuscany.sdo.util.SDOUtil; +import junit.framework.TestCase; -import commonj.sdo.helper.*; +import org.apache.tuscany.sdo.util.SDOUtil; -import junit.framework.TestCase; +import commonj.sdo.helper.HelperContext; +import commonj.sdo.helper.XMLDocument; +import commonj.sdo.helper.XMLHelper; +import commonj.sdo.helper.XSDHelper; public class XMLHelperTestCase extends TestCase { @@ -52,6 +55,8 @@ // Populate the meta data for the test (Stock Quote) model define("/simpleWithChangeSummary.xsd"); + + define("/SequenceChangeSummary.xsd"); } protected void tearDown() throws Exception { @@ -72,9 +77,9 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream(); - // doc changes encoding (https://bugs.eclipse.org/bugs/show_bug.cgi?id=173681) // doc declares NameSpaces at root xmlh.save(xmlh.createDocument(doc.getRootObject(), doc.getRootElementURI(), doc.getRootElementName()), baos, options); + //xmlh.save(xmlh.createDocument(doc.getRootObject(), doc.getRootElementURI(), doc.getRootElementName()), System.out, options); assertEquals(baos.toString(), formetted); } @@ -109,5 +114,48 @@ MARGIN+INDENT+INDENT+ "</cs:stockQuote>" +LINE_BREAK+ MARGIN+INDENT+ "</changes>" +LINE_BREAK+ MARGIN+ "</cs:stockQuote>"); + } + + public void testSaveMixedOutputStreamObject() throws IOException { + format("/mixedChangeSummary.xml", +MARGIN+ "<?xml version=\"1.0\" encoding=\"ASCII\"?>" +LINE_BREAK+ +MARGIN+ "<cs:stockQuote xmlns:cs=\"http://www.example.com/sequenceCS\";><changes create=\"#//quotes[3] #//quotes[4]\" delete=\"#//changes/stockQuote[1]/quotes[2]\" logging=\"false\" xmlns:sdo=\"commonj.sdo\">" +LINE_BREAK+ +INDENT+ "<cs:stockQuote sdo:ref=\"#/stockQuote\">" +LINE_BREAK+ +INDENT+INDENT+ "<symbol>fbnt</symbol>" +LINE_BREAK+ +INDENT+INDENT+ "<companyName>FlyByNightTechnology</companyName>" +LINE_BREAK+ +INDENT+INDENT+ "<price>1000.0</price>" +LINE_BREAK+ +INDENT+INDENT+ "<quotes sdo:ref=\"#//quotes[1]\" />" +LINE_BREAK+ +INDENT+INDENT+ "<quotes><price>2000.0</price><quotes><price>2000.99</price></quotes></quotes>" +LINE_BREAK+ +INDENT+INDENT+ "<quotes sdo:ref=\"#//quotes[2]\" />" +LINE_BREAK+ +INDENT+ "</cs:stockQuote>" +LINE_BREAK+ +"</changes><symbol>FBNT</symbol><companyName>FlyByNightTechnology</companyName><price>999.0</price><quotes><price>1500.0</price></quotes><quotes><price>2500.0</price></quotes><volume>1000.0</volume><quotes><price>3000.0</price></quotes><quotes><price>4000.0</price></quotes></cs:stockQuote>"); + } + + public void testOpenMixedOutputStreamObject() throws IOException { + format("/openChangeSummary.xml", +MARGIN+ "<?xml version=\"1.0\" encoding=\"ASCII\"?>" +LINE_BREAK+ +MARGIN+ "<cs:openQuote xmlns:cs=\"http://www.example.com/sequenceCS\"; xmlns:open=\"http://www.example.com/open\";>" +LINE_BREAK+ +MARGIN+INDENT+ "<symbol>FBNT</symbol>" +LINE_BREAK+ +MARGIN+INDENT+ "<open:openStockQuote>" +LINE_BREAK+ +MARGIN+INDENT+INDENT+ "<symbol>1500.0</symbol>" +LINE_BREAK+ +MARGIN+INDENT+ "</open:openStockQuote>" +LINE_BREAK+ +MARGIN+INDENT+ "<open:openStockQuote>" +LINE_BREAK+ +MARGIN+INDENT+INDENT+ "<symbol>2500.0</symbol>" +LINE_BREAK+ +MARGIN+INDENT+ "</open:openStockQuote>" +LINE_BREAK+ +MARGIN+INDENT+ "<open:openStockQuote>" +LINE_BREAK+ +MARGIN+INDENT+INDENT+ "<symbol>3000.0</symbol>" +LINE_BREAK+ +MARGIN+INDENT+ "</open:openStockQuote>" +LINE_BREAK+ +MARGIN+INDENT+ "<open:openStockQuote>" +LINE_BREAK+ +MARGIN+INDENT+INDENT+ "<symbol>4000.0</symbol>" +LINE_BREAK+ +MARGIN+INDENT+ "</open:openStockQuote>" +LINE_BREAK+ +MARGIN+INDENT+ "<changes create=\"#//open:openStockQuote[3] #//open:openStockQuote[4]\" delete=\"#//changes/openQuote[1]/open:openStockQuote[2]\" logging=\"false\" xmlns:sdo=\"commonj.sdo\">" +LINE_BREAK+ +MARGIN+INDENT+INDENT+ "<cs:openQuote sdo:ref=\"#/openQuote\">" +LINE_BREAK+ +MARGIN+INDENT+INDENT+INDENT+ "<symbol>fbnt</symbol>" +LINE_BREAK+ +MARGIN+INDENT+INDENT+INDENT+ "<open:openStockQuote sdo:ref=\"#//open:openStockQuote[1]\" />" +LINE_BREAK+ +MARGIN+INDENT+INDENT+INDENT+ "<open:openStockQuote><symbol>2000.0</symbol><open:openStockQuote><symbol>2000.99</symbol></open:openStockQuote></open:openStockQuote>" +LINE_BREAK+ +MARGIN+INDENT+INDENT+INDENT+ "<open:openStockQuote sdo:ref=\"#//open:openStockQuote[2]\" />" +LINE_BREAK+ +MARGIN+INDENT+INDENT+ "</cs:openQuote>" +LINE_BREAK+ +MARGIN+INDENT+ "</changes>" +LINE_BREAK+ +MARGIN+ "</cs:openQuote>"); } }
Added: incubator/tuscany/java/sdo/impl/src/test/resources/SequenceChangeSummary.xsd URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/resources/SequenceChangeSummary.xsd?view=auto&rev=509148 ============================================================================== --- incubator/tuscany/java/sdo/impl/src/test/resources/SequenceChangeSummary.xsd (added) +++ incubator/tuscany/java/sdo/impl/src/test/resources/SequenceChangeSummary.xsd Mon Feb 19 02:32:13 2007 @@ -0,0 +1,48 @@ +<?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. + --> +<schema xmlns="http://www.w3.org/2001/XMLSchema"; xmlns:sdo="commonj.sdo" xmlns:mixed="http://www.example.com/mixed"; xmlns:open="http://www.example.com/open"; targetNamespace="http://www.example.com/sequenceCS"; xmlns:cs="http://www.example.com/sequenceCS";> + + <import namespace="commonj.sdo" schemaLocation="sdoModel.xsd"/> + + <import namespace="http://www.example.com/mixed"; schemaLocation="mixed.xsd"/> + <import namespace="http://www.example.com/open"; schemaLocation="open.xsd"/> + + <complexType name="RootQuote"> + <complexContent> + <extension base="mixed:MixedQuote"> + <sequence> + <element name="changes" type="sdo:ChangeSummaryType"/> + </sequence> + </extension> + </complexContent> + </complexType> + + <element name="stockQuote" type="cs:RootQuote"/> + + <element name="openQuote"> + <complexType> + <complexContent> + <extension base="open:OpenQuote"> + <sequence> + <element name="changes" type="sdo:ChangeSummaryType"/> + </sequence> + </extension> + </complexContent> + </complexType> + </element> + +</schema> \ No newline at end of file Propchange: incubator/tuscany/java/sdo/impl/src/test/resources/SequenceChangeSummary.xsd ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sdo/impl/src/test/resources/SequenceChangeSummary.xsd ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/tuscany/java/sdo/impl/src/test/resources/SequenceChangeSummary.xsd ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: incubator/tuscany/java/sdo/impl/src/test/resources/mixedChangeSummary.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/resources/mixedChangeSummary.xml?view=auto&rev=509148 ============================================================================== --- incubator/tuscany/java/sdo/impl/src/test/resources/mixedChangeSummary.xml (added) +++ incubator/tuscany/java/sdo/impl/src/test/resources/mixedChangeSummary.xml Mon Feb 19 02:32:13 2007 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="ASCII"?> +<cs:stockQuote xmlns:cs="http://www.example.com/sequenceCS";><changes create="#//quotes[3] #//quotes[4]" delete="#//changes/stockQuote[1]/quotes[2]" logging="false" xmlns:sdo="commonj.sdo"> + <cs:stockQuote sdo:ref="#/stockQuote"> + <symbol>fbnt</symbol> + <companyName>FlyByNightTechnology</companyName> + <price>1000.0</price> + <quotes sdo:ref="#//quotes[1]" /> + <quotes><price>2000.0</price><quotes><price>2000.99</price></quotes></quotes> + <quotes sdo:ref="#//quotes[2]" /> + </cs:stockQuote> +</changes><symbol>FBNT</symbol><companyName>FlyByNightTechnology</companyName><price>999.0</price><quotes><price>1500.0</price></quotes><quotes><price>2500.0</price></quotes><volume>1000.0</volume><quotes><price>3000.0</price></quotes><quotes><price>4000.0</price></quotes></cs:stockQuote> \ No newline at end of file Propchange: incubator/tuscany/java/sdo/impl/src/test/resources/mixedChangeSummary.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sdo/impl/src/test/resources/mixedChangeSummary.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/tuscany/java/sdo/impl/src/test/resources/mixedChangeSummary.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: incubator/tuscany/java/sdo/impl/src/test/resources/mixedChangeSummaryUndone.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/resources/mixedChangeSummaryUndone.xml?view=auto&rev=509148 ============================================================================== --- incubator/tuscany/java/sdo/impl/src/test/resources/mixedChangeSummaryUndone.xml (added) +++ incubator/tuscany/java/sdo/impl/src/test/resources/mixedChangeSummaryUndone.xml Mon Feb 19 02:32:13 2007 @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="ASCII"?> +<cs:stockQuote xmlns:cs="http://www.example.com/sequenceCS";><changes logging="false" /><symbol>fbnt</symbol><companyName>FlyByNightTechnology</companyName><price>1000.0</price><quotes><price>1500.0</price></quotes><quotes><price>2000.0</price><quotes><price>2000.99</price></quotes></quotes><quotes><price>2500.0</price></quotes></cs:stockQuote> \ No newline at end of file Propchange: incubator/tuscany/java/sdo/impl/src/test/resources/mixedChangeSummaryUndone.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sdo/impl/src/test/resources/mixedChangeSummaryUndone.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/tuscany/java/sdo/impl/src/test/resources/mixedChangeSummaryUndone.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: incubator/tuscany/java/sdo/impl/src/test/resources/openChangeSummary.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/resources/openChangeSummary.xml?view=auto&rev=509148 ============================================================================== --- incubator/tuscany/java/sdo/impl/src/test/resources/openChangeSummary.xml (added) +++ incubator/tuscany/java/sdo/impl/src/test/resources/openChangeSummary.xml Mon Feb 19 02:32:13 2007 @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="ASCII"?> +<cs:openQuote xmlns:cs="http://www.example.com/sequenceCS"; xmlns:open="http://www.example.com/open";> + <symbol>FBNT</symbol> + <open:openStockQuote> + <symbol>1500.0</symbol> + </open:openStockQuote> + <open:openStockQuote> + <symbol>2500.0</symbol> + </open:openStockQuote> + <open:openStockQuote> + <symbol>3000.0</symbol> + </open:openStockQuote> + <open:openStockQuote> + <symbol>4000.0</symbol> + </open:openStockQuote> + <changes create="#//open:openStockQuote[3] #//open:openStockQuote[4]" delete="#//changes/openQuote[1]/open:openStockQuote[2]" logging="false" xmlns:sdo="commonj.sdo"> + <cs:openQuote sdo:ref="#/openQuote"> + <symbol>fbnt</symbol> + <open:openStockQuote sdo:ref="#//open:openStockQuote[1]" /> + <open:openStockQuote><symbol>2000.0</symbol><open:openStockQuote><symbol>2000.99</symbol></open:openStockQuote></open:openStockQuote> + <open:openStockQuote sdo:ref="#//open:openStockQuote[2]" /> + </cs:openQuote> + </changes> +</cs:openQuote> \ No newline at end of file Propchange: incubator/tuscany/java/sdo/impl/src/test/resources/openChangeSummary.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sdo/impl/src/test/resources/openChangeSummary.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/tuscany/java/sdo/impl/src/test/resources/openChangeSummary.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: incubator/tuscany/java/sdo/impl/src/test/resources/openChangeSummaryUndone.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/resources/openChangeSummaryUndone.xml?view=auto&rev=509148 ============================================================================== --- incubator/tuscany/java/sdo/impl/src/test/resources/openChangeSummaryUndone.xml (added) +++ incubator/tuscany/java/sdo/impl/src/test/resources/openChangeSummaryUndone.xml Mon Feb 19 02:32:13 2007 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="ASCII"?> +<cs:openQuote xmlns:cs="http://www.example.com/sequenceCS"; xmlns:open="http://www.example.com/open";> + <symbol>fbnt</symbol> + <open:openStockQuote> + <symbol>1500.0</symbol> + </open:openStockQuote> + <open:openStockQuote> + <symbol>2000.0</symbol> + <open:openStockQuote> + <symbol>2000.99</symbol> + </open:openStockQuote> + </open:openStockQuote> + <open:openStockQuote> + <symbol>2500.0</symbol> + </open:openStockQuote> + <changes logging="false" /> +</cs:openQuote> \ No newline at end of file Propchange: incubator/tuscany/java/sdo/impl/src/test/resources/openChangeSummaryUndone.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sdo/impl/src/test/resources/openChangeSummaryUndone.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/tuscany/java/sdo/impl/src/test/resources/openChangeSummaryUndone.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
