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

Side by Side Diff: chrome/browser/ui/webui/inspect_ui_browsertest.cc

Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/devtools/device/adb/adb_device_provider.h" 5 #include "chrome/browser/devtools/device/adb/adb_device_provider.h"
6 #include "chrome/browser/devtools/device/adb/mock_adb_server.h" 6 #include "chrome/browser/devtools/device/adb/mock_adb_server.h"
7 #include "chrome/browser/devtools/device/devtools_android_bridge.h" 7 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/tabs/tab_strip_model.h" 9 #include "chrome/browser/ui/tabs/tab_strip_model.h"
10 #include "chrome/common/url_constants.h" 10 #include "chrome/common/url_constants.h"
11 #include "chrome/test/base/ui_test_utils.h" 11 #include "chrome/test/base/ui_test_utils.h"
12 #include "chrome/test/base/web_ui_browser_test.h" 12 #include "chrome/test/base/web_ui_browser_test.h"
13 #include "content/public/browser/navigation_details.h" 13 #include "content/public/browser/navigation_details.h"
14 #include "content/public/browser/web_contents.h" 14 #include "content/public/browser/web_contents.h"
15 #include "content/public/test/browser_test_utils.h" 15 #include "content/public/test/browser_test_utils.h"
16 #include "net/test/embedded_test_server/embedded_test_server.h"
16 17
17 using content::WebContents; 18 using content::WebContents;
18 19
19 namespace { 20 namespace {
20 21
21 const char kSharedWorkerTestPage[] = 22 const char kSharedWorkerTestPage[] = "/workers/workers_ui_shared_worker.html";
22 "files/workers/workers_ui_shared_worker.html"; 23 const char kSharedWorkerJs[] = "/workers/workers_ui_shared_worker.js";
23 const char kSharedWorkerJs[] =
24 "files/workers/workers_ui_shared_worker.js";
25 24
26 class InspectUITest : public WebUIBrowserTest { 25 class InspectUITest : public WebUIBrowserTest {
27 public: 26 public:
28 InspectUITest() {} 27 InspectUITest() {}
29 28
30 void SetUpOnMainThread() override { 29 void SetUpOnMainThread() override {
31 WebUIBrowserTest::SetUpOnMainThread(); 30 WebUIBrowserTest::SetUpOnMainThread();
32 AddLibrary(base::FilePath(FILE_PATH_LITERAL("inspect_ui_test.js"))); 31 AddLibrary(base::FilePath(FILE_PATH_LITERAL("inspect_ui_test.js")));
33 } 32 }
34 33
35 private: 34 private:
36 DISALLOW_COPY_AND_ASSIGN(InspectUITest); 35 DISALLOW_COPY_AND_ASSIGN(InspectUITest);
37 }; 36 };
38 37
39 IN_PROC_BROWSER_TEST_F(InspectUITest, InspectUIPage) { 38 IN_PROC_BROWSER_TEST_F(InspectUITest, InspectUIPage) {
40 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL)); 39 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL));
41 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest( 40 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
42 "testTargetListed", 41 "testTargetListed",
43 new base::StringValue("#pages"), 42 new base::StringValue("#pages"),
44 new base::StringValue("populateWebContentsTargets"), 43 new base::StringValue("populateWebContentsTargets"),
45 new base::StringValue(chrome::kChromeUIInspectURL))); 44 new base::StringValue(chrome::kChromeUIInspectURL)));
46 } 45 }
47 46
48 IN_PROC_BROWSER_TEST_F(InspectUITest, SharedWorker) { 47 IN_PROC_BROWSER_TEST_F(InspectUITest, SharedWorker) {
49 ASSERT_TRUE(test_server()->Start()); 48 ASSERT_TRUE(embedded_test_server()->Start());
50 GURL url = test_server()->GetURL(kSharedWorkerTestPage); 49 GURL url = embedded_test_server()->GetURL(kSharedWorkerTestPage);
51 ui_test_utils::NavigateToURL(browser(), url); 50 ui_test_utils::NavigateToURL(browser(), url);
52 51
53 ui_test_utils::NavigateToURLWithDisposition( 52 ui_test_utils::NavigateToURLWithDisposition(
54 browser(), 53 browser(),
55 GURL(chrome::kChromeUIInspectURL), 54 GURL(chrome::kChromeUIInspectURL),
56 NEW_FOREGROUND_TAB, 55 NEW_FOREGROUND_TAB,
57 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); 56 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
58 57
59 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest( 58 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
60 "testTargetListed", 59 "testTargetListed",
(...skipping 18 matching lines...) Expand all
79 StartMockAdbServer(FlushWithSize); 78 StartMockAdbServer(FlushWithSize);
80 79
81 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL)); 80 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL));
82 81
83 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest("testAdbTargetsListed")); 82 ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest("testAdbTargetsListed"));
84 83
85 StopMockAdbServer(); 84 StopMockAdbServer();
86 } 85 }
87 86
88 IN_PROC_BROWSER_TEST_F(InspectUITest, ReloadCrash) { 87 IN_PROC_BROWSER_TEST_F(InspectUITest, ReloadCrash) {
89 ASSERT_TRUE(test_server()->Start()); 88 ASSERT_TRUE(embedded_test_server()->Start());
90 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL)); 89 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL));
91 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL)); 90 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL));
92 } 91 }
93 92
94 } // namespace 93 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc ('k') | chrome/browser/ui/webui/webui_webview_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698