aboutsummaryrefslogtreecommitdiffstats
path: root/searchsummary/src/tests
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahooinc.com>2021-11-18 12:46:35 +0000
committerArne H Juul <arnej@yahooinc.com>2021-11-18 12:47:00 +0000
commita84b1073467eab96d0e08c4c9fd42cc343584791 (patch)
treec13e0a610539b4363ab0a60cb103cf1f63debaa6 /searchsummary/src/tests
parent57183d087ede775e56b642286d43264ee8595984 (diff)
we no longer make any XML strings
Diffstat (limited to 'searchsummary/src/tests')
-rw-r--r--searchsummary/src/tests/docsummary/positionsdfw_test.cpp2
-rw-r--r--searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp4
2 files changed, 1 insertions, 5 deletions
diff --git a/searchsummary/src/tests/docsummary/positionsdfw_test.cpp b/searchsummary/src/tests/docsummary/positionsdfw_test.cpp
index 404179caff7..52a363c9888 100644
--- a/searchsummary/src/tests/docsummary/positionsdfw_test.cpp
+++ b/searchsummary/src/tests/docsummary/positionsdfw_test.cpp
@@ -134,7 +134,7 @@ void checkWritePositionField(Test &test, AttrType &attr,
PositionsDFW::UP writer =
createPositionsDFW(attr.getName().c_str(), &attribute_man);
ASSERT_TRUE(writer.get());
- ResType res_type = RES_XMLSTRING;
+ ResType res_type = RES_JSONSTRING;
MyGetDocsumsStateCallback callback;
GetDocsumsState state(callback);
state._attributes.push_back(&attr);
diff --git a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
index 0a421882784..5855dd0e8fd 100644
--- a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
+++ b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
@@ -65,8 +65,6 @@ struct DocsumFixture : IDocsumStore, GetDocsumsStateCallback {
strlen("long_string")));
EXPECT_TRUE(packer->AddLongData( "long_data",
strlen("long_data")));
- EXPECT_TRUE(packer->AddLongString( "xml_string",
- strlen("xml_string")));
FieldBlock jsf1("{foo:1, bar:2}");
EXPECT_TRUE(packer->AddLongData(jsf1.data(), jsf1.dataLen()));
EXPECT_TRUE(packer->AddLongString("abc", 3));
@@ -98,7 +96,6 @@ DocsumFixture::DocsumFixture()
EXPECT_TRUE(cfg->AddConfigEntry("data_field", RES_DATA));
EXPECT_TRUE(cfg->AddConfigEntry("longstring_field", RES_LONG_STRING));
EXPECT_TRUE(cfg->AddConfigEntry("longdata_field", RES_LONG_DATA));
- EXPECT_TRUE(cfg->AddConfigEntry("xmlstring_field", RES_XMLSTRING));
EXPECT_TRUE(cfg->AddConfigEntry("jsonstring_field", RES_JSONSTRING));
EXPECT_TRUE(cfg->AddConfigEntry("bad_jsonstring_field", RES_JSONSTRING));
config->CreateEnumMaps();
@@ -121,7 +118,6 @@ TEST_FF("require that docsum can be written as slime", DocsumFixture(), Slime())
EXPECT_EQUAL(f2.get()["data_field"].asData().make_string(), std::string("data"));
EXPECT_EQUAL(f2.get()["longstring_field"].asString().make_string(), std::string("long_string"));
EXPECT_EQUAL(f2.get()["longdata_field"].asData().make_string(), std::string("long_data"));
- EXPECT_EQUAL(f2.get()["xmlstring_field"].asString().make_string(), std::string("xml_string"));
EXPECT_EQUAL(f2.get()["jsonstring_field"]["foo"].asLong(), 1u);
EXPECT_EQUAL(f2.get()["jsonstring_field"]["bar"].asLong(), 2u);
EXPECT_EQUAL(f2.get()["bad_jsonstring_field"].type().getId(), 0u);