From bd4f8a9026cae7c517f05b36e992e7e7ec8cff3f Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Tue, 21 Mar 2017 12:40:27 +0100
Subject: Removed LinkedPtr usage

---
 searchlib/src/tests/query/query-old.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'searchlib/src/tests/query')

diff --git a/searchlib/src/tests/query/query-old.cpp b/searchlib/src/tests/query/query-old.cpp
index 0d0ceee63d9..db4b7f87895 100644
--- a/searchlib/src/tests/query/query-old.cpp
+++ b/searchlib/src/tests/query/query-old.cpp
@@ -232,11 +232,11 @@ TEST("e is not rewritten even if allowed") {
     vespalib::stringref stackDump(term, sizeof(term));
     EXPECT_EQUAL(6u, stackDump.size());
     AllowRewrite allowRewrite;
-    Query q(allowRewrite, stackDump);
+    const Query q(allowRewrite, stackDump);
     EXPECT_TRUE(q.valid());
-    const QueryNode::LP & root = q.getRoot();
-    EXPECT_EQUAL(QueryTerm::classId, root->getClass().id());
-    const QueryTerm & qt = static_cast<const QueryTerm &>(*root);
+    const QueryNode & root = q.getRoot();
+    EXPECT_TRUE(dynamic_cast<const QueryTerm *>(&root) != nullptr);
+    const QueryTerm & qt = static_cast<const QueryTerm &>(root);
     EXPECT_EQUAL("c", qt.index());
     EXPECT_EQUAL(vespalib::stringref("e"), qt.getTerm());
     EXPECT_EQUAL(3u, qt.uniqueId());
@@ -247,11 +247,11 @@ TEST("1.0e is not rewritten by default") {
     vespalib::stringref stackDump(term, sizeof(term));
     EXPECT_EQUAL(9u, stackDump.size());
     QueryNodeResultFactory empty;
-    Query q(empty, stackDump);
+    const Query q(empty, stackDump);
     EXPECT_TRUE(q.valid());
-    const QueryNode::LP & root = q.getRoot();
-    EXPECT_EQUAL(QueryTerm::classId, root->getClass().id());
-    const QueryTerm & qt = static_cast<const QueryTerm &>(*root);
+    const QueryNode & root = q.getRoot();
+    EXPECT_TRUE(dynamic_cast<const QueryTerm *>(&root) != nullptr);
+    const QueryTerm & qt = static_cast<const QueryTerm &>(root);
     EXPECT_EQUAL("c", qt.index());
     EXPECT_EQUAL(vespalib::stringref("1.0e"), qt.getTerm());
     EXPECT_EQUAL(3u, qt.uniqueId());
@@ -262,31 +262,31 @@ TEST("1.0e is rewritten if allowed too.") {
     vespalib::stringref stackDump(term, sizeof(term));
     EXPECT_EQUAL(9u, stackDump.size());
     AllowRewrite empty;
-    Query q(empty, stackDump);
+    const Query q(empty, stackDump);
     EXPECT_TRUE(q.valid());
-    const QueryNode::LP & root = q.getRoot();
-    EXPECT_EQUAL(EquivQueryNode::classId, root->getClass().id());
-    const EquivQueryNode & equiv = static_cast<const EquivQueryNode &>(*root);
+    const QueryNode & root = q.getRoot();
+    EXPECT_TRUE(dynamic_cast<const EquivQueryNode *>(&root) != nullptr);
+    const EquivQueryNode & equiv = static_cast<const EquivQueryNode &>(root);
     EXPECT_EQUAL(2u, equiv.size());
-    EXPECT_EQUAL(QueryTerm::classId, equiv[0]->getClass().id());
+    EXPECT_TRUE(dynamic_cast<const QueryTerm *>(equiv[0].get()) != nullptr);
     {
         const QueryTerm & qt = static_cast<const QueryTerm &>(*equiv[0]);
         EXPECT_EQUAL("c", qt.index());
         EXPECT_EQUAL(vespalib::stringref("1.0e"), qt.getTerm());
         EXPECT_EQUAL(3u, qt.uniqueId());
     }
-    EXPECT_EQUAL(PhraseQueryNode::classId, equiv[1]->getClass().id());
+    EXPECT_TRUE(dynamic_cast<const PhraseQueryNode *>(equiv[1].get()) != nullptr);
     {
         const PhraseQueryNode & phrase = static_cast<const PhraseQueryNode &>(*equiv[1]);
         EXPECT_EQUAL(2u, phrase.size());
-        EXPECT_EQUAL(QueryTerm::classId, phrase[0]->getClass().id());
+        EXPECT_TRUE(dynamic_cast<const QueryTerm *>(phrase[0].get()) != nullptr);
         {
             const QueryTerm & qt = static_cast<const QueryTerm &>(*phrase[0]);
             EXPECT_EQUAL("c", qt.index());
             EXPECT_EQUAL(vespalib::stringref("1"), qt.getTerm());
             EXPECT_EQUAL(0u, qt.uniqueId());
         }
-        EXPECT_EQUAL(QueryTerm::classId, phrase[1]->getClass().id());
+        EXPECT_TRUE(dynamic_cast<const QueryTerm *>(phrase[1].get()) != nullptr);
         {
             const QueryTerm & qt = static_cast<const QueryTerm &>(*phrase[1]);
             EXPECT_EQUAL("c", qt.index());
-- 
cgit v1.2.3