OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 5 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
9 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 9 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
10 #include "chrome/test/base/browser_with_test_window_test.h" | 10 #include "chrome/test/base/browser_with_test_window_test.h" |
11 #include "content/browser/tab_contents/tab_contents.h" | |
12 #include "content/common/url_constants.h" | |
11 | 13 |
12 typedef BrowserWithTestWindowTest ToolbarModelTest; | 14 typedef BrowserWithTestWindowTest ToolbarModelTest; |
13 | 15 |
16 // Test that URLs are correctly shown or hidden both during navigation and | |
17 // after commit. | |
14 TEST_F(ToolbarModelTest, ShouldDisplayURL) { | 18 TEST_F(ToolbarModelTest, ShouldDisplayURL) { |
19 AddTab(browser(), GURL(chrome::kAboutBlankURL)); | |
20 TabContents* contents = browser()->GetTabContentsAt(0); | |
21 | |
15 browser()->OpenURL(GURL("view-source:http://www.google.com"), | 22 browser()->OpenURL(GURL("view-source:http://www.google.com"), |
16 GURL(), CURRENT_TAB, PageTransition::TYPED); | 23 GURL(), CURRENT_TAB, PageTransition::TYPED); |
17 EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL()); | 24 EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL()); |
18 EXPECT_EQ(ASCIIToUTF16("view-source:www.google.com"), | 25 EXPECT_EQ(ASCIIToUTF16("view-source:www.google.com"), |
19 browser()->toolbar_model()->GetText()); | 26 browser()->toolbar_model()->GetText()); |
27 CommitPendingLoad(&contents->controller()); | |
28 EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL()); | |
29 EXPECT_EQ(ASCIIToUTF16("view-source:www.google.com"), | |
30 browser()->toolbar_model()->GetText()); | |
20 | 31 |
21 browser()->OpenURL(GURL("view-source:chrome://newtab/"), | 32 browser()->OpenURL(GURL("view-source:chrome://newtab/"), |
22 GURL(), CURRENT_TAB, PageTransition::TYPED); | 33 GURL(), CURRENT_TAB, PageTransition::TYPED); |
23 EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL()); | 34 EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL()); |
24 EXPECT_EQ(ASCIIToUTF16("view-source:chrome://newtab"), | 35 EXPECT_EQ(ASCIIToUTF16("view-source:chrome://newtab"), |
25 browser()->toolbar_model()->GetText()); | 36 browser()->toolbar_model()->GetText()); |
37 CommitPendingLoad(&contents->controller()); | |
Aaron Boodman
2011/10/12 07:41:08
It would be nice to pull this pattern into a helpe
Charlie Reis
2011/10/12 19:02:57
Done.
Aaron Boodman
2011/10/12 20:18:50
Great, thanks!
| |
38 EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL()); | |
39 EXPECT_EQ(ASCIIToUTF16("view-source:chrome://newtab"), | |
40 browser()->toolbar_model()->GetText()); | |
26 | 41 |
27 browser()->OpenURL(GURL("chrome-extension://monkey/balls.html"), | 42 browser()->OpenURL(GURL("chrome-extension://monkey/balls.html"), |
28 GURL(), CURRENT_TAB, PageTransition::TYPED); | 43 GURL(), CURRENT_TAB, PageTransition::TYPED); |
29 EXPECT_FALSE(browser()->toolbar_model()->ShouldDisplayURL()); | 44 EXPECT_FALSE(browser()->toolbar_model()->ShouldDisplayURL()); |
30 EXPECT_EQ(ASCIIToUTF16(""), browser()->toolbar_model()->GetText()); | 45 EXPECT_EQ(ASCIIToUTF16(""), browser()->toolbar_model()->GetText()); |
46 CommitPendingLoad(&contents->controller()); | |
47 EXPECT_FALSE(browser()->toolbar_model()->ShouldDisplayURL()); | |
48 EXPECT_EQ(ASCIIToUTF16(""), browser()->toolbar_model()->GetText()); | |
31 | 49 |
32 browser()->OpenURL(GURL("chrome://newtab/"), | 50 browser()->OpenURL(GURL("chrome://newtab/"), |
33 GURL(), CURRENT_TAB, PageTransition::TYPED); | 51 GURL(), CURRENT_TAB, PageTransition::TYPED); |
34 EXPECT_FALSE(browser()->toolbar_model()->ShouldDisplayURL()); | 52 EXPECT_FALSE(browser()->toolbar_model()->ShouldDisplayURL()); |
35 EXPECT_EQ(ASCIIToUTF16(""), browser()->toolbar_model()->GetText()); | 53 EXPECT_EQ(ASCIIToUTF16(""), browser()->toolbar_model()->GetText()); |
54 CommitPendingLoad(&contents->controller()); | |
55 EXPECT_FALSE(browser()->toolbar_model()->ShouldDisplayURL()); | |
56 EXPECT_EQ(ASCIIToUTF16(""), browser()->toolbar_model()->GetText()); | |
36 | 57 |
37 browser()->OpenURL(GURL("about:blank"), | 58 browser()->OpenURL(GURL(chrome::kAboutBlankURL), |
38 GURL(), CURRENT_TAB, PageTransition::TYPED); | 59 GURL(), CURRENT_TAB, PageTransition::TYPED); |
39 EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL()); | 60 EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL()); |
40 EXPECT_EQ(ASCIIToUTF16("about:blank"), | 61 EXPECT_EQ(ASCIIToUTF16(chrome::kAboutBlankURL), |
62 browser()->toolbar_model()->GetText()); | |
63 CommitPendingLoad(&contents->controller()); | |
64 EXPECT_TRUE(browser()->toolbar_model()->ShouldDisplayURL()); | |
65 EXPECT_EQ(ASCIIToUTF16(chrome::kAboutBlankURL), | |
41 browser()->toolbar_model()->GetText()); | 66 browser()->toolbar_model()->GetText()); |
42 } | 67 } |
OLD | NEW |