CVS Update: xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests
Aleksander Andrzej Slominski <[email protected]> Mon, 28 Feb 2005 15:18:31 -0500 (EST)
| Newsgroups | gmane.text.xml.xmlpull.devel |
|---|---|
| Message-ID | <[email protected]> |
aslom 05/02/28 15:18:31
Modified: addons/java/dom2_builder/src/org/xmlpull/v1/dom2_builder
DOM2XmlPullBuilder.java
addons/java/parser_pool/src/org/xmlpull/v1/parser_pool
XmlPullParserPool.java
addons/java/util/src/org/xmlpull/v1/util XmlPullUtil.java
addons/java/wrapper/src/org/xmlpull/v1/wrapper
XmlPullParserWrapper.java
. build.xml
doc changes.html
src/java/api/org/xmlpull/v1 XmlPullParser.java
XmlPullParserFactory.java
src/java/samples XmlPullCount.java
src/java/tests/org/xmlpull/v1/tests PackageTests.java
TestBootstrapXmlTests.java
TestEntityReplacement.java
TestEolNormalization.java TestEvent.java
TestFactory.java TestMisc.java
TestProcessDocdecl.java TestSerialize.java
TestSerializeWithNs.java TestSetInput.java
TestSimple.java TestSimpleProcessDocdecl.java
TestSimpleToken.java TestSimpleValidation.java
TestSimpleWithNs.java TestToken.java
TestXmlSimple.java TestXmlTypical.java
UtilTestCase.java XmlTestCase.java
Log:
fixed xpp.START_TAG warnings
minor typos fixed
incremented minor version
Revision Changes Path
1.7 +6 -6 xmlpull-api-v1/addons/java/dom2_builder/src/org/xmlpull/v1/dom2_builder/DOM2XmlPullBuilder.java
Index: DOM2XmlPullBuilder.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/dom2_builder/src/org/xmlpull/v1/dom2_builder/DOM2XmlPullBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -t -w -r1.6 -r1.7
--- DOM2XmlPullBuilder.java 29 Jul 2003 22:28:33 -0000 1.6
+++ DOM2XmlPullBuilder.java 28 Feb 2005 20:18:29 -0000 1.7
@@ -125,7 +125,7 @@
private Element parseSubTree()
throws XmlPullParserException, IOException
{
- pp.require( pp.START_TAG, null, null);
+ pp.require( XmlPullParser.START_TAG, null, null);
String name = pp.getName();
String ns = pp.getNamespace( );
String prefix = pp.getPrefix();
@@ -151,20 +151,20 @@
}
// process children
- while( pp.next() != pp.END_TAG ) {
- if (pp.getEventType() == pp.START_TAG) {
+ while( pp.next() != XmlPullParser.END_TAG ) {
+ if (pp.getEventType() == XmlPullParser.START_TAG) {
Element el = parseSubTree(pp, docFactory);
parent.appendChild(el);
- } else if (pp.getEventType() == pp.TEXT) {
+ } else if (pp.getEventType() == XmlPullParser.TEXT) {
String text = pp.getText();
Text textEl = docFactory.createTextNode(text);
parent.appendChild(textEl);
} else {
throw new XmlPullParserException(
- "unexpected event "+pp.TYPES[ pp.getEventType() ], pp, null);
+ "unexpected event "+XmlPullParser.TYPES[ pp.getEventType() ], pp, null);
}
}
- pp.require( pp.END_TAG, ns, name);
+ pp.require( XmlPullParser.END_TAG, ns, name);
return parent;
}
1.3 +3 -1 xmlpull-api-v1/addons/java/parser_pool/src/org/xmlpull/v1/parser_pool/XmlPullParserPool.java
Index: XmlPullParserPool.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/parser_pool/src/org/xmlpull/v1/parser_pool/XmlPullParserPool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -t -w -r1.2 -r1.3
--- XmlPullParserPool.java 8 Jul 2003 21:14:42 -0000 1.2
+++ XmlPullParserPool.java 28 Feb 2005 20:18:29 -0000 1.3
@@ -9,6 +9,8 @@
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory;
+// add aging so parser used more than X times is not resused ...
+
/**
* Very simple utility to make pooling of XmlPull parsers easy.
*
1.4 +3 -3 xmlpull-api-v1/addons/java/util/src/org/xmlpull/v1/util/XmlPullUtil.java
Index: XmlPullUtil.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/util/src/org/xmlpull/v1/util/XmlPullUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -t -w -r1.3 -r1.4
--- XmlPullUtil.java 5 May 2003 01:36:17 -0000 1.3
+++ XmlPullUtil.java 28 Feb 2005 20:18:29 -0000 1.4
@@ -136,7 +136,7 @@
}
/**
- * combine nextTag(); pp.require(pp.START_TAG, null, name);
+ * combine nextTag(); pp.require(XmlPullParser.START_TAG, null, name);
*/
public static void nextStartTag(XmlPullParser pp, String name)
throws XmlPullParserException, IOException
@@ -146,7 +146,7 @@
}
/**
- * combine nextTag(); pp.require(pp.START_TAG, namespace, name);
+ * combine nextTag(); pp.require(XmlPullParser.START_TAG, namespace, name);
*/
public static void nextStartTag(XmlPullParser pp, String namespace, String name)
throws XmlPullParserException, IOException
@@ -159,7 +159,7 @@
/**
- * combine nextTag(); pp.require(pp.END_TAG, namespace, name);
+ * combine nextTag(); pp.require(XmlPullParser.END_TAG, namespace, name);
*/
public static void nextEndTag(XmlPullParser pp, String namespace, String name)
throws XmlPullParserException, IOException
1.10 +4 -7 xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/XmlPullParserWrapper.java
Index: XmlPullParserWrapper.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/XmlPullParserWrapper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -t -w -r1.9 -r1.10
--- XmlPullParserWrapper.java 30 Jul 2003 17:05:55 -0000 1.9
+++ XmlPullParserWrapper.java 28 Feb 2005 20:18:29 -0000 1.10
@@ -3,9 +3,6 @@
package org.xmlpull.v1.wrapper;
-import java.lang.reflect.Proxy;
-import java.lang.reflect.InvocationHandler;
-
import java.io.IOException;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@@ -87,13 +84,13 @@
throws XmlPullParserException, IOException;
/**
- * combine nextTag(); pp.require(pp.START_TAG, null, name);
+ * combine nextTag(); pp.require(XmlPullParser.START_TAG, null, name);
*/
public void nextStartTag(String name)
throws XmlPullParserException, IOException;
/**
- * combine nextTag(); pp.require(pp.START_TAG, namespace, name);
+ * combine nextTag(); pp.require(XmlPullParser.START_TAG, namespace, name);
*/
public void nextStartTag(String namespace, String name)
throws XmlPullParserException, IOException;
@@ -104,14 +101,14 @@
public void nextEndTag() throws XmlPullParserException, IOException;
/**
- * combine nextTag(); pp.require(pp.END_TAG, null, name);
+ * combine nextTag(); pp.require(XmlPullParser.END_TAG, null, name);
*/
public void nextEndTag(String name)
throws XmlPullParserException, IOException;
/**
- * combine nextTag(); pp.require(pp.END_TAG, namespace, name);
+ * combine nextTag(); pp.require(XmlPullParser.END_TAG, namespace, name);
*/
public void nextEndTag(String namespace, String name)
throws XmlPullParserException, IOException;
1.31 +2 -2 xmlpull-api-v1/build.xml
Index: build.xml
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/build.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -t -w -r1.30 -r1.31
--- build.xml 15 Jan 2004 17:17:11 -0000 1.30
+++ build.xml 28 Feb 2005 20:18:29 -0000 1.31
@@ -10,8 +10,8 @@
<!-- set global properties for this build -->
<property name="name" value="XmlPull"/>
- <property name="year" value="2003"/>
- <property name="version" value="1_1_3_4a"/>
+ <property name="year" value="2005"/>
+ <property name="version" value="1_1_3_4b"/>
<property name="xmlpull_version" value="xmlpull_${version}"/>
<property name="xmlpull_tag" value="XMLPULL_${version}"/>
<property name="copyright"
1.54 +4 -0 xmlpull-api-v1/doc/changes.html
Index: changes.html
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/doc/changes.html,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -t -w -r1.53 -r1.54
--- changes.html 1 Feb 2004 19:17:34 -0000 1.53
+++ changes.html 28 Feb 2005 20:18:29 -0000 1.54
@@ -19,6 +19,10 @@
<h3><a name="XMLPULL_1_1_3_*"></a>2004-02- (XMLPULL_1_1_3_*)</h3>
<ul>
+<li>2004-02-13: added sample that demonstrates how to use XmlPullParser that
+implements Cloneable to allow exploring efficient "What-If" parsing, for more
+details see <a href="http://groups.yahoo.com/group/xmlpull-user/message/132">
+mailing list archies</a>.</li>
<li>2004-02-01: fixed style issue raised by Max Gilead related to unnecessary
use of public modifier in interfaces (<a href="http://www.extreme.indiana.edu/bugzilla/show_bug.cgi?id=174">bug
174</a>)</li>
1.79 +6 -6 xmlpull-api-v1/src/java/api/org/xmlpull/v1/XmlPullParser.java
Index: XmlPullParser.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/api/org/xmlpull/v1/XmlPullParser.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -t -w -r1.78 -r1.79
--- XmlPullParser.java 1 Feb 2004 19:17:34 -0000 1.78
+++ XmlPullParser.java 28 Feb 2005 20:18:29 -0000 1.79
@@ -89,16 +89,16 @@
*
* xpp.<a href="#setInput">setInput</a>( new StringReader ( "<foo>Hello World!</foo>" ) );
* int eventType = xpp.getEventType();
- * while (eventType != xpp.END_DOCUMENT) {
- * if(eventType == xpp.START_DOCUMENT) {
+ * while (eventType != XmlPullParser.END_DOCUMENT) {
+ * if(eventType == XmlPullParser.START_DOCUMENT) {
* System.out.println("Start document");
- * } else if(eventType == xpp.END_DOCUMENT) {
+ * } else if(eventType == XmlPullParser.END_DOCUMENT) {
* System.out.println("End document");
- * } else if(eventType == xpp.START_TAG) {
+ * } else if(eventType == XmlPullParser.START_TAG) {
* System.out.println("Start tag "+xpp.<a href="#getName()">getName()</a>);
- * } else if(eventType == xpp.END_TAG) {
+ * } else if(eventType == XmlPullParser.END_TAG) {
* System.out.println("End tag "+xpp.getName());
- * } else if(eventType == xpp.TEXT) {
+ * } else if(eventType == XmlPullParser.TEXT) {
* System.out.println("Text "+xpp.<a href="#getText()">getText()</a>);
* }
* eventType = xpp.next();
1.26 +2 -2 xmlpull-api-v1/src/java/api/org/xmlpull/v1/XmlPullParserFactory.java
Index: XmlPullParserFactory.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/api/org/xmlpull/v1/XmlPullParserFactory.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -t -w -r1.25 -r1.26
--- XmlPullParserFactory.java 20 May 2003 10:03:13 -0000 1.25
+++ XmlPullParserFactory.java 28 Feb 2005 20:18:29 -0000 1.26
@@ -10,7 +10,7 @@
/**
* This class is used to create implementations of XML Pull Parser defined in XMPULL V1 API.
- * The name of actual facotry class will be determied based on several parameters.
+ * The name of actual factory class will be determined based on several parameters.
* It works similar to JAXP but tailored to work in J2ME environments
* (no access to system properties or file system) so name of parser class factory to use
* and its class used for loading (no classloader - on J2ME no access to context class loaders)
1.6 +0 -1 xmlpull-api-v1/src/java/samples/XmlPullCount.java
Index: XmlPullCount.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/samples/XmlPullCount.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -t -w -r1.5 -r1.6
--- XmlPullCount.java 12 Jan 2004 16:20:59 -0000 1.5
+++ XmlPullCount.java 28 Feb 2005 20:18:30 -0000 1.6
@@ -2,7 +2,6 @@
// for license please see accompanying LICENSE.txt file (available also at http://www.xmlpull.org/)
import java.io.File;
-import java.io.FileReader;
import java.io.IOException;
import java.io.StringReader;
1.20 +1 -4 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.19
retrieving revision 1.20
diff -u -b -t -w -r1.19 -r1.20
--- PackageTests.java 9 Feb 2004 06:32:49 -0000 1.19
+++ PackageTests.java 28 Feb 2005 20:18:30 -0000 1.20
@@ -18,10 +18,7 @@
// -Dorg.xmlpull.v1.tests=org.xmlpull.mxp1.MXParser,org.xmlpull.mxp1_serializer.MXSerializer
/**
- * TODO: add tests for
- * <pre>
- * test mixed next() with nextToken()
- * </pre>
+ * TODO: add tests for mixed next() with nextToken()
*
* @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander Slominski</a>
*/
1.2 +48 -48 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestBootstrapXmlTests.java
Index: TestBootstrapXmlTests.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestBootstrapXmlTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- TestBootstrapXmlTests.java 31 Jul 2002 21:32:05 -0000 1.1
+++ TestBootstrapXmlTests.java 28 Feb 2005 20:18:30 -0000 1.2
@@ -59,69 +59,69 @@
XmlPullParser pp = factory.newPullParser();
pp.setInput( new StringReader( MINI_TEST_XML ) );
pp.next();
- pp.require( pp.START_TAG, TEST_NS, "tests");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "tests");
pp.next();
- pp.require( pp.TEXT, null, null);
+ pp.require( XmlPullParser.TEXT, null, null);
String text = pp.getText();
assertEquals("\n ", text);
pp.next();
- pp.require( pp.START_TAG, TEST_NS, "test-parser");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "test-parser");
// check name
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "create-parser");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "create-parser");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "create-parser");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "create-parser");
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "input-inline");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "input-inline");
text = "";
- if(pp.next() == pp.TEXT) {
+ if(pp.next() == XmlPullParser.TEXT) {
text = pp.getText();
pp.next();
}
assertEquals("<foo/> ", text);
- pp.require( pp.END_TAG, TEST_NS, "input-inline");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "input-inline");
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "next");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "next");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "next");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "next");
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "expect");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "expect");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "expect");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "expect");
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "next");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "next");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "next");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "next");
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "expect");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "expect");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "expect");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "expect");
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "next");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "next");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "next");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "next");
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "expect");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "expect");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "expect");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "expect");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "test-parser");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "test-parser");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "tests");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "tests");
pp.next();
- pp.require( pp.END_DOCUMENT, null, null);
+ pp.require( XmlPullParser.END_DOCUMENT, null, null);
}
@@ -145,75 +145,75 @@
XmlPullParser pp = factory.newPullParser();
pp.setInput( new StringReader( TYPICAL_TEST_XML ) );
pp.next();
- pp.require( pp.START_TAG, TEST_NS, "tests");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "tests");
pp.next();
- pp.require( pp.TEXT, null, null);
+ pp.require( XmlPullParser.TEXT, null, null);
String text = pp.getText();
assertEquals("\n ", text);
pp.next();
- pp.require( pp.START_TAG, TEST_NS, "test-parser");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "test-parser");
// check name
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "create-parser");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "create-parser");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "create-parser");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "create-parser");
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "input-inline");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "input-inline");
text = "";
- if(pp.next() == pp.TEXT) {
+ if(pp.next() == XmlPullParser.TEXT) {
text = pp.getText();
pp.next();
}
assertEquals("<foo att=\"t\" att2='a' > bar&baz &</foo>", text);
- pp.require( pp.END_TAG, TEST_NS, "input-inline");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "input-inline");
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "set-feature");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "set-feature");
text = pp.nextText();
assertEquals("http://xmlpull.org/v1/doc/features.html#process-namespaces", text);
- pp.require( pp.END_TAG, TEST_NS, "set-feature");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "set-feature");
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "expect");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "expect");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "expect");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "expect");
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "next");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "next");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "next");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "next");
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "expect");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "expect");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "expect");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "expect");
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "next-text");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "next-text");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "next-text");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "next-text");
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "next");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "next");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "next");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "next");
pp.nextTag();
- pp.require( pp.START_TAG, TEST_NS, "expect");
+ pp.require( XmlPullParser.START_TAG, TEST_NS, "expect");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "expect");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "expect");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "test-parser");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "test-parser");
pp.nextTag();
- pp.require( pp.END_TAG, TEST_NS, "tests");
+ pp.require( XmlPullParser.END_TAG, TEST_NS, "tests");
pp.next();
- pp.require( pp.END_DOCUMENT, null, null);
+ pp.require( XmlPullParser.END_DOCUMENT, null, null);
}
1.11 +1 -1 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestEntityReplacement.java
Index: TestEntityReplacement.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestEntityReplacement.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -t -w -r1.10 -r1.11
--- TestEntityReplacement.java 19 Aug 2004 06:16:56 -0000 1.10
+++ TestEntityReplacement.java 28 Feb 2005 20:18:30 -0000 1.11
@@ -124,7 +124,7 @@
//assertEquals("UTF-8", pp.getCharacterEncodingScheme());
//assertEquals("1.0", startdoc.getVersion());
String c = pp.nextText();
- assertEquals(expectedText,c); //FAILURE expected "<text>" but was "<text"
+ assertEquals(expectedText, c);
assertEquals(XmlPullParser.END_TAG, pp.getEventType());
}
1.6 +0 -2 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestEolNormalization.java
Index: TestEolNormalization.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestEolNormalization.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -t -w -r1.5 -r1.6
--- TestEolNormalization.java 16 Apr 2002 19:06:00 -0000 1.5
+++ TestEolNormalization.java 28 Feb 2005 20:18:30 -0000 1.6
@@ -3,8 +3,6 @@
package org.xmlpull.v1.tests;
-//import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import java.io.StringReader;
1.13 +35 -35 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestEvent.java
Index: TestEvent.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestEvent.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -t -w -r1.12 -r1.13
--- TestEvent.java 7 Sep 2002 20:39:44 -0000 1.12
+++ TestEvent.java 28 Feb 2005 20:18:30 -0000 1.13
@@ -4,7 +4,7 @@
package org.xmlpull.v1.tests;
//import junit.framework.Test;
-import junit.framework.TestCase;
+//import junit.framework.TestCase;
import junit.framework.TestSuite;
import java.io.StringReader;
@@ -43,55 +43,55 @@
XmlPullParser xpp = factory.newPullParser();
xpp.setInput(new StringReader(TEST_XML));
- 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.next();
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 0, "", "root", null, false, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "root", null, false, 0);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.TEXT, null, 0, null, null, "\n", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.TEXT, null, 0, null, null, "\n", false, -1);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.START_TAG, null, 0, "", "foo", null, false, 0);
+ checkParserStateNs(xpp, 2, XmlPullParser.START_TAG, null, 0, "", "foo", null, false, 0);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.TEXT, null, 0, null, null, "bar", false, -1);
+ checkParserStateNs(xpp, 2, XmlPullParser.TEXT, null, 0, null, null, "bar", false, -1);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.END_TAG, null, 0, "", "foo", null, false, -1);
+ checkParserStateNs(xpp, 2, XmlPullParser.END_TAG, null, 0, "", "foo", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.TEXT, null, 0, null, null, "\n", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.TEXT, null, 0, null, null, "\n", false, -1);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.START_TAG,
+ checkParserStateNs(xpp, 2, XmlPullParser.START_TAG,
null, 1, "http://www.xmlpull.org/temp", "hugo", null, false, 0);
checkNamespace(xpp, 0, null, "http://www.xmlpull.org/temp", true);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.TEXT, null, 1, null, null, " \n\n \n ", false, -1);
+ checkParserStateNs(xpp, 2, XmlPullParser.TEXT, null, 1, null, null, " \n\n \n ", false, -1);
xpp.next();
- checkParserStateNs(xpp, 3, xpp.START_TAG,
+ checkParserStateNs(xpp, 3, XmlPullParser.START_TAG,
null, 1, "http://www.xmlpull.org/temp", "hugochild", null, false, 0);
xpp.next();
- checkParserStateNs(xpp, 3, xpp.TEXT, null, 1, null, null,
+ checkParserStateNs(xpp, 3, XmlPullParser.TEXT, null, 1, null, null,
"This is in a new namespace", false, -1);
xpp.next();
- checkParserStateNs(xpp, 3, xpp.END_TAG,
+ checkParserStateNs(xpp, 3, XmlPullParser.END_TAG,
null, 1, "http://www.xmlpull.org/temp", "hugochild", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.END_TAG,
+ checkParserStateNs(xpp, 2, XmlPullParser.END_TAG,
null, 1, "http://www.xmlpull.org/temp", "hugo", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.TEXT, null, 0, null, null, "\t\n", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.TEXT, null, 0, null, null, "\t\n", false, -1);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.START_TAG, null, 0, "", "bar", null, true, 1);
+ checkParserStateNs(xpp, 2, XmlPullParser.START_TAG, null, 0, "", "bar", null, true, 1);
checkAttribNs(xpp, 0, null, "", "testattr", "123abc");
xpp.next();
- checkParserStateNs(xpp, 2, xpp.END_TAG, null, 0, "", "bar", null, false, -1);
+ checkParserStateNs(xpp, 2, XmlPullParser.END_TAG, null, 0, "", "bar", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "root", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "root", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
}
public void testMultiNs() throws Exception {
@@ -99,40 +99,40 @@
XmlPullParser xpp = factory.newPullParser();
xpp.setInput(new StringReader("<foo><bar xmlns=''/><char xmlns=''></char></foo>"));
- 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.next();
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 0, "", "foo", null, false, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "foo", null, false, 0);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.START_TAG, null, 1, "", "bar", null, true, 0);
+ checkParserStateNs(xpp, 2, XmlPullParser.START_TAG, null, 1, "", "bar", null, true, 0);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.END_TAG, null, 1, "", "bar", null, false, -1);
+ checkParserStateNs(xpp, 2, XmlPullParser.END_TAG, null, 1, "", "bar", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.START_TAG, null, 1, "", "char", null, false, 0);
+ checkParserStateNs(xpp, 2, XmlPullParser.START_TAG, null, 1, "", "char", null, false, 0);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.END_TAG, null, 1, "", "char", null, false, -1);
+ checkParserStateNs(xpp, 2, XmlPullParser.END_TAG, null, 1, "", "char", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "foo", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "foo", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
xpp.setInput(new StringReader("<foo><bar xmlns=''></bar><char xmlns=''></char></foo>"));
- 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.next();
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 0, "", "foo", null, false, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "foo", null, false, 0);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.START_TAG, null, 1, "", "bar", null, false, 0);
+ checkParserStateNs(xpp, 2, XmlPullParser.START_TAG, null, 1, "", "bar", null, false, 0);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.END_TAG, null, 1, "", "bar", null, false, -1);
+ checkParserStateNs(xpp, 2, XmlPullParser.END_TAG, null, 1, "", "bar", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.START_TAG, null, 1, "", "char", null, false, 0);
+ checkParserStateNs(xpp, 2, XmlPullParser.START_TAG, null, 1, "", "char", null, false, 0);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.END_TAG, null, 1, "", "char", null, false, -1);
+ checkParserStateNs(xpp, 2, XmlPullParser.END_TAG, null, 1, "", "char", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "foo", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "foo", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
}
1.9 +0 -1 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestFactory.java
Index: TestFactory.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -t -w -r1.8 -r1.9
--- TestFactory.java 16 Apr 2002 19:06:00 -0000 1.8
+++ TestFactory.java 28 Feb 2005 20:18:30 -0000 1.9
@@ -3,7 +3,6 @@
package org.xmlpull.v1.tests;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.xmlpull.v1.XmlPullParser;
1.23 +1 -3 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestMisc.java
Index: TestMisc.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestMisc.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -t -w -r1.22 -r1.23
--- TestMisc.java 9 Feb 2004 06:31:51 -0000 1.22
+++ TestMisc.java 28 Feb 2005 20:18:30 -0000 1.23
@@ -3,8 +3,6 @@
package org.xmlpull.v1.tests;
-//import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import java.io.StringReader;
@@ -91,7 +89,7 @@
// assertEquals( "", pp.readText() );
// pp.next();
// assertEquals( "foo", pp.readText() );
- // assertEquals( pp.TYPES[ pp.END_TAG ], pp.TYPES[ pp.getEventType() ]);
+ // assertEquals( pp.TYPES[ XmlPullParser.END_TAG ], pp.TYPES[ pp.getEventType() ]);
// }
public void testNextText() throws Exception {
1.2 +23 -23 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestProcessDocdecl.java
Index: TestProcessDocdecl.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestProcessDocdecl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- TestProcessDocdecl.java 23 Aug 2002 19:11:51 -0000 1.1
+++ TestProcessDocdecl.java 28 Feb 2005 20:18:30 -0000 1.2
@@ -4,10 +4,10 @@
package org.xmlpull.v1.tests;
//import junit.framework.Test;
-import junit.framework.TestCase;
+//import junit.framework.TestCase;
import junit.framework.TestSuite;
-import java.io.ByteArrayInputStream;
+//import java.io.ByteArrayInputStream;
import java.io.StringReader;
import org.xmlpull.v1.XmlPullParser;
@@ -44,16 +44,16 @@
throws XmlPullParserException
{
XmlPullParser xpp = factory.newPullParser();
- xpp.setFeature(xpp.FEATURE_PROCESS_NAMESPACES, useNamespaces);
+ xpp.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, useNamespaces);
assertEquals(useNamespaces, xpp.getFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES));
try {
- xpp.setFeature(xpp.FEATURE_PROCESS_DOCDECL, true);
+ xpp.setFeature(XmlPullParser.FEATURE_PROCESS_DOCDECL, true);
} catch(XmlPullParserException ex) {
return null;
}
assertEquals(true, xpp.getFeature(XmlPullParser.FEATURE_PROCESS_DOCDECL));
try {
- xpp.setFeature(xpp.FEATURE_VALIDATION, useValidation);
+ xpp.setFeature(XmlPullParser.FEATURE_VALIDATION, useValidation);
} catch(XmlPullParserException ex) {
return null;
}
@@ -113,16 +113,16 @@
//next
xpp.setInput(new StringReader( XML_SIMPLE_ENT ));
- 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.next();
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 0, "", "test", null, false/*empty*/, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "test", null, false/*empty*/, 0);
xpp.next();
String expectedContent = "Publication: "+PUB_ENTITY_REPLACEMENT+" ";
- checkParserStateNs(xpp, 1, xpp.TEXT, null, 0, null, null, expectedContent, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.TEXT, null, 0, null, null, expectedContent, false, -1);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "test", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "test", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
//nextToken
}
@@ -165,22 +165,22 @@
//next
xpp.setInput(new StringReader( XML_REPLACE_ENT ));
- 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.next();
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 0, "", "test", null, false/*empty*/, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "test", null, false/*empty*/, 0);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.START_TAG, null, 0, "", "p", null, false/*empty*/, 0);
+ checkParserStateNs(xpp, 2, XmlPullParser.START_TAG, null, 0, "", "p", null, false/*empty*/, 0);
xpp.next();
String expectedContent = EXAMPLE_ENTITY_TEXT_EVENT;
- checkParserStateNs(xpp, 2, xpp.TEXT, null, 0, null, null, expectedContent, false, -1);
+ checkParserStateNs(xpp, 2, XmlPullParser.TEXT, null, 0, null, null, expectedContent, false, -1);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.END_TAG, null, 0, "", "p", null, false/*empty*/, -1);
+ checkParserStateNs(xpp, 2, XmlPullParser.END_TAG, null, 0, "", "p", null, false/*empty*/, -1);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.TEXT, null, 0, null, null, " ", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.TEXT, null, 0, null, null, " ", false, -1);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "test", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "test", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
}
public void testTricky() throws Exception {
@@ -213,16 +213,16 @@
//next
xpp.setInput(new StringReader( XML_TRICKY ));
- 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.next();
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 0, "", "test", null, false/*empty*/, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "test", null, false/*empty*/, 0);
xpp.next();
String expectedContent = EXPECTED_XML_TRICKY;
- checkParserStateNs(xpp, 1, xpp.TEXT, null, 0, null, null, expectedContent, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.TEXT, null, 0, null, null, expectedContent, false, -1);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "test", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "test", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
//TODO nextToken()
1.9 +22 -23 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.8
retrieving revision 1.9
diff -u -b -t -w -r1.8 -r1.9
--- TestSerialize.java 9 Feb 2004 20:15:57 -0000 1.8
+++ TestSerialize.java 28 Feb 2005 20:18:30 -0000 1.9
@@ -3,7 +3,6 @@
package org.xmlpull.v1.tests;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import java.io.ByteArrayOutputStream;
@@ -92,13 +91,13 @@
xpp.setInput(new StringReader(serialized));
assertEquals(null, xpp.getInputEncoding());
- checkParserState(xpp, 0, xpp.START_DOCUMENT, null, null, false, -1);
+ checkParserState(xpp, 0, XmlPullParser.START_DOCUMENT, null, null, false, -1);
xpp.next();
- checkParserState(xpp, 1, xpp.START_TAG, "foo", null, xpp.isEmptyElementTag() /*empty*/, 0);
+ checkParserState(xpp, 1, XmlPullParser.START_TAG, "foo", null, xpp.isEmptyElementTag() /*empty*/, 0);
xpp.next();
- checkParserState(xpp, 1, xpp.END_TAG, "foo", null, false, -1);
+ checkParserState(xpp, 1, XmlPullParser.END_TAG, "foo", null, false, -1);
xpp.next();
- checkParserState(xpp, 0, xpp.END_DOCUMENT, null, null, false, -1);
+ checkParserState(xpp, 0, XmlPullParser.END_DOCUMENT, null, null, false, -1);
}
public void testSimpleStream() throws Exception {
@@ -121,16 +120,16 @@
assertEquals("UTF-8", xpp.getInputEncoding());
//xpp.setInput(new StringReader( "<foo/>" ) );
- checkParserState(xpp, 0, xpp.START_DOCUMENT, null, null, false, -1);
+ checkParserState(xpp, 0, XmlPullParser.START_DOCUMENT, null, null, false, -1);
xpp.next();
- checkParserState(xpp, 1, xpp.START_TAG, "foo", null, false /*empty*/, 0);
+ checkParserState(xpp, 1, XmlPullParser.START_TAG, "foo", null, false /*empty*/, 0);
xpp.next();
- checkParserState(xpp, 1, xpp.TEXT, null, "test", false, -1);
+ checkParserState(xpp, 1, XmlPullParser.TEXT, null, "test", false, -1);
assertEquals(false, xpp.isWhitespace());
xpp.next();
- checkParserState(xpp, 1, xpp.END_TAG, "foo", null, false, -1);
+ checkParserState(xpp, 1, XmlPullParser.END_TAG, "foo", null, false, -1);
xpp.next();
- checkParserState(xpp, 0, xpp.END_DOCUMENT, null, null, false, -1);
+ checkParserState(xpp, 0, XmlPullParser.END_DOCUMENT, null, null, false, -1);
}
public void testSimpleSerWithAttribute() throws Exception {
@@ -188,24 +187,24 @@
//xpp.setInput(new StringReader("<foo attrName='attrVal'>bar<p:t>\r\n\t </p:t></foo>"));
String serialized = sw.toString();
xpp.setInput(new StringReader(serialized));
- checkParserState(xpp, 0, xpp.START_DOCUMENT, null, null, false, -1);
+ checkParserState(xpp, 0, XmlPullParser.START_DOCUMENT, null, null, false, -1);
xpp.next();
- checkParserState(xpp, 1, xpp.START_TAG, "foo", null, false, 1);
+ checkParserState(xpp, 1, XmlPullParser.START_TAG, "foo", null, false, 1);
checkAttrib(xpp, 0, "attrName", "attrVal");
xpp.next();
- checkParserState(xpp, 1, xpp.TEXT, null, "bar", false, -1);
+ checkParserState(xpp, 1, XmlPullParser.TEXT, null, "bar", false, -1);
assertEquals(false, xpp.isWhitespace());
xpp.next();
- checkParserState(xpp, 2, xpp.START_TAG, "p:t", null, false, 0);
+ checkParserState(xpp, 2, XmlPullParser.START_TAG, "p:t", null, false, 0);
xpp.next();
- checkParserState(xpp, 2, xpp.TEXT, null, "\n\t ", false, -1);
+ checkParserState(xpp, 2, XmlPullParser.TEXT, null, "\n\t ", false, -1);
assertTrue(xpp.isWhitespace());
xpp.next();
- checkParserState(xpp, 2, xpp.END_TAG, "p:t", null, false, -1);
+ checkParserState(xpp, 2, XmlPullParser.END_TAG, "p:t", null, false, -1);
xpp.next();
- checkParserState(xpp, 1, xpp.END_TAG, "foo", null, false, -1);
+ checkParserState(xpp, 1, XmlPullParser.END_TAG, "foo", null, false, -1);
xpp.next();
- checkParserState(xpp, 0, xpp.END_DOCUMENT, null, null, false, -1);
+ checkParserState(xpp, 0, XmlPullParser.END_DOCUMENT, null, null, false, -1);
}
@@ -259,17 +258,17 @@
assertEquals("UTF-8", xpp.getInputEncoding());
//xpp.setInput(new StringReader( "<foo/>" ) );
- checkParserState(xpp, 0, xpp.START_DOCUMENT, null, null, false, -1);
+ checkParserState(xpp, 0, XmlPullParser.START_DOCUMENT, null, null, false, -1);
xpp.next();
- checkParserState(xpp, 1, xpp.START_TAG, "foo", null, false /*empty*/, 1);
+ checkParserState(xpp, 1, XmlPullParser.START_TAG, "foo", null, false /*empty*/, 1);
assertEquals(printable(s), printable(xpp.getAttributeValue(null, "att")));
xpp.next();
- checkParserState(xpp, 1, xpp.TEXT, null, expectedS, false, -1);
+ checkParserState(xpp, 1, XmlPullParser.TEXT, null, expectedS, false, -1);
assertEquals(false, xpp.isWhitespace());
xpp.next();
- checkParserState(xpp, 1, xpp.END_TAG, "foo", null, false, -1);
+ checkParserState(xpp, 1, XmlPullParser.END_TAG, "foo", null, false, -1);
xpp.next();
- checkParserState(xpp, 0, xpp.END_DOCUMENT, null, null, false, -1);
+ checkParserState(xpp, 0, XmlPullParser.END_DOCUMENT, null, null, false, -1);
baos = new ByteArrayOutputStream();
ser.setOutput(baos, "UTF-8");
1.20 +67 -66 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.19
retrieving revision 1.20
diff -u -b -t -w -r1.19 -r1.20
--- TestSerializeWithNs.java 9 Feb 2004 06:32:49 -0000 1.19
+++ TestSerializeWithNs.java 28 Feb 2005 20:18:30 -0000 1.20
@@ -3,7 +3,6 @@
package org.xmlpull.v1.tests;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import java.io.ByteArrayOutputStream;
@@ -47,17 +46,17 @@
private void checkSimpleWriterResult(String textContent) throws Exception {
- 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.next();
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 0, "", "foo", null, xpp.isEmptyElementTag() /*empty*/, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "foo", null, xpp.isEmptyElementTag() /*empty*/, 0);
if(textContent != null) {
xpp.next();
- checkParserStateNs(xpp, 1, xpp.TEXT, null, 0, null, null, textContent, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.TEXT, null, 0, null, null, textContent, false, -1);
}
xpp.next();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "foo", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "foo", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
}
public void testSimpleWriter() throws Exception {
@@ -281,7 +280,7 @@
xpp.nextToken();
if(xpp.getEventType() == XmlPullParser.IGNORABLE_WHITESPACE) {
- String expectedIws = gatherTokenText(xpp, xpp.IGNORABLE_WHITESPACE, true);
+ String expectedIws = gatherTokenText(xpp, XmlPullParser.IGNORABLE_WHITESPACE, true);
assertEquals(printable(iws), printable(expectedIws));
}
@@ -415,10 +414,10 @@
XmlPullParser pp = factory.newPullParser();
pp.setInput(new StringReader(s));
pp.nextTag();
- pp.require(pp.START_TAG, null, "test");
- assertEquals("value", pp.getAttributeValue(pp.NO_NAMESPACE, "att"));
+ pp.require(XmlPullParser.START_TAG, null, "test");
+ assertEquals("value", pp.getAttributeValue(XmlPullParser.NO_NAMESPACE, "att"));
pp.nextTag();
- pp.require(pp.END_TAG, null, "test");
+ pp.require(XmlPullParser.END_TAG, null, "test");
}
/**
@@ -445,12 +444,12 @@
XmlPullParser pp = factory.newPullParser();
pp.setInput(new StringReader(s));
pp.nextTag();
- pp.require(pp.START_TAG, null, "test");
- assertEquals("value", pp.getAttributeValue(pp.NO_NAMESPACE, "att"));
- assertEquals("valueA", pp.getAttributeValue(pp.NO_NAMESPACE, "attA"));
- assertEquals("valueQ", pp.getAttributeValue(pp.NO_NAMESPACE, "attQ"));
+ pp.require(XmlPullParser.START_TAG, null, "test");
+ assertEquals("value", pp.getAttributeValue(XmlPullParser.NO_NAMESPACE, "att"));
+ assertEquals("valueA", pp.getAttributeValue(XmlPullParser.NO_NAMESPACE, "attA"));
+ assertEquals("valueQ", pp.getAttributeValue(XmlPullParser.NO_NAMESPACE, "attQ"));
pp.nextTag();
- pp.require(pp.END_TAG, null, "test");
+ pp.require(XmlPullParser.END_TAG, null, "test");
}
@@ -658,10 +657,10 @@
//System.out.println(getClass()+" sw="+sw);
xpp.setInput(new StringReader(serialized));
- 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.next();
String expectedPrefix = (prefix != null && prefix.length() == 0) ? null : prefix;
- checkParserStateNs(xpp, 1, xpp.START_TAG, expectedPrefix, 1, NS, "foo", null, xpp.isEmptyElementTag() /*empty*/, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, expectedPrefix, 1, NS, "foo", null, xpp.isEmptyElementTag() /*empty*/, 0);
}
public void testSetPrefix() throws Exception {
@@ -789,48 +788,48 @@
xpp.setInput(new StringReader(soapEnvelope));
- 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.next();
- checkParserStateNs(xpp, 1, xpp.START_TAG, 1, ENV, "Envelope", false /*empty*/, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, 1, ENV, "Envelope", false /*empty*/, 0);
xpp.nextTag();
- checkParserStateNs(xpp, 2, xpp.START_TAG, 1, ENV, "Header", false /*empty*/, 0);
+ checkParserStateNs(xpp, 2, XmlPullParser.START_TAG, 1, ENV, "Header", false /*empty*/, 0);
xpp.nextTag();
- checkParserStateNs(xpp, 3, xpp.START_TAG,
+ checkParserStateNs(xpp, 3, XmlPullParser.START_TAG,
2+extraNs, ALERTCONTROL, "alertcontrol", false /*empty*/, 2);
checkAttribNs(xpp, 0, ENV, "mustUnderstand", "true");
checkAttribNs(xpp, 1, ENV, "role", ROLE);
xpp.nextTag();
- checkParserStateNs(xpp, 4, xpp.START_TAG, 2+extraNs, ALERTCONTROL, "priority", false /*empty*/, 0);
+ checkParserStateNs(xpp, 4, XmlPullParser.START_TAG, 2+extraNs, ALERTCONTROL, "priority", false /*empty*/, 0);
String text = xpp.nextText();
assertEquals("1", text);
xpp.nextTag();
- checkParserStateNs(xpp, 4, xpp.START_TAG, 2+extraNs, ALERTCONTROL, "expires", false /*empty*/, 0);
+ checkParserStateNs(xpp, 4, XmlPullParser.START_TAG, 2+extraNs, ALERTCONTROL, "expires", false /*empty*/, 0);
text = xpp.nextText();
assertEquals(EXPIRES, text);
xpp.nextTag();
- checkParserStateNs(xpp, 3, xpp.END_TAG, 2+extraNs, ALERTCONTROL, "alertcontrol", false, -1);
+ checkParserStateNs(xpp, 3, XmlPullParser.END_TAG, 2+extraNs, ALERTCONTROL, "alertcontrol", false, -1);
xpp.nextTag();
- checkParserStateNs(xpp, 2, xpp.END_TAG, 1, ENV, "Header", false, -1);
+ checkParserStateNs(xpp, 2, XmlPullParser.END_TAG, 1, ENV, "Header", false, -1);
xpp.nextTag();
- checkParserStateNs(xpp, 2, xpp.START_TAG, 1, ENV, "Body", false /*empty*/, 0);
+ checkParserStateNs(xpp, 2, XmlPullParser.START_TAG, 1, ENV, "Body", false /*empty*/, 0);
xpp.nextTag();
- checkParserStateNs(xpp, 3, xpp.START_TAG, 2, ALERT, "alert", false /*empty*/, 0);
+ checkParserStateNs(xpp, 3, XmlPullParser.START_TAG, 2, ALERT, "alert", false /*empty*/, 0);
xpp.nextTag();
- checkParserStateNs(xpp, 4, xpp.START_TAG, 2, ALERT, "msg", false /*empty*/, 0);
+ checkParserStateNs(xpp, 4, XmlPullParser.START_TAG, 2, ALERT, "msg", false /*empty*/, 0);
text = xpp.nextText();
assertEquals(MSG, text);
xpp.nextTag();
- checkParserStateNs(xpp, 3, xpp.END_TAG, 2, ALERT, "alert", false, -1);
+ checkParserStateNs(xpp, 3, XmlPullParser.END_TAG, 2, ALERT, "alert", false, -1);
xpp.nextTag();
- checkParserStateNs(xpp, 2, xpp.END_TAG, 1, ENV, "Body", false, -1);
+ checkParserStateNs(xpp, 2, XmlPullParser.END_TAG, 1, ENV, "Body", false, -1);
xpp.nextTag();
- checkParserStateNs(xpp, 1, xpp.END_TAG, 1, ENV, "Envelope", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, 1, ENV, "Envelope", false, -1);
xpp.next();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
checkTestSetPrefixSoap2(soapEnvelope);
}
@@ -838,63 +837,63 @@
// run test using parser.require()
private void checkTestSetPrefixSoap2(String soapEnvelope) throws Exception {
xpp.setInput(new StringReader(soapEnvelope));
- xpp.setFeature(xpp.FEATURE_PROCESS_NAMESPACES, true);
+ xpp.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
- xpp.require(xpp.START_DOCUMENT, null, null);
+ xpp.require(XmlPullParser.START_DOCUMENT, null, null);
xpp.next(); // essentially moveToContent()
- xpp.require(xpp.START_TAG, ENV, "Envelope");
+ xpp.require(XmlPullParser.START_TAG, ENV, "Envelope");
xpp.nextTag();
- xpp.require(xpp.START_TAG, ENV, "Header");
+ xpp.require(XmlPullParser.START_TAG, ENV, "Header");
xpp.nextTag();
- xpp.require(xpp.START_TAG, ALERTCONTROL, "alertcontrol");
+ xpp.require(XmlPullParser.START_TAG, ALERTCONTROL, "alertcontrol");
String mustUderstand = xpp.getAttributeValue(ENV, "mustUnderstand");
assertEquals("true", mustUderstand);
String role = xpp.getAttributeValue(ENV, "role");
assertEquals(ROLE, role);
xpp.nextTag();
- xpp.require(xpp.START_TAG, ALERTCONTROL, "priority");
+ xpp.require(XmlPullParser.START_TAG, ALERTCONTROL, "priority");
String text = xpp.nextText();
assertEquals("1", text);
//Integer.parseInt(text);
xpp.nextTag();
- xpp.require(xpp.START_TAG, ALERTCONTROL, "expires");
+ xpp.require(XmlPullParser.START_TAG, ALERTCONTROL, "expires");
text = xpp.nextText();
assertEquals(EXPIRES, text);
xpp.nextTag();
- xpp.require(xpp.END_TAG, ALERTCONTROL, "alertcontrol");
+ xpp.require(XmlPullParser.END_TAG, ALERTCONTROL, "alertcontrol");
xpp.nextTag();
- xpp.require(xpp.END_TAG, ENV, "Header");
+ xpp.require(XmlPullParser.END_TAG, ENV, "Header");
xpp.nextTag();
- xpp.require(xpp.START_TAG, ENV, "Body");
+ xpp.require(XmlPullParser.START_TAG, ENV, "Body");
xpp.nextTag();
- xpp.require(xpp.START_TAG, ALERT, "alert");
+ xpp.require(XmlPullParser.START_TAG, ALERT, "alert");
xpp.nextTag();
- xpp.require(xpp.START_TAG, ALERT, "msg");
+ xpp.require(XmlPullParser.START_TAG, ALERT, "msg");
text = xpp.nextText();
assertEquals(MSG, text);
xpp.nextTag();
- xpp.require(xpp.END_TAG, ALERT, "alert");
+ xpp.require(XmlPullParser.END_TAG, ALERT, "alert");
xpp.nextTag();
- xpp.require(xpp.END_TAG, ENV, "Body");
+ xpp.require(XmlPullParser.END_TAG, ENV, "Body");
xpp.nextTag();
- xpp.require(xpp.END_TAG, ENV, "Envelope");
+ xpp.require(XmlPullParser.END_TAG, ENV, "Envelope");
xpp.next();
- xpp.require(xpp.END_DOCUMENT, null, null);
+ xpp.require(XmlPullParser.END_DOCUMENT, null, null);
}
@@ -975,10 +974,10 @@
xpp.setInput(new ByteArrayInputStream( binput ), "US-ASCII" );
assertEquals("US-ASCII", xpp.getInputEncoding());
- 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.next();
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 3, "namesp", "foo", null, false, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 3, "namesp", "foo", null, false, 0);
assertEquals(0, xpp.getNamespaceCount(0));
assertEquals(3, xpp.getNamespaceCount(1));
checkNamespace(xpp, 0, null, "namesp", true);
@@ -986,7 +985,7 @@
checkNamespace(xpp, 2, "ns2", "namesp2", true);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.START_TAG, "ns1", 6, "x1", "bar", null, false, 0);
+ checkParserStateNs(xpp, 2, XmlPullParser.START_TAG, "ns1", 6, "x1", "bar", null, false, 0);
assertEquals(0, xpp.getNamespaceCount(0));
assertEquals(3, xpp.getNamespaceCount(1));
assertEquals(6, xpp.getNamespaceCount(2));
@@ -995,7 +994,7 @@
checkNamespace(xpp, 5, null, "namesp1", true);
xpp.next();
- checkParserStateNs(xpp, 3, xpp.START_TAG, "ns2", 6, "namesp2", "gugu", null, true, 4);
+ checkParserStateNs(xpp, 3, XmlPullParser.START_TAG, "ns2", 6, "namesp2", "gugu", null, true, 4);
assertEquals(6, xpp.getNamespaceCount(2));
assertEquals(6, xpp.getNamespaceCount(3));
assertEquals("x1", xpp.getNamespace("ns1"));
@@ -1007,10 +1006,10 @@
checkAttribNs(xpp, 3, "ns1", "x1", "a3", "v3");
xpp.next();
- checkParserStateNs(xpp, 3, xpp.END_TAG, "ns2", 6, "namesp2", "gugu", null, false, -1);
+ checkParserStateNs(xpp, 3, XmlPullParser.END_TAG, "ns2", 6, "namesp2", "gugu", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 3, xpp.START_TAG, null, 7, "namesp1", "baz", null, xpp.isEmptyElementTag(), 0);
+ checkParserStateNs(xpp, 3, XmlPullParser.START_TAG, null, 7, "namesp1", "baz", null, xpp.isEmptyElementTag(), 0);
assertEquals(0, xpp.getNamespaceCount(0));
assertEquals(3, xpp.getNamespaceCount(1));
assertEquals(6, xpp.getNamespaceCount(2));
@@ -1021,7 +1020,7 @@
assertEquals("namesp3", xpp.getNamespace("ns3"));
xpp.next();
- checkParserStateNs(xpp, 3, xpp.END_TAG, null, 7, "namesp1", "baz", null, false, -1);
+ checkParserStateNs(xpp, 3, XmlPullParser.END_TAG, null, 7, "namesp1", "baz", null, false, -1);
assertEquals("y1", xpp.getNamespace("ns1"));
assertEquals("namesp2", xpp.getNamespace("ns2"));
assertEquals("namesp3", xpp.getNamespace("ns3"));
@@ -1043,19 +1042,19 @@
xpp.next();
- checkParserStateNs(xpp, 2, xpp.END_TAG, "ns1", 6, "x1", "bar", null, false, -1);
+ checkParserStateNs(xpp, 2, XmlPullParser.END_TAG, "ns1", 6, "x1", "bar", null, false, -1);
// check that namespace is undelcared
assertEquals("x1", xpp.getNamespace("ns1"));
xpp.next();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 3, "namesp", "foo", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 3, "namesp", "foo", null, false, -1);
assertEquals("namesp1", xpp.getNamespace("ns1"));
assertEquals("namesp2", xpp.getNamespace("ns2"));
assertEquals(null, xpp.getNamespace("ns3"));
xpp.next();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
assertEquals(null, xpp.getNamespace("ns1"));
assertEquals(null, xpp.getNamespace("ns2"));
assertEquals(null, xpp.getNamespace("ns3"));
@@ -1074,20 +1073,20 @@
expect.next();
actual.next();
assertXml("inconsistent event type", expect, actual,
- expect.TYPES[ expect.getEventType() ],
- actual.TYPES[ actual.getEventType() ]
+ XmlPullParser.TYPES[ expect.getEventType() ],
+ XmlPullParser.TYPES[ actual.getEventType() ]
);
- if(expect.getEventType() == expect.END_DOCUMENT) {
+ if(expect.getEventType() == XmlPullParser.END_DOCUMENT) {
break;
}
- if(expect.getEventType() == expect.START_TAG
- || expect.getEventType() == expect.END_TAG )
+ if(expect.getEventType() == XmlPullParser.START_TAG
+ || expect.getEventType() == XmlPullParser.END_TAG )
{
assertXml("tag names", expect, actual,
expect.getName(), actual.getName());
assertXml("tag namespaces", expect, actual,
expect.getNamespace(), actual.getNamespace());
- if(expect.getEventType() == expect.START_TAG) {
+ if(expect.getEventType() == XmlPullParser.START_TAG) {
// check consisteny of attributes -- allow them to be in any order
int expectAttrCount = expect.getAttributeCount();
assertXml("attributes count", expect, actual,
@@ -1113,6 +1112,8 @@
}
String expectN = expectAttrNamespace+":"+expectAttrName;
if(actualPos == -1) {
+ System.err.println("expected:\n"+expectedXml
+ +"\nactual:\n"+actualXml);
fail("could not find expected attribute "+expectN
+" actual parser "+actual.getPositionDescription());
}
@@ -1130,7 +1131,7 @@
""+expectAttrDefault, ""+actual.isAttributeDefault(actualPos) );
}
}
- } else if(expect.getEventType() == expect.TEXT) {
+ } else if(expect.getEventType() == XmlPullParser.TEXT) {
assertXml("text content", expect, actual,
expect.getText(), actual.getText());
} else {
1.8 +7 -8 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSetInput.java
Index: TestSetInput.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSetInput.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -t -w -r1.7 -r1.8
--- TestSetInput.java 3 May 2003 06:37:45 -0000 1.7
+++ TestSetInput.java 28 Feb 2005 20:18:30 -0000 1.8
@@ -3,7 +3,6 @@
package org.xmlpull.v1.tests;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import java.io.ByteArrayInputStream;
@@ -55,12 +54,12 @@
assertEquals("no read() called in just contructed reader", false, reader.calledRead());
xpp.setInput(reader);
- 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);
assertEquals("read() not called before next()", false, reader.calledRead());
xpp.next();
assertEquals("read() must be called after next()", true, reader.calledRead());
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 0, "", "foo", null, true/*empty*/, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "foo", null, true/*empty*/, 0);
}
public void testSetInput() throws Exception {
@@ -76,7 +75,7 @@
xpp.setInput(isw, "UTF-8");
assertEquals("UTF-8", xpp.getInputEncoding());
- 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);
assertEquals("read() not called before next()", false, isw.calledRead());
xpp.nextToken();
@@ -102,7 +101,7 @@
// //xpp.setInput(isw, "UTF-16" ); //TODO why Xerces2 causes java Unicode decoder to fail ????
// xpp.setInput(isw, "UTF16" );
// //assertEquals("UTF-16", xpp.getInputEncoding());
- // 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);
// assertEquals("read() not called before next()", false, isw.calledRead());
//
// xpp.nextToken();
@@ -122,7 +121,7 @@
xpp.setInput(isw, null );
assertEquals(null, xpp.getInputEncoding());
- 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);
//assertEquals("read() not called before next()", false, isw.calledRead());
xpp.nextToken();
@@ -140,12 +139,12 @@
xpp.setInput(isw, null );
assertEquals(null, xpp.getInputEncoding());
- 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);
//assertEquals("read() not called before next()", false, isw.calledRead());
xpp.next();
assertEquals("read() must be called after next()", true, isw.calledRead());
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 0, "", "foo", null, true/*empty*/, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "foo", null, true/*empty*/, 0);
if(xpp.getFeature(FEATURE_DETECT_ENCODING)) {
assertEquals("ISO-8859-1", xpp.getInputEncoding());
1.16 +21 -22 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSimple.java
Index: TestSimple.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSimple.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -t -w -r1.15 -r1.16
--- TestSimple.java 31 Jul 2002 21:32:05 -0000 1.15
+++ TestSimple.java 28 Feb 2005 20:18:30 -0000 1.16
@@ -4,7 +4,6 @@
package org.xmlpull.v1.tests;
//import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import java.io.ByteArrayInputStream;
@@ -42,11 +41,11 @@
assertEquals(false, xpp.getFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES));
// this SHOULD always be OK
- assertEquals("START_DOCUMENT", xpp.TYPES[xpp.START_DOCUMENT]);
- assertEquals("END_DOCUMENT", xpp.TYPES[xpp.END_DOCUMENT]);
- assertEquals("START_TAG", xpp.TYPES[xpp.START_TAG]);
- assertEquals("END_TAG", xpp.TYPES[xpp.END_TAG]);
- assertEquals("TEXT", xpp.TYPES[xpp.TEXT]);
+ assertEquals("START_DOCUMENT", xpp.TYPES[XmlPullParser.START_DOCUMENT]);
+ assertEquals("END_DOCUMENT", xpp.TYPES[XmlPullParser.END_DOCUMENT]);
+ assertEquals("START_TAG", xpp.TYPES[XmlPullParser.START_TAG]);
+ assertEquals("END_TAG", xpp.TYPES[XmlPullParser.END_TAG]);
+ assertEquals("TEXT", xpp.TYPES[XmlPullParser.TEXT]);
assertEquals("CDSECT", xpp.TYPES[xpp.CDSECT]);
assertEquals("ENTITY_REF", xpp.TYPES[xpp.ENTITY_REF]);
assertEquals("IGNORABLE_WHITESPACE", xpp.TYPES[xpp.IGNORABLE_WHITESPACE]);
@@ -82,13 +81,13 @@
// check the simplest possible XML document - just one root element
xpp.setInput(new StringReader("<foo></foo>"));
assertEquals(null, xpp.getInputEncoding());
- checkParserState(xpp, 0, xpp.START_DOCUMENT, null, null, false, -1);
+ checkParserState(xpp, 0, XmlPullParser.START_DOCUMENT, null, null, false, -1);
xpp.next();
- checkParserState(xpp, 1, xpp.START_TAG, "foo", null, false /*empty*/, 0);
+ checkParserState(xpp, 1, XmlPullParser.START_TAG, "foo", null, false /*empty*/, 0);
xpp.next();
- checkParserState(xpp, 1, xpp.END_TAG, "foo", null, false, -1);
+ checkParserState(xpp, 1, XmlPullParser.END_TAG, "foo", null, false, -1);
xpp.next();
- checkParserState(xpp, 0, xpp.END_DOCUMENT, null, null, false, -1);
+ checkParserState(xpp, 0, XmlPullParser.END_DOCUMENT, null, null, false, -1);
//check taking input form input stream
@@ -96,34 +95,34 @@
xpp.setInput(new ByteArrayInputStream( binput ), "UTF-8" );
assertEquals("UTF-8", xpp.getInputEncoding());
//xpp.setInput(new StringReader( "<foo/>" ) );
- checkParserState(xpp, 0, xpp.START_DOCUMENT, null, null, false, -1);
+ checkParserState(xpp, 0, XmlPullParser.START_DOCUMENT, null, null, false, -1);
xpp.next();
- checkParserState(xpp, 1, xpp.START_TAG, "foo", null, true /*empty*/, 0);
+ checkParserState(xpp, 1, XmlPullParser.START_TAG, "foo", null, true /*empty*/, 0);
xpp.next();
- checkParserState(xpp, 1, xpp.END_TAG, "foo", null, false, -1);
+ checkParserState(xpp, 1, XmlPullParser.END_TAG, "foo", null, false, -1);
xpp.next();
- checkParserState(xpp, 0, xpp.END_DOCUMENT, null, null, false, -1);
+ checkParserState(xpp, 0, XmlPullParser.END_DOCUMENT, null, null, false, -1);
// one step further - it has an attribute and content ...
xpp.setInput(new StringReader("<foo attrName='attrVal'>bar<p:t>\r\n\t </p:t></foo>"));
- checkParserState(xpp, 0, xpp.START_DOCUMENT, null, null, false, -1);
+ checkParserState(xpp, 0, XmlPullParser.START_DOCUMENT, null, null, false, -1);
xpp.next();
- checkParserState(xpp, 1, xpp.START_TAG, "foo", null, false, 1);
+ checkParserState(xpp, 1, XmlPullParser.START_TAG, "foo", null, false, 1);
checkAttrib(xpp, 0, "attrName", "attrVal");
xpp.next();
- checkParserState(xpp, 1, xpp.TEXT, null, "bar", false, -1);
+ checkParserState(xpp, 1, XmlPullParser.TEXT, null, "bar", false, -1);
assertEquals(false, xpp.isWhitespace());
xpp.next();
- checkParserState(xpp, 2, xpp.START_TAG, "p:t", null, false, 0);
+ checkParserState(xpp, 2, XmlPullParser.START_TAG, "p:t", null, false, 0);
xpp.next();
- checkParserState(xpp, 2, xpp.TEXT, null, "\n\t ", false, -1);
+ checkParserState(xpp, 2, XmlPullParser.TEXT, null, "\n\t ", false, -1);
assertTrue(xpp.isWhitespace());
xpp.next();
- checkParserState(xpp, 2, xpp.END_TAG, "p:t", null, false, -1);
+ checkParserState(xpp, 2, XmlPullParser.END_TAG, "p:t", null, false, -1);
xpp.next();
- checkParserState(xpp, 1, xpp.END_TAG, "foo", null, false, -1);
+ checkParserState(xpp, 1, XmlPullParser.END_TAG, "foo", null, false, -1);
xpp.next();
- checkParserState(xpp, 0, xpp.END_DOCUMENT, null, null, false, -1);
+ checkParserState(xpp, 0, XmlPullParser.END_DOCUMENT, null, null, false, -1);
}
1.3 +9 -12 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSimpleProcessDocdecl.java
Index: TestSimpleProcessDocdecl.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSimpleProcessDocdecl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -t -w -r1.2 -r1.3
--- TestSimpleProcessDocdecl.java 9 Sep 2002 01:36:41 -0000 1.2
+++ TestSimpleProcessDocdecl.java 28 Feb 2005 20:18:30 -0000 1.3
@@ -3,11 +3,8 @@
package org.xmlpull.v1.tests;
-//import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
-import java.io.ByteArrayInputStream;
import java.io.StringReader;
import org.xmlpull.v1.XmlPullParser;
@@ -41,11 +38,11 @@
public void testProcessDocdecl() throws Exception {
XmlPullParser xpp = factory.newPullParser();
try {
- xpp.setFeature(xpp.FEATURE_PROCESS_DOCDECL, true);
+ xpp.setFeature(XmlPullParser.FEATURE_PROCESS_DOCDECL, true);
} catch(XmlPullParserException ex) {
return;
}
- PackageTests.addNote("* feature "+xpp.FEATURE_PROCESS_DOCDECL+" is supported\n");
+ PackageTests.addNote("* feature "+XmlPullParser.FEATURE_PROCESS_DOCDECL+" is supported\n");
// setting validation MUST enables also PROCESS_DOCDECL
assertEquals(true, xpp.getFeature(XmlPullParser.FEATURE_PROCESS_DOCDECL));
// default is to have non-validating parser
@@ -63,24 +60,24 @@
"<greeting>Hello, &name;!</greeting>\n";
xpp.setInput(new StringReader( XML_MIN_VALID ));
- 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);
assertNull(xpp.getProperty(PROPERTY_XMLDECL_VERSION));
assertNull(xpp.getProperty(PROPERTY_XMLDECL_STANDALONE));
assertNull(xpp.getProperty(PROPERTY_XMLDECL_CONTENT));
xpp.next();
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 0, "", "greeting", null, false/*empty*/, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "greeting", null, false/*empty*/, 0);
//XMLDecl support is required when PROCESS DOCDECL enabled
assertEquals("1.0", xpp.getProperty(PROPERTY_XMLDECL_VERSION));
assertEquals(Boolean.TRUE, xpp.getProperty(PROPERTY_XMLDECL_STANDALONE));
xpp.next();
- checkParserStateNs(xpp, 1, xpp.TEXT, null, 0, null, null, "Hello, world!", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.TEXT, null, 0, null, null, "Hello, world!", false, -1);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "greeting", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "greeting", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
@@ -88,9 +85,9 @@
final String XML_MIN_INVALID = XML_MIN_PROLOG+
"<greet>Hello, &world;!</greet>\n";
xpp.setInput(new StringReader( XML_MIN_INVALID ));
- 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.next();
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 0, "", "greet", null, false/*empty*/, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "greet", null, false/*empty*/, 0);
try {
xpp.next();
fail("exception was expected of next() for undeclared entity");
1.20 +14 -17 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSimpleToken.java
Index: TestSimpleToken.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSimpleToken.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -t -w -r1.19 -r1.20
--- TestSimpleToken.java 23 Aug 2002 19:11:51 -0000 1.19
+++ TestSimpleToken.java 28 Feb 2005 20:18:30 -0000 1.20
@@ -3,12 +3,9 @@
package org.xmlpull.v1.tests;
-//import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import java.io.StringReader;
-import java.io.StringWriter;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserFactory;
@@ -45,17 +42,17 @@
XmlPullParser xpp = factory.newPullParser();
assertEquals(true, xpp.getFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES));
xpp.setInput(new StringReader("<foo><!--comment--><?target pi?></foo>"));
- 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, 1, xpp.START_TAG, null, 0, "", "foo", null, false, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "foo", null, false, 0);
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.COMMENT, null, 0, null, null, "comment", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.COMMENT, null, 0, null, null, "comment", false, -1);
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.PROCESSING_INSTRUCTION, null, 0, null, null, "target pi", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.PROCESSING_INSTRUCTION, null, 0, null, null, "target pi", false, -1);
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "foo", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "foo", null, false, -1);
xpp.nextToken();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
}
public void testSimpleToken() throws Exception {
@@ -90,9 +87,9 @@
for(int i = 1; i <= 2; ++i) {
xpp.setInput(new StringReader(i == 1 ? "<foo/>" : "<foo></foo>"));
boolean empty = (i == 1);
- 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, 1, xpp.START_TAG, null, 0, "", "foo", null, empty, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "foo", null, empty, 0);
if(roundtripSupported) {
if(empty) {
// System.out.println("tag='"+xpp.getText()+"'");
@@ -109,7 +106,7 @@
}
}
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "foo", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "foo", null, false, -1);
if(roundtripSupported) {
if(empty) {
assertEquals("empty tag roundtrip",
@@ -122,7 +119,7 @@
}
}
xpp.nextToken();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
}
}
@@ -139,9 +136,9 @@
public void testNormalization(XmlPullParser xpp) throws Exception {
xpp.setInput(new StringReader("<foo>\n \r\n \n\r</foo>"));
- 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, 1, xpp.START_TAG, null, 0, "", "foo", null, false/*empty*/, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "foo", null, false/*empty*/, 0);
boolean roundtrip = xpp.getFeature(FEATURE_XML_ROUNDTRIP) == false;
String text = nextTokenGathered(xpp, XmlPullParser.TEXT, true);
@@ -153,9 +150,9 @@
assertEquals("\n \r\n \n\r", text);
}
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "foo", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "foo", null, false, -1);
xpp.nextToken();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
}
}
1.3 +8 -11 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSimpleValidation.java
Index: TestSimpleValidation.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSimpleValidation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -t -w -r1.2 -r1.3
--- TestSimpleValidation.java 9 Sep 2002 01:36:41 -0000 1.2
+++ TestSimpleValidation.java 28 Feb 2005 20:18:30 -0000 1.3
@@ -3,11 +3,8 @@
package org.xmlpull.v1.tests;
-//import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
-import java.io.ByteArrayInputStream;
import java.io.StringReader;
import org.xmlpull.v1.XmlPullParser;
@@ -41,11 +38,11 @@
public void testValidation() throws Exception {
XmlPullParser xpp = factory.newPullParser();
try {
- xpp.setFeature(xpp.FEATURE_VALIDATION, true);
+ xpp.setFeature(XmlPullParser.FEATURE_VALIDATION, true);
} catch(XmlPullParserException ex) {
return;
}
- PackageTests.addNote("* feature "+xpp.FEATURE_VALIDATION+" is supported\n");
+ PackageTests.addNote("* feature "+XmlPullParser.FEATURE_VALIDATION+" is supported\n");
// setting validation MUST enables also PROCESS_DOCDECL
assertEquals(true, xpp.getFeature(XmlPullParser.FEATURE_PROCESS_DOCDECL));
@@ -62,24 +59,24 @@
"<greeting>Hello, world!</greeting>\n";
xpp.setInput(new StringReader( XML_MIN_VALID ));
- 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);
assertNull(xpp.getProperty(PROPERTY_XMLDECL_VERSION));
assertNull(xpp.getProperty(PROPERTY_XMLDECL_STANDALONE));
assertNull(xpp.getProperty(PROPERTY_XMLDECL_CONTENT));
xpp.next();
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 0, "", "greeting", null, false/*empty*/, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "greeting", null, false/*empty*/, 0);
//XMLDecl support is required when PROCESS DOCDECL enabled
assertEquals("1.0", xpp.getProperty(PROPERTY_XMLDECL_VERSION));
assertEquals(null, xpp.getProperty(PROPERTY_XMLDECL_STANDALONE));
xpp.next();
- checkParserStateNs(xpp, 1, xpp.TEXT, null, 0, null, null, "Hello, world!", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.TEXT, null, 0, null, null, "Hello, world!", false, -1);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "greeting", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "greeting", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
@@ -87,7 +84,7 @@
final String XML_MIN_INVALID = XML_MIN_PROLOG+
"<greet>Hello, world!</greet>\n";
xpp.setInput(new StringReader( XML_MIN_INVALID ));
- 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);
try {
xpp.next();
fail("exception was expected of next() for invalid document element root");
1.15 +23 -25 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSimpleWithNs.java
Index: TestSimpleWithNs.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSimpleWithNs.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -t -w -r1.14 -r1.15
--- TestSimpleWithNs.java 24 Apr 2002 23:15:02 -0000 1.14
+++ TestSimpleWithNs.java 28 Feb 2005 20:18:30 -0000 1.15
@@ -3,8 +3,6 @@
package org.xmlpull.v1.tests;
-//import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import java.io.ByteArrayInputStream;
@@ -56,38 +54,38 @@
// check the simplest possible XML document - just one root element
xpp.setInput(new StringReader("<foo></foo>"));
- 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.next();
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 0, "", "foo", null, false/*empty*/, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "foo", null, false/*empty*/, 0);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "foo", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "foo", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
xpp.setInput(new StringReader("<foo/>"));
- 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.next();
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 0, "", "foo", null, true/*empty*/, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "foo", null, true/*empty*/, 0);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "foo", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "foo", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
// one step further - it has content ...
xpp.setInput(new StringReader("<foo attrName='attrVal'>bar</foo>"));
- 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.next();
- 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.next();
- checkParserStateNs(xpp, 1, xpp.TEXT, null, 0, null, null, "bar", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.TEXT, null, 0, null, null, "bar", false, -1);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "foo", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "foo", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
byte[] binput = ("<foo xmlns='n' xmlns:ns1='n1' xmlns:ns2='n2'>"+
@@ -98,10 +96,10 @@
xpp.setInput(new ByteArrayInputStream( binput ), "US-ASCII" );
assertEquals("US-ASCII", xpp.getInputEncoding());
- 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.next();
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 3, "n", "foo", null, false, 0);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 3, "n", "foo", null, false, 0);
assertEquals(0, xpp.getNamespaceCount(0));
assertEquals(3, xpp.getNamespaceCount(1));
checkNamespace(xpp, 0, null, "n", true);
@@ -109,7 +107,7 @@
checkNamespace(xpp, 2, "ns2", "n2", true);
xpp.next();
- checkParserStateNs(xpp, 2, xpp.START_TAG, "ns1", 6, "x1", "bar", null, false, 0);
+ checkParserStateNs(xpp, 2, XmlPullParser.START_TAG, "ns1", 6, "x1", "bar", null, false, 0);
assertEquals(0, xpp.getNamespaceCount(0));
assertEquals(3, xpp.getNamespaceCount(1));
assertEquals(6, xpp.getNamespaceCount(2));
@@ -118,7 +116,7 @@
checkNamespace(xpp, 5, null, "n1", true);
xpp.next();
- checkParserStateNs(xpp, 3, xpp.START_TAG, "ns2", 6, "n2", "gugu", null, true, 4);
+ checkParserStateNs(xpp, 3, XmlPullParser.START_TAG, "ns2", 6, "n2", "gugu", null, true, 4);
assertEquals(6, xpp.getNamespaceCount(2));
assertEquals(6, xpp.getNamespaceCount(3));
assertEquals("x1", xpp.getNamespace("ns1"));
@@ -130,10 +128,10 @@
checkAttribNs(xpp, 3, "ns1", "x1", "a3", "v3");
xpp.next();
- checkParserStateNs(xpp, 3, xpp.END_TAG, "ns2", 6, "n2", "gugu", null, false, -1);
+ checkParserStateNs(xpp, 3, XmlPullParser.END_TAG, "ns2", 6, "n2", "gugu", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 3, xpp.START_TAG, null, 7, "n1", "baz", null, false, 0);
+ checkParserStateNs(xpp, 3, XmlPullParser.START_TAG, null, 7, "n1", "baz", null, false, 0);
assertEquals(0, xpp.getNamespaceCount(0));
assertEquals(3, xpp.getNamespaceCount(1));
assertEquals(6, xpp.getNamespaceCount(2));
@@ -144,7 +142,7 @@
assertEquals("n3", xpp.getNamespace("ns3"));
xpp.next();
- checkParserStateNs(xpp, 3, xpp.END_TAG, null, 7, "n1", "baz", null, false, -1);
+ checkParserStateNs(xpp, 3, XmlPullParser.END_TAG, null, 7, "n1", "baz", null, false, -1);
assertEquals("y1", xpp.getNamespace("ns1"));
assertEquals("n2", xpp.getNamespace("ns2"));
assertEquals("n3", xpp.getNamespace("ns3"));
@@ -166,19 +164,19 @@
xpp.next();
- checkParserStateNs(xpp, 2, xpp.END_TAG, "ns1", 6, "x1", "bar", null, false, -1);
+ checkParserStateNs(xpp, 2, XmlPullParser.END_TAG, "ns1", 6, "x1", "bar", null, false, -1);
// check that namespace is undelcared
assertEquals("x1", xpp.getNamespace("ns1"));
xpp.next();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 3, "n", "foo", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 3, "n", "foo", null, false, -1);
assertEquals("n1", xpp.getNamespace("ns1"));
assertEquals("n2", xpp.getNamespace("ns2"));
assertEquals(null, xpp.getNamespace("ns3"));
xpp.next();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
assertEquals(null, xpp.getNamespace("ns1"));
assertEquals(null, xpp.getNamespace("ns2"));
assertEquals(null, xpp.getNamespace("ns3"));
1.18 +35 -37 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestToken.java
Index: TestToken.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestToken.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -t -w -r1.17 -r1.18
--- TestToken.java 3 May 2003 06:37:45 -0000 1.17
+++ TestToken.java 28 Feb 2005 20:18:30 -0000 1.18
@@ -3,8 +3,6 @@
package org.xmlpull.v1.tests;
-//import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import java.io.StringReader;
@@ -68,25 +66,25 @@
XmlPullParser xpp = factory.newPullParser();
assertEquals(true, xpp.getFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES));
xpp.setInput(new StringReader(MISC_XML));
- boolean processDocdecl = xpp.getFeature(xpp.FEATURE_PROCESS_DOCDECL);
+ boolean processDocdecl = xpp.getFeature(XmlPullParser.FEATURE_PROCESS_DOCDECL);
// make sure entity "test" can be resolved even when parser is not parsing DOCDECL
if(!processDocdecl) {
xpp.defineEntityReplacementText("test", "This is test! Do NOT Panic!");
}
- 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.next();
- 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.next();
- checkParserStateNs(xpp, 1, xpp.TEXT, null, 0, null, null,
+ checkParserStateNs(xpp, 1, XmlPullParser.TEXT, null, 0, null, null,
"barThis is test! Do NOT Panic!This is test! Do NOT Panic!< &>'\" < vo<o ",
false, -1);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "foo", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "foo", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
}
@@ -126,7 +124,7 @@
"disabling feature "+FEATURE_XML_ROUNDTRIP+" must be supported");
}
- 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);
try {
xpp.isWhitespace();
fail("whitespace function must fail for START_DOCUMENT");
@@ -135,12 +133,12 @@
if(checkPrologAndEpilog) {
xpp.nextToken();
- if(xpp.getEventType() == xpp.IGNORABLE_WHITESPACE) {
+ if(xpp.getEventType() == XmlPullParser.IGNORABLE_WHITESPACE) {
// xpp.nextToken();
// checkParserStateNs(xpp, 0, xpp.IGNORABLE_WHITESPACE, null, 0, null, null,
// "\n \r\n \n\r", false, -1);
// assertTrue(xpp.isWhitespace());
- String text = gatherTokenText(xpp, xpp.IGNORABLE_WHITESPACE, true);
+ String text = gatherTokenText(xpp, XmlPullParser.IGNORABLE_WHITESPACE, true);
if(roundtripSupported) {
assertEquals(printable("\n \r\n \n\r"), printable(text));
assertEquals("\n \r\n \n\r", text);
@@ -150,7 +148,7 @@
}
}
- checkParserStateNs(xpp, 0, xpp.COMMENT, null, 0, null, null, "c", false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.COMMENT, null, 0, null, null, "c", false, -1);
try {
xpp.isWhitespace();
fail("whitespace function must fail for START_DOCUMENT");
@@ -158,12 +156,12 @@
}
xpp.nextToken();
- if(xpp.getEventType() == xpp.IGNORABLE_WHITESPACE) {
+ if(xpp.getEventType() == XmlPullParser.IGNORABLE_WHITESPACE) {
// xpp.nextToken();
// checkParserStateNs(xpp, 0, xpp.IGNORABLE_WHITESPACE, null, 0, null, null, " \r\n", false, -1);
// assertTrue(xpp.isWhitespace());
//String text = nextTokenGathered(xpp, xpp.IGNORABLE_WHITESPACE, true);
- String text = gatherTokenText(xpp, xpp.IGNORABLE_WHITESPACE, true);
+ String text = gatherTokenText(xpp, XmlPullParser.IGNORABLE_WHITESPACE, true);
if(roundtripSupported) {
assertEquals(printable(" \r\n"), printable(text));
} else {
@@ -175,7 +173,7 @@
} else {
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 expectedDocdecl = " titlepage "+
//"SYSTEM \"http://www.foo.bar/dtds/typo.dtd\""+
"[<!ENTITY % active.links \"INCLUDE\">"+
@@ -196,7 +194,7 @@
// now parse elements
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 0, "", "foo", null, false, 1);
+ checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "foo", null, false, 1);
if(roundtripSupported) {
assertEquals("start tag roundtrip", "<foo attrName='attrVal'>", xpp.getText());
}
@@ -208,13 +206,13 @@
}
{
- String text = nextTokenGathered(xpp, xpp.TEXT, false);
+ String text = nextTokenGathered(xpp, XmlPullParser.TEXT, false);
assertEquals(printable("bar"), printable(text));
}
//xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.COMMENT, null, 0, null, null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.COMMENT, null, 0, null, null, false, -1);
try {
xpp.isWhitespace();
fail("whitespace function must fail for COMMENT");
@@ -229,15 +227,15 @@
}
}
- boolean processDocdecl = xpp.getFeature(xpp.FEATURE_PROCESS_DOCDECL);
+ boolean processDocdecl = xpp.getFeature(XmlPullParser.FEATURE_PROCESS_DOCDECL);
// uresolved entity must be reurned as null by nextToken()
xpp.nextToken();
if(!processDocdecl) {
- checkParserStateNs(xpp, 1, xpp.ENTITY_REF, null, 0, null,
+ checkParserStateNs(xpp, 1, XmlPullParser.ENTITY_REF, null, 0, null,
"test", null, false, -1);
} else {
- checkParserStateNs(xpp, 1, xpp.ENTITY_REF, null, 0, null,
+ checkParserStateNs(xpp, 1, XmlPullParser.ENTITY_REF, null, 0, null,
"test", "This is test! Do NOT Panic!", false, -1);
}
@@ -247,7 +245,7 @@
xpp.defineEntityReplacementText("test", "This is test! Do NOT Panic!");
}
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.ENTITY_REF, null, 0, null,
+ checkParserStateNs(xpp, 1, XmlPullParser.ENTITY_REF, null, 0, null,
"test", "This is test! Do NOT Panic!", false, -1);
try {
xpp.isWhitespace();
@@ -257,7 +255,7 @@
// check standard entities and char refs
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.ENTITY_REF, null, 0, null, "lt", "<", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.ENTITY_REF, null, 0, null, "lt", "<", false, -1);
try {
xpp.isWhitespace();
fail("whitespace function must fail for ENTITY_REF");
@@ -265,7 +263,7 @@
}
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.ENTITY_REF, null, 0, null, "#32", " ", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.ENTITY_REF, null, 0, null, "#32", " ", false, -1);
try {
xpp.isWhitespace();
fail("whitespace function must fail for ENTITY_REF");
@@ -273,25 +271,25 @@
}
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.ENTITY_REF, null, 0, null, "gt", ">", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.ENTITY_REF, null, 0, null, "gt", ">", false, -1);
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.ENTITY_REF, null, 0, null, "apos", "'", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.ENTITY_REF, null, 0, null, "apos", "'", false, -1);
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.ENTITY_REF, null, 0, null, "quot", "\"", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.ENTITY_REF, null, 0, null, "quot", "\"", false, -1);
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.ENTITY_REF, null, 0, null, "#x20", " ", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.ENTITY_REF, null, 0, null, "#x20", " ", false, -1);
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.ENTITY_REF, null, 0, null, "#x3C", "<", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.ENTITY_REF, null, 0, null, "#x3C", "<", false, -1);
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.PROCESSING_INSTRUCTION, null, 0, null, null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.PROCESSING_INSTRUCTION, null, 0, null, null, false, -1);
try {
xpp.isWhitespace();
fail("whitespace function must fail for START_DOCUMENT");
@@ -307,11 +305,11 @@
}
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.CDSECT, null, 0, null, null, " vo<o ", false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.CDSECT, null, 0, null, null, " vo<o ", false, -1);
assertEquals(false, xpp.isWhitespace());
xpp.nextToken();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 0, "", "foo", null, false, -1);
+ checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "foo", null, false, -1);
if(roundtripSupported) {
assertEquals("end tag roundtrip", "</foo>", xpp.getText());
}
@@ -324,14 +322,14 @@
xpp.nextToken();
if(checkPrologAndEpilog) {
//if(unnormalizedSupported) {
- if(xpp.getEventType() == xpp.IGNORABLE_WHITESPACE) {
+ if(xpp.getEventType() == XmlPullParser.IGNORABLE_WHITESPACE) {
// xpp.nextToken();
// checkParserStateNs(xpp, 0, xpp.IGNORABLE_WHITESPACE, null, 0, null, null,
// " \r\n", false, -1);
// assertTrue(xpp.isWhitespace());
//String text = nextTokenGathered(xpp, xpp.IGNORABLE_WHITESPACE, true);
- String text = gatherTokenText(xpp, xpp.IGNORABLE_WHITESPACE, true);
+ String text = gatherTokenText(xpp, XmlPullParser.IGNORABLE_WHITESPACE, true);
if(roundtripSupported) {
assertEquals(printable(" \r\n"), printable(text));
} else {
@@ -339,7 +337,7 @@
}
}
}
- checkParserStateNs(xpp, 0, xpp.END_DOCUMENT, null, 0, null, null, null, false, -1);
+ checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
try {
xpp.isWhitespace();
fail("whitespace function must fail for END_DOCUMENT");
@@ -375,7 +373,7 @@
xpp.setInput(new StringReader(MISC_XML));
int[] holderForStartAndLength = new int[2];
char[] buf;
- while(xpp.nextToken() != xpp.END_DOCUMENT) {
+ while(xpp.nextToken() != XmlPullParser.END_DOCUMENT) {
switch(xpp.getEventType()) {
case XmlPullParser.START_TAG:
buf = xpp.getTextCharacters(holderForStartAndLength);
1.3 +0 -1 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestXmlSimple.java
Index: TestXmlSimple.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestXmlSimple.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -t -w -r1.2 -r1.3
--- TestXmlSimple.java 7 Sep 2002 20:39:44 -0000 1.2
+++ TestXmlSimple.java 28 Feb 2005 20:18:30 -0000 1.3
@@ -5,7 +5,6 @@
import java.io.*;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.xmlpull.v1.*;
1.2 +0 -1 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestXmlTypical.java
Index: TestXmlTypical.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestXmlTypical.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- TestXmlTypical.java 31 Jul 2002 21:32:05 -0000 1.1
+++ TestXmlTypical.java 28 Feb 2005 20:18:30 -0000 1.2
@@ -5,7 +5,6 @@
import java.io.*;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.xmlpull.v1.XmlPullParserException;
1.22 +12 -12 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/UtilTestCase.java
Index: UtilTestCase.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/UtilTestCase.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -t -w -r1.21 -r1.22
--- UtilTestCase.java 11 Sep 2002 04:55:59 -0000 1.21
+++ UtilTestCase.java 28 Feb 2005 20:18:30 -0000 1.22
@@ -84,7 +84,7 @@
throws XmlPullParserException, IOException
{
StringBuffer buf = new StringBuffer();
- assertEquals(xpp.TYPES[ type ], xpp.TYPES[ xpp.getEventType() ]);
+ assertEquals(XmlPullParser.TYPES[ type ], XmlPullParser.TYPES[ xpp.getEventType() ]);
do {
buf.append(xpp.getText());
if(expectedWhitespaces) {
@@ -110,20 +110,20 @@
assertTrue("column number must be -1 or >= 0 not "+xpp.getColumnNumber(),
xpp.getColumnNumber() == -1 || xpp.getColumnNumber() >= 0);
- assertEquals("PROCESS_NAMESPACES", false, xpp.getFeature(xpp.FEATURE_PROCESS_NAMESPACES));
- assertEquals("TYPES[getType()]", xpp.TYPES[type], xpp.TYPES[xpp.getEventType()]);
+ assertEquals("PROCESS_NAMESPACES", false, xpp.getFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES));
+ assertEquals("TYPES[getType()]", XmlPullParser.TYPES[type], XmlPullParser.TYPES[xpp.getEventType()]);
assertEquals("getType()", type, xpp.getEventType());
assertEquals("getDepth()", depth, xpp.getDepth());
assertEquals("getPrefix()", null, xpp.getPrefix());
assertEquals("getNamespacesCount(getDepth())", 0, xpp.getNamespaceCount(depth));
- if(xpp.getEventType() == xpp.START_TAG || xpp.getEventType() == xpp.END_TAG) {
+ if(xpp.getEventType() == XmlPullParser.START_TAG || xpp.getEventType() == XmlPullParser.END_TAG) {
assertEquals("getNamespace()", "", xpp.getNamespace());
} else {
assertEquals("getNamespace()", null, xpp.getNamespace());
}
assertEquals("getName()", name, xpp.getName());
- if(xpp.getEventType() != xpp.START_TAG && xpp.getEventType() != xpp.END_TAG) {
+ if(xpp.getEventType() != XmlPullParser.START_TAG && xpp.getEventType() != XmlPullParser.END_TAG) {
assertEquals("getText()", printable(text), printable(xpp.getText()));
int [] holderForStartAndLength = new int[2];
@@ -135,7 +135,7 @@
assertEquals("getTextCharacters()", null, text);
}
}
- if(type == xpp.START_TAG) {
+ if(type == XmlPullParser.START_TAG) {
assertEquals("isEmptyElementTag()", isEmpty, xpp.isEmptyElementTag());
} else {
try {
@@ -165,7 +165,7 @@
// this methid can be used with enabled and not enabled namespaces
//assertEquals("PROCESS_NAMESPACES", true, xpp.getFeature(xpp.FEATURE_PROCESS_NAMESPACES));
- assertEquals("TYPES[getEventType()]", xpp.TYPES[type], xpp.TYPES[xpp.getEventType()]);
+ assertEquals("TYPES[getEventType()]", XmlPullParser.TYPES[type], XmlPullParser.TYPES[xpp.getEventType()]);
assertEquals("getEventType()", type, xpp.getEventType());
assertEquals("getName()", name, xpp.getName());
@@ -173,7 +173,7 @@
assertEquals("getNamespacesCount(getDepth())", nsCount, xpp.getNamespaceCount(depth));
assertEquals("getNamespace()", namespace, xpp.getNamespace());
- if(type == xpp.START_TAG) {
+ if(type == XmlPullParser.START_TAG) {
assertEquals("isEmptyElementTag()", isEmpty, xpp.isEmptyElementTag());
} else {
try {
@@ -216,7 +216,7 @@
{
checkParserStateNs(xpp, depth, type, prefix, nsCount, namespace, name, isEmpty, attribCount);
- if(xpp.getEventType() != xpp.START_TAG && xpp.getEventType() != xpp.END_TAG) {
+ if(xpp.getEventType() != XmlPullParser.START_TAG && xpp.getEventType() != XmlPullParser.END_TAG) {
assertEquals("getText()", printable(text), printable(xpp.getText()));
int [] holderForStartAndLength = new int[2];
@@ -224,7 +224,7 @@
if(buf != null) {
String s = new String(buf, holderForStartAndLength[0], holderForStartAndLength[1]);
// ENTITY_REF is a special case when getText != (getTextCharacters == getName)
- if(xpp.getEventType() != xpp.ENTITY_REF) {
+ if(xpp.getEventType() != XmlPullParser.ENTITY_REF) {
assertEquals("getText(holder)", printable(text), printable(s));
} else {
assertEquals("getText(holder) ENTITY_REF", printable(name), printable(s));
@@ -245,7 +245,7 @@
String value
) throws XmlPullParserException, IOException
{
- assertEquals("must be on START_TAG", xpp.START_TAG, xpp.getEventType());
+ assertEquals("must be on START_TAG", XmlPullParser.START_TAG, xpp.getEventType());
assertEquals("getAttributePrefix()",null, xpp.getAttributePrefix(pos));
assertEquals("getAttributeNamespace()","", xpp.getAttributeNamespace(pos));
assertEquals("getAttributeName()",name, xpp.getAttributeName(pos));
@@ -264,7 +264,7 @@
String value
) throws XmlPullParserException, IOException
{
- assertEquals("must be on START_TAG", xpp.START_TAG, xpp.getEventType());
+ assertEquals("must be on START_TAG", XmlPullParser.START_TAG, xpp.getEventType());
assertEquals("getAttributeNamespace()",namespace, xpp.getAttributeNamespace(pos));
assertEquals("getAttributeName()",name, xpp.getAttributeName(pos));
assertEquals("getAttributeValue()",printable(value), printable(xpp.getAttributeValue(pos)));
1.7 +6 -6 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/XmlTestCase.java
Index: XmlTestCase.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/XmlTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -t -w -r1.6 -r1.7
--- XmlTestCase.java 9 Sep 2002 01:36:41 -0000 1.6
+++ XmlTestCase.java 28 Feb 2005 20:18:30 -0000 1.7
@@ -144,16 +144,16 @@
//wrapper.nextStartTag(NS_URI, "tests");
pp.nextTag();
- pp.require(pp.START_TAG, NS_URI, "tests");
- while(pp.nextTag() == pp.START_TAG) {
+ pp.require(XmlPullParser.START_TAG, NS_URI, "tests");
+ while(pp.nextTag() == XmlPullParser.START_TAG) {
executeTestParser(pp);
}
- pp.require(pp.END_TAG, NS_URI, "tests");
+ pp.require(XmlPullParser.END_TAG, NS_URI, "tests");
}
protected void executeTestParser(XmlPullParser pp) throws IOException, XmlPullParserException
{
- pp.require(pp.START_TAG, NS_URI, "test-parser");
+ pp.require(XmlPullParser.START_TAG, NS_URI, "test-parser");
String testName = pp.getAttributeValue("", "name");
verbose(">> START TEST '"+testName+"'");
//testFactory = XmlPullParserFactory.newInstance();
@@ -161,7 +161,7 @@
verbose(">> using testFactory='"+testFactory.getClass()+"'");
XmlPullParser testParser = null;
boolean testInputReady = false;
- while(pp.nextTag() == pp.START_TAG) {
+ while(pp.nextTag() == XmlPullParser.START_TAG) {
String action = pp.getName();
if("create-parser".equals(action)) {
testParser = testFactory.newPullParser();
@@ -233,7 +233,7 @@
}
}
- pp.require(pp.END_TAG, NS_URI, "test-parser");
+ pp.require(XmlPullParser.END_TAG, NS_URI, "test-parser");
verbose(">> END TEST '"+testName+"'");
}
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/