Skip to content

Commit

Permalink
Remove set_composer_key_selection and set_skip_slow_rewriters from Co…
Browse files Browse the repository at this point in the history 
…nversionRequest.

* Other setters will be removed in the following CLs.
* ConversionRequest::Options is the alternative of the setters.

PiperOrigin-RevId: 699111673
  • Loading branch information
@hiroyuki-komatsu
hiroyuki-komatsu committed Nov 24, 2024
1 parent 9e72a5a commit 7b2e7cf
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 27 deletions.
66 changes: 45 additions & 21 deletions src/converter/converter_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -884,9 +884,13 @@ TEST_F(ConverterTest, CompletePosIds) {
Segment *seg = segments.add_segment();
seg->set_key(kTestKeys[i]);
seg->set_segment_type(Segment::FREE);
ConversionRequest request;
request.set_request_type(ConversionRequest::PREDICTION);
request.set_max_conversion_candidates_size(20);
const ConversionRequest request =
ConversionRequestBuilder()
.SetOptions({
.request_type = ConversionRequest::PREDICTION,
.max_conversion_candidates_size = 20,
})
.Build();
CHECK(converter_and_data->immutable_converter->ConvertForRequest(
request, &segments));
const int lid = segments.segment(0).candidate(0).lid;
Expand Down Expand Up @@ -990,8 +994,10 @@ TEST_F(ConverterTest, StartSuggestion) {
composer.InsertCharacter("shi");

commands::Context context;
ConversionRequest request(composer, client_request, context, config);
request.set_request_type(ConversionRequest::SUGGESTION);
ConversionRequest::Options options = {.request_type =
ConversionRequest::SUGGESTION};
const ConversionRequest request(composer, client_request, context, config,
std::move(options));

Segments segments;
EXPECT_TRUE(converter->StartSuggestion(request, &segments));
Expand All @@ -1009,8 +1015,10 @@ TEST_F(ConverterTest, StartSuggestion) {
composer.InsertCharacter("si");

commands::Context context;
ConversionRequest request(composer, client_request, context, config);
request.set_request_type(ConversionRequest::SUGGESTION);
ConversionRequest::Options options = {.request_type =
ConversionRequest::SUGGESTION};
const ConversionRequest request(composer, client_request, context, config,
std::move(options));

Segments segments;
EXPECT_TRUE(converter->StartSuggestion(request, &segments));
Expand Down Expand Up @@ -1145,10 +1153,14 @@ TEST_F(ConverterTest, PredictSetKey) {
orig_candidates_size = seg->candidates_size();
}

ConversionRequest request;
request.set_request_type(ConversionRequest::PREDICTION);
request.set_should_call_set_key_in_prediction(
test_data.should_call_set_key_in_prediction);
const ConversionRequest request =
ConversionRequestBuilder()
.SetOptions({
.request_type = ConversionRequest::PREDICTION,
.should_call_set_key_in_prediction =
test_data.should_call_set_key_in_prediction,
})
.Build();

ASSERT_TRUE(converter->Predict(request, kPredictionKey, &segments));

Expand Down Expand Up @@ -1243,9 +1255,12 @@ TEST_F(ConverterTest, ComposerKeySelection) {
composer::Composer composer(&table, &default_request(), &config);
composer.InsertCharacterPreedit("わたしh");

ConversionRequest request =
ConversionRequestBuilder().SetComposer(composer).Build();
request.set_composer_key_selection(ConversionRequest::CONVERSION_KEY);
const ConversionRequest request =
ConversionRequestBuilder()
.SetComposer(composer)
.SetOptions(
{.composer_key_selection = ConversionRequest::CONVERSION_KEY})
.Build();
ASSERT_TRUE(converter->StartConversion(request, &segments));
EXPECT_EQ(segments.conversion_segments_size(), 2);
EXPECT_EQ(segments.conversion_segment(0).candidate(0).value, "私");
Expand All @@ -1256,9 +1271,12 @@ TEST_F(ConverterTest, ComposerKeySelection) {
composer::Composer composer(&table, &default_request(), &config);
composer.InsertCharacterPreedit("わたしh");

ConversionRequest request =
ConversionRequestBuilder().SetComposer(composer).Build();
request.set_composer_key_selection(ConversionRequest::PREDICTION_KEY);
const ConversionRequest request =
ConversionRequestBuilder()
.SetComposer(composer)
.SetOptions(
{.composer_key_selection = ConversionRequest::PREDICTION_KEY})
.Build();
ASSERT_TRUE(converter->StartConversion(request, &segments));
EXPECT_EQ(segments.conversion_segments_size(), 1);
EXPECT_EQ(segments.conversion_segment(0).candidate(0).value, "私");
Expand Down Expand Up @@ -1642,8 +1660,11 @@ TEST_F(ConverterTest, UserEntryInMobilePrediction) {
{
composer.SetPreeditTextForTestOnly("てすとが");
commands::Context context;
ConversionRequest conversion_request(composer, request, context, config);
conversion_request.set_request_type(ConversionRequest::PREDICTION);
ConversionRequest::Options options = {
.request_type = ConversionRequest::PREDICTION,
};
const ConversionRequest conversion_request(composer, request, context,
config, std::move(options));
Segments segments;
EXPECT_TRUE(converter->StartPrediction(conversion_request, &segments));
ASSERT_EQ(segments.segments_size(), 1);
Expand Down Expand Up @@ -1841,8 +1862,11 @@ TEST_F(ConverterTest, RewriterShouldRespectDefaultCandidates) {
composer.SetPreeditTextForTestOnly("あい");
commands::Context context;

ConversionRequest conversion_request(composer, request, context, config);
conversion_request.set_request_type(ConversionRequest::PREDICTION);
ConversionRequest::Options options = {
.request_type = ConversionRequest::PREDICTION,
};
const ConversionRequest conversion_request(composer, request, context, config,
std::move(options));
Segments segments;

// Remember user history 3 times after getting the top candidate
Expand Down
6 changes: 0 additions & 6 deletions src/request/conversion_request.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,6 @@ class ConversionRequest {
ComposerKeySelection composer_key_selection() const {
return options_.composer_key_selection;
}
void set_composer_key_selection(ComposerKeySelection selection) {
options_.composer_key_selection = selection;
}

const commands::Request &request() const { return request_; }
const commands::Context &context() const { return context_; }
Expand All @@ -204,9 +201,6 @@ class ConversionRequest {
// TODO(noriyukit): Remove these methods after removing skip_slow_rewriters_
// flag.
bool skip_slow_rewriters() const { return options_.skip_slow_rewriters; }
void set_skip_slow_rewriters(bool value) {
options_.skip_slow_rewriters = value;
}

bool IsKanaModifierInsensitiveConversion() const {
return request_.kana_modifier_insensitive_conversion() &&
Expand Down

0 comments on commit 7b2e7cf

Please sign in to comment.