IME for Mus: Make InputMethodMus use the IME Mojo API.

ui/views/mus/input_method_mus_unittest.cc

Index: ui/views/mus/input_method_mus_unittest.cc
diff --git a/ui/views/mus/input_method_mus_unittest.cc b/ui/views/mus/input_method_mus_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..039d1d13e6ec69bbcff96ce1b1f2797297a28192
--- /dev/null
+++ b/ui/views/mus/input_method_mus_unittest.cc
@@ -0,0 +1,98 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ui/views/mus/input_method_mus.h"
+
+#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/ime/dummy_text_input_client.h"
+#include "ui/base/ime/input_method_delegate.h"
+#include "ui/events/event.h"
+#include "ui/views/mus/window_manager_connection.h"
+#include "ui/views/test/scoped_views_test_helper.h"
+
+namespace views {
+namespace {
+
+class TestInputMethodDelegate : public ui::internal::InputMethodDelegate {
+ public:
+  TestInputMethodDelegate() {}
+  ~TestInputMethodDelegate() override {}
+
+  // ui::internal::InputMethodDelegate:
+  ui::EventDispatchDetails DispatchKeyEventPostIME(
+      ui::KeyEvent* key_event) override {
+    return ui::EventDispatchDetails();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TestInputMethodDelegate);
+};
+
+class TestTextInputClient : public ui::DummyTextInputClient {
+ public:
+  TestTextInputClient() {}
+  ~TestTextInputClient() override {}
+
+  ui::KeyEvent* ReceieveKeyEvent() {

[sadrul, 2016/08/16 20:01:51]

WaitUntilInputReceived()?

[Hadi, 2016/08/16 20:18:25]

Done.

+    run_loop_.reset(new base::RunLoop);
+    run_loop_->Run();
+    run_loop_.reset();
+
+    return received_event_->AsKeyEvent();
+  }
+
+  // ui::DummyTextInputClient:
+  void InsertChar(const ui::KeyEvent& event) override {
+    received_event_ = ui::Event::Clone(event);
+    run_loop_->Quit();
+  }
+
+ private:
+  std::unique_ptr<base::RunLoop> run_loop_;
+  std::unique_ptr<ui::Event> received_event_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestTextInputClient);
+};
+
+}  // namespace
+
+class InputMethodMusTest : public testing::Test {
+ public:
+  InputMethodMusTest() : message_loop_(base::MessageLoop::TYPE_UI) {}
+  ~InputMethodMusTest() override {}
+
+  shell::Connector* connector() {
+    return WindowManagerConnection::Get()->connector();
+  }
+
+ private:
+  base::MessageLoop message_loop_;
+  ScopedViewsTestHelper helper_;
+
+  DISALLOW_COPY_AND_ASSIGN(InputMethodMusTest);
+};
+
+TEST_F(InputMethodMusTest, DispatchKeyEvent) {
+  // test_ime_driver will register itself as the current IMEDriver. It echoes
+  // back the key events it receives.
+  ASSERT_TRUE(connector()->Connect("mojo:test_ime_driver"));
+
+  TestInputMethodDelegate input_method_delegate;
+  InputMethodMus input_method(&input_method_delegate, nullptr);
+  input_method.Init(connector());
+
+  TestTextInputClient text_input_client;
+  input_method.SetFocusedTextInputClient(&text_input_client);
+
+  ui::KeyEvent key_event('A', ui::VKEY_A, 0);
+  input_method.DispatchKeyEvent(&key_event);
+
+  ui::KeyEvent* received_event = text_input_client.ReceieveKeyEvent();
+  ASSERT_EQ(ui::ET_KEY_PRESSED, received_event->type());

[sadrul, 2016/08/16 20:01:51]

EXPECT_EQ

[Hadi, 2016/08/16 20:18:25]

Done.

+  ASSERT_EQ(key_event.GetCharacter(), received_event->GetCharacter());

[sadrul, 2016/08/16 20:01:51]

ditto

Also check EXPECT_TRUE(received_event->is_char())

[Hadi, 2016/08/16 20:18:25]

Done.

+}
+
+}  // namespace views