diff options
Diffstat (limited to 'icing/result/result-state-manager_thread-safety_test.cc')
| -rw-r--r-- | icing/result/result-state-manager_thread-safety_test.cc | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/icing/result/result-state-manager_thread-safety_test.cc b/icing/result/result-state-manager_thread-safety_test.cc index 0da37d8..55eda85 100644 --- a/icing/result/result-state-manager_thread-safety_test.cc +++ b/icing/result/result-state-manager_thread-safety_test.cc @@ -26,7 +26,6 @@ #include "icing/result/result-state-manager.h" #include "icing/schema/schema-store.h" #include "icing/scoring/priority-queue-scored-document-hits-ranker.h" -#include "icing/scoring/scored-document-hits-ranker.h" #include "icing/store/document-store.h" #include "icing/testing/common-matchers.h" #include "icing/testing/fake-clock.h" @@ -49,12 +48,6 @@ using ::testing::Not; using ::testing::SizeIs; using PageResultInfo = std::pair<uint64_t, PageResult>; -ScoringSpecProto CreateScoringSpec() { - ScoringSpecProto scoring_spec; - scoring_spec.set_rank_by(ScoringSpecProto::RankingStrategy::DOCUMENT_SCORE); - return scoring_spec; -} - ResultSpecProto CreateResultSpec(int num_per_page) { ResultSpecProto result_spec; result_spec.set_num_per_page(num_per_page); @@ -163,9 +156,8 @@ TEST_F(ResultStateManagerThreadSafetyTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits), /*is_descending=*/false), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), CreateResultSpec(kNumPerPage), *document_store_, - *result_retriever_)); + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, + CreateResultSpec(kNumPerPage), *document_store_, *result_retriever_)); ASSERT_THAT(page_result_info1.second.results, SizeIs(kNumPerPage)); for (int i = 0; i < kNumPerPage; ++i) { ASSERT_THAT(page_result_info1.second.results[i].score(), Eq(i)); @@ -264,9 +256,8 @@ TEST_F(ResultStateManagerThreadSafetyTest, InvalidateResultStateWhileUsing) { std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits), /*is_descending=*/false), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), CreateResultSpec(kNumPerPage), *document_store_, - *result_retriever_)); + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, + CreateResultSpec(kNumPerPage), *document_store_, *result_retriever_)); ASSERT_THAT(page_result_info1.second.results, SizeIs(kNumPerPage)); for (int i = 0; i < kNumPerPage; ++i) { ASSERT_THAT(page_result_info1.second.results[i].score(), Eq(i)); @@ -394,8 +385,8 @@ TEST_F(ResultStateManagerThreadSafetyTest, MultipleResultStates) { std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits_copy), /*is_descending=*/false), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), CreateResultSpec(kNumPerPage), + /*parent_adjustment_info=*/nullptr, + /*child_adjustment_info=*/nullptr, CreateResultSpec(kNumPerPage), *document_store_, *result_retriever)); EXPECT_THAT(page_result_info1.second.results, SizeIs(kNumPerPage)); for (int i = 0; i < kNumPerPage; ++i) { |