Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1003)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/input_method/browser_state_monitor_unittest.cc

Issue 11466010: Decompose BrowserStateMonitor into two parts, simplifying unit tests and APIs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix gypi ordering. Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/input_method/browser_state_monitor.cc ('k') | chrome/browser/chromeos/input_method/input_method_configuration.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/input_method/browser_state_monitor_unittest.cc
diff --git a/chrome/browser/chromeos/input_method/browser_state_monitor_unittest.cc b/chrome/browser/chromeos/input_method/browser_state_monitor_unittest.cc
index 746009c5073465b62022e45352f7010acc9b2bc4..0a057ec77a30739b5d2f0c2f14aff48664f0e9d3 100644
--- a/chrome/browser/chromeos/input_method/browser_state_monitor_unittest.cc
+++ b/chrome/browser/chromeos/input_method/browser_state_monitor_unittest.cc
@@ -7,9 +7,7 @@
#include <string>
#include "base/basictypes.h"
-#include "base/prefs/public/pref_member.h"
-#include "chrome/browser/chromeos/input_method/mock_input_method_delegate.h"
-#include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
+#include "base/bind.h"
#include "chrome/common/chrome_notification_types.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_service.h"
@@ -19,38 +17,46 @@ namespace chromeos {
namespace input_method {
namespace {
-class TestableBrowserStateMonitor : public BrowserStateMonitor {
+class MockObserver {
public:
- using BrowserStateMonitor::InputMethodChanged;
- using BrowserStateMonitor::Observe;
+ MockObserver()
+ : state_(InputMethodManager::STATE_TERMINATING),
+ update_state_count_(0) { }
- TestableBrowserStateMonitor(InputMethodManager* manager,
- InputMethodDelegate* delegate)
- : BrowserStateMonitor(manager, delegate) {
+ void SetState(InputMethodManager::State new_state) {
+ ++update_state_count_;
+ state_ = new_state;
}
+
+ base::Callback<void(InputMethodManager::State new_state)> AsCallback() {
+ return base::Bind(&MockObserver::SetState, base::Unretained(this));
+ }
+
+ int update_state_count() const {
+ return update_state_count_;
+ }
+
+ InputMethodManager::State state() const {
+ return state_;
+ }
+
+ private:
+ InputMethodManager::State state_;
+ int update_state_count_;
+
+ DISALLOW_COPY_AND_ASSIGN(MockObserver);
};
} // anonymous namespace
TEST(BrowserStateMonitorLifetimeTest, TestConstruction) {
- MockInputMethodManager mock_manager;
- MockInputMethodDelegate mock_delegate;
- TestableBrowserStateMonitor monitor(&mock_manager, &mock_delegate);
-
- // Check the initial state of the |mock_manager| and |monitor| objects.
- EXPECT_EQ(1, mock_manager.add_observer_count_);
- EXPECT_EQ(1, mock_manager.set_state_count_);
- EXPECT_EQ(InputMethodManager::STATE_LOGIN_SCREEN, mock_manager.last_state_);
- EXPECT_EQ(InputMethodManager::STATE_LOGIN_SCREEN, monitor.state());
-}
+ MockObserver mock_observer;
+ BrowserStateMonitor monitor(mock_observer.AsCallback());
-TEST(BrowserStateMonitorLifetimeTest, TestDestruction) {
- MockInputMethodManager mock_manager;
- MockInputMethodDelegate mock_delegate;
- {
- TestableBrowserStateMonitor monitor(&mock_manager, &mock_delegate);
- }
- EXPECT_EQ(1, mock_manager.remove_observer_count_);
+ // Check the initial state of the |mock_observer| and |monitor| objects.
+ EXPECT_EQ(1, mock_observer.update_state_count());
+ EXPECT_EQ(InputMethodManager::STATE_LOGIN_SCREEN, mock_observer.state());
+ EXPECT_EQ(InputMethodManager::STATE_LOGIN_SCREEN, monitor.state());
}
namespace {
@@ -58,13 +64,12 @@ namespace {
class BrowserStateMonitorTest : public testing::Test {
public:
BrowserStateMonitorTest()
- : monitor_(&mock_manager_, &mock_delegate_) {
+ : monitor_(mock_observer_.AsCallback()) {
}
protected:
- MockInputMethodManager mock_manager_;
- MockInputMethodDelegate mock_delegate_;
- TestableBrowserStateMonitor monitor_;
+ MockObserver mock_observer_;
+ BrowserStateMonitor monitor_;
private:
DISALLOW_COPY_AND_ASSIGN(BrowserStateMonitorTest);
@@ -73,44 +78,44 @@ class BrowserStateMonitorTest : public testing::Test {
} // anonymous namespace
TEST_F(BrowserStateMonitorTest, TestObserveLoginUserChanged) {
- EXPECT_EQ(1, mock_manager_.set_state_count_);
+ EXPECT_EQ(1, mock_observer_.update_state_count());
monitor_.Observe(chrome::NOTIFICATION_LOGIN_USER_CHANGED,
content::NotificationService::AllSources(),
content::NotificationService::NoDetails());
- // Check if the state of the |mock_manager_| as well as the |monitor| are both
- // changed.
- EXPECT_EQ(2, mock_manager_.set_state_count_);
+ // Check if the state of the |mock_observer_| as well as the |monitor| are
+ // both changed.
+ EXPECT_EQ(2, mock_observer_.update_state_count());
EXPECT_EQ(InputMethodManager::STATE_BROWSER_SCREEN,
- mock_manager_.last_state_);
+ mock_observer_.state());
EXPECT_EQ(InputMethodManager::STATE_BROWSER_SCREEN, monitor_.state());
}
TEST_F(BrowserStateMonitorTest, TestObserveSessionStarted) {
- EXPECT_EQ(1, mock_manager_.set_state_count_);
+ EXPECT_EQ(1, mock_observer_.update_state_count());
monitor_.Observe(chrome::NOTIFICATION_SESSION_STARTED,
content::NotificationService::AllSources(),
content::NotificationService::NoDetails());
- // Check if the state of the |mock_manager_| as well as the |monitor| are both
- // changed.
- EXPECT_EQ(2, mock_manager_.set_state_count_);
+ // Check if the state of the |mock_observer_| as well as the |monitor| are
+ // both changed.
+ EXPECT_EQ(2, mock_observer_.update_state_count());
EXPECT_EQ(InputMethodManager::STATE_BROWSER_SCREEN,
- mock_manager_.last_state_);
+ mock_observer_.state());
EXPECT_EQ(InputMethodManager::STATE_BROWSER_SCREEN, monitor_.state());
}
TEST_F(BrowserStateMonitorTest, TestObserveLoginUserChangedThenSessionStarted) {
- EXPECT_EQ(1, mock_manager_.set_state_count_);
+ EXPECT_EQ(1, mock_observer_.update_state_count());
monitor_.Observe(chrome::NOTIFICATION_LOGIN_USER_CHANGED,
content::NotificationService::AllSources(),
content::NotificationService::NoDetails());
- // Check if the state of the |mock_manager_| as well as the |monitor| are both
- // changed.
- EXPECT_EQ(2, mock_manager_.set_state_count_);
+ // Check if the state of the |mock_observer_| as well as the |monitor| are
+ // both changed.
+ EXPECT_EQ(2, mock_observer_.update_state_count());
EXPECT_EQ(InputMethodManager::STATE_BROWSER_SCREEN,
- mock_manager_.last_state_);
+ mock_observer_.state());
EXPECT_EQ(InputMethodManager::STATE_BROWSER_SCREEN, monitor_.state());
monitor_.Observe(chrome::NOTIFICATION_SESSION_STARTED,
@@ -118,161 +123,53 @@ TEST_F(BrowserStateMonitorTest, TestObserveLoginUserChangedThenSessionStarted) {
content::NotificationService::NoDetails());
// The second notification should be nop.
- EXPECT_EQ(2, mock_manager_.set_state_count_);
+ EXPECT_EQ(2, mock_observer_.update_state_count());
EXPECT_EQ(InputMethodManager::STATE_BROWSER_SCREEN,
- mock_manager_.last_state_);
+ mock_observer_.state());
EXPECT_EQ(InputMethodManager::STATE_BROWSER_SCREEN, monitor_.state());
}
TEST_F(BrowserStateMonitorTest, TestObserveScreenLockUnlock) {
- EXPECT_EQ(1, mock_manager_.set_state_count_);
+ EXPECT_EQ(1, mock_observer_.update_state_count());
monitor_.Observe(chrome::NOTIFICATION_LOGIN_USER_CHANGED,
content::NotificationService::AllSources(),
content::NotificationService::NoDetails());
- EXPECT_EQ(2, mock_manager_.set_state_count_);
+ EXPECT_EQ(2, mock_observer_.update_state_count());
monitor_.Observe(chrome::NOTIFICATION_SESSION_STARTED,
content::NotificationService::AllSources(),
content::NotificationService::NoDetails());
- EXPECT_EQ(2, mock_manager_.set_state_count_);
+ EXPECT_EQ(2, mock_observer_.update_state_count());
bool locked = true;
monitor_.Observe(chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
content::NotificationService::AllSources(),
content::Details<bool>(&locked));
- EXPECT_EQ(3, mock_manager_.set_state_count_);
+ EXPECT_EQ(3, mock_observer_.update_state_count());
EXPECT_EQ(InputMethodManager::STATE_LOCK_SCREEN,
- mock_manager_.last_state_);
+ mock_observer_.state());
EXPECT_EQ(InputMethodManager::STATE_LOCK_SCREEN, monitor_.state());
- // When the screen is locked, the monitor should ignore input method changes.
- monitor_.InputMethodChanged(&mock_manager_, false);
- EXPECT_EQ(0, mock_delegate_.update_system_input_method_count());
- EXPECT_EQ(0, mock_delegate_.update_user_input_method_count());
-
locked = false;
monitor_.Observe(chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
content::NotificationService::AllSources(),
content::Details<bool>(&locked));
- EXPECT_EQ(4, mock_manager_.set_state_count_);
+ EXPECT_EQ(4, mock_observer_.update_state_count());
EXPECT_EQ(InputMethodManager::STATE_BROWSER_SCREEN,
- mock_manager_.last_state_);
+ mock_observer_.state());
EXPECT_EQ(InputMethodManager::STATE_BROWSER_SCREEN, monitor_.state());
-
- monitor_.InputMethodChanged(&mock_manager_, false);
- EXPECT_EQ(0, mock_delegate_.update_system_input_method_count());
- EXPECT_EQ(1, mock_delegate_.update_user_input_method_count());
}
TEST_F(BrowserStateMonitorTest, TestObserveAppTerminating) {
- EXPECT_EQ(1, mock_manager_.set_state_count_);
+ EXPECT_EQ(1, mock_observer_.update_state_count());
monitor_.Observe(chrome::NOTIFICATION_APP_TERMINATING,
content::NotificationService::AllSources(),
content::NotificationService::NoDetails());
- // Check if the state of the |mock_manager_| as well as the |monitor| are both
- // changed.
- EXPECT_EQ(2, mock_manager_.set_state_count_);
+ // Check if the state of the |mock_observer_| as well as the |monitor| are
+ // both changed.
+ EXPECT_EQ(2, mock_observer_.update_state_count());
EXPECT_EQ(InputMethodManager::STATE_TERMINATING,
- mock_manager_.last_state_);
+ mock_observer_.state());
EXPECT_EQ(InputMethodManager::STATE_TERMINATING, monitor_.state());
-
- // In the terminating state, the monitor should ignore input method changes.
- monitor_.InputMethodChanged(&mock_manager_, false);
- EXPECT_EQ(0, mock_delegate_.update_system_input_method_count());
- EXPECT_EQ(0, mock_delegate_.update_user_input_method_count());
-}
-
-TEST_F(BrowserStateMonitorTest, TestUpdatePrefOnLoginScreen) {
- EXPECT_EQ(InputMethodManager::STATE_LOGIN_SCREEN, monitor_.state());
- monitor_.InputMethodChanged(&mock_manager_, false);
- EXPECT_EQ(1, mock_delegate_.update_system_input_method_count());
- EXPECT_EQ(0, mock_delegate_.update_user_input_method_count());
- monitor_.InputMethodChanged(&mock_manager_, false);
- EXPECT_EQ(2, mock_delegate_.update_system_input_method_count());
- EXPECT_EQ(0, mock_delegate_.update_user_input_method_count());
-}
-
-TEST_F(BrowserStateMonitorTest, TestUpdatePrefOnBrowserScreen) {
- monitor_.Observe(chrome::NOTIFICATION_LOGIN_USER_CHANGED,
- content::NotificationService::AllSources(),
- content::NotificationService::NoDetails());
- EXPECT_EQ(InputMethodManager::STATE_BROWSER_SCREEN, monitor_.state());
-
- monitor_.InputMethodChanged(&mock_manager_, false);
- EXPECT_EQ(0, mock_delegate_.update_system_input_method_count());
- EXPECT_EQ(1, mock_delegate_.update_user_input_method_count());
- monitor_.InputMethodChanged(&mock_manager_, false);
- EXPECT_EQ(0, mock_delegate_.update_system_input_method_count());
- EXPECT_EQ(2, mock_delegate_.update_user_input_method_count());
-
- monitor_.Observe(chrome::NOTIFICATION_SESSION_STARTED,
- content::NotificationService::AllSources(),
- content::NotificationService::NoDetails());
- EXPECT_EQ(InputMethodManager::STATE_BROWSER_SCREEN, monitor_.state());
-
- monitor_.InputMethodChanged(&mock_manager_, false);
- EXPECT_EQ(0, mock_delegate_.update_system_input_method_count());
- EXPECT_EQ(3, mock_delegate_.update_user_input_method_count());
- monitor_.InputMethodChanged(&mock_manager_, false);
- EXPECT_EQ(0, mock_delegate_.update_system_input_method_count());
- EXPECT_EQ(4, mock_delegate_.update_user_input_method_count());
-}
-
-TEST_F(BrowserStateMonitorTest, TestUpdatePrefOnLoginScreenDetails) {
- EXPECT_EQ(InputMethodManager::STATE_LOGIN_SCREEN, monitor_.state());
- std::string input_method_id = "xkb:us:dvorak:eng";
- mock_manager_.SetCurrentInputMethodId(input_method_id);
- monitor_.InputMethodChanged(&mock_manager_, false);
- EXPECT_EQ(1, mock_delegate_.update_system_input_method_count());
- EXPECT_EQ(0, mock_delegate_.update_user_input_method_count());
- EXPECT_EQ(input_method_id, mock_delegate_.system_input_method());
- input_method_id = "xkb:us:colemak:eng";
- mock_manager_.SetCurrentInputMethodId(input_method_id);
- monitor_.InputMethodChanged(&mock_manager_, false);
- EXPECT_EQ(2, mock_delegate_.update_system_input_method_count());
- EXPECT_EQ(0, mock_delegate_.update_user_input_method_count());
- EXPECT_EQ(input_method_id, mock_delegate_.system_input_method());
-}
-
-TEST_F(BrowserStateMonitorTest, TestUpdatePrefOnBrowserScreenDetails) {
- monitor_.Observe(chrome::NOTIFICATION_LOGIN_USER_CHANGED,
- content::NotificationService::AllSources(),
- content::NotificationService::NoDetails());
- EXPECT_EQ(InputMethodManager::STATE_BROWSER_SCREEN, monitor_.state());
- monitor_.Observe(chrome::NOTIFICATION_SESSION_STARTED,
- content::NotificationService::AllSources(),
- content::NotificationService::NoDetails());
- EXPECT_EQ(InputMethodManager::STATE_BROWSER_SCREEN, monitor_.state());
-
- const std::string input_method_id = "xkb:us:dvorak:eng";
- mock_manager_.SetCurrentInputMethodId(input_method_id);
- monitor_.InputMethodChanged(&mock_manager_, false);
- EXPECT_EQ(0, mock_delegate_.update_system_input_method_count());
- EXPECT_EQ(1, mock_delegate_.update_user_input_method_count());
- EXPECT_EQ(input_method_id, mock_delegate_.user_input_method());
-
- monitor_.InputMethodChanged(&mock_manager_, false);
- EXPECT_EQ(0, mock_delegate_.update_system_input_method_count());
- EXPECT_EQ(2, mock_delegate_.update_user_input_method_count());
- EXPECT_EQ(input_method_id, mock_delegate_.user_input_method());
-
- const std::string input_method_id_2 = "xkb:us:colemak:eng";
- mock_manager_.SetCurrentInputMethodId(input_method_id_2);
- monitor_.InputMethodChanged(&mock_manager_, false);
- EXPECT_EQ(0, mock_delegate_.update_system_input_method_count());
- EXPECT_EQ(3, mock_delegate_.update_user_input_method_count());
- EXPECT_EQ(input_method_id_2, mock_delegate_.user_input_method());
-
- const std::string input_method_id_3 = "xkb:us::eng";
- mock_manager_.SetCurrentInputMethodId(input_method_id_3);
- monitor_.InputMethodChanged(&mock_manager_, false);
- EXPECT_EQ(0, mock_delegate_.update_system_input_method_count());
- EXPECT_EQ(4, mock_delegate_.update_user_input_method_count());
- EXPECT_EQ(input_method_id_3, mock_delegate_.user_input_method());
-
- monitor_.InputMethodChanged(&mock_manager_, false);
- EXPECT_EQ(0, mock_delegate_.update_system_input_method_count());
- EXPECT_EQ(5, mock_delegate_.update_user_input_method_count());
- EXPECT_EQ(input_method_id_3, mock_delegate_.user_input_method());
}
} // namespace input_method
« no previous file with comments | « chrome/browser/chromeos/input_method/browser_state_monitor.cc ('k') | chrome/browser/chromeos/input_method/input_method_configuration.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698