Use auto and std::make_unique

1 files changed, 9 insertions, 9 deletions

diff --git a/searchlib/src/tests/queryeval/weighted_set_term/weighted_set_term_test.cpp b/searchlib/src/tests/queryeval/weighted_set_term/weighted_set_term_test.cpp
index 9d0dd05e3e3..de5fc1a0c05 100644
--- a/searchlib/src/tests/queryeval/weighted_set_term/weighted_set_term_test.cpp
+++ b/searchlib/src/tests/queryeval/weighted_set_term/weighted_set_term_test.cpp
@@ -54,11 +54,11 @@ struct WS {
     WS& set_term_is_not_needed(bool value) { term_is_not_needed = value; return *this; }
 
     [[nodiscard]] Node::UP createNode() const {
-        auto *node = new SimpleWeightedSetTerm(tokens.size(), "view", 0, Weight(0));
+        auto node = std::make_unique<SimpleWeightedSetTerm>(tokens.size(), "view", 0, Weight(0));
         for (const auto & token : tokens) {
             node->addTerm(token.first,Weight(token.second));
         }
-        return Node::UP(node);
+        return node;
     }
 
     bool isGenericSearch(Searchable &searchable, const std::string &field, bool strict) const {
@@ -67,9 +67,9 @@ struct WS {
         Node::UP node = createNode();
         FieldSpecList fields;
         fields.add(FieldSpec(field, fieldId, handle));
-        queryeval::Blueprint::UP bp = searchable.createBlueprint(requestContext, fields, *node);
+        auto bp = searchable.createBlueprint(requestContext, fields, *node);
         bp->fetchPostings(ExecuteInfo::create(strict));
-        SearchIterator::UP sb = bp->createSearch(*md, strict);
+        auto sb = bp->createSearch(*md, strict);
         return (dynamic_cast<WeightedSetTermSearch*>(sb.get()) != nullptr);
     }
 
@@ -82,9 +82,9 @@ struct WS {
         Node::UP node = createNode();
         FieldSpecList fields;
         fields.add(FieldSpec(field, fieldId, handle, field_is_filter));
-        queryeval::Blueprint::UP bp = searchable.createBlueprint(requestContext, fields, *node);
+        auto bp = searchable.createBlueprint(requestContext, fields, *node);
         bp->fetchPostings(ExecuteInfo::create(strict));
-        SearchIterator::UP sb = bp->createSearch(*md, strict);
+        auto sb = bp->createSearch(*md, strict);
         sb->initFullRange();
         FakeResult result;
         for (uint32_t docId = 1; docId < 10; ++docId) {
@@ -141,7 +141,7 @@ struct MockFixture {
         mock = new MockSearch(initial);
         children.push_back(mock);
         weights.push_back(1);
-        search = WeightedSetTermSearch::create(children, tfmd, false, weights, MatchData::UP(nullptr));
+        search = WeightedSetTermSearch::create(children, tfmd, false, weights, {});
     }
 };
 
@@ -257,14 +257,14 @@ TEST_F("test Eager Matching Child", MockFixture(5)) {
 class IteratorChildrenVerifier : public search::test::IteratorChildrenVerifier {
 private:
     SearchIterator::UP create(const std::vector<SearchIterator*> &children) const override {
-        return SearchIterator::UP(WeightedSetTermSearch::create(children, _tfmd, false, _weights, MatchData::UP(nullptr)));
+        return WeightedSetTermSearch::create(children, _tfmd, false, _weights, {});
     }
 };
 
 class WeightIteratorChildrenVerifier : public search::test::DwaIteratorChildrenVerifier {
 private:
     SearchIterator::UP create(std::vector<DocumentWeightIterator> && children) const override {
-        return SearchIterator::UP(WeightedSetTermSearch::create(_tfmd, false, _weights, std::move(children)));
+        return WeightedSetTermSearch::create(_tfmd, false, _weights, std::move(children));
     }
 };