summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/reload_button_gtk_unittest.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-26 20:42:37 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-26 20:42:37 +0000
commit88ebe22bc07a208734ac3c07e006f1c0c6acf110 (patch)
treef938251c3dd5518c97ac291d04ccdf7f83dca88c /chrome/browser/gtk/reload_button_gtk_unittest.cc
parent291104b09f6ab9f81708175376fd3c954a695753 (diff)
downloadchromium_src-88ebe22bc07a208734ac3c07e006f1c0c6acf110.zip
chromium_src-88ebe22bc07a208734ac3c07e006f1c0c6acf110.tar.gz
chromium_src-88ebe22bc07a208734ac3c07e006f1c0c6acf110.tar.bz2
Improve reload button unittesting. Instead of doing very low-level tests of individual function outputs, test higher-level sequences of actions.
This also adds a views unittest alongside the existing GTK one. BUG=none TEST=none Review URL: http://codereview.chromium.org/4114001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63941 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/reload_button_gtk_unittest.cc')
-rw-r--r--chrome/browser/gtk/reload_button_gtk_unittest.cc194
1 files changed, 91 insertions, 103 deletions
diff --git a/chrome/browser/gtk/reload_button_gtk_unittest.cc b/chrome/browser/gtk/reload_button_gtk_unittest.cc
index 12384b6..04e01d0 100644
--- a/chrome/browser/gtk/reload_button_gtk_unittest.cc
+++ b/chrome/browser/gtk/reload_button_gtk_unittest.cc
@@ -2,137 +2,125 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/message_loop.h"
#include "chrome/browser/gtk/reload_button_gtk.h"
#include "testing/gtest/include/gtest/gtest.h"
-class ReloadButtonGtkPeer {
+class ReloadButtonGtkTest : public testing::Test {
public:
- explicit ReloadButtonGtkPeer(ReloadButtonGtk* reload) : reload_(reload) { }
+ ReloadButtonGtkTest();
- // const accessors for internal state
- ReloadButtonGtk::Mode intended_mode() const {
- return reload_->intended_mode_;
- }
- ReloadButtonGtk::Mode visible_mode() const { return reload_->visible_mode_; }
+ void CheckState(bool enabled,
+ ReloadButtonGtk::Mode intended_mode,
+ ReloadButtonGtk::Mode visible_mode,
+ bool timer_running);
- // mutators for internal state
- void SetState(GtkStateType state) {
- gtk_widget_set_state(reload_->widget(), state);
- }
- void set_intended_mode(ReloadButtonGtk::Mode mode) {
- reload_->intended_mode_ = mode;
- }
- void set_visible_mode(ReloadButtonGtk::Mode mode) {
- reload_->visible_mode_ = mode;
+ // These accessors eliminate the need to declare each testcase as a friend.
+ void set_mouse_hovered(bool hovered) {
+ reload_.testing_mouse_hovered_ = hovered;
}
- void set_timer_running() {
- reload_->pretend_timer_is_running_for_unittest_ = true;
- }
- void set_timer_stopped() {
- reload_->pretend_timer_is_running_for_unittest_ = false;
- }
-
- // forwarders to private methods
- gboolean OnLeave() {
- return reload_->OnLeaveNotify(reload_->widget(), NULL);
- }
-
- void OnClicked() {
- reload_->OnClicked(reload_->widget());
- }
-
- private:
- ReloadButtonGtk* const reload_;
-};
-
-namespace {
+ int reload_count() { return reload_.testing_reload_count_; }
+ void fake_mouse_leave() { reload_.OnLeaveNotify(reload_.widget(), NULL); }
-class ReloadButtonGtkTest : public testing::Test {
protected:
- ReloadButtonGtkTest() : reload_(NULL, NULL), peer_(&reload_) { }
+ // We need a message loop for the timers to post events.
+ MessageLoop loop_;
- protected:
ReloadButtonGtk reload_;
- ReloadButtonGtkPeer peer_;
};
-TEST_F(ReloadButtonGtkTest, ChangeModeReload) {
- reload_.ChangeMode(ReloadButtonGtk::MODE_RELOAD, true);
- EXPECT_EQ(ReloadButtonGtk::MODE_RELOAD, peer_.intended_mode());
- EXPECT_EQ(ReloadButtonGtk::MODE_RELOAD, peer_.visible_mode());
+ReloadButtonGtkTest::ReloadButtonGtkTest() : reload_(NULL, NULL) {
+ // Set the timer delay to 0 so that timers will fire as soon as we tell the
+ // message loop to run pending tasks.
+ reload_.timer_delay_ = base::TimeDelta();
}
-TEST_F(ReloadButtonGtkTest, ChangeModeStop) {
- reload_.ChangeMode(ReloadButtonGtk::MODE_STOP, true);
- EXPECT_EQ(ReloadButtonGtk::MODE_STOP, peer_.intended_mode());
- EXPECT_EQ(ReloadButtonGtk::MODE_STOP, peer_.visible_mode());
+void ReloadButtonGtkTest::CheckState(bool enabled,
+ ReloadButtonGtk::Mode intended_mode,
+ ReloadButtonGtk::Mode visible_mode,
+ bool timer_running) {
+ EXPECT_NE(enabled, reload_.stop_.paint_override() == GTK_STATE_INSENSITIVE);
+ EXPECT_EQ(intended_mode, reload_.intended_mode_);
+ EXPECT_EQ(visible_mode, reload_.visible_mode_);
+ EXPECT_EQ(timer_running, reload_.timer_.IsRunning());
}
-TEST_F(ReloadButtonGtkTest, ScheduleChangeModeNormalReload) {
- peer_.set_visible_mode(ReloadButtonGtk::MODE_STOP);
- peer_.SetState(GTK_STATE_NORMAL);
- reload_.ChangeMode(ReloadButtonGtk::MODE_RELOAD, false);
- EXPECT_EQ(ReloadButtonGtk::MODE_RELOAD, peer_.intended_mode());
- EXPECT_EQ(ReloadButtonGtk::MODE_RELOAD, peer_.visible_mode());
-}
+TEST_F(ReloadButtonGtkTest, Basic) {
+ // The stop/reload button starts in the "enabled reload" state with no timer
+ // running.
+ CheckState(true, ReloadButtonGtk::MODE_RELOAD, ReloadButtonGtk::MODE_RELOAD,
+ false);
-TEST_F(ReloadButtonGtkTest, ScheduleChangeModeHotReload) {
- peer_.set_visible_mode(ReloadButtonGtk::MODE_STOP);
- peer_.SetState(GTK_STATE_PRELIGHT);
- reload_.ChangeMode(ReloadButtonGtk::MODE_RELOAD, false);
- EXPECT_EQ(ReloadButtonGtk::MODE_RELOAD, peer_.intended_mode());
- EXPECT_EQ(ReloadButtonGtk::MODE_STOP, peer_.visible_mode());
-}
+ // Press the button. This should start the double-click timer.
+ gtk_button_clicked(GTK_BUTTON(reload_.widget()));
+ CheckState(true, ReloadButtonGtk::MODE_RELOAD, ReloadButtonGtk::MODE_RELOAD,
+ true);
-TEST_F(ReloadButtonGtkTest, ScheduleChangeModeNormalStop) {
- peer_.set_visible_mode(ReloadButtonGtk::MODE_RELOAD);
- peer_.SetState(GTK_STATE_NORMAL);
+ // Now change the mode (as if the browser had started loading the page). This
+ // should cancel the timer since the button is not hovered.
reload_.ChangeMode(ReloadButtonGtk::MODE_STOP, false);
- EXPECT_EQ(ReloadButtonGtk::MODE_STOP, peer_.intended_mode());
- EXPECT_EQ(ReloadButtonGtk::MODE_STOP, peer_.visible_mode());
+ CheckState(true, ReloadButtonGtk::MODE_STOP, ReloadButtonGtk::MODE_STOP,
+ false);
+
+ // Press the button again. This should change back to reload.
+ gtk_button_clicked(GTK_BUTTON(reload_.widget()));
+ CheckState(true, ReloadButtonGtk::MODE_RELOAD, ReloadButtonGtk::MODE_RELOAD,
+ false);
}
-TEST_F(ReloadButtonGtkTest, ScheduleChangeModeHotStop) {
- peer_.set_visible_mode(ReloadButtonGtk::MODE_RELOAD);
- peer_.SetState(GTK_STATE_PRELIGHT);
+TEST_F(ReloadButtonGtkTest, DoubleClickTimer) {
+ // Start by pressing the button.
+ gtk_button_clicked(GTK_BUTTON(reload_.widget()));
+
+ // Try to press the button again. This should do nothing because the timer is
+ // running.
+ int original_reload_count = reload_count();
+ gtk_button_clicked(GTK_BUTTON(reload_.widget()));
+ CheckState(true, ReloadButtonGtk::MODE_RELOAD, ReloadButtonGtk::MODE_RELOAD,
+ true);
+ EXPECT_EQ(original_reload_count, reload_count());
+
+ // Hover the button, and change mode. The visible mode should not change,
+ // again because the timer is running.
+ set_mouse_hovered(true);
reload_.ChangeMode(ReloadButtonGtk::MODE_STOP, false);
- EXPECT_EQ(ReloadButtonGtk::MODE_STOP, peer_.intended_mode());
- EXPECT_EQ(ReloadButtonGtk::MODE_STOP, peer_.visible_mode());
+ CheckState(true, ReloadButtonGtk::MODE_STOP, ReloadButtonGtk::MODE_RELOAD,
+ true);
+
+ // Now fire the timer. This should complete the mode change.
+ loop_.RunAllPending();
+ CheckState(true, ReloadButtonGtk::MODE_STOP, ReloadButtonGtk::MODE_STOP,
+ false);
}
-TEST_F(ReloadButtonGtkTest, ScheduleChangeModeTimerHotStop) {
- peer_.set_visible_mode(ReloadButtonGtk::MODE_RELOAD);
- peer_.SetState(GTK_STATE_PRELIGHT);
- peer_.set_timer_running();
+TEST_F(ReloadButtonGtkTest, DisableOnHover) {
+ // Start by pressing the button and proceeding with the mode change.
+ gtk_button_clicked(GTK_BUTTON(reload_.widget()));
reload_.ChangeMode(ReloadButtonGtk::MODE_STOP, false);
- peer_.set_timer_stopped();
- EXPECT_EQ(ReloadButtonGtk::MODE_STOP, peer_.intended_mode());
- EXPECT_EQ(ReloadButtonGtk::MODE_RELOAD, peer_.visible_mode());
-}
-TEST_F(ReloadButtonGtkTest, OnLeaveIntendedStop) {
- peer_.SetState(GTK_STATE_PRELIGHT);
- peer_.set_visible_mode(ReloadButtonGtk::MODE_RELOAD);
- peer_.set_intended_mode(ReloadButtonGtk::MODE_STOP);
- peer_.OnLeave();
- EXPECT_EQ(ReloadButtonGtk::MODE_STOP, peer_.visible_mode());
- EXPECT_EQ(ReloadButtonGtk::MODE_STOP, peer_.intended_mode());
+ // Now hover the button and change back. This should result in a disabled
+ // stop button.
+ set_mouse_hovered(true);
+ reload_.ChangeMode(ReloadButtonGtk::MODE_RELOAD, false);
+ CheckState(false, ReloadButtonGtk::MODE_RELOAD, ReloadButtonGtk::MODE_STOP,
+ false);
+
+ // Un-hover the button, which should allow it to reset.
+ set_mouse_hovered(false);
+ fake_mouse_leave();
+ CheckState(true, ReloadButtonGtk::MODE_RELOAD, ReloadButtonGtk::MODE_RELOAD,
+ false);
}
-TEST_F(ReloadButtonGtkTest, OnLeaveIntendedReload) {
- peer_.SetState(GTK_STATE_PRELIGHT);
- peer_.set_visible_mode(ReloadButtonGtk::MODE_STOP);
- peer_.set_intended_mode(ReloadButtonGtk::MODE_RELOAD);
- peer_.OnLeave();
- EXPECT_EQ(ReloadButtonGtk::MODE_RELOAD, peer_.visible_mode());
- EXPECT_EQ(ReloadButtonGtk::MODE_RELOAD, peer_.intended_mode());
-}
+TEST_F(ReloadButtonGtkTest, ResetOnClick) {
+ // Start by pressing the button and proceeding with the mode change.
+ gtk_button_clicked(GTK_BUTTON(reload_.widget()));
+ reload_.ChangeMode(ReloadButtonGtk::MODE_STOP, false);
-TEST_F(ReloadButtonGtkTest, OnClickedStop) {
- peer_.set_visible_mode(ReloadButtonGtk::MODE_STOP);
- peer_.OnClicked();
- EXPECT_EQ(ReloadButtonGtk::MODE_RELOAD, peer_.visible_mode());
- EXPECT_EQ(ReloadButtonGtk::MODE_RELOAD, peer_.intended_mode());
+ // Hover the button and click it. This should change back to reload despite
+ // the hover, because it's a direct user action.
+ set_mouse_hovered(true);
+ gtk_button_clicked(GTK_BUTTON(reload_.widget()));
+ CheckState(true, ReloadButtonGtk::MODE_RELOAD, ReloadButtonGtk::MODE_RELOAD,
+ false);
}
-
-} // namespace