Index: ui/file_manager/file_manager/foreground/js/metadata/file_system_metadata_provider_unittest.js |
diff --git a/ui/file_manager/file_manager/foreground/js/metadata/file_system_metadata_provider_unittest.js b/ui/file_manager/file_manager/foreground/js/metadata/file_system_metadata_provider_unittest.js |
index 3f81abd80c8b30daf562f4be7fea8c084caa0664..77116bbeb830cb713f438a1c7c8b0e6cd795e54c 100644 |
--- a/ui/file_manager/file_manager/foreground/js/metadata/file_system_metadata_provider_unittest.js |
+++ b/ui/file_manager/file_manager/foreground/js/metadata/file_system_metadata_provider_unittest.js |
@@ -40,45 +40,45 @@ function setUp() { |
} |
function testFileSystemMetadataProviderBasic(callback) { |
- var cache = new MetadataProviderCache(); |
- var provider = new FileSystemMetadataProvider(cache); |
- reportPromise(provider.get( |
- [entryA, entryB], |
- ['modificationTime', 'size', 'contentMimeType', |
- 'present', 'availableOffline']).then( |
- function(results) { |
- assertEquals(2, results.length); |
- assertEquals( |
- new Date(2015, 1, 1).toString(), |
- results[0].modificationTime.toString()); |
- assertEquals(1024, results[0].size); |
- assertEquals('application/A', results[0].contentMimeType); |
- assertTrue(results[0].present); |
- assertTrue(results[0].availableOffline); |
- assertEquals( |
- new Date(2015, 2, 2).toString(), |
- results[1].modificationTime.toString()); |
- assertEquals(2048, results[1].size); |
- assertEquals('application/B', results[1].contentMimeType); |
- assertTrue(results[1].present); |
- assertTrue(results[1].availableOffline); |
- }), callback); |
+ var provider = new FileSystemMetadataProvider(); |
+ var names = [ |
+ 'modificationTime', 'size', 'contentMimeType', 'present', |
+ 'availableOffline']; |
+ reportPromise(provider.get([ |
+ new MetadataRequest(entryA, names), |
+ new MetadataRequest(entryB, names) |
+ ]).then(function(results) { |
+ assertEquals(2, results.length); |
+ assertEquals( |
+ new Date(2015, 1, 1).toString(), |
+ results[0].modificationTime.toString()); |
+ assertEquals(1024, results[0].size); |
+ assertEquals('application/A', results[0].contentMimeType); |
+ assertTrue(results[0].present); |
+ assertTrue(results[0].availableOffline); |
+ assertEquals( |
+ new Date(2015, 2, 2).toString(), |
+ results[1].modificationTime.toString()); |
+ assertEquals(2048, results[1].size); |
+ assertEquals('application/B', results[1].contentMimeType); |
+ assertTrue(results[1].present); |
+ assertTrue(results[1].availableOffline); |
+ }), callback); |
} |
function testFileSystemMetadataProviderPartialRequest(callback) { |
var cache = new MetadataProviderCache(); |
var provider = new FileSystemMetadataProvider(cache); |
reportPromise(provider.get( |
- [entryA], |
- ['modificationTime', 'size']).then( |
- function(results) { |
- assertEquals(1, results.length); |
- assertEquals( |
- new Date(2015, 1, 1).toString(), |
- results[0].modificationTime.toString()); |
- assertEquals(1024, results[0].size); |
- // When contentMimeType is not requested, this shouldn't try to get |
- // MIME type. |
- assertFalse(chrome.fileManagerPrivate.isGetMimeTypeCalled_); |
- }), callback); |
+ [new MetadataRequest(entryA, ['modificationTime', 'size'])]).then( |
+ function(results) { |
+ assertEquals(1, results.length); |
+ assertEquals( |
+ new Date(2015, 1, 1).toString(), |
+ results[0].modificationTime.toString()); |
+ assertEquals(1024, results[0].size); |
+ // When contentMimeType is not requested, this shouldn't try to get |
+ // MIME type. |
+ assertFalse(chrome.fileManagerPrivate.isGetMimeTypeCalled_); |
+ }), callback); |
} |