c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

adding xml:id draft support adding 4 first regression tests Daniel

Browse Source 
* SAX2.c include/libxml/tree.h: adding xml:id draft support
* Makefile.am test/xmlid/id_tst* result/xmlid/id_tst*: adding
  4 first regression tests
Daniel
This commit is contained in:
Daniel Veillard 2004-04-09 21:51:49 +00:00
parent 80c0092ba9
commit 67f8b1cd96
16 changed files with 98 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Apr 9 23:49:37 CEST 2004 Daniel Veillard <daniel@veillard.com>
* SAX2.c include/libxml/tree.h: adding xml:id draft support
* Makefile.am test/xmlid/id_tst* result/xmlid/id_tst*: adding
4 first regression tests
Fri Apr 9 11:56:08 CEST 2004 Daniel Veillard <daniel@veillard.com>
* libxml.spec.in: fixing Red Hat bug #120482 , libxml2-python

23
Makefile.am
View File

@ -122,7 +122,7 @@ check-local: tests
testall : tests SVGtests SAXtests
tests: XMLtests XMLenttests NStests Errtests @READER_TEST@ @TEST_SAX@ @TEST_PUSH@ @TEST_HTML@ @TEST_PHTML@ @TEST_VALID@ URItests @TEST_XPATH@ @TEST_XPTR@ @TEST_XINCLUDE@ @TEST_C14N@ @TEST_DEBUG@ @TEST_CATALOG@ @TEST_REGEXPS@ @TEST_SCHEMAS@ @TEST_THREADS@ Timingtests @TEST_VTIME@ @PYTHON_TESTS@
tests: XMLtests XMLenttests NStests IDtests Errtests @READER_TEST@ @TEST_SAX@ @TEST_PUSH@ @TEST_HTML@ @TEST_PHTML@ @TEST_VALID@ URItests @TEST_XPATH@ @TEST_XPTR@ @TEST_XINCLUDE@ @TEST_C14N@ @TEST_DEBUG@ @TEST_CATALOG@ @TEST_REGEXPS@ @TEST_SCHEMAS@ @TEST_THREADS@ Timingtests @TEST_VTIME@ @PYTHON_TESTS@
@(if [ "@PYTHON_SUBDIR@" != "" ] ; then cd python ; $(MAKE) tests ; fi)
@(cd doc/examples ; $(MAKE) tests)
@ -281,6 +281,27 @@ NStests : xmllint$(EXEEXT)
rm result.$$name error.$$name ; \
fi ; fi ; done)
IDtests : xmllint$(EXEEXT) testXPath$(EXEEXT)
@(echo > .memdump)
@echo "## xml:id regression tests"
-@(for i in $(srcdir)/test/xmlid/id_*.xml ; do \
name=`basename $$i`; \
if [ ! -d $$i ] ; then \
if [ ! -f $(srcdir)/result/xmlid/$$name ] ; then \
echo New test file $$name ; \
$(CHECKER) $(top_builddir)/testXPath -i $$i "id('bar')" \
2> $(srcdir)/result/xmlid/$$name.err \
> $(srcdir)/result/xmlid/$$name ; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
else \
log=`$(CHECKER) $(top_builddir)/testXPath -i $$i "id('bar')" 2> error.$$name > result.$$name ; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
diff $(srcdir)/result/xmlid/$$name result.$$name ; \
diff $(srcdir)/result/xmlid/$$name.err error.$$name` ; \
if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
rm result.$$name error.$$name ; \
fi ; fi ; done)
Errtests : xmllint$(EXEEXT)
@(echo > .memdump)
@echo "## Error cases regression tests"

21
SAX2.c
View File

@ -1204,6 +1204,14 @@ xmlSAX2AttributeInternal(void *ctx, const xmlChar *fullname,
xmlAddID(&ctxt->vctxt, ctxt->myDoc, value, ret);
else if (xmlIsRef(ctxt->myDoc, ctxt->node, ret))
xmlAddRef(&ctxt->vctxt, ctxt->myDoc, value, ret);
else if (xmlStrEqual(fullname, BAD_CAST "xml:id")) {
/*
* Add the xml:id value
*
* Open issue: normalization of the value.
*/
xmlAddID(&ctxt->vctxt, ctxt->myDoc, value, ret);
}
}
error:
@ -1925,7 +1933,18 @@ xmlSAX2AttributeNs(xmlParserCtxtPtr ctxt,
if (dup == NULL)
dup = xmlStrndup(value, valueend - value);
xmlAddRef(&ctxt->vctxt, ctxt->myDoc, dup, ret);
}
} else if ((prefix == ctxt->str_xml) &&
(localname[0] == 'i') && (localname[1] == 'd') &&
(localname[2] == 0)) {
/*
* Add the xml:id value
*
* Open issue: normalization of the value.
*/
if (dup == NULL)
dup = xmlStrndup(value, valueend - value);
xmlAddID(&ctxt->vctxt, ctxt->myDoc, dup, ret);
}
}
if (dup != NULL)
xmlFree(dup);

7
include/libxml/tree.h
View File

@ -63,6 +63,13 @@ typedef xmlEntity *xmlEntityPtr;
#define XML_XML_NAMESPACE \
(const xmlChar *) "http://www.w3.org/XML/1998/namespace"
/**
* XML_XML_ID:
*
* This is the name for the special xml:id attribute
*/
#define XML_XML_ID (const xmlChar *) "xml:id"
/*
* The different element types carried by an XML tree.
*

6
result/xmlid/id_tst1.xml Normal file
View File

@ -0,0 +1,6 @@
Object is a Node Set :
Set contains 1 nodes:
1 ELEMENT foo
ATTRIBUTE id
TEXT
content=bar

0
result/xmlid/id_tst1.xml.err Normal file
View File

6
result/xmlid/id_tst2.xml Normal file
View File

@ -0,0 +1,6 @@
Object is a Node Set :
Set contains 1 nodes:
1 ELEMENT foo
ATTRIBUTE id
TEXT
content=bar

3
result/xmlid/id_tst2.xml.err Normal file
View File

@ -0,0 +1,3 @@
./test/xmlid/id_tst2.xml:1: namespace error : Namespace prefix n on foo is not defined
<n:foo xml:id="bar"/>
^

6
result/xmlid/id_tst3.xml Normal file
View File

@ -0,0 +1,6 @@
Object is a Node Set :
Set contains 1 nodes:
1 ELEMENT o:o
ATTRIBUTE id
TEXT
content=bar

6
result/xmlid/id_tst3.xml.err Normal file
View File

@ -0,0 +1,6 @@
./test/xmlid/id_tst3.xml:1: namespace error : Failed to parse QName 'f:o:'
<f:o:o xml:id="bar"/>
^
./test/xmlid/id_tst3.xml:1: namespace error : Namespace prefix f on o:o is not defined
<f:o:o xml:id="bar"/>
^

6
result/xmlid/id_tst4.xml Normal file
View File

@ -0,0 +1,6 @@
Object is a Node Set :
Set contains 1 nodes:
1 ELEMENT foo
ATTRIBUTE id
TEXT
content=bar

3
result/xmlid/id_tst4.xml.err Normal file
View File

@ -0,0 +1,3 @@
./test/xmlid/id_tst4.xml:3: element err: validity error : ID bar already defined
<err xml:id="bar"/>
^

1
test/xmlid/id_tst1.xml Normal file
View File

@ -0,0 +1 @@
<foo xml:id="bar"/>

1
test/xmlid/id_tst2.xml Normal file
View File

@ -0,0 +1 @@
<n:foo xml:id="bar"/>

1
test/xmlid/id_tst3.xml Normal file
View File

@ -0,0 +1 @@
<f:o:o xml:id="bar"/>

4
test/xmlid/id_tst4.xml Normal file
View File

@ -0,0 +1,4 @@
<doc>
<foo xml:id="bar"/>
<err xml:id="bar"/>
</doc>