CVS Update: xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests
Aleksander Andrzej Slominski <[email protected]> Mon, 23 Oct 2006 01:05:58 -0400 (EDT)
| Newsgroups | gmane.text.xml.xmlpull.devel |
|---|---|
| Message-ID | <[email protected]> |
aslom 06/10/23 01:05:58
Modified: addons/java/dom2_builder/src/org/xmlpull/v1/dom2_builder
DOM2XmlPullBuilder.java
addons/java/tests/org/xmlpull/v1/dom2_builder
TestDOM2XmlPullBuilder.java
doc changes.html
src/java/tests/org/xmlpull/v1/tests PackageTests.java
Log:
sync
Revision Changes Path
1.9 +29 -26 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.8
retrieving revision 1.9
diff -u -b -t -w -r1.8 -r1.9
--- DOM2XmlPullBuilder.java 23 Oct 2006 04:01:08 -0000 1.8
+++ DOM2XmlPullBuilder.java 23 Oct 2006 05:05:58 -0000 1.9
@@ -182,7 +182,10 @@
String prefix = pp.getNamespacePrefix(i);
for (int j = top; j > i; --j)
{
- if(prefix.equals(pp.getNamespacePrefix(j))) {
+ String prefixJ = pp.getNamespacePrefix(j);
+ if((prefix != null && prefix.equals(prefixJ))
+ || (prefix != null && prefix == prefixJ) )
+ {
// prefix is already declared -- skip it
continue LOOP;
}
1.2 +65 -29 xmlpull-api-v1/addons/java/tests/org/xmlpull/v1/dom2_builder/TestDOM2XmlPullBuilder.java
Index: TestDOM2XmlPullBuilder.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/tests/org/xmlpull/v1/dom2_builder/TestDOM2XmlPullBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- TestDOM2XmlPullBuilder.java 23 Oct 2006 04:18:52 -0000 1.1
+++ TestDOM2XmlPullBuilder.java 23 Oct 2006 05:05:58 -0000 1.2
@@ -35,6 +35,42 @@
protected void setUp() throws XmlPullParserException {
}
+
+ final String DEFAULT_NS_XML =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
+ "<ServerConfiguration xmlns=\" http://your-namespace-here\" \n"+
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchem a-instance\" xsi:schemaLocation=\"http://your-namespace-here test.xsd\">\n"+
+ " <Server>savage-m60</Server>\n"+
+ "</ServerConfiguration>\n"+
+ "";
+
+ public void testDomDefaultNs() throws IOException, XmlPullParserException {
+ testDom(DEFAULT_NS_XML);
+ }
+
+ final String PREFIXED_NS_XML =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"+
+ "<jtc:ServerConfiguration xmlns:jtc=\" http://your-namespace-here\" \n"+
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchem a-instance\" xsi:schemaLocation=\"http://your-namespace-here test.xsd\">\n"+
+ " <jtc:Server>savage-m60</jtc:Server>\n"+
+ "</jtc:ServerConfiguration>\n"+
+ "";
+
+ public void testDomPrefixNs() throws IOException, XmlPullParserException {
+ testDom(PREFIXED_NS_XML);
+ }
+
+ public void testDom(final String XML) throws IOException, XmlPullParserException {
+ DOM2XmlPullBuilder builder = new DOM2XmlPullBuilder();
+
+ StringReader reader = new StringReader(XML);
+
+ // create document
+
+ Element el1 = builder.parse(reader);
+ // show it ...
+ }
+
public void testSimpleBuild() throws IOException, XmlPullParserException {
DOM2XmlPullBuilder builder = new DOM2XmlPullBuilder();
@@ -75,13 +111,13 @@
Element root = el2; //doc2.getDocumentElement();
//System.out.println("root="+root);
- System.out.println ("root ns=" + root.getNamespaceURI() + ", localName=" +root.getLocalName());
+ //System.out.println ("root ns=" + root.getNamespaceURI() + ", localName=" +root.getLocalName());
assertEquals("uri1", root.getNamespaceURI());
assertEquals("foo", root.getLocalName());
NodeList children = root.getElementsByTagNameNS("*","bar");
Element bar = (Element)children.item(0);
- System.out.println ("bar ns=" + bar.getNamespaceURI() + ", localName=" +bar.getLocalName());
+ //System.out.println ("bar ns=" + bar.getNamespaceURI() + ", localName=" +bar.getLocalName());
assertEquals("uri2", bar.getNamespaceURI());
assertEquals("bar", bar.getLocalName());
@@ -96,7 +132,7 @@
Text text = (Text)bar.getFirstChild();
- System.out.println("text="+text.getNodeValue());
+ //System.out.println("text="+text.getNodeValue());
assertEquals("baz", text.getNodeValue());
}
1.60 +1 -1 xmlpull-api-v1/doc/changes.html
Index: changes.html
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/doc/changes.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -t -w -r1.59 -r1.60
--- changes.html 23 Oct 2006 05:05:23 -0000 1.59
+++ changes.html 23 Oct 2006 05:05:58 -0000 1.60
@@ -23,7 +23,7 @@
-->
<h3>IN PROGRESS:</h3>
- <h3><a name="XMLPULL_1_1_4"></a>2006-10- (XMLPULL_1_1_4)</h3>
+ <h3><a name="XMLPULL_1_1_4"></a>2006-10-23 (XMLPULL_1_1_4)</h3>
<ul>
<li>2006-10-22 (XMLPULL_1_1_3_4c): fixed
1.22 +1 -1 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.21
retrieving revision 1.22
diff -u -b -t -w -r1.21 -r1.22
--- PackageTests.java 23 Oct 2006 04:20:59 -0000 1.21
+++ PackageTests.java 23 Oct 2006 05:05:58 -0000 1.22
@@ -26,7 +26,7 @@
private static boolean runAll;
public static boolean runnigAllTests() { return runAll; }
- public static void setRunnigAllTests(boolean enable) { runAll = enable; }
+ //public static void setRunnigAllTests(boolean enable) { runAll = enable; }
public PackageTests() {
super();
Yahoo! Groups Links
<*> To visit your group on the web, go to:
http://groups.yahoo.com/group/xmlpull-dev/
<*> Your email settings:
Individual Email | Traditional
<*> To change settings online go to:
http://groups.yahoo.com/group/xmlpull-dev/join
(Yahoo! ID required)
<*> To change settings via email:
mailto:[email protected]
mailto:[email protected]
<*> To unsubscribe from this group, send an email to:
[email protected]
<*> Your use of Yahoo! Groups is subject to:
http://docs.yahoo.com/info/terms/