diff options
author | Arne H Juul <arnej@yahooinc.com> | 2021-10-19 14:15:47 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2021-10-19 14:15:47 +0000 |
commit | 5bac27daa62f5b9136695a319a7ff5a7b8bcb602 (patch) | |
tree | 8486f4e3993a79a1ad200637882a079521a106c0 /searchlib/src/tests | |
parent | 765d397cb65fdb3205c7ac5921fc89449c86bf07 (diff) |
use same name for abstract node types
Diffstat (limited to 'searchlib/src/tests')
-rw-r--r-- | searchlib/src/tests/query/customtypevisitor_test.cpp | 4 | ||||
-rw-r--r-- | searchlib/src/tests/query/querybuilder_test.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/searchlib/src/tests/query/customtypevisitor_test.cpp b/searchlib/src/tests/query/customtypevisitor_test.cpp index da3d8ffa115..35280fb0bd8 100644 --- a/searchlib/src/tests/query/customtypevisitor_test.cpp +++ b/searchlib/src/tests/query/customtypevisitor_test.cpp @@ -72,8 +72,8 @@ struct MyQueryNodeTypes { typedef MyPredicateQuery PredicateQuery; typedef MyRegExpTerm RegExpTerm; typedef MyNearestNeighborTerm NearestNeighborTerm; - typedef MyFalse False; - typedef MyTrue True; + typedef MyFalse FalseQueryNode; + typedef MyTrue TrueQueryNode; }; class MyCustomVisitor : public CustomTypeVisitor<MyQueryNodeTypes> diff --git a/searchlib/src/tests/query/querybuilder_test.cpp b/searchlib/src/tests/query/querybuilder_test.cpp index 80ccd494ef6..93cfad27742 100644 --- a/searchlib/src/tests/query/querybuilder_test.cpp +++ b/searchlib/src/tests/query/querybuilder_test.cpp @@ -177,8 +177,8 @@ void checkQueryTreeTypes(Node *node) { typedef typename NodeTypes::WeakAnd WeakAnd; typedef typename NodeTypes::PredicateQuery PredicateQuery; typedef typename NodeTypes::RegExpTerm RegExpTerm; - typedef typename NodeTypes::True TrueNode; - typedef typename NodeTypes::False FalseNode; + typedef typename NodeTypes::TrueQueryNode TrueNode; + typedef typename NodeTypes::FalseQueryNode FalseNode; ASSERT_TRUE(node); auto* and_node = as_node<And>(node); @@ -330,8 +330,8 @@ struct AbstractTypes { typedef search::query::WeakAnd WeakAnd; typedef search::query::PredicateQuery PredicateQuery; typedef search::query::RegExpTerm RegExpTerm; - typedef search::query::TrueQueryNode True; - typedef search::query::FalseQueryNode False; + typedef search::query::TrueQueryNode TrueQueryNode; + typedef search::query::FalseQueryNode FalseQueryNode; }; // Builds a tree with simplequery and checks that the results have the @@ -452,8 +452,8 @@ struct MyQueryNodeTypes { typedef MyPredicateQuery PredicateQuery; typedef MyRegExpTerm RegExpTerm; typedef MyNearestNeighborTerm NearestNeighborTerm; - typedef MyTrue True; - typedef MyFalse False; + typedef MyTrue TrueQueryNode; + typedef MyFalse FalseQueryNode; }; TEST("require that Custom Query Trees Can Be Built") { |