diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2016-10-19 18:26:52 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2016-10-19 18:26:52 (GMT) |
| commit | 818fd731f62993dc8aa5d07b82e1d1b2c04aae7d (patch) | |
| tree | 41a61b0a1b18ed5ffeeb028e986b3586f9063628 /libxml2/test/c14n | |
| parent | d72feaf69933b069cff3c0cb20a5f5f03ecba77b (diff) | |
| download | blt-818fd731f62993dc8aa5d07b82e1d1b2c04aae7d.zip blt-818fd731f62993dc8aa5d07b82e1d1b2c04aae7d.tar.gz blt-818fd731f62993dc8aa5d07b82e1d1b2c04aae7d.tar.bz2 | |
update libxml2
Diffstat (limited to 'libxml2/test/c14n')
150 files changed, 0 insertions, 1701 deletions
diff --git a/libxml2/test/c14n/1-1-without-comments/doc.dtd b/libxml2/test/c14n/1-1-without-comments/doc.dtd deleted file mode 100755 index c460239..0000000 --- a/libxml2/test/c14n/1-1-without-comments/doc.dtd +++ /dev/null @@ -1 +0,0 @@ -<!-- Empty DTD -->
\ No newline at end of file diff --git a/libxml2/test/c14n/1-1-without-comments/example-1.xml b/libxml2/test/c14n/1-1-without-comments/example-1.xml deleted file mode 100755 index ed450c7..0000000 --- a/libxml2/test/c14n/1-1-without-comments/example-1.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> - -<?xml-stylesheet href="doc.xsl" - type="text/xsl" ?> - -<!DOCTYPE doc SYSTEM "doc.dtd"> - -<doc>Hello, world!<!-- Comment 1 --></doc> - -<?pi-without-data ?> - -<!-- Comment 2 --> - -<!-- Comment 3 --> diff --git a/libxml2/test/c14n/1-1-without-comments/example-2.xml b/libxml2/test/c14n/1-1-without-comments/example-2.xml deleted file mode 100755 index 74eeea1..0000000 --- a/libxml2/test/c14n/1-1-without-comments/example-2.xml +++ /dev/null @@ -1,11 +0,0 @@ -<doc> - <clean> </clean> - <dirty> A B </dirty> - <mixed> - A - <clean> </clean> - B - <dirty> A B </dirty> - C - </mixed> -</doc> diff --git a/libxml2/test/c14n/1-1-without-comments/example-3.xml b/libxml2/test/c14n/1-1-without-comments/example-3.xml deleted file mode 100755 index a7a1950..0000000 --- a/libxml2/test/c14n/1-1-without-comments/example-3.xml +++ /dev/null @@ -1,18 +0,0 @@ -<!DOCTYPE doc [<!ATTLIST e9 attr CDATA "default">]> -<doc> - <e1 /> - <e2 ></e2> - <e3 name = "elem3" id="elem3" /> - <e4 name="elem4" id="elem4" ></e4> - <e5 a:attr="out" b:attr="sorted" attr2="all" attr="I'm" - xmlns:b="http://www.ietf.org" - xmlns:a="http://www.w3.org" - xmlns="http://www.uvic.ca"/> - <e6 xmlns="" xmlns:a="http://www.w3.org"> - <e7 xmlns="http://www.ietf.org"> - <e8 xmlns="" xmlns:a="http://www.w3.org"> - <e9 xmlns="" xmlns:a="http://www.ietf.org"/> - </e8> - </e7> - </e6> -</doc> diff --git a/libxml2/test/c14n/1-1-without-comments/example-4.xml b/libxml2/test/c14n/1-1-without-comments/example-4.xml deleted file mode 100755 index 3fba138..0000000 --- a/libxml2/test/c14n/1-1-without-comments/example-4.xml +++ /dev/null @@ -1,9 +0,0 @@ -<!DOCTYPE doc [<!ATTLIST normId id ID #IMPLIED>]> -<doc> - <text>First line
 Second line</text> - <value>2</value> - <compute><![CDATA[value>"0" && value<"10" ?"valid":"error"]]></compute> - <compute expr='value>"0" && value<"10" ?"valid":"error"'>valid</compute> - <norm attr=' '   
	 ' '/> - <normId id=' '   
	 ' '/> -</doc> diff --git a/libxml2/test/c14n/1-1-without-comments/example-5.xml b/libxml2/test/c14n/1-1-without-comments/example-5.xml deleted file mode 100755 index 92c5322..0000000 --- a/libxml2/test/c14n/1-1-without-comments/example-5.xml +++ /dev/null @@ -1,12 +0,0 @@ -<!DOCTYPE doc [ -<!ATTLIST doc attrExtEnt ENTITY #IMPLIED> -<!ENTITY ent1 "Hello"> -<!ENTITY ent2 SYSTEM "world.txt"> -<!ENTITY entExt SYSTEM "earth.gif" NDATA gif> -<!NOTATION gif SYSTEM "viewgif.exe"> -]> -<doc attrExtEnt="entExt"> - &ent1;, &ent2;! -</doc> - -<!-- Let world.txt contain "world" (excluding the quotes) --> diff --git a/libxml2/test/c14n/1-1-without-comments/example-6.xml b/libxml2/test/c14n/1-1-without-comments/example-6.xml deleted file mode 100755 index 31e2071..0000000 --- a/libxml2/test/c14n/1-1-without-comments/example-6.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<doc>©</doc> diff --git a/libxml2/test/c14n/1-1-without-comments/example-7.xml b/libxml2/test/c14n/1-1-without-comments/example-7.xml deleted file mode 100755 index 41171cb..0000000 --- a/libxml2/test/c14n/1-1-without-comments/example-7.xml +++ /dev/null @@ -1,11 +0,0 @@ -<!DOCTYPE doc [ -<!ATTLIST e2 xml:space (default|preserve) 'preserve'> -<!ATTLIST e3 id ID #IMPLIED> -]> -<doc xmlns="http://www.ietf.org" xmlns:w3c="http://www.w3.org"> - <e1> - <e2 xmlns=""> - <e3 id="E3"/> - </e2> - </e1> -</doc> diff --git a/libxml2/test/c14n/1-1-without-comments/example-7.xpath b/libxml2/test/c14n/1-1-without-comments/example-7.xpath deleted file mode 100755 index 84ddb08..0000000 --- a/libxml2/test/c14n/1-1-without-comments/example-7.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<XPath xmlns:ietf="http://www.ietf.org" > - (//.|//@*|//namespace::*) - [ - self::ietf:e1 - or - (parent::ietf:e1 and not(self::text() or self::e2)) - or - count(id("E3")|ancestor-or-self::node()) = count(ancestor-or-self::node()) - ] -</XPath>
\ No newline at end of file diff --git a/libxml2/test/c14n/1-1-without-comments/example-8.xml b/libxml2/test/c14n/1-1-without-comments/example-8.xml deleted file mode 100755 index a07f6c7..0000000 --- a/libxml2/test/c14n/1-1-without-comments/example-8.xml +++ /dev/null @@ -1,11 +0,0 @@ -<!DOCTYPE doc [ -<!ATTLIST e2 xml:space (default|preserve) 'preserve'> -<!ATTLIST e3 id ID #IMPLIED> -]> -<doc xmlns="http://www.ietf.org" xmlns:w3c="http://www.w3.org" xml:base="something/else"> - <e1> - <e2 xmlns="" xml:id="abc" xml:base="bar/"> - <e3 id="E3" xml:base="foo"/> - </e2> - </e1> -</doc> diff --git a/libxml2/test/c14n/1-1-without-comments/example-8.xpath b/libxml2/test/c14n/1-1-without-comments/example-8.xpath deleted file mode 100755 index 84ddb08..0000000 --- a/libxml2/test/c14n/1-1-without-comments/example-8.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<XPath xmlns:ietf="http://www.ietf.org" > - (//.|//@*|//namespace::*) - [ - self::ietf:e1 - or - (parent::ietf:e1 and not(self::text() or self::e2)) - or - count(id("E3")|ancestor-or-self::node()) = count(ancestor-or-self::node()) - ] -</XPath>
\ No newline at end of file diff --git a/libxml2/test/c14n/1-1-without-comments/world.txt b/libxml2/test/c14n/1-1-without-comments/world.txt deleted file mode 100755 index 04fea06..0000000 --- a/libxml2/test/c14n/1-1-without-comments/world.txt +++ /dev/null @@ -1 +0,0 @@ -world
\ No newline at end of file diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec-102.xml b/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec-102.xml deleted file mode 100644 index 18b7c75..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec-102.xml +++ /dev/null @@ -1,16 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-c14n11spec-102 - -Check that correct xml:base fixup is performed. ---> -<!DOCTYPE doc [ - <!ATTLIST e2 xml:space (default|preserve) 'preserve'> - <!ATTLIST e3 id ID #IMPLIED> -]> -<doc xmlns="http://www.ietf.org" xmlns:w3c="http://www.w3.org" xml:base="http://www.example.com/something/else"> - <e1> - <e2 xmlns="" xml:id="abc" xml:base="../bar/"> - <e3 id="E3" xml:base="foo"/> - </e2> - </e1> -</doc>
\ No newline at end of file diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec-102.xpath b/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec-102.xpath deleted file mode 100644 index e919acc..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec-102.xpath +++ /dev/null @@ -1,9 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-c14n11spec-102 - -Check that correct xml:base fixup is performed. ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[self::ietf:e1 or (parent::ietf:e1 and not(self::text() or self::e2)) or count(id("E3")|ancestor-or-self::node()) = count(ancestor-or-self::node())] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec2-102.xml b/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec2-102.xml deleted file mode 100644 index d271afd..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec2-102.xml +++ /dev/null @@ -1,16 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-c14n11spec2-102 - -Check that correct xml:base fixup is performed. ---> -<!DOCTYPE doc [ - <!ATTLIST e2 xml:space (default|preserve) 'preserve'> - <!ATTLIST e3 id ID #IMPLIED> -]> -<doc xmlns="http://www.ietf.org" xmlns:w3c="http://www.w3.org" xml:base="something/else"> - <e1> - <e2 xmlns="" xml:id="abc" xml:base="bar/"> - <e3 id="E3" xml:base="foo"/> - </e2> - </e1> -</doc>
\ No newline at end of file diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec2-102.xpath b/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec2-102.xpath deleted file mode 100644 index cdaad3e..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec2-102.xpath +++ /dev/null @@ -1,9 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-c14n11spec2-102 - -Check that correct xml:base fixup is performed. ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[self::ietf:e1 or (parent::ietf:e1 and not(self::text() or self::e2)) or count(id("E3")|ancestor-or-self::node()) = count(ancestor-or-self::node())] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec3-102.xml b/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec3-102.xml deleted file mode 100644 index f46e1e9..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec3-102.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-c14n11spec3-102 - -Check that correct xml:base fixup is performed. ---> -<a xml:base="foo/bar"> - <b xml:base=".."> - <c xml:base=".."> - <d xml:base="x"> - </d> - </c> - </b> -</a> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec3-102.xpath b/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec3-102.xpath deleted file mode 100644 index 1d8dd71..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-c14n11spec3-102.xpath +++ /dev/null @@ -1,9 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-c14n11spec2-102 - -Check that correct xml:base fixup is performed. ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[self::a or ancestor-or-self::d] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-1.xml b/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-1.xml deleted file mode 100755 index 24a899b..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-1.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-prop-1 - -Check that implementations of [XML-C14N1.1] work properly when the -xml:base origin appears in the output document subset and also children -with xml:base, which do not require further processing, are also present. ---> -<ietf:c14n11XmlBaseDoc1 xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org" xml:base="http://xmlbase.example.org/xmlbase0/"> - <ietf:e1 xml:base="/xmlbase1/"> - <ietf:e11 xml:base="/xmlbase11/"> - <ietf:e111 xml:base="/xmlbase111/"/> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 xml:base="/xmlbase121/"/> - </ietf:e12> - </ietf:e1> - <ietf:e2> - <ietf:e21 xml:base="/xmlbase21/"/> - </ietf:e2> - <ietf:e3> - <ietf:e31 at="3"/> - </ietf:e3> -</ietf:c14n11XmlBaseDoc1> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-1.xpath b/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-1.xpath deleted file mode 100755 index 168e98d..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-1.xpath +++ /dev/null @@ -1,11 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-prop-1 - -Check that implementations of [XML-C14N1.1] work properly when the -xml:base origin appears in the output document subset and also children -with xml:base, which do not require further processing, are also present. ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:c14n11XmlBaseDoc1 and not(ancestor-or-self::ietf:e2)] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-2.xml b/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-2.xml deleted file mode 100755 index 4c85329..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-2.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-prop-2 - -Check that implementations of [XML-C14N1.1] properly build the xml:base -at the first level (ietf:e1). ---> -<ietf:c14n11XmlBaseDoc1 xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org" xml:base="http://xmlbase.example.org/xmlbase0/"> - <ietf:e1 xml:base="/xmlbase1/"> - <ietf:e11 xml:base="/xmlbase11/"> - <ietf:e111 xml:base="/xmlbase111/"/> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 xml:base="/xmlbase121/"/> - </ietf:e12> - </ietf:e1> - <ietf:e2> - <ietf:e21 xml:base="/xmlbase21/"/> - </ietf:e2> - <ietf:e3> - <ietf:e31 at="3"/> - </ietf:e3> -</ietf:c14n11XmlBaseDoc1> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-2.xpath b/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-2.xpath deleted file mode 100755 index fdab085..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-2.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-prop-2 - -Check that implementations of [XML-C14N1.1] properly build the xml:base -at the first level (ietf:e1). ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:e1] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-3.xml b/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-3.xml deleted file mode 100755 index 19ce738..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-3.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-prop-3 - -Check that implementations of [XML-C14N1.1] properly build the xml:base -if one of intermediate the levels (ietf:e1) are absent from the document -subset. ---> -<ietf:c14n11XmlBaseDoc1 xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org" xml:base="http://xmlbase.example.org/xmlbase0/"> - <ietf:e1 xml:base="/xmlbase1/"> - <ietf:e11 xml:base="/xmlbase11/"> - <ietf:e111 xml:base="/xmlbase111/"/> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 xml:base="/xmlbase121/"/> - </ietf:e12> - </ietf:e1> - <ietf:e2> - <ietf:e21 xml:base="/xmlbase21/"/> - </ietf:e2> - <ietf:e3> - <ietf:e31 at="3"/> - </ietf:e3> -</ietf:c14n11XmlBaseDoc1> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-3.xpath b/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-3.xpath deleted file mode 100755 index de87508..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-3.xpath +++ /dev/null @@ -1,11 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-prop-3 - -Check that implementations of [XML-C14N1.1] properly build the xml:base -if one of intermediate the levels (ietf:e1) are absent from the document -subset. ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:e11] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-4.xml b/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-4.xml deleted file mode 100755 index 57e4436..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-4.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-prop-4 - -Check that implementations of [XML-C14N1.1] properly build the xml:base -if several intermediate levels (ietf:e1 and ietf:e11) are absent from -the document subset. ---> -<ietf:c14n11XmlBaseDoc1 xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org" xml:base="http://xmlbase.example.org/xmlbase0/"> - <ietf:e1 xml:base="/xmlbase1/"> - <ietf:e11 xml:base="/xmlbase11/"> - <ietf:e111 xml:base="/xmlbase111/"/> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 xml:base="/xmlbase121/"/> - </ietf:e12> - </ietf:e1> - <ietf:e2> - <ietf:e21 xml:base="/xmlbase21/"/> - </ietf:e2> - <ietf:e3> - <ietf:e31 at="3"/> - </ietf:e3> -</ietf:c14n11XmlBaseDoc1> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-4.xpath b/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-4.xpath deleted file mode 100755 index 818ef10..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-4.xpath +++ /dev/null @@ -1,11 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-prop-4 - -Check that implementations of [XML-C14N1.1] properly build the xml:base -if several intermediate levels (ietf:e1 and ietf:e11) are absent from -the document subset. ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:e111] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-5.xml b/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-5.xml deleted file mode 100755 index f92a897..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-5.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-prop-5 - -Check that implementations of [XML-C14N1.1] properly build the xml:base -if one intermediate level (ietf:e2) without any xml:base attribute is absent -from the document subset. ---> -<ietf:c14n11XmlBaseDoc1 xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org" xml:base="http://xmlbase.example.org/xmlbase0/"> - <ietf:e1 xml:base="/xmlbase1/"> - <ietf:e11 xml:base="/xmlbase11/"> - <ietf:e111 xml:base="/xmlbase111/"/> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 xml:base="/xmlbase121/"/> - </ietf:e12> - </ietf:e1> - <ietf:e2> - <ietf:e21 xml:base="/xmlbase21/"/> - </ietf:e2> - <ietf:e3> - <ietf:e31 at="3"/> - </ietf:e3> -</ietf:c14n11XmlBaseDoc1> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-5.xpath b/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-5.xpath deleted file mode 100755 index 7020803..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-5.xpath +++ /dev/null @@ -1,11 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-prop-5 - -Check that implementations of [XML-C14N1.1] properly build the xml:base -if one intermediate level (ietf:e2) without any xml:base attribute is absent -from the document subset. ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:e21] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-6.xml b/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-6.xml deleted file mode 100755 index 62824f9..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-6.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-prop-6 - -Check that implementations of [XML-C14N1.1] properly build the xml:base in -one element that originally had no xml:base attribute. ---> -<ietf:c14n11XmlBaseDoc1 xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org" xml:base="http://xmlbase.example.org/xmlbase0/"> - <ietf:e1 xml:base="/xmlbase1/"> - <ietf:e11 xml:base="/xmlbase11/"> - <ietf:e111 xml:base="/xmlbase111/"/> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 xml:base="/xmlbase121/"/> - </ietf:e12> - </ietf:e1> - <ietf:e2> - <ietf:e21 xml:base="/xmlbase21/"/> - </ietf:e2> - <ietf:e3> - <ietf:e31 at="3"/> - </ietf:e3> -</ietf:c14n11XmlBaseDoc1> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-6.xpath b/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-6.xpath deleted file mode 100755 index 2b93c64..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-6.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-prop-6 - -Check that implementations of [XML-C14N1.1] properly build the xml:base in -one element that originally had no xml:base attribute. ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:e3] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-7.xml b/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-7.xml deleted file mode 100755 index ee13916..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-7.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-prop-7 - -Check that implementations of [XML-C14N1.1] do not pass the xml:base -to another element when it is not necessary. ---> -<ietf:c14n11XmlBaseDoc1 xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org" xml:base="http://xmlbase.example.org/xmlbase0/"> - <ietf:e1 xml:base="/xmlbase1/"> - <ietf:e11 xml:base="/xmlbase11/"> - <ietf:e111 xml:base="/xmlbase111/"/> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 xml:base="/xmlbase121/"/> - </ietf:e12> - </ietf:e1> - <ietf:e2> - <ietf:e21 xml:base="/xmlbase21/"/> - </ietf:e2> - <ietf:e3> - <ietf:e31 at="3"/> - </ietf:e3> -</ietf:c14n11XmlBaseDoc1> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-7.xpath b/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-7.xpath deleted file mode 100755 index 7d37ab8..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlbase-prop-7.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#c14n11xmlbase-prop-7 - -Check that implementations of [XML-C14N1.1] do not pass the xml:base -to another element when it is not necessary. ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:c14n11XmlBaseDoc1 and not(ancestor-or-self::ietf:e1 or ancestor-or-self::ietf:e2)] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlid-prop-1.xml b/libxml2/test/c14n/1-1-without-comments/xmlid-prop-1.xml deleted file mode 100644 index ca58c2b..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlid-prop-1.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLID - -Check that implementations of [XML-C14N1.1] handle xml:id attributes -as defined in [XML-C14N1.1] ---> -<ietf:c14n11XmlIdDoc1 xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org"> - <ietf:e1 xml:id="IdInterop"> - <ietf:e11> - <ietf:e111 /> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 /> - </ietf:e12> - </ietf:e1> - <ietf:e2 > - <ietf:e21 /> - </ietf:e2> -</ietf:c14n11XmlIdDoc1>
\ No newline at end of file diff --git a/libxml2/test/c14n/1-1-without-comments/xmlid-prop-1.xpath b/libxml2/test/c14n/1-1-without-comments/xmlid-prop-1.xpath deleted file mode 100755 index dc5573c..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlid-prop-1.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLID - -Check that implementations of [XML-C14N1.1] handle xml:id attributes -as defined in [XML-C14N1.1] ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:e1] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlid-prop-2.xml b/libxml2/test/c14n/1-1-without-comments/xmlid-prop-2.xml deleted file mode 100644 index ca58c2b..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlid-prop-2.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLID - -Check that implementations of [XML-C14N1.1] handle xml:id attributes -as defined in [XML-C14N1.1] ---> -<ietf:c14n11XmlIdDoc1 xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org"> - <ietf:e1 xml:id="IdInterop"> - <ietf:e11> - <ietf:e111 /> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 /> - </ietf:e12> - </ietf:e1> - <ietf:e2 > - <ietf:e21 /> - </ietf:e2> -</ietf:c14n11XmlIdDoc1>
\ No newline at end of file diff --git a/libxml2/test/c14n/1-1-without-comments/xmlid-prop-2.xpath b/libxml2/test/c14n/1-1-without-comments/xmlid-prop-2.xpath deleted file mode 100755 index bed44b7..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlid-prop-2.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLID - -Check that implementations of [XML-C14N1.1] handle xml:id attributes -as defined in [XML-C14N1.1] ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:e11 or ancestor-or-self::ietf:e12] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmllang-prop-1.xml b/libxml2/test/c14n/1-1-without-comments/xmllang-prop-1.xml deleted file mode 100644 index 1111e33..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmllang-prop-1.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLLANG - -Check that implementations of [XML-C14N1.1] handle xml:lang attributes -as defined in [XML-C14N1.1] ---> -<ietf:c14n11Xmllang xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org"> - <ietf:e1 xml:lang="EN"> - <ietf:e11> - <ietf:e111 /> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 /> - </ietf:e12> - </ietf:e1> - <ietf:e2 > - <ietf:e21 /> - </ietf:e2> -</ietf:c14n11Xmllang>
\ No newline at end of file diff --git a/libxml2/test/c14n/1-1-without-comments/xmllang-prop-1.xpath b/libxml2/test/c14n/1-1-without-comments/xmllang-prop-1.xpath deleted file mode 100755 index 224924e..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmllang-prop-1.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLLANG - -Check that implementations of [XML-C14N1.1] handle xml:lang attributes -as defined in [XML-C14N1.1] ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:e1] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmllang-prop-2.xml b/libxml2/test/c14n/1-1-without-comments/xmllang-prop-2.xml deleted file mode 100644 index 1111e33..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmllang-prop-2.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLLANG - -Check that implementations of [XML-C14N1.1] handle xml:lang attributes -as defined in [XML-C14N1.1] ---> -<ietf:c14n11Xmllang xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org"> - <ietf:e1 xml:lang="EN"> - <ietf:e11> - <ietf:e111 /> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 /> - </ietf:e12> - </ietf:e1> - <ietf:e2 > - <ietf:e21 /> - </ietf:e2> -</ietf:c14n11Xmllang>
\ No newline at end of file diff --git a/libxml2/test/c14n/1-1-without-comments/xmllang-prop-2.xpath b/libxml2/test/c14n/1-1-without-comments/xmllang-prop-2.xpath deleted file mode 100755 index ca21758..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmllang-prop-2.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLLANG - -Check that implementations of [XML-C14N1.1] handle xml:lang attributes -as defined in [XML-C14N1.1] ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:e2] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmllang-prop-3.xml b/libxml2/test/c14n/1-1-without-comments/xmllang-prop-3.xml deleted file mode 100644 index 1111e33..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmllang-prop-3.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLLANG - -Check that implementations of [XML-C14N1.1] handle xml:lang attributes -as defined in [XML-C14N1.1] ---> -<ietf:c14n11Xmllang xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org"> - <ietf:e1 xml:lang="EN"> - <ietf:e11> - <ietf:e111 /> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 /> - </ietf:e12> - </ietf:e1> - <ietf:e2 > - <ietf:e21 /> - </ietf:e2> -</ietf:c14n11Xmllang>
\ No newline at end of file diff --git a/libxml2/test/c14n/1-1-without-comments/xmllang-prop-3.xpath b/libxml2/test/c14n/1-1-without-comments/xmllang-prop-3.xpath deleted file mode 100755 index 86e77fa..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmllang-prop-3.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLLANG - -Check that implementations of [XML-C14N1.1] handle xml:lang attributes -as defined in [XML-C14N1.1] ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:e11] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmllang-prop-4.xml b/libxml2/test/c14n/1-1-without-comments/xmllang-prop-4.xml deleted file mode 100644 index 1111e33..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmllang-prop-4.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLLANG - -Check that implementations of [XML-C14N1.1] handle xml:lang attributes -as defined in [XML-C14N1.1] ---> -<ietf:c14n11Xmllang xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org"> - <ietf:e1 xml:lang="EN"> - <ietf:e11> - <ietf:e111 /> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 /> - </ietf:e12> - </ietf:e1> - <ietf:e2 > - <ietf:e21 /> - </ietf:e2> -</ietf:c14n11Xmllang>
\ No newline at end of file diff --git a/libxml2/test/c14n/1-1-without-comments/xmllang-prop-4.xpath b/libxml2/test/c14n/1-1-without-comments/xmllang-prop-4.xpath deleted file mode 100755 index fdc7661..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmllang-prop-4.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLLANG - -Check that implementations of [XML-C14N1.1] handle xml:lang attributes -as defined in [XML-C14N1.1] ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:e11 or ancestor-or-self::ietf:e12] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-1.xml b/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-1.xml deleted file mode 100644 index 62da9e4..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-1.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLSPACE - -Check that implementations of [XML-C14N1.1] handle xml:space attributes -as defined in [XML-C14N1.1] ---> -<ietf:c14n11XmlSpaceDoc1 xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org"> - <ietf:e1 xml:space="true"> - <ietf:e11> - <ietf:e111 /> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 /> - </ietf:e12> - </ietf:e1> - <ietf:e2 > - <ietf:e21 /> - </ietf:e2> -</ietf:c14n11XmlSpaceDoc1>
\ No newline at end of file diff --git a/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-1.xpath b/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-1.xpath deleted file mode 100755 index bad373a..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-1.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLSPACE - -Check that implementations of [XML-C14N1.1] handle xml:space attributes -as defined in [XML-C14N1.1] ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:e1] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-2.xml b/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-2.xml deleted file mode 100644 index 62da9e4..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-2.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLSPACE - -Check that implementations of [XML-C14N1.1] handle xml:space attributes -as defined in [XML-C14N1.1] ---> -<ietf:c14n11XmlSpaceDoc1 xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org"> - <ietf:e1 xml:space="true"> - <ietf:e11> - <ietf:e111 /> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 /> - </ietf:e12> - </ietf:e1> - <ietf:e2 > - <ietf:e21 /> - </ietf:e2> -</ietf:c14n11XmlSpaceDoc1>
\ No newline at end of file diff --git a/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-2.xpath b/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-2.xpath deleted file mode 100755 index ffb7d85..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-2.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLSPACE - -Check that implementations of [XML-C14N1.1] handle xml:space attributes -as defined in [XML-C14N1.1] ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:e2] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-3.xml b/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-3.xml deleted file mode 100644 index 62da9e4..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-3.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLSPACE - -Check that implementations of [XML-C14N1.1] handle xml:space attributes -as defined in [XML-C14N1.1] ---> -<ietf:c14n11XmlSpaceDoc1 xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org"> - <ietf:e1 xml:space="true"> - <ietf:e11> - <ietf:e111 /> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 /> - </ietf:e12> - </ietf:e1> - <ietf:e2 > - <ietf:e21 /> - </ietf:e2> -</ietf:c14n11XmlSpaceDoc1>
\ No newline at end of file diff --git a/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-3.xpath b/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-3.xpath deleted file mode 100755 index 3f27aed..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-3.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLSPACE - -Check that implementations of [XML-C14N1.1] handle xml:space attributes -as defined in [XML-C14N1.1] ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:e11] -</XPath> diff --git a/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-4.xml b/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-4.xml deleted file mode 100644 index 62da9e4..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-4.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLSPACE - -Check that implementations of [XML-C14N1.1] handle xml:space attributes -as defined in [XML-C14N1.1] ---> -<ietf:c14n11XmlSpaceDoc1 xmlns:ietf="http://www.ietf.org" xmlns:w3c="http://www.w3.org"> - <ietf:e1 xml:space="true"> - <ietf:e11> - <ietf:e111 /> - </ietf:e11> - <ietf:e12 at="2"> - <ietf:e121 /> - </ietf:e12> - </ietf:e1> - <ietf:e2 > - <ietf:e21 /> - </ietf:e2> -</ietf:c14n11XmlSpaceDoc1>
\ No newline at end of file diff --git a/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-4.xpath b/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-4.xpath deleted file mode 100755 index 49c4395..0000000 --- a/libxml2/test/c14n/1-1-without-comments/xmlspace-prop-4.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<!-- -http://www.w3.org/TR/xmldsig2ed-tests/#XMLSPACE - -Check that implementations of [XML-C14N1.1] handle xml:space attributes -as defined in [XML-C14N1.1] ---> -<XPath xmlns:ietf="http://www.ietf.org" > -(//. | //@* | //namespace::*) -[ancestor-or-self::ietf:e11 or ancestor-or-self::ietf:e12] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-09.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-09.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-09.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-09.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-09.xpath deleted file mode 100644 index 717b66a..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-09.xpath +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- everything --> - ancestor-or-self::bar:Something - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-10.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-10.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-10.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-10.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-10.xpath deleted file mode 100644 index 8ea2795..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-10.xpath +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- only text, elements or directly-used namespace nodes --> - ancestor-or-self::bar:Something and - ((name() != "bar") or parent::bar:Something) and - ((name() != "foo") or parent::foo:Something) and - ((name() != "baz") or parent::baz:Something) and - ((name() != "") or self::text()) - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-11.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-11.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-11.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-11.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-11.xpath deleted file mode 100644 index 37d65e0..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-11.xpath +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- only text, elements or directly-used namespace nodes --> - ancestor-or-self::bar:Something and - (self::text() or - (namespace-uri() != "") or - (string(self::node()) = namespace-uri(parent::node()))) - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-12.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-12.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-12.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-12.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-12.xpath deleted file mode 100644 index ed8ae68..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-12.xpath +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- only text, elements, or directly-used namespace nodes but not foo:Something --> - ancestor-or-self::bar:Something and - not (self::foo:Something) and - (self::text() or - (namespace-uri() != "") or - (string(self::node()) = namespace-uri(parent::node()))) - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-13.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-13.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-13.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-13.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-13.xpath deleted file mode 100644 index 7d0170b..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-13.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- no namespace nodes; I am not in my parent's namespace axis --> - ancestor-or-self::bar:Something and - (count(parent::node()/namespace::*) != - count(parent::node()/namespace::* | self::node())) - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-14.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-14.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-14.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-14.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-14.xpath deleted file mode 100644 index 2732894..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-14.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- no namespace nodes; I am text or have nonempty namespace URI --> - ancestor-or-self::bar:Something and - (self::text() or - (namespace-uri() != "")) - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-15.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-15.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-15.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-15.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-15.xpath deleted file mode 100644 index ae6589e..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-15.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- only namespace nodes --> - ancestor-or-self::bar:Something and - (count(parent::node()/namespace::*) = - count(parent::node()/namespace::* | self::node())) - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-16.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-16.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-16.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-16.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-16.xpath deleted file mode 100644 index bdca528..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-16.xpath +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- only directly-used namespace nodes --> - ancestor-or-self::bar:Something and - (string(self::node()) = namespace-uri(parent::node())) - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-17.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-17.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-17.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-17.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-17.xpath deleted file mode 100644 index 24fdd3f..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-17.xpath +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- no namespace nodes but the default on alternate elements --> - ancestor-or-self::bar:Something and - (self::text() or - (namespace-uri() != "") or - ((name() = "") and - ((count(ancestor-or-self::node()) mod 2) = 1))) - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-18.ns b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-18.ns deleted file mode 100644 index 3886aed..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-18.ns +++ /dev/null @@ -1 +0,0 @@ -#default
\ No newline at end of file diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-18.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-18.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-18.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-18.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-18.xpath deleted file mode 100644 index 717b66a..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-18.xpath +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- everything --> - ancestor-or-self::bar:Something - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-19.ns b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-19.ns deleted file mode 100644 index 3886aed..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-19.ns +++ /dev/null @@ -1 +0,0 @@ -#default
\ No newline at end of file diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-19.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-19.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-19.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-19.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-19.xpath deleted file mode 100644 index 8ea2795..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-19.xpath +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- only text, elements or directly-used namespace nodes --> - ancestor-or-self::bar:Something and - ((name() != "bar") or parent::bar:Something) and - ((name() != "foo") or parent::foo:Something) and - ((name() != "baz") or parent::baz:Something) and - ((name() != "") or self::text()) - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-20.ns b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-20.ns deleted file mode 100644 index 3886aed..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-20.ns +++ /dev/null @@ -1 +0,0 @@ -#default
\ No newline at end of file diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-20.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-20.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-20.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-20.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-20.xpath deleted file mode 100644 index 37d65e0..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-20.xpath +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- only text, elements or directly-used namespace nodes --> - ancestor-or-self::bar:Something and - (self::text() or - (namespace-uri() != "") or - (string(self::node()) = namespace-uri(parent::node()))) - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-21.ns b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-21.ns deleted file mode 100644 index 3886aed..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-21.ns +++ /dev/null @@ -1 +0,0 @@ -#default
\ No newline at end of file diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-21.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-21.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-21.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-21.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-21.xpath deleted file mode 100644 index ed8ae68..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-21.xpath +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- only text, elements, or directly-used namespace nodes but not foo:Something --> - ancestor-or-self::bar:Something and - not (self::foo:Something) and - (self::text() or - (namespace-uri() != "") or - (string(self::node()) = namespace-uri(parent::node()))) - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-22.ns b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-22.ns deleted file mode 100644 index 3886aed..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-22.ns +++ /dev/null @@ -1 +0,0 @@ -#default
\ No newline at end of file diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-22.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-22.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-22.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-22.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-22.xpath deleted file mode 100644 index 7d0170b..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-22.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- no namespace nodes; I am not in my parent's namespace axis --> - ancestor-or-self::bar:Something and - (count(parent::node()/namespace::*) != - count(parent::node()/namespace::* | self::node())) - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-23.ns b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-23.ns deleted file mode 100644 index 3886aed..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-23.ns +++ /dev/null @@ -1 +0,0 @@ -#default
\ No newline at end of file diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-23.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-23.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-23.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-23.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-23.xpath deleted file mode 100644 index 2732894..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-23.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- no namespace nodes; I am text or have nonempty namespace URI --> - ancestor-or-self::bar:Something and - (self::text() or - (namespace-uri() != "")) - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-24.ns b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-24.ns deleted file mode 100644 index 3886aed..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-24.ns +++ /dev/null @@ -1 +0,0 @@ -#default
\ No newline at end of file diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-24.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-24.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-24.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-24.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-24.xpath deleted file mode 100644 index ae6589e..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-24.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- only namespace nodes --> - ancestor-or-self::bar:Something and - (count(parent::node()/namespace::*) = - count(parent::node()/namespace::* | self::node())) - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-25.ns b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-25.ns deleted file mode 100644 index 3886aed..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-25.ns +++ /dev/null @@ -1 +0,0 @@ -#default
\ No newline at end of file diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-25.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-25.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-25.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-25.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-25.xpath deleted file mode 100644 index bdca528..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-25.xpath +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- only directly-used namespace nodes --> - ancestor-or-self::bar:Something and - (string(self::node()) = namespace-uri(parent::node())) - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-26.ns b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-26.ns deleted file mode 100644 index 3886aed..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-26.ns +++ /dev/null @@ -1 +0,0 @@ -#default
\ No newline at end of file diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-26.xml b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-26.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-26.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-26.xpath b/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-26.xpath deleted file mode 100644 index 24fdd3f..0000000 --- a/libxml2/test/c14n/exc-without-comments/merlin-c14n-two-26.xpath +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- no namespace nodes but the default on alternate elements --> - ancestor-or-self::bar:Something and - (self::text() or - (namespace-uri() != "") or - ((name() = "") and - ((count(ancestor-or-self::node()) mod 2) = 1))) - ] -</XPath> diff --git a/libxml2/test/c14n/exc-without-comments/test-0.xml b/libxml2/test/c14n/exc-without-comments/test-0.xml deleted file mode 100644 index c7c42d9..0000000 --- a/libxml2/test/c14n/exc-without-comments/test-0.xml +++ /dev/null @@ -1,18 +0,0 @@ -<!DOCTYPE doc [<!ATTLIST e9 attr CDATA "default">]> -<doc xmlns:foo="http://www.bar.org" xml:base="http://www.example.org/2002/"> - <e1 /> - <e2 ></e2> - <e3 name = "elem3" id="elem3" /> - <e4 name="elem4" id="elem4" ></e4> - <e5 a:attr="out" b:attr="sorted" attr2="all" attr="I'm" - xmlns:b="http://www.ietf.org" - xmlns:a="http://www.w3.org" - xmlns="http://example.org"/> - <e6 xmlns="" test="../baz" xmlns:a="http://www.w3.org"> - <e7 xmlns="http://www.ietf.org"> - <e8 xmlns="" xmlns:a="http://www.w3.org" a:foo="bar"> - <e9 xmlns="" xmlns:a="http://www.ietf.org"/> - </e8> - </e7> - </e6> -</doc> diff --git a/libxml2/test/c14n/exc-without-comments/test-0.xpath b/libxml2/test/c14n/exc-without-comments/test-0.xpath deleted file mode 100644 index faa0070..0000000 --- a/libxml2/test/c14n/exc-without-comments/test-0.xpath +++ /dev/null @@ -1,3 +0,0 @@ -<XPath> -(//. | //@* | //namespace::*)[ancestor-or-self::e6] -</XPath>
\ No newline at end of file diff --git a/libxml2/test/c14n/exc-without-comments/test-1.ns b/libxml2/test/c14n/exc-without-comments/test-1.ns deleted file mode 100644 index 2e65efe..0000000 --- a/libxml2/test/c14n/exc-without-comments/test-1.ns +++ /dev/null @@ -1 +0,0 @@ -a
\ No newline at end of file diff --git a/libxml2/test/c14n/exc-without-comments/test-1.xml b/libxml2/test/c14n/exc-without-comments/test-1.xml deleted file mode 100644 index c7c42d9..0000000 --- a/libxml2/test/c14n/exc-without-comments/test-1.xml +++ /dev/null @@ -1,18 +0,0 @@ -<!DOCTYPE doc [<!ATTLIST e9 attr CDATA "default">]> -<doc xmlns:foo="http://www.bar.org" xml:base="http://www.example.org/2002/"> - <e1 /> - <e2 ></e2> - <e3 name = "elem3" id="elem3" /> - <e4 name="elem4" id="elem4" ></e4> - <e5 a:attr="out" b:attr="sorted" attr2="all" attr="I'm" - xmlns:b="http://www.ietf.org" - xmlns:a="http://www.w3.org" - xmlns="http://example.org"/> - <e6 xmlns="" test="../baz" xmlns:a="http://www.w3.org"> - <e7 xmlns="http://www.ietf.org"> - <e8 xmlns="" xmlns:a="http://www.w3.org" a:foo="bar"> - <e9 xmlns="" xmlns:a="http://www.ietf.org"/> - </e8> - </e7> - </e6> -</doc> diff --git a/libxml2/test/c14n/exc-without-comments/test-1.xpath b/libxml2/test/c14n/exc-without-comments/test-1.xpath deleted file mode 100644 index faa0070..0000000 --- a/libxml2/test/c14n/exc-without-comments/test-1.xpath +++ /dev/null @@ -1,3 +0,0 @@ -<XPath> -(//. | //@* | //namespace::*)[ancestor-or-self::e6] -</XPath>
\ No newline at end of file diff --git a/libxml2/test/c14n/exc-without-comments/test-2.xml b/libxml2/test/c14n/exc-without-comments/test-2.xml deleted file mode 100644 index 83d15a7..0000000 --- a/libxml2/test/c14n/exc-without-comments/test-2.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0"?> -<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"> - <SignedInfo> - <ds:CanonicalizationMethod xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> - <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> - <Reference URI="#ndid:1234-5678-0987"> - <Transforms> - <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> - </Transforms> - <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> - <DigestValue>sj1VXDB2VMCU5qmva2OtDw3kKOs=</DigestValue> - </Reference> - </SignedInfo> - <SignatureValue>...</SignatureValue> - <KeyInfo> - <X509Data> - <X509Certificate>...</X509Certificate> - </X509Data> - </KeyInfo> -</Signature> diff --git a/libxml2/test/c14n/exc-without-comments/test-2.xpath b/libxml2/test/c14n/exc-without-comments/test-2.xpath deleted file mode 100644 index e57652f..0000000 --- a/libxml2/test/c14n/exc-without-comments/test-2.xpath +++ /dev/null @@ -1,6 +0,0 @@ -<XPath xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> -(//. | //@* | //namespace::*) -[ - ancestor-or-self::ds:SignedInfo -] -</XPath>
\ No newline at end of file diff --git a/libxml2/test/c14n/with-comments/doc.dtd b/libxml2/test/c14n/with-comments/doc.dtd deleted file mode 100644 index c460239..0000000 --- a/libxml2/test/c14n/with-comments/doc.dtd +++ /dev/null @@ -1 +0,0 @@ -<!-- Empty DTD -->
\ No newline at end of file diff --git a/libxml2/test/c14n/with-comments/example-1.xml b/libxml2/test/c14n/with-comments/example-1.xml deleted file mode 100644 index ed450c7..0000000 --- a/libxml2/test/c14n/with-comments/example-1.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> - -<?xml-stylesheet href="doc.xsl" - type="text/xsl" ?> - -<!DOCTYPE doc SYSTEM "doc.dtd"> - -<doc>Hello, world!<!-- Comment 1 --></doc> - -<?pi-without-data ?> - -<!-- Comment 2 --> - -<!-- Comment 3 --> diff --git a/libxml2/test/c14n/with-comments/example-2.xml b/libxml2/test/c14n/with-comments/example-2.xml deleted file mode 100644 index 74eeea1..0000000 --- a/libxml2/test/c14n/with-comments/example-2.xml +++ /dev/null @@ -1,11 +0,0 @@ -<doc> - <clean> </clean> - <dirty> A B </dirty> - <mixed> - A - <clean> </clean> - B - <dirty> A B </dirty> - C - </mixed> -</doc> diff --git a/libxml2/test/c14n/with-comments/example-3.xml b/libxml2/test/c14n/with-comments/example-3.xml deleted file mode 100644 index a7a1950..0000000 --- a/libxml2/test/c14n/with-comments/example-3.xml +++ /dev/null @@ -1,18 +0,0 @@ -<!DOCTYPE doc [<!ATTLIST e9 attr CDATA "default">]> -<doc> - <e1 /> - <e2 ></e2> - <e3 name = "elem3" id="elem3" /> - <e4 name="elem4" id="elem4" ></e4> - <e5 a:attr="out" b:attr="sorted" attr2="all" attr="I'm" - xmlns:b="http://www.ietf.org" - xmlns:a="http://www.w3.org" - xmlns="http://www.uvic.ca"/> - <e6 xmlns="" xmlns:a="http://www.w3.org"> - <e7 xmlns="http://www.ietf.org"> - <e8 xmlns="" xmlns:a="http://www.w3.org"> - <e9 xmlns="" xmlns:a="http://www.ietf.org"/> - </e8> - </e7> - </e6> -</doc> diff --git a/libxml2/test/c14n/with-comments/example-4.xml b/libxml2/test/c14n/with-comments/example-4.xml deleted file mode 100644 index 3fba138..0000000 --- a/libxml2/test/c14n/with-comments/example-4.xml +++ /dev/null @@ -1,9 +0,0 @@ -<!DOCTYPE doc [<!ATTLIST normId id ID #IMPLIED>]> -<doc> - <text>First line
 Second line</text> - <value>2</value> - <compute><![CDATA[value>"0" && value<"10" ?"valid":"error"]]></compute> - <compute expr='value>"0" && value<"10" ?"valid":"error"'>valid</compute> - <norm attr=' '   
	 ' '/> - <normId id=' '   
	 ' '/> -</doc> diff --git a/libxml2/test/c14n/with-comments/example-5.xml b/libxml2/test/c14n/with-comments/example-5.xml deleted file mode 100644 index 92c5322..0000000 --- a/libxml2/test/c14n/with-comments/example-5.xml +++ /dev/null @@ -1,12 +0,0 @@ -<!DOCTYPE doc [ -<!ATTLIST doc attrExtEnt ENTITY #IMPLIED> -<!ENTITY ent1 "Hello"> -<!ENTITY ent2 SYSTEM "world.txt"> -<!ENTITY entExt SYSTEM "earth.gif" NDATA gif> -<!NOTATION gif SYSTEM "viewgif.exe"> -]> -<doc attrExtEnt="entExt"> - &ent1;, &ent2;! -</doc> - -<!-- Let world.txt contain "world" (excluding the quotes) --> diff --git a/libxml2/test/c14n/with-comments/example-6.xml b/libxml2/test/c14n/with-comments/example-6.xml deleted file mode 100644 index 31e2071..0000000 --- a/libxml2/test/c14n/with-comments/example-6.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<doc>©</doc> diff --git a/libxml2/test/c14n/with-comments/example-7.xml b/libxml2/test/c14n/with-comments/example-7.xml deleted file mode 100644 index 41171cb..0000000 --- a/libxml2/test/c14n/with-comments/example-7.xml +++ /dev/null @@ -1,11 +0,0 @@ -<!DOCTYPE doc [ -<!ATTLIST e2 xml:space (default|preserve) 'preserve'> -<!ATTLIST e3 id ID #IMPLIED> -]> -<doc xmlns="http://www.ietf.org" xmlns:w3c="http://www.w3.org"> - <e1> - <e2 xmlns=""> - <e3 id="E3"/> - </e2> - </e1> -</doc> diff --git a/libxml2/test/c14n/with-comments/example-7.xpath b/libxml2/test/c14n/with-comments/example-7.xpath deleted file mode 100644 index 84ddb08..0000000 --- a/libxml2/test/c14n/with-comments/example-7.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<XPath xmlns:ietf="http://www.ietf.org" > - (//.|//@*|//namespace::*) - [ - self::ietf:e1 - or - (parent::ietf:e1 and not(self::text() or self::e2)) - or - count(id("E3")|ancestor-or-self::node()) = count(ancestor-or-self::node()) - ] -</XPath>
\ No newline at end of file diff --git a/libxml2/test/c14n/with-comments/world.txt b/libxml2/test/c14n/with-comments/world.txt deleted file mode 100644 index 04fea06..0000000 --- a/libxml2/test/c14n/with-comments/world.txt +++ /dev/null @@ -1 +0,0 @@ -world
\ No newline at end of file diff --git a/libxml2/test/c14n/without-comments/doc.dtd b/libxml2/test/c14n/without-comments/doc.dtd deleted file mode 100644 index c460239..0000000 --- a/libxml2/test/c14n/without-comments/doc.dtd +++ /dev/null @@ -1 +0,0 @@ -<!-- Empty DTD -->
\ No newline at end of file diff --git a/libxml2/test/c14n/without-comments/example-1.xml b/libxml2/test/c14n/without-comments/example-1.xml deleted file mode 100644 index ed450c7..0000000 --- a/libxml2/test/c14n/without-comments/example-1.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> - -<?xml-stylesheet href="doc.xsl" - type="text/xsl" ?> - -<!DOCTYPE doc SYSTEM "doc.dtd"> - -<doc>Hello, world!<!-- Comment 1 --></doc> - -<?pi-without-data ?> - -<!-- Comment 2 --> - -<!-- Comment 3 --> diff --git a/libxml2/test/c14n/without-comments/example-2.xml b/libxml2/test/c14n/without-comments/example-2.xml deleted file mode 100644 index 74eeea1..0000000 --- a/libxml2/test/c14n/without-comments/example-2.xml +++ /dev/null @@ -1,11 +0,0 @@ -<doc> - <clean> </clean> - <dirty> A B </dirty> - <mixed> - A - <clean> </clean> - B - <dirty> A B </dirty> - C - </mixed> -</doc> diff --git a/libxml2/test/c14n/without-comments/example-3.xml b/libxml2/test/c14n/without-comments/example-3.xml deleted file mode 100644 index a7a1950..0000000 --- a/libxml2/test/c14n/without-comments/example-3.xml +++ /dev/null @@ -1,18 +0,0 @@ -<!DOCTYPE doc [<!ATTLIST e9 attr CDATA "default">]> -<doc> - <e1 /> - <e2 ></e2> - <e3 name = "elem3" id="elem3" /> - <e4 name="elem4" id="elem4" ></e4> - <e5 a:attr="out" b:attr="sorted" attr2="all" attr="I'm" - xmlns:b="http://www.ietf.org" - xmlns:a="http://www.w3.org" - xmlns="http://www.uvic.ca"/> - <e6 xmlns="" xmlns:a="http://www.w3.org"> - <e7 xmlns="http://www.ietf.org"> - <e8 xmlns="" xmlns:a="http://www.w3.org"> - <e9 xmlns="" xmlns:a="http://www.ietf.org"/> - </e8> - </e7> - </e6> -</doc> diff --git a/libxml2/test/c14n/without-comments/example-4.xml b/libxml2/test/c14n/without-comments/example-4.xml deleted file mode 100644 index 3fba138..0000000 --- a/libxml2/test/c14n/without-comments/example-4.xml +++ /dev/null @@ -1,9 +0,0 @@ -<!DOCTYPE doc [<!ATTLIST normId id ID #IMPLIED>]> -<doc> - <text>First line
 Second line</text> - <value>2</value> - <compute><![CDATA[value>"0" && value<"10" ?"valid":"error"]]></compute> - <compute expr='value>"0" && value<"10" ?"valid":"error"'>valid</compute> - <norm attr=' '   
	 ' '/> - <normId id=' '   
	 ' '/> -</doc> diff --git a/libxml2/test/c14n/without-comments/example-5.xml b/libxml2/test/c14n/without-comments/example-5.xml deleted file mode 100644 index 92c5322..0000000 --- a/libxml2/test/c14n/without-comments/example-5.xml +++ /dev/null @@ -1,12 +0,0 @@ -<!DOCTYPE doc [ -<!ATTLIST doc attrExtEnt ENTITY #IMPLIED> -<!ENTITY ent1 "Hello"> -<!ENTITY ent2 SYSTEM "world.txt"> -<!ENTITY entExt SYSTEM "earth.gif" NDATA gif> -<!NOTATION gif SYSTEM "viewgif.exe"> -]> -<doc attrExtEnt="entExt"> - &ent1;, &ent2;! -</doc> - -<!-- Let world.txt contain "world" (excluding the quotes) --> diff --git a/libxml2/test/c14n/without-comments/example-6.xml b/libxml2/test/c14n/without-comments/example-6.xml deleted file mode 100644 index 31e2071..0000000 --- a/libxml2/test/c14n/without-comments/example-6.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<doc>©</doc> diff --git a/libxml2/test/c14n/without-comments/example-7.xml b/libxml2/test/c14n/without-comments/example-7.xml deleted file mode 100644 index 41171cb..0000000 --- a/libxml2/test/c14n/without-comments/example-7.xml +++ /dev/null @@ -1,11 +0,0 @@ -<!DOCTYPE doc [ -<!ATTLIST e2 xml:space (default|preserve) 'preserve'> -<!ATTLIST e3 id ID #IMPLIED> -]> -<doc xmlns="http://www.ietf.org" xmlns:w3c="http://www.w3.org"> - <e1> - <e2 xmlns=""> - <e3 id="E3"/> - </e2> - </e1> -</doc> diff --git a/libxml2/test/c14n/without-comments/example-7.xpath b/libxml2/test/c14n/without-comments/example-7.xpath deleted file mode 100644 index 84ddb08..0000000 --- a/libxml2/test/c14n/without-comments/example-7.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<XPath xmlns:ietf="http://www.ietf.org" > - (//.|//@*|//namespace::*) - [ - self::ietf:e1 - or - (parent::ietf:e1 and not(self::text() or self::e2)) - or - count(id("E3")|ancestor-or-self::node()) = count(ancestor-or-self::node()) - ] -</XPath>
\ No newline at end of file diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-00.xml b/libxml2/test/c14n/without-comments/merlin-c14n-two-00.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-00.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-00.xpath b/libxml2/test/c14n/without-comments/merlin-c14n-two-00.xpath deleted file mode 100644 index 717b66a..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-00.xpath +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- everything --> - ancestor-or-self::bar:Something - ] -</XPath> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-01.xml b/libxml2/test/c14n/without-comments/merlin-c14n-two-01.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-01.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-01.xpath b/libxml2/test/c14n/without-comments/merlin-c14n-two-01.xpath deleted file mode 100644 index 8ea2795..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-01.xpath +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- only text, elements or directly-used namespace nodes --> - ancestor-or-self::bar:Something and - ((name() != "bar") or parent::bar:Something) and - ((name() != "foo") or parent::foo:Something) and - ((name() != "baz") or parent::baz:Something) and - ((name() != "") or self::text()) - ] -</XPath> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-02.xml b/libxml2/test/c14n/without-comments/merlin-c14n-two-02.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-02.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-02.xpath b/libxml2/test/c14n/without-comments/merlin-c14n-two-02.xpath deleted file mode 100644 index 37d65e0..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-02.xpath +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- only text, elements or directly-used namespace nodes --> - ancestor-or-self::bar:Something and - (self::text() or - (namespace-uri() != "") or - (string(self::node()) = namespace-uri(parent::node()))) - ] -</XPath> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-03.xml b/libxml2/test/c14n/without-comments/merlin-c14n-two-03.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-03.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-03.xpath b/libxml2/test/c14n/without-comments/merlin-c14n-two-03.xpath deleted file mode 100644 index ed8ae68..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-03.xpath +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- only text, elements, or directly-used namespace nodes but not foo:Something --> - ancestor-or-self::bar:Something and - not (self::foo:Something) and - (self::text() or - (namespace-uri() != "") or - (string(self::node()) = namespace-uri(parent::node()))) - ] -</XPath> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-04.xml b/libxml2/test/c14n/without-comments/merlin-c14n-two-04.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-04.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-04.xpath b/libxml2/test/c14n/without-comments/merlin-c14n-two-04.xpath deleted file mode 100644 index 7d0170b..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-04.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- no namespace nodes; I am not in my parent's namespace axis --> - ancestor-or-self::bar:Something and - (count(parent::node()/namespace::*) != - count(parent::node()/namespace::* | self::node())) - ] -</XPath> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-05.xml b/libxml2/test/c14n/without-comments/merlin-c14n-two-05.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-05.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-05.xpath b/libxml2/test/c14n/without-comments/merlin-c14n-two-05.xpath deleted file mode 100644 index 2732894..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-05.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- no namespace nodes; I am text or have nonempty namespace URI --> - ancestor-or-self::bar:Something and - (self::text() or - (namespace-uri() != "")) - ] -</XPath> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-06.xml b/libxml2/test/c14n/without-comments/merlin-c14n-two-06.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-06.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-06.xpath b/libxml2/test/c14n/without-comments/merlin-c14n-two-06.xpath deleted file mode 100644 index ae6589e..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-06.xpath +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- only namespace nodes --> - ancestor-or-self::bar:Something and - (count(parent::node()/namespace::*) = - count(parent::node()/namespace::* | self::node())) - ] -</XPath> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-07.xml b/libxml2/test/c14n/without-comments/merlin-c14n-two-07.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-07.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-07.xpath b/libxml2/test/c14n/without-comments/merlin-c14n-two-07.xpath deleted file mode 100644 index bdca528..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-07.xpath +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- only directly-used namespace nodes --> - ancestor-or-self::bar:Something and - (string(self::node()) = namespace-uri(parent::node())) - ] -</XPath> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-08.xml b/libxml2/test/c14n/without-comments/merlin-c14n-two-08.xml deleted file mode 100644 index 714c9d1..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-08.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<foo:Root xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xmlns="http://example.org/" xml:lang="en-ie"> - <bar:Something> - <foo:Something> - <bar:Something> - <foo:Something> - <baz:Something /> - </foo:Something> - </bar:Something> - </foo:Something> - </bar:Something> -</foo:Root> diff --git a/libxml2/test/c14n/without-comments/merlin-c14n-two-08.xpath b/libxml2/test/c14n/without-comments/merlin-c14n-two-08.xpath deleted file mode 100644 index 24fdd3f..0000000 --- a/libxml2/test/c14n/without-comments/merlin-c14n-two-08.xpath +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<XPath xmlns:bar="http://example.org/bar" xmlns:baz="http://example.org/baz" xmlns:foo="http://example.org/foo" xml:lang="en-ie"> - (//. | //@* | //namespace::*) - [ - <!-- no namespace nodes but the default on alternate elements --> - ancestor-or-self::bar:Something and - (self::text() or - (namespace-uri() != "") or - ((name() = "") and - ((count(ancestor-or-self::node()) mod 2) = 1))) - ] -</XPath> diff --git a/libxml2/test/c14n/without-comments/test-0.xml b/libxml2/test/c14n/without-comments/test-0.xml deleted file mode 100644 index 7e1f9d4..0000000 --- a/libxml2/test/c14n/without-comments/test-0.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE envelope [ - <!ENTITY dsig "http://www.w3.org/2000/09/xmldsig#"> - <!ENTITY c14n "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"> - <!ENTITY xpath "http://www.w3.org/TR/1999/REC-xpath-19991116"> - <!ENTITY xslt "http://www.w3.org/TR/1999/REC-xslt-19991116"> - <!ATTLIST Notaries Id ID #IMPLIED> -]> -<Object Id="object-1" MimeType="text/plain">I am the text.</Object> diff --git a/libxml2/test/c14n/without-comments/test-0.xpath b/libxml2/test/c14n/without-comments/test-0.xpath deleted file mode 100644 index 1fca7bf..0000000 --- a/libxml2/test/c14n/without-comments/test-0.xpath +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE envelope [ - <!ENTITY dsig "http://www.w3.org/2000/09/xmldsig#"> - <!ENTITY c14n "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"> - <!ENTITY xpath "http://www.w3.org/TR/1999/REC-xpath-19991116"> - <!ENTITY xslt "http://www.w3.org/TR/1999/REC-xslt-19991116"> - <!ATTLIST Notaries Id ID #IMPLIED> -]> -<XPath> - (//.|//@*|//namespace::*) - [ - self::text() - ] -</XPath> diff --git a/libxml2/test/c14n/without-comments/test-1.xml b/libxml2/test/c14n/without-comments/test-1.xml deleted file mode 100644 index 2156615..0000000 --- a/libxml2/test/c14n/without-comments/test-1.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE envelope [ - <!ENTITY dsig "http://www.w3.org/2000/09/xmldsig#"> - <!ENTITY c14n "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"> - <!ENTITY xpath "http://www.w3.org/TR/1999/REC-xpath-19991116"> - <!ENTITY xslt "http://www.w3.org/TR/1999/REC-xslt-19991116"> - <!ATTLIST Notaries Id ID #IMPLIED> -]> - <Signature xmlns="http://www.w3.org/2000/09/xmldsig#" Id="signature"> - <Object Id="object-4"> - <X509Data> - <X509SubjectName> - CN=Merlin Hughes,O=Baltimore Technologies\, Ltd.,ST=Dublin,C=IE - </X509SubjectName> - <X509IssuerSerial> - <X509IssuerName> - CN=Test DSA CA,O=Baltimore Technologies\, Ltd.,ST=Dublin,C=IE - </X509IssuerName> - <X509SerialNumber>970849936</X509SerialNumber> - </X509IssuerSerial> - <X509Certificate> - MIIDNzCCAvWgAwIBAgIEOd3+kDAJBgcqhkjOOAQDMFsxCzAJBgNVBAYTAklFMQ8w - DQYDVQQIEwZEdWJsaW4xJTAjBgNVBAoTHEJhbHRpbW9yZSBUZWNobm9sb2dpZXMs - IEx0ZC4xFDASBgNVBAMTC1Rlc3QgRFNBIENBMB4XDTAwMTAwNjE2MzIxNVoXDTAx - MTAwNjE2MzIxNFowXTELMAkGA1UEBhMCSUUxDzANBgNVBAgTBkR1YmxpbjElMCMG - A1UEChMcQmFsdGltb3JlIFRlY2hub2xvZ2llcywgTHRkLjEWMBQGA1UEAxMNTWVy - bGluIEh1Z2hlczCCAbYwggErBgcqhkjOOAQBMIIBHgKBgQDaJjfDTrawMHf8MiUt - Y54b37hSmYNnR3KpGT10uU1Dqppcju06uN0iGbqf947DjkBC25hKnqykK31xBw0E - CPbYq/KC98kghdf2xJCu6B8aqJ95K9jdVflJ3WP7PQxJn+fmM23zy6HYLXVICpfq - etdNj/VHCShZE3bdJiE6VobSFQIVAPQecqS2PaTDprcQnkwx4MHTRXhrAoGAMuGA - lqeB1ax+vyO2+Osubjhl7pHxLu47RIH+/M52DjESA9KMSrwzsYx8yNR2WooByrE0 - t6fu0VncK7UK8olO4t7wpv2z4AFQPRVCKFwo0qgn5aKIkICGMlrRy81avb27wGcW - othx3iPPMtFXtoDqK0JItaI9R8zc1msFhM1GKMYDgYQAAoGActA8YGxrtngg/zKV - vqEOefnwmViFztcnPBYPlJsvh6yKI4iDm68fnp4Mi3RrJ6bZAygFrUIQLxLjV+OJ - tgJAEto0xAs+Mehuq1DkSFEpP3oDzCTOsrOiS1DwQe4oIb7zVk/9l7aPtJMHW0LV - lMdwZNFNNJoqMcT2ZfCPrfvYvQ2jRzBFMB4GA1UdEQQXMBWBE21lcmxpbkBiYWx0 - aW1vcmUuaWUwDgYDVR0PAQH/BAQDAgeAMBMGA1UdIwQMMAqACEJZQG0KwRbPMAkG - ByqGSM44BAMDMQAwLgIVAK4skWEFYgrggaJA8vYAwSjg12+KAhUAwHTo7wd4tENw - 9LAKPklQ/74fH18= - </X509Certificate> - </X509Data> - </Object> - </Signature>
\ No newline at end of file diff --git a/libxml2/test/c14n/without-comments/test-1.xpath b/libxml2/test/c14n/without-comments/test-1.xpath deleted file mode 100644 index 3c11e29..0000000 --- a/libxml2/test/c14n/without-comments/test-1.xpath +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE envelope [ - <!ENTITY dsig "http://www.w3.org/2000/09/xmldsig#"> - <!ENTITY c14n "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"> - <!ENTITY xpath "http://www.w3.org/TR/1999/REC-xpath-19991116"> - <!ENTITY xslt "http://www.w3.org/TR/1999/REC-xslt-19991116"> - <!ATTLIST Notaries Id ID #IMPLIED> -]> -<XPath xmlns:dsig="&dsig;"> - (//.|//@*|//namespace::*) - [ - ancestor-or-self::dsig:X509Data - ] -</XPath> diff --git a/libxml2/test/c14n/without-comments/test-2.xml b/libxml2/test/c14n/without-comments/test-2.xml deleted file mode 100644 index 9fda49e..0000000 --- a/libxml2/test/c14n/without-comments/test-2.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<n0:local xmlns:n0="foo://bar" xmlns:n3="ftp://example.org"> - <n1:elem2 xmlns:n1="http://example.net" xml:lang="en"> - <n3:stuff xmlns:n3="ftp://example.org"/> - </n1:elem2> -</n0:local> - -
\ No newline at end of file diff --git a/libxml2/test/c14n/without-comments/test-2.xpath b/libxml2/test/c14n/without-comments/test-2.xpath deleted file mode 100644 index 9653bc3..0000000 --- a/libxml2/test/c14n/without-comments/test-2.xpath +++ /dev/null @@ -1,8 +0,0 @@ - -<XPath xmlns:n1="http://example.net" > - (//. | //@* | //namespace::*) - [ - ancestor-or-self::n1:elem2 - ] -</XPath> -
\ No newline at end of file diff --git a/libxml2/test/c14n/without-comments/test-3.xml b/libxml2/test/c14n/without-comments/test-3.xml deleted file mode 100644 index c7c42d9..0000000 --- a/libxml2/test/c14n/without-comments/test-3.xml +++ /dev/null @@ -1,18 +0,0 @@ -<!DOCTYPE doc [<!ATTLIST e9 attr CDATA "default">]> -<doc xmlns:foo="http://www.bar.org" xml:base="http://www.example.org/2002/"> - <e1 /> - <e2 ></e2> - <e3 name = "elem3" id="elem3" /> - <e4 name="elem4" id="elem4" ></e4> - <e5 a:attr="out" b:attr="sorted" attr2="all" attr="I'm" - xmlns:b="http://www.ietf.org" - xmlns:a="http://www.w3.org" - xmlns="http://example.org"/> - <e6 xmlns="" test="../baz" xmlns:a="http://www.w3.org"> - <e7 xmlns="http://www.ietf.org"> - <e8 xmlns="" xmlns:a="http://www.w3.org" a:foo="bar"> - <e9 xmlns="" xmlns:a="http://www.ietf.org"/> - </e8> - </e7> - </e6> -</doc> diff --git a/libxml2/test/c14n/without-comments/test-3.xpath b/libxml2/test/c14n/without-comments/test-3.xpath deleted file mode 100644 index faa0070..0000000 --- a/libxml2/test/c14n/without-comments/test-3.xpath +++ /dev/null @@ -1,3 +0,0 @@ -<XPath> -(//. | //@* | //namespace::*)[ancestor-or-self::e6] -</XPath>
\ No newline at end of file diff --git a/libxml2/test/c14n/without-comments/world.txt b/libxml2/test/c14n/without-comments/world.txt deleted file mode 100644 index 04fea06..0000000 --- a/libxml2/test/c14n/without-comments/world.txt +++ /dev/null @@ -1 +0,0 @@ -world
\ No newline at end of file |