Files app: Simplify getString in unittest

Change all unit tests inside ui/file_manager/file_manager/ to not
require each translation string, by returning the message id as the
translated string by default.

Some tests check against specific text, so only those specific texts
were kept.

Bug: 907966
Change-Id: I9d6ad880c6cb7105b7828819391878a682b3e6ed
Reviewed-on: https://chromium-review.googlesource.com/c/1349140Reviewed-by: Sam McNally <sammc@chromium.org>
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610535}

ui/file_manager/file_manager/background/js/crostini_unittest.js

@@ -10,7 +10,8 @@ window.loadTimeData = {
   data: {'DRIVE_FS_ENABLED': false},
   getBoolean: function(key) {
     return window.loadTimeData.data[key];
-  }
+  },
+  getString: id => id,
 };
 
 let volumeManagerRootType = 'testroot';

ui/file_manager/file_manager/background/js/device_handler_unittest.js

@@ -20,36 +20,17 @@ var volumeManager;
 /** @type {DeviceHandler} */
 var handler;
 
-// Set up string assets.
-loadTimeData.data = {
-  REMOVABLE_DEVICE_DETECTION_TITLE: 'Device detected',
-  REMOVABLE_DEVICE_NAVIGATION_MESSAGE: 'DEVICE_NAVIGATION',
-  REMOVABLE_DEVICE_NAVIGATION_BUTTON_LABEL: '',
-  REMOVABLE_DEVICE_IMPORT_MESSAGE: 'DEVICE_IMPORT',
-  REMOVABLE_DEVICE_IMPORT_BUTTON_LABEL: '',
-  DEVICE_UNKNOWN_BUTTON_LABEL: 'DEVICE_UNKNOWN_BUTTON_LABEL',
-  DEVICE_UNKNOWN_MESSAGE: 'DEVICE_UNKNOWN: $1',
-  DEVICE_UNKNOWN_DEFAULT_MESSAGE: 'DEVICE_UNKNOWN_DEFAULT_MESSAGE',
-  DEVICE_UNSUPPORTED_MESSAGE: 'DEVICE_UNSUPPORTED: $1',
-  DEVICE_HARD_UNPLUGGED_TITLE: 'DEVICE_HARD_UNPLUGGED_TITLE',
-  DEVICE_HARD_UNPLUGGED_MESSAGE: 'DEVICE_HARD_UNPLUGGED_MESSAGE',
-  DOWNLOADS_DIRECTORY_LABEL: 'DOWNLOADS_DIRECTORY_LABEL',
-  DRIVE_DIRECTORY_LABEL: 'DRIVE_DIRECTORY_LABEL',
-  MULTIPART_DEVICE_UNSUPPORTED_MESSAGE: 'MULTIPART_DEVICE_UNSUPPORTED: $1',
-  EXTERNAL_STORAGE_DISABLED_MESSAGE: 'EXTERNAL_STORAGE_DISABLED',
-  FORMATTING_OF_DEVICE_PENDING_TITLE: 'FORMATTING_OF_DEVICE_PENDING_TITLE',
-  FORMATTING_OF_DEVICE_PENDING_MESSAGE: 'FORMATTING_OF_DEVICE_PENDING',
-  FORMATTING_OF_DEVICE_FINISHED_TITLE: 'FORMATTING_OF_DEVICE_FINISHED_TITLE',
-  FORMATTING_FINISHED_SUCCESS_MESSAGE: 'FORMATTING_FINISHED_SUCCESS',
-  FORMATTING_OF_DEVICE_FAILED_TITLE: 'FORMATTING_OF_DEVICE_FAILED_TITLE',
-  FORMATTING_FINISHED_FAILURE_MESSAGE: 'FORMATTING_FINISHED_FAILURE',
-  RENAMING_OF_DEVICE_FAILED_TITLE: 'RENAMING_OF_DEVICE_FAILED_TITLE',
-  RENAMING_OF_DEVICE_FINISHED_FAILURE_MESSAGE:
-      'RENAMING_OF_DEVICE_FINISHED_FAILURE',
-};
-
 // Set up the test components.
 function setUp() {
+// Set up string assets.
+  window.loadTimeData.data = {
+    DEVICE_UNSUPPORTED_MESSAGE: 'DEVICE_UNSUPPORTED: $1',
+    DEVICE_UNKNOWN_MESSAGE: 'DEVICE_UNKNOWN: $1',
+    MULTIPART_DEVICE_UNSUPPORTED_MESSAGE: 'MULTIPART_DEVICE_UNSUPPORTED: $1',
+  };
+  window.loadTimeData.getString = id => {
+    return window.loadTimeData.data_[id] || id;
+  };
   new MockCommandLinePrivate();
   volumeManager = new MockVolumeManager();
   MockVolumeManager.installMockSingleton(volumeManager);
@@ -81,7 +62,8 @@ function testGoodDevice(callback) {
           function(notifications) {
             assertEquals(1, Object.keys(notifications).length);
             var options = notifications['deviceNavigation:/device/path'];
-            assertEquals('DEVICE_NAVIGATION', options.message);
+            assertEquals(
+                'REMOVABLE_DEVICE_NAVIGATION_MESSAGE', options.message);
             assertTrue(options.isClickable);
           }),
       callback);
@@ -184,7 +166,7 @@ function testMediaDeviceWithImportDisabled(callback) {
           function(notifications) {
             assertEquals(1, Object.keys(notifications).length);
             assertEquals(
-                'DEVICE_NAVIGATION',
+                'REMOVABLE_DEVICE_NAVIGATION_MESSAGE',
                 notifications[
                     'deviceNavigation:/device/path'].message,
                 'Device notification did not have the right message.');
@@ -265,7 +247,7 @@ function testGoodDeviceWithBadParent_DuplicateMount(callback) {
           function(notifications) {
             assertEquals(1, Object.keys(notifications).length);
             assertEquals(
-                'DEVICE_NAVIGATION',
+                'REMOVABLE_DEVICE_NAVIGATION_MESSAGE',
                 notifications['deviceNavigation:/device/path'].message);
           }),
       callback);
@@ -400,7 +382,7 @@ function testMountPartialSuccess(callback) {
           function(notifications) {
             assertEquals(1, Object.keys(notifications).length);
             assertEquals(
-                'DEVICE_NAVIGATION',
+                'REMOVABLE_DEVICE_NAVIGATION_MESSAGE',
                 notifications['deviceNavigation:/device/path'].message);
           }).then(function() {
             chrome.fileManagerPrivate.onMountCompleted.dispatch({
@@ -551,7 +533,7 @@ function testDisabledDevice() {
     devicePath: '/device/path'
   });
   assertEquals(1, Object.keys(chrome.notifications.items).length);
-  assertEquals('EXTERNAL_STORAGE_DISABLED',
+  assertEquals('EXTERNAL_STORAGE_DISABLED_MESSAGE',
                chrome.notifications.items['deviceFail:/device/path'].message);
 
   chrome.fileManagerPrivate.onDeviceChanged.dispatch({
@@ -567,7 +549,7 @@ function testFormatSucceeded() {
     devicePath: '/device/path'
   });
   assertEquals(1, Object.keys(chrome.notifications.items).length);
-  assertEquals('FORMATTING_OF_DEVICE_PENDING',
+  assertEquals('FORMATTING_OF_DEVICE_PENDING_MESSAGE',
                chrome.notifications.items['formatStart:/device/path'].message);
 
   chrome.fileManagerPrivate.onDeviceChanged.dispatch({
@@ -575,7 +557,7 @@ function testFormatSucceeded() {
     devicePath: '/device/path'
   });
   assertEquals(1, Object.keys(chrome.notifications.items).length);
-  assertEquals('FORMATTING_FINISHED_SUCCESS',
+  assertEquals('FORMATTING_FINISHED_SUCCESS_MESSAGE',
                chrome.notifications.items[
                    'formatSuccess:/device/path'].message);
 }
@@ -586,7 +568,7 @@ function testFormatFailed() {
     devicePath: '/device/path'
   });
   assertEquals(1, Object.keys(chrome.notifications.items).length);
-  assertEquals('FORMATTING_OF_DEVICE_PENDING',
+  assertEquals('FORMATTING_OF_DEVICE_PENDING_MESSAGE',
                chrome.notifications.items['formatStart:/device/path'].message);
 
   chrome.fileManagerPrivate.onDeviceChanged.dispatch({
@@ -594,7 +576,7 @@ function testFormatFailed() {
     devicePath: '/device/path'
   });
   assertEquals(1, Object.keys(chrome.notifications.items).length);
-  assertEquals('FORMATTING_FINISHED_FAILURE',
+  assertEquals('FORMATTING_FINISHED_FAILURE_MESSAGE',
                chrome.notifications.items['formatFail:/device/path'].message);
 }
 
@@ -617,7 +599,7 @@ function testRenameFailed() {
       {type: 'rename_fail', devicePath: '/device/path'});
   assertEquals(1, Object.keys(chrome.notifications.items).length);
   assertEquals(
-      'RENAMING_OF_DEVICE_FINISHED_FAILURE',
+      'RENAMING_OF_DEVICE_FINISHED_FAILURE_MESSAGE',
       chrome.notifications.items['renameFail:/device/path'].message);
 }
 

ui/file_manager/file_manager/background/js/duplicate_finder_unittest.js

@@ -29,20 +29,12 @@ var testHistory;
 /** @type {importer.DispositionChecker.CheckerFunction} */
 var getDisposition;
 
-// Set up string assets.
-loadTimeData.data = {
-  CLOUD_IMPORT_ITEMS_REMAINING: '',
-  DRIVE_DIRECTORY_LABEL: 'My Drive',
-  DRIVE_OFFLINE_COLLECTION_LABEL: 'Offline',
-  DRIVE_SHARED_WITH_ME_COLLECTION_LABEL: 'Shared with me',
-  DOWNLOADS_DIRECTORY_LABEL: 'Downloads',
-};
-
 window.metrics = {
   recordTime: function() {},
 };
 
 function setUp() {
+  window.loadTimeData.getString = id => id;
   let mockChrome = {
     fileManagerPrivate: {
       /**

ui/file_manager/file_manager/background/js/file_operation_handler_unittest.js

@@ -13,7 +13,7 @@ var handler = null;
 // Set up the test components.
 function setUp() {
   // Set up string assets.
-  loadTimeData.data = {
+  window.loadTimeData.data = {
     COPY_FILE_NAME: 'Copying $1...',
     COPY_TARGET_EXISTS_ERROR: '$1 is already exists.',
     COPY_FILESYSTEM_ERROR: 'Copy filesystem error: $1',

ui/file_manager/file_manager/background/js/media_import_handler_unittest.js

@@ -35,15 +35,6 @@ var destinationFactory;
 /** @type {!MockDriveSyncHandler} */
 var driveSyncHandler;
 
-// Set up string assets.
-loadTimeData.data = {
-  CLOUD_IMPORT_ITEMS_REMAINING: '',
-  DRIVE_DIRECTORY_LABEL: 'My Drive',
-  DOWNLOADS_DIRECTORY_LABEL: 'Downloads',
-  DRIVE_OFFLINE_COLLECTION_LABEL: 'Offline',
-  DRIVE_SHARED_WITH_ME_COLLECTION_LABEL: 'Shared with me',
-};
-
 var chrome;
 
 window.metrics = {
@@ -54,6 +45,7 @@ window.metrics = {
 };
 
 function setUp() {
+  window.loadTimeData.getString = id => id;
   // Set up mock chrome APIs.
   chrome = {
     power: {

ui/file_manager/file_manager/background/js/volume_manager_unittest.js

@@ -4,13 +4,10 @@
 
 let mockChrome;
 
-loadTimeData.data = {
-  DRIVE_DIRECTORY_LABEL: 'My Drive',
-  DOWNLOADS_DIRECTORY_LABEL: 'Downloads',
-  ANDROID_FILES_ROOT_LABEL: 'Play files'
-};
-
 function setUp() {
+  window.loadTimeData.getString = id => id;
+  window.loadTimeData.data = {};
+
   // Set up mock of chrome.fileManagerPrivate APIs.
   mockChrome = {
     runtime: {lastError: undefined},

ui/file_manager/file_manager/common/js/importer_common_unittest.js

@@ -26,14 +26,9 @@ let sdFileEntry;
 /** @type {!MockFileEntry} */
 let driveFileEntry;
 
-// Sadly, boilerplate setup necessary to include test support classes.
-loadTimeData.data = {
-  DRIVE_DIRECTORY_LABEL: 'My Drive',
-  DOWNLOADS_DIRECTORY_LABEL: 'Downloads'
-};
-
 // Set up the test components.
 function setUp() {
+  window.loadTimeData.getString = id => id;
   new MockCommandLinePrivate();
   new MockChromeStorageAPI();
   importer.setupTestLogger();

ui/file_manager/file_manager/common/js/util_unittest.js

@@ -24,9 +24,7 @@ function setUp() {
   ];
   fileSystem.populate(filenames);
 
-  window.loadTimeData = {
-    getString: id => id,
-  };
+  window.loadTimeData.getString = id => id;
 }
 
 function testReadEntriesRecursively(callback) {

ui/file_manager/file_manager/foreground/js/actions_model_unittest.js

@@ -10,11 +10,6 @@ var ui = null;
 var driveFileSystem = null;
 var providedFileSystem = null;
 
-loadTimeData.data = {
-  DRIVE_DIRECTORY_LABEL: '',
-  DOWNLOADS_DIRECTORY_LABEL: ''
-};
-
 function MockFolderShortcutsModel() {
   this.has = false;
 }
@@ -54,6 +49,8 @@ function MockUI() {
 }
 
 function setUp() {
+  window.loadTimeData.getString = id => id;
+  window.loadTimeData.data = {};
   window.chrome = {
     runtime: {
       lastError: null

ui/file_manager/file_manager/foreground/js/import_controller_unittest.js

@@ -29,24 +29,6 @@ var widget;
 /** @type {!DirectoryEntry} */
 var nonDcimDirectory;
 
-/**
- * @enum {string}
- */
-var MESSAGES = {
-  CLOUD_IMPORT_BUTTON_LABEL: 'Import it!',
-  CLOUD_IMPORT_ACTIVE_IMPORT_BUTTON_LABEL: 'Already importing!',
-  CLOUD_IMPORT_EMPTY_SCAN_BUTTON_LABEL: 'No new media',
-  CLOUD_IMPORT_INSUFFICIENT_SPACE_BUTTON_LABEL: 'Not enough space!',
-  CLOUD_IMPORT_SCANNING_BUTTON_LABEL: 'Scanning... ...!',
-  DOWNLOADS_DIRECTORY_LABEL: 'Downloads',
-  DRIVE_DIRECTORY_LABEL: 'My Drive',
-  DRIVE_OFFLINE_COLLECTION_LABEL: 'Offline',
-  DRIVE_SHARED_WITH_ME_COLLECTION_LABEL: 'Shared with me',
-};
-
-// Set up string assets.
-loadTimeData.data = MESSAGES;
-
 window.metrics = {
   recordSmallCount: function() {},
   recordUserAction: function() {},
@@ -55,6 +37,8 @@ window.metrics = {
 };
 
 function setUp() {
+  window.loadTimeData.getString = id => id;
+  window.loadTimeData.data = {};
   new MockChromeStorageAPI();
   new MockCommandLinePrivate();
 

ui/file_manager/file_manager/foreground/js/navigation_list_model_unittest.js

@@ -8,24 +8,16 @@ var drive;
 /** @type {!MockFileSystem} Simulate a removable volume. */
 var hoge;
 
-// Set up string assets.
-loadTimeData.data = {
-  DRIVE_DIRECTORY_LABEL: 'My Drive',
-  DRIVE_MY_DRIVE_LABEL: 'My Drive',
-  DRIVE_TEAM_DRIVES_LABEL: 'Team Drives',
-  DRIVE_OFFLINE_COLLECTION_LABEL: 'Offline',
-  DRIVE_SHARED_WITH_ME_COLLECTION_LABEL: 'Shared with me',
-  DRIVE_RECENT_COLLECTION_LABEL: 'Recents',
-  DOWNLOADS_DIRECTORY_LABEL: 'Downloads',
-  LINUX_FILES_ROOT_LABEL: 'Linux files',
-  MY_FILES_ROOT_LABEL: 'My files',
-  RECENT_ROOT_LABEL: 'Recent',
-  MEDIA_VIEW_IMAGES_ROOT_LABEL: 'Images',
-  MEDIA_VIEW_VIDEOS_ROOT_LABEL: 'Videos',
-  MEDIA_VIEW_AUDIO_ROOT_LABEL: 'Audio',
-};
-
 function setUp() {
+  window.loadTimeData.data = {
+    MY_FILES_VOLUME_ENABLED: false,
+    MY_FILES_ROOT_LABEL: 'My files',
+    DOWNLOADS_DIRECTORY_LABEL: 'Downloads',
+    DRIVE_DIRECTORY_LABEL: 'My Drive',
+  };
+  window.loadTimeData.getString = id => {
+    return window.loadTimeData.data_[id] || id;
+  };
   new MockCommandLinePrivate();
   // Override VolumeInfo.prototype.resolveDisplayRoot to be sync.
   VolumeInfoImpl.prototype.resolveDisplayRoot = function(successCallback) {
@@ -37,7 +29,6 @@ function setUp() {
   drive = new MockFileSystem('drive');
   hoge = new MockFileSystem('removable:hoge');
 
-  loadTimeData.data_['MY_FILES_VOLUME_ENABLED'] = false;
 }
 
 function testModel() {

ui/file_manager/file_manager/foreground/js/progress_center_item_group_unittest.js

@@ -4,11 +4,14 @@
 'use strict';
 
 // Prepare the string assets.
-loadTimeData.data = {
+window.loadTimeData.data = {
   COPY_PROGRESS_SUMMARY: 'Copying...',
   ERROR_PROGRESS_SUMMARY: '1 Error.',
   ERROR_PROGRESS_SUMMARY_PLURAL: '$1 Errors.'
 };
+window.loadTimeData.getString = id => {
+  return window.loadTimeData.data_[id] || id;
+};
 
 function testSimpleProgress() {
   var group = new ProgressCenterItemGroup(/* name */ 'test', /* quite */ false);

ui/file_manager/file_manager/foreground/js/providers_model_unittest.js

@@ -2,18 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * Load time data.
- * @type {Object}
- */
-loadTimeData.data = {
-  DOWNLOADS_DIRECTORY_LABEL: 'Downloads',
-  DRIVE_DIRECTORY_LABEL: 'Google Drive',
-  DRIVE_MY_DRIVE_LABEL: 'My Drive',
-  DRIVE_OFFLINE_COLLECTION_LABEL: 'Offline',
-  DRIVE_SHARED_WITH_ME_COLLECTION_LABEL: 'Shared with me',
-};
-
 /**
  * Providing extension which has a mounted file system and doesn't support
  * multiple mounts.
@@ -140,6 +128,8 @@ function addProvidedVolume(volumeManager, providerId, volumeId) {
 }
 
 function setUp() {
+  window.loadTimeData.getString = id => id;
+
   // Create and install a mock fileManagerPrivate API for fetching the list of
   // providers. TODO(mtomasz): Add some native (non-extension) providers.
   let mockChrome = {

ui/file_manager/file_manager/foreground/js/ui/directory_tree_unittest.js

@@ -7,24 +7,9 @@ var mockCommandLinePrivate;
 var metrics;
 var onDirectoryChangedListeners;
 
-/**
- * Set string data.
- * @type {Object}
- */
-loadTimeData.data = {
-  DOWNLOADS_DIRECTORY_LABEL: 'Downloads',
-  DRIVE_DIRECTORY_LABEL: 'Google Drive',
-  DRIVE_MY_DRIVE_LABEL: 'My Drive',
-  DRIVE_TEAM_DRIVES_LABEL: 'Team Drives',
-  DRIVE_COMPUTERS_LABEL: 'Computers',
-  DRIVE_OFFLINE_COLLECTION_LABEL: 'Offline',
-  DRIVE_SHARED_WITH_ME_COLLECTION_LABEL: 'Shared with me',
-  REMOVABLE_DIRECTORY_LABEL: 'External Storage',
-  ARCHIVE_DIRECTORY_LABEL: 'Archives',
-  MY_FILES_ROOT_LABEL: 'My files',
-};
-
 function setUp() {
+  window.loadTimeData.getString = id => id;
+  window.loadTimeData.data = {};
   chrome = {
     fileManagerPrivate: {
       onDirectoryChanged: {