Addapt search_iterator to new api.

openzim · May 5, 2021 · 8d48ee9 · 8d48ee9
1 parent f10f8f0
commit 8d48ee9
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/test/search_iterator.cpp b/test/search_iterator.cpp
@@ -36,13 +36,13 @@ TEST(search_iterator, functions) {
     "item a",
   });
 
-  zim::Search search(archive);
-  search.set_suggestion_mode(true);
-  search.set_query("item");
-  search.set_range(0, archive.getEntryCount());
-  search.set_verbose(true);
+  zim::Searcher searcher(archive);
+  zim::Query query;
+  query.setQuery("item", true);
+  auto search = searcher.search(query);
+  auto result = search.getRange(0, archive.getEntryCount());
 
-  auto it = search.begin();
+  auto it = result.begin();
 
   // Test functions
   ASSERT_EQ(it.get_title(), "item a");
@@ -61,26 +61,26 @@ TEST(search_iterator, iteration) {
     "item b"
   });
 
-  zim::Search search(archive);
-  search.set_suggestion_mode(true);
-  search.set_query("item");
-  search.set_range(0, archive.getEntryCount());
-  search.set_verbose(true);
+  zim::Searcher searcher(archive);
+  zim::Query query;
+  query.setQuery("item", true);
+  auto search = searcher.search(query);
+  auto result = search.getRange(0, archive.getEntryCount());
 
-  auto it = search.begin();
-  ASSERT_EQ(it.get_title(), search.begin().get_title());
+  auto it = result.begin();
+  ASSERT_EQ(it.get_title(), result.begin().get_title());
 
   ASSERT_EQ(it.get_title(), "item a");
   it++;
   ASSERT_EQ(it.get_title(), "item b");
-  ASSERT_TRUE(it != search.begin());
+  ASSERT_TRUE(it != result.begin());
 
   it--;
   ASSERT_EQ(it.get_title(), "item a");
-  ASSERT_TRUE(search.begin() == it);
+  ASSERT_TRUE(result.begin() == it);
 
   it++; it++;
-  ASSERT_TRUE(it == search.end());
+  ASSERT_TRUE(it == result.end());
 }
 
 } // anonymous namespace