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

Side by Side Diff: chrome/test/data/webui/webui_resource_browsertest.cc

Issue 17450012: Fix test failure in list_selection_model_test.html and port to automated browser test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk. Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <vector> 5 #include <vector>
6 6
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/tabs/tab_strip_model.h" 8 #include "chrome/browser/ui/tabs/tab_strip_model.h"
9 #include "chrome/test/base/in_process_browser_test.h" 9 #include "chrome/test/base/in_process_browser_test.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 AddLibrary(IDR_WEBUI_JS_CR_UI_ARRAY_DATA_MODEL); 93 AddLibrary(IDR_WEBUI_JS_CR_UI_ARRAY_DATA_MODEL);
94 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST); 94 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST);
95 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_ITEM); 95 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_ITEM);
96 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_CONTROLLER); 96 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_CONTROLLER);
97 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_MODEL); 97 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_MODEL);
98 // Grid must be the last addition as it depends on list libraries. 98 // Grid must be the last addition as it depends on list libraries.
99 AddLibrary(IDR_WEBUI_JS_CR_UI_GRID); 99 AddLibrary(IDR_WEBUI_JS_CR_UI_GRID);
100 RunTest(base::FilePath(FILE_PATH_LITERAL("grid_test.html"))); 100 RunTest(base::FilePath(FILE_PATH_LITERAL("grid_test.html")));
101 } 101 }
102 102
103 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ListSelectionModelTest) {
104 AddLibrary(IDR_WEBUI_JS_CR);
105 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET);
106 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_MODEL);
107 RunTest(base::FilePath(FILE_PATH_LITERAL("list_selection_model_test.html")));
108 }
109
103 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, LocalStringsTest) { 110 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, LocalStringsTest) {
104 AddLibrary(IDR_WEBUI_JS_LOCAL_STRINGS); 111 AddLibrary(IDR_WEBUI_JS_LOCAL_STRINGS);
105 RunTest(base::FilePath(FILE_PATH_LITERAL("local_strings_test.html"))); 112 RunTest(base::FilePath(FILE_PATH_LITERAL("local_strings_test.html")));
106 } 113 }
107 114
108 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, PositionUtilTest) { 115 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, PositionUtilTest) {
109 AddLibrary(IDR_WEBUI_JS_CR); 116 AddLibrary(IDR_WEBUI_JS_CR);
110 AddLibrary(IDR_WEBUI_JS_CR_UI_POSITION_UTIL); 117 AddLibrary(IDR_WEBUI_JS_CR_UI_POSITION_UTIL);
111 RunTest(base::FilePath(FILE_PATH_LITERAL("position_util_test.html"))); 118 RunTest(base::FilePath(FILE_PATH_LITERAL("position_util_test.html")));
112 } 119 }
OLDNEW
« no previous file with comments | « chrome/test/data/webui/list_selection_model_test.html ('k') | chrome/test/data/webui/webui_resource_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698