Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/data/extensions/api_test/file_system_provider/notify/test.js

Issue 985533004: Implement chrome.fileSystem.requestFileSystem(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed kiosk mode. Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/data/extensions/api_test/file_system_provider/notify/manifest.json ('k') | chrome/test/data/extensions/api_test/file_system_provider/read_directory/manifest.json » ('j') | third_party/closure_compiler/externs/chrome_extensions.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/extensions/api_test/file_system_provider/notify/test.js
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/notify/test.js b/chrome/test/data/extensions/api_test/file_system_provider/notify/test.js
index 0beaa1cfc385e0c0edece872a23113179aa73591..67bdbfe70ce631a999bef164a9fec8c10c61a720 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/notify/test.js
+++ b/chrome/test/data/extensions/api_test/file_system_provider/notify/test.js
@@ -84,40 +84,46 @@ function runTests() {
{create: false},
chrome.test.callbackPass(function(fileEntry) {
chrome.test.assertEq(TESTING_DIRECTORY.name, fileEntry.name);
- chrome.fileManagerPrivate.addFileWatch(
- fileEntry.toURL(),
- chrome.test.callbackPass(function(result) {
- chrome.test.assertTrue(result);
- // Verify closure called when an even arrives.
- directoryChangedCallback = chrome.test.callbackPass(
- function() {
- chrome.test.assertEq(1, directoryChangedEvents.length);
- chrome.test.assertEq(
- 'changed', directoryChangedEvents[0].eventType);
- chrome.test.assertEq(
- fileEntry.toURL(),
- directoryChangedEvents[0].entry.toURL());
- // Confirm that the tag is updated.
- chrome.fileSystemProvider.getAll(
- chrome.test.callbackPass(function(fileSystems) {
- chrome.test.assertEq(1, fileSystems.length);
+ test_util.toExternalEntry(fileEntry).then(
+ chrome.test.callbackPass(function(externalEntry) {
+ chrome.test.assertTrue(!!externalEntry);
+ chrome.fileManagerPrivate.addFileWatch(
+ externalEntry.toURL(),
+ chrome.test.callbackPass(function(result) {
+ chrome.test.assertTrue(result);
+ // Verify closure called when an even arrives.
+ directoryChangedCallback = chrome.test.callbackPass(
+ function() {
chrome.test.assertEq(
- 1, fileSystems[0].watchers.length);
- var watcher = fileSystems[0].watchers[0];
+ 1, directoryChangedEvents.length);
chrome.test.assertEq(
- TESTING_TAG, watcher.lastTag);
- }));
- });
- // TODO(mtomasz): Add more advanced tests, eg. for the details
- // of changes.
- chrome.fileSystemProvider.notify({
- fileSystemId: test_util.FILE_SYSTEM_ID,
- observedPath: fileEntry.fullPath,
- recursive: false,
- changeType: 'CHANGED',
- tag: TESTING_TAG
- }, chrome.test.callbackPass());
- }));
+ 'changed',
+ directoryChangedEvents[0].eventType);
+ chrome.test.assertEq(
+ externalEntry.toURL(),
+ directoryChangedEvents[0].entry.toURL());
+ // Confirm that the tag is updated.
+ chrome.fileSystemProvider.getAll(
+ chrome.test.callbackPass(function(items) {
+ chrome.test.assertEq(1, items.length);
+ chrome.test.assertEq(
+ 1, items[0].watchers.length);
+ var watcher = items[0].watchers[0];
+ chrome.test.assertEq(
+ TESTING_TAG, watcher.lastTag);
+ }));
+ });
+ // TODO(mtomasz): Add more advanced tests, eg. for the
+ // details of changes.
+ chrome.fileSystemProvider.notify({
+ fileSystemId: test_util.FILE_SYSTEM_ID,
+ observedPath: fileEntry.fullPath,
+ recursive: false,
+ changeType: 'CHANGED',
+ tag: TESTING_TAG
+ }, chrome.test.callbackPass());
+ }));
+ })).catch(chrome.test.fail);
}), function(error) {
chrome.test.fail(error.name);
});
@@ -178,30 +184,35 @@ function runTests() {
chrome.test.callbackPass(function(fileEntry) {
chrome.test.assertEq(TESTING_DIRECTORY.name, fileEntry.name);
// Verify closure called when an even arrives.
- directoryChangedCallback = chrome.test.callbackPass(
- function() {
- chrome.test.assertEq(2, directoryChangedEvents.length);
- chrome.test.assertEq(
- 'changed', directoryChangedEvents[1].eventType);
- chrome.test.assertEq(fileEntry.toURL(),
- directoryChangedEvents[1].entry.toURL());
- // Confirm that the watcher is removed.
- chrome.fileSystemProvider.getAll(
- chrome.test.callbackPass(function(fileSystems) {
- chrome.test.assertEq(1, fileSystems.length);
+ test_util.toExternalEntry(fileEntry).then(
+ chrome.test.callbackPass(function(externalEntry) {
+ chrome.test.assertTrue(!!externalEntry);
+ directoryChangedCallback = chrome.test.callbackPass(
+ function() {
+ chrome.test.assertEq(2, directoryChangedEvents.length);
chrome.test.assertEq(
- 0, fileSystems[0].watchers.length);
- }));
- });
- // TODO(mtomasz): Add more advanced tests, eg. for the details
- // of changes.
- chrome.fileSystemProvider.notify({
- fileSystemId: test_util.FILE_SYSTEM_ID,
- observedPath: fileEntry.fullPath,
- recursive: false,
- changeType: 'DELETED',
- tag: TESTING_ANOTHER_TAG
- }, chrome.test.callbackPass());
+ 'changed', directoryChangedEvents[1].eventType);
+ chrome.test.assertEq(
+ externalEntry.toURL(),
+ directoryChangedEvents[1].entry.toURL());
+ // Confirm that the watcher is removed.
+ chrome.fileSystemProvider.getAll(
+ chrome.test.callbackPass(function(fileSystems) {
+ chrome.test.assertEq(1, fileSystems.length);
+ chrome.test.assertEq(
+ 0, fileSystems[0].watchers.length);
+ }));
+ });
+ // TODO(mtomasz): Add more advanced tests, eg. for the details
+ // of changes.
+ chrome.fileSystemProvider.notify({
+ fileSystemId: test_util.FILE_SYSTEM_ID,
+ observedPath: fileEntry.fullPath,
+ recursive: false,
+ changeType: 'DELETED',
+ tag: TESTING_ANOTHER_TAG
+ }, chrome.test.callbackPass());
+ })).catch(chrome.test.fail);
}));
},
@@ -213,18 +224,22 @@ function runTests() {
{create: false},
chrome.test.callbackPass(function(fileEntry) {
chrome.test.assertEq(TESTING_DIRECTORY.name, fileEntry.name);
- directoryChangedCallback = function() {
- chrome.test.fail();
- };
- // TODO(mtomasz): NOT_FOUND error should be returned instead.
- chrome.fileSystemProvider.notify({
- fileSystemId: test_util.FILE_SYSTEM_ID,
- observedPath: fileEntry.fullPath,
- recursive: false,
- changeType: 'CHANGED',
- tag: TESTING_ANOTHER_TAG
- }, chrome.test.callbackFail('NOT_FOUND'));
- }));
+ test_util.toExternalEntry(fileEntry).then(
+ chrome.test.callbackPass(function(externalEntry) {
+ chrome.test.assertTrue(!!externalEntry);
+ directoryChangedCallback = function() {
+ chrome.test.fail();
+ };
+ // TODO(mtomasz): NOT_FOUND error should be returned instead.
+ chrome.fileSystemProvider.notify({
+ fileSystemId: test_util.FILE_SYSTEM_ID,
+ observedPath: fileEntry.fullPath,
+ recursive: false,
+ changeType: 'CHANGED',
+ tag: TESTING_ANOTHER_TAG
+ }, chrome.test.callbackFail('NOT_FOUND'));
+ })).catch(chrome.test.fail);
+ }));
}
]);
}
« no previous file with comments | « chrome/test/data/extensions/api_test/file_system_provider/notify/manifest.json ('k') | chrome/test/data/extensions/api_test/file_system_provider/read_directory/manifest.json » ('j') | third_party/closure_compiler/externs/chrome_extensions.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698