Commit 30b157e0 authored by Tommy C. Li's avatar Tommy C. Li Committed by Commit Bot

Omnibox UI Experiments: Steady State Elision - Reelide on blur tests

When the URL is un-elided, and then the Omnibox is blurred:

 a) If the text has not been edited, re-elide the URL.
 b) If the text has been edited, leave the complete edited text as-is.

This CL adds two tests - one for each scenario.

Bug: 797354
Change-Id: Ia70cf4357218e3b8f043be73716f067d7b287fd4
Reviewed-on: https://chromium-review.googlesource.com/1012778
Commit-Queue: Tommy Li <tommycli@chromium.org>
Reviewed-by: default avatarJustin Donnelly <jdonnelly@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551025}
parent 9aeb35ea
...@@ -133,6 +133,10 @@ class OmniboxViewViews : public OmniboxView, ...@@ -133,6 +133,10 @@ class OmniboxViewViews : public OmniboxView,
MouseClickDrag); MouseClickDrag);
FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsSteadyStateElisionsTest, FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsSteadyStateElisionsTest,
MouseDoubleClickDrag); MouseDoubleClickDrag);
FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsSteadyStateElisionsTest,
ReelideOnBlur);
FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsSteadyStateElisionsTest,
DontReelideOnBlurIfEdited);
friend class OmniboxViewViewsTest; friend class OmniboxViewViewsTest;
friend class OmniboxViewViewsSteadyStateElisionsTest; friend class OmniboxViewViewsSteadyStateElisionsTest;
......
...@@ -720,3 +720,33 @@ TEST_F(OmniboxViewViewsSteadyStateElisionsTest, MouseDoubleClickDrag) { ...@@ -720,3 +720,33 @@ TEST_F(OmniboxViewViewsSteadyStateElisionsTest, MouseDoubleClickDrag) {
EXPECT_EQ(15U, start); EXPECT_EQ(15U, start);
EXPECT_EQ(0U, end); EXPECT_EQ(0U, end);
} }
TEST_F(OmniboxViewViewsSteadyStateElisionsTest, ReelideOnBlur) {
// Double-click should unelide the URL by making a partial selection.
SendMouseClick(4 * kCharacterWidth);
SendMouseClick(4 * kCharacterWidth);
ExpectFullUrlDisplayed();
omnibox_view()->OnBlur();
ExpectElidedUrlDisplayed();
}
TEST_F(OmniboxViewViewsSteadyStateElisionsTest, DontReelideOnBlurIfEdited) {
// Double-click should unelide the URL by making a partial selection.
SendMouseClick(4 * kCharacterWidth);
SendMouseClick(4 * kCharacterWidth);
ExpectFullUrlDisplayed();
// Since the domain word is selected, pressing 'a' should replace the domain.
ui::KeyEvent char_event(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::DomCode::US_A, 0,
ui::DomKey::FromCharacter('a'),
ui::EventTimeForNow());
omnibox_textfield()->InsertChar(char_event);
EXPECT_EQ(base::ASCIIToUTF16("https://a.com"), omnibox_view()->text());
EXPECT_TRUE(omnibox_view()->model()->user_input_in_progress());
// Now that we've edited the text, blurring should not re-elide the URL.
omnibox_view()->OnBlur();
EXPECT_EQ(base::ASCIIToUTF16("https://a.com"), omnibox_view()->text());
EXPECT_TRUE(omnibox_view()->model()->user_input_in_progress());
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment