CVS Update: xmlpull-api-v1/addons/java/xmlrpc/samples
Aleksander Andrzej Slominski <[email protected]> Sat, 3 May 2003 01:19:22 -0500 (EST)
| Newsgroups | gmane.text.xml.xmlpull.devel |
|---|---|
| Message-ID | <[email protected]> |
aslom 03/05/03 01:19:22
Modified: addons/java/wrapper/samples WrapperSample.java
addons/java/wrapper/src/org/xmlpull/v1/wrapper
XmlPullWrapperFactory.java
addons/java/wrapper/src/org/xmlpull/v1/wrapper/junit
TestXmlPullWrapper.java
addons/java/xmlrpc/samples XmlRpcSample.java
Log:
added to wrapped factory methods to make it easier to do "drop in" replacement
fixed unit test
Revision Changes Path
1.2 +1 -1 xmlpull-api-v1/addons/java/wrapper/samples/WrapperSample.java
Index: WrapperSample.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/wrapper/samples/WrapperSample.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- WrapperSample.java 3 May 2003 05:56:45 -0000 1.1
+++ WrapperSample.java 3 May 2003 06:19:21 -0000 1.2
@@ -7,7 +7,7 @@
import org.xmlpull.v1.wrapper.XmlPullWrapperFactory;
/**
- * Example how to use wrapper addon to XmlPullApi
+ * Example how to use wrapper addon to XmlPull API
*
* @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander Slominski</a>
*/
1.2 +27 -0 xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/XmlPullWrapperFactory.java
Index: XmlPullWrapperFactory.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/XmlPullWrapperFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- XmlPullWrapperFactory.java 3 May 2003 05:56:45 -0000 1.1
+++ XmlPullWrapperFactory.java 3 May 2003 06:19:22 -0000 1.2
@@ -45,6 +45,33 @@
}
}
+
+ public void setFeature(String name,
+ boolean state) throws XmlPullParserException
+ {
+ factory.setFeature(name, state);
+ }
+
+
+ public boolean getFeature (String name) {
+ return factory.getFeature(name);
+ }
+
+ public void setNamespaceAware(boolean awareness) {
+ factory.setNamespaceAware(awareness);
+ }
+
+ public boolean isNamespaceAware() {
+ return factory.isNamespaceAware();
+ }
+
+ public void setValidating(boolean validating) {
+ factory.setValidating(validating);
+ }
+
+ public boolean isValidating() {
+ return factory.isValidating();
+ }
//public void setUseDynamic(boolean enable) { useDynamic = enable; };
//public boolean getUseDynamic() { return useDynamic; };
1.2 +18 -19 xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/junit/TestXmlPullWrapper.java
Index: TestXmlPullWrapper.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/junit/TestXmlPullWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- TestXmlPullWrapper.java 3 May 2003 05:56:47 -0000 1.1
+++ TestXmlPullWrapper.java 3 May 2003 06:19:22 -0000 1.2
@@ -10,8 +10,8 @@
import junit.framework.TestSuite;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlPullParserFactory;
-import org.xmlpull.v1.util.XmlPullWrapper;
+import org.xmlpull.v1.wrapper.XmlPullParserWrapper;
+import org.xmlpull.v1.wrapper.XmlPullWrapperFactory;
/**
* Test some wrapper utility operations.
@@ -19,7 +19,7 @@
* @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander Slominski</a>
*/
public class TestXmlPullWrapper extends TestCase {
- private XmlPullParserFactory factory;
+ private XmlPullWrapperFactory wrappedFactory;
public static void main (String[] args) {
junit.textui.TestRunner.run (new TestSuite(TestXmlPullWrapper.class));
@@ -31,10 +31,10 @@
}
protected void setUp() throws XmlPullParserException {
- factory = factory.newInstance();
- factory.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
- assertEquals(true, factory.getFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES));
- assertEquals(false, factory.getFeature(XmlPullParser.FEATURE_VALIDATION));
+ wrappedFactory = wrappedFactory.newInstance();
+ wrappedFactory.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
+ assertEquals(true, wrappedFactory.getFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES));
+ assertEquals(false, wrappedFactory.getFeature(XmlPullParser.FEATURE_VALIDATION));
}
public void testPI() throws IOException, XmlPullParserException {
@@ -61,25 +61,24 @@
"<tag><?"+PI+"?></tag>";
final String PI_NORMALIZED = normalized(PI);
- XmlPullParser pp = factory.newPullParser();
- XmlPullWrapper pw = new XmlPullWrapper(pp);
- pp.setInput(new StringReader(XML_TEST_PI));
-
- assertEquals(XmlPullParser.START_TAG, pp.next());
- assertEquals("tag", pp.getName());
- assertEquals(XmlPullParser.PROCESSING_INSTRUCTION, pp.nextToken());
- assertEquals(printable(PI_NORMALIZED), printable(pp.getText()));
- assertEquals(PI_NORMALIZED, pp.getText());
+ XmlPullParserWrapper pw = wrappedFactory.newPullWrapper();
+ pw.setInput(new StringReader(XML_TEST_PI));
+
+ assertEquals(XmlPullParser.START_TAG, pw.next());
+ assertEquals("tag", pw.getName());
+ assertEquals(XmlPullParser.PROCESSING_INSTRUCTION, pw.nextToken());
+ assertEquals(printable(PI_NORMALIZED), printable(pw.getText()));
+ assertEquals(PI_NORMALIZED, pw.getText());
assertEquals(printable(piTarget), printable(pw.getPITarget()));
assertEquals(piTarget, pw.getPITarget());
if(piData != null) {
assertEquals(printable(piData), printable(pw.getPIData()));
assertEquals(piData, pw.getPIData());
}
- assertEquals(pp.next(), XmlPullParser.END_TAG);
- assertEquals("tag", pp.getName());
+ assertEquals(pw.next(), XmlPullParser.END_TAG);
+ assertEquals("tag", pw.getName());
- assertEquals(pp.next(), XmlPullParser.END_DOCUMENT);
+ assertEquals(pw.next(), XmlPullParser.END_DOCUMENT);
}
private static String printable(char ch) {
1.2 +11 -8 xmlpull-api-v1/addons/java/xmlrpc/samples/XmlRpcSample.java
Index: XmlRpcSample.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/xmlrpc/samples/XmlRpcSample.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- XmlRpcSample.java 19 Feb 2003 16:27:36 -0000 1.1
+++ XmlRpcSample.java 3 May 2003 06:19:22 -0000 1.2
@@ -1,3 +1,6 @@
+/* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- //------100-columns-wide------>|*/
+// for license please see accompanying LICENSE.txt file (available also at http://www.xmlpull.org/)
+
import java.io.FileInputStream;
import org.xmlpull.v1.*;
------------------------ Yahoo! Groups Sponsor ---------------------~-->
Rent DVDs from home.
Over 14,500 titles. Free Shipping
& No Late Fees. Try Netflix for FREE!
http://us.click.yahoo.com/BVVfoB/hP.FAA/uetFAA/2U_rlB/TM
---------------------------------------------------------------------~->
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/