CVS Update: xmlpull-api-v1/addons/java/dom2_builder/src/META-INF
Aleksander Andrzej Slominski <[email protected]> Mon, 25 Jan 2010 11:20:34 -0500 (EST)
| Newsgroups | gmane.text.xml.xmlpull.devel |
|---|---|
| Message-ID | <[email protected]> |
aslom 10/01/25 11:20:34
Modified: . build.xml
src/java/tests/org/xmlpull/v1/tests TestSerialize.java
addons/java/sax2_driver/src/org/xmlpull/v1/sax2 Driver.java
Added: . xmlpull-api-v1.javaproj
addons/java/dom2_builder/src/META-INF MANIFEST.MF
Log:
added test for serializer bug
Revision Changes Path
1.36 +2 -2 xmlpull-api-v1/build.xml
Index: build.xml
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/build.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -t -w -r1.35 -r1.36
--- build.xml 29 Nov 2006 21:10:19 -0000 1.35
+++ build.xml 25 Jan 2010 16:20:34 -0000 1.36
@@ -10,8 +10,8 @@
<!-- set global properties for this build -->
<property name="name" value="XmlPull"/>
- <property name="year" value="2006"/>
- <property name="version" value="1_2-RC1"/>
+ <property name="year" value="2008"/>
+ <property name="version" value="1_2-RC2"/>
<property name="xmlpull_version" value="xmlpull_${version}"/>
<property name="xmlpull_tag" value="XMLPULL_${version}"/>
<property name="copyright"
1.1 xmlpull-api-v1/xmlpull-api-v1.javaproj
Index: xmlpull-api-v1.javaproj
===================================================================
<javaProject>
<guid>{D50F9E77-24A0-4E55-86EB-68AD62C4AEDC}</guid>
<includedFiles>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>addons\java\parser_pool\src\org\xmlpull\v1\parser_pool\XmlPullParserPool.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\api\org\xmlpull\v1\XmlPullParser.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\api\org\xmlpull\v1\XmlPullParserException.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\api\org\xmlpull\v1\XmlPullParserFactory.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\api\org\xmlpull\v1\XmlSerializer.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\samples\BestDeal.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\samples\ChannelPullHandler.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\samples\CloneableFileReader.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\samples\eventlist\EventList.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\samples\MyXmlPullApp.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\samples\MyXmlWriteApp.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\samples\Roundtrip.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\samples\RSSReader.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\samples\SimpleXmlPullApp.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\samples\XmlCompare.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\samples\XmlPullCount.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\samples\XMLRPCDecoder.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\PackageTests.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestAttributes.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestBootstrapXmlTests.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestCdsect.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestEntityReplacement.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestEolNormalization.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestEvent.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestFactory.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestMisc.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestProcessDocdecl.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestSerialize.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestSerializeWithNs.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestSetInput.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestSimple.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestSimpleProcessDocdecl.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestSimpleToken.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestSimpleValidation.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestSimpleWithNs.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestToken.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestXmlCdsect.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestXmlSimple.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\TestXmlTypical.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\UtilTestCase.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COMPILE</buildAction>
<relativePath>src\java\tests\org\xmlpull\v1\tests\XmlTestCase.java</relativePath>
</javaFile>
<javaFile>
<buildAction>COPY</buildAction>
<packageNameForResource>org.xmlpull.v1.tests.xml</packageNameForResource>
<relativePath>src\xml\tests\cdsect.xml</relativePath>
</javaFile>
<javaFile>
<buildAction>COPY</buildAction>
<packageNameForResource>org.xmlpull.v1.tests.xml</packageNameForResource>
<relativePath>src\xml\tests\cdsect_eol.xml</relativePath>
</javaFile>
<javaFile>
<buildAction>COPY</buildAction>
<packageNameForResource>org.xmlpull.v1.tests.xml</packageNameForResource>
<relativePath>src\xml\tests\cdsect_mixed.xml</relativePath>
</javaFile>
<javaFile>
<buildAction>COPY</buildAction>
<packageNameForResource>org.xmlpull.v1.tests.xml</packageNameForResource>
<relativePath>src\xml\tests\cdsect_more.xml</relativePath>
</javaFile>
<javaFile>
<buildAction>COPY</buildAction>
<packageNameForResource>org.xmlpull.v1.tests.xml</packageNameForResource>
<relativePath>src\xml\tests\simple.xml</relativePath>
</javaFile>
<javaFile>
<buildAction>COPY</buildAction>
<packageNameForResource>org.xmlpull.v1.tests.xml</packageNameForResource>
<relativePath>src\xml\tests\simple2.xml</relativePath>
</javaFile>
<javaFile>
<buildAction>COPY</buildAction>
<packageNameForResource>org.xmlpull.v1.tests.xml</packageNameForResource>
<relativePath>src\xml\tests\typical.xml</relativePath>
</javaFile>
</includedFiles>
<name>xmlpull_api_v1</name>
<projectReferences/>
<references>
<classpathReference>
<relativePath>lib\junit\junit3.8.1.jar</relativePath>
<relativeSourcepath>..\..\Offnet\JUnit\junit3.8.1\src\</relativeSourcepath>
</classpathReference>
</references>
<startingPoints>
<startingPoint>
<commandLineArguments></commandLineArguments>
<name>org.xmlpull.v1.tests.PackageTests</name>
<target>org.xmlpull.v1.tests.PackageTests</target>
<vmOtherOptions></vmOtherOptions>
<workingDir></workingDir>
</startingPoint>
</startingPoints>
<targetVM>1.5</targetVM>
</javaProject>
1.10 +38 -0 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSerialize.java
Index: TestSerialize.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSerialize.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -t -w -r1.9 -r1.10
--- TestSerialize.java 28 Feb 2005 20:18:30 -0000 1.9
+++ TestSerialize.java 25 Jan 2010 16:20:34 -0000 1.10
@@ -284,5 +284,43 @@
fail("expected to fail as zero chartacter is illegal both in XML 1.0 and 1.1");
} catch(Exception e) {}
}
+
+
+ public void testSerializerAutoPrefixGeneration() throws Exception {
+ XmlSerializer ser = factory.newSerializer();
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ser.setOutput(baos, "UTF-8");
+ ser.startDocument("UTF-8", null);
+ ser.setPrefix("n1", "ns1");
+ ser.startTag("", "foo");
+ ser.attribute("ns1", "id", "foo");
+ ser.attribute("ns2", "id", "foo");
+ ser.text("test");
+ ser.endTag("", "foo");
+ ser.endDocument();
+
+ byte[] binput = baos.toByteArray();
+ //System.out.println("binput="+new String(binput, "UTF8"));
+ //expected something like <foo n1:id="foo" n2:id="foo" xmlns:n1="ns1" xmlns:n2="ns2">test</foo>
+ xpp.setInput(new ByteArrayInputStream( binput ), "UTF-8" );
+ assertEquals("UTF-8", xpp.getInputEncoding());
+
+ xpp.setInput(new ByteArrayInputStream( binput ), "UTF-8" );
+ assertEquals("UTF-8", xpp.getInputEncoding());
+
+ //xpp.setInput(new StringReader( "<foo/>" ) );
+ checkParserState(xpp, 0, XmlPullParser.START_DOCUMENT, null, null, false, -1);
+ xpp.next();
+ checkParserState(xpp, 1, XmlPullParser.START_TAG, "foo", null, false /*empty*/, 4);
+ xpp.next();
+ checkParserState(xpp, 1, XmlPullParser.TEXT, null, "test", false, -1);
+ assertEquals(false, xpp.isWhitespace());
+ xpp.next();
+ checkParserState(xpp, 1, XmlPullParser.END_TAG, "foo", null, false, -1);
+ xpp.next();
+ checkParserState(xpp, 0, XmlPullParser.END_DOCUMENT, null, null, false, -1);
+ }
+
}
1.7 +1 -1 xmlpull-api-v1/addons/java/sax2_driver/src/org/xmlpull/v1/sax2/Driver.java
Index: Driver.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/sax2_driver/src/org/xmlpull/v1/sax2/Driver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -t -w -r1.6 -r1.7
--- Driver.java 3 Nov 2006 15:53:56 -0000 1.6
+++ Driver.java 25 Jan 2010 16:20:34 -0000 1.7
@@ -355,7 +355,7 @@
try {
if(pp.getEventType() != XmlPullParser.START_TAG) {
throw new SAXException(
- "start tag must be read before skiping subtree"+pp.getPositionDescription());
+ "start tag must be read before skipping subtree"+pp.getPositionDescription());
}
final int[] holderForStartAndLength = new int[2];
final StringBuffer rawName = new StringBuffer(16);
1.1 xmlpull-api-v1/addons/java/dom2_builder/src/META-INF/MANIFEST.MF
Index: MANIFEST.MF
===================================================================
Manifest-Version: 1.0
Class-Path:
------------------------------------
Yahoo! Groups Links
<*> To visit your group on the web, go to:
http://groups.yahoo.com/group/xmlpull-dev/
<*> Your email settings:
Individual Email | Traditional
<*> To change settings online go to:
http://groups.yahoo.com/group/xmlpull-dev/join
(Yahoo! ID required)
<*> To change settings via email:
[email protected]
[email protected]
<*> To unsubscribe from this group, send an email to:
[email protected]
<*> Your use of Yahoo! Groups is subject to:
http://docs.yahoo.com/info/terms/