Stop testing with url data type, use uri data type instead.

5 files changed, 26 insertions, 316 deletions

diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index 677419d9cee..5b081fb5b51 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -11,7 +11,6 @@
 #include <vespa/document/datatype/annotationtype.h>
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/datatype/tensor_data_type.h>
-#include <vespa/document/datatype/urldatatype.h>
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/document/fieldvalue/arrayfieldvalue.h>
 #include <vespa/document/fieldvalue/bytefieldvalue.h>
@@ -770,55 +769,19 @@ TEST_F("requireThatUrisAreUsed", Fixture)
 {
     BuildContext bc([](auto& header)
                     { using namespace document::config_builder;
-                        header.addField("urisingle", UrlDataType::getInstance().getId())
-                            .addField("uriarray", Array(UrlDataType::getInstance().getId()))
-                            .addField("uriwset", Wset(UrlDataType::getInstance().getId())); });
+                        header.addField("urisingle", DataType::T_URI)
+                            .addField("uriarray", Array(DataType::T_URI))
+                            .addField("uriwset", Wset(DataType::T_URI)); });
     DBContext dc(bc.get_repo_sp(), getDocTypeName());
     auto exp = bc.make_document("id:ns:searchdocument::0");
-    auto uri = bc.make_url();
-    uri.setValue("all", StringFieldValue("http://www.example.com:81/fluke?ab=2#4"));
-    uri.setValue("scheme", StringFieldValue("http"));
-    uri.setValue("host", StringFieldValue("www.example.com"));
-    uri.setValue("port", StringFieldValue("81"));
-    uri.setValue("path", StringFieldValue("/fluke"));
-    uri.setValue("query", StringFieldValue("ab=2"));
-    uri.setValue("fragment", StringFieldValue("4"));
-    exp->setValue("urisingle", uri);
+    exp->setValue("urisingle", StringFieldValue("http://www.example.com:81/fluke?ab=2#4"));
     auto uri_array = bc.make_array("uriarray");
-    uri.setValue("all", StringFieldValue("http://www.example.com:82/fluke?ab=2#8"));
-    uri.setValue("scheme", StringFieldValue("http"));
-    uri.setValue("host", StringFieldValue("www.example.com"));
-    uri.setValue("port", StringFieldValue("82"));
-    uri.setValue("path", StringFieldValue("/fluke"));
-    uri.setValue("query", StringFieldValue("ab=2"));
-    uri.setValue("fragment", StringFieldValue("8"));
-    uri_array.add(uri);
-    uri.setValue("all", StringFieldValue("http://www.flickr.com:82/fluke?ab=2#9"));
-    uri.setValue("scheme", StringFieldValue("http"));
-    uri.setValue("host", StringFieldValue("www.flickr.com"));
-    uri.setValue("port", StringFieldValue("82"));
-    uri.setValue("path", StringFieldValue("/fluke"));
-    uri.setValue("query", StringFieldValue("ab=2"));
-    uri.setValue("fragment", StringFieldValue("9"));
-    uri_array.add(uri);
+    uri_array.add(StringFieldValue("http://www.example.com:82/fluke?ab=2#8"));
+    uri_array.add(StringFieldValue("http://www.flickr.com:82/fluke?ab=2#9"));
     exp->setValue("uriarray", uri_array);
     auto uri_wset = bc.make_wset("uriwset");
-    uri.setValue("all", StringFieldValue("http://www.example.com:83/fluke?ab=2#12"));
-    uri.setValue("scheme", StringFieldValue("http"));
-    uri.setValue("host", StringFieldValue("www.example.com"));
-    uri.setValue("port", StringFieldValue("83"));
-    uri.setValue("path", StringFieldValue("/fluke"));
-    uri.setValue("query", StringFieldValue("ab=2"));
-    uri.setValue("fragment", StringFieldValue("12"));
-    uri_wset.add(uri, 4);
-    uri.setValue("all", StringFieldValue("http://www.flickr.com:85/fluke?ab=2#13"));
-    uri.setValue("scheme", StringFieldValue("http"));
-    uri.setValue("host", StringFieldValue("www.flickr.com"));
-    uri.setValue("port", StringFieldValue("85"));
-    uri.setValue("path", StringFieldValue("/fluke"));
-    uri.setValue("query", StringFieldValue("ab=2"));
-    uri.setValue("fragment", StringFieldValue("13"));
-    uri_wset.add(uri, 7);
+    uri_wset.add(StringFieldValue("http://www.example.com:83/fluke?ab=2#12"), 4);
+    uri_wset.add(StringFieldValue("http://www.flickr.com:85/fluke?ab=2#13"), 7);
     exp->setValue("uriwset", uri_wset);
     dc._sa->put(1, 1, *exp);
 
diff --git a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
index 1e6cb61d3f4..b9e933ab3e8 100644
--- a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
+++ b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
@@ -1,11 +1,9 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/document/datatype/datatype.h>
-#include <vespa/document/datatype/urldatatype.h>
 #include <vespa/document/fieldvalue/arrayfieldvalue.h>
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/document/fieldvalue/stringfieldvalue.h>
-#include <vespa/document/fieldvalue/structfieldvalue.h>
 #include <vespa/document/fieldvalue/weightedsetfieldvalue.h>
 #include <vespa/document/repo/configbuilder.h>
 #include <vespa/searchlib/diskindex/fusion.h>
@@ -48,8 +46,7 @@ using namespace index;
 
 using document::ArrayFieldValue;
 using document::Document;
-using document::StructFieldValue;
-using document::UrlDataType;
+using document::StringFieldValue;
 using document::WeightedSetFieldValue;
 using queryeval::RankedSearchIteratorBase;
 using queryeval::SearchIterator;
@@ -1179,9 +1176,9 @@ DocBuilder::AddFieldsType
 make_uri_add_fields()
 {
     return [](auto& header) { using namespace document::config_builder;
-        header.addField("iu", UrlDataType::getInstance().getId())
-            .addField("iau", Array(UrlDataType::getInstance().getId()))
-            .addField("iwu", Wset(UrlDataType::getInstance().getId()));
+        header.addField("iu", document::DataType::T_URI)
+            .addField("iau", Array(document::DataType::T_URI))
+            .addField("iwu", Wset(document::DataType::T_URI));
            };
 }
 
@@ -1194,51 +1191,16 @@ TEST_F(UriInverterTest, require_that_uri_indexing_is_working)
 {
     Document::UP doc;
     StringFieldBuilder sfb(_b);
-    sfb.url_mode(true);
-    auto url_value = _b.make_url();
 
     doc = _b.make_document("id:ns:searchdocument::10");
-    url_value.setValue("all", sfb.tokenize("http://www.example.com:81/fluke?ab=2#4").build());
-    url_value.setValue("scheme", sfb.tokenize("http").build());
-    url_value.setValue("host", sfb.tokenize("www.example.com").build());
-    url_value.setValue("port", sfb.tokenize("81").build());
-    url_value.setValue("path", sfb.tokenize("/fluke").build());
-    url_value.setValue("query", sfb.tokenize("ab=2").build());
-    url_value.setValue("fragment", sfb.tokenize("4").build());
-    doc->setValue("iu", url_value);
+    doc->setValue("iu", StringFieldValue("http://www.example.com:81/fluke?ab=2#4"));
     auto url_array = _b.make_array("iau");
-    url_value.setValue("all", sfb.tokenize("http://www.example.com:82/fluke?ab=2#8").build());
-    url_value.setValue("scheme", sfb.tokenize("http").build());
-    url_value.setValue("host", sfb.tokenize("www.example.com").build());
-    url_value.setValue("port", sfb.tokenize("82").build());
-    url_value.setValue("path", sfb.tokenize("/fluke").build());
-    url_value.setValue("query", sfb.tokenize("ab=2").build());
-    url_value.setValue("fragment", sfb.tokenize("8").build());
-    url_array.add(url_value);
-    url_value.setValue("all", sfb.tokenize("http://www.flickr.com:82/fluke?ab=2#9").build());
-    url_value.setValue("scheme", sfb.tokenize("http").build());
-    url_value.setValue("host", sfb.tokenize("www.flickr.com").build());
-    url_value.setValue("path", sfb.tokenize("/fluke").build());
-    url_value.setValue("fragment", sfb.tokenize("9").build());
-    url_array.add(url_value);
+    url_array.add(StringFieldValue("http://www.example.com:82/fluke?ab=2#8"));
+    url_array.add(StringFieldValue("http://www.flickr.com:82/fluke?ab=2#9"));
     doc->setValue("iau", url_array);
     auto url_wset = _b.make_wset("iwu");
-    url_value.setValue("all", sfb.tokenize("http://www.example.com:83/fluke?ab=2#12").build());
-    url_value.setValue("scheme", sfb.tokenize("http").build());
-    url_value.setValue("host", sfb.tokenize("www.example.com").build());
-    url_value.setValue("port", sfb.tokenize("83").build());
-    url_value.setValue("path", sfb.tokenize("/fluke").alt_word("altfluke").build());
-    url_value.setValue("query", sfb.tokenize("ab=2").build());
-    url_value.setValue("fragment", sfb.tokenize("12").build());
-    url_wset.add(url_value, 4);
-    url_value.setValue("all", sfb.tokenize("http://www.flickr.com:85/fluke?ab=2#13").build());
-    url_value.setValue("scheme", sfb.tokenize("http").build());
-    url_value.setValue("host", sfb.tokenize("www.flickr.com").build());
-    url_value.setValue("port", sfb.tokenize("85").build());
-    url_value.setValue("path", sfb.tokenize("/fluke").build());
-    url_value.setValue("query", sfb.tokenize("ab=2").build());
-    url_value.setValue("fragment", sfb.tokenize("13").build());
-    url_wset.add(url_value, 7);
+    url_wset.add(StringFieldValue("http://www.example.com:83/fluke?ab=2#12"), 4);
+    url_wset.add(StringFieldValue("http://www.flickr.com:85/fluke?ab=2#13"), 7);
     doc->setValue("iwu", url_wset);
     _inv.invertDocument(10, *doc, {});
     myPushDocument(_inv);
diff --git a/searchlib/src/tests/memoryindex/url_field_inverter/url_field_inverter_test.cpp b/searchlib/src/tests/memoryindex/url_field_inverter/url_field_inverter_test.cpp
index b3892d5d69a..9543b109dc4 100644
--- a/searchlib/src/tests/memoryindex/url_field_inverter/url_field_inverter_test.cpp
+++ b/searchlib/src/tests/memoryindex/url_field_inverter/url_field_inverter_test.cpp
@@ -1,11 +1,9 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/searchlib/memoryindex/url_field_inverter.h>
-#include <vespa/document/datatype/urldatatype.h>
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/document/fieldvalue/arrayfieldvalue.h>
 #include <vespa/document/fieldvalue/stringfieldvalue.h>
-#include <vespa/document/fieldvalue/structfieldvalue.h>
 #include <vespa/document/fieldvalue/weightedsetfieldvalue.h>
 #include <vespa/document/repo/configbuilder.h>
 #include <vespa/document/repo/fixedtyperepo.h>
@@ -16,7 +14,6 @@
 #include <vespa/searchlib/memoryindex/field_inverter.h>
 #include <vespa/searchlib/memoryindex/word_store.h>
 #include <vespa/searchlib/test/doc_builder.h>
-#include <vespa/searchlib/test/string_field_builder.h>
 #include <vespa/searchlib/test/memoryindex/ordered_field_index_inserter.h>
 #include <vespa/searchlib/test/memoryindex/ordered_field_index_inserter_backend.h>
 #include <vespa/vespalib/gtest/gtest.h>
@@ -25,13 +22,11 @@ namespace search {
 
 using document::Document;
 using document::ArrayFieldValue;
-using document::StructFieldValue;
-using document::UrlDataType;
+using document::StringFieldValue;
 using document::WeightedSetFieldValue;
 using index::schema::CollectionType;
 using index::schema::DataType;
 using search::test::DocBuilder;
-using search::test::StringFieldBuilder;
 
 using namespace index;
 
@@ -45,17 +40,7 @@ Document::UP
 makeDoc10Single(DocBuilder &b)
 {
     auto doc = b.make_document("id:ns:searchdocument::10");
-    auto url_value = b.make_struct("url");
-    StringFieldBuilder sfb(b);
-    sfb.url_mode(true);
-    url_value.setValue("all", sfb.tokenize("http://www.example.com:81/fluke?ab=2#4").build());
-    url_value.setValue("scheme", sfb.tokenize("http").build());
-    url_value.setValue("host", sfb.tokenize("www.example.com").build());
-    url_value.setValue("port", sfb.tokenize("81").build());
-    url_value.setValue("path", sfb.tokenize("/fluke").alt_word("altfluke").build());
-    url_value.setValue("query", sfb.tokenize("ab=2").build());
-    url_value.setValue("fragment", sfb.tokenize("4").build());
-    doc->setValue("url", url_value);
+    doc->setValue("url", StringFieldValue("http://www.example.com:81/fluke?ab=2#4"));
     return doc;
 }
 
@@ -63,24 +48,9 @@ Document::UP
 makeDoc10Array(DocBuilder &b)
 {
     auto doc = b.make_document("id:ns:searchdocument::10");
-    StringFieldBuilder sfb(b);
-    sfb.url_mode(true);
     auto url_array = b.make_array("url");
-    auto url_value = b.make_url();
-    url_value.setValue("all", sfb.tokenize("http://www.example.com:82/fluke?ab=2#8").build());
-    url_value.setValue("scheme", sfb.tokenize("http").build());
-    url_value.setValue("host", sfb.tokenize("www.example.com").build());
-    url_value.setValue("port", sfb.tokenize("82").build());
-    url_value.setValue("path", sfb.tokenize("/fluke").alt_word("altfluke").build());
-    url_value.setValue("query", sfb.tokenize("ab=2").build());
-    url_value.setValue("fragment", sfb.tokenize("8").build());
-    url_array.add(url_value);
-    url_value.setValue("all", sfb.tokenize("http://www.flickr.com:82/fluke?ab=2#9").build());
-    url_value.setValue("scheme", sfb.tokenize("http").build());
-    url_value.setValue("host", sfb.tokenize("www.flickr.com").build());
-    url_value.setValue("path", sfb.tokenize("/fluke").build());
-    url_value.setValue("fragment", sfb.tokenize("9").build());
-    url_array.add(url_value);
+    url_array.add(StringFieldValue("http://www.example.com:82/fluke?ab=2#8"));
+    url_array.add(StringFieldValue("http://www.flickr.com:82/fluke?ab=2#9"));
     doc->setValue("url", url_array);
     return doc;
 }
@@ -89,26 +59,9 @@ Document::UP
 makeDoc10WeightedSet(DocBuilder &b)
 {
     auto doc = b.make_document("id:ns:searchdocument::10");
-    StringFieldBuilder sfb(b);
-    sfb.url_mode(true);
     auto url_wset = b.make_wset("url");
-    auto url_value = b.make_url();
-    url_value.setValue("all", sfb.tokenize("http://www.example.com:83/fluke?ab=2#12").build());
-    url_value.setValue("scheme", sfb.tokenize("http").build());
-    url_value.setValue("host", sfb.tokenize("www.example.com").build());
-    url_value.setValue("port", sfb.tokenize("83").build());
-    url_value.setValue("path", sfb.tokenize("/fluke").alt_word("altfluke").build());
-    url_value.setValue("query", sfb.tokenize("ab=2").build());
-    url_value.setValue("fragment", sfb.tokenize("12").build());
-    url_wset.add(url_value, 4);
-    url_value.setValue("all", sfb.tokenize("http://www.flickr.com:85/fluke?ab=2#13").build());
-    url_value.setValue("scheme", sfb.tokenize("http").build());
-    url_value.setValue("host", sfb.tokenize("www.flickr.com").build());
-    url_value.setValue("port", sfb.tokenize("85").build());
-    url_value.setValue("path", sfb.tokenize("/fluke").build());
-    url_value.setValue("query", sfb.tokenize("ab=2").build());
-    url_value.setValue("fragment", sfb.tokenize("13").build());
-    url_wset.add(url_value, 7);
+    url_wset.add(StringFieldValue("http://www.example.com:83/fluke?ab=2#12"), 4);
+    url_wset.add(StringFieldValue("http://www.flickr.com:85/fluke?ab=2#13"), 7);
     doc->setValue("url", url_wset);
     return doc;
 }
@@ -187,27 +140,23 @@ struct UrlFieldInverterTest : public ::testing::Test {
             inverter->pushDocuments();
         }
     }
-
-    void enableAnnotations() {
-        _urlInverter->setUseAnnotations(true);
-    }
 };
 
 UrlFieldInverterTest::~UrlFieldInverterTest() = default;
 
 DocBuilder::AddFieldsType
 add_single_url = [](auto& header) {
-                     header.addField("url", UrlDataType::getInstance().getId()); };
+                     header.addField("url", document::DataType::T_URI); };
 
 DocBuilder::AddFieldsType
 add_array_url = [](auto& header) {
                     using namespace document::config_builder;
-                    header.addField("url", Array(UrlDataType::getInstance().getId())); };
+                    header.addField("url", Array(document::DataType::T_URI)); };
 
 DocBuilder::AddFieldsType
 add_wset_url = [](auto& header) {
                     using namespace document::config_builder;
-                    header.addField("url", Wset(UrlDataType::getInstance().getId())); };
+                    header.addField("url", Wset(document::DataType::T_URI)); };
 
 
 
@@ -350,139 +299,6 @@ TEST_F(WeightedSetInverterTest, require_that_weighted_set_field_works)
               _inserter_backend.toStr());
 }
 
-TEST_F(SingleInverterTest, require_that_annotated_single_url_field_works)
-{
-    enableAnnotations();
-    invertDocument(10, *makeDoc10Single(_b));
-    pushDocuments();
-    EXPECT_EQ("f=0,"
-              "w=2,a=10,"
-              "w=4,a=10,"
-              "w=81,a=10,"
-              "w=ab,a=10,"
-              "w=com,a=10,"
-              "w=example,a=10,"
-              "w=fluke,a=10,"
-              "w=http,a=10,"
-              "w=www,a=10,"
-              "f=1,"
-              "w=http,a=10,"
-              "f=2,"
-              "w=com,a=10,"
-              "w=example,a=10,"
-              "w=www,a=10,"
-              "f=3,"
-              "w=81,a=10,"
-              "f=4,"
-              "w=altfluke,a=10,"
-              "w=fluke,a=10,"
-              "f=5,"
-              "w=2,a=10,"
-              "w=ab,a=10,"
-              "f=6,"
-              "w=4,a=10,"
-              "f=7,"
-              "w=EnDhOsT,a=10,"
-              "w=StArThOsT,a=10,"
-              "w=com,a=10,"
-              "w=example,a=10,"
-              "w=www,a=10",
-              _inserter_backend.toStr());
-}
-
-TEST_F(ArrayInverterTest, require_that_annotated_array_url_field_works)
-{
-    enableAnnotations();
-    invertDocument(10, *makeDoc10Array(_b));
-    pushDocuments();
-    EXPECT_EQ("f=0,"
-              "w=2,a=10,"
-              "w=8,a=10,"
-              "w=82,a=10,"
-              "w=9,a=10,"
-              "w=ab,a=10,"
-              "w=com,a=10,"
-              "w=example,a=10,"
-              "w=flickr,a=10,"
-              "w=fluke,a=10,"
-              "w=http,a=10,"
-              "w=www,a=10,"
-              "f=1,"
-              "w=http,a=10,"
-              "f=2,"
-              "w=com,a=10,"
-              "w=example,a=10,"
-              "w=flickr,a=10,"
-              "w=www,a=10,"
-              "f=3,"
-              "w=82,a=10,"
-              "f=4,"
-              "w=altfluke,a=10,"
-              "w=fluke,a=10,"
-              "f=5,"
-              "w=2,a=10,"
-              "w=ab,a=10,"
-              "f=6,"
-              "w=8,a=10,"
-              "w=9,a=10,"
-              "f=7,"
-              "w=EnDhOsT,a=10,"
-              "w=StArThOsT,a=10,"
-              "w=com,a=10,"
-              "w=example,a=10,"
-              "w=flickr,a=10,"
-              "w=www,a=10",
-              _inserter_backend.toStr());
-}
-
-TEST_F(WeightedSetInverterTest, require_that_annotated_weighted_set_field_works)
-{
-    enableAnnotations();
-    _inserter_backend.setVerbose();
-    invertDocument(10, *makeDoc10WeightedSet(_b));
-    pushDocuments();
-    EXPECT_EQ("f=0,"
-              "w=12,a=10(e=0,w=4,l=9[8]),"
-              "w=13,a=10(e=1,w=7,l=9[8]),"
-              "w=2,a=10(e=0,w=4,l=9[7],e=1,w=7,l=9[7]),"
-              "w=83,a=10(e=0,w=4,l=9[4]),"
-              "w=85,a=10(e=1,w=7,l=9[4]),"
-              "w=ab,a=10(e=0,w=4,l=9[6],e=1,w=7,l=9[6]),"
-              "w=com,a=10(e=0,w=4,l=9[3],e=1,w=7,l=9[3]),"
-              "w=example,a=10(e=0,w=4,l=9[2]),"
-              "w=flickr,a=10(e=1,w=7,l=9[2]),"
-              "w=fluke,a=10(e=0,w=4,l=9[5],e=1,w=7,l=9[5]),"
-              "w=http,a=10(e=0,w=4,l=9[0],e=1,w=7,l=9[0]),"
-              "w=www,a=10(e=0,w=4,l=9[1],e=1,w=7,l=9[1]),"
-              "f=1,"
-              "w=http,a=10(e=0,w=4,l=1[0],e=1,w=7,l=1[0]),"
-              "f=2,"
-              "w=com,a=10(e=0,w=4,l=3[2],e=1,w=7,l=3[2]),"
-              "w=example,a=10(e=0,w=4,l=3[1]),"
-              "w=flickr,a=10(e=1,w=7,l=3[1]),"
-              "w=www,a=10(e=0,w=4,l=3[0],e=1,w=7,l=3[0]),"
-              "f=3,"
-              "w=83,a=10(e=0,w=4,l=1[0]),"
-              "w=85,a=10(e=1,w=7,l=1[0]),"
-              "f=4,"
-              "w=altfluke,a=10(e=0,w=4,l=1[0]),"
-              "w=fluke,a=10(e=0,w=4,l=1[0],e=1,w=7,l=1[0]),"
-              "f=5,"
-              "w=2,a=10(e=0,w=4,l=2[1],e=1,w=7,l=2[1]),"
-              "w=ab,a=10(e=0,w=4,l=2[0],e=1,w=7,l=2[0]),"
-              "f=6,"
-              "w=12,a=10(e=0,w=4,l=1[0]),"
-              "w=13,a=10(e=1,w=7,l=1[0]),"
-              "f=7,"
-              "w=EnDhOsT,a=10(e=0,w=4,l=5[4],e=1,w=7,l=5[4]),"
-              "w=StArThOsT,a=10(e=0,w=4,l=5[0],e=1,w=7,l=5[0]),"
-              "w=com,a=10(e=0,w=4,l=5[3],e=1,w=7,l=5[3]),"
-              "w=example,a=10(e=0,w=4,l=5[2]),"
-              "w=flickr,a=10(e=1,w=7,l=5[2]),"
-              "w=www,a=10(e=0,w=4,l=5[1],e=1,w=7,l=5[1])",
-              _inserter_backend.toStr());
-}
-
 TEST_F(SingleInverterTest, require_that_empty_single_field_works)
 {
     invertDocument(10, *makeDoc10Empty(_b));
@@ -505,30 +321,6 @@ TEST_F(WeightedSetInverterTest, require_that_empty_weighted_set_field_works)
     EXPECT_EQ("", _inserter_backend.toStr());
 }
 
-TEST_F(SingleInverterTest, require_that_annotated_empty_single_field_works)
-{
-    enableAnnotations();
-    invertDocument(10, *makeDoc10Empty(_b));
-    pushDocuments();
-    EXPECT_EQ("", _inserter_backend.toStr());
-}
-
-TEST_F(ArrayInverterTest, require_that_annotated_empty_array_field_works)
-{
-    enableAnnotations();
-    invertDocument(10, *makeDoc10Empty(_b));
-    pushDocuments();
-    EXPECT_EQ("", _inserter_backend.toStr());
-}
-
-TEST_F(WeightedSetInverterTest, require_that_annotated_empty_weighted_set_field_works)
-{
-    enableAnnotations();
-    invertDocument(10, *makeDoc10Empty(_b));
-    pushDocuments();
-    EXPECT_EQ("", _inserter_backend.toStr());
-}
-
 }
 }
 
diff --git a/searchlib/src/vespa/searchlib/test/doc_builder.cpp b/searchlib/src/vespa/searchlib/test/doc_builder.cpp
index 2312bf1d6bf..4ed64b9bfe6 100644
--- a/searchlib/src/vespa/searchlib/test/doc_builder.cpp
+++ b/searchlib/src/vespa/searchlib/test/doc_builder.cpp
@@ -108,10 +108,4 @@ DocBuilder::make_struct(vespalib::stringref field_name)
     return {field_type};
 }
 
-StructFieldValue
-DocBuilder::make_url()
-{
-    return {get_data_type("url")};
-}
-
 }
diff --git a/searchlib/src/vespa/searchlib/test/doc_builder.h b/searchlib/src/vespa/searchlib/test/doc_builder.h
index 75dbc30a0fb..1f652694b0a 100644
--- a/searchlib/src/vespa/searchlib/test/doc_builder.h
+++ b/searchlib/src/vespa/searchlib/test/doc_builder.h
@@ -45,7 +45,6 @@ public:
     document::MapFieldValue make_map(vespalib::stringref field_name);
     document::WeightedSetFieldValue make_wset(vespalib::stringref field_name);
     document::StructFieldValue make_struct(vespalib::stringref field_name);
-    document::StructFieldValue make_url();
 };
 
 }