diff options
5 files changed, 64 insertions, 64 deletions
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp index 5567eb970bb..6c36b004133 100644 --- a/searchcore/src/tests/proton/docsummary/docsummary.cpp +++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp @@ -952,13 +952,13 @@ Test::requireThatUrisAreUsed() startIndexField("urisingle"). startSubField("all"). addUrlTokenizedString( - "http://www.yahoo.com:81/fluke?ab=2#4"). + "http://www.example.com:81/fluke?ab=2#4"). endSubField(). startSubField("scheme"). addUrlTokenizedString("http"). endSubField(). startSubField("host"). - addUrlTokenizedString("www.yahoo.com"). + addUrlTokenizedString("www.example.com"). endSubField(). startSubField("port"). addUrlTokenizedString("81"). @@ -977,13 +977,13 @@ Test::requireThatUrisAreUsed() startElement(1). startSubField("all"). addUrlTokenizedString( - "http://www.yahoo.com:82/fluke?ab=2#8"). + "http://www.example.com:82/fluke?ab=2#8"). endSubField(). startSubField("scheme"). addUrlTokenizedString("http"). endSubField(). startSubField("host"). - addUrlTokenizedString("www.yahoo.com"). + addUrlTokenizedString("www.example.com"). endSubField(). startSubField("port"). addUrlTokenizedString("82"). @@ -1027,13 +1027,13 @@ Test::requireThatUrisAreUsed() startElement(4). startSubField("all"). addUrlTokenizedString( - "http://www.yahoo.com:83/fluke?ab=2#12"). + "http://www.example.com:83/fluke?ab=2#12"). endSubField(). startSubField("scheme"). addUrlTokenizedString("http"). endSubField(). startSubField("host"). - addUrlTokenizedString("www.yahoo.com"). + addUrlTokenizedString("www.example.com"). endSubField(). startSubField("port"). addUrlTokenizedString("83"). @@ -1086,14 +1086,14 @@ Test::requireThatUrisAreUsed() bc.createFieldCacheRepo(getResultConfig())->getFieldCache("class0"), getMarkupFields()); - EXPECT_TRUE(assertString("http://www.yahoo.com:81/fluke?ab=2#4", + EXPECT_TRUE(assertString("http://www.example.com:81/fluke?ab=2#4", "urisingle", dsa, 1)); GeneralResultPtr res = getResult(dsa, 1); { vespalib::Slime slime; decode(res->GetEntry("uriarray"), slime); EXPECT_TRUE(slime.get().valid()); - EXPECT_EQUAL("http://www.yahoo.com:82/fluke?ab=2#8", asVstring(slime.get()[0])); + EXPECT_EQUAL("http://www.example.com:82/fluke?ab=2#8", asVstring(slime.get()[0])); EXPECT_EQUAL("http://www.flickr.com:82/fluke?ab=2#9", asVstring(slime.get()[1])); } { @@ -1104,7 +1104,7 @@ Test::requireThatUrisAreUsed() EXPECT_EQUAL(7L, slime.get()[1]["weight"].asLong()); vespalib::string arr0s = asVstring(slime.get()[0]["item"]); vespalib::string arr1s = asVstring(slime.get()[1]["item"]); - EXPECT_EQUAL("http://www.yahoo.com:83/fluke?ab=2#12", arr0s); + EXPECT_EQUAL("http://www.example.com:83/fluke?ab=2#12", arr0s); EXPECT_EQUAL("http://www.flickr.com:85/fluke?ab=2#13", arr1s); } } diff --git a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp index 878833fa58b..b9b74527dca 100644 --- a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp +++ b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp @@ -369,9 +369,9 @@ Document Test::makeDocument() { doc.setValue("position2", LongFieldValue(ZCurve::encode(4, 2))); StructFieldValue uri(getDataType("url")); - uri.setValue("all", annotateTerm("http://www.yahoo.com:42/foobar?q#frag")); + uri.setValue("all", annotateTerm("http://www.example.com:42/foobar?q#frag")); uri.setValue("scheme", annotateTerm("http")); - uri.setValue("host", annotateTerm("www.yahoo.com")); + uri.setValue("host", annotateTerm("www.example.com")); uri.setValue("port", annotateTerm("42")); uri.setValue("path", annotateTerm("foobar")); uri.setValue("query", annotateTerm("q")); @@ -379,10 +379,10 @@ Document Test::makeDocument() { doc.setValue("uri", uri); ArrayFieldValue uri_array(getDataType("Array<url>")); - uri.setValue("all", annotateTerm("http://www.yahoo.com:80/foobar?q#frag")); + uri.setValue("all", annotateTerm("http://www.example.com:80/foobar?q#frag")); uri.setValue("port", annotateTerm("80")); uri_array.add(uri); - uri.setValue("all", annotateTerm("https://www.yahoo.com:443/foo?q#frag")); + uri.setValue("all", annotateTerm("https://www.example.com:443/foo?q#frag")); uri.setValue("scheme", annotateTerm("https")); uri.setValue("path", annotateTerm("foo")); uri.setValue("port", annotateTerm("443")); diff --git a/searchlib/src/tests/index/docbuilder/docbuilder_test.cpp b/searchlib/src/tests/index/docbuilder/docbuilder_test.cpp index a4402736f2d..f5eb6d385d9 100644 --- a/searchlib/src/tests/index/docbuilder/docbuilder_test.cpp +++ b/searchlib/src/tests/index/docbuilder/docbuilder_test.cpp @@ -124,13 +124,13 @@ Test::testBuilder() endField(); b.startIndexField("iu"). startSubField("all"). - addUrlTokenizedString("http://www.yahoo.com:81/fluke?ab=2#4"). + addUrlTokenizedString("http://www.example.com:81/fluke?ab=2#4"). endSubField(). startSubField("scheme"). addUrlTokenizedString("http"). endSubField(). startSubField("host"). - addUrlTokenizedString("www.yahoo.com"). + addUrlTokenizedString("www.example.com"). endSubField(). startSubField("port"). addUrlTokenizedString("81"). @@ -148,13 +148,13 @@ Test::testBuilder() b.startIndexField("iau"). startElement(1). startSubField("all"). - addUrlTokenizedString("http://www.yahoo.com:82/fluke?ab=2#8"). + addUrlTokenizedString("http://www.example.com:82/fluke?ab=2#8"). endSubField(). startSubField("scheme"). addUrlTokenizedString("http"). endSubField(). startSubField("host"). - addUrlTokenizedString("www.yahoo.com"). + addUrlTokenizedString("www.example.com"). endSubField(). startSubField("port"). addUrlTokenizedString("82"). @@ -196,13 +196,13 @@ Test::testBuilder() b.startIndexField("iwu"). startElement(4). startSubField("all"). - addUrlTokenizedString("http://www.yahoo.com:83/fluke?ab=2#12"). + addUrlTokenizedString("http://www.example.com:83/fluke?ab=2#12"). endSubField(). startSubField("scheme"). addUrlTokenizedString("http"). endSubField(). startSubField("host"). - addUrlTokenizedString("www.yahoo.com"). + addUrlTokenizedString("www.example.com"). endSubField(). startSubField("port"). addUrlTokenizedString("83"). @@ -309,8 +309,8 @@ Test::testBuilder() EXPECT_EQUAL("<item weight=\"1\">foo</item>", *itr++); EXPECT_EQUAL("</ic>", *itr++); EXPECT_EQUAL("<iu>", *itr++); - EXPECT_EQUAL("<all>http://www.yahoo.com:81/fluke?ab=2#4</all>", *itr++); - EXPECT_EQUAL("<host>www.yahoo.com</host>", *itr++); + EXPECT_EQUAL("<all>http://www.example.com:81/fluke?ab=2#4</all>", *itr++); + EXPECT_EQUAL("<host>www.example.com</host>", *itr++); EXPECT_EQUAL("<scheme>http</scheme>", *itr++); EXPECT_EQUAL("<path>/fluke</path>", *itr++); EXPECT_EQUAL("<port>81</port>", *itr++); @@ -319,8 +319,8 @@ Test::testBuilder() EXPECT_EQUAL("</iu>", *itr++); EXPECT_EQUAL("<iau>", *itr++); EXPECT_EQUAL("<item>", *itr++); - EXPECT_EQUAL("<all>http://www.yahoo.com:82/fluke?ab=2#8</all>", *itr++); - EXPECT_EQUAL("<host>www.yahoo.com</host>", *itr++); + EXPECT_EQUAL("<all>http://www.example.com:82/fluke?ab=2#8</all>", *itr++); + EXPECT_EQUAL("<host>www.example.com</host>", *itr++); EXPECT_EQUAL("<scheme>http</scheme>", *itr++); EXPECT_EQUAL("<path>/fluke</path>", *itr++); EXPECT_EQUAL("<port>82</port>", *itr++); @@ -339,8 +339,8 @@ Test::testBuilder() EXPECT_EQUAL("</iau>", *itr++); EXPECT_EQUAL("<iwu>", *itr++); EXPECT_EQUAL("<item weight=\"4\">", *itr++); - EXPECT_EQUAL("<all>http://www.yahoo.com:83/fluke?ab=2#12</all>", *itr++); - EXPECT_EQUAL("<host>www.yahoo.com</host>", *itr++); + EXPECT_EQUAL("<all>http://www.example.com:83/fluke?ab=2#12</all>", *itr++); + EXPECT_EQUAL("<host>www.example.com</host>", *itr++); EXPECT_EQUAL("<scheme>http</scheme>", *itr++); EXPECT_EQUAL("<path>/fluke</path>", *itr++); EXPECT_EQUAL("<port>83</port>", *itr++); diff --git a/searchlib/src/tests/memoryindex/dictionary/dictionary_test.cpp b/searchlib/src/tests/memoryindex/dictionary/dictionary_test.cpp index 8ebab883613..3dbf4efc368 100644 --- a/searchlib/src/tests/memoryindex/dictionary/dictionary_test.cpp +++ b/searchlib/src/tests/memoryindex/dictionary/dictionary_test.cpp @@ -1178,13 +1178,13 @@ TEST_F("requireThatUriIndexingIsWorking", DictionaryFixture<UriFixture>) f._b.startDocument("doc::10"); f._b.startIndexField("iu"). startSubField("all"). - addUrlTokenizedString("http://www.yahoo.com:81/fluke?ab=2#4"). + addUrlTokenizedString("http://www.example.com:81/fluke?ab=2#4"). endSubField(). startSubField("scheme"). addUrlTokenizedString("http"). endSubField(). startSubField("host"). - addUrlTokenizedString("www.yahoo.com"). + addUrlTokenizedString("www.example.com"). endSubField(). startSubField("port"). addUrlTokenizedString("81"). @@ -1202,13 +1202,13 @@ TEST_F("requireThatUriIndexingIsWorking", DictionaryFixture<UriFixture>) f._b.startIndexField("iau"). startElement(1). startSubField("all"). - addUrlTokenizedString("http://www.yahoo.com:82/fluke?ab=2#8"). + addUrlTokenizedString("http://www.example.com:82/fluke?ab=2#8"). endSubField(). startSubField("scheme"). addUrlTokenizedString("http"). endSubField(). startSubField("host"). - addUrlTokenizedString("www.yahoo.com"). + addUrlTokenizedString("www.example.com"). endSubField(). startSubField("port"). addUrlTokenizedString("82"). @@ -1250,13 +1250,13 @@ TEST_F("requireThatUriIndexingIsWorking", DictionaryFixture<UriFixture>) f._b.startIndexField("iwu"). startElement(4). startSubField("all"). - addUrlTokenizedString("http://www.yahoo.com:83/fluke?ab=2#12"). + addUrlTokenizedString("http://www.example.com:83/fluke?ab=2#12"). endSubField(). startSubField("scheme"). addUrlTokenizedString("http"). endSubField(). startSubField("host"). - addUrlTokenizedString("www.yahoo.com"). + addUrlTokenizedString("www.example.com"). endSubField(). startSubField("port"). addUrlTokenizedString("83"). @@ -1315,7 +1315,7 @@ TEST_F("requireThatUriIndexingIsWorking", DictionaryFixture<UriFixture>) } { uint32_t fieldId = f.getSchema().getIndexFieldId("iu"); - PostingIterator itr(f._d.findFrozen("yahoo", fieldId), + PostingIterator itr(f._d.findFrozen("example", fieldId), featureStoreRef(f._d, fieldId), fieldId, matchData); itr.initFullRange(); @@ -1327,7 +1327,7 @@ TEST_F("requireThatUriIndexingIsWorking", DictionaryFixture<UriFixture>) } { uint32_t fieldId = f.getSchema().getIndexFieldId("iau"); - PostingIterator itr(f._d.findFrozen("yahoo", fieldId), + PostingIterator itr(f._d.findFrozen("example", fieldId), featureStoreRef(f._d, fieldId), fieldId, matchData); itr.initFullRange(); @@ -1340,7 +1340,7 @@ TEST_F("requireThatUriIndexingIsWorking", DictionaryFixture<UriFixture>) } { uint32_t fieldId = f.getSchema().getIndexFieldId("iwu"); - PostingIterator itr(f._d.findFrozen("yahoo", fieldId), + PostingIterator itr(f._d.findFrozen("example", fieldId), featureStoreRef(f._d, fieldId), fieldId, matchData); itr.initFullRange(); diff --git a/searchlib/src/tests/memoryindex/urlfieldinverter/urlfieldinverter_test.cpp b/searchlib/src/tests/memoryindex/urlfieldinverter/urlfieldinverter_test.cpp index 233c95b58c8..5011310f412 100644 --- a/searchlib/src/tests/memoryindex/urlfieldinverter/urlfieldinverter_test.cpp +++ b/searchlib/src/tests/memoryindex/urlfieldinverter/urlfieldinverter_test.cpp @@ -30,13 +30,13 @@ makeDoc10Single(DocBuilder &b) b.startDocument("doc::10"); b.startIndexField("url"). startSubField("all"). - addUrlTokenizedString("http://www.yahoo.com:81/fluke?ab=2#4"). + addUrlTokenizedString("http://www.example.com:81/fluke?ab=2#4"). endSubField(). startSubField("scheme"). addUrlTokenizedString("http"). endSubField(). startSubField("host"). - addUrlTokenizedString("www.yahoo.com"). + addUrlTokenizedString("www.example.com"). endSubField(). startSubField("port"). addUrlTokenizedString("81"). @@ -63,13 +63,13 @@ makeDoc10Array(DocBuilder &b) b.startIndexField("url"). startElement(1). startSubField("all"). - addUrlTokenizedString("http://www.yahoo.com:82/fluke?ab=2#8"). + addUrlTokenizedString("http://www.example.com:82/fluke?ab=2#8"). endSubField(). startSubField("scheme"). addUrlTokenizedString("http"). endSubField(). startSubField("host"). - addUrlTokenizedString("www.yahoo.com"). + addUrlTokenizedString("www.example.com"). endSubField(). startSubField("port"). addUrlTokenizedString("82"). @@ -119,13 +119,13 @@ makeDoc10WeightedSet(DocBuilder &b) b.startIndexField("url"). startElement(4). startSubField("all"). - addUrlTokenizedString("http://www.yahoo.com:83/fluke?ab=2#12"). + addUrlTokenizedString("http://www.example.com:83/fluke?ab=2#12"). endSubField(). startSubField("scheme"). addUrlTokenizedString("http"). endSubField(). startSubField("host"). - addUrlTokenizedString("www.yahoo.com"). + addUrlTokenizedString("www.example.com"). endSubField(). startSubField("port"). addUrlTokenizedString("83"). @@ -258,16 +258,16 @@ TEST_F("requireThatSingleUrlFieldWorks", Fixture(CollectionType::SINGLE)) "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," - "w=yahoo,a=10," "f=1," "w=http,a=10," "f=2," "w=com,a=10," + "w=example,a=10," "w=www,a=10," - "w=yahoo,a=10," "f=3," "w=81,a=10," "f=4," @@ -281,8 +281,8 @@ TEST_F("requireThatSingleUrlFieldWorks", Fixture(CollectionType::SINGLE)) "w=EnDhOsT,a=10," "w=StArThOsT,a=10," "w=com,a=10," - "w=www,a=10," - "w=yahoo,a=10", + "w=example,a=10," + "w=www,a=10", f._inserter.toStr()); } @@ -298,18 +298,18 @@ TEST_F("requireThatArrayUrlFieldWorks", Fixture(CollectionType::ARRAY)) "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," - "w=yahoo,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," - "w=yahoo,a=10," "f=3," "w=82,a=10," "f=4," @@ -324,9 +324,9 @@ TEST_F("requireThatArrayUrlFieldWorks", Fixture(CollectionType::ARRAY)) "w=EnDhOsT,a=10," "w=StArThOsT,a=10," "w=com,a=10," + "w=example,a=10," "w=flickr,a=10," - "w=www,a=10," - "w=yahoo,a=10", + "w=www,a=10", f._inserter.toStr()); } @@ -342,18 +342,18 @@ TEST_F("requireThatWeightedSetFieldWorks", Fixture(CollectionType::WEIGHTEDSET)) "w=85,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," - "w=yahoo,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," - "w=yahoo,a=10," "f=3," "w=83,a=10," "w=85,a=10," @@ -369,9 +369,9 @@ TEST_F("requireThatWeightedSetFieldWorks", Fixture(CollectionType::WEIGHTEDSET)) "w=EnDhOsT,a=10," "w=StArThOsT,a=10," "w=com,a=10," + "w=example,a=10," "w=flickr,a=10," - "w=www,a=10," - "w=yahoo,a=10", + "w=www,a=10", f._inserter.toStr()); } @@ -386,16 +386,16 @@ TEST_F("requireThatAnnotatedSingleUrlFieldWorks", Fixture(CollectionType::SINGLE "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," - "w=yahoo,a=10," "f=1," "w=http,a=10," "f=2," "w=com,a=10," + "w=example,a=10," "w=www,a=10," - "w=yahoo,a=10," "f=3," "w=81,a=10," "f=4," @@ -410,8 +410,8 @@ TEST_F("requireThatAnnotatedSingleUrlFieldWorks", Fixture(CollectionType::SINGLE "w=EnDhOsT,a=10," "w=StArThOsT,a=10," "w=com,a=10," - "w=www,a=10," - "w=yahoo,a=10", + "w=example,a=10," + "w=www,a=10", f._inserter.toStr()); } @@ -428,18 +428,18 @@ TEST_F("requireThatAnnotatedArrayUrlFieldWorks", Fixture(CollectionType::ARRAY)) "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," - "w=yahoo,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," - "w=yahoo,a=10," "f=3," "w=82,a=10," "f=4," @@ -455,9 +455,9 @@ TEST_F("requireThatAnnotatedArrayUrlFieldWorks", Fixture(CollectionType::ARRAY)) "w=EnDhOsT,a=10," "w=StArThOsT,a=10," "w=com,a=10," + "w=example,a=10," "w=flickr,a=10," - "w=www,a=10," - "w=yahoo,a=10", + "w=www,a=10", f._inserter.toStr()); } @@ -476,18 +476,18 @@ TEST_F("requireThatAnnotatedWeightedSetFieldWorks", "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])," - "w=yahoo,a=10(e=0,w=4,l=9[2])," "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])," - "w=yahoo,a=10(e=0,w=4,l=3[1])," "f=3," "w=83,a=10(e=0,w=4,l=1[0])," "w=85,a=10(e=1,w=7,l=1[0])," @@ -504,9 +504,9 @@ TEST_F("requireThatAnnotatedWeightedSetFieldWorks", "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])," - "w=yahoo,a=10(e=0,w=4,l=5[2])", + "w=www,a=10(e=0,w=4,l=5[1],e=1,w=7,l=5[1])", f._inserter.toStr()); } |