CVS Update: xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests
Aleksander Andrzej Slominski <[email protected]> Mon, 9 Feb 2004 01:32:49 -0500 (EST)
| Newsgroups | gmane.text.xml.xmlpull.devel |
|---|---|
| Message-ID | <[email protected]> |
aslom 04/02/09 01:32:49
Modified: src/java/tests/org/xmlpull/v1/tests PackageTests.java
TestSerialize.java TestSerializeWithNs.java
Log:
fixed serializer test to correclty check that serializing of <32 chars
except for \r\n\t must fail in XML 1.0
Revision Changes Path
1.19 +26 -21 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/PackageTests.java
Index: PackageTests.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/PackageTests.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -t -w -r1.18 -r1.19
--- PackageTests.java 12 Jan 2004 16:20:59 -0000 1.18
+++ PackageTests.java 9 Feb 2004 06:32:49 -0000 1.19
@@ -12,6 +12,11 @@
import org.xmlpull.v1.XmlPullParserFactory;
import org.xmlpull.v1.XmlSerializer;
+// -server -Dorg.xmlpull.v1.XmlPullParserFactory=org.xmlpull.v1.xni2xmlpull1.X2ParserFactory
+// -Dorg.xmlpull.v1.XmlPullParserFactory=org.xmlpull.v1.xni2xmlpull1.X2ParserFactory
+// -Dorg.xmlpull.v1.XmlPullParserFactory=org.xmlpull.mxp1.MXParserFactory
+// -Dorg.xmlpull.v1.tests=org.xmlpull.mxp1.MXParser,org.xmlpull.mxp1_serializer.MXSerializer
+
/**
* TODO: add tests for
* <pre>
1.7 +25 -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.6
retrieving revision 1.7
diff -u -b -t -w -r1.6 -r1.7
--- TestSerialize.java 20 Jan 2004 23:44:26 -0000 1.6
+++ TestSerialize.java 9 Feb 2004 06:32:49 -0000 1.7
@@ -218,8 +218,33 @@
ser.startDocument("UTF-8", null);
ser.startTag("", "foo");
String s = "test\u0008\t\r\n";
+ try {
ser.attribute(null, "att", s);
+ fail("expected to fail for control character (<32)");
+ } catch(IllegalArgumentException e) {
+ } catch(IllegalStateException e){
+ }
+
+ ser = factory.newSerializer();
+ baos = new ByteArrayOutputStream();
+ ser.setOutput(baos, "UTF-8");
+ ser.startDocument("UTF-8", null);
+ ser.startTag("", "foo");
+ try {
ser.text(s);
+ } catch(IllegalArgumentException e) {
+ } catch(IllegalStateException e){
+ }
+
+ ser = factory.newSerializer();
+ baos = new ByteArrayOutputStream();
+ ser.setOutput(baos, "UTF-8");
+ ser.startDocument("UTF-8", null);
+ ser.startTag("", "foo");
+ s = "test\u0009\t\r\n";
+ ser.attribute(null, "att", s);
+ ser.text(s);
+
ser.endTag("", "foo");
ser.endDocument();
1.19 +14 -13 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSerializeWithNs.java
Index: TestSerializeWithNs.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSerializeWithNs.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -t -w -r1.18 -r1.19
--- TestSerializeWithNs.java 12 Jan 2004 16:20:59 -0000 1.18
+++ TestSerializeWithNs.java 9 Feb 2004 06:32:49 -0000 1.19
@@ -264,51 +264,52 @@
String serialized = sw.toString();
//System.out.println(getClass()+" serialized="+serialized);
xpp.setInput(new StringReader(serialized));
- xpp.setFeature(xpp.FEATURE_PROCESS_NAMESPACES, true);
+ xpp.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
- checkParserStateNs(xpp, 0, xpp.START_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.START_DOCUMENT, null, 0, null, null, null, false, -1);
xpp.nextToken();
- checkParserStateNs(xpp, 0, xpp.DOCDECL, null, 0, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.DOCDECL, null, 0, null, null, false, -1);
String gotDocdecl = xpp.getText();
if(gotDocdecl != null) {
assertEquals(printable(docdecl), printable(gotDocdecl));
}
xpp.nextToken();
- checkParserStateNs(xpp, 0, xpp.PROCESSING_INSTRUCTION, null, 0, null, null, "pi test", false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.PROCESSING_INSTRUCTION, null, 0, null, null, "pi test", false, -1);
xpp.nextToken();
- if(xpp.getEventType() == xpp.IGNORABLE_WHITESPACE) {
+ if(xpp.getEventType() == XmlPullParser.IGNORABLE_WHITESPACE) {
String expectedIws = gatherTokenText(xpp, xpp.IGNORABLE_WHITESPACE, true);
assertEquals(printable(iws), printable(expectedIws));
}
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 0, "", "foo", null, false, 1);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "foo", null, false, 1);
checkAttribNs(xpp, 0, null, "", "attrName", attrVal);
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.ENTITY_REF, null, 0, null, "amp", "&", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.ENTITY_REF, null, 0, null, "amp", "&", false, -1);
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.CDSECT, null, 0, null, null, cdsect, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.CDSECT, null, 0, null, null, cdsect, false, -1);
assertEquals(false, xpp.isWhitespace());
xpp.nextToken();
- checkParserStateNs(xpp, 2, xpp.START_TAG, 2, "uri1", "bar", false, 0);
+ checkParserStateNs(xpp, 2, XmlPullParser.START_TAG, 2, "uri1", "bar", false, 0);
- String gotText = nextTokenGathered(xpp, xpp.TEXT, false);
+ String gotText = nextTokenGathered(xpp, XmlPullParser.TEXT, false);
+ //System.out.println(getClass()+" text="+printable(text)+" got="+printable(gotText));
assertEquals(printable(text), printable(gotText));
//xpp.nextToken();
- checkParserStateNs(xpp, 2, xpp.COMMENT, null, 2, null, null, comment, false, -1);
+ checkParserStateNs(xpp, 2, XmlPullParser.COMMENT, null, 2, null, null, comment, false, -1);
xpp.nextToken();
- checkParserStateNs(xpp, 2, xpp.END_TAG, 2, "uri1", "bar", false, -1);
+ checkParserStateNs(xpp, 2, XmlPullParser.END_TAG, 2, "uri1", "bar", false, -1);
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.END_TAG, 0, "", "foo", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, 0, "", "foo", false, -1);
}
Yahoo! Groups Links
<*> To visit your group on the web, go to:
http://groups.yahoo.com/group/xmlpull-dev/
<*> 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/