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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/page_click_tracker_browsertest.cc

Issue 8351009: Updating PageClickTracker to Notify listeners When Text Input Loses Focus. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 2 months 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
« chrome/renderer/page_click_tracker.cc ('K') | « chrome/renderer/page_click_tracker.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/page_click_tracker_browsertest.cc
diff --git a/chrome/renderer/page_click_tracker_browsertest.cc b/chrome/renderer/page_click_tracker_browsertest.cc
index bf034bc951dfbe06e886270a7343dcc5633431f1..299126302dc20ea7f503ef9c757021336d1d8ee2 100644
--- a/chrome/renderer/page_click_tracker_browsertest.cc
+++ b/chrome/renderer/page_click_tracker_browsertest.cc
@@ -17,7 +17,8 @@
class TestPageClickListener : public PageClickListener {
public:
TestPageClickListener()
- : called_(false),
+ : input_element_clicked_called_(false),
+ input_element_lost_focus_called_(false),
was_focused_(false),
is_focused_(false),
notification_response_(false) {
@@ -26,99 +27,167 @@ class TestPageClickListener : public PageClickListener {
virtual bool InputElementClicked(const WebKit::WebInputElement& element,
bool was_focused,
bool is_focused) {
- called_ = true;
+ input_element_clicked_called_ = true;
element_clicked_ = element;
was_focused_ = was_focused;
is_focused_ = is_focused;
return notification_response_;
}
+ virtual bool InputElementLostFocus() {
+ input_element_lost_focus_called_ = true;
+ return notification_response_;
+ }
+
void ClearResults() {
- called_ = false;
+ input_element_clicked_called_ = false;
+ input_element_lost_focus_called_ = false;
element_clicked_.reset();
was_focused_ = false;
is_focused_ = false;
}
- bool called_;
+ bool input_element_clicked_called_;
+ bool input_element_lost_focus_called_;
WebKit::WebInputElement element_clicked_;
bool was_focused_;
bool is_focused_;
bool notification_response_;
};
-// Tests that PageClickTracker does notify correctly when a node is clicked.
-TEST_F(ChromeRenderViewTest, PageClickTracker) {
- // RenderView creates PageClickTracker but it doesn't keep it around. Rather
- // than make it do so for the test, we create a new object.
- PageClickTracker* page_click_tracker = new PageClickTracker(view_);
-
- TestPageClickListener test_listener1;
- TestPageClickListener test_listener2;
- page_click_tracker->AddListener(&test_listener1);
- page_click_tracker->AddListener(&test_listener2);
-
- LoadHTML("<form>"
- " <input type='text' id='text'></input><br>"
- " <input type='button' id='button'></input><br>"
- "</form>");
- GetWebWidget()->resize(WebKit::WebSize(500, 500));
- GetWebWidget()->setFocus(true);
- WebKit::WebDocument document = view_->GetWebView()->mainFrame()->document();
- WebKit::WebElement text = document.getElementById("text");
- ASSERT_FALSE(text.isNull());
- WebKit::WebElement button = document.getElementById("button");
- ASSERT_FALSE(button.isNull());
+class PageClickTrackerTest : public ChromeRenderViewTest {
+ protected:
+ virtual void SetUp() {
+ ChromeRenderViewTest::SetUp();
+ // RenderView creates PageClickTracker but it doesn't keep it around.
+ // Rather than make it do so for the test, we create a new object.
+ page_click_tracker_ = new PageClickTracker(view_);
+
+ page_click_tracker_->AddListener(&test_listener1_);
+ page_click_tracker_->AddListener(&test_listener2_);
+
+ LoadHTML("<form>"
+ " <input type='text' id='text_1'></input><br>"
+ " <input type='text' id='text_2'></input><br>"
+ " <input type='button' id='button'></input><br>"
+ "</form>");
+ GetWebWidget()->resize(WebKit::WebSize(500, 500));
+ GetWebWidget()->setFocus(true);
+ WebKit::WebDocument document = view_->GetWebView()->mainFrame()->document();
+ text_ = document.getElementById("text_1");
+ ASSERT_FALSE(text_.isNull());
+ WebKit::WebElement button = document.getElementById("button");
+ ASSERT_FALSE(button.isNull());
Ilya Sherman 2011/10/24 21:30:46 nit: If the |button| is not used, it should be saf
+ }
+
+ PageClickTracker* page_click_tracker_;
Ilya Sherman 2011/10/24 21:30:46 This should be a scoped_ptr<PageClickTracker>, so
+ TestPageClickListener test_listener1_;
+ TestPageClickListener test_listener2_;
+ WebKit::WebElement text_;
+
+};
+
+// Tests that PageClickTracker does notify correctly when a node is clicked.
+TEST_F(PageClickTrackerTest, PageClickTrackerInputClicked) {
// Click the text field once.
- EXPECT_TRUE(SimulateElementClick("text"));
- EXPECT_TRUE(test_listener1.called_);
- EXPECT_TRUE(test_listener2.called_);
- EXPECT_FALSE(test_listener1.was_focused_);
- EXPECT_FALSE(test_listener2.was_focused_);
- EXPECT_TRUE(test_listener1.is_focused_);
- EXPECT_TRUE(test_listener2.is_focused_);
- EXPECT_TRUE(text == test_listener1.element_clicked_);
- EXPECT_TRUE(text == test_listener2.element_clicked_);
- test_listener1.ClearResults();
- test_listener2.ClearResults();
+ EXPECT_TRUE(SimulateElementClick("text_1"));
+ EXPECT_TRUE(test_listener1_.input_element_clicked_called_);
+ EXPECT_TRUE(test_listener2_.input_element_clicked_called_);
+ EXPECT_FALSE(test_listener1_.was_focused_);
+ EXPECT_FALSE(test_listener2_.was_focused_);
+ EXPECT_TRUE(test_listener1_.is_focused_);
+ EXPECT_TRUE(test_listener2_.is_focused_);
+ EXPECT_TRUE(text_ == test_listener1_.element_clicked_);
+ EXPECT_TRUE(text_ == test_listener2_.element_clicked_);
+ test_listener1_.ClearResults();
+ test_listener2_.ClearResults();
// Click the text field again to test that was_focused_ is set correctly.
- EXPECT_TRUE(SimulateElementClick("text"));
- EXPECT_TRUE(test_listener1.called_);
- EXPECT_TRUE(test_listener2.called_);
- EXPECT_TRUE(test_listener1.was_focused_);
- EXPECT_TRUE(test_listener2.was_focused_);
- EXPECT_TRUE(test_listener1.is_focused_);
- EXPECT_TRUE(test_listener2.is_focused_);
- EXPECT_TRUE(text == test_listener1.element_clicked_);
- EXPECT_TRUE(text == test_listener2.element_clicked_);
- test_listener1.ClearResults();
- test_listener2.ClearResults();
+ EXPECT_TRUE(SimulateElementClick("text_1"));
+ EXPECT_TRUE(test_listener1_.input_element_clicked_called_);
+ EXPECT_TRUE(test_listener2_.input_element_clicked_called_);
+ EXPECT_TRUE(test_listener1_.was_focused_);
+ EXPECT_TRUE(test_listener2_.was_focused_);
+ EXPECT_TRUE(test_listener1_.is_focused_);
+ EXPECT_TRUE(test_listener2_.is_focused_);
+ EXPECT_TRUE(text_ == test_listener1_.element_clicked_);
+ EXPECT_TRUE(text_ == test_listener2_.element_clicked_);
+ test_listener1_.ClearResults();
+ test_listener2_.ClearResults();
// Click the button, no notification should happen (this is not a text-input).
EXPECT_TRUE(SimulateElementClick("button"));
- EXPECT_FALSE(test_listener1.called_);
- EXPECT_FALSE(test_listener2.called_);
+ EXPECT_FALSE(test_listener1_.input_element_clicked_called_);
+ EXPECT_FALSE(test_listener2_.input_element_clicked_called_);
// Make the first listener stop the event propagation, click the text field
// and make sure only the first listener is notified.
- test_listener1.notification_response_ = true;
- EXPECT_TRUE(SimulateElementClick("text"));
- EXPECT_TRUE(test_listener1.called_);
- EXPECT_FALSE(test_listener2.called_);
- test_listener1.ClearResults();
+ test_listener1_.notification_response_ = true;
+ EXPECT_TRUE(SimulateElementClick("text_1"));
+ EXPECT_TRUE(test_listener1_.input_element_clicked_called_);
+ EXPECT_FALSE(test_listener2_.input_element_clicked_called_);
+ test_listener1_.ClearResults();
// Make sure removing a listener work.
- page_click_tracker->RemoveListener(&test_listener1);
- EXPECT_TRUE(SimulateElementClick("text"));
- EXPECT_FALSE(test_listener1.called_);
- EXPECT_TRUE(test_listener2.called_);
- test_listener2.ClearResults();
+ page_click_tracker_->RemoveListener(&test_listener1_);
+ EXPECT_TRUE(SimulateElementClick("text_1"));
+ EXPECT_FALSE(test_listener1_.input_element_clicked_called_);
+ EXPECT_TRUE(test_listener2_.input_element_clicked_called_);
+ test_listener2_.ClearResults();
// Make sure we don't choke when no listeners are registered.
- page_click_tracker->RemoveListener(&test_listener2);
- EXPECT_TRUE(SimulateElementClick("text"));
- EXPECT_FALSE(test_listener1.called_);
- EXPECT_FALSE(test_listener2.called_);
+ page_click_tracker_->RemoveListener(&test_listener2_);
+ EXPECT_TRUE(SimulateElementClick("text_1"));
+ EXPECT_FALSE(test_listener1_.input_element_clicked_called_);
+ EXPECT_FALSE(test_listener2_.input_element_clicked_called_);
+}
+
+TEST_F(PageClickTrackerTest, PageClickTrackerInputFocusLost) {
+ // Click a text field and test the no lost focus notifications are sent.
Ilya Sherman 2011/10/24 21:30:46 nit: "the" -> "that"
+ EXPECT_TRUE(SimulateElementClick("text_1"));
+ EXPECT_FALSE(test_listener1_.input_element_lost_focus_called_);
+ EXPECT_FALSE(test_listener2_.input_element_lost_focus_called_);
+ test_listener1_.ClearResults();
+ test_listener2_.ClearResults();
+
+ // Select another text field to test that the notifcation for the
+ // first text field losing focus is sent.
+ EXPECT_TRUE(SimulateElementClick("text_2"));
+ EXPECT_TRUE(test_listener1_.input_element_lost_focus_called_);
+ EXPECT_TRUE(test_listener2_.input_element_lost_focus_called_);
+ test_listener1_.ClearResults();
+ test_listener2_.ClearResults();
+
+ // Click the button, a notification should happen since a text field has
+ // lost focus.
+ EXPECT_TRUE(SimulateElementClick("button"));
+ EXPECT_TRUE(test_listener1_.input_element_lost_focus_called_);
+ EXPECT_TRUE(test_listener2_.input_element_lost_focus_called_);
+ test_listener1_.ClearResults();
+ test_listener2_.ClearResults();
+
Ilya Sherman 2011/10/24 21:30:46 Let's add a test immediately after this that click
+ // Make the first listener stop the event propagation, click the text field,
+ // then a button and make sure only the first listener is notified.
+ test_listener1_.notification_response_ = true;
+ EXPECT_TRUE(SimulateElementClick("text_1"));
+ EXPECT_TRUE(SimulateElementClick("button"));
+ EXPECT_TRUE(test_listener1_.input_element_lost_focus_called_);
+ EXPECT_FALSE(test_listener2_.input_element_lost_focus_called_);
+ test_listener1_.ClearResults();
+
+ // Make sure removing a listener work.
+ page_click_tracker_->RemoveListener(&test_listener1_);
+ EXPECT_TRUE(SimulateElementClick("text_1"));
+ EXPECT_TRUE(SimulateElementClick("button"));
+ EXPECT_FALSE(test_listener1_.input_element_lost_focus_called_);
+ EXPECT_TRUE(test_listener2_.input_element_lost_focus_called_);
+ test_listener2_.ClearResults();
+
+ // Make sure we don't choke when no listeners are registered.
+ page_click_tracker_->RemoveListener(&test_listener2_);
+ EXPECT_TRUE(SimulateElementClick("text_1"));
+ EXPECT_TRUE(SimulateElementClick("button"));
+ EXPECT_FALSE(test_listener1_.input_element_lost_focus_called_);
+ EXPECT_FALSE(test_listener2_.input_element_lost_focus_called_);
}
« chrome/renderer/page_click_tracker.cc ('K') | « chrome/renderer/page_click_tracker.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698