1 files changed, 14 insertions, 14 deletions

diff --git a/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp b/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp
index 1d908bed568..372b76fa9af 100644
--- a/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp
+++ b/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp
@@ -81,7 +81,7 @@ public:
     }
 
     FieldSpecBaseList exposeFields() const override {
-        return FieldSpecBaseList();
+        return {};
     }
 
     bool inheritStrict(size_t i) const override {
@@ -140,7 +140,7 @@ struct MyTerm : SimpleLeafBlueprint {
         setEstimate(HitEstimate(hitEstimate, false));
     }
     SearchIterator::UP createLeafSearch(const search::fef::TermFieldMatchDataArray &, bool) const override {
-        return SearchIterator::UP();
+        return {};
     }
     SearchIteratorUP createFilterSearch(bool strict, FilterConstraint constraint) const override {
         return create_default_filter(strict, constraint);
@@ -311,13 +311,13 @@ TEST("testHitEstimateCalculation")
 
 TEST("testHitEstimatePropagation")
 {
-    MyLeaf *leaf1 = new MyLeaf();
+    auto *leaf1 = new MyLeaf();
     leaf1->estimate(10);
 
-    MyLeaf *leaf2 = new MyLeaf();
+    auto *leaf2 = new MyLeaf();
     leaf2->estimate(20);
 
-    MyLeaf *leaf3 = new MyLeaf();
+    auto *leaf3 = new MyLeaf();
     leaf3->estimate(30);
 
     MyOr *parent = new MyOr();
@@ -346,7 +346,7 @@ TEST("testHitEstimatePropagation")
     leaf3->estimate(25);
     EXPECT_EQUAL(20u, root->getState().estimate().estHits);
     parent->addChild(std::move(tmp));
-    EXPECT_TRUE(tmp.get() == 0);
+    EXPECT_FALSE(tmp);
     EXPECT_EQUAL(25u, root->getState().estimate().estHits);
 }
 
@@ -572,7 +572,7 @@ TEST_F("testSearchCreation", Fixture)
                              .addField(3, 3).create());
         SearchIterator::UP leafsearch = f.create(*l);
 
-        MySearch *lw = new MySearch("leaf", true, true);
+        auto *lw = new MySearch("leaf", true, true);
         lw->addHandle(1).addHandle(2).addHandle(3);
         SearchIterator::UP wantleaf(lw);
 
@@ -584,11 +584,11 @@ TEST_F("testSearchCreation", Fixture)
                              .add(MyLeafSpec(2).addField(2, 2).create()));
         SearchIterator::UP andsearch = f.create(*a);
 
-        MySearch *l1 = new MySearch("leaf", true, true);
-        MySearch *l2 = new MySearch("leaf", true, false);
+        auto *l1 = new MySearch("leaf", true, true);
+        auto *l2 = new MySearch("leaf", true, false);
         l1->addHandle(1);
         l2->addHandle(2);
-        MySearch *aw = new MySearch("and", false, true);
+        auto *aw = new MySearch("and", false, true);
         aw->add(l1);
         aw->add(l2);
         SearchIterator::UP wanted(aw);
@@ -600,11 +600,11 @@ TEST_F("testSearchCreation", Fixture)
                              .add(MyLeafSpec(2).addField(2, 22).create()));
         SearchIterator::UP orsearch = f.create(*o);
 
-        MySearch *l1 = new MySearch("leaf", true, true);
-        MySearch *l2 = new MySearch("leaf", true, true);
+        auto *l1 = new MySearch("leaf", true, true);
+        auto *l2 = new MySearch("leaf", true, true);
         l1->addHandle(11);
         l2->addHandle(22);
-        MySearch *ow = new MySearch("or", false, true);
+        auto *ow = new MySearch("or", false, true);
         ow->add(l1);
         ow->add(l2);
         SearchIterator::UP wanted(ow);
@@ -619,7 +619,7 @@ TEST("testBlueprintMakeNew")
                             .add(MyLeafSpec(2).addField(2, 22).create()));
     orig->setSourceId(42);
     MyOr *myOr = dynamic_cast<MyOr*>(orig.get());
-    ASSERT_TRUE(myOr != 0);
+    ASSERT_TRUE(myOr != nullptr);
     EXPECT_EQUAL(42u, orig->getSourceId());
     EXPECT_EQUAL(2u, orig->getState().numFields());
 }