diff options
Diffstat (limited to 'document/src/test/vespaxmlparser')
20 files changed, 57 insertions, 57 deletions
diff --git a/document/src/test/vespaxmlparser/test01.xml b/document/src/test/vespaxmlparser/test01.xml index 52de6146f19..c73410c70d6 100644 --- a/document/src/test/vespaxmlparser/test01.xml +++ b/document/src/test/vespaxmlparser/test01.xml @@ -6,7 +6,7 @@ <vespafeed> - <document documenttype="news" documentid="doc:news:http://news1"> + <document documenttype="news" documentid="id:ns:news::http://news1"> <url>testUrl</url> <title>testTitle</title> <last_downloaded>1</last_downloaded> diff --git a/document/src/test/vespaxmlparser/test02.xml b/document/src/test/vespaxmlparser/test02.xml index 31f21358070..7a02a4f7929 100644 --- a/document/src/test/vespaxmlparser/test02.xml +++ b/document/src/test/vespaxmlparser/test02.xml @@ -5,7 +5,7 @@ --> <vespafeed> - <document documenttype="news" documentid="doc:news:http://news2"> + <document documenttype="news" documentid="id:ns:news::http://news2"> <url>testUrl2</url> <title>testTitle2</title> <weightedsetint> diff --git a/document/src/test/vespaxmlparser/test03.xml b/document/src/test/vespaxmlparser/test03.xml index ed71e8ddec5..a3090cc95a1 100644 --- a/document/src/test/vespaxmlparser/test03.xml +++ b/document/src/test/vespaxmlparser/test03.xml @@ -9,7 +9,7 @@ --> <vespafeed> - <update documenttype="news" documentid="doc:news:http://news3"> + <update documenttype="news" documentid="id:ns:news::http://news3"> <assign field="url">assignUrl</assign> <assign field="title">assignTitle</assign> <assign field="last_downloaded">1</assign> diff --git a/document/src/test/vespaxmlparser/test04.xml b/document/src/test/vespaxmlparser/test04.xml index d73cc5905b5..8dc1a90caab 100644 --- a/document/src/test/vespaxmlparser/test04.xml +++ b/document/src/test/vespaxmlparser/test04.xml @@ -9,7 +9,7 @@ --> <vespafeed> - <update documenttype="news" documentid="doc:news:http://news4"> + <update documenttype="news" documentid="id:ns:news::http://news4"> <assign field="url">assignUrl</assign> <assign field="value_long">2</assign> <assign field="stringarr"> diff --git a/document/src/test/vespaxmlparser/test05.xml b/document/src/test/vespaxmlparser/test05.xml index cb27fff83ad..af2e019d168 100644 --- a/document/src/test/vespaxmlparser/test05.xml +++ b/document/src/test/vespaxmlparser/test05.xml @@ -9,7 +9,7 @@ --> <vespafeed> - <update documenttype="news" documentid="doc:news:http://news5"> + <update documenttype="news" documentid="id:ns:news::http://news5"> <add field="stringarr"> <item>addString1</item> <item>addString2</item> diff --git a/document/src/test/vespaxmlparser/test06.xml b/document/src/test/vespaxmlparser/test06.xml index bae65abda51..3c6b293e82b 100644 --- a/document/src/test/vespaxmlparser/test06.xml +++ b/document/src/test/vespaxmlparser/test06.xml @@ -11,66 +11,66 @@ <vespafeed> - <document documenttype="news" documentid="doc:news:http://news6a"> + <document documenttype="news" documentid="id:ns:news::http://news6a"> <value_long>txt</value_long> </document> - <document documenttype="news" documentid="doc:news:http://news6b"> + <document documenttype="news" documentid="id:ns:news::http://news6b"> <stringarr> <item>stringarrItem1</item> <item></item> </stringarr> </document> - <document documenttype="news" documentid="doc:news:http://news6c"> + <document documenttype="news" documentid="id:ns:news::http://news6c"> <intarr> <item>1</item> <item>txt</item> </intarr> </document> - <document documenttype="news" documentid="doc:news:http://news6d"> + <document documenttype="news" documentid="id:ns:news::http://news6d"> <longarr> <item>1</item> <item> </item> </longarr> </document> - <document documenttype="news" documentid="doc:news:http://news6e"> + <document documenttype="news" documentid="id:ns:news::http://news6e"> <bytearr> <item>1</item> <item>128</item> </bytearr> </document> - <document documenttype="news" documentid="doc:news:http://news6f"> + <document documenttype="news" documentid="id:ns:news::http://news6f"> <floatarr> <item>1.0</item> <item>two</item> </floatarr> </document> - <document documenttype="news" documentid="doc:news:http://news6g"> + <document documenttype="news" documentid="id:ns:news::http://news6g"> <weightedsetint> <item>1</item> <item weight="12">txt</item> </weightedsetint> </document> - <document documenttype="news" documentid="doc:news:http://news6h"> + <document documenttype="news" documentid="id:ns:news::http://news6h"> <weightedsetint> <item weight="1">2</item> <item weight="three">4</item> </weightedsetint> </document> - <document documenttype="news" documentid="doc:news:http://news6i"> + <document documenttype="news" documentid="id:ns:news::http://news6i"> <weightedsetstring> <item weight="txt">aString</item> </weightedsetstring> </document> - <document documenttype="news" documentid="doc:news:http://news6j"> + <document documenttype="news" documentid="id:ns:news::http://news6j"> <title>myTitle</title> </document> diff --git a/document/src/test/vespaxmlparser/test07.xml b/document/src/test/vespaxmlparser/test07.xml index ac3d0ccf91a..5f2873f6f20 100644 --- a/document/src/test/vespaxmlparser/test07.xml +++ b/document/src/test/vespaxmlparser/test07.xml @@ -7,7 +7,7 @@ - some fields in this documenttype are assigned invalid values --> <vespafeed> - <update documenttype="news" documentid="doc:news:http://news7a"> + <update documenttype="news" documentid="id:ns:news::http://news7a"> <alter field="last_downloaded"> <increment by="2" /> <decrement by="3" /> @@ -36,7 +36,7 @@ </divide> </update> - <update documenttype="news" documentid="doc:news:http://news7b"> + <update documenttype="news" documentid="id:ns:news::http://news7b"> <alter field="title"> <increment by="2" /> <decrement by="3" /> @@ -45,25 +45,25 @@ </alter> </update> - <update documenttype="news" documentid="doc:news:http://news7c"> + <update documenttype="news" documentid="id:ns:news::http://news7c"> <increment field="weightedsetint" by="five"> <key>1</key> </increment> </update> - <update documenttype="news" documentid="doc:news:http://news7d"> + <update documenttype="news" documentid="id:ns:news::http://news7d"> <decrement field="weightedsetint" by="2"> <key></key> </decrement> </update> - <update documenttype="news" documentid="doc:news:http://news7e"> + <update documenttype="news" documentid="id:ns:news::http://news7e"> <multiply field="floatarr"> <key>3</key> </multiply> </update> - <update documenttype="news" documentid="doc:news:http://news7f"> + <update documenttype="news" documentid="id:ns:news::http://news7f"> <divide field="floatarr" by="3"> <key>four</key> </divide> diff --git a/document/src/test/vespaxmlparser/test08.xml b/document/src/test/vespaxmlparser/test08.xml index 1ae56c14d78..e3d0c00800c 100644 --- a/document/src/test/vespaxmlparser/test08.xml +++ b/document/src/test/vespaxmlparser/test08.xml @@ -10,7 +10,7 @@ --> <vespafeed> - <update documenttype="news" documentid="doc:news:http://news8a"> + <update documenttype="news" documentid="id:ns:news::http://news8a"> <remove field="stringarr"> <item>removeString1</item> <item>removeString2</item> diff --git a/document/src/test/vespaxmlparser/test09.xml b/document/src/test/vespaxmlparser/test09.xml index 8d30a9196f2..b3df5202030 100644 --- a/document/src/test/vespaxmlparser/test09.xml +++ b/document/src/test/vespaxmlparser/test09.xml @@ -10,13 +10,13 @@ --> <vespafeed> - <remove documentid="doc:news:http://news9a" /> + <remove documentid="id:ns:news::http://news9a" /> - <remove documentid="doc:news:http://news9b"> + <remove documentid="id:ns:news::http://news9b"> </remove> <remove> - <uri>doc:news:http://news9c</uri> + <uri>id:ns:news::http://news9c</uri> </remove> </vespafeed> diff --git a/document/src/test/vespaxmlparser/test10.xml b/document/src/test/vespaxmlparser/test10.xml index b5d1146bec6..ba7abd53738 100644 --- a/document/src/test/vespaxmlparser/test10.xml +++ b/document/src/test/vespaxmlparser/test10.xml @@ -11,7 +11,7 @@ <vespafeed> - <document documenttype="news" documentid="doc:news:http://news10a"> + <document documenttype="news" documentid="id:ns:news::http://news10a"> <url>testUrl</url> <title>testTitle</title> <last_downloaded>1</last_downloaded> @@ -47,11 +47,11 @@ </weightedsetstring> </document> - <document documenttype="news" documentid="doc:news:http://news10b"> + <document documenttype="news" documentid="id:ns:news::http://news10b"> <url>testUrl2</url> </document> - <update documenttype="news" documentid="doc:news:http://news10c"> + <update documenttype="news" documentid="id:ns:news::http://news10c"> <add field="stringarr"> <item>addString1</item> <item>addString2</item> @@ -68,7 +68,7 @@ </add> </update> - <update documenttype="news" documentid="doc:news:http://news10d"> + <update documenttype="news" documentid="id:ns:news::http://news10d"> <assign field="url">assignUrl</assign> <assign field="value_long">2</assign> <assign field="stringarr"> @@ -85,10 +85,10 @@ </assign> </update> - <remove documentid="doc:news:http://news10e"/> + <remove documentid="id:ns:news::http://news10e"/> <remove> - <uri>doc:news:http://news10f</uri> + <uri>id:ns:news::http://news10f</uri> </remove> </vespafeed> diff --git a/document/src/test/vespaxmlparser/test12.xml b/document/src/test/vespaxmlparser/test12.xml index c1473778b3f..4d02b2db8d8 100644 --- a/document/src/test/vespaxmlparser/test12.xml +++ b/document/src/test/vespaxmlparser/test12.xml @@ -10,29 +10,29 @@ </vespaadd> <!-- bad document: --> - <document documenttype="news" documentid="doc:news:http://news12b"> + <document documenttype="news" documentid="id:ns:news::http://news12b"> <value_long>testUrlB</value_long> </document> <!-- OK document --> - <document documenttype="news" documentid="doc:news:http://news12c"> + <document documenttype="news" documentid="id:ns:news::http://news12c"> <url>testUrl</url> <title>testTitle</title> </document> <!-- bad document: --> - <document documenttype="news" documentid="doc:news:http://news12d"> + <document documenttype="news" documentid="id:ns:news::http://news12d"> <value_long>testUrlC</value_long> </documen> <!-- OK document --> - <document documenttype="news" documentid="doc:news:http://news12e"> + <document documenttype="news" documentid="id:ns:news::http://news12e"> <url>testUrl</url> <title>testTitle</title> </document> <!-- bad document: --> - <document documenttype="news" documentid="doc:news:http://news12f"> + <document documenttype="news" documentid="id:ns:news::http://news12f"> <value_long>testUrlD</value_long> </document> diff --git a/document/src/test/vespaxmlparser/test13.xml b/document/src/test/vespaxmlparser/test13.xml index 74cede712ba..54194f15f0e 100644 --- a/document/src/test/vespaxmlparser/test13.xml +++ b/document/src/test/vespaxmlparser/test13.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <vespafeed> - <document documenttype="alltypes" documentid="doc:foobar:http://all.types"> + <document documenttype="alltypes" documentid="id:ns:alltypes::http://all.types"> <stringval>Banana</stringval> <intval1>2146983647</intval1> <intval2>4294967291</intval2> diff --git a/document/src/test/vespaxmlparser/testXMLfile.xml b/document/src/test/vespaxmlparser/testXMLfile.xml index d8100efa327..29b6041a14a 100644 --- a/document/src/test/vespaxmlparser/testXMLfile.xml +++ b/document/src/test/vespaxmlparser/testXMLfile.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <vespafeed> - <document documenttype="music" documentid="doc:music:http://music.yahoo.com/bobdylan/BestOf"> + <document documenttype="music" documentid="id:ns::music::http://music.yahoo.com/bobdylan/BestOf"> <url>http://music.yahoo.com/bobdylan/BestOf</url> <songs>Knockin on Heaven's Door; Mr. Tambourine Man</songs> <title>Best of Bob Dylan</title> @@ -18,9 +18,9 @@ </popularity> </document> - <remove documentid="doc:music:http://music.yahoo.com/BritneySpears/HitMe"/> + <remove documentid="id:ns:music::http://music.yahoo.com/BritneySpears/HitMe"/> - <update documenttype="music" documentid="doc:music:http://music.yahoo.com/bobdylan/BestOf"> + <update documenttype="music" documentid="id:ns:music::http://music.yahoo.com/bobdylan/BestOf"> <assign field="title">The Best of Bob Dylan</assign> <add field="tracks"> <item>Man Of Constant Sorrow</item> diff --git a/document/src/test/vespaxmlparser/test_docindoc.xml b/document/src/test/vespaxmlparser/test_docindoc.xml index 60146780d77..5734a0e635b 100644 --- a/document/src/test/vespaxmlparser/test_docindoc.xml +++ b/document/src/test/vespaxmlparser/test_docindoc.xml @@ -2,22 +2,22 @@ <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <vespafeed> - <document type="outerdoc" id="doc:outer:this:is:outer:doc"> + <document type="outerdoc" id="id:outer:outerdoc::this:is:outer:doc"> <innerdocuments> <item> - <document type="docindoc" id="doc:inner:this:is:inner:doc:a"> + <document type="docindoc" id="id:inner:docindoc::this:is:inner:doc:a"> <name>Peter Sellers</name> <content>Comedian</content> </document> </item> <item> - <document type="docindoc" id="doc:inner:this:is:inner:doc:b"> + <document type="docindoc" id="id:inner:docindoc::this:is:inner:doc:b"> <name>Ole Olsen</name> <content>Common man</content> </document> </item> <item> - <document type="docindoc" id="doc:inner:this:is:inner:doc:c"> + <document type="docindoc" id="id:inner:docindoc::this:is:inner:doc:c"> <name>Stein Nilsen</name> <content>Worker</content> </document> diff --git a/document/src/test/vespaxmlparser/test_position.xml b/document/src/test/vespaxmlparser/test_position.xml index 609fe187973..ee1e95580f2 100644 --- a/document/src/test/vespaxmlparser/test_position.xml +++ b/document/src/test/vespaxmlparser/test_position.xml @@ -1,15 +1,15 @@ <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <vespafeed> - <document documenttype="my_doc" documentid="doc:scheme:"> + <document documenttype="my_doc" documentid="id:ns:my_doc::"> <my_pos><x>1</x><y>2</y></my_pos> </document> - <document documenttype="my_doc" documentid="doc:scheme:"> + <document documenttype="my_doc" documentid="id:ns:my_doc::"> <my_pos>E3;N4</my_pos> </document> - <document documenttype="my_doc" documentid="doc:scheme:"> + <document documenttype="my_doc" documentid="id:ns:my_doc::"> <my_pos>5;6</my_pos> </document> - <document documenttype="my_doc" documentid="doc:scheme:"> + <document documenttype="my_doc" documentid="id:ns:my_doc::"> <my_pos binaryencoding="base64">Nzs4</my_pos> </document> </vespafeed> diff --git a/document/src/test/vespaxmlparser/test_uri.xml b/document/src/test/vespaxmlparser/test_uri.xml index d1240af105f..92f77d8ec99 100644 --- a/document/src/test/vespaxmlparser/test_uri.xml +++ b/document/src/test/vespaxmlparser/test_uri.xml @@ -1,12 +1,12 @@ <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <vespafeed> - <document documenttype="my_doc" documentid="doc:scheme:"> + <document documenttype="my_doc" documentid="id:ns:my_doc::"> <my_uri>scheme://host</my_uri> </document> - <document documenttype="my_doc" documentid="doc:scheme:"> + <document documenttype="my_doc" documentid="id:ns:my_doc::"> <my_arr><item>scheme://host</item></my_arr> </document> - <update documenttype="my_doc" documentid="doc:scheme:"> + <update documenttype="my_doc" documentid="id:ns:my_doc::"> <add field="my_arr"> <item>scheme://host</item> </add> diff --git a/document/src/test/vespaxmlparser/test_url.xml b/document/src/test/vespaxmlparser/test_url.xml index 23c0c78fa8c..c66625a6fe6 100644 --- a/document/src/test/vespaxmlparser/test_url.xml +++ b/document/src/test/vespaxmlparser/test_url.xml @@ -1,6 +1,6 @@ <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <vespafeed> - <document documenttype="my_doc" documentid="doc:scheme:"> + <document documenttype="my_doc" documentid="id:ns:my_doc::"> <my_url> <all>scheme://user@host:99/path?query#fragment</all> <scheme>scheme</scheme> @@ -11,10 +11,10 @@ <fragment>fragment</fragment> </my_url> </document> - <document documenttype="my_doc" documentid="doc:scheme:"> + <document documenttype="my_doc" documentid="id:ns:my_doc::"> <my_url>scheme://user@host:99/path?query#fragment</my_url> </document> - <document documenttype="my_doc" documentid="doc:scheme:"> + <document documenttype="my_doc" documentid="id:ns:my_doc::"> <my_url binaryencoding="base64">c2NoZW1lOi8vdXNlckBob3N0Ojk5L3BhdGg/cXVlcnkjZnJhZ21lbnQ=</my_url> </document> </vespafeed> diff --git a/document/src/test/vespaxmlparser/testalltypes.xml b/document/src/test/vespaxmlparser/testalltypes.xml index a63fc77645a..072a77ff609 100644 --- a/document/src/test/vespaxmlparser/testalltypes.xml +++ b/document/src/test/vespaxmlparser/testalltypes.xml @@ -6,7 +6,7 @@ <vespafeed> - <document documenttype="news" documentid="doc:news:http://news1"> + <document documenttype="news" documentid="id:ns:news::http://news1"> <url>testUrl</url> <title>testTitle</title> <last_downloaded>1</last_downloaded> diff --git a/document/src/test/vespaxmlparser/testmapnokey.xml b/document/src/test/vespaxmlparser/testmapnokey.xml index 7dc8a3af4e0..6e198d4319e 100644 --- a/document/src/test/vespaxmlparser/testmapnokey.xml +++ b/document/src/test/vespaxmlparser/testmapnokey.xml @@ -6,7 +6,7 @@ <vespafeed> - <document documenttype="news" documentid="doc:news:http://news1"> + <document documenttype="news" documentid="id:ns:news::http://news1"> <arrmap> <item> diff --git a/document/src/test/vespaxmlparser/testmapnovalue.xml b/document/src/test/vespaxmlparser/testmapnovalue.xml index ac04ea8e967..ffcca1e3676 100644 --- a/document/src/test/vespaxmlparser/testmapnovalue.xml +++ b/document/src/test/vespaxmlparser/testmapnovalue.xml @@ -6,7 +6,7 @@ <vespafeed> - <document documenttype="news" documentid="doc:news:http://news1"> + <document documenttype="news" documentid="id:ns:news::http://news1"> <arrmap> <item> |