From cf6fcf7e245eb4d78579cde3367a45a19a97443b Mon Sep 17 00:00:00 2001 From: Hiroyuki Komatsu Date: Tue, 27 Feb 2024 17:15:01 +0000 Subject: [PATCH] Rename functions of Converter. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the functions with ForRequest (e.g. StartConversionForRequest) are main functions, rename them to the shorter one. * StartConversionForRequest(request, *segments) → StartConversion(request, *segments) * StartConversion(*segments, key) → StartConversionWithKey(*segments, key) This is a preparation for the main issue (b/326840183). #codehealth PiperOrigin-RevId: 610773962 --- src/converter/BUILD.bazel | 7 +- src/converter/converter.cc | 43 ++-- src/converter/converter.h | 40 ++-- src/converter/converter_interface.h | 40 ++-- src/converter/converter_main.cc | 12 +- src/converter/converter_mock.h | 28 ++- src/converter/converter_regression_test.cc | 11 +- src/converter/converter_test.cc | 82 ++++--- src/converter/quality_regression_util.cc | 18 +- src/engine/minimal_engine.cc | 40 ++-- .../dictionary_prediction_aggregator.cc | 6 +- .../dictionary_prediction_aggregator_test.cc | 5 +- src/session/internal/ime_context_test.cc | 3 +- src/session/session_converter.cc | 26 +-- src/session/session_converter_test.cc | 146 ++++++------ src/session/session_test.cc | 219 +++++++++--------- 16 files changed, 366 insertions(+), 360 deletions(-) diff --git a/src/converter/BUILD.bazel b/src/converter/BUILD.bazel index 2d47385f7..96a1a100d 100644 --- a/src/converter/BUILD.bazel +++ b/src/converter/BUILD.bazel @@ -422,7 +422,6 @@ mozc_cc_library( ":immutable_converter_interface", ":segments", "//base:japanese_util", - "//base:logging", "//base:util", "//base:vlog", "//base/strings:assign", @@ -438,6 +437,8 @@ mozc_cc_library( "//transliteration", "//usage_stats", "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/log", + "@com_google_absl//absl/log:check", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", ], @@ -644,7 +645,11 @@ mozc_cc_library( hdrs = ["converter_mock.h"], deps = [ ":converter_interface", + ":segments", + "//request:conversion_request", "//testing:gunit", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/types:span", ], ) diff --git a/src/converter/converter.cc b/src/converter/converter.cc index 6624d7365..f3d43af43 100644 --- a/src/converter/converter.cc +++ b/src/converter/converter.cc @@ -37,10 +37,11 @@ #include #include +#include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" #include "base/japanese_util.h" -#include "base/logging.h" #include "base/strings/assign.h" #include "base/util.h" #include "base/vlog.h" @@ -273,8 +274,8 @@ void Converter::Init(const engine::Modules &modules, general_noun_id_ = pos_matcher_->GetGeneralNounId(); } -bool Converter::StartConversionForRequest( - const ConversionRequest &original_request, Segments *segments) const { +bool Converter::StartConversion(const ConversionRequest &original_request, + Segments *segments) const { ConversionRequest request = CreateConversionRequestWithType( original_request, ConversionRequest::CONVERSION); if (!request.has_composer()) { @@ -300,8 +301,8 @@ bool Converter::StartConversionForRequest( return Convert(request, conversion_key, segments); } -bool Converter::StartConversion(Segments *segments, - const absl::string_view key) const { +bool Converter::StartConversionWithKey(Segments *segments, + const absl::string_view key) const { if (key.empty()) { return false; } @@ -425,8 +426,8 @@ bool Converter::Predict(const ConversionRequest &request, return IsValidSegments(request, *segments); } -bool Converter::StartPredictionForRequest( - const ConversionRequest &original_request, Segments *segments) const { +bool Converter::StartPrediction(const ConversionRequest &original_request, + Segments *segments) const { ConversionRequest request = CreateConversionRequestWithType( original_request, ConversionRequest::PREDICTION); if (!request.has_composer()) { @@ -438,22 +439,22 @@ bool Converter::StartPredictionForRequest( return Predict(request, prediction_key, segments); } -bool Converter::StartPrediction(Segments *segments, - const absl::string_view key) const { +bool Converter::StartPredictionWithKey(Segments *segments, + const absl::string_view key) const { ConversionRequest default_request; default_request.set_request_type(ConversionRequest::PREDICTION); return Predict(default_request, key, segments); } -bool Converter::StartSuggestion(Segments *segments, - const absl::string_view key) const { +bool Converter::StartSuggestionWithKey(Segments *segments, + const absl::string_view key) const { ConversionRequest default_request; default_request.set_request_type(ConversionRequest::SUGGESTION); return Predict(default_request, key, segments); } -bool Converter::StartSuggestionForRequest( - const ConversionRequest &original_request, Segments *segments) const { +bool Converter::StartSuggestion(const ConversionRequest &original_request, + Segments *segments) const { ConversionRequest request = CreateConversionRequestWithType( original_request, ConversionRequest::SUGGESTION); DCHECK(request.has_composer()); @@ -461,21 +462,21 @@ bool Converter::StartSuggestionForRequest( return Predict(request, prediction_key, segments); } -bool Converter::StartPartialSuggestion(Segments *segments, - const absl::string_view key) const { +bool Converter::StartPartialSuggestionWithKey( + Segments *segments, const absl::string_view key) const { ConversionRequest default_request; default_request.set_request_type(ConversionRequest::PARTIAL_SUGGESTION); return Predict(default_request, key, segments); } -bool Converter::StartPartialSuggestionForRequest( +bool Converter::StartPartialSuggestion( const ConversionRequest &original_request, Segments *segments) const { ConversionRequest request = CreateConversionRequestWithType( original_request, ConversionRequest::PARTIAL_SUGGESTION); DCHECK(request.has_composer()); const size_t cursor = request.composer().GetCursor(); if (cursor == 0 || cursor == request.composer().GetLength()) { - return StartSuggestionForRequest(request, segments); + return StartSuggestion(request, segments); } std::string conversion_key = request.composer().GetQueryForConversion(); @@ -484,21 +485,21 @@ bool Converter::StartPartialSuggestionForRequest( return Predict(request, conversion_key, segments); } -bool Converter::StartPartialPrediction(Segments *segments, - const absl::string_view key) const { +bool Converter::StartPartialPredictionWithKey( + Segments *segments, const absl::string_view key) const { ConversionRequest default_request; default_request.set_request_type(ConversionRequest::PARTIAL_PREDICTION); return Predict(default_request, key, segments); } -bool Converter::StartPartialPredictionForRequest( +bool Converter::StartPartialPrediction( const ConversionRequest &original_request, Segments *segments) const { ConversionRequest request = CreateConversionRequestWithType( original_request, ConversionRequest::PARTIAL_PREDICTION); DCHECK(request.has_composer()); const size_t cursor = request.composer().GetCursor(); if (cursor == 0 || cursor == request.composer().GetLength()) { - return StartPredictionForRequest(request, segments); + return StartPrediction(request, segments); } std::string conversion_key = request.composer().GetQueryForConversion(); diff --git a/src/converter/converter.h b/src/converter/converter.h index 3f94607b3..8c27c8a91 100644 --- a/src/converter/converter.h +++ b/src/converter/converter.h @@ -64,38 +64,38 @@ class Converter final : public ConverterInterface { ImmutableConverterInterface *immutable_converter); ABSL_MUST_USE_RESULT - bool StartConversionForRequest(const ConversionRequest &request, - Segments *segments) const override; + bool StartConversion(const ConversionRequest &request, + Segments *segments) const override; ABSL_MUST_USE_RESULT - bool StartConversion(Segments *segments, - absl::string_view key) const override; + bool StartConversionWithKey(Segments *segments, + absl::string_view key) const override; ABSL_MUST_USE_RESULT bool StartReverseConversion(Segments *segments, absl::string_view key) const override; ABSL_MUST_USE_RESULT - bool StartPredictionForRequest(const ConversionRequest &request, - Segments *segments) const override; + bool StartPrediction(const ConversionRequest &request, + Segments *segments) const override; ABSL_MUST_USE_RESULT - bool StartPrediction(Segments *segments, - absl::string_view key) const override; + bool StartPredictionWithKey(Segments *segments, + absl::string_view key) const override; ABSL_MUST_USE_RESULT - bool StartSuggestionForRequest(const ConversionRequest &request, - Segments *segments) const override; + bool StartSuggestion(const ConversionRequest &request, + Segments *segments) const override; ABSL_MUST_USE_RESULT - bool StartSuggestion(Segments *segments, - absl::string_view key) const override; + bool StartSuggestionWithKey(Segments *segments, + absl::string_view key) const override; ABSL_MUST_USE_RESULT - bool StartPartialPredictionForRequest(const ConversionRequest &request, - Segments *segments) const override; + bool StartPartialPrediction(const ConversionRequest &request, + Segments *segments) const override; ABSL_MUST_USE_RESULT - bool StartPartialPrediction(Segments *segments, - absl::string_view key) const override; + bool StartPartialPredictionWithKey(Segments *segments, + absl::string_view key) const override; ABSL_MUST_USE_RESULT - bool StartPartialSuggestionForRequest(const ConversionRequest &request, - Segments *segments) const override; + bool StartPartialSuggestion(const ConversionRequest &request, + Segments *segments) const override; ABSL_MUST_USE_RESULT - bool StartPartialSuggestion(Segments *segments, - absl::string_view key) const override; + bool StartPartialSuggestionWithKey(Segments *segments, + absl::string_view key) const override; void FinishConversion(const ConversionRequest &request, Segments *segments) const override; diff --git a/src/converter/converter_interface.h b/src/converter/converter_interface.h index 6512d6fa1..630cf7d65 100644 --- a/src/converter/converter_interface.h +++ b/src/converter/converter_interface.h @@ -56,14 +56,14 @@ class ConverterInterface { // Starts conversion for given request. ABSL_MUST_USE_RESULT - virtual bool StartConversionForRequest(const ConversionRequest &request, - Segments *segments) const = 0; + virtual bool StartConversion(const ConversionRequest &request, + Segments *segments) const = 0; // Start conversion with key. // key is a request written in Hiragana sequence ABSL_MUST_USE_RESULT - virtual bool StartConversion(Segments *segments, - absl::string_view key) const = 0; + virtual bool StartConversionWithKey(Segments *segments, + absl::string_view key) const = 0; // Start reverse conversion with key. ABSL_MUST_USE_RESULT @@ -72,43 +72,43 @@ class ConverterInterface { // Starts prediction for given request. ABSL_MUST_USE_RESULT - virtual bool StartPredictionForRequest(const ConversionRequest &request, - Segments *segments) const = 0; + virtual bool StartPrediction(const ConversionRequest &request, + Segments *segments) const = 0; // Start prediction with key (request_type = PREDICTION) ABSL_MUST_USE_RESULT - virtual bool StartPrediction(Segments *segments, - absl::string_view key) const = 0; + virtual bool StartPredictionWithKey(Segments *segments, + absl::string_view key) const = 0; // Starts suggestion for given request. ABSL_MUST_USE_RESULT - virtual bool StartSuggestionForRequest(const ConversionRequest &request, - Segments *segments) const = 0; + virtual bool StartSuggestion(const ConversionRequest &request, + Segments *segments) const = 0; // Start suggestion with key (request_type = SUGGESTION) ABSL_MUST_USE_RESULT - virtual bool StartSuggestion(Segments *segments, - absl::string_view key) const = 0; + virtual bool StartSuggestionWithKey(Segments *segments, + absl::string_view key) const = 0; // Starts partial prediction for given request. ABSL_MUST_USE_RESULT - virtual bool StartPartialPredictionForRequest( - const ConversionRequest &request, Segments *segments) const = 0; + virtual bool StartPartialPrediction(const ConversionRequest &request, + Segments *segments) const = 0; // Start prediction with key (request_type = PARTIAL_PREDICTION) ABSL_MUST_USE_RESULT - virtual bool StartPartialPrediction(Segments *segments, - absl::string_view key) const = 0; + virtual bool StartPartialPredictionWithKey(Segments *segments, + absl::string_view key) const = 0; // Starts partial suggestion for given request. ABSL_MUST_USE_RESULT - virtual bool StartPartialSuggestionForRequest( - const ConversionRequest &request, Segments *segments) const = 0; + virtual bool StartPartialSuggestion(const ConversionRequest &request, + Segments *segments) const = 0; // Start suggestion with key (request_type = PARTIAL_SUGGESTION) ABSL_MUST_USE_RESULT - virtual bool StartPartialSuggestion(Segments *segments, - absl::string_view key) const = 0; + virtual bool StartPartialSuggestionWithKey(Segments *segments, + absl::string_view key) const = 0; // Finish conversion. // Segments are cleared. Context is not cleared diff --git a/src/converter/converter_main.cc b/src/converter/converter_main.cc index 1cde117a0..9e5fd4e69 100644 --- a/src/converter/converter_main.cc +++ b/src/converter/converter_main.cc @@ -296,14 +296,14 @@ bool ExecCommand(const ConverterInterface &converter, const std::string &line, if (func == "startconversion" || func == "start" || func == "s") { CHECK_FIELDS_LENGTH(2); composer.SetPreeditTextForTestOnly(fields[1]); - return converter.StartConversionForRequest(*conversion_request, segments); + return converter.StartConversion(*conversion_request, segments); } else if (func == "convertwithnodeinfo" || func == "cn") { CHECK_FIELDS_LENGTH(5); Lattice::SetDebugDisplayNode( NumberUtil::SimpleAtoi(fields[2]), // begin pos NumberUtil::SimpleAtoi(fields[3]), // end pos fields[4]); - const bool result = converter.StartConversion(segments, fields[1]); + const bool result = converter.StartConversionWithKey(segments, fields[1]); Lattice::ResetDebugDisplayNode(); return result; } else if (func == "reverseconversion" || func == "reverse" || func == "r") { @@ -312,16 +312,16 @@ bool ExecCommand(const ConverterInterface &converter, const std::string &line, } else if (func == "startprediction" || func == "predict" || func == "p") { if (fields.size() >= 2) { composer.SetPreeditTextForTestOnly(fields[1]); - return converter.StartPredictionForRequest(*conversion_request, segments); + return converter.StartPrediction(*conversion_request, segments); } else { - return converter.StartPredictionForRequest(*conversion_request, segments); + return converter.StartPrediction(*conversion_request, segments); } } else if (func == "startsuggestion" || func == "suggest") { if (fields.size() >= 2) { composer.SetPreeditTextForTestOnly(fields[1]); - return converter.StartSuggestionForRequest(*conversion_request, segments); + return converter.StartSuggestion(*conversion_request, segments); } else { - return converter.StartSuggestionForRequest(*conversion_request, segments); + return converter.StartSuggestion(*conversion_request, segments); } } else if (func == "finishconversion" || func == "finish") { converter.FinishConversion(*conversion_request, segments); diff --git a/src/converter/converter_mock.h b/src/converter/converter_mock.h index 6d2696cba..7b273a00e 100644 --- a/src/converter/converter_mock.h +++ b/src/converter/converter_mock.h @@ -30,7 +30,15 @@ #ifndef MOZC_CONVERTER_CONVERTER_MOCK_H_ #define MOZC_CONVERTER_CONVERTER_MOCK_H_ +#include +#include +#include + +#include "absl/strings/string_view.h" +#include "absl/types/span.h" #include "converter/converter_interface.h" +#include "converter/segments.h" +#include "request/conversion_request.h" #include "testing/gmock.h" namespace mozc { @@ -40,32 +48,32 @@ class StrictMockConverter : public ConverterInterface { StrictMockConverter() = default; ~StrictMockConverter() override = default; - MOCK_METHOD(bool, StartConversionForRequest, + MOCK_METHOD(bool, StartConversion, (const ConversionRequest &request, Segments *segments), (const, override)); - MOCK_METHOD(bool, StartConversion, + MOCK_METHOD(bool, StartConversionWithKey, (Segments * segments, absl::string_view key), (const, override)); MOCK_METHOD(bool, StartReverseConversion, (Segments * segments, absl::string_view key), (const, override)); - MOCK_METHOD(bool, StartPredictionForRequest, + MOCK_METHOD(bool, StartPrediction, (const ConversionRequest &request, Segments *segments), (const, override)); - MOCK_METHOD(bool, StartPrediction, + MOCK_METHOD(bool, StartPredictionWithKey, (Segments * segments, absl::string_view key), (const, override)); - MOCK_METHOD(bool, StartSuggestionForRequest, + MOCK_METHOD(bool, StartSuggestion, (const ConversionRequest &request, Segments *segments), (const, override)); - MOCK_METHOD(bool, StartSuggestion, + MOCK_METHOD(bool, StartSuggestionWithKey, (Segments * segments, absl::string_view key), (const, override)); - MOCK_METHOD(bool, StartPartialPredictionForRequest, + MOCK_METHOD(bool, StartPartialPrediction, (const ConversionRequest &request, Segments *segments), (const, override)); - MOCK_METHOD(bool, StartPartialPrediction, + MOCK_METHOD(bool, StartPartialPredictionWithKey, (Segments * segments, absl::string_view key), (const, override)); - MOCK_METHOD(bool, StartPartialSuggestionForRequest, + MOCK_METHOD(bool, StartPartialSuggestion, (const ConversionRequest &request, Segments *segments), (const, override)); - MOCK_METHOD(bool, StartPartialSuggestion, + MOCK_METHOD(bool, StartPartialSuggestionWithKey, (Segments * segments, absl::string_view key), (const, override)); MOCK_METHOD(void, FinishConversion, (const ConversionRequest &request, Segments *segments), diff --git a/src/converter/converter_regression_test.cc b/src/converter/converter_regression_test.cc index f8af4addf..b82bf07da 100644 --- a/src/converter/converter_regression_test.cc +++ b/src/converter/converter_regression_test.cc @@ -54,16 +54,16 @@ TEST_F(ConverterRegressionTest, QueryOfDeathTest) { CHECK(converter); { Segments segments; - EXPECT_TRUE(converter->StartConversion(&segments, "りゅきゅけmぽ")); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, "りゅきゅけmぽ")); } { Segments segments; - EXPECT_TRUE(converter->StartConversion(&segments, "5.1,||t:1")); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, "5.1,||t:1")); } { Segments segments; // Converter returns false, but not crash. - EXPECT_FALSE(converter->StartConversion(&segments, "")); + EXPECT_FALSE(converter->StartConversionWithKey(&segments, "")); } { Segments segments; @@ -74,7 +74,7 @@ TEST_F(ConverterRegressionTest, QueryOfDeathTest) { composer::Composer composer(&table, &request, nullptr); conv_request.set_composer(&composer); // Converter returns false, but not crash. - EXPECT_FALSE(converter->StartConversionForRequest(conv_request, &segments)); + EXPECT_FALSE(converter->StartConversion(conv_request, &segments)); } } @@ -83,7 +83,8 @@ TEST_F(ConverterRegressionTest, Regression3323108) { ConverterInterface *converter = engine->GetConverter(); Segments segments; - EXPECT_TRUE(converter->StartConversion(&segments, "ここではきものをぬぐ")); + EXPECT_TRUE( + converter->StartConversionWithKey(&segments, "ここではきものをぬぐ")); EXPECT_EQ(segments.conversion_segments_size(), 3); const ConversionRequest default_request; EXPECT_TRUE(converter->ResizeSegment(&segments, default_request, 1, 2)); diff --git a/src/converter/converter_test.cc b/src/converter/converter_test.cc index 05254671d..443b96df6 100644 --- a/src/converter/converter_test.cc +++ b/src/converter/converter_test.cc @@ -359,11 +359,11 @@ TEST_F(ConverterTest, CanConvertTest) { CHECK(converter); { Segments segments; - EXPECT_TRUE(converter->StartConversion(&segments, "-")); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, "-")); } { Segments segments; - EXPECT_TRUE(converter->StartConversion(&segments, "おきておきて")); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, "おきておきて")); } } @@ -377,7 +377,7 @@ std::string ContextAwareConvert(const std::string &first_key, CHECK(converter); Segments segments; - EXPECT_TRUE(converter->StartConversion(&segments, first_key)); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, first_key)); std::string converted; int segment_num = 0; @@ -411,7 +411,7 @@ std::string ContextAwareConvert(const std::string &first_key, // TODO(team): Use StartConversionForRequest instead of StartConversion. const ConversionRequest default_request; converter->FinishConversion(default_request, &segments); - EXPECT_TRUE(converter->StartConversion(&segments, second_key)); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, second_key)); EXPECT_EQ(segments.segments_size(), segment_num + 1); return segments.segment(segment_num).candidate(0).value; @@ -773,7 +773,7 @@ TEST_F(ConverterTest, CandidateKeyTest) { ConverterInterface *converter = engine->GetConverter(); CHECK(converter); Segments segments; - EXPECT_TRUE(converter->StartConversion(&segments, "わたしは")); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, "わたしは")); EXPECT_EQ(segments.segments_size(), 1); EXPECT_EQ(segments.segment(0).candidate(0).key, "わたしは"); EXPECT_EQ(segments.segment(0).candidate(0).content_key, "わたし"); @@ -793,7 +793,7 @@ TEST_F(ConverterTest, Regression3437022) { { // Make sure convert result is one segment - EXPECT_TRUE(converter->StartConversion(&segments, kKey1 + kKey2)); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, kKey1 + kKey2)); EXPECT_EQ(segments.conversion_segments_size(), 1); EXPECT_EQ(segments.conversion_segment(0).candidate(0).value, kValue1 + kValue2); @@ -801,14 +801,14 @@ TEST_F(ConverterTest, Regression3437022) { { // Make sure we can convert first part segments.Clear(); - EXPECT_TRUE(converter->StartConversion(&segments, kKey1)); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, kKey1)); EXPECT_EQ(segments.conversion_segments_size(), 1); EXPECT_EQ(segments.conversion_segment(0).candidate(0).value, kValue1); } { // Make sure we can convert last part segments.Clear(); - EXPECT_TRUE(converter->StartConversion(&segments, kKey2)); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, kKey2)); EXPECT_EQ(segments.conversion_segments_size(), 1); EXPECT_EQ(segments.conversion_segment(0).candidate(0).value, kValue2); } @@ -821,7 +821,7 @@ TEST_F(ConverterTest, Regression3437022) { dic->AddEntry(kKey1 + kKey2, kValue1 + kValue2); dic->UnLock(); - EXPECT_TRUE(converter->StartConversion(&segments, kKey1 + kKey2)); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, kKey1 + kKey2)); int rest_size = 0; for (const Segment &segment : segments.conversion_segments().drop(1)) { @@ -904,7 +904,7 @@ TEST_F(ConverterTest, Regression3046266) { constexpr char kValueNotExpected[] = "中"; - EXPECT_TRUE(converter->StartConversion(&segments, kKey1)); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, kKey1)); EXPECT_EQ(segments.conversion_segments_size(), 1); EXPECT_TRUE(converter->CommitSegmentValue(&segments, 0, 0)); @@ -912,7 +912,7 @@ TEST_F(ConverterTest, Regression3046266) { const ConversionRequest default_request; converter->FinishConversion(default_request, &segments); - EXPECT_TRUE(converter->StartConversion(&segments, kKey2)); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, kKey2)); EXPECT_EQ(segments.conversion_segments_size(), 1); const Segment &segment = segments.conversion_segment(0); for (size_t i = 0; i < segment.candidates_size(); ++i) { @@ -930,7 +930,7 @@ TEST_F(ConverterTest, Regression5502496) { constexpr char kKey[] = "みんあ"; constexpr char kValueExpected[] = "みんな"; - EXPECT_TRUE(converter->StartConversion(&segments, kKey)); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, kKey)); EXPECT_EQ(segments.conversion_segments_size(), 1); const Segment &segment = segments.conversion_segment(0); bool found = false; @@ -942,7 +942,7 @@ TEST_F(ConverterTest, Regression5502496) { EXPECT_TRUE(found); } -TEST_F(ConverterTest, StartSuggestionForRequest) { +TEST_F(ConverterTest, StartSuggestion) { commands::Request client_request; client_request.set_mixed_conversion(true); @@ -966,7 +966,7 @@ TEST_F(ConverterTest, StartSuggestionForRequest) { Segments segments; ConversionRequest request(&composer, &client_request, &config); request.set_request_type(ConversionRequest::SUGGESTION); - EXPECT_TRUE(converter->StartSuggestionForRequest(request, &segments)); + EXPECT_TRUE(converter->StartSuggestion(request, &segments)); EXPECT_EQ(segments.segments_size(), 1); ASSERT_TRUE(segments.segment(0).meta_candidates_size() >= transliteration::HALF_ASCII); @@ -983,7 +983,7 @@ TEST_F(ConverterTest, StartSuggestionForRequest) { Segments segments; ConversionRequest request(&composer, &client_request, &config); request.set_request_type(ConversionRequest::SUGGESTION); - EXPECT_TRUE(converter->StartSuggestionForRequest(request, &segments)); + EXPECT_TRUE(converter->StartSuggestion(request, &segments)); EXPECT_EQ(segments.segments_size(), 1); ASSERT_TRUE(segments.segment(0).meta_candidates_size() >= transliteration::HALF_ASCII); @@ -999,7 +999,7 @@ TEST_F(ConverterTest, StartPartialPrediction) { ConverterInterface *converter = engine->GetConverter(); CHECK(converter); Segments segments; - EXPECT_TRUE(converter->StartPartialPrediction(&segments, "わたしは")); + EXPECT_TRUE(converter->StartPartialPredictionWithKey(&segments, "わたしは")); EXPECT_EQ(segments.segments_size(), 1); EXPECT_EQ(segments.segment(0).candidate(0).key, "わたしは"); EXPECT_EQ(segments.segment(0).candidate(0).content_key, "わたしは"); @@ -1011,7 +1011,7 @@ TEST_F(ConverterTest, StartPartialSuggestion) { ConverterInterface *converter = engine->GetConverter(); CHECK(converter); Segments segments; - EXPECT_TRUE(converter->StartPartialSuggestion(&segments, "わたしは")); + EXPECT_TRUE(converter->StartPartialSuggestionWithKey(&segments, "わたしは")); EXPECT_EQ(segments.segments_size(), 1); EXPECT_EQ(segments.segment(0).candidate(0).key, "わたしは"); EXPECT_EQ(segments.segment(0).candidate(0).content_key, "わたしは"); @@ -1022,7 +1022,7 @@ TEST_F(ConverterTest, StartPartialPredictionMobile) { ConverterInterface *converter = engine->GetConverter(); CHECK(converter); Segments segments; - EXPECT_TRUE(converter->StartPartialPrediction(&segments, "わたしは")); + EXPECT_TRUE(converter->StartPartialPredictionWithKey(&segments, "わたしは")); EXPECT_EQ(segments.segments_size(), 1); EXPECT_EQ(segments.segment(0).candidate(0).key, "わたしは"); EXPECT_EQ(segments.segment(0).candidate(0).content_key, "わたしは"); @@ -1033,7 +1033,7 @@ TEST_F(ConverterTest, StartPartialSuggestionMobile) { ConverterInterface *converter = engine->GetConverter(); CHECK(converter); Segments segments; - EXPECT_TRUE(converter->StartPartialSuggestion(&segments, "わたしは")); + EXPECT_TRUE(converter->StartPartialSuggestionWithKey(&segments, "わたしは")); EXPECT_EQ(segments.segments_size(), 1); EXPECT_EQ(segments.segment(0).candidate(0).key, "わたしは"); EXPECT_EQ(segments.segment(0).candidate(0).content_key, "わたしは"); @@ -1179,7 +1179,7 @@ TEST_F(ConverterTest, VariantExpansionForSuggestion) { Segments segments; { // Dictionary suggestion - EXPECT_TRUE(converter.StartSuggestion(&segments, "てすと")); + EXPECT_TRUE(converter.StartSuggestionWithKey(&segments, "てすと")); EXPECT_EQ(segments.conversion_segments_size(), 1); EXPECT_LE(1, segments.conversion_segment(0).candidates_size()); EXPECT_TRUE(FindCandidateByValue("<>!?", segments.conversion_segment(0))); @@ -1189,7 +1189,7 @@ TEST_F(ConverterTest, VariantExpansionForSuggestion) { { // Realtime conversion segments.Clear(); - EXPECT_TRUE(converter.StartSuggestion(&segments, "てすとの")); + EXPECT_TRUE(converter.StartSuggestionWithKey(&segments, "てすとの")); EXPECT_EQ(segments.conversion_segments_size(), 1); EXPECT_LE(1, segments.conversion_segment(0).candidates_size()); EXPECT_TRUE(FindCandidateByValue("<>!?の", segments.conversion_segment(0))); @@ -1210,7 +1210,7 @@ TEST_F(ConverterTest, ComposerKeySelection) { composer.InsertCharacterPreedit("わたしh"); ConversionRequest request(&composer, &default_request(), &config); request.set_composer_key_selection(ConversionRequest::CONVERSION_KEY); - ASSERT_TRUE(converter->StartConversionForRequest(request, &segments)); + ASSERT_TRUE(converter->StartConversion(request, &segments)); EXPECT_EQ(segments.conversion_segments_size(), 2); EXPECT_EQ(segments.conversion_segment(0).candidate(0).value, "私"); EXPECT_EQ(segments.conversion_segment(1).candidate(0).value, "h"); @@ -1221,7 +1221,7 @@ TEST_F(ConverterTest, ComposerKeySelection) { composer.InsertCharacterPreedit("わたしh"); ConversionRequest request(&composer, &default_request(), &config); request.set_composer_key_selection(ConversionRequest::PREDICTION_KEY); - ASSERT_TRUE(converter->StartConversionForRequest(request, &segments)); + ASSERT_TRUE(converter->StartConversion(request, &segments)); EXPECT_EQ(segments.conversion_segments_size(), 1); EXPECT_EQ(segments.conversion_segment(0).candidate(0).value, "私"); } @@ -1245,7 +1245,7 @@ TEST_F(ConverterTest, SuppressionDictionaryForRewriter) { composer.InsertCharacter("placeholder"); const ConversionRequest request(&composer, &default_request(), &config); Segments segments; - EXPECT_TRUE(ret->converter->StartConversionForRequest(request, &segments)); + EXPECT_TRUE(ret->converter->StartConversion(request, &segments)); // Verify that words inserted by the rewriter is suppressed if its in the // suppression_dictionary. @@ -1517,7 +1517,7 @@ TEST_F(ConverterTest, LimitCandidatesSize) { ConversionRequest request(&composer, &request_proto, &config); Segments segments; - ASSERT_TRUE(converter->StartConversionForRequest(request, &segments)); + ASSERT_TRUE(converter->StartConversion(request, &segments)); ASSERT_EQ(segments.conversion_segments_size(), 1); const int original_candidates_size = segments.segment(0).candidates_size(); const int original_meta_candidates_size = @@ -1528,7 +1528,7 @@ TEST_F(ConverterTest, LimitCandidatesSize) { segments.Clear(); request_proto.set_candidates_size_limit(original_candidates_size - 1); - ASSERT_TRUE(converter->StartConversionForRequest(request, &segments)); + ASSERT_TRUE(converter->StartConversion(request, &segments)); ASSERT_EQ(segments.conversion_segments_size(), 1); EXPECT_GE(original_candidates_size - 1, segments.segment(0).candidates_size()); @@ -1539,7 +1539,7 @@ TEST_F(ConverterTest, LimitCandidatesSize) { segments.Clear(); request_proto.set_candidates_size_limit(0); - ASSERT_TRUE(converter->StartConversionForRequest(request, &segments)); + ASSERT_TRUE(converter->StartConversion(request, &segments)); ASSERT_EQ(segments.conversion_segments_size(), 1); EXPECT_EQ(segments.segment(0).candidates_size(), 1); EXPECT_EQ(segments.segment(0).meta_candidates_size(), @@ -1561,7 +1561,7 @@ TEST_F(ConverterTest, UserEntryShouldBePromoted) { CHECK(converter); { Segments segments; - EXPECT_TRUE(converter->StartConversion(&segments, "あい")); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, "あい")); ASSERT_EQ(segments.conversion_segments_size(), 1); ASSERT_LT(1, segments.conversion_segment(0).candidates_size()); EXPECT_EQ(segments.conversion_segment(0).candidate(0).value, "哀"); @@ -1583,7 +1583,7 @@ TEST_F(ConverterTest, UserEntryShouldBePromotedMobilePrediction) { CHECK(converter); { Segments segments; - EXPECT_TRUE(converter->StartPrediction(&segments, "あい")); + EXPECT_TRUE(converter->StartPredictionWithKey(&segments, "あい")); ASSERT_EQ(segments.conversion_segments_size(), 1); ASSERT_LT(1, segments.conversion_segment(0).candidates_size()); @@ -1618,7 +1618,7 @@ TEST_F(ConverterTest, SuppressionEntryShouldBePrioritized) { CHECK(converter); { Segments segments; - EXPECT_TRUE(converter->StartConversion(&segments, "あい")); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, "あい")); ASSERT_EQ(segments.conversion_segments_size(), 1); ASSERT_LT(1, segments.conversion_segment(0).candidates_size()); EXPECT_FALSE(FindCandidateByValue("哀", segments.conversion_segment(0))); @@ -1643,7 +1643,7 @@ TEST_F(ConverterTest, SuppressionEntryShouldBePrioritizedPrediction) { CHECK(converter); { Segments segments; - EXPECT_TRUE(converter->StartPrediction(&segments, "あい")); + EXPECT_TRUE(converter->StartPredictionWithKey(&segments, "あい")); ASSERT_EQ(segments.conversion_segments_size(), 1); ASSERT_LT(1, segments.conversion_segment(0).candidates_size()); EXPECT_FALSE(FindCandidateByValue("哀", segments.conversion_segment(0))); @@ -1665,7 +1665,7 @@ TEST_F(ConverterTest, AbbreviationShouldBeIndependent) { CHECK(converter); { Segments segments; - EXPECT_TRUE(converter->StartConversion(&segments, "じゅうじか")); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, "じゅうじか")); ASSERT_EQ(segments.conversion_segments_size(), 1); EXPECT_FALSE( FindCandidateByValue("Google+うじか", segments.conversion_segment(0))); @@ -1689,7 +1689,7 @@ TEST_F(ConverterTest, AbbreviationShouldBeIndependentPrediction) { { Segments segments; - EXPECT_TRUE(converter->StartPrediction(&segments, "じゅうじか")); + EXPECT_TRUE(converter->StartPredictionWithKey(&segments, "じゅうじか")); ASSERT_EQ(segments.conversion_segments_size(), 1); EXPECT_FALSE(FindCandidateByValue("Google+うじか", segments.conversion_segment(0))); @@ -1711,7 +1711,7 @@ TEST_F(ConverterTest, SuggestionOnlyShouldBeIndependent) { CHECK(converter); { Segments segments; - EXPECT_TRUE(converter->StartConversion(&segments, "じゅうじか")); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, "じゅうじか")); ASSERT_EQ(segments.conversion_segments_size(), 1); EXPECT_FALSE( FindCandidateByValue("Google+うじか", segments.conversion_segment(0))); @@ -1734,7 +1734,7 @@ TEST_F(ConverterTest, SuggestionOnlyShouldBeIndependentPrediction) { CHECK(converter); { Segments segments; - EXPECT_TRUE(converter->StartConversion(&segments, "じゅうじか")); + EXPECT_TRUE(converter->StartConversionWithKey(&segments, "じゅうじか")); ASSERT_EQ(segments.conversion_segments_size(), 1); EXPECT_FALSE(FindCandidateByValue("Google+うじか", segments.conversion_segment(0))); @@ -1763,8 +1763,7 @@ TEST_F(ConverterTest, RewriterShouldRespectDefaultCandidates) { absl::flat_hash_set seen; for (int i = 0; i < 4; ++i) { segments.Clear(); - EXPECT_TRUE( - converter->StartPredictionForRequest(conversion_request, &segments)); + EXPECT_TRUE(converter->StartPrediction(conversion_request, &segments)); const Segment &segment = segments.conversion_segment(0); if (i == 0) { top_candidate = segment.candidate(0).value; @@ -1783,8 +1782,7 @@ TEST_F(ConverterTest, RewriterShouldRespectDefaultCandidates) { } segments.Clear(); - EXPECT_TRUE( - converter->StartPredictionForRequest(conversion_request, &segments)); + EXPECT_TRUE(converter->StartPrediction(conversion_request, &segments)); int default_candidate_index = -1; for (int i = 0; i < segments.conversion_segment(0).candidates_size(); ++i) { @@ -1814,8 +1812,7 @@ TEST_F(ConverterTest, Segments segments; composer.SetPreeditTextForTestOnly("おつかれ"); - EXPECT_TRUE( - converter->StartPredictionForRequest(conversion_request, &segments)); + EXPECT_TRUE(converter->StartPrediction(conversion_request, &segments)); int o_index = GetCandidateIndexByValue("お", segments.conversion_segment(0)); int otsukare_index = @@ -1855,8 +1852,7 @@ TEST_F(ConverterTest, DoNotAddOverlappingNodesForPrediction) { } composer.SetPreeditTextForTestOnly("てはい"); - EXPECT_TRUE( - converter->StartPredictionForRequest(conversion_request, &segments)); + EXPECT_TRUE(converter->StartPrediction(conversion_request, &segments)); EXPECT_FALSE(FindCandidateByValue("て廃", segments.conversion_segment(0))); } diff --git a/src/converter/quality_regression_util.cc b/src/converter/quality_regression_util.cc index 0e1d76f94..70211524a 100644 --- a/src/converter/quality_regression_util.cc +++ b/src/converter/quality_regression_util.cc @@ -250,7 +250,7 @@ absl::StatusOr QualityRegressionUtil::ConvertAndTest( composer::Composer composer(&table, &request_, &config_); composer.SetPreeditTextForTestOnly(key); ConversionRequest conv_req(&composer, &request_, &config_); - if (!converter_->StartConversionForRequest(conv_req, &segments_)) { + if (!converter_->StartConversion(conv_req, &segments_)) { return absl::UnknownError(absl::StrCat( "StartConversionForRequest failed: ", item.OutputAsTSV())); } @@ -263,7 +263,7 @@ absl::StatusOr QualityRegressionUtil::ConvertAndTest( composer::Composer composer(&table, &request_, &config_); composer.SetPreeditTextForTestOnly(key); ConversionRequest conv_req(&composer, &request_, &config_); - if (!converter_->StartPredictionForRequest(conv_req, &segments_)) { + if (!converter_->StartPrediction(conv_req, &segments_)) { return absl::UnknownError(absl::StrCat( "StartPredictionForRequest failed: ", item.OutputAsTSV())); } @@ -271,9 +271,9 @@ absl::StatusOr QualityRegressionUtil::ConvertAndTest( composer::Composer composer(&table, &request_, &config_); composer.SetPreeditTextForTestOnly(key); ConversionRequest conv_req(&composer, &request_, &config_); - if (!converter_->StartSuggestionForRequest(conv_req, &segments_)) { - return absl::UnknownError(absl::StrCat( - "StartSuggestionForRequest failed: ", item.OutputAsTSV())); + if (!converter_->StartSuggestion(conv_req, &segments_)) { + return absl::UnknownError( + absl::StrCat("StartSuggestion failed: ", item.OutputAsTSV())); } } else if (command == kZeroQueryExpect || command == kZeroQueryNotExpect) { commands::Request request = request_; @@ -284,9 +284,9 @@ absl::StatusOr QualityRegressionUtil::ConvertAndTest( composer.SetPreeditTextForTestOnly(key); ConversionRequest conv_req(&composer, &request, &config_); conv_req.set_max_conversion_candidates_size(10); - if (!converter_->StartSuggestionForRequest(conv_req, &segments_)) { - return absl::UnknownError(absl::StrCat( - "StartSuggestionForRequest failed: ", item.OutputAsTSV())); + if (!converter_->StartSuggestion(conv_req, &segments_)) { + return absl::UnknownError( + absl::StrCat("StartSuggestion failed: ", item.OutputAsTSV())); } if (!converter_->CommitSegmentValue(&segments_, 0, 0)) { return absl::UnknownError( @@ -299,7 +299,7 @@ absl::StatusOr QualityRegressionUtil::ConvertAndTest( composer::Composer composer(&table, &request, &config_); ConversionRequest conv_req(&composer, &request, &config_); conv_req.set_max_conversion_candidates_size(10); - if (!converter_->StartPredictionForRequest(conv_req, &segments_)) { + if (!converter_->StartPrediction(conv_req, &segments_)) { return absl::UnknownError(absl::StrCat( "StartPredictionForRequest failed: ", item.OutputAsTSV())); } diff --git a/src/engine/minimal_engine.cc b/src/engine/minimal_engine.cc index 02265db61..f4f97a63e 100644 --- a/src/engine/minimal_engine.cc +++ b/src/engine/minimal_engine.cc @@ -103,13 +103,13 @@ class MinimalConverter : public ConverterInterface { public: MinimalConverter() = default; - bool StartConversionForRequest(const ConversionRequest &request, - Segments *segments) const override { + bool StartConversion(const ConversionRequest &request, + Segments *segments) const override { return AddAsIsCandidate(request, segments); } - bool StartConversion(Segments *segments, - const absl::string_view key) const override { + bool StartConversionWithKey(Segments *segments, + const absl::string_view key) const override { return AddAsIsCandidate(key, segments); } @@ -118,43 +118,43 @@ class MinimalConverter : public ConverterInterface { return false; } - bool StartPredictionForRequest(const ConversionRequest &request, - Segments *segments) const override { + bool StartPrediction(const ConversionRequest &request, + Segments *segments) const override { return AddAsIsCandidate(request, segments); } - bool StartPrediction(Segments *segments, - const absl::string_view key) const override { + bool StartPredictionWithKey(Segments *segments, + const absl::string_view key) const override { return AddAsIsCandidate(key, segments); } - bool StartSuggestionForRequest(const ConversionRequest &request, - Segments *segments) const override { + bool StartSuggestion(const ConversionRequest &request, + Segments *segments) const override { return AddAsIsCandidate(request, segments); } - bool StartSuggestion(Segments *segments, - const absl::string_view key) const override { + bool StartSuggestionWithKey(Segments *segments, + const absl::string_view key) const override { return AddAsIsCandidate(key, segments); } - bool StartPartialPredictionForRequest(const ConversionRequest &request, - Segments *segments) const override { + bool StartPartialPrediction(const ConversionRequest &request, + Segments *segments) const override { return false; } - bool StartPartialPrediction(Segments *segments, - const absl::string_view key) const override { + bool StartPartialPredictionWithKey( + Segments *segments, const absl::string_view key) const override { return false; } - bool StartPartialSuggestionForRequest(const ConversionRequest &request, - Segments *segments) const override { + bool StartPartialSuggestion(const ConversionRequest &request, + Segments *segments) const override { return false; } - bool StartPartialSuggestion(Segments *segments, - const absl::string_view key) const override { + bool StartPartialSuggestionWithKey( + Segments *segments, const absl::string_view key) const override { return false; } diff --git a/src/prediction/dictionary_prediction_aggregator.cc b/src/prediction/dictionary_prediction_aggregator.cc index a597f6124..800ee0a0d 100644 --- a/src/prediction/dictionary_prediction_aggregator.cc +++ b/src/prediction/dictionary_prediction_aggregator.cc @@ -844,7 +844,7 @@ bool DictionaryPredictionAggregator::PushBackTopConversionResult( // partial candidates. tmp_request.set_create_partial_candidates(false); tmp_request.set_request_type(ConversionRequest::CONVERSION); - if (!converter_->StartConversionForRequest(tmp_request, &tmp_segments)) { + if (!converter_->StartConversion(tmp_request, &tmp_segments)) { return false; } @@ -860,7 +860,7 @@ bool DictionaryPredictionAggregator::PushBackTopConversionResult( result->candidate_attributes |= Segment::Candidate::NO_VARIANTS_EXPANSION; // Concatenate the top candidates. - // Note that since StartConversionForRequest() runs in conversion mode, the + // Note that since StartConversion() runs in conversion mode, the // resulting |tmp_segments| doesn't have inner_segment_boundary. We need to // construct it manually here. // TODO(noriyukit): This is code duplicate in converter/nbest_generator.cc and @@ -898,7 +898,7 @@ void DictionaryPredictionAggregator::AggregateRealtimeConversion( DCHECK(results); // First insert a top conversion result. // Note: Do not call actual converter for partial suggestion / prediction. - // Converter::StartConversionForRequest() resets conversion key from composer + // Converter::StartConversion() resets conversion key from composer // rather than using the key in segments. if (request.use_actual_converter_for_realtime_conversion() && request.request_type() != ConversionRequest::PARTIAL_SUGGESTION && diff --git a/src/prediction/dictionary_prediction_aggregator_test.cc b/src/prediction/dictionary_prediction_aggregator_test.cc index 018a9a079..3777b52fb 100644 --- a/src/prediction/dictionary_prediction_aggregator_test.cc +++ b/src/prediction/dictionary_prediction_aggregator_test.cc @@ -619,8 +619,7 @@ TEST_F(DictionaryPredictionAggregatorTest, suggestion_convreq_->set_request_type(ConversionRequest::PARTIAL_SUGGESTION); // StartConversion should not be called for partial. - EXPECT_CALL(*data_and_aggregator->mutable_converter(), - StartConversionForRequest(_, _)) + EXPECT_CALL(*data_and_aggregator->mutable_converter(), StartConversion(_, _)) .Times(0); EXPECT_CALL(*data_and_aggregator->mutable_immutable_converter(), ConvertForRequest(_, _)) @@ -1626,7 +1625,7 @@ TEST_F(DictionaryPredictionAggregatorTest, AggregateRealtimeConversion) { add_segment("なかのです", "Nakanodesu"); EXPECT_CALL(*data_and_aggregator->mutable_converter(), - StartConversionForRequest(_, _)) + StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } // Set up mock immutable converter diff --git a/src/session/internal/ime_context_test.cc b/src/session/internal/ime_context_test.cc index cec6c7372..f9986d4a9 100644 --- a/src/session/internal/ime_context_test.cc +++ b/src/session/internal/ime_context_test.cc @@ -41,6 +41,7 @@ #include "protocol/commands.pb.h" #include "protocol/config.pb.h" #include "session/session_converter.h" +#include "testing/gmock.h" #include "testing/gunit.h" #include "testing/testing_util.h" @@ -114,7 +115,7 @@ TEST(ImeContextTest, CopyContext) { segment->set_key("あん"); Segment::Candidate *candidate = segment->add_candidate(); candidate->value = "庵"; - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); { diff --git a/src/session/session_converter.cc b/src/session/session_converter.cc index e90fbea4b..2be4de1b7 100644 --- a/src/session/session_converter.cc +++ b/src/session/session_converter.cc @@ -186,8 +186,8 @@ bool SessionConverter::ConvertWithPreferences( SetConversionPreferences(preferences, &segments_, &conversion_request); SetRequestType(ConversionRequest::CONVERSION, &conversion_request); - if (!converter_->StartConversionForRequest(conversion_request, &segments_)) { - LOG(WARNING) << "StartConversionForRequest() failed"; + if (!converter_->StartConversion(conversion_request, &segments_)) { + LOG(WARNING) << "StartConversion() failed"; ResetState(); return false; } @@ -490,15 +490,12 @@ bool SessionConverter::SuggestWithPreferences( // Start actual suggestion/prediction. bool result; if (use_partial_composition) { - result = converter_->StartPartialPredictionForRequest(conversion_request, - &segments_); + result = converter_->StartPartialPrediction(conversion_request, &segments_); } else { if (use_prediction_candidate) { - result = - converter_->StartPredictionForRequest(conversion_request, &segments_); + result = converter_->StartPrediction(conversion_request, &segments_); } else { - result = - converter_->StartSuggestionForRequest(conversion_request, &segments_); + result = converter_->StartSuggestion(conversion_request, &segments_); } } if (!result) { @@ -518,11 +515,11 @@ bool SessionConverter::SuggestWithPreferences( CreateIncognitoConversionRequest(conversion_request, incognito_config); incognito_segments_.Clear(); if (use_partial_composition) { - result = converter_->StartPartialSuggestionForRequest( - incognito_conversion_request, &incognito_segments_); + result = converter_->StartPartialSuggestion(incognito_conversion_request, + &incognito_segments_); } else { - result = converter_->StartSuggestionForRequest( - incognito_conversion_request, &incognito_segments_); + result = converter_->StartSuggestion(incognito_conversion_request, + &incognito_segments_); } if (!result) { MOZC_VLOG(1) @@ -584,9 +581,8 @@ bool SessionConverter::PredictWithPreferences( segments_.clear_conversion_segments(); if (predict_expand || predict_first) { - if (!converter_->StartPredictionForRequest(conversion_request, - &segments_)) { - LOG(WARNING) << "StartPredictionForRequest() failed"; + if (!converter_->StartPrediction(conversion_request, &segments_)) { + LOG(WARNING) << "StartPrediction() failed"; // TODO(komatsu): Perform refactoring after checking the stability test. // // If predict_expand is true, it means we have prevous_suggestions_. diff --git a/src/session/session_converter_test.cc b/src/session/session_converter_test.cc index fbc1e8554..ebba408a1 100644 --- a/src/session/session_converter_test.cc +++ b/src/session/session_converter_test.cc @@ -430,7 +430,7 @@ TEST_F(SessionConverterTest, Convert) { SetAiueo(&segments); composer_->InsertCharacterPreedit("あいうえお"); FillT13Ns(&segments, composer_.get()); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } @@ -493,7 +493,7 @@ TEST_F(SessionConverterTest, ConvertWithSpellingCorrection) { FillT13Ns(&segments, composer_.get()); segments.mutable_conversion_segment(0)->mutable_candidate(0)->attributes |= Segment::Candidate::SPELLING_CORRECTION; - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } @@ -511,7 +511,7 @@ TEST_F(SessionConverterTest, ConvertToTransliteration) { SetAiueo(&segments); composer_->InsertCharacterKeyAndPreedit("aiueo", kChars_Aiueo); FillT13Ns(&segments, composer_.get()); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } @@ -578,7 +578,7 @@ TEST_F(SessionConverterTest, ConvertToTransliterationWithMultipleSegments) { { Segments segments; SetLike(&segments); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } @@ -640,7 +640,7 @@ TEST_F(SessionConverterTest, ConvertToTransliterationWithoutCascadigWindow) { composer_->InsertCharacterKeyAndPreedit("dvd", "ｄｖｄ"); FillT13Ns(&segments, composer_.get()); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } @@ -705,7 +705,7 @@ TEST_F(SessionConverterTest, MultiSegmentsConversion) { SetKamaboko(&segments); composer_->InsertCharacterPreedit(kKamabokono + kInbou); FillT13Ns(&segments, composer_.get()); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } EXPECT_TRUE(converter.Convert(*composer_)); @@ -970,7 +970,7 @@ TEST_F(SessionConverterTest, Transliterations) { segment->add_candidate()->value = "クマー"; } FillT13Ns(&segments, composer_.get()); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.Convert(*composer_)); @@ -1030,7 +1030,7 @@ TEST_F(SessionConverterTest, T13NWithResegmentation) { InsertASCIISequence("kamabokonoinbou", composer_.get()); FillT13Ns(&segments, composer_.get()); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } EXPECT_TRUE(converter.Convert(*composer_)); @@ -1106,7 +1106,7 @@ TEST_F(SessionConverterTest, ConvertToHalfWidth) { segment->add_candidate()->value = "あべし"; } FillT13Ns(&segments, composer_.get()); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.ConvertToHalfWidth(*composer_)); expected_indices.push_back(0); @@ -1189,7 +1189,7 @@ TEST_F(SessionConverterTest, ConvertToHalfWidth2) { segment->add_candidate()->value = "q､｡"; } FillT13Ns(&segments, composer_.get()); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.ConvertToHalfWidth(*composer_)); std::vector expected_indices; @@ -1224,7 +1224,7 @@ TEST_F(SessionConverterTest, SwitchKanaTypeFromCompositionMode) { segment->add_candidate()->value = "あべし"; } FillT13Ns(&segments, composer_.get()); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.SwitchKanaType(*composer_)); std::vector expected_indices = {0}; @@ -1289,7 +1289,7 @@ TEST_F(SessionConverterTest, SwitchKanaTypeFromConversionMode) { segment->add_candidate()->value = "漢字"; } FillT13Ns(&segments, composer_.get()); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.Convert(*composer_)); std::vector expected_indices = {0}; @@ -1378,7 +1378,7 @@ TEST_F(SessionConverterTest, ResizeSegmentFailedInSwitchKanaType) { Segments segments; AddSegmentWithSingleCandidate(&segments, "かな", "カナ"); AddSegmentWithSingleCandidate(&segments, "たいぷ", "タイプ"); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); // Suppose that ResizeSegment() fails for "かな|たいぷ" (UTF8-length is 5). @@ -1400,7 +1400,7 @@ TEST_F(SessionConverterTest, CommitFirstSegment) { SetKamaboko(&segments); composer_->InsertCharacterPreedit("かまぼこ"); FillT13Ns(&segments, composer_.get()); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); const std::string kKamabokono = "かまぼこの"; @@ -1495,7 +1495,7 @@ TEST_F(SessionConverterTest, CommitHeadToFocusedSegments) { candidate = segment->add_candidate(); candidate->value = "頂いた"; - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } @@ -1536,7 +1536,7 @@ TEST_F(SessionConverterTest, CommitHeadToFocusedSegmentsAtLastSegment) { Segments segments; SetKamaboko(&segments); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); const std::string kKamabokono = "かまぼこの"; @@ -1582,7 +1582,7 @@ TEST_F(SessionConverterTest, CommitConvertedBracketPairText) { composer_->InsertCharacterPreedit(kKakko); // Suggestion - EXPECT_CALL(mock_converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); ASSERT_TRUE(converter.Suggest(*composer_)); std::vector expected_indices = {0}; @@ -1711,7 +1711,7 @@ TEST_F(SessionConverterTest, ClearSegmentsBeforeSuggest) { // Call Suggest() and sets the segments of converter to the following one. const Segments &segments = GetSegmentsTest(); - EXPECT_CALL(mock_converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); composer_->InsertCharacterPreedit("てすと"); EXPECT_TRUE(converter.Suggest(*composer_)); @@ -1722,7 +1722,7 @@ TEST_F(SessionConverterTest, ClearSegmentsBeforeSuggest) { empty.set_max_history_segments_size( converter.conversion_preferences().max_history_size); EXPECT_CALL(mock_converter, - StartSuggestionForRequest(_, Pointee(EqualsSegments(empty)))) + StartSuggestion(_, Pointee(EqualsSegments(empty)))) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.Suggest(*composer_)); } @@ -1734,14 +1734,14 @@ TEST_F(SessionConverterTest, PredictIsNotCalledInPredictionState) { // Call Predict() and sets the segments of converter to the following one. By // calling Predict(), converter enters PREDICTION state. const Segments &segments = GetSegmentsTest(); - EXPECT_CALL(mock_converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); composer_->InsertCharacterPreedit("てすと"); EXPECT_TRUE(converter.Predict(*composer_)); Mock::VerifyAndClearExpectations(&mock_converter); // Then, call Predict() again. PredictForRequest() is not called. - EXPECT_CALL(mock_converter, StartPredictionForRequest(_, _)).Times(0); + EXPECT_CALL(mock_converter, StartPrediction(_, _)).Times(0); EXPECT_TRUE(converter.Predict(*composer_)); } @@ -1765,7 +1765,7 @@ TEST_F(SessionConverterTest, CommitSuggestionByIndex) { composer_->InsertCharacterPreedit(kChars_Mo); // Suggestion - EXPECT_CALL(mock_converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); ASSERT_TRUE(converter.Suggest(*composer_)); std::vector expected_indices = {0}; @@ -1845,7 +1845,7 @@ TEST_F(SessionConverterTest, CommitSuggestionById) { composer_->InsertCharacterPreedit(kChars_Mo); // Suggestion - EXPECT_CALL(mock_converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.Suggest(*composer_)); Mock::VerifyAndClearExpectations(&mock_converter); @@ -1941,7 +1941,7 @@ TEST_F(SessionConverterTest, PartialPrediction) { composer_->InsertCharacterPreedit(kChars_Kokode + kChars_Hakimonowo); composer_->MoveCursorToEnd(); // Prediction for "ここではきものを". - EXPECT_CALL(mock_converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(suggestion_segments), Return(true))); EXPECT_TRUE(converter.Suggest(*composer_)); Mock::VerifyAndClearExpectations(&mock_converter); @@ -1954,7 +1954,7 @@ TEST_F(SessionConverterTest, PartialPrediction) { composer_->MoveCursorTo(0); // Prediction for "ここではきものを". - EXPECT_CALL(mock_converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(suggestion_segments), Return(true))); EXPECT_TRUE(converter.Suggest(*composer_)); Mock::VerifyAndClearExpectations(&mock_converter); @@ -1966,7 +1966,7 @@ TEST_F(SessionConverterTest, PartialPrediction) { composer_->MoveCursorTo(3); // Partial prediction for "ここで" - EXPECT_CALL(mock_converter, StartPartialPredictionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartPartialPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments1), Return(true))); EXPECT_TRUE(converter.Suggest(*composer_)); Mock::VerifyAndClearExpectations(&mock_converter); @@ -2021,7 +2021,7 @@ TEST_F(SessionConverterTest, SuggestAndPredict) { composer_->InsertCharacterPreedit(kChars_Mo); // Suggestion - EXPECT_CALL(mock_converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.Suggest(*composer_)); Mock::VerifyAndClearExpectations(&mock_converter); @@ -2055,7 +2055,7 @@ TEST_F(SessionConverterTest, SuggestAndPredict) { // Since Suggest() was called, the converter stores its results internally. In // this case, the prediction is not triggered. - EXPECT_CALL(mock_converter, StartPredictionForRequest(_, _)).Times(0); + EXPECT_CALL(mock_converter, StartPrediction(_, _)).Times(0); EXPECT_TRUE(converter.Predict(*composer_)); Mock::VerifyAndClearExpectations(&mock_converter); EXPECT_TRUE(IsCandidateListVisible(converter)); @@ -2109,7 +2109,7 @@ TEST_F(SessionConverterTest, SuggestAndPredict) { candidate->value = "モンドリアン"; candidate->content_key = "もんどりあん"; } - EXPECT_CALL(mock_converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(mondrian_segments), Return(true))); converter.CandidateNext(*composer_); Mock::VerifyAndClearExpectations(&mock_converter); @@ -2163,8 +2163,8 @@ TEST_F(SessionConverterTest, SuggestAndPredict) { } // After commit, the state should be reset. Thus, calling prediction before - // suggestion should trigger StartPredictionForRequest(). - EXPECT_CALL(mock_converter, StartPredictionForRequest(_, _)) + // suggestion should trigger StartPrediction(). + EXPECT_CALL(mock_converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(mondrian_segments), Return(true))); expected_indices.push_back(0); EXPECT_TRUE(converter.Predict(*composer_)); @@ -2218,8 +2218,8 @@ TEST_F(SessionConverterTest, SuggestFillIncognitoCandidateWords) { request_->set_fill_incognito_candidate_words(false); MockConverter mock_converter; SessionConverter converter(&mock_converter, request_.get(), config_.get()); - EXPECT_CALL(mock_converter, StartSuggestionForRequest( - IsIncognitoConversionRequest(false), _)) + EXPECT_CALL(mock_converter, + StartSuggestion(IsIncognitoConversionRequest(false), _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.Suggest(*composer_)); commands::Output output; @@ -2233,11 +2233,11 @@ TEST_F(SessionConverterTest, SuggestFillIncognitoCandidateWords) { request_->set_fill_incognito_candidate_words(true); MockConverter mock_converter; SessionConverter converter(&mock_converter, request_.get(), config_.get()); - EXPECT_CALL(mock_converter, StartSuggestionForRequest( - IsIncognitoConversionRequest(false), _)) + EXPECT_CALL(mock_converter, + StartSuggestion(IsIncognitoConversionRequest(false), _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); - EXPECT_CALL(mock_converter, StartSuggestionForRequest( - IsIncognitoConversionRequest(true), _)) + EXPECT_CALL(mock_converter, + StartSuggestion(IsIncognitoConversionRequest(true), _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.Suggest(*composer_)); commands::Output output; @@ -2272,7 +2272,7 @@ TEST_F(SessionConverterTest, OnePhaseSuggestion) { // Suggestion (internally prediction) // Use "prediction" mock as this suggestion uses prediction internally. - EXPECT_CALL(mock_converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.Suggest(*composer_)); Mock::VerifyAndClearExpectations(&mock_converter); @@ -2301,7 +2301,7 @@ TEST_F(SessionConverterTest, SuppressSuggestionWhenNotRequested) { composer_->InsertCharacterPreedit(kChars_Mo); // Suggestion - EXPECT_CALL(mock_converter, StartSuggestionForRequest(_, _)).Times(0); + EXPECT_CALL(mock_converter, StartSuggestion(_, _)).Times(0); // No candidates should be visible because we are on password field. ConversionPreferences conversion_preferences = @@ -2321,7 +2321,7 @@ TEST_F(SessionConverterTest, SuppressSuggestionOnPasswordField) { composer_->InsertCharacterPreedit(kChars_Mo); // Suggestion - EXPECT_CALL(mock_converter, StartSuggestionForRequest(_, _)).Times(0); + EXPECT_CALL(mock_converter, StartSuggestion(_, _)).Times(0); // No candidates should be visible because we are on password field. EXPECT_FALSE(converter.Suggest(*composer_)); @@ -2522,7 +2522,7 @@ TEST_F(SessionConverterTest, ReloadConfig) { SetAiueo(&segments); composer_->InsertCharacterPreedit("あいうえお"); FillT13Ns(&segments, composer_.get()); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); composer_->InsertCharacterPreedit("aiueo"); @@ -2575,7 +2575,7 @@ TEST_F(SessionConverterTest, OutputAllCandidateWords) { commands::Output output; - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.Convert(*composer_)); Mock::VerifyAndClearExpectations(&mock_converter); @@ -2672,7 +2672,7 @@ TEST_F(SessionConverterTest, GetPreeditAndGetConversion) { // PREDICTION MockConverter mock_converter; SessionConverter converter(&mock_converter, request_.get(), config_.get()); - EXPECT_CALL(mock_converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_CALL(mock_converter, FocusSegmentValue(_, 0, 1)) .WillOnce(Return(true)); @@ -2689,7 +2689,7 @@ TEST_F(SessionConverterTest, GetPreeditAndGetConversion) { // SUGGESTION MockConverter mock_converter; SessionConverter converter(&mock_converter, request_.get(), config_.get()); - EXPECT_CALL(mock_converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); converter.Suggest(*composer_); std::string preedit; @@ -2716,7 +2716,7 @@ TEST_F(SessionConverterTest, GetPreeditAndGetConversion) { // CONVERSION MockConverter mock_converter; SessionConverter converter(&mock_converter, request_.get(), config_.get()); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_CALL(mock_converter, FocusSegmentValue(_, 0, 1)) .WillOnce(Return(true)); @@ -2787,7 +2787,7 @@ TEST_F(SessionConverterTest, Clone) { Segments segments; SetKamaboko(&segments); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); src.set_use_cascading_window(false); @@ -2834,7 +2834,7 @@ TEST_F(SessionConverterTest, Issue1948334) { composer_->InsertCharacterPreedit(kChars_Mo); // Suggestion - EXPECT_CALL(mock_converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartSuggestion(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.Suggest(*composer_)); Mock::VerifyAndClearExpectations(&mock_converter); @@ -2852,7 +2852,7 @@ TEST_F(SessionConverterTest, Issue1948334) { composer_->InsertCharacterPreedit("もず"); // Suggestion - EXPECT_CALL(mock_converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartSuggestion(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.Suggest(*composer_)); Mock::VerifyAndClearExpectations(&mock_converter); @@ -2920,7 +2920,7 @@ TEST_F(SessionConverterTest, Issue1960362) { FillT13Ns(&segments, composer_.get()); FillT13Ns(&resized_segments, composer_.get()); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_CALL(mock_converter, ResizeSegment(_, _, _, _)) .WillRepeatedly(DoAll(SetArgPointee<0>(resized_segments), Return(true))); @@ -2958,7 +2958,7 @@ TEST_F(SessionConverterTest, Issue1978201) { } // Prediction - EXPECT_CALL(mock_converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartPrediction(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.Predict(*composer_)); EXPECT_TRUE(converter.IsActive()); @@ -3029,7 +3029,7 @@ TEST_F(SessionConverterTest, Issue2029557) { // Prediction (as ) Segments segments; SetAiueo(&segments); - EXPECT_CALL(mock_converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.Predict(*composer_)); EXPECT_TRUE(converter.IsActive()); @@ -3042,7 +3042,7 @@ TEST_F(SessionConverterTest, Issue2029557) { candidate->value = "a"; FillT13Ns(&segments, composer_.get()); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(converter.ConvertToTransliteration(*composer_, transliteration::HIRAGANA)); @@ -3064,7 +3064,7 @@ TEST_F(SessionConverterTest, Issue2031986) { candidate->value = "AAAA"; candidate = segment->add_candidate(); candidate->value = "Aaaa"; - EXPECT_CALL(mock_converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } // Get suggestion @@ -3076,7 +3076,7 @@ TEST_F(SessionConverterTest, Issue2031986) { Segments segments; Segment *segment = segments.add_segment(); segment->set_key("aaaaa"); - EXPECT_CALL(mock_converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(false))); } // Hide suggestion @@ -3100,7 +3100,7 @@ TEST_F(SessionConverterTest, Issue2040116) { Segments segments; Segment *segment = segments.add_segment(); segment->set_key("G"); - EXPECT_CALL(mock_converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(false))); } // Get prediction @@ -3116,7 +3116,7 @@ TEST_F(SessionConverterTest, Issue2040116) { Segment::Candidate *candidate; candidate = segment->add_candidate(); candidate->value = "GoogleSuggest"; - EXPECT_CALL(mock_converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } // Get prediction again @@ -3142,7 +3142,7 @@ TEST_F(SessionConverterTest, Issue2040116) { Segments segments; Segment *segment = segments.add_segment(); segment->set_key("G"); - EXPECT_CALL(mock_converter, StartPredictionForRequest(_, _)).Times(0); + EXPECT_CALL(mock_converter, StartPrediction(_, _)).Times(0); } // Hide prediction EXPECT_CALL(mock_converter, FocusSegmentValue(_, 0, 0)); @@ -3200,7 +3200,7 @@ TEST_F(SessionConverterTest, ZeroQuerySuggestion) { segment->set_key(""); segment->add_candidate()->value = "search"; segment->add_candidate()->value = "input"; - EXPECT_CALL(mock_converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(composer_->Empty()); @@ -3289,7 +3289,7 @@ TEST_F(SessionConverterTest, CommandCandidate) { FillT13Ns(&segments, composer_.get()); // set COMMAND_CANDIDATE. SetCommandCandidate(&segments, 0, 0, Segment::Candidate::DEFAULT_COMMAND); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); composer_->InsertCharacterPreedit(kChars_Aiueo); @@ -3314,7 +3314,7 @@ TEST_F(SessionConverterTest, CommandCandidateWithCommitCommands) { Segments segments; SetKamaboko(&segments); SetCommandCandidate(&segments, 0, 0, Segment::Candidate::DEFAULT_COMMAND); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); converter.Convert(*composer_); @@ -3337,7 +3337,7 @@ TEST_F(SessionConverterTest, CommandCandidateWithCommitCommands) { Segments segments; SetKamaboko(&segments); SetCommandCandidate(&segments, 1, 0, Segment::Candidate::DEFAULT_COMMAND); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); converter.Convert(*composer_); @@ -3359,7 +3359,7 @@ TEST_F(SessionConverterTest, CommandCandidateWithCommitCommands) { Segments segments; SetAiueo(&segments); SetCommandCandidate(&segments, 0, 0, Segment::Candidate::DEFAULT_COMMAND); - EXPECT_CALL(mock_converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); converter.Suggest(*composer_); @@ -3376,7 +3376,7 @@ TEST_F(SessionConverterTest, CommandCandidateWithCommitCommands) { Segments segments; SetAiueo(&segments); SetCommandCandidate(&segments, 0, 1, Segment::Candidate::DEFAULT_COMMAND); - EXPECT_CALL(mock_converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); converter.Suggest(*composer_); @@ -3398,7 +3398,7 @@ TEST_F(SessionConverterTest, ExecuteCommandCandidate) { SetAiueo(&segments); SetCommandCandidate(&segments, 0, 0, Segment::Candidate::ENABLE_INCOGNITO_MODE); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); composer_->InsertCharacterPreedit(kChars_Aiueo); @@ -3426,7 +3426,7 @@ TEST_F(SessionConverterTest, ExecuteCommandCandidate) { SetAiueo(&segments); SetCommandCandidate(&segments, 0, 0, Segment::Candidate::DISABLE_INCOGNITO_MODE); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); composer_->InsertCharacterPreedit(kChars_Aiueo); @@ -3454,7 +3454,7 @@ TEST_F(SessionConverterTest, ExecuteCommandCandidate) { SetAiueo(&segments); SetCommandCandidate(&segments, 0, 0, Segment::Candidate::ENABLE_PRESENTATION_MODE); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); composer_->InsertCharacterPreedit(kChars_Aiueo); @@ -3482,7 +3482,7 @@ TEST_F(SessionConverterTest, ExecuteCommandCandidate) { SetAiueo(&segments); SetCommandCandidate(&segments, 0, 0, Segment::Candidate::DISABLE_PRESENTATION_MODE); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); composer_->InsertCharacterPreedit(kChars_Aiueo); @@ -3510,7 +3510,7 @@ TEST_F(SessionConverterTest, PropagateConfigToRenderer) { SetAiueo(&segments); composer_->InsertCharacterPreedit("あいうえお"); FillT13Ns(&segments, composer_.get()); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); commands::Output output; @@ -3539,7 +3539,7 @@ TEST_F(SessionConverterTest, ConversionFail) { // segments doesn't have any candidates. Segments segments; segments.add_segment()->set_key(kChars_Aiueo); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(false))); composer_->InsertCharacterPreedit(kChars_Aiueo); @@ -3563,7 +3563,7 @@ TEST_F(SessionConverterTest, ConversionFail) { { Segments segments; SetAiueo(&segments); - EXPECT_CALL(mock_converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); composer_->InsertCharacterPreedit(kChars_Aiueo); @@ -3583,7 +3583,7 @@ TEST_F(SessionConverterTest, ConversionFail) { // segments doesn't have any candidates. segments.add_segment()->set_key(kChars_Aiueo); - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(false))); // Falls back to composition state. @@ -3814,7 +3814,7 @@ TEST_F(SessionConverterTest, ResultTokens) { candidate->lid = 200; candidate->rid = 201; } - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); composer_->InsertCharacterPreedit("きょうははれ"); @@ -3864,7 +3864,7 @@ TEST_F(SessionConverterTest, ResultTokensWithInnerSegements) { // 6, 6, 6, 6 = len("はれ"), len("晴れ"), len("はれ"), len("晴れ") candidate->PushBackInnerSegmentBoundary(6, 6, 6, 6); } - EXPECT_CALL(mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(mock_converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); composer_->InsertCharacterPreedit("きょうははれ"); diff --git a/src/session/session_test.cc b/src/session/session_test.cc index ed75fa448..ecc4a9fa8 100644 --- a/src/session/session_test.cc +++ b/src/session/session_test.cc @@ -488,7 +488,7 @@ class SessionTest : public testing::TestWithTempUserProfile { SetComposer(session, &request); SetAiueo(&segments); FillT13Ns(request, &segments); - EXPECT_CALL(*converter, StartConversionForRequest(_, _)) + EXPECT_CALL(*converter, StartConversion(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -584,7 +584,7 @@ class SessionTest : public testing::TestWithTempUserProfile { candidate = segment->add_candidate(); candidate->key = hiragana; candidate->value = kanji; - EXPECT_CALL(*converter, StartConversionForRequest(_, _)) + EXPECT_CALL(*converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } @@ -617,7 +617,7 @@ class SessionTest : public testing::TestWithTempUserProfile { segment = segments.add_segment(); segment->set_key("google"); segment->add_candidate()->value = "GOOGLE"; - EXPECT_CALL(*mock_converter, StartConversionForRequest(_, _)) + EXPECT_CALL(*mock_converter, StartConversion(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); } command.Clear(); @@ -631,7 +631,7 @@ class SessionTest : public testing::TestWithTempUserProfile { segment->set_key(""); AddCandidate("search", "search", segment); AddCandidate("input", "input", segment); - EXPECT_CALL(*mock_converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(*mock_converter, StartSuggestion(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); } @@ -643,7 +643,7 @@ class SessionTest : public testing::TestWithTempUserProfile { segment->set_key(""); AddCandidate("search", "search", segment); AddCandidate("input", "input", segment); - EXPECT_CALL(*mock_converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(*mock_converter, StartPrediction(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); } } @@ -673,7 +673,7 @@ class SessionTest : public testing::TestWithTempUserProfile { } { // Commit the composition to make an undo context. - EXPECT_CALL(*converter, StartConversionForRequest(_, _)) + EXPECT_CALL(*converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); session->Convert(&command); @@ -938,7 +938,7 @@ TEST_F(SessionTest, RevertComposition) { SetComposer(&session, &request); SetAiueo(&segments); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -994,7 +994,7 @@ TEST_F(SessionTest, SelectCandidate) { SetComposer(&session, &request); SetAiueo(&segments); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -1028,7 +1028,7 @@ TEST_F(SessionTest, HighlightCandidate) { SetComposer(&session, &request); SetAiueo(&segments); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -1064,7 +1064,7 @@ TEST_F(SessionTest, Conversion) { SetComposer(&session, &request); SetAiueo(&segments); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_SINGLE_SEGMENT_AND_KEY("あいうえお", "あいうえお", command); @@ -1099,7 +1099,7 @@ TEST_F(SessionTest, SegmentWidthShrink) { SetComposer(&session, &request); SetAiueo(&segments); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -1127,7 +1127,7 @@ TEST_F(SessionTest, ConvertPrev) { SetComposer(&session, &request); SetAiueo(&segments); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -1182,7 +1182,7 @@ TEST_F(SessionTest, ResetFocusedSegmentAfterCommit) { candidate->value = "なかのです"; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -1234,7 +1234,7 @@ TEST_F(SessionTest, ResetFocusedSegmentAfterCommit) { SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); // "あ[]" @@ -1270,7 +1270,7 @@ TEST_F(SessionTest, ResetFocusedSegmentAfterCancel) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); // "あい[]" @@ -1325,7 +1325,7 @@ TEST_F(SessionTest, ResetFocusedSegmentAfterCancel) { candidate->value = "相"; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -1372,7 +1372,7 @@ TEST_F(SessionTest, KeepFixedCandidateAfterSegmentWidthExpand) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -1451,7 +1451,7 @@ TEST_F(SessionTest, CommitSegment) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -1507,7 +1507,7 @@ TEST_F(SessionTest, CommitSegmentAt2ndSegment) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -1564,7 +1564,7 @@ TEST_F(SessionTest, Transliterations) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -1611,7 +1611,7 @@ TEST_F(SessionTest, ConvertToTransliteration) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -1647,7 +1647,7 @@ TEST_F(SessionTest, ConvertToTransliterationWithMultipleSegments) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); // Convert @@ -1699,7 +1699,7 @@ TEST_F(SessionTest, ConvertToHalfWidth) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -1736,7 +1736,7 @@ TEST_F(SessionTest, ConvertConsonantsToFullAlphanumeric) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -1782,7 +1782,7 @@ TEST_F(SessionTest, ConvertConsonantsToFullAlphanumericWithoutCascadingWindow) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -1824,7 +1824,7 @@ TEST_F(SessionTest, SwitchKanaType) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -1862,7 +1862,7 @@ TEST_F(SessionTest, SwitchKanaType) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -2014,7 +2014,7 @@ TEST_F(SessionTest, UpdatePreferences) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); SetSendKeyCommand("SPACE", &command); @@ -2095,7 +2095,7 @@ TEST_F(SessionTest, RomajiInput) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); session.ConvertToHiragana(&command); @@ -2150,7 +2150,7 @@ TEST_F(SessionTest, KanaInput) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -2184,7 +2184,7 @@ TEST_F(SessionTest, ExceededComposition) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -2216,7 +2216,7 @@ TEST_F(SessionTest, OutputAllCandidateWords) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -2298,7 +2298,7 @@ TEST_F(SessionTest, UndoForComposition) { { // Undo for CommitFirstSuggestion SetAiueo(&segments); - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); InsertCharacterChars("ai", &session, &command); ConversionRequest request; @@ -2389,7 +2389,7 @@ TEST_F(SessionTest, UndoForSingleSegment) { } { // Undo after commitment of composition - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); session.Convert(&command); @@ -2578,7 +2578,7 @@ TEST_F(SessionTest, UndoForMultipleSegments) { } { // Undo for CommitCandidate - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); session.Convert(&command); @@ -2638,7 +2638,7 @@ TEST_F(SessionTest, UndoForMultipleSegments) { segments.mutable_segment(0)->set_segment_type(Segment::FREE); segments.mutable_segment(1)->set_segment_type(Segment::FREE); segments.mutable_segment(2)->set_segment_type(Segment::FREE); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); session.Convert(&command); @@ -2741,7 +2741,7 @@ TEST_F(SessionTest, UndoForCommittedBracketPairIssue284235847) { } { // Commit 1st and 2nd segment - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); session.Convert(&command); @@ -2824,7 +2824,7 @@ TEST_F(SessionTest, MultipleUndo) { candidate->value = "cand3-2"; } - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); session.Convert(&command); @@ -2911,7 +2911,7 @@ TEST_F(SessionTest, UndoOrRewindUndo) { candidate->value = "AIUEO"; } { - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); session.Convert(&command); @@ -2963,7 +2963,7 @@ TEST_F(SessionTest, UndoOrRewindRewind) { candidate = segments.mutable_segment(0)->add_candidate(); candidate->value = "AIUEO"; - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); session.Convert(&command); @@ -2985,7 +2985,7 @@ TEST_F(SessionTest, UndoOrRewindRewind) { AddCandidate("e", "e", segment); AddCandidate("e", "E", segment); } - EXPECT_CALL(converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(converter, StartPrediction(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); commands::Command command; @@ -3017,7 +3017,7 @@ TEST_F(SessionTest, StopKeyToggling) { segment = segments.add_segment(); AddCandidate("dummy", "Dummy", segment); } - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); commands::Command command; @@ -3075,7 +3075,7 @@ TEST_F(SessionTest, CommitRawText) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); session.Convert(&command); @@ -3204,7 +3204,7 @@ TEST_F(SessionTest, ConvertNextPagePrevPage) { absl::StrFormat("page%d-cand%d", page_index, cand_index); } } - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } @@ -3264,7 +3264,7 @@ TEST_F(SessionTest, NeedlessClearUndoContext) { SetAiueo(&segments); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); session.Convert(&command); @@ -3352,7 +3352,7 @@ TEST_F(SessionTest, ClearUndoContextAfterDirectInputAfterConversion) { FillT13Ns(request, &segments); // Convert - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); session.Convert(&command); @@ -3508,7 +3508,7 @@ TEST_F(SessionTest, ConvertToFullOrHalfAlphanumericAfterUndo) { ASSERT_TRUE(command.output().has_preedit()); EXPECT_EQ(GetComposition(command), "あいうえお"); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); session.ConvertToHalfASCII(&command); @@ -3529,7 +3529,7 @@ TEST_F(SessionTest, ConvertToFullOrHalfAlphanumericAfterUndo) { ASSERT_TRUE(command.output().has_preedit()); EXPECT_EQ(GetComposition(command), "あいうえお"); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); session.ConvertToFullASCII(&command); @@ -3670,7 +3670,7 @@ TEST_F(SessionTest, Issue1805239) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); SendSpecialKey(commands::KeyEvent::SPACE, &session, &command); @@ -3725,7 +3725,7 @@ TEST_F(SessionTest, Issue1816861) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); SendSpecialKey(commands::KeyEvent::SPACE, &session, &command); @@ -3752,7 +3752,7 @@ TEST_F(SessionTest, Issue1816861) { candidate = segment->add_candidate(); candidate->value = "陰謀説"; - EXPECT_CALL(converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); SendSpecialKey(commands::KeyEvent::TAB, &session, &command); @@ -3789,7 +3789,7 @@ TEST_F(SessionTest, T13NWithResegmentation) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } { @@ -3866,7 +3866,7 @@ TEST_F(SessionTest, Shortcut) { ConversionRequest request(&context.composer(), &context.GetRequest(), &context.GetConfig()); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); commands::Command command; @@ -3902,7 +3902,7 @@ TEST_F(SessionTest, ShortcutWithCapsLockIssue5655743) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); commands::Command command; @@ -3947,7 +3947,7 @@ TEST_F(SessionTest, ShortcutFromVK) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); commands::Command command; @@ -4180,7 +4180,7 @@ TEST_F(SessionTest, ExitTemporaryAlphanumModeAfterCommittingSugesstion) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(session.Convert(&command)); @@ -4214,7 +4214,7 @@ TEST_F(SessionTest, ExitTemporaryAlphanumModeAfterCommittingSugesstion) { Segment *segment = segments.add_segment(); segment->set_key("NFL"); segment->add_candidate()->value = "NFL"; - EXPECT_CALL(converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(session.PredictAndConvert(&command)); @@ -4252,7 +4252,7 @@ TEST_F(SessionTest, ExitTemporaryAlphanumModeAfterCommittingSugesstion) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(session.ConvertToHalfASCII(&command)); @@ -4412,7 +4412,7 @@ TEST_F(SessionTest, Suggest) { commands::Command command; SendKey("M", &session, &command); - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments_mo), Return(true))); SendKey("O", &session, &command); ASSERT_TRUE(command.output().has_candidates()); @@ -4420,7 +4420,7 @@ TEST_F(SessionTest, Suggest) { EXPECT_EQ(command.output().candidates().candidate(0).value(), "MOCHA"); // moz| - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments_moz), Return(true))); SendKey("Z", &session, &command); ASSERT_TRUE(command.output().has_candidates()); @@ -4428,7 +4428,7 @@ TEST_F(SessionTest, Suggest) { EXPECT_EQ(command.output().candidates().candidate(0).value(), "MOZUKU"); // mo| - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments_mo), Return(true))); SendKey("Backspace", &session, &command); ASSERT_TRUE(command.output().has_candidates()); @@ -4436,7 +4436,7 @@ TEST_F(SessionTest, Suggest) { EXPECT_EQ(command.output().candidates().candidate(0).value(), "MOCHA"); // m|o - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments_mo), Return(true))); command.Clear(); EXPECT_TRUE(session.MoveCursorLeft(&command)); @@ -4445,7 +4445,7 @@ TEST_F(SessionTest, Suggest) { EXPECT_EQ(command.output().candidates().candidate(0).value(), "MOCHA"); // mo| - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments_mo), Return(true))); command.Clear(); EXPECT_TRUE(session.MoveCursorToEnd(&command)); @@ -4454,7 +4454,7 @@ TEST_F(SessionTest, Suggest) { EXPECT_EQ(command.output().candidates().candidate(0).value(), "MOCHA"); // |mo - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments_mo), Return(true))); command.Clear(); EXPECT_TRUE(session.MoveCursorToBeginning(&command)); @@ -4463,7 +4463,7 @@ TEST_F(SessionTest, Suggest) { EXPECT_EQ(command.output().candidates().candidate(0).value(), "MOCHA"); // m|o - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments_mo), Return(true))); command.Clear(); EXPECT_TRUE(session.MoveCursorRight(&command)); @@ -4472,7 +4472,7 @@ TEST_F(SessionTest, Suggest) { EXPECT_EQ(command.output().candidates().candidate(0).value(), "MOCHA"); // m| - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments_m), Return(true))); command.Clear(); EXPECT_TRUE(session.Delete(&command)); @@ -4491,12 +4491,12 @@ TEST_F(SessionTest, Suggest) { ConversionRequest request_m_conv; SetComposer(&session, &request_m_conv); FillT13Ns(request_m_conv, &segments_m_conv); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments_m_conv), Return(true))); command.Clear(); EXPECT_TRUE(session.Convert(&command)); - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments_m), Return(true))); command.Clear(); EXPECT_TRUE(session.ConvertCancel(&command)); @@ -4529,7 +4529,7 @@ TEST_F(SessionTest, CommitCandidateTypingCorrection) { InitSessionToPrecomposition(&session, request); commands::Command command; - EXPECT_CALL(converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(converter, StartPrediction(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments_jueri), Return(true))); InsertCharacterChars("jueri", &session, &command); @@ -4547,7 +4547,7 @@ TEST_F(SessionTest, CommitCandidateTypingCorrection) { .WillOnce(SetArgPointee<1>(empty_segments)); SetSendCommandCommand(commands::SessionCommand::SUBMIT_CANDIDATE, &command); command.mutable_input()->mutable_command()->set_id(0); - EXPECT_CALL(converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments_jueri), Return(true))); session.SendCommand(&command); EXPECT_TRUE(command.output().consumed()); @@ -4613,7 +4613,7 @@ TEST_F(SessionTest, MobilePartialPrediction) { InitSessionToPrecomposition(&session, request); commands::Command command; - EXPECT_CALL(converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(converter, StartPrediction(_, _)) .WillRepeatedly( DoAll(SetArgPointee<1>(segments_watashino), Return(true))); InsertCharacterChars("watashino", &session, &command); @@ -4622,7 +4622,7 @@ TEST_F(SessionTest, MobilePartialPrediction) { EXPECT_EQ(command.output().candidates().candidate(0).value(), "私の"); // partial suggestion for "わた|しの" - EXPECT_CALL(converter, StartPartialPredictionForRequest(_, _)) + EXPECT_CALL(converter, StartPartialPrediction(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments_wata), Return(true))); command.Clear(); EXPECT_TRUE(session.MoveCursorLeft(&command)); @@ -4638,7 +4638,7 @@ TEST_F(SessionTest, MobilePartialPrediction) { .WillOnce(DoAll(SetArgPointee<0>(segments_wata), Return(true))); SetSendCommandCommand(commands::SessionCommand::SUBMIT_CANDIDATE, &command); command.mutable_input()->mutable_command()->set_id(0); - EXPECT_CALL(converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments_shino), Return(true))); session.SendCommand(&command); EXPECT_TRUE(command.output().consumed()); @@ -4739,7 +4739,7 @@ TEST_F(SessionTest, ToggleAlphanumericMode) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -4871,7 +4871,7 @@ TEST_F(SessionTest, InsertSpaceHalfWidth) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -4916,7 +4916,7 @@ TEST_F(SessionTest, InsertSpaceFullWidth) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -5761,7 +5761,7 @@ TEST_F(SessionTest, Issue1951385) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(false))); command.Clear(); @@ -5800,7 +5800,7 @@ TEST_F(SessionTest, Issue1978201) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(session.Convert(&command)); @@ -5822,7 +5822,7 @@ TEST_F(SessionTest, Issue1975771) { // Trigger suggest by pressing "a". Segments segments; SetAiueo(&segments); - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); commands::Command command; @@ -5864,7 +5864,7 @@ TEST_F(SessionTest, Issue2029466) { // Segments segments; SetAiueo(&segments); - EXPECT_CALL(converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); EXPECT_TRUE(session.PredictAndConvert(&command)); @@ -5906,7 +5906,7 @@ TEST_F(SessionTest, Issue2034943) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } // Get conversion @@ -5940,7 +5940,7 @@ TEST_F(SessionTest, Issue2026354) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -5969,7 +5969,7 @@ TEST_F(SessionTest, Issue2066906) { candidate->value = "abc"; candidate = segment->add_candidate(); candidate->value = "abcdef"; - EXPECT_CALL(converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); // Prediction with "a" @@ -5982,7 +5982,7 @@ TEST_F(SessionTest, Issue2066906) { EXPECT_TRUE(session.Commit(&command)); EXPECT_RESULT("abc", command); - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); InsertCharacterChars("a", &session, &command); EXPECT_FALSE(command.output().has_result()); @@ -6235,7 +6235,7 @@ TEST_F(SessionTest, Issue2223755) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } @@ -6386,7 +6386,7 @@ TEST_F(SessionTest, Issue2379374) { request.set_config(&config); SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } @@ -6799,7 +6799,7 @@ TEST_F(SessionTest, InputModeOutputHasCandidates) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); commands::Command command; @@ -6883,7 +6883,7 @@ TEST_F(SessionTest, PerformedCommand) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); commands::Command command; // SPACE @@ -6915,7 +6915,7 @@ TEST_F(SessionTest, ResetContext) { Segments segments; segments.add_segment()->add_candidate(); // Stub candidate. - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); EXPECT_TRUE(SendKey("A", &session, &command)); command.Clear(); @@ -6956,7 +6956,7 @@ TEST_F(SessionTest, ClearUndoOnResetContext) { } { - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); session.Convert(&command); @@ -7033,15 +7033,14 @@ TEST_F(SessionTest, Issue3428520) { Segments segments; SetAiueo(&segments); - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); InsertCharacterChars("aiueo", &session, &command); ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) - .WillOnce(Return(true)); + EXPECT_CALL(converter, StartConversion(_, _)).WillOnce(Return(true)); command.Clear(); session.Convert(&command); EXPECT_FALSE(command.output().has_result()); @@ -7103,7 +7102,7 @@ TEST_F(SessionTest, AutoConversion) { SetAiueo(&segments); ConversionRequest default_request; FillT13Ns(default_request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); // Auto Off @@ -7349,7 +7348,7 @@ TEST_F(SessionTest, AlphanumericOfSSH) { ConversionRequest request; SetComposer(&session, &request); FillT13Ns(request, &segments); - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); @@ -7635,7 +7634,7 @@ TEST_F(SessionTest, CommitCandidateAt2ndOf3Segments) { candidate = segment->add_candidate(); candidate->value = "抜いた"; - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } @@ -7703,7 +7702,7 @@ TEST_F(SessionTest, CommitCandidateAt3rdOf3Segments) { candidate = segment->add_candidate(); candidate->value = "抜いた"; - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } @@ -7743,7 +7742,7 @@ TEST_F(SessionTest, CommitCandidateSuggestion) { commands::Command command; SendKey("M", &session, &command); command.Clear(); - EXPECT_CALL(converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(converter, StartPrediction(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments_mo), Return(true))); SendKey("O", &session, &command); ASSERT_TRUE(command.output().has_candidates()); @@ -7810,7 +7809,7 @@ TEST_F(SessionTest, CommitCandidateT13N) { EXPECT_EQ(segment->candidate(-2).value, "TOK"); EXPECT_EQ(segment->candidate(-3).value, "Tok"); - EXPECT_CALL(converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(converter, StartPrediction(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments), Return(true))); commands::Command command; @@ -8146,7 +8145,7 @@ TEST_F(SessionTest, NotZeroQuerySuggest) { segment->add_candidate()->value = "input"; // Commit composition and zero query suggest should not be invoked. - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)).Times(0); + EXPECT_CALL(converter, StartSuggestion(_, _)).Times(0); command.Clear(); session.Commit(&command); EXPECT_EQ(command.output().result().value(), "google"); @@ -8235,7 +8234,7 @@ TEST_F(SessionTest, ZeroQuerySuggest) { segment = segments.add_segment(); segment->set_key(""); segment->add_candidate()->value = "google"; - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } @@ -8250,7 +8249,7 @@ TEST_F(SessionTest, ZeroQuerySuggest) { segment->set_key(""); segment->add_candidate()->value = "search"; segment->add_candidate()->value = "input"; - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); } @@ -8669,7 +8668,7 @@ TEST_F(SessionTest, UndoKeyAction) { candidate = segments.mutable_segment(0)->add_candidate(); candidate->value = "AIUEO"; - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); command.Clear(); session.Convert(&command); @@ -9209,7 +9208,7 @@ TEST_F(SessionTest, EditCancel) { commands::Command command; SendKey("M", &session, &command); - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments_mo), Return(true))); SendKey("O", &session, &command); ASSERT_TRUE(command.output().has_candidates()); @@ -9233,7 +9232,7 @@ TEST_F(SessionTest, EditCancel) { EXPECT_TRUE(session.SendCommand(&command)); command.Clear(); - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments_mo), Return(true))); session.ConvertCancel(&command); ASSERT_TRUE(command.output().has_candidates()); @@ -9339,7 +9338,7 @@ TEST_F(SessionTest, EditCancelAndIMEOff) { commands::Command command; SendKey("M", &session, &command); - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments_mo), Return(true))); SendKey("O", &session, &command); ASSERT_TRUE(command.output().has_candidates()); @@ -9394,7 +9393,7 @@ TEST_F(SessionTest, EditCancelAndIMEOff) { EXPECT_TRUE(session.SendCommand(&command)); command.Clear(); - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillRepeatedly(DoAll(SetArgPointee<1>(segments_mo), Return(true))); session.ConvertCancel(&command); ASSERT_TRUE(command.output().has_candidates()); @@ -9696,7 +9695,7 @@ TEST_F(SessionTest, DoNothingOnCompositionKeepingSuggestWindow) { segment->add_candidate()->value = "MOCHA"; segment->add_candidate()->value = "MOZUKU"; } - EXPECT_CALL(converter, StartSuggestionForRequest(_, _)) + EXPECT_CALL(converter, StartSuggestion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments_mo), Return(true))); commands::Command command; @@ -9726,7 +9725,7 @@ TEST_F(SessionTest, ModeChangeOfConvertAtPunctuations) { segment->set_key("あ"); segment->add_candidate()->value = "あ"; } - EXPECT_CALL(converter, StartConversionForRequest(_, _)) + EXPECT_CALL(converter, StartConversion(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments_a_conv), Return(true))); commands::Command command; @@ -9786,7 +9785,7 @@ TEST_F(SessionTest, DeleteHistory) { segment->add_candidate()->value = "DeleteHistory"; ConversionRequest request; SetComposer(&session, &request); - EXPECT_CALL(converter, StartPredictionForRequest(_, _)) + EXPECT_CALL(converter, StartPrediction(_, _)) .WillOnce(DoAll(SetArgPointee<1>(segments), Return(true))); // Type "del". Preedit = "でｌ".