Skip to content

GitLab

T
tangled
Commit 4c864ba3 authored by Stuart Langley's avatar Stuart Langley Committed by Commit Bot
Browse files
Options

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: default avatarNoel Gordon <noel@chromium.org>
Commit-Queue: Stuart Langley <slangley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609569}
parent 9d11eb1d
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 26 deletions
chrome/browser/chromeos/file_manager/file_manager_jstest.cc
View file @ 4c864ba3
...@@ -164,8 +164,7 @@ IN_PROC_BROWSER_TEST_F(FileManagerJsTest, MetadataModel) { ...@@ -164,8 +164,7 @@ IN_PROC_BROWSER_TEST_F(FileManagerJsTest, MetadataModel) {
} }
IN_PROC_BROWSER_TEST_F(FileManagerJsTest, ThumbnailModel) { IN_PROC_BROWSER_TEST_F(FileManagerJsTest, ThumbnailModel) {
RunTest(base::FilePath(FILE_PATH_LITERAL( RunGeneratedTest("/foreground/js/metadata/thumbnail_model_unittest.html");
"foreground/js/metadata/thumbnail_model_unittest.html")));
} }
IN_PROC_BROWSER_TEST_F(FileManagerJsTest, ExifParser) { IN_PROC_BROWSER_TEST_F(FileManagerJsTest, ExifParser) {
......
ui/file_manager/file_manager/foreground/js/metadata/BUILD.gn
View file @ 4c864ba3
...@@ -203,9 +203,18 @@ js_library("thumbnail_model") { ...@@ -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") { js_unit_tests("unit_tests") {
deps = [ deps = [
":image_orientation_unittest", ":image_orientation_unittest",
":thumbnail_model_unittest",
] ]
} }
......
ui/file_manager/file_manager/foreground/js/metadata/thumbnail_model_unittest.html deleted 100644 → 0
View file @ 9d11eb1d
<!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>
ui/file_manager/file_manager/foreground/js/metadata/thumbnail_model_unittest.js
View file @ 4c864ba3
...@@ -12,6 +12,18 @@ var nonImageEntry = { ...@@ -12,6 +12,18 @@ var nonImageEntry = {
toURL: function() { return 'filesystem://B'; } toURL: function() { return 'filesystem://B'; }
}; };
const contentThumbnailTransform = {
scaleX: 0,
scaleY: 0,
rotate90: 0,
};
const imageTransformation = {
scaleX: 1,
scaleY: 1,
rotate90: 2,
};
var metadata; var metadata;
var contentMetadata; var contentMetadata;
var thumbnailModel; var thumbnailModel;
...@@ -23,10 +35,10 @@ function setUp() { ...@@ -23,10 +35,10 @@ function setUp() {
metadata.thumbnailUrl = 'EXTERNAL_THUMBNAIL_URL'; metadata.thumbnailUrl = 'EXTERNAL_THUMBNAIL_URL';
metadata.customIconUrl = 'CUSTOM_ICON_URL'; metadata.customIconUrl = 'CUSTOM_ICON_URL';
metadata.contentThumbnailUrl = 'CONTENT_THUMBNAIL_URL'; metadata.contentThumbnailUrl = 'CONTENT_THUMBNAIL_URL';
metadata.contentThumbnailTransform = 'CONTENT_THUMBNAIL_TRANSFORM'; metadata.contentThumbnailTransform = contentThumbnailTransform;
metadata.contentImageTransform = 'CONTENT_IMAGE_TRANSFORM'; metadata.contentImageTransform = imageTransformation;
thumbnailModel = new ThumbnailModel({ thumbnailModel = new ThumbnailModel(/** @type {!MetadataModel} */ ({
get: function(entries, names) { get: function(entries, names) {
var result = new MetadataItem(); var result = new MetadataItem();
for (var i = 0; i < names.length; i++) { for (var i = 0; i < names.length; i++) {
...@@ -34,7 +46,8 @@ function setUp() { ...@@ -34,7 +46,8 @@ function setUp() {
result[name] = metadata[name]; result[name] = metadata[name];
} }
return Promise.resolve([result]); return Promise.resolve([result]);
}}); }
}));
} }
function testThumbnailModelGetBasic(callback) { function testThumbnailModelGetBasic(callback) {
...@@ -47,8 +60,8 @@ function testThumbnailModelGetBasic(callback) { ...@@ -47,8 +60,8 @@ function testThumbnailModelGetBasic(callback) {
assertEquals('CUSTOM_ICON_URL', results[0].external.customIconUrl); assertEquals('CUSTOM_ICON_URL', results[0].external.customIconUrl);
assertTrue(results[0].external.present); assertTrue(results[0].external.present);
assertEquals('CONTENT_THUMBNAIL_URL', results[0].thumbnail.url); assertEquals('CONTENT_THUMBNAIL_URL', results[0].thumbnail.url);
assertEquals('CONTENT_THUMBNAIL_TRANSFORM', results[0].thumbnail.transform); assertEquals(contentThumbnailTransform, results[0].thumbnail.transform);
assertEquals('CONTENT_IMAGE_TRANSFORM', results[0].media.imageTransform); assertEquals(imageTransformation, results[0].media.imageTransform);
}), callback); }), callback);
} }
......
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