Closure compile thumbnail_model_unittest.js

- Remove the .html file - Add BUILD target for thumbnail_model_unittest.js - Fix closure errors in the unittest.js files. No change in behaviour. Bug: 906896 Change-Id: I12d83ee0f3192565d6248d8f862c9c9e1a199f00 Reviewed-on: https://chromium-review.googlesource.com/c/1343578Reviewed-by: Noel Gordon <noel@chromium.org> Commit-Queue: Stuart Langley <slangley@chromium.org> Cr-Commit-Position: refs/heads/master@{#609569}

Closure compile thumbnail_model_unittest.js
- Remove the .html file - Add BUILD target for thumbnail_model_unittest.js - Fix closure errors in the unittest.js files. No change in behaviour. Bug: 906896 Change-Id: I12d83ee0f3192565d6248d8f862c9c9e1a199f00 Reviewed-on: https://chromium-review.googlesource.com/c/1343578Reviewed-by: Noel Gordon <noel@chromium.org> Commit-Queue: Stuart Langley <slangley@chromium.org> Cr-Commit-Position: refs/heads/master@{#609569}
4c864ba3 · Stuart Langley · Commit Bot · 9d11eb1d · 4c864ba3 · 4c864ba3
Commit 4c864ba3 authored Nov 20, 2018 by Stuart Langley Committed by Commit Bot Nov 20, 2018
4 changed files
--- a/chrome/browser/chromeos/file_manager/file_manager_jstest.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_jstest.cc
@@ -164,8 +164,7 @@ IN_PROC_BROWSER_TEST_F(FileManagerJsTest, MetadataModel) {
 }

 IN_PROC_BROWSER_TEST_F(FileManagerJsTest, ThumbnailModel) {
-  RunTest(base::FilePath(FILE_PATH_LITERAL(
-      "foreground/js/metadata/thumbnail_model_unittest.html")));
+  RunGeneratedTest("/foreground/js/metadata/thumbnail_model_unittest.html");
 }

 IN_PROC_BROWSER_TEST_F(FileManagerJsTest, ExifParser) {

--- a/ui/file_manager/file_manager/foreground/js/metadata/BUILD.gn
+++ b/ui/file_manager/file_manager/foreground/js/metadata/BUILD.gn
@@ -203,9 +203,18 @@ js_library("thumbnail_model") {
  ]
 }

+js_unittest("thumbnail_model_unittest") {
+  deps = [
+    ":thumbnail_model",
+    "//ui/file_manager/base/js:test_error_reporting",
+    "//ui/webui/resources/js:webui_resource_test",
+  ]
+}
+
 js_unit_tests("unit_tests") {
  deps = [
    ":image_orientation_unittest",
+    ":thumbnail_model_unittest",
  ]
 }


--- a/ui/file_manager/file_manager/foreground/js/metadata/thumbnail_model_unittest.html
+++ b/ui/file_manager/file_manager/foreground/js/metadata/thumbnail_model_unittest.html
-<!DOCTYPE html>
-<!-- Copyright 2015 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.
-  -->
-<script src="../../../common/js/file_type.js"></script>
-<script src="../../../../base/js/test_error_reporting.js"></script>
-<script src="metadata_item.js"></script>
-<script src="thumbnail_model.js"></script>
-
-<script src="thumbnail_model_unittest.js"></script>
--- a/ui/file_manager/file_manager/foreground/js/metadata/thumbnail_model_unittest.js
+++ b/ui/file_manager/file_manager/foreground/js/metadata/thumbnail_model_unittest.js
@@ -12,6 +12,18 @@ var nonImageEntry = {
  toURL: function() { return 'filesystem://B'; }
 };

+const contentThumbnailTransform = {
+  scaleX: 0,
+  scaleY: 0,
+  rotate90: 0,
+};
+
+const imageTransformation = {
+  scaleX: 1,
+  scaleY: 1,
+  rotate90: 2,
+};
+
 var metadata;
 var contentMetadata;
 var thumbnailModel;
@@ -23,18 +35,19 @@ function setUp() {
  metadata.thumbnailUrl = 'EXTERNAL_THUMBNAIL_URL';
  metadata.customIconUrl = 'CUSTOM_ICON_URL';
  metadata.contentThumbnailUrl = 'CONTENT_THUMBNAIL_URL';
-  metadata.contentThumbnailTransform = 'CONTENT_THUMBNAIL_TRANSFORM';
-  metadata.contentImageTransform = 'CONTENT_IMAGE_TRANSFORM';
+  metadata.contentThumbnailTransform = contentThumbnailTransform;
+  metadata.contentImageTransform = imageTransformation;

-  thumbnailModel = new ThumbnailModel({
-      get: function(entries, names) {
-        var result = new MetadataItem();
-        for (var i = 0; i < names.length; i++) {
-          var name = names[i];
-          result[name] = metadata[name];
-        }
-        return Promise.resolve([result]);
-      }});
+  thumbnailModel = new ThumbnailModel(/** @type {!MetadataModel} */ ({
+    get: function(entries, names) {
+      var result = new MetadataItem();
+      for (var i = 0; i < names.length; i++) {
+        var name = names[i];
+        result[name] = metadata[name];
+      }
+      return Promise.resolve([result]);
+    }
+  }));
 }

 function testThumbnailModelGetBasic(callback) {
@@ -47,8 +60,8 @@ function testThumbnailModelGetBasic(callback) {
    assertEquals('CUSTOM_ICON_URL', results[0].external.customIconUrl);
    assertTrue(results[0].external.present);
    assertEquals('CONTENT_THUMBNAIL_URL', results[0].thumbnail.url);
-    assertEquals('CONTENT_THUMBNAIL_TRANSFORM', results[0].thumbnail.transform);
-    assertEquals('CONTENT_IMAGE_TRANSFORM', results[0].media.imageTransform);
+    assertEquals(contentThumbnailTransform, results[0].thumbnail.transform);
+    assertEquals(imageTransformation, results[0].media.imageTransform);
  }), callback);
 }