Remove termlikeness and expect fully qualified names for children from the qrs.

3 files changed, 5 insertions, 6 deletions

diff --git a/searchlib/src/tests/query/customtypevisitor_test.cpp b/searchlib/src/tests/query/customtypevisitor_test.cpp
index fac60cb0aaf..a941694d375 100644
--- a/searchlib/src/tests/query/customtypevisitor_test.cpp
+++ b/searchlib/src/tests/query/customtypevisitor_test.cpp
@@ -39,7 +39,7 @@ struct MyNear : Near { MyNear() : Near(1) {} };
 struct MyONear : ONear { MyONear() : ONear(1) {} };
 struct MyOr : Or {};
 struct MyPhrase : Phrase { MyPhrase() : Phrase("view", 0, Weight(42)) {} };
-struct MySameElement : SameElement { MySameElement() : SameElement("view", 0, Weight(42)) {} };
+struct MySameElement : SameElement { MySameElement() : SameElement("view") {} };
 struct MyRank : Rank {};
 struct MyNumberTerm : InitTerm<NumberTerm>  {};
 struct MyLocationTerm : InitTerm<LocationTerm> {};
diff --git a/searchlib/src/tests/query/query_visitor_test.cpp b/searchlib/src/tests/query/query_visitor_test.cpp
index 7135f69ec09..f8922c54a4e 100644
--- a/searchlib/src/tests/query/query_visitor_test.cpp
+++ b/searchlib/src/tests/query/query_visitor_test.cpp
@@ -83,7 +83,7 @@ void Test::requireThatAllNodesCanBeVisited() {
     checkVisit<ONear>(new SimpleONear(0));
     checkVisit<Or>(new SimpleOr);
     checkVisit<Phrase>(new SimplePhrase("field", 0, Weight(42)));
-    checkVisit<SameElement>(new SimpleSameElement("field", 0, Weight(42)));
+    checkVisit<SameElement>(new SimpleSameElement("field"));
     checkVisit<WeightedSetTerm>(new SimpleWeightedSetTerm("field", 0, Weight(42)));
     checkVisit<DotProduct>(new SimpleDotProduct("field", 0, Weight(42)));
     checkVisit<WandTerm>(new SimpleWandTerm("field", 0, Weight(42), 57, 67, 77.7));
diff --git a/searchlib/src/tests/query/querybuilder_test.cpp b/searchlib/src/tests/query/querybuilder_test.cpp
index 9753072cdf7..2f15ecc40c2 100644
--- a/searchlib/src/tests/query/querybuilder_test.cpp
+++ b/searchlib/src/tests/query/querybuilder_test.cpp
@@ -105,7 +105,7 @@ Node::UP createQueryTree() {
             builder.addStringTerm(str[2], view[2], id[2], weight[2]);
         }
         builder.addRegExpTerm(str[5], view[5], id[5], weight[5]);
-        builder.addSameElement(3, view[4], id[4], weight[4]);
+        builder.addSameElement(3, view[4]);
         {
             builder.addStringTerm(str[4], view[4], id[4], weight[5]);
             builder.addStringTerm(str[5], view[5], id[5], weight[6]);
@@ -322,7 +322,7 @@ struct MyONear : ONear { MyONear(size_t dist) : ONear(dist) {} };
 struct MyWeakAnd : WeakAnd { MyWeakAnd(uint32_t minHits, const vespalib::string & v) : WeakAnd(minHits, v) {} };
 struct MyOr : Or {};
 struct MyPhrase : Phrase { MyPhrase(const string &f, int32_t i, Weight w) : Phrase(f, i, w) {}};
-struct MySameElement : SameElement { MySameElement(const string &f, int32_t i, Weight w) : SameElement(f, i, w) {}};
+struct MySameElement : SameElement { MySameElement(const string &f) : SameElement(f) {}};
 
 struct MyWeightedSetTerm : WeightedSetTerm {
     MyWeightedSetTerm(const string &f, int32_t i, Weight w) : WeightedSetTerm(f, i, w) {}
@@ -545,8 +545,7 @@ TEST("require that Query Tree Creator Can Create Queries From Stack") {
     string stackDump = StackDumpCreator::create(*node);
     SimpleQueryStackDumpIterator iterator(stackDump);
 
-    Node::UP new_node =
-        QueryTreeCreator<SimpleQueryNodeTypes>::create(iterator);
+    Node::UP new_node = QueryTreeCreator<SimpleQueryNodeTypes>::create(iterator);
     checkQueryTreeTypes<SimpleQueryNodeTypes>(new_node.get());
 }