Merge branch 'google:master' into uim

shitamo · Nov 25, 2024 · 42fbf1b · 42fbf1b
2 parents 98b4376 + 51945d7
commit 42fbf1b
Show file tree

Hide file tree

Showing 40 changed files with 902 additions and 986 deletions.
diff --git a/src/composer/composer_test.cc b/src/composer/composer_test.cc
@@ -3223,5 +3223,20 @@ TEST_F(ComposerTest, CreateComposerOperators) {
   EXPECT_EQ(copied.source_text(), moved.source_text());
 }
 
+TEST_F(ComposerTest, CreateEmptyComposerData) {
+  const ComposerData data = Composer::CreateEmptyComposerData();
+  EXPECT_EQ(data.GetInputMode(), transliteration::HIRAGANA);
+  EXPECT_EQ(data.GetStringForPreedit(), "");
+  EXPECT_EQ(data.GetQueryForConversion(), "");
+  EXPECT_EQ(data.GetQueryForPrediction(), "");
+  EXPECT_EQ(data.GetStringForTypeCorrection(), "");
+  EXPECT_EQ(data.GetLength(), 0);
+  EXPECT_EQ(data.GetCursor(), 0);
+  EXPECT_EQ(data.GetRawString(), "");
+  EXPECT_EQ(data.GetRawSubString(0, 2), "");
+  EXPECT_EQ(data.GetRawSubString(1, 1), "");
+  EXPECT_EQ(data.source_text(), "");
+}
+
 }  // namespace composer
 }  // namespace mozc
diff --git a/src/converter/BUILD.bazel b/src/converter/BUILD.bazel
@@ -512,15 +512,14 @@ mozc_cc_test(
         ":converter_interface",
         ":segments",
         "//composer",
-        "//composer:table",
-        "//config:config_handler",
         "//engine:engine_factory",
         "//engine:engine_interface",
         "//protocol:commands_cc_proto",
         "//request:conversion_request",
         "//testing:gunit_main",
         "//testing:mozctest",
         "@com_google_absl//absl/log:check",
+        "@com_google_absl//absl/strings:string_view",
     ],
 )