lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00
Code Activity

fixed another problem pointed by Stphane Bidoul Daniel

Browse Source 
* xmlreader.c python/tests/reader.py: fixed another problem
  pointed by Stphane Bidoul
Daniel
This commit is contained in:
Daniel Veillard
2002-12-30 12:37:59 +00:00
parent aaa105b590
commit 571b889b6b
3 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Dec 30 13:36:50 CET 2002 Daniel Veillard <daniel@veillard.com>
* xmlreader.c python/tests/reader.py: fixed another problem
pointed by St<53>phane Bidoul
Mon Dec 30 12:39:55 CET 2002 Daniel Veillard <daniel@veillard.com> Mon Dec 30 12:39:55 CET 2002 Daniel Veillard <daniel@veillard.com>
* xmlreader.c python/tests/reader.py: fixed a limit case problem * xmlreader.c python/tests/reader.py: fixed a limit case problem

71
python/tests/reader.py
View File

@ -235,34 +235,6 @@ if reader.MoveToNextAttribute() != 0:
print "Failed to detect last attribute" print "Failed to detect last attribute"
sys.exit(1) sys.exit(1)
#
# Another test provided by St<53>phane Bidoul and checked with C#
#
expect="""1 (a) [None]
1 (b) [None]
-- 2 (b1) [b1]
1 (c) [None]
3 (#text) [content of c]
15 (c) [None]
15 (a) [None]
"""
res=""
f = StringIO.StringIO("""<a><b b1="b1"/><c>content of c</c></a>""")
input = libxml2.inputBuffer(f)
reader = input.newTextReader("test5")
while reader.Read():
res=res + "%s (%s) [%s]\n" % (reader.NodeType(),reader.Name(),
reader.Value())
if reader.NodeType() == 1: # Element
while reader.MoveToNextAttribute():
res = res + "-- %s (%s) [%s]\n" % (reader.NodeType(),
reader.Name(),reader.Value())
if res != expect:
print "test5 failed"
print res
sys.exit(1)
# #
# a couple of tests for namespace nodes # a couple of tests for namespace nodes
@ -319,6 +291,49 @@ if ret != 0:
print "test8: failed to detect the EOF" print "test8: failed to detect the EOF"
sys.exit(1) sys.exit(1)
#
# Another test provided by St<53>phane Bidoul and checked with C#
#
def tst_reader(s):
f = StringIO.StringIO(s)
input = libxml2.inputBuffer(f)
reader = input.newTextReader("tst")
res = ""
while reader.Read():
res=res + "%s (%s) [%s] %d\n" % (reader.NodeType(),reader.Name(),
reader.Value(), reader.IsEmptyElement())
if reader.NodeType() == 1: # Element
while reader.MoveToNextAttribute():
res = res + "-- %s (%s) [%s]\n" % (reader.NodeType(),
reader.Name(),reader.Value())
return res
doc="""<a><b b1="b1"/><c>content of c</c></a>"""
expect="""1 (a) [None] 0
1 (b) [None] 1
-- 2 (b1) [b1]
1 (c) [None] 0
3 (#text) [content of c] 0
15 (c) [None] 0
15 (a) [None] 0
"""
res = tst_reader(doc)
if res != expect:
print "test5 failed"
print res
sys.exit(1)
doc="""<test><b/><c/></test>"""
expect="""1 (test) [None] 0
1 (b) [None] 1
1 (c) [None] 1
15 (test) [None] 0
"""
res = tst_reader(doc)
if res != expect:
print "test5 failed"
print res
sys.exit(1)
# #
# cleanup for memory allocation counting # cleanup for memory allocation counting

3
xmlreader.c
View File

@ -431,7 +431,8 @@ xmlTextReaderRead(xmlTextReaderPtr reader) {
return(1); return(1);
} }
if ((oldstate == XML_TEXTREADER_ELEMENT) && if ((oldstate == XML_TEXTREADER_ELEMENT) &&
(reader->node->type == XML_ELEMENT_NODE)) { (reader->node->type == XML_ELEMENT_NODE) &&
(wasempty == 0)) {
reader->state = XML_TEXTREADER_END; reader->state = XML_TEXTREADER_END;
DUMP_READER DUMP_READER
return(1); return(1);