Skip to content

GitLab

T
tangled
Commit 84b63242 authored by Noel Gordon's avatar Noel Gordon Committed by Commit Bot
Browse files
Options

Closure compile navigation_list_model_unittest 

 - remove navigation_list_model_unittest.html
 - add BUILD rules to auto-generate and compile this unittest
 - fix MockFolderShortcutDataModel BUILD rule
   - MockFolderShortcutDataModel depends on ui:array_data_model
 - fix FolderShortcutsDataModel BUILD rule
   - FolderShortcutsDataModel depends on cr:event_target
 - add prefix comments to all test cases
   - test cases should describe their intent
 - fix Closure compile errors

Bug: 910991
Change-Id: I8ba2ad3e917473b83011871d94cf17b80ad64d31
Reviewed-on: https://chromium-review.googlesource.com/c/1356731
Commit-Queue: Noel Gordon <noel@chromium.org>
Reviewed-by: default avatarSam McNally <sammc@chromium.org>
Reviewed-by: default avatarLuciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613016}
parent 471524ed
Expand all Show whitespace changes
Inline Side-by-side
Showing with 199 additions and 110 deletions
chrome/browser/chromeos/file_manager/file_manager_jstest.cc
View file @ 84b63242
...@@ -20,8 +20,7 @@ IN_PROC_BROWSER_TEST_F(FileManagerJsTest, ActionsModelTest) { ...@@ -20,8 +20,7 @@ IN_PROC_BROWSER_TEST_F(FileManagerJsTest, ActionsModelTest) {
} }
IN_PROC_BROWSER_TEST_F(FileManagerJsTest, NavigationListModelTest) { IN_PROC_BROWSER_TEST_F(FileManagerJsTest, NavigationListModelTest) {
RunTest(base::FilePath( RunGeneratedTest("/foreground/js/navigation_list_model_unittest.html");
FILE_PATH_LITERAL("foreground/js/navigation_list_model_unittest.html")));
} }
IN_PROC_BROWSER_TEST_F(FileManagerJsTest, FileOperationHandlerTest) { IN_PROC_BROWSER_TEST_F(FileManagerJsTest, FileOperationHandlerTest) {
......
ui/file_manager/file_manager/foreground/js/BUILD.gn
View file @ 84b63242
...@@ -165,6 +165,7 @@ js_library("mock_folder_shortcut_data_model") { ...@@ -165,6 +165,7 @@ js_library("mock_folder_shortcut_data_model") {
testonly = true testonly = true
deps = [ deps = [
"//ui/file_manager/file_manager/common/js:mock_entry", "//ui/file_manager/file_manager/common/js:mock_entry",
"//ui/webui/resources/js/cr/ui:array_data_model",
] ]
} }
...@@ -406,6 +407,7 @@ js_library("folder_shortcuts_data_model") { ...@@ -406,6 +407,7 @@ js_library("folder_shortcuts_data_model") {
"//ui/file_manager/file_manager/common/js:async_util", "//ui/file_manager/file_manager/common/js:async_util",
"//ui/file_manager/file_manager/common/js:metrics", "//ui/file_manager/file_manager/common/js:metrics",
"//ui/file_manager/file_manager/common/js:util", "//ui/file_manager/file_manager/common/js:util",
"//ui/webui/resources/js/cr:event_target",
] ]
} }
...@@ -526,6 +528,16 @@ js_library("navigation_list_model") { ...@@ -526,6 +528,16 @@ js_library("navigation_list_model") {
] ]
} }
js_unittest("navigation_list_model_unittest") {
deps = [
":mock_folder_shortcut_data_model",
":navigation_list_model",
"//ui/file_manager/base/js:mock_chrome",
"//ui/file_manager/base/js:test_error_reporting",
"//ui/file_manager/file_manager/background/js:mock_volume_manager",
]
}
js_library("progress_center_item_group") { js_library("progress_center_item_group") {
deps = [ deps = [
"../../common/js:progress_center_common", "../../common/js:progress_center_common",
...@@ -699,6 +711,7 @@ js_library("webui_command_extender") { ...@@ -699,6 +711,7 @@ js_library("webui_command_extender") {
js_unit_tests("unit_tests") { js_unit_tests("unit_tests") {
deps = [ deps = [
":file_list_model_unittest", ":file_list_model_unittest",
":navigation_list_model_unittest",
":progress_center_item_group_unittest", ":progress_center_item_group_unittest",
":providers_model_unittest", ":providers_model_unittest",
":spinner_controller_unittest", ":spinner_controller_unittest",
......
ui/file_manager/file_manager/foreground/js/mock_folder_shortcut_data_model.js
View file @ 84b63242
...@@ -3,13 +3,14 @@ ...@@ -3,13 +3,14 @@
// found in the LICENSE file. // found in the LICENSE file.
/** /**
* Mock class for FolderShortcutDataModel. * Mock FolderShortcutDataModel.
* @param {...MockEntry} var_args List of the initial shortcuts. * @param {!Array<MockEntry>} args Array of shortcuts.
*
* @extends {cr.ui.ArrayDataModel} * @extends {cr.ui.ArrayDataModel}
* @constructor * @constructor
*/ */
function MockFolderShortcutDataModel(var_args) { function MockFolderShortcutDataModel(...args) {
cr.ui.ArrayDataModel.apply(this, arguments); cr.ui.ArrayDataModel.apply(this, args);
} }
MockFolderShortcutDataModel.prototype = { MockFolderShortcutDataModel.prototype = {
......
ui/file_manager/file_manager/foreground/js/navigation_list_model_unittest.html deleted 100644 → 0
View file @ 471524ed
<!DOCTYPE html>
<!-- Copyright 2014 The Chromium Authors. All rights reserved.
-- Use of this source code is governed by a BSD-style license that can be
-- found in the LICENSE file.
-->
<cr-menu id="add-new-services-menu">
</cr-menu>
<script src="../../../../../ui/webui/resources/js/cr.js"></script>
<script src="../../../../../ui/webui/resources/js/cr/ui.js"></script>
<script src="../../../../../ui/webui/resources/js/cr/event_target.js"></script>
<script src="../../../../../ui/webui/resources/js/cr/ui/array_data_model.js"></script>
<script src="../../../../../ui/webui/resources/js/load_time_data.js"></script>
<script src="../../common/js/files_app_entry_types.js"></script>
<script src="../../../base/js/volume_manager_types.js"></script>
<script src="../../background/js/volume_info_impl.js"></script>
<script src="../../background/js/volume_info_list_impl.js"></script>
<script src="../../background/js/volume_manager_factory.js"></script>
<script src="../../background/js/volume_manager_impl.js"></script>
<script src="../../background/js/volume_manager_util.js"></script>
<script src="../../background/js/mock_volume_manager.js"></script>
<script src="../../common/js/async_util.js"></script>
<script src="../../common/js/mock_entry.js"></script>
<script src="../../../base/js/test_error_reporting.js"></script>
<script src="../../../base/js/mock_chrome.js"></script>
<script src="../../common/js/unittest_util.js"></script>
<script src="../../common/js/util.js"></script>
<script src="mock_folder_shortcut_data_model.js"></script>
<script src="navigation_list_model.js"></script>
<script src="navigation_list_model_unittest.js"></script>
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