Commit 59da55b2 authored by Noel Gordon's avatar Noel Gordon Committed by Commit Bot

Integration tests task.js: update test names

Drop the "On" prefixing of the volume type (like all the other tests).

Tbr: fukino
No-Presubmit: true
Bug: 836254
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: If891b0d4fc5baf1445ca892f6490fe20b44d4d67
Reviewed-on: https://chromium-review.googlesource.com/1057208Reviewed-by: default avatarNoel Gordon <noel@chromium.org>
Commit-Queue: Noel Gordon <noel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558269}
parent 28f4b5cb
...@@ -277,29 +277,29 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( ...@@ -277,29 +277,29 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
ExecuteDefaultTaskOnDownloads, ExecuteDefaultTaskOnDownloads,
FileManagerBrowserTest, FileManagerBrowserTest,
::testing::Values( ::testing::Values(
TestParameter(NOT_IN_GUEST_MODE, "executeDefaultTaskOnDownloads"), TestParameter(NOT_IN_GUEST_MODE, "executeDefaultTaskDownloads"),
TestParameter(IN_GUEST_MODE, "executeDefaultTaskOnDownloads"))); TestParameter(IN_GUEST_MODE, "executeDefaultTaskDownloads")));
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
ExecuteDefaultTaskOnDrive, ExecuteDefaultTaskOnDrive,
FileManagerBrowserTest, FileManagerBrowserTest,
::testing::Values(TestParameter(NOT_IN_GUEST_MODE, ::testing::Values(TestParameter(NOT_IN_GUEST_MODE,
"executeDefaultTaskOnDrive"))); "executeDefaultTaskDrive")));
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
DefaultTaskDialog, DefaultTaskDialog,
FileManagerBrowserTest, FileManagerBrowserTest,
::testing::Values( ::testing::Values(
TestParameter(NOT_IN_GUEST_MODE, "defaultTaskDialogOnDownloads"), TestParameter(NOT_IN_GUEST_MODE, "defaultTaskDialogDownloads"),
TestParameter(IN_GUEST_MODE, "defaultTaskDialogOnDownloads"), TestParameter(IN_GUEST_MODE, "defaultTaskDialogDownloads"),
TestParameter(NOT_IN_GUEST_MODE, "defaultTaskDialogOnDrive"))); TestParameter(NOT_IN_GUEST_MODE, "defaultTaskDialogDrive")));
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
GenericTask, GenericTask,
FileManagerBrowserTest, FileManagerBrowserTest,
::testing::Values( ::testing::Values(
TestParameter(NOT_IN_GUEST_MODE, "genericTaskIsNotExecuted"), TestParameter(NOT_IN_GUEST_MODE, "genericTaskIsNotExecuted"),
TestParameter(NOT_IN_GUEST_MODE, "genericAndNonGenericTasksAreMixed"))); TestParameter(NOT_IN_GUEST_MODE, "genericTaskAndNonGenericTask")));
WRAPPED_INSTANTIATE_TEST_CASE_P( WRAPPED_INSTANTIATE_TEST_CASE_P(
FolderShortcuts, FolderShortcuts,
......
...@@ -214,22 +214,22 @@ function defaultTaskDialog(expectedTaskId, windowId) { ...@@ -214,22 +214,22 @@ function defaultTaskDialog(expectedTaskId, windowId) {
}); });
} }
testcase.executeDefaultTaskOnDrive = function() { testcase.executeDefaultTaskDrive = function() {
testPromise(setupTaskTest(RootPath.DRIVE, DRIVE_FAKE_TASKS).then( testPromise(setupTaskTest(RootPath.DRIVE, DRIVE_FAKE_TASKS).then(
executeDefaultTask.bind(null, 'dummytaskid|drive|open-with'))); executeDefaultTask.bind(null, 'dummytaskid|drive|open-with')));
}; };
testcase.executeDefaultTaskOnDownloads = function() { testcase.executeDefaultTaskDownloads = function() {
testPromise(setupTaskTest(RootPath.DOWNLOADS, DOWNLOADS_FAKE_TASKS).then( testPromise(setupTaskTest(RootPath.DOWNLOADS, DOWNLOADS_FAKE_TASKS).then(
executeDefaultTask.bind(null, 'dummytaskid|open-with'))); executeDefaultTask.bind(null, 'dummytaskid|open-with')));
}; };
testcase.defaultTaskDialogOnDrive = function() { testcase.defaultTaskDialogDrive = function() {
testPromise(setupTaskTest(RootPath.DRIVE, DRIVE_FAKE_TASKS).then( testPromise(setupTaskTest(RootPath.DRIVE, DRIVE_FAKE_TASKS).then(
defaultTaskDialog.bind(null, 'dummytaskid-2|drive|open-with'))); defaultTaskDialog.bind(null, 'dummytaskid-2|drive|open-with')));
}; };
testcase.defaultTaskDialogOnDownloads = function() { testcase.defaultTaskDialogDownloads = function() {
testPromise(setupTaskTest(RootPath.DOWNLOADS, DOWNLOADS_FAKE_TASKS).then( testPromise(setupTaskTest(RootPath.DOWNLOADS, DOWNLOADS_FAKE_TASKS).then(
defaultTaskDialog.bind(null, 'dummytaskid-2|open-with'))); defaultTaskDialog.bind(null, 'dummytaskid-2|open-with')));
}; };
...@@ -253,7 +253,7 @@ testcase.genericTaskIsNotExecuted = function() { ...@@ -253,7 +253,7 @@ testcase.genericTaskIsNotExecuted = function() {
})); }));
}; };
testcase.genericAndNonGenericTasksAreMixed = function() { testcase.genericTaskAndNonGenericTask = function() {
var tasks = [ var tasks = [
new FakeTask(false, 'dummytaskid|open-with', 'DummyTask1', new FakeTask(false, 'dummytaskid|open-with', 'DummyTask1',
true /* isGenericFileHandler */), true /* isGenericFileHandler */),
......
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