From 991249b70460b61f3b73b53387dbc20357aedaa1 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Wed, 21 Aug 2019 09:14:35 +0200
Subject: Revert "Revert "doc: -> id:""

---
 document/src/tests/vespaxml/fieldpathupdates.xml   |  2 +-
 document/src/tests/vespaxml/test1.expected.xml     |  5 ---
 document/src/tests/vespaxml/test1.xml              |  9 -----
 document/src/tests/vespaxml/test10.xml             |  9 -----
 document/src/tests/vespaxml/test11.xml             |  8 ----
 document/src/tests/vespaxml/test12.xml             |  9 -----
 document/src/tests/vespaxml/test13.xml             |  7 ----
 document/src/tests/vespaxml/test14.xml             |  8 ----
 document/src/tests/vespaxml/test15.xml             |  8 ----
 document/src/tests/vespaxml/test16.xml             |  8 ----
 document/src/tests/vespaxml/test17.xml             |  9 -----
 document/src/tests/vespaxml/test18.xml             |  9 -----
 document/src/tests/vespaxml/test2.expected.xml     |  5 ---
 document/src/tests/vespaxml/test2.xml              |  7 ----
 document/src/tests/vespaxml/test20.xml             |  8 ----
 document/src/tests/vespaxml/test21.xml             |  9 -----
 document/src/tests/vespaxml/test22.xml             |  9 -----
 document/src/tests/vespaxml/test23.xml             |  9 -----
 document/src/tests/vespaxml/test24.xml             |  9 -----
 document/src/tests/vespaxml/test25.xml             |  9 -----
 document/src/tests/vespaxml/test26.xml             |  9 -----
 document/src/tests/vespaxml/test27.xml             |  9 -----
 document/src/tests/vespaxml/test28.xml             | 10 -----
 document/src/tests/vespaxml/test29.xml             | 18 ---------
 document/src/tests/vespaxml/test3.xml              |  9 -----
 document/src/tests/vespaxml/test30.xml             | 15 --------
 document/src/tests/vespaxml/test32.xml             |  7 ----
 document/src/tests/vespaxml/test33.xml             |  9 -----
 document/src/tests/vespaxml/test34.xml             |  7 ----
 document/src/tests/vespaxml/test35.xml             |  9 -----
 document/src/tests/vespaxml/test36.xml             | 43 ----------------------
 document/src/tests/vespaxml/test37.xml             | 23 ------------
 document/src/tests/vespaxml/test4.xml              | 23 ------------
 document/src/tests/vespaxml/test40.xml             |  6 ---
 document/src/tests/vespaxml/test41.xml             | 22 -----------
 document/src/tests/vespaxml/test42.xml             | 22 -----------
 document/src/tests/vespaxml/test43.xml             | 32 ----------------
 document/src/tests/vespaxml/test45.xml             |  6 ---
 document/src/tests/vespaxml/test46.xml             | 10 -----
 document/src/tests/vespaxml/test47.xml             | 10 -----
 document/src/tests/vespaxml/test48.xml             |  6 ---
 document/src/tests/vespaxml/test49.xml             |  8 ----
 document/src/tests/vespaxml/test5.expected.xml     |  3 --
 document/src/tests/vespaxml/test5.xml              |  6 ---
 document/src/tests/vespaxml/test50.xml             |  8 ----
 document/src/tests/vespaxml/test51.xml             |  6 ---
 document/src/tests/vespaxml/test52.xml             | 10 -----
 document/src/tests/vespaxml/test53.xml             | 11 ------
 document/src/tests/vespaxml/test54.xml             | 10 -----
 document/src/tests/vespaxml/test55.xml             | 11 ------
 document/src/tests/vespaxml/test56.xml             |  8 ----
 document/src/tests/vespaxml/test57.xml             |  8 ----
 document/src/tests/vespaxml/test58.xml             | 15 --------
 document/src/tests/vespaxml/test59.xml             |  7 ----
 document/src/tests/vespaxml/test6.xml              |  7 ----
 document/src/tests/vespaxml/test7.xml              |  9 -----
 document/src/tests/vespaxml/test8.xml              |  9 -----
 document/src/tests/vespaxml/test9.xml              |  7 ----
 document/src/tests/vespaxml/test_arraystruct.xml   | 19 ----------
 document/src/tests/vespaxml/test_doc5.xml          |  8 ----
 document/src/tests/vespaxml/test_doc6.xml          |  6 ---
 document/src/tests/vespaxml/test_doc8.xml          |  9 -----
 .../src/tests/vespaxml/test_externalentity.xml     | 11 ------
 document/src/tests/vespaxml/test_idprefix.xml      | 13 -------
 document/src/tests/vespaxml/test_struct.xml        |  9 -----
 document/src/tests/vespaxml/test_update1.xml       | 12 ------
 66 files changed, 1 insertion(+), 690 deletions(-)
 mode change 100755 => 100644 document/src/tests/vespaxml/fieldpathupdates.xml
 delete mode 100644 document/src/tests/vespaxml/test1.expected.xml
 delete mode 100644 document/src/tests/vespaxml/test1.xml
 delete mode 100644 document/src/tests/vespaxml/test10.xml
 delete mode 100644 document/src/tests/vespaxml/test11.xml
 delete mode 100644 document/src/tests/vespaxml/test12.xml
 delete mode 100644 document/src/tests/vespaxml/test13.xml
 delete mode 100644 document/src/tests/vespaxml/test14.xml
 delete mode 100644 document/src/tests/vespaxml/test15.xml
 delete mode 100644 document/src/tests/vespaxml/test16.xml
 delete mode 100644 document/src/tests/vespaxml/test17.xml
 delete mode 100644 document/src/tests/vespaxml/test18.xml
 delete mode 100644 document/src/tests/vespaxml/test2.expected.xml
 delete mode 100644 document/src/tests/vespaxml/test2.xml
 delete mode 100644 document/src/tests/vespaxml/test20.xml
 delete mode 100644 document/src/tests/vespaxml/test21.xml
 delete mode 100644 document/src/tests/vespaxml/test22.xml
 delete mode 100644 document/src/tests/vespaxml/test23.xml
 delete mode 100644 document/src/tests/vespaxml/test24.xml
 delete mode 100644 document/src/tests/vespaxml/test25.xml
 delete mode 100644 document/src/tests/vespaxml/test26.xml
 delete mode 100644 document/src/tests/vespaxml/test27.xml
 delete mode 100644 document/src/tests/vespaxml/test28.xml
 delete mode 100644 document/src/tests/vespaxml/test29.xml
 delete mode 100644 document/src/tests/vespaxml/test3.xml
 delete mode 100644 document/src/tests/vespaxml/test30.xml
 delete mode 100644 document/src/tests/vespaxml/test32.xml
 delete mode 100644 document/src/tests/vespaxml/test33.xml
 delete mode 100644 document/src/tests/vespaxml/test34.xml
 delete mode 100644 document/src/tests/vespaxml/test35.xml
 delete mode 100644 document/src/tests/vespaxml/test36.xml
 delete mode 100644 document/src/tests/vespaxml/test37.xml
 delete mode 100644 document/src/tests/vespaxml/test4.xml
 delete mode 100644 document/src/tests/vespaxml/test40.xml
 delete mode 100644 document/src/tests/vespaxml/test41.xml
 delete mode 100644 document/src/tests/vespaxml/test42.xml
 delete mode 100644 document/src/tests/vespaxml/test43.xml
 delete mode 100644 document/src/tests/vespaxml/test45.xml
 delete mode 100644 document/src/tests/vespaxml/test46.xml
 delete mode 100644 document/src/tests/vespaxml/test47.xml
 delete mode 100644 document/src/tests/vespaxml/test48.xml
 delete mode 100644 document/src/tests/vespaxml/test49.xml
 delete mode 100644 document/src/tests/vespaxml/test5.expected.xml
 delete mode 100644 document/src/tests/vespaxml/test5.xml
 delete mode 100644 document/src/tests/vespaxml/test50.xml
 delete mode 100644 document/src/tests/vespaxml/test51.xml
 delete mode 100644 document/src/tests/vespaxml/test52.xml
 delete mode 100644 document/src/tests/vespaxml/test53.xml
 delete mode 100644 document/src/tests/vespaxml/test54.xml
 delete mode 100644 document/src/tests/vespaxml/test55.xml
 delete mode 100644 document/src/tests/vespaxml/test56.xml
 delete mode 100644 document/src/tests/vespaxml/test57.xml
 delete mode 100644 document/src/tests/vespaxml/test58.xml
 delete mode 100644 document/src/tests/vespaxml/test59.xml
 delete mode 100644 document/src/tests/vespaxml/test6.xml
 delete mode 100644 document/src/tests/vespaxml/test7.xml
 delete mode 100644 document/src/tests/vespaxml/test8.xml
 delete mode 100644 document/src/tests/vespaxml/test9.xml
 delete mode 100644 document/src/tests/vespaxml/test_arraystruct.xml
 delete mode 100644 document/src/tests/vespaxml/test_doc5.xml
 delete mode 100644 document/src/tests/vespaxml/test_doc6.xml
 delete mode 100644 document/src/tests/vespaxml/test_doc8.xml
 delete mode 100644 document/src/tests/vespaxml/test_externalentity.xml
 delete mode 100644 document/src/tests/vespaxml/test_idprefix.xml
 delete mode 100644 document/src/tests/vespaxml/test_struct.xml
 delete mode 100644 document/src/tests/vespaxml/test_update1.xml

(limited to 'document/src/tests/vespaxml')

diff --git a/document/src/tests/vespaxml/fieldpathupdates.xml b/document/src/tests/vespaxml/fieldpathupdates.xml
old mode 100755
new mode 100644
index 3b81aaf4ba2..6c9719a86b9
--- a/document/src/tests/vespaxml/fieldpathupdates.xml
+++ b/document/src/tests/vespaxml/fieldpathupdates.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>
-    <update documenttype="news" documentid="doc:test:http://www.ntnu.no/">
+    <update documenttype="news" documentid="id:ns:news::http://www.ntnu.no/">
         <assign fieldpath="url">assignUrl</assign>
         <assign fieldpath="title">assignTitle</assign>
         <assign fieldpath="last_downloaded">1</assign>
diff --git a/document/src/tests/vespaxml/test1.expected.xml b/document/src/tests/vespaxml/test1.expected.xml
deleted file mode 100644
index 198ed29690d..00000000000
--- a/document/src/tests/vespaxml/test1.expected.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<document documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
-  <title>TestTitle</title>
-  <last_downloaded>100</last_downloaded>
-</document>
diff --git a/document/src/tests/vespaxml/test1.xml b/document/src/tests/vespaxml/test1.xml
deleted file mode 100644
index 1ec09a0b61f..00000000000
--- a/document/src/tests/vespaxml/test1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd idprefix="doc:crawler:">
-    <document documenttype="news" documentid="http://www.ntnu.no/">
-       <title>TestTitle</title>
-       <last_downloaded>100</last_downloaded>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test10.xml b/document/src/tests/vespaxml/test10.xml
deleted file mode 100644
index 832734faf48..00000000000
--- a/document/src/tests/vespaxml/test10.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="news" id="doc:crawler/http://www.ntnu.no/">
-       <title>Test<Title</title>
-       <last_downloaded>hundred</last_downloaded>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test11.xml b/document/src/tests/vespaxml/test11.xml
deleted file mode 100644
index 10daff34be3..00000000000
--- a/document/src/tests/vespaxml/test11.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vesparemove>
-    <document type="news" id="doc:crawler/http://www.ntnu���.no/">
-    </document>
-  </vesparemove>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test12.xml b/document/src/tests/vespaxml/test12.xml
deleted file mode 100644
index 3bfd2658404..00000000000
--- a/document/src/tests/vespaxml/test12.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="news" id="doc:crawler/http://www.ntnu.no/">
-       <title></title>
-       <last_downloaded></last_downloaded>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test13.xml b/document/src/tests/vespaxml/test13.xml
deleted file mode 100644
index 4e55558abc6..00000000000
--- a/document/src/tests/vespaxml/test13.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-    <document type="news" id="doc:crawler:http://www.ntnu.no/">
-       <title>TestTitle</title>
-       <last_downloaded>100</last_downloaded>
-    </document>
-</vespa>
diff --git a/document/src/tests/vespaxml/test14.xml b/document/src/tests/vespaxml/test14.xml
deleted file mode 100644
index 8b345f8c654..00000000000
--- a/document/src/tests/vespaxml/test14.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="news" id="doc:crawler/http://www.ntnu.no/">
-       <last_downloaded>123</last_downloaded>
-    </doc>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test15.xml b/document/src/tests/vespaxml/test15.xml
deleted file mode 100644
index 32707f1636b..00000000000
--- a/document/src/tests/vespaxml/test15.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="news" id="doc:crawler/http://www.ntnu.no/">
-       <title>TestTitle</tit>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test16.xml b/document/src/tests/vespaxml/test16.xml
deleted file mode 100644
index 3b3179446e9..00000000000
--- a/document/src/tests/vespaxml/test16.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <documentid type="news" id="doc:crawler:http://www.ntnu.no/">
-    </documentid>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test17.xml b/document/src/tests/vespaxml/test17.xml
deleted file mode 100644
index aefcc5708e7..00000000000
--- a/document/src/tests/vespaxml/test17.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-  <vespaadd>
-    <document type="news" id="doc:crawler/http://www.ntnu.no/1">
-    </document>
-  </vespaadd>
-  <vespaadd>
-    <document type="news" id="doc:crawler/http://www.ntnu.no/2">
-    </document>
-  </vespaadd>
diff --git a/document/src/tests/vespaxml/test18.xml b/document/src/tests/vespaxml/test18.xml
deleted file mode 100644
index 852dd55c134..00000000000
--- a/document/src/tests/vespaxml/test18.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="article" id="doc:crawler/http://www.ntnu.no/">
-       <title>TestTitle</title>
-       <last_downloaded>100</last_downloaded>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test2.expected.xml b/document/src/tests/vespaxml/test2.expected.xml
deleted file mode 100644
index 198ed29690d..00000000000
--- a/document/src/tests/vespaxml/test2.expected.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<document documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
-  <title>TestTitle</title>
-  <last_downloaded>100</last_downloaded>
-</document>
diff --git a/document/src/tests/vespaxml/test2.xml b/document/src/tests/vespaxml/test2.xml
deleted file mode 100644
index 8194fb1de5e..00000000000
--- a/document/src/tests/vespaxml/test2.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-    <document documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
-       <title>TestTitle</title>
-       <last_downloaded>100</last_downloaded>
-    </document>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test20.xml b/document/src/tests/vespaxml/test20.xml
deleted file mode 100644
index ca502100f67..00000000000
--- a/document/src/tests/vespaxml/test20.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <endoffeed>
-     <name>default</name>
-     <generations>10</generations>
-     <increment>11</increment>
-  </endoffeed>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test21.xml b/document/src/tests/vespaxml/test21.xml
deleted file mode 100644
index 45ef52a3e67..00000000000
--- a/document/src/tests/vespaxml/test21.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="news" id="doc:crawler/http://www.ntnu.no/">
-       <title>TestTitle</title>
-       <last_downloaded>21474836480</last_downloaded>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test22.xml b/document/src/tests/vespaxml/test22.xml
deleted file mode 100644
index c9f5a0af841..00000000000
--- a/document/src/tests/vespaxml/test22.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="news" id="doc:crawler:http://www.ntnu.no/">
-       <title>TestTitle</title>
-       <value_long>9223372036854775807</value_long>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test23.xml b/document/src/tests/vespaxml/test23.xml
deleted file mode 100644
index e052c3f2c7f..00000000000
--- a/document/src/tests/vespaxml/test23.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="news" id="doc:crawler:http://www.ntnu.no/">
-       <title>TestTitle</title>
-       <value_long>-9223372036854775807</value_long>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test24.xml b/document/src/tests/vespaxml/test24.xml
deleted file mode 100644
index 3d36eea7dc8..00000000000
--- a/document/src/tests/vespaxml/test24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="news" id="doc:crawler:http://www.ntnu.no/">
-       <title>TestTitle</title>
-       <value_long>18446744073709551615</value_long>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test25.xml b/document/src/tests/vespaxml/test25.xml
deleted file mode 100644
index 9a499195a6b..00000000000
--- a/document/src/tests/vespaxml/test25.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="news" id="doc:crawler/http://www.ntnu.no/">
-       <title>TestTitle</title>
-       <value_long>18446744073709551616</value_long>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test26.xml b/document/src/tests/vespaxml/test26.xml
deleted file mode 100644
index 2d6ae226c68..00000000000
--- a/document/src/tests/vespaxml/test26.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="news" id="doc:crawler:http://www.ntnu.no/">
-       <title>TestTitle</title>
-       <last_downloaded>0x123</last_downloaded>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test27.xml b/document/src/tests/vespaxml/test27.xml
deleted file mode 100644
index f8adb8b11f8..00000000000
--- a/document/src/tests/vespaxml/test27.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="news" id="doc:crawler/http://www.ntnu.no/">
-       <title>TestTitle</title>
-       <last_downloaded>0x123</last_downloaded>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test28.xml b/document/src/tests/vespaxml/test28.xml
deleted file mode 100644
index 929ba7415d0..00000000000
--- a/document/src/tests/vespaxml/test28.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- Test content -->
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="news" id="doc:crawler:http://www.ntnu.no/">
-       <title>TestTitleContent</title>
-        <value_content contenttype="text/html" encoding="utf-8" language="en"><![CDATA[<html><body><h1>This is the title</h1></body></html>]]></value_content>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test29.xml b/document/src/tests/vespaxml/test29.xml
deleted file mode 100644
index 1b863e5637e..00000000000
--- a/document/src/tests/vespaxml/test29.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- Test field attribute -->
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="news">
-       <field name="uri">doc:crawler:http://www.ntnu.no/</field>
-       <field name="title">TestTitleContent</field>
-       <field name="value_content" contenttype="text/html" encoding="UTF-8" language="NO">This is content</field>
-       <last_downloaded>345</last_downloaded>
-    </document>
-    <document type="news">
-       <field name="uri">doc:crawler:http://www.ntnu.no/2</field>
-       <field name="title">TestTitleContent2</field>
-       <field name="value_content">This is content2</field>
-       <last_downloaded>345</last_downloaded>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test3.xml b/document/src/tests/vespaxml/test3.xml
deleted file mode 100644
index f328115b5ca..00000000000
--- a/document/src/tests/vespaxml/test3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vesparemove idprefix="doc:crawler:">
-    <documentid type="news">
-       <uri>http://www.ntnu.no/</uri>
-       <last_downloaded></last_downloaded>
-    </documentid>
-  </vesparemove>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test30.xml b/document/src/tests/vespaxml/test30.xml
deleted file mode 100644
index fa24e99cd83..00000000000
--- a/document/src/tests/vespaxml/test30.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed xmlns:xsd="http://www.w3.org/2001/XMLSchema-datatypes"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <vespaadd>
-    <document type="news" id="doc:crawler:http://www.ntnu.no/">
-       <title xsi:type="xsd:hexBinary">E5AEB6E59BADE3808220044BE680AC</title>
-       <last_downloaded>100</last_downloaded>
-    </document>
-    <document type="news" id="doc:crawler:http://www.ntnu.org/">
-       <title xsi:type="xsd:base64Binary">5a625Zut44CCIARL5oCs</title>
-       <last_downloaded>100</last_downloaded>
-    </document>
-  </vespaadd>
-</vespafeed>
-
diff --git a/document/src/tests/vespaxml/test32.xml b/document/src/tests/vespaxml/test32.xml
deleted file mode 100644
index 53993f57d19..00000000000
--- a/document/src/tests/vespaxml/test32.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vesparemove>
-    <documentid id="doc:crawler:http://www.ntnu���.no/"/>
-  </vesparemove>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test33.xml b/document/src/tests/vespaxml/test33.xml
deleted file mode 100644
index d63c059aa6e..00000000000
--- a/document/src/tests/vespaxml/test33.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vesparemove>
-    <documentid>
-      <uri>http://www.ntnu.no/</uri>
-    </documentid>
-  </vesparemove>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test34.xml b/document/src/tests/vespaxml/test34.xml
deleted file mode 100644
index 384c7ae8111..00000000000
--- a/document/src/tests/vespaxml/test34.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vesparemove>
-    <documentid id="http://www.ntnu.no/"/>
-  </vesparemove>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test35.xml b/document/src/tests/vespaxml/test35.xml
deleted file mode 100644
index e69f032ef49..00000000000
--- a/document/src/tests/vespaxml/test35.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="news" id="doc:crawler:http://www.ntnu.no/">
-       <title binaryencoding="base64">VmVzcGEgcnVsZXM=</title>
-       <last_downloaded>100</last_downloaded>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test36.xml b/document/src/tests/vespaxml/test36.xml
deleted file mode 100644
index bfd4547b6c8..00000000000
--- a/document/src/tests/vespaxml/test36.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd idprefix="doc:crawler:">
-    <document type="news" id="http://www.ntnu.no/1">
-       <title>TestTitle1</title>
-       <last_downloaded>100</last_downloaded>
-       <stringarr>
-         <item>one</item>
-         <item>two</item>
-         <item>three</item>
-         <item>four</item>
-         <item>five</item>
-       </stringarr>
-       <intarr>
-         <item>1</item>
-         <item>2</item>
-         <item>3</item>
-         <item>4</item>
-         <item>5</item>
-       </intarr>
-    </document>
-    <document type="news" id="http://www.ntnu.no/2">
-       <title>TestTitle2</title>
-       <intarr>
-         <item>o1</item>
-       </intarr>
-    </document>
-    <document type="news" id="http://www.ntnu.no/3">
-       <title>TestTitle3</title>
-       <intarr>
-         <tem>1</tem>
-       </intarr>
-    </document>
-    <document type="news" id="http://www.ntnu.no/4">
-       <title>TestTitle4</title>
-       <intarr></intarr>
-    </document>
-    <document type="news" id="http://www.ntnu.no/5">
-       <title>TestTitle5</title>
-       <intarr>1</intarr>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test37.xml b/document/src/tests/vespaxml/test37.xml
deleted file mode 100644
index 8993dd99640..00000000000
--- a/document/src/tests/vespaxml/test37.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd idprefix="doc:crawler:">
-    <document type="news" id="http://www.ntnu.no/1">
-       <title>TestTitle1</title>
-       <last_downloaded>100</last_downloaded>
-       <weightedsetstring>
-         <item>one</item>
-         <item>two</item>
-         <item>three</item>
-         <item>four</item>
-         <item>five</item>
-       </weightedsetstring>
-       <weightedsetint>
-         <item>1</item>
-         <item>2</item>
-         <item>3</item>
-         <item>4</item>
-         <item>5</item>
-       </weightedsetint>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test4.xml b/document/src/tests/vespaxml/test4.xml
deleted file mode 100644
index 8a4777344d6..00000000000
--- a/document/src/tests/vespaxml/test4.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-
-  <vespaadd idprefix="doc:crawler:">
-    <document type="news" id="http://www.uio.no/">
-       <title>TestTitle</title>
-       <last_downloaded>100</last_downloaded>
-    </document>
-
-    <document type="news" id="http://www.dagbladet.no/">
-       <title>Title2</title>
-       <last_downloaded>100</last_downloaded>
-    </document>
-  </vespaadd>
-
-  <vespaadd>
-    <document type="news" id="doc:crawler2:http://www.vg.no/">
-       <title>Title2</title>
-       <last_downloaded>100</last_downloaded>
-    </document>
-  </vespaadd>
-
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test40.xml b/document/src/tests/vespaxml/test40.xml
deleted file mode 100644
index 68210920df2..00000000000
--- a/document/src/tests/vespaxml/test40.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-    <update documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
-       <assign field="title">TestTitle</assign>
-    </update>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test41.xml b/document/src/tests/vespaxml/test41.xml
deleted file mode 100644
index b92c2e586a8..00000000000
--- a/document/src/tests/vespaxml/test41.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <update documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
-    <assign field="stringarr">
-      <item>First</item>
-      <item>Second</item>
-    </assign>
-    <add field="stringarr">
-      <item>Third</item>
-      <item>Fourth</item>
-    </add>
-    <remove field="stringarr">
-      <item>Fifth</item>
-      <item>Sixth</item>
-    </remove>
-    <assign field="intarr">
-      <item>100</item>
-      <item>200</item>
-    </assign>
-    <assign field="intarr"></assign>
-  </update>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test42.xml b/document/src/tests/vespaxml/test42.xml
deleted file mode 100644
index 479509776fa..00000000000
--- a/document/src/tests/vespaxml/test42.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-    <update documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
-        <assign field="weightedsetstring">
-	    <item weight="1">First</item>
-            <item weight="2">Second</item>
-        </assign>
-        <add field="weightedsetstring">
-            <item weight="3">Third</item>
-            <item weight="4">Fourth</item>
-        </add>
-        <remove field="weightedsetstring">
-            <item>Fifth</item>
-	    <item>Sixth</item>
-	</remove>
-        <assign field="weightedsetint">
-	    <item weight="1">100</item>
-            <item weight="2">200</item>
-        </assign>
-        <assign field="weightedsetint"></assign>
-    </update>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test43.xml b/document/src/tests/vespaxml/test43.xml
deleted file mode 100644
index 874deada10c..00000000000
--- a/document/src/tests/vespaxml/test43.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-    <document documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
-        <value_long>1008</value_long>
-	<weightedsetstring>
-	    <item weight="1">First</item>
-            <item weight="2">Second</item>
-        </weightedsetstring>
-    </document>
-    <update documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
-        <increment field="value_long" by="1" />
-        <decrement field="value_long" by="2" />
-	<divide field="value_long" by="3" />
-	<multiply field="value_long" by="4" />
-    </update>	
-    <update documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
-	<alter field="value_long">
-	    <increment by="5" />
-	    <decrement by="6" />
-	</alter>
-	<alter field="value_long">
-	    <divide by="7" />
-	    <multiply by="8" />
-	</alter>
-    </update>	
-    <update documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
-	<increment field="weightedsetstring" by="9">
-	    <key>First</key>
-	    <key>Second</key>
-	</increment>
-    </update>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test45.xml b/document/src/tests/vespaxml/test45.xml
deleted file mode 100644
index ccc1a475a86..00000000000
--- a/document/src/tests/vespaxml/test45.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-    <update documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
-        <remove field="floatarr" />
-    </update>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test46.xml b/document/src/tests/vespaxml/test46.xml
deleted file mode 100644
index 118dfdd810d..00000000000
--- a/document/src/tests/vespaxml/test46.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-    <document documenttype="news" documentid="doc:crawler:http://www.blargh.example.com/" lastmodified="98798787">
-        <value_long>1008</value_long>
-	<weightedsetstring>
-	    <item weight="1">First</item>
-            <item weight="2">Second</item>
-        </weightedsetstring>
-    </document>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test47.xml b/document/src/tests/vespaxml/test47.xml
deleted file mode 100644
index e9499c32810..00000000000
--- a/document/src/tests/vespaxml/test47.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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>
-    <!-- VERY BAD: -->
-    <vespaadd>
-        <documentid type="news">
-            <uri>doc:this:is:very:bad</uri>
-        </documentid>
-    </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test48.xml b/document/src/tests/vespaxml/test48.xml
deleted file mode 100644
index 119d3ea82d4..00000000000
--- a/document/src/tests/vespaxml/test48.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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>
-    <!-- VERY BAD: -->
-    <documentid type="news" id="doc:this:is:even:worse" />
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test49.xml b/document/src/tests/vespaxml/test49.xml
deleted file mode 100644
index d3fa4dc9637..00000000000
--- a/document/src/tests/vespaxml/test49.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-    <!-- VERY BAD: -->
-    <documentid type="news">
-        <uri>doc:this:is:very:very:ugly</uri>
-    </documentid>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test5.expected.xml b/document/src/tests/vespaxml/test5.expected.xml
deleted file mode 100644
index 5b851a4601e..00000000000
--- a/document/src/tests/vespaxml/test5.expected.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<remove documentid="doc:crawler:http://www.ntnu.no/"/>
-
diff --git a/document/src/tests/vespaxml/test5.xml b/document/src/tests/vespaxml/test5.xml
deleted file mode 100644
index bdfa496cb86..00000000000
--- a/document/src/tests/vespaxml/test5.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vesparemove>
-    <documentid documentid="doc:crawler:http://www.ntnu.no/"/>
-  </vesparemove>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test50.xml b/document/src/tests/vespaxml/test50.xml
deleted file mode 100644
index 45c4c0a4d13..00000000000
--- a/document/src/tests/vespaxml/test50.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-    <!-- OK: -->
-    <vesparemove>
-        <documentid type="news" id="doc:this:an:ok:removal"/>
-    </vesparemove>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test51.xml b/document/src/tests/vespaxml/test51.xml
deleted file mode 100644
index 9e91d45d930..00000000000
--- a/document/src/tests/vespaxml/test51.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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>
-    <!-- OK: -->
-    <remove documentid="doc:this:is:also:an:ok:removal"/>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test52.xml b/document/src/tests/vespaxml/test52.xml
deleted file mode 100644
index a8617df42da..00000000000
--- a/document/src/tests/vespaxml/test52.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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>
-    <!-- OK: -->
-    <vespaadd>
-        <document documentid="doc:blah:blah:blah" documenttype="news">
-            <value_long>2345</value_long>
-        </document>
-    </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test53.xml b/document/src/tests/vespaxml/test53.xml
deleted file mode 100644
index 6449436ff54..00000000000
--- a/document/src/tests/vespaxml/test53.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-    <!-- HALF BAD, BUT NOT ALLOWED: -->
-    <vespaadd>
-        <document documentid="doc:blah:blah:blah" documenttype="news">
-            <value_long>2345</value_long>
-        </document>
-        <documentid type="news" id="doc:half:bad:add"/>
-    </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test54.xml b/document/src/tests/vespaxml/test54.xml
deleted file mode 100644
index 7535f4b93ea..00000000000
--- a/document/src/tests/vespaxml/test54.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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>
-    <!-- VERY BAD: -->
-    <vesparemove>
-        <document documentid="doc:bluh:bluh:bluh" documenttype="news">
-            <value_long>45</value_long>
-        </document>
-    </vesparemove>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test55.xml b/document/src/tests/vespaxml/test55.xml
deleted file mode 100644
index b2134a29a46..00000000000
--- a/document/src/tests/vespaxml/test55.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-    <!-- HALF BAD, BUT NOT ALLOWED: -->
-    <vesparemove>
-        <documentid type="news" id="doc:this:remove:is:half:bad"/>
-        <document documentid="doc:bluh:bluh:bluh" documenttype="news">
-            <value_long>45</value_long>
-        </document>
-    </vesparemove>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test56.xml b/document/src/tests/vespaxml/test56.xml
deleted file mode 100644
index 1dd36a57b68..00000000000
--- a/document/src/tests/vespaxml/test56.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-    <!-- VERY BAD: -->
-    <vesparemove>
-        <document documentid="doc:bluh:bluh:bluh" documenttype="news" />
-    </vesparemove>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test57.xml b/document/src/tests/vespaxml/test57.xml
deleted file mode 100644
index d75e6d4d099..00000000000
--- a/document/src/tests/vespaxml/test57.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-    <!-- OK: -->
-    <document documentid="doc:blih:blih:blih" documenttype="news">
-        <value_long>235</value_long>
-    </document>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test58.xml b/document/src/tests/vespaxml/test58.xml
deleted file mode 100644
index 8711a2a49e4..00000000000
--- a/document/src/tests/vespaxml/test58.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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 type="news" id="doc:music:http://music.yahoo.com">
-    <url>http://music.yahoo.com</url>
-    <stringarr>
-   <item>yahoo<item>
-   <item>hello</item>
-   </stringarr>
-      </document>
-
-
-
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test59.xml b/document/src/tests/vespaxml/test59.xml
deleted file mode 100644
index e7708351c93..00000000000
--- a/document/src/tests/vespaxml/test59.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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>
-    <update documentid="doc:blih:blih:blih" documenttype="news">
-        <increment field="title" by="3549" />
-    </update>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test6.xml b/document/src/tests/vespaxml/test6.xml
deleted file mode 100644
index 3739690d2fe..00000000000
--- a/document/src/tests/vespaxml/test6.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vesparemove>
-    <documentid type="news" id="doc:crawler:http://www.ntnu���.no/"/>
-  </vesparemove>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test7.xml b/document/src/tests/vespaxml/test7.xml
deleted file mode 100644
index 129773678f1..00000000000
--- a/document/src/tests/vespaxml/test7.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed idprefix="doc:crawler:">
-  <vespaadd>
-    <document type="news" id="http://www.ntnu.no/">
-       <title>TestTitle</title>
-       <last_downloaded>100.5</last_downloaded>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test8.xml b/document/src/tests/vespaxml/test8.xml
deleted file mode 100644
index 272791511c1..00000000000
--- a/document/src/tests/vespaxml/test8.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="news" id="doc:crawler:http://www.ntnu.no/">
-       <title>TestTitle</title>
-       <last_downloaded>hundred</last_downloaded>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test9.xml b/document/src/tests/vespaxml/test9.xml
deleted file mode 100644
index b733c66a797..00000000000
--- a/document/src/tests/vespaxml/test9.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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>
-  <vesparemove>
-    <documentid id="doc:crawler/http://www.ntnu���.no/"/>
-  </vesparemove>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test_arraystruct.xml b/document/src/tests/vespaxml/test_arraystruct.xml
deleted file mode 100644
index ba5c3233e16..00000000000
--- a/document/src/tests/vespaxml/test_arraystruct.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <document documenttype="news" documentid="doc:test:struct">
-    <mystructarr>
-      <item>
-        <intval>36</intval>
-        <stringval>test</stringval>
-      </item>
-      <item>
-        <intval>39</intval>
-        <stringval>test2</stringval>
-      </item>
-      <item>
-        <intval>100</intval>
-        <stringval>cooool</stringval>
-      </item>
-    </mystructarr>
-  </document>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test_doc5.xml b/document/src/tests/vespaxml/test_doc5.xml
deleted file mode 100644
index 30ce5f7b8f8..00000000000
--- a/document/src/tests/vespaxml/test_doc5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <endoffeed>
-     <name>default</name>
-     <generation>10</generation>
-     <increment>20</increment>
-  </endoffeed>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test_doc6.xml b/document/src/tests/vespaxml/test_doc6.xml
deleted file mode 100644
index 52015073f96..00000000000
--- a/document/src/tests/vespaxml/test_doc6.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <endoffeed>
-     <name>default</name>
-  </endoffeed>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test_doc8.xml b/document/src/tests/vespaxml/test_doc8.xml
deleted file mode 100644
index f5c7a2090ae..00000000000
--- a/document/src/tests/vespaxml/test_doc8.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd>
-    <document type="news" version="13" id="http://www.ntnu.no/">
-       <title>TestTitle</title>
-       <last_downloaded>100</last_downloaded>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test_externalentity.xml b/document/src/tests/vespaxml/test_externalentity.xml
deleted file mode 100644
index 014d67d32bc..00000000000
--- a/document/src/tests/vespaxml/test_externalentity.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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. -->
-<!DOCTYPE vespafeed [<!ENTITY xxe SYSTEM "xxe.txt">]>
-<vespafeed>
-  <vespaadd idprefix="doc:crawler:">
-    <document documenttype="news" documentid="http://www.ntnu.no/">
-       <title>&xxe;</title>
-       <last_downloaded>100</last_downloaded>
-    </document>
-  </vespaadd>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test_idprefix.xml b/document/src/tests/vespaxml/test_idprefix.xml
deleted file mode 100644
index 2b0487d0b94..00000000000
--- a/document/src/tests/vespaxml/test_idprefix.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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 type="news" id="http://music.yahoo.com/bobdylan/BestOf">
-    <title>Best of Bob Dylan</title>
-  </document>
-
-  <document type="news" id="http://music.yahoo.com/metallica/BestOf">
-    <title>Best of Metallica</title>
-  </document>
-
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test_struct.xml b/document/src/tests/vespaxml/test_struct.xml
deleted file mode 100644
index 251b8b4896d..00000000000
--- a/document/src/tests/vespaxml/test_struct.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <document documenttype="news" documentid="doc:test:struct">
-    <mystruct>
-      <intval>36</intval>
-      <stringval>test</stringval>
-    </mystruct>
-  </document>
-</vespafeed>
diff --git a/document/src/tests/vespaxml/test_update1.xml b/document/src/tests/vespaxml/test_update1.xml
deleted file mode 100644
index 89dcb978e3b..00000000000
--- a/document/src/tests/vespaxml/test_update1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<vespafeed>
-  <vespaadd idprefix="doc:crawler:">
-    <document type="news" id="http://www.ntnu.no/">
-       <title>TestTitle</title>
-       <last_downloaded>100</last_downloaded>
-    </document>
-    <update documenttype="news" documentid="http://www.ntnu.no/">
-          <divide field="last_downloaded" by="0" />
-    </update>
-  </vespaadd>
-</vespafeed>
-- 
cgit v1.2.3