diff options
Diffstat (limited to 'searchcore/src/tests/proton')
5 files changed, 26 insertions, 28 deletions
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp index 7df80778cb7..a33a5f147f2 100644 --- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp @@ -569,7 +569,7 @@ TEST_F("require that outdated put is ignored", FeedHandlerFixture) void addLidToRemove(RemoveDocumentsOperation &op) { - LidVectorContext::LP lids(new LidVectorContext(42)); + LidVectorContext::SP lids(new LidVectorContext(42)); lids->addLid(4); op.setLidsToRemove(0, lids); } diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp index 2c54188af3a..7a28dd02bca 100644 --- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp @@ -249,7 +249,7 @@ TEST_F("require that prune removed documents removes documents", { f.addDocsToMetaStore(3); - LidVectorContext::LP lids(new LidVectorContext(4)); + LidVectorContext::SP lids(new LidVectorContext(4)); lids->addLid(1); lids->addLid(3); PruneRemovedDocumentsOperation op(lids->getDocIdLimit(), subdb_id); diff --git a/searchcore/src/tests/proton/metrics/metrics_engine/metrics_engine_test.cpp b/searchcore/src/tests/proton/metrics/metrics_engine/metrics_engine_test.cpp index 36cdd7ff89f..78b53910023 100644 --- a/searchcore/src/tests/proton/metrics/metrics_engine/metrics_engine_test.cpp +++ b/searchcore/src/tests/proton/metrics/metrics_engine/metrics_engine_test.cpp @@ -44,14 +44,14 @@ struct AttributeMetricsFixture { EXPECT_EQUAL(expNumMetrics, totalLegacyMetrics.list.getRegisteredMetrics().size()); } void assertMetricsExists(const vespalib::string &attrName) { - EXPECT_TRUE(metrics.get(attrName).get() != nullptr); - EXPECT_TRUE(legacyMetrics.list.get(attrName).get() != nullptr); - EXPECT_TRUE(totalLegacyMetrics.list.get(attrName).get() != nullptr); + EXPECT_TRUE(metrics.get(attrName) != nullptr); + EXPECT_TRUE(legacyMetrics.list.get(attrName) != nullptr); + EXPECT_TRUE(totalLegacyMetrics.list.get(attrName) != nullptr); } void assertMetricsNotExists(const vespalib::string &attrName) { - EXPECT_TRUE(metrics.get(attrName).get() == nullptr); - EXPECT_TRUE(legacyMetrics.list.get(attrName).get() == nullptr); - EXPECT_TRUE(totalLegacyMetrics.list.get(attrName).get() == nullptr); + EXPECT_TRUE(metrics.get(attrName) == nullptr); + EXPECT_TRUE(legacyMetrics.list.get(attrName) == nullptr); + EXPECT_TRUE(totalLegacyMetrics.list.get(attrName) == nullptr); } }; diff --git a/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp b/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp index 89159a6b92f..0afbfaedb73 100644 --- a/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp +++ b/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp @@ -16,7 +16,6 @@ #include <vespa/searchcore/proton/server/i_proton_configurer.h> #include <vespa/searchsummary/config/config-juniperrc.h> #include <vespa/vespalib/testkit/testapp.h> -#include <vespa/vespalib/util/linkedptr.h> #include <vespa/vespalib/util/varholder.h> #include <mutex> @@ -33,7 +32,6 @@ using document::DocumenttypesConfig; using document::DocumenttypesConfigBuilder; using search::TuneFileDocumentDB; using std::map; -using vespalib::LinkedPtr; using vespalib::VarHolder; struct DoctypeFixture { diff --git a/searchcore/src/tests/proton/server/legacy_attribute_metrics_test.cpp b/searchcore/src/tests/proton/server/legacy_attribute_metrics_test.cpp index cd129d79693..513ad5a03dd 100644 --- a/searchcore/src/tests/proton/server/legacy_attribute_metrics_test.cpp +++ b/searchcore/src/tests/proton/server/legacy_attribute_metrics_test.cpp @@ -22,31 +22,31 @@ Test::Main() LegacyAttributeMetrics attrMetrics(0); EXPECT_EQUAL(0u, attrMetrics.list.release().size()); { - LegacyAttributeMetrics::List::Entry::LP e1 = attrMetrics.list.add("foo"); - LegacyAttributeMetrics::List::Entry::LP e2 = attrMetrics.list.add("bar"); - LegacyAttributeMetrics::List::Entry::LP e3 = attrMetrics.list.add("foo"); - EXPECT_TRUE(e1.get() != 0); - EXPECT_TRUE(e2.get() != 0); - EXPECT_TRUE(e3.get() == 0); + LegacyAttributeMetrics::List::Entry *e1 = attrMetrics.list.add("foo"); + LegacyAttributeMetrics::List::Entry *e2 = attrMetrics.list.add("bar"); + LegacyAttributeMetrics::List::Entry *e3 = attrMetrics.list.add("foo"); + EXPECT_TRUE(e1 != nullptr); + EXPECT_TRUE(e2 != nullptr); + EXPECT_TRUE(e3 == nullptr); } { const LegacyAttributeMetrics &constMetrics = attrMetrics; - LegacyAttributeMetrics::List::Entry::LP e1 = constMetrics.list.get("foo"); - LegacyAttributeMetrics::List::Entry::LP e2 = constMetrics.list.get("bar"); - LegacyAttributeMetrics::List::Entry::LP e3 = constMetrics.list.get("baz"); - EXPECT_TRUE(e1.get() != 0); - EXPECT_TRUE(e2.get() != 0); - EXPECT_TRUE(e3.get() == 0); + LegacyAttributeMetrics::List::Entry *e1 = constMetrics.list.get("foo"); + LegacyAttributeMetrics::List::Entry *e2 = constMetrics.list.get("bar"); + LegacyAttributeMetrics::List::Entry *e3 = constMetrics.list.get("baz"); + EXPECT_TRUE(e1 != nullptr); + EXPECT_TRUE(e2 != nullptr); + EXPECT_TRUE(e3 == nullptr); } EXPECT_EQUAL(2u, attrMetrics.list.release().size()); { const LegacyAttributeMetrics &constMetrics = attrMetrics; - LegacyAttributeMetrics::List::Entry::LP e1 = constMetrics.list.get("foo"); - LegacyAttributeMetrics::List::Entry::LP e2 = constMetrics.list.get("bar"); - LegacyAttributeMetrics::List::Entry::LP e3 = constMetrics.list.get("baz"); - EXPECT_TRUE(e1.get() == 0); - EXPECT_TRUE(e2.get() == 0); - EXPECT_TRUE(e3.get() == 0); + LegacyAttributeMetrics::List::Entry *e1 = constMetrics.list.get("foo"); + LegacyAttributeMetrics::List::Entry *e2 = constMetrics.list.get("bar"); + LegacyAttributeMetrics::List::Entry *e3 = constMetrics.list.get("baz"); + EXPECT_TRUE(e1 == nullptr); + EXPECT_TRUE(e2 == nullptr); + EXPECT_TRUE(e3 == nullptr); } EXPECT_EQUAL(0u, attrMetrics.list.release().size()); } |