diff options
Diffstat (limited to 'icing/result/result-state-manager_test.cc')
-rw-r--r-- | icing/result/result-state-manager_test.cc | 162 |
1 files changed, 60 insertions, 102 deletions
diff --git a/icing/result/result-state-manager_test.cc b/icing/result/result-state-manager_test.cc index c8af5fe..c0ea49a 100644 --- a/icing/result/result-state-manager_test.cc +++ b/icing/result/result-state-manager_test.cc @@ -20,6 +20,7 @@ #include "icing/file/filesystem.h" #include "icing/portable/equals-proto.h" #include "icing/result/page-result.h" +#include "icing/result/result-adjustment-info.h" #include "icing/result/result-retriever-v2.h" #include "icing/schema/schema-store.h" #include "icing/scoring/priority-queue-scored-document-hits-ranker.h" @@ -47,9 +48,6 @@ using ::testing::Not; using ::testing::SizeIs; using PageResultInfo = std::pair<uint64_t, PageResult>; -// TODO(sungyc): Refactor helper functions below (builder classes or common test -// utility). - ScoringSpecProto CreateScoringSpec() { ScoringSpecProto scoring_spec; scoring_spec.set_rank_by(ScoringSpecProto::RankingStrategy::DOCUMENT_SCORE); @@ -196,9 +194,8 @@ TEST_F(ResultStateManagerTest, ShouldCacheAndRetrieveFirstPageOnePage) { ICING_ASSERT_OK_AND_ASSIGN( PageResultInfo page_result_info, result_state_manager.CacheAndRetrieveFirstPage( - std::move(ranker), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + std::move(ranker), /*parent_adjustment_info=*/nullptr, + /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/10, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -243,9 +240,8 @@ TEST_F(ResultStateManagerTest, ShouldCacheAndRetrieveFirstPageMultiplePages) { ICING_ASSERT_OK_AND_ASSIGN( PageResultInfo page_result_info1, result_state_manager.CacheAndRetrieveFirstPage( - std::move(ranker), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + std::move(ranker), /*parent_adjustment_info=*/nullptr, + /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/2, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); EXPECT_THAT(page_result_info1.first, Not(Eq(kInvalidNextPageToken))); @@ -290,9 +286,8 @@ TEST_F(ResultStateManagerTest, NullRankerShouldReturnError) { EXPECT_THAT( result_state_manager.CacheAndRetrieveFirstPage( - /*ranker=*/nullptr, - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*ranker=*/nullptr, /*parent_adjustment_info=*/nullptr, + /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever()), StatusIs(libtextclassifier3::StatusCode::INVALID_ARGUMENT)); @@ -308,8 +303,7 @@ TEST_F(ResultStateManagerTest, EmptyRankerShouldReturnEmptyFirstPage) { std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::vector<ScoredDocumentHit>(), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -347,9 +341,8 @@ TEST_F(ResultStateManagerTest, ShouldAllowEmptyFirstPage) { std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), result_spec, document_store(), - result_retriever())); + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, + result_spec, document_store(), result_retriever())); // If the first page has no result, then it should be the last page. EXPECT_THAT(page_result_info.first, Eq(kInvalidNextPageToken)); EXPECT_THAT(page_result_info.second.results, IsEmpty()); @@ -391,9 +384,8 @@ TEST_F(ResultStateManagerTest, ShouldAllowEmptyLastPage) { std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), result_spec, document_store(), - result_retriever())); + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, + result_spec, document_store(), result_retriever())); EXPECT_THAT(page_result_info1.first, Not(Eq(kInvalidNextPageToken))); ASSERT_THAT(page_result_info1.second.results, SizeIs(2)); EXPECT_THAT(page_result_info1.second.results.at(0).document(), @@ -437,7 +429,10 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits1), /*is_descending=*/true), - query_terms, search_spec, scoring_spec, result_spec, document_store(), + /*parent_adjustment_info=*/ + std::make_unique<ResultAdjustmentInfo>(search_spec, scoring_spec, + result_spec, query_terms), + /*child_adjustment_info=*/nullptr, result_spec, document_store(), result_retriever())); ASSERT_THAT(page_result_info1.first, Not(Eq(kInvalidNextPageToken))); @@ -449,7 +444,10 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits2), /*is_descending=*/true), - query_terms, search_spec, scoring_spec, result_spec, document_store(), + /*parent_adjustment_info=*/ + std::make_unique<ResultAdjustmentInfo>(search_spec, scoring_spec, + result_spec, query_terms), + /*child_adjustment_info=*/nullptr, result_spec, document_store(), result_retriever())); // Calling CacheAndRetrieveFirstPage() on state 2 should invalidate the @@ -484,8 +482,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits1), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); ASSERT_THAT(page_result_info1.first, Not(Eq(kInvalidNextPageToken))); @@ -498,8 +495,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits2), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); ASSERT_THAT(page_result_info2.first, Not(Eq(kInvalidNextPageToken))); @@ -542,8 +538,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits1), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); ASSERT_THAT(page_result_info.first, Not(Eq(kInvalidNextPageToken))); @@ -589,8 +584,7 @@ TEST_F(ResultStateManagerTest, ShouldInvalidateOneToken) { std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits1), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -600,8 +594,7 @@ TEST_F(ResultStateManagerTest, ShouldInvalidateOneToken) { std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits2), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -639,8 +632,7 @@ TEST_F(ResultStateManagerTest, ShouldInvalidateAllTokens) { std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits1), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -650,8 +642,7 @@ TEST_F(ResultStateManagerTest, ShouldInvalidateAllTokens) { std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits2), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -685,8 +676,7 @@ TEST_F(ResultStateManagerTest, ShouldRemoveOldestResultState) { std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits1), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -696,8 +686,7 @@ TEST_F(ResultStateManagerTest, ShouldRemoveOldestResultState) { std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits2), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -708,8 +697,7 @@ TEST_F(ResultStateManagerTest, ShouldRemoveOldestResultState) { std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits3), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -755,8 +743,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits1), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -766,8 +753,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits2), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -777,8 +763,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits3), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -797,8 +782,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits4), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -851,8 +835,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits1), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -862,8 +845,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits2), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -873,8 +855,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits3), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -897,8 +878,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits4), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -908,8 +888,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits5), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -919,8 +898,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits6), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -982,8 +960,7 @@ TEST_F( std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits1), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -993,8 +970,7 @@ TEST_F( std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits2), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1004,8 +980,7 @@ TEST_F( std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits3), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1024,8 +999,7 @@ TEST_F( std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits4), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1040,8 +1014,7 @@ TEST_F( std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits5), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1097,8 +1070,7 @@ TEST_F(ResultStateManagerTest, GetNextPageShouldDecreaseCurrentHitsCount) { std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits1), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1108,8 +1080,7 @@ TEST_F(ResultStateManagerTest, GetNextPageShouldDecreaseCurrentHitsCount) { std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits2), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1119,8 +1090,7 @@ TEST_F(ResultStateManagerTest, GetNextPageShouldDecreaseCurrentHitsCount) { std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits3), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1144,8 +1114,7 @@ TEST_F(ResultStateManagerTest, GetNextPageShouldDecreaseCurrentHitsCount) { std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits4), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1198,8 +1167,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits1), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1209,8 +1177,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits2), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1220,8 +1187,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits3), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1245,8 +1211,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits4), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1261,8 +1226,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits5), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1316,8 +1280,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits1), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1327,8 +1290,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits2), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1345,8 +1307,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits3), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); EXPECT_THAT(page_result_info3.first, Not(Eq(kInvalidNextPageToken))); @@ -1420,8 +1381,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits1), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1435,8 +1395,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits2), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/1, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); @@ -1474,8 +1433,7 @@ TEST_F(ResultStateManagerTest, std::make_unique< PriorityQueueScoredDocumentHitsRanker<ScoredDocumentHit>>( std::move(scored_document_hits), /*is_descending=*/true), - /*query_terms=*/{}, SearchSpecProto::default_instance(), - CreateScoringSpec(), + /*parent_adjustment_info=*/nullptr, /*child_adjustment_info=*/nullptr, CreateResultSpec(/*num_per_page=*/2, ResultSpecProto::NAMESPACE), document_store(), result_retriever())); |