Follow up from @havardpe comments.

6 files changed, 15 insertions, 15 deletions

diff --git a/searchlib/src/tests/queryeval/dot_product/dot_product_test.cpp b/searchlib/src/tests/queryeval/dot_product/dot_product_test.cpp
index a31b01c5875..3dcf75a0eab 100644
--- a/searchlib/src/tests/queryeval/dot_product/dot_product_test.cpp
+++ b/searchlib/src/tests/queryeval/dot_product/dot_product_test.cpp
@@ -9,7 +9,7 @@
 #include <vespa/searchlib/queryeval/fake_result.h>
 #include <vespa/searchlib/queryeval/fake_searchable.h>
 #include <vespa/searchlib/queryeval/fake_requestcontext.h>
-#include <vespa/searchlib/test/searchiteratorverifiers.h>
+#include <vespa/searchlib/test/weightedchildrenverifiers.h>
 
 using namespace search;
 using namespace search::query;
@@ -174,19 +174,19 @@ private:
     }
 };
 
-class WeightIteratorChildrenVerifier : public search::test::WeightIteratorChildrenVerifier {
+class WeightIteratorChildrenVerifier : public search::test::DwaIteratorChildrenVerifier {
 private:
     SearchIterator::UP create(std::vector<DocumentWeightIterator> && children) const override {
         return SearchIterator::UP(DotProductSearch::create(_tfmd, _weights, std::move(children)));
     }
 };
 
-TEST("verify initRange with search iterator children") {
+TEST("verify search iterator conformance with search iterator children") {
     IteratorChildrenVerifier verifier;
     verifier.verify();
 }
 
-TEST("verify initRange with document weight iterator children") {
+TEST("verify search iterator conformance with document weight iterator children") {
     WeightIteratorChildrenVerifier verifier;
     verifier.verify();
 }
diff --git a/searchlib/src/tests/queryeval/monitoring_search_iterator/monitoring_search_iterator_test.cpp b/searchlib/src/tests/queryeval/monitoring_search_iterator/monitoring_search_iterator_test.cpp
index 1803fc55abc..3f2a8b10ccc 100644
--- a/searchlib/src/tests/queryeval/monitoring_search_iterator/monitoring_search_iterator_test.cpp
+++ b/searchlib/src/tests/queryeval/monitoring_search_iterator/monitoring_search_iterator_test.cpp
@@ -329,7 +329,7 @@ public:
     }
 };
 
-TEST("test monitoring search iterator handles initRange accoring to spec") {
+TEST("test monitoring search iterator adheres to search iterator requirements") {
     MonitoringSearchIteratorVerifier searchVerifier;
     searchVerifier.verify();
     MonitoringDumpIteratorVerifier dumpVerifier;
diff --git a/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp b/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp
index e743677b38e..2339a88be5a 100644
--- a/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp
+++ b/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp
@@ -9,7 +9,7 @@
 #include <vespa/searchlib/queryeval/test/eagerchild.h>
 #include <vespa/searchlib/queryeval/test/leafspec.h>
 #include <vespa/searchlib/queryeval/test/wandspec.h>
-#include <vespa/searchlib/test/searchiteratorverifiers.h>
+#include <vespa/searchlib/test/weightedchildrenverifiers.h>
 #include <vespa/searchlib/test/document_weight_attribute_helper.h>
 #include <vespa/searchlib/queryeval/document_weight_search_iterator.h>
 #include <vespa/searchlib/fef/fef.h>
@@ -649,7 +649,7 @@ SearchIterator::UP create_wand(bool use_dwa,
     return SearchIterator::UP(ParallelWeakAndSearch::create(terms, matchParams, RankParams(tfmd, std::move(childrenMatchData)), strict));
 }
 
-class Verifier : public search::test::WeightIteratorChildrenVerifier {
+class Verifier : public search::test::DwaIteratorChildrenVerifier {
 public:
     Verifier(bool use_dwa) : _use_dwa(use_dwa) { }
 private:
@@ -665,7 +665,7 @@ private:
     mutable DummyHeap _dummy_heap;
 };
 
-TEST("verify initRange") {
+TEST("verify search iterator conformance") {
     for (bool use_dwa: {false, true}) {
         Verifier verifier(use_dwa);
         verifier.verify();
diff --git a/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp b/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp
index 561f48df8d7..ae8d87b5a89 100644
--- a/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp
+++ b/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp
@@ -636,7 +636,7 @@ public:
         return make_termwise(createIterator(getExpectedDocIds(), strict), strict);
     }
 };
-TEST("test that init range works for terwise too.") {
+TEST("test terwise adheres to search iterator requirements.") {
     Verifier verifier;
     verifier.verify();
 }
diff --git a/searchlib/src/tests/queryeval/weak_and/weak_and_test.cpp b/searchlib/src/tests/queryeval/weak_and/weak_and_test.cpp
index f7ab5aaf3d8..af9f6288ea5 100644
--- a/searchlib/src/tests/queryeval/weak_and/weak_and_test.cpp
+++ b/searchlib/src/tests/queryeval/weak_and/weak_and_test.cpp
@@ -7,7 +7,7 @@
 #include <vespa/searchlib/queryeval/test/eagerchild.h>
 #include <vespa/searchlib/queryeval/test/leafspec.h>
 #include <vespa/searchlib/queryeval/test/wandspec.h>
-#include <vespa/searchlib/test/searchiteratorverifiers.h>
+#include <vespa/searchlib/test/weightedchildrenverifiers.h>
 
 using namespace search::fef;
 using namespace search::queryeval;
@@ -111,7 +111,7 @@ private:
     }
 };
 
-TEST("verify initRange with search iterator children") {
+TEST("verify search iterator conformance") {
     IteratorChildrenVerifier verifier;
     verifier.verify();
 }
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 1e432f89747..a819eb77118 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
@@ -10,7 +10,7 @@
 #include <vespa/searchlib/queryeval/fake_result.h>
 #include <vespa/searchlib/queryeval/fake_searchable.h>
 #include <vespa/searchlib/queryeval/fake_requestcontext.h>
-#include <vespa/searchlib/test/searchiteratorverifiers.h>
+#include <vespa/searchlib/test/weightedchildrenverifiers.h>
 
 using namespace search;
 using namespace search::query;
@@ -196,19 +196,19 @@ private:
     }
 };
 
-class WeightIteratorChildrenVerifier : public search::test::WeightIteratorChildrenVerifier {
+class WeightIteratorChildrenVerifier : public search::test::DwaIteratorChildrenVerifier {
 private:
     SearchIterator::UP create(std::vector<DocumentWeightIterator> && children) const override {
         return SearchIterator::UP(WeightedSetTermSearch::create(_tfmd, _weights, std::move(children)));
     }
 };
 
-TEST("verify initRange with search iterator children") {
+TEST("verify search iterator conformance with search iterator children") {
     IteratorChildrenVerifier verifier;
     verifier.verify();
 }
 
-TEST("verify initRange with document weight iterator children") {
+TEST("verify search iterator conformance with document weight iterator children") {
     WeightIteratorChildrenVerifier verifier;
     verifier.verify();
 }