From e111bb917a63282b8e11012acb8f97cba882f342 Mon Sep 17 00:00:00 2001 From: Alexander Dorokhine Date: Thu, 5 Nov 2020 15:28:28 -0800 Subject: Update icing from upstream. Change-Id: Ia63a77142ec717c0d9a81ec0a5c1267381858200 --- icing/store/document-store_test.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'icing/store/document-store_test.cc') diff --git a/icing/store/document-store_test.cc b/icing/store/document-store_test.cc index 301dbdd..d97ec46 100644 --- a/icing/store/document-store_test.cc +++ b/icing/store/document-store_test.cc @@ -111,19 +111,19 @@ class DocumentStoreTest : public ::testing::Test { subject->set_property_name("subject"); subject->set_data_type(PropertyConfigProto::DataType::STRING); subject->set_cardinality(PropertyConfigProto::Cardinality::OPTIONAL); - subject->mutable_indexing_config()->set_term_match_type( + subject->mutable_string_indexing_config()->set_term_match_type( TermMatchType::EXACT_ONLY); - subject->mutable_indexing_config()->set_tokenizer_type( - IndexingConfig::TokenizerType::PLAIN); + subject->mutable_string_indexing_config()->set_tokenizer_type( + StringIndexingConfig::TokenizerType::PLAIN); auto body = type_config->add_properties(); body->set_property_name("body"); body->set_data_type(PropertyConfigProto::DataType::STRING); body->set_cardinality(PropertyConfigProto::Cardinality::OPTIONAL); - body->mutable_indexing_config()->set_term_match_type( + body->mutable_string_indexing_config()->set_term_match_type( TermMatchType::EXACT_ONLY); - body->mutable_indexing_config()->set_tokenizer_type( - IndexingConfig::TokenizerType::PLAIN); + body->mutable_string_indexing_config()->set_tokenizer_type( + StringIndexingConfig::TokenizerType::PLAIN); ICING_ASSERT_OK_AND_ASSIGN( schema_store_, SchemaStore::Create(&filesystem_, schema_store_dir_)); @@ -1941,10 +1941,10 @@ TEST_F(DocumentStoreTest, UpdateSchemaStoreDeletesInvalidDocuments) { property_config->set_property_name("subject"); property_config->set_data_type(PropertyConfigProto::DataType::STRING); property_config->set_cardinality(PropertyConfigProto::Cardinality::OPTIONAL); - property_config->mutable_indexing_config()->set_term_match_type( + property_config->mutable_string_indexing_config()->set_term_match_type( TermMatchType::EXACT_ONLY); - property_config->mutable_indexing_config()->set_tokenizer_type( - IndexingConfig::TokenizerType::PLAIN); + property_config->mutable_string_indexing_config()->set_tokenizer_type( + StringIndexingConfig::TokenizerType::PLAIN); ICING_ASSERT_OK_AND_ASSIGN( std::unique_ptr schema_store, @@ -2168,10 +2168,10 @@ TEST_F(DocumentStoreTest, OptimizedUpdateSchemaStoreDeletesInvalidDocuments) { property_config->set_property_name("subject"); property_config->set_data_type(PropertyConfigProto::DataType::STRING); property_config->set_cardinality(PropertyConfigProto::Cardinality::OPTIONAL); - property_config->mutable_indexing_config()->set_term_match_type( + property_config->mutable_string_indexing_config()->set_term_match_type( TermMatchType::EXACT_ONLY); - property_config->mutable_indexing_config()->set_tokenizer_type( - IndexingConfig::TokenizerType::PLAIN); + property_config->mutable_string_indexing_config()->set_tokenizer_type( + StringIndexingConfig::TokenizerType::PLAIN); ICING_ASSERT_OK_AND_ASSIGN( std::unique_ptr schema_store, -- cgit v1.2.3