You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2012/05/09 02:17:22 UTC
spec commit: described test condition,
updated to test for NOT_FOUND_ERR
Updated Branches:
refs/heads/master 35a3f3f4a -> c3225a50f
described test condition, updated to test for NOT_FOUND_ERR
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/commit/c3225a50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/c3225a50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/c3225a50
Branch: refs/heads/master
Commit: c3225a50f48649bc66fd6c4e99b3e959d06a13b8
Parents: 35a3f3f
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue May 8 17:16:43 2012 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue May 8 17:16:43 2012 -0700
----------------------------------------------------------------------
autotest/tests/file.tests.js | 272 ++++++++++++++++++------------------
1 files changed, 136 insertions(+), 136 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/c3225a50/autotest/tests/file.tests.js
----------------------------------------------------------------------
diff --git a/autotest/tests/file.tests.js b/autotest/tests/file.tests.js
index de37980..860a6c1 100644
--- a/autotest/tests/file.tests.js
+++ b/autotest/tests/file.tests.js
@@ -31,10 +31,10 @@ describe('File API', function() {
// deletes specified file or directory
var deleteEntry = function(name, success, error) {
// deletes entry, if it exists
- window.resolveLocalFileSystemURI(root.toURL() + '/' + name,
+ window.resolveLocalFileSystemURI(root.toURL() + '/' + name,
function(entry) {
if (entry.isDirectory === true) {
- entry.removeRecursively(success, error);
+ entry.removeRecursively(success, error);
} else {
entry.remove(success, error);
}
@@ -42,7 +42,7 @@ describe('File API', function() {
};
// deletes file, if it exists, then invokes callback
var deleteFile = function(fileName, callback) {
- root.getFile(fileName, null,
+ root.getFile(fileName, null,
// remove file system entry
function(entry) {
entry.remove(callback, function() { console.log('[ERROR] deleteFile cleanup method invoked fail callback.'); });
@@ -59,7 +59,7 @@ describe('File API', function() {
// deletes and re-creates the specified directory
var createDirectory = function(dirName, success, error) {
deleteEntry(dirName, function() {
- root.getDirectory(dirName, {create: true}, success, error);
+ root.getDirectory(dirName, {create: true}, success, error);
}, error);
};
@@ -111,7 +111,7 @@ describe('File API', function() {
expect(fileSystem.root).toBeDefined();
}),
fail = createFail('window.requestFileSystem');
-
+
// retrieve PERSISTENT file system
runs(function() {
window.requestFileSystem(LocalFileSystem.PERSISTENT, 0, win, fail);
@@ -134,7 +134,7 @@ describe('File API', function() {
fail = createFail('window.requestFileSystem');
// Request the file system
- runs(function() {
+ runs(function() {
window.requestFileSystem(LocalFileSystem.TEMPORARY, 0, win, fail);
});
@@ -206,7 +206,7 @@ describe('File API', function() {
});
waitsFor(function() { return win.wasCalled; }, "resolveLocalFileSystemURI callback never called", Tests.TEST_TIMEOUT);
-
+
runs(function() {
expect(win).toHaveBeenCalled();
expect(fail).not.toHaveBeenCalled();
@@ -237,13 +237,13 @@ describe('File API', function() {
});
waitsFor(function() { return win.wasCalled; }, "resolveLocalFileSystemURI callback never called", Tests.TEST_TIMEOUT);
-
+
runs(function() {
expect(win).toHaveBeenCalled();
expect(fail).not.toHaveBeenCalled();
});
});
-
+
// create a new file entry
runs(function() {
createFile(fileName, resolveCallback, fail);
@@ -251,13 +251,13 @@ describe('File API', function() {
waitsFor(function() { return resolveCallback.wasCalled; }, "createFile callback never called", Tests.TEST_TIMEOUT);
});
- it("should error out when resolving invalid file name", function() {
+ it("should error (NOT_FOUND_ERR) when resolving (non-existent) invalid file name", function() {
var fail = jasmine.createSpy().andCallFake(function(error) {
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
}),
win = createWin('window.resolveLocalFileSystemURI');
-
+
// lookup file system entry
runs(function() {
window.resolveLocalFileSystemURI("file:///this.is.not.a.valid.file.txt", win, fail);
@@ -270,10 +270,10 @@ describe('File API', function() {
expect(win).not.toHaveBeenCalled();
});
});
- it("resolve invalid URL", function() {
+ it("should error (NOT_FOUND_ERR) when resolving (non-existent) invalid URL", function() {
var fail = jasmine.createSpy().andCallFake(function(error) {
expect(error).toBeDefined();
- expect(error).toBeFileError(FileError.ENCODING_ERR);
+ expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
}),
win = createWin('window.resolveLocalFileSystemURI');
@@ -331,7 +331,7 @@ describe('File API', function() {
expect(entry.removeRecursively).toBeDefined();
}),
fail = createFail('FileSystem');
-
+
runs(function() {
window.resolveLocalFileSystemURI(root.toURL(), win, fail);
});
@@ -357,7 +357,7 @@ describe('File API', function() {
// create:false, exclusive:false, file does not exist
runs(function() {
- root.getFile(fileName, {create:false}, win, fail);
+ root.getFile(fileName, {create:false}, win, fail);
});
waitsFor(function() { return fail.wasCalled; }, "error callback never called", Tests.TEST_TIMEOUT);
@@ -380,10 +380,10 @@ describe('File API', function() {
entry.remove(null, null);
}),
fail = createFail('DirectoryEntry');
-
+
// create:true, exclusive:false, file does not exist
runs(function() {
- root.getFile(fileName, {create: true}, win, fail);
+ root.getFile(fileName, {create: true}, win, fail);
});
waitsFor(function() { return win.wasCalled; }, "success callback never called", Tests.TEST_TIMEOUT);
@@ -402,7 +402,7 @@ describe('File API', function() {
expect(entry.isDirectory).toBe(false);
expect(entry.name).toBe(fileName);
expect(entry.fullPath).toBe(filePath);
-
+
// cleanup
entry.remove(null, null);
}),
@@ -443,7 +443,7 @@ describe('File API', function() {
expect(entry.isDirectory).toBe(false);
expect(entry.name).toBe(fileName);
expect(entry.fullPath).toBe(filePath);
-
+
// cleanup
entry.remove(null, fail);
});
@@ -475,12 +475,12 @@ describe('File API', function() {
fail = jasmine.createSpy().andCallFake(function(error) {
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.PATH_EXISTS_ERR);
-
+
// cleanup
existingFile.remove(null, fail);
}),
win = createWin('DirectoryEntry');
-
+
// create file to kick off it
runs(function() {
root.getFile(fileName, {create:true}, getFile, fail);
@@ -497,7 +497,7 @@ describe('File API', function() {
expect(entry.isDirectory).toBe(false);
expect(entry.name).toBe(fileName);
expect(entry.fullPath).toBe(filePath);
-
+
entry.remove(null, fail); //clean up
}),
fail = createFail('DirectoryEntry'),
@@ -514,7 +514,7 @@ describe('File API', function() {
expect(fail).not.toHaveBeenCalled();
});
});
-
+
// create file to kick off it
runs(function() {
root.getFile(fileName, {create:true}, getFile, fail);
@@ -529,7 +529,7 @@ describe('File API', function() {
expect(error).toBeFileError(FileError.ENCODING_ERR);
}),
win = createWin('DirectoryEntry');
-
+
// create:false, exclusive:false, invalid path
runs(function() {
root.getFile(fileName, {create:false}, win, fail);
@@ -551,7 +551,7 @@ describe('File API', function() {
expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
}),
win = createWin('DirectoryEntry');
-
+
// create:false, exclusive:false, directory does not exist
runs(function() {
root.getDirectory(dirName, {create:false}, win, fail);
@@ -580,19 +580,19 @@ describe('File API', function() {
expect(win).toHaveBeenCalled();
expect(fail).not.toHaveBeenCalled();
});
-
+
}), win = jasmine.createSpy().andCallFake(function(directory) {
expect(directory).toBeDefined();
expect(directory.isFile).toBe(false);
expect(directory.isDirectory).toBe(true);
expect(directory.name).toBe(dirName);
expect(directory.fullPath).toBe(dirPath);
-
+
// cleanup
directory.remove(null, fail);
}),
fail = createFail('DirectoryEntry');
-
+
// create:true, exclusive:false, directory does not exist
runs(function() {
root.getDirectory(dirName, {create: true}, getDir, fail);
@@ -627,7 +627,7 @@ describe('File API', function() {
directory.remove(null, fail);
}),
fail = createFail('DirectoryEntry');
-
+
// create:true, exclusive:false, directory does not exist
runs(function() {
root.getDirectory(dirName, {create: true}, getDir, fail);
@@ -645,15 +645,15 @@ describe('File API', function() {
expect(directory.isDirectory).toBe(true);
expect(directory.name).toBe(dirName);
expect(directory.fullPath).toBe(dirPath);
-
+
// cleanup
directory.remove(null, fail);
}),
fail = createFail('DirectoryEntry');
-
+
// create:true, exclusive:false, directory does not exist
runs(function() {
- root.getDirectory(dirName, {create: true}, win, fail);
+ root.getDirectory(dirName, {create: true}, win, fail);
});
waitsFor(function() { return win.wasCalled; }, "win never called", Tests.TEST_TIMEOUT);
@@ -663,7 +663,7 @@ describe('File API', function() {
expect(fail).not.toHaveBeenCalled();
});
});
-
+
it("DirectoryEntry.getDirectory: create new directory (exclusive)", function() {
var dirName = "de.create.exclusive.dir",
dirPath = root.fullPath + '/' + dirName,
@@ -673,14 +673,14 @@ describe('File API', function() {
expect(directory.isDirectory).toBe(true);
expect(directory.name).toBe(dirName);
expect(directory.fullPath).toBe(dirPath);
-
+
// cleanup
directory.remove(null, fail);
}),
fail = createFail('DirectoryEntry');
// create:true, exclusive:true, directory does not exist
runs(function() {
- root.getDirectory(dirName, {create: true, exclusive:true}, win, fail);
+ root.getDirectory(dirName, {create: true, exclusive:true}, win, fail);
});
waitsFor(function() { return win.wasCalled; }, "win never called", Tests.TEST_TIMEOUT);
@@ -712,15 +712,15 @@ describe('File API', function() {
expect(directory.isDirectory).toBe(true);
expect(directory.name).toBe(dirName);
expect(directory.fullPath).toBe(dirPath);
-
+
// cleanup
directory.remove(null, fail);
}),
fail = createFail('DirectoryEntry');
-
+
// create directory to kick off it
runs(function() {
- root.getDirectory(dirName, {create:true}, getDir, this.fail);
+ root.getDirectory(dirName, {create:true}, getDir, this.fail);
});
waitsFor(function() { return getDir.wasCalled; }, "getDir never called", Tests.TEST_TIMEOUT);
@@ -746,17 +746,17 @@ describe('File API', function() {
fail = jasmine.createSpy().andCallFake(function(error) {
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.PATH_EXISTS_ERR);
-
+
// cleanup
existingDir.remove(null, fail);
}),
win = createWin('DirectoryEntry');
-
+
// create directory to kick off it
runs(function() {
root.getDirectory(dirName, {create:true}, getDir, fail);
});
-
+
waitsFor(function() { return getDir.wasCalled; }, "getDir never called", Tests.TEST_TIMEOUT);
});
it("DirectoryEntry.getDirectory: get Entry for existing directory", function() {
@@ -780,14 +780,14 @@ describe('File API', function() {
expect(directory.isFile).toBe(false);
expect(directory.isDirectory).toBe(true);
expect(directory.name).toBe(dirName);
-
+
expect(directory.fullPath).toBe(dirPath);
-
+
// cleanup
directory.remove(null, fail);
}),
fail = createFail('DirectoryEntry');
-
+
// create directory to kick off it
root.getDirectory(dirName, {create:true}, getDir, fail);
});
@@ -798,10 +798,10 @@ describe('File API', function() {
expect(error).toBeFileError(FileError.ENCODING_ERR);
}),
win = createWin('DirectoryEntry');
-
+
// create:false, exclusive:false, invalid path
runs(function() {
- root.getDirectory(dirName, {create:false}, win, fail);
+ root.getDirectory(dirName, {create:false}, win, fail);
});
waitsFor(function() { return fail.wasCalled; }, "fail never called", Tests.TEST_TIMEOUT);
@@ -832,12 +832,12 @@ describe('File API', function() {
fail = jasmine.createSpy().andCallFake(function(error) {
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.TYPE_MISMATCH_ERR);
-
+
// cleanup
existingFile.remove(null, null);
}),
win = createWin('DirectoryEntry');
-
+
// create file to kick off it
runs(function() {
root.getFile(fileName, {create:true}, getDir, fail);
@@ -866,12 +866,12 @@ describe('File API', function() {
fail = jasmine.createSpy().andCallFake(function(error) {
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.TYPE_MISMATCH_ERR);
-
+
// cleanup
existingDir.remove(null, null);
}),
win = createWin('DirectoryEntry');
-
+
// create directory to kick off it
runs(function() {
root.getDirectory(dirName, {create:true}, getFile, fail);
@@ -929,7 +929,7 @@ describe('File API', function() {
waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
});
it("createReader: create reader on existing directory", function() {
- // create reader for root directory
+ // create reader for root directory
var reader = root.createReader();
expect(reader).toBeDefined();
expect(typeof reader.readEntries).toBe('function');
@@ -964,8 +964,8 @@ describe('File API', function() {
expect(entries instanceof Array).toBe(true);
}),
fail = createFail('DirectoryReader');
-
- // create reader for root directory
+
+ // create reader for root directory
reader = root.createReader();
// read entries
runs(function() {
@@ -986,7 +986,7 @@ describe('File API', function() {
// read entries
var readEntries = jasmine.createSpy().andCallFake(function() {
var reader = directory.createReader();
-
+
runs(function() {
reader.readEntries(win, itReader);
});
@@ -1055,12 +1055,12 @@ describe('File API', function() {
expect(fileEntry).toBeDefined();
expect(typeof fileEntry.createWriter).toBe('function');
expect(typeof fileEntry.file).toBe('function');
-
- // cleanup
+
+ // cleanup
fileEntry.remove(null, fail);
}),
fail = createFail('FileEntry');
-
+
// create a new file entry to kick off it
runs(function() {
root.getFile(fileName, {create:true}, itFileEntry, fail);
@@ -1093,12 +1093,12 @@ describe('File API', function() {
itWriter = jasmine.createSpy().andCallFake(function(writer) {
expect(writer).toBeDefined();
expect(writer instanceof FileWriter).toBe(true);
-
- // cleanup
+
+ // cleanup
itFile.remove(null, fail);
}),
fail = createFail('FileEntry');
-
+
// create a new file entry to kick off it
runs(function() {
root.getFile(fileName, {create:true}, entryCallback, fail);
@@ -1111,7 +1111,7 @@ describe('File API', function() {
newFile,
entryCallback = jasmine.createSpy().andCallFake(function(fileEntry) {
newFile = fileEntry;
-
+
runs(function() {
fileEntry.file(itFile, fail);
});
@@ -1126,12 +1126,12 @@ describe('File API', function() {
itFile = jasmine.createSpy().andCallFake(function(file) {
expect(file).toBeDefined();
expect(file instanceof File).toBe(true);
-
- // cleanup
+
+ // cleanup
newFile.remove(null, fail);
}),
fail = createFail('FileEntry');
-
+
// create a new file entry to kick off it
runs(function() {
root.getFile(fileName, {create:true}, entryCallback, fail);
@@ -1168,7 +1168,7 @@ describe('File API', function() {
}),
fail = createFail('FileEntry'),
win = createWin('FileEntry');
-
+
// create a new file entry to kick off it
runs(function() {
root.getFile(fileName, {create:true}, entryCallback, fail);
@@ -1236,7 +1236,7 @@ describe('File API', function() {
// cleanup
deleteEntry(fileName);
});
-
+
// create a new file entry
createFile(fileName, entryCallback, fail);
});
@@ -1262,7 +1262,7 @@ describe('File API', function() {
// cleanup
deleteEntry(dirName);
});
-
+
// create a new directory entry
runs(function() {
createDirectory(dirName, entryCallback, fail);
@@ -1293,7 +1293,7 @@ describe('File API', function() {
// cleanup
deleteEntry(fileName);
});
-
+
// create a new file entry
runs(function() {
createFile(fileName, entryCallback, fail);
@@ -1364,7 +1364,7 @@ describe('File API', function() {
deleteEntry(fileName);
}),
fail = createFail('Entry');
-
+
// create a new file entry
runs(function() {
createFile(fileName, itURL, fail);
@@ -1421,7 +1421,7 @@ describe('File API', function() {
});
});
expect(entry).toBeDefined();
-
+
runs(function() {
entry.remove(checkRemove, fail);
});
@@ -1435,7 +1435,7 @@ describe('File API', function() {
deleteEntry(fileName);
}),
fail = createFail('Entry');
-
+
// create a new file entry
runs(function() {
createFile(fileName, entryCallback, fail);
@@ -1594,7 +1594,7 @@ describe('File API', function() {
expect(entry2.isDirectory).toBe(false);
expect(entry2.fullPath).toBe(fullPath);
expect(entry2.name).toBe(file2);
-
+
// cleanup
deleteEntry(file1);
deleteEntry(file2);
@@ -1669,7 +1669,7 @@ describe('File API', function() {
expect(directory.isDirectory).toBe(true);
expect(directory.fullPath).toBe(dstPath);
expect(directory.name).toBe(dstDir);
-
+
runs(function() {
root.getDirectory(dstDir, {create:false}, itDirExists, fail);
});
@@ -1682,7 +1682,7 @@ describe('File API', function() {
expect(dirEntry.isDirectory).toBe(true);
expect(dirEntry.fullPath).toBe(dstPath);
expect(dirEntry.name).toBe(dstDir);
-
+
runs(function() {
dirEntry.getFile(file1, {create:false}, itFileExists, fail);
});
@@ -1735,7 +1735,7 @@ describe('File API', function() {
expect(directory.isDirectory).toBe(true);
expect(directory.fullPath).toBe(dstPath);
expect(directory.name).toBe(dstDir);
-
+
root.getDirectory(dstDir, {create:false}, itDirExists, fail);
},
itDirExists = function(dirEntry) {
@@ -1744,7 +1744,7 @@ describe('File API', function() {
expect(dirEntry.isDirectory).toBe(true);
expect(dirEntry.fullPath).toBe(dstPath);
expect(dirEntry.name).toBe(dstDir);
-
+
dirEntry.getFile(file1, {create:false}, itFileExists, fail);
},
itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
@@ -1784,7 +1784,7 @@ describe('File API', function() {
var copyDir = jasmine.createSpy().andCallFake(function(fileEntry) {
// copy srcDir onto itself
runs(function() {
- directory.copyTo(root, null, win, itCopy);
+ directory.copyTo(root, null, win, itCopy);
});
waitsFor(function() { return itCopy.wasCalled; }, "itCopy never called", Tests.TEST_TIMEOUT);
@@ -1799,8 +1799,8 @@ describe('File API', function() {
itCopy = jasmine.createSpy().andCallFake(function(error) {
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
-
- runs(function() {
+
+ runs(function() {
root.getDirectory(srcDir, {create:false}, itDirectoryExists, fail);
});
@@ -1810,7 +1810,7 @@ describe('File API', function() {
// returning confirms existence so just check fullPath entry
expect(dirEntry).toBeDefined();
expect(dirEntry.fullPath).toBe(srcPath);
-
+
runs(function() {
dirEntry.getFile(file1, {create:false}, itFileExists, fail);
});
@@ -1826,7 +1826,7 @@ describe('File API', function() {
itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
expect(fileEntry).toBeDefined();
expect(fileEntry.fullPath).toBe(filePath);
-
+
// cleanup
deleteEntry(srcDir);
});
@@ -1855,7 +1855,7 @@ describe('File API', function() {
itCopy = jasmine.createSpy().andCallFake(function(error) {
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
-
+
runs(function() {
root.getDirectory(srcDir, {create:false}, itDirectoryExists, fail);
});
@@ -1885,7 +1885,7 @@ describe('File API', function() {
waitsFor(function() { return entryCallback.wasCalled; }, "entryCallback never called", Tests.TEST_TIMEOUT);
});
it("copyTo: directory that does not exist", function() {
- var file1 = "entry.copy.dnf.file1",
+ var file1 = "entry.copy.dnf.file1",
dstDir = "entry.copy.dnf.dstDir",
filePath = root.fullPath + '/' + file1,
dstPath = root.fullPath + '/' + dstDir,
@@ -1987,7 +1987,7 @@ describe('File API', function() {
expect(entry.isDirectory).toBe(false);
expect(entry.fullPath).toBe(dstPath);
expect(entry.name).toBe(file2);
-
+
runs(function() {
root.getFile(file2, {create:false}, itMovedExists, fail);
});
@@ -1997,7 +1997,7 @@ describe('File API', function() {
itMovedExists = jasmine.createSpy().andCallFake(function(fileEntry) {
expect(fileEntry).toBeDefined();
expect(fileEntry.fullPath).toBe(dstPath);
-
+
runs(function() {
root.getFile(file1, {create:false}, win, itOrig);
});
@@ -2014,7 +2014,7 @@ describe('File API', function() {
//expect(navigator.fileMgr.itFileExists(srcPath) === false, "original file should not exist.");
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
-
+
// cleanup
deleteEntry(file1);
deleteEntry(file2);
@@ -2057,7 +2057,7 @@ describe('File API', function() {
waitsFor(function() { return itMove.wasCalled; }, "itMove never called", Tests.TEST_TIMEOUT);
});
-
+
// create a parent directory to move file to
runs(function() {
root.getDirectory(dir, {create: true}, moveFile, fail);
@@ -2068,7 +2068,7 @@ describe('File API', function() {
itMovedExists = jasmine.createSpy().andCallFake(function(fileEntry) {
expect(fileEntry).toBeDefined();
expect(fileEntry.fullPath).toBe(dstPath);
-
+
runs(function() {
root.getFile(file1, {create:false}, win, itOrig);
});
@@ -2084,7 +2084,7 @@ describe('File API', function() {
itOrig = jasmine.createSpy().andCallFake(function(error) {
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
-
+
// cleanup
deleteEntry(file1);
deleteEntry(dir);
@@ -2131,7 +2131,7 @@ describe('File API', function() {
expect(directory.fullPath).toBe(dstPath);
expect(directory.name).toBe(dstDir);
// it that moved file exists in destination dir
-
+
runs(function() {
directory.getFile(file1, {create:false}, itMovedExists, fail);
});
@@ -2158,7 +2158,7 @@ describe('File API', function() {
itOrig = jasmine.createSpy().andCallFake(function(error) {
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
-
+
// cleanup
deleteEntry(srcDir);
deleteEntry(dstDir);
@@ -2231,7 +2231,7 @@ describe('File API', function() {
itOrig = jasmine.createSpy().andCallFake(function(error) {
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
-
+
// cleanup
deleteEntry(srcDir);
deleteEntry(dstDir);
@@ -2304,7 +2304,7 @@ describe('File API', function() {
itOrig = jasmine.createSpy().andCallFake(function(error) {
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
-
+
// cleanup
deleteEntry(srcDir);
deleteEntry(dstDir);
@@ -2346,7 +2346,7 @@ describe('File API', function() {
itMove = jasmine.createSpy().andCallFake(function(error) {
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
-
+
// it that original dir still exists
runs(function() {
root.getDirectory(srcDir, {create:false}, itDirectoryExists, fail);
@@ -2358,7 +2358,7 @@ describe('File API', function() {
// returning confirms existence so just check fullPath entry
expect(dirEntry).toBeDefined();
expect(dirEntry.fullPath).toBe(srcPath);
-
+
runs(function() {
dirEntry.getFile(file1, {create:false}, itFileExists, fail);
});
@@ -2374,7 +2374,7 @@ describe('File API', function() {
itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
expect(fileEntry).toBeDefined();
expect(fileEntry.fullPath).toBe(filePath);
-
+
// cleanup
deleteEntry(srcDir);
});
@@ -2419,7 +2419,7 @@ describe('File API', function() {
itDirectoryExists = jasmine.createSpy().andCallFake(function(entry) {
expect(entry).toBeDefined();
expect(entry.fullPath).toBe(srcPath);
-
+
// cleanup
deleteEntry(srcDir);
});
@@ -2447,7 +2447,7 @@ describe('File API', function() {
itMove = jasmine.createSpy().andCallFake(function(error) {
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
-
+
//it that original file still exists
runs(function() {
root.getFile(file1, {create:false}, itFileExists, fail);
@@ -2464,7 +2464,7 @@ describe('File API', function() {
itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
expect(fileEntry).toBeDefined();
expect(fileEntry.fullPath).toBe(filePath);
-
+
// cleanup
deleteEntry(file1);
});
@@ -2496,10 +2496,10 @@ describe('File API', function() {
// move file1 onto sub-directory
entry.moveTo(directory, subDir, win, itMove);
};
- // create sub-directory
+ // create sub-directory
directory.getDirectory(subDir, {create: true}, moveFile, fail);
};
- // create top level directory
+ // create top level directory
root.getDirectory(dstDir, {create: true}, createSubDirectory, fail);
},
itDirectoryExists = function(dirEntry) {
@@ -2526,7 +2526,7 @@ describe('File API', function() {
});
waitsFor(function() { return itFileExists.wasCalled; }, "itFileExists never called", Tests.TEST_TIMEOUT);
-
+
runs(function() {
expect(itFileExists).toHaveBeenCalled();
expect(win).not.toHaveBeenCalled();
@@ -2564,7 +2564,7 @@ describe('File API', function() {
itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
expect(fileEntry).toBeDefined();
expect(fileEntry.fullPath).toBe(filePath);
-
+
// cleanup
deleteEntry(file1);
deleteEntry(srcDir);
@@ -2614,7 +2614,7 @@ describe('File API', function() {
itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
expect(fileEntry).toBeDefined();
expect(fileEntry.fullPath).toBe(filePath);
-
+
// cleanup
deleteEntry(file1);
deleteEntry(srcDir);
@@ -2650,14 +2650,14 @@ describe('File API', function() {
var itMove = function(error) {
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
-
+
// it that destination directory still exists
directory.getDirectory(subDir, {create:false}, itDirectoryExists, fail);
};
- // create sub-directory
+ // create sub-directory
directory.getDirectory(subDir, {create: true}, moveDir, fail);
};
- // create top level directory
+ // create top level directory
root.getDirectory(dstDir, {create: true}, createSubDirectory, fail);
},
itDirectoryExists = function(dirEntry) {
@@ -2712,7 +2712,7 @@ describe('File API', function() {
expect(entry.isDirectory).toBe(false);
expect(entry.fullPath).toBe(file2Path);
expect(entry.name).toBe(file2);
-
+
// it that old file does not exists
root.getFile(file1, {create:false}, win, itFileMoved);
},
@@ -2725,7 +2725,7 @@ describe('File API', function() {
itFileExists = jasmine.createSpy().andCallFake(function(fileEntry) {
expect(fileEntry).toBeDefined();
expect(fileEntry.fullPath).toBe(file2Path);
-
+
// cleanup
deleteEntry(file1);
deleteEntry(file2);
@@ -2777,14 +2777,14 @@ describe('File API', function() {
itFileExists = function(fileEntry) {
expect(fileEntry).toBeDefined();
expect(fileEntry.fullPath).toBe(filePath);
-
+
// check that old directory no longer exists
root.getDirectory(srcDir, {create:false}, win, itRemoved);
},
itRemoved = jasmine.createSpy().andCallFake(function(error){
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
-
+
// cleanup
deleteEntry(srcDir);
deleteEntry(dstDir);
@@ -2807,7 +2807,7 @@ describe('File API', function() {
});
});
it("moveTo: directory that does not exist", function() {
- var file1 = "entry.move.dnf.file1",
+ var file1 = "entry.move.dnf.file1",
dstDir = "entry.move.dnf.dstDir",
filePath = root.fullPath + '/' + file1,
dstPath = root.fullPath + '/' + dstDir,
@@ -2822,7 +2822,7 @@ describe('File API', function() {
itMove = jasmine.createSpy().andCallFake(function(error) {
expect(error).toBeDefined();
expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
-
+
// cleanup
deleteEntry(file1);
});
@@ -2912,10 +2912,10 @@ describe('File API', function() {
reader.onloadend = verifier;
var myFile = new File();
- myFile.fullPath = filePath;
+ myFile.fullPath = filePath;
reader.readAsText(myFile);
};
-
+
// create a file, write to it, and read it in again
runs(function() {
root.getFile(fileName, {create: true}, create_writer, fail);
@@ -2944,10 +2944,10 @@ describe('File API', function() {
var reader = new FileReader();
reader.onloadend = verifier;
var myFile = new File();
- myFile.fullPath = filePath;
+ myFile.fullPath = filePath;
reader.readAsText(myFile);
};
-
+
// create a file, write to it, and read it in again
runs(function() {
root.getFile(fileName, {create: true}, read_file, fail);
@@ -2968,7 +2968,7 @@ describe('File API', function() {
});
reader.onerror = verifier;
var myFile = new File();
- myFile.fullPath = root.fullPath + '/' + "doesnotexist.err";
+ myFile.fullPath = root.fullPath + '/' + "doesnotexist.err";
runs(function() {
reader.readAsText(myFile);
@@ -2993,7 +2993,7 @@ describe('File API', function() {
},
// writes file and reads it back in
write_file = function(writer) {
- writer.onwriteend = read_file;
+ writer.onwriteend = read_file;
writer.write(rule);
},
verifier = jasmine.createSpy().andCallFake(function(evt) {
@@ -3005,10 +3005,10 @@ describe('File API', function() {
var reader = new FileReader();
reader.onloadend = verifier;
var myFile = new File();
- myFile.fullPath = filePath;
+ myFile.fullPath = filePath;
reader.readAsDataURL(myFile);
};
-
+
// create a file, write to it, and read it in again
runs(function() {
root.getFile(fileName, {create: true}, create_writer, fail);
@@ -3089,7 +3089,7 @@ describe('File API', function() {
writer.write(rule);
}, fail);
};
-
+
// create file, then write and append to it
runs(function() {
createFile(fileName, write_file);
@@ -3120,7 +3120,7 @@ describe('File API', function() {
theWriter.onwriteend = anotherVerifier;
length += exception.length;
theWriter.seek(theWriter.length);
- theWriter.write(exception);
+ theWriter.write(exception);
}),
anotherVerifier = jasmine.createSpy().andCallFake(function(evt) {
expect(theWriter.length).toBe(length);
@@ -3135,7 +3135,7 @@ describe('File API', function() {
theWriter.onwriteend = verifier;
theWriter.write(rule);
};
-
+
// create file, then write and append to it
runs(function() {
var file = new File();
@@ -3168,7 +3168,7 @@ describe('File API', function() {
theWriter.onwriteend = anotherVerifier;
length = 12 + exception.length;
theWriter.seek(12);
- theWriter.write(exception);
+ theWriter.write(exception);
}),
anotherVerifier = jasmine.createSpy().andCallFake(function(evt) {
expect(theWriter.length).toBe(length);
@@ -3185,7 +3185,7 @@ describe('File API', function() {
theWriter.write(rule);
}, fail);
};
-
+
// create file, then write and append to it
runs(function() {
createFile(fileName, write_file);
@@ -3216,7 +3216,7 @@ describe('File API', function() {
theWriter.onwriteend = anotherVerifier;
length = 8 + exception.length;
theWriter.seek(8);
- theWriter.write(exception);
+ theWriter.write(exception);
}),
anotherVerifier = jasmine.createSpy().andCallFake(function(evt) {
expect(theWriter.length).toBe(length);
@@ -3233,7 +3233,7 @@ describe('File API', function() {
theWriter.write(rule);
}, fail);
};
-
+
// create file, then write and append to it
runs(function() {
createFile(fileName, write_file);
@@ -3271,7 +3271,7 @@ describe('File API', function() {
theWriter.write(rule);
}, fail);
};
-
+
// creates file, then write XML data
runs(function() {
createFile(fileName, write_file);
@@ -3305,10 +3305,10 @@ describe('File API', function() {
fileEntry.createWriter(function(writer) {
theWriter = writer;
theWriter.onwriteend = verifier;
- theWriter.write(rule);
+ theWriter.write(rule);
}, fail);
};
-
+
// creates file, then write JSON content
runs(function() {
createFile(fileName, write_file);
@@ -3341,7 +3341,7 @@ describe('File API', function() {
// writes file and reads it back in
write_file = function(writer) {
theWriter = writer;
- theWriter.onwriteend = read_file;
+ theWriter.onwriteend = read_file;
theWriter.write(rule);
},
// reads file and compares content to what was written
@@ -3395,7 +3395,7 @@ describe('File API', function() {
theWriter.write(rule);
}, fail);
};
-
+
// creates file, then write JSON content
runs(function() {
createFile(fileName, seek_file);
@@ -3413,20 +3413,20 @@ describe('File API', function() {
rule = "There is an exception to every rule. Except this one.",
fail = createFail('FileWRiter'),
theWriter,
- // writes file content
+ // writes file content
write_file = function(fileEntry) {
fileEntry.createWriter(function(writer) {
theWriter = writer;
theWriter.onwriteend = function(evt) {
truncate_file(theWriter);
- };
+ };
theWriter.write(rule);
}, fail);
},
verifier = jasmine.createSpy().andCallFake(function(evt) {
expect(theWriter.length).toBe(36);
expect(theWriter.position).toBe(36);
-
+
// cleanup
deleteFile(fileName);
}),
Re: spec commit: described test condition, updated to test for NOT_FOUND_ERR
Posted by Jesse MacFadyen <pu...@gmail.com>.
Thanks Simon, that adds a lot of clarity.
I agree we should go back then.
I will annotate the test and add a documentation entry.
In WP7 URLs without a protocol were considered relative, I will adjust.
Sorry Drew + Becky.
Cheers,
Jesse
Sent from my iPhone5
On 2012-05-23, at 8:39 AM, Simon MacDonald <si...@gmail.com> wrote:
> Hey Jesse,
>
> I'm probably the person who originally wrote the test and the intent
> was to test to see that we fire a ENCODING_ERR when the url passed
> into window.resolveLocalFileSystemURI() does not specify a protocol.
>
> In Java when you do a:
>
> URL testUrl = new URL("/this.is.not.a.valid.url");
>
> it throws a MalformedURLException complaining that no protocol exists.
>
> More damningly if you run the following code in Chrome:
>
> var url = '/this.is.not.a.valid.url';
> window.webkitResolveLocalFileSystemURL(url, function(fileEntry) {
> console.log("path = " + fileEntry.name);
> }, function(error) {
> console.log("Error = " + error.code);
> console.log("Encoding error = " + FileError.ENCODING_ERR);
> });
>
> you will see:
>
> Error = 5
> Encoding error = 5
>
> in the console so it appears that Chrome agrees with our implementation.
>
> It's my recommendation that the test case and Drew's change on BB
> should be reverted to the original behaviour and the WP code be
> changed to return a ENCODING_ERR if not protocol is specified so we
> all stay consistent.
>
> As to why there is a native implementation? At least on Android you
> can pass in "content://" type URL's which point to pictures, video,
> etc. in the Android content store. The
> window.resolveLocalFileSystemURI() method can be used to get a
> FileEntry from one of these weird content uri's so devs can manipulate
> the files.
>
> Simon Mac Donald
> http://hi.im/simonmacdonald
>
>
> On Tue, May 22, 2012 at 6:14 PM, Jesse <pu...@gmail.com> wrote:
>> I think the only person who knows the intent of the test case is whoever
>> wrote it.
>> I am sorry that a fix for WP7 has caused issues elsewhere, I will look for
>> another solution. Ultimately we need the docs to state what error codes
>> are returned in what situation, perhaps an example for each error code,
>> that would be aligned with the tests.
>>
>> What exactly makes "/this.is.not.a.valid.url" an EncodingError?
>>
>> On WP7 I am relying on the SDK to tell me if it is well formed :
>>
>> if (!Uri.IsWellFormedUriString(fileOptions.Uri, UriKind.RelativeOrAbsolute))
>> {
>> DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR,
>> ENCODING_ERR));
>> return;
>> }
>>
>> If indeed it is deemed that this is an EncodingError, do we even need to
>> call native to determine that?
>>
>>
>> On Tue, May 22, 2012 at 1:46 PM, Becky Gibson <gi...@gmail.com>wrote:
>>
>>> Just tested mobile-spec on iOS and was surprised to find a failing file
>>> test.
>>>
>>> Curious why the error code was changed from ENCODING_ERR to NOT_FOUND_ERR?
>>> To me the description in the spec would indicate that an invalid URL
>>> would return ENCODING_ERR?
>>>
>>> from http://www.w3.org/TR/file-system-api/#definitions: EncodingErrorA
>>> path or URL supplied to the API was malformed.
>>> NotFoundErrorA required file or directory could not be found at the time an
>>> operation was processed.
>>> The test that was changed is: window.resolveLocalFileSystemURI(
>>> "/this.is.not.a.valid.url", win, fail); IMHO "/this.is.not.a.valid.url" is
>>> NOT a valid url according to
>>> http://www.w3.org/Addressing/URL/url-spec.txt so it seems appropriate
>>> to return an encodingError? This was discussed in
>>> https://issues.apache.org/jira/browse/CB-671 where folks suggested it IS a
>>> valid URL?
>>>
>>> If we decide this is the appropriate return value, I'll have to do a bit of
>>> work on the iOS code as it uses the NSURL URLWithString: and isFileURL:
>>> apis to determine if the input is a valid File URL or not. I'm not sure
>>> that appending "file://" to the input parameter is really the best
>>> solution......
>>>
>>> NSURL* testUri = [NSURL URLWithString:strUri];
>>> if (!testUri || ![testUri isFileURL])
>>>
>>> I'm also wondering if this is something we should be changing without some
>>> kind of warning to users. While most people may just check for an error,
>>> it seems a bit odd to change the actual error code being returned.
>>>
>>> -becky
>>>
>>>
>>> On Tue, May 8, 2012 at 8:17 PM, <pu...@apache.org> wrote:
>>>
>>>> Updated Branches:
>>>> refs/heads/master 35a3f3f4a -> c3225a50f
>>>>
>>>>
>>>> described test condition, updated to test for NOT_FOUND_ERR
>>>>
>>>>
>>>> Project:
>>>>
>>> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/repo
>>>> Commit:
>>>>
>>> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/commit/c3225a50
>>>> Tree:
>>>>
>>> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/c3225a50
>>>> Diff:
>>>>
>>> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/c3225a50
>>>>
>>>> Branch: refs/heads/master
>>>> Commit: c3225a50f48649bc66fd6c4e99b3e959d06a13b8
>>>> Parents: 35a3f3f
>>>> Author: Jesse MacFadyen <pu...@gmail.com>
>>>> Authored: Tue May 8 17:16:43 2012 -0700
>>>> Committer: Jesse MacFadyen <pu...@gmail.com>
>>>> Committed: Tue May 8 17:16:43 2012 -0700
>>>>
>>>> ----------------------------------------------------------------------
>>>> autotest/tests/file.tests.js | 272 ++++++++++++++++++------------------
>>>> 1 files changed, 136 insertions(+), 136 deletions(-)
>>>> ----------------------------------------------------------------------
>>>>
>>>>
>>>>
>>>>
>>> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/c3225a50/autotest/tests/file.tests.js
>>>> ----------------------------------------------------------------------
>>>> diff --git a/autotest/tests/file.tests.js b/autotest/tests/file.tests.js
>>>> index de37980..860a6c1 100644
>>>> --- a/autotest/tests/file.tests.js
>>>> +++ b/autotest/tests/file.tests.js
>>>> @@ -31,10 +31,10 @@ describe('File API', function() {
>>>> // deletes specified file or directory
>>>> var deleteEntry = function(name, success, error) {
>>>> // deletes entry, if it exists
>>>> - window.resolveLocalFileSystemURI(root.toURL() + '/' + name,
>>>> + window.resolveLocalFileSystemURI(root.toURL() + '/' + name,
>>>> function(entry) {
>>>> if (entry.isDirectory === true) {
>>>> - entry.removeRecursively(success, error);
>>>> + entry.removeRecursively(success, error);
>>>> } else {
>>>> entry.remove(success, error);
>>>> }
>>>> @@ -42,7 +42,7 @@ describe('File API', function() {
>>>> };
>>>> // deletes file, if it exists, then invokes callback
>>>> var deleteFile = function(fileName, callback) {
>>>> - root.getFile(fileName, null,
>>>> + root.getFile(fileName, null,
>>>> // remove file system entry
>>>> function(entry) {
>>>> entry.remove(callback, function() {
>>>> console.log('[ERROR] deleteFile cleanup method invoked fail callback.');
>>> });
>>>> @@ -59,7 +59,7 @@ describe('File API', function() {
>>>> // deletes and re-creates the specified directory
>>>> var createDirectory = function(dirName, success, error) {
>>>> deleteEntry(dirName, function() {
>>>> - root.getDirectory(dirName, {create: true}, success, error);
>>>> + root.getDirectory(dirName, {create: true}, success, error);
>>>> }, error);
>>>> };
>>>>
>>>> @@ -111,7 +111,7 @@ describe('File API', function() {
>>>> expect(fileSystem.root).toBeDefined();
>>>> }),
>>>> fail = createFail('window.requestFileSystem');
>>>> -
>>>> +
>>>> // retrieve PERSISTENT file system
>>>> runs(function() {
>>>> window.requestFileSystem(LocalFileSystem.PERSISTENT,
>>>> 0, win, fail);
>>>> @@ -134,7 +134,7 @@ describe('File API', function() {
>>>> fail = createFail('window.requestFileSystem');
>>>>
>>>> // Request the file system
>>>> - runs(function() {
>>>> + runs(function() {
>>>> window.requestFileSystem(LocalFileSystem.TEMPORARY,
>>> 0,
>>>> win, fail);
>>>> });
>>>>
>>>> @@ -206,7 +206,7 @@ describe('File API', function() {
>>>> });
>>>>
>>>> waitsFor(function() { return win.wasCalled; },
>>>> "resolveLocalFileSystemURI callback never called", Tests.TEST_TIMEOUT);
>>>> -
>>>> +
>>>> runs(function() {
>>>> expect(win).toHaveBeenCalled();
>>>> expect(fail).not.toHaveBeenCalled();
>>>> @@ -237,13 +237,13 @@ describe('File API', function() {
>>>> });
>>>>
>>>> waitsFor(function() { return win.wasCalled; },
>>>> "resolveLocalFileSystemURI callback never called", Tests.TEST_TIMEOUT);
>>>> -
>>>> +
>>>> runs(function() {
>>>> expect(win).toHaveBeenCalled();
>>>> expect(fail).not.toHaveBeenCalled();
>>>> });
>>>> });
>>>> -
>>>> +
>>>> // create a new file entry
>>>> runs(function() {
>>>> createFile(fileName, resolveCallback, fail);
>>>> @@ -251,13 +251,13 @@ describe('File API', function() {
>>>>
>>>> waitsFor(function() { return resolveCallback.wasCalled;
>>> },
>>>> "createFile callback never called", Tests.TEST_TIMEOUT);
>>>> });
>>>> - it("should error out when resolving invalid file name",
>>>> function() {
>>>> + it("should error (NOT_FOUND_ERR) when resolving
>>>> (non-existent) invalid file name", function() {
>>>> var fail =
>>> jasmine.createSpy().andCallFake(function(error)
>>>> {
>>>> expect(error).toBeDefined();
>>>> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>>> }),
>>>> win = createWin('window.resolveLocalFileSystemURI');
>>>> -
>>>> +
>>>> // lookup file system entry
>>>> runs(function() {
>>>>
>>>> window.resolveLocalFileSystemURI("file:///this.is.not.a.valid.file.txt",
>>>> win, fail);
>>>> @@ -270,10 +270,10 @@ describe('File API', function() {
>>>> expect(win).not.toHaveBeenCalled();
>>>> });
>>>> });
>>>> - it("resolve invalid URL", function() {
>>>> + it("should error (NOT_FOUND_ERR) when resolving
>>>> (non-existent) invalid URL", function() {
>>>> var fail =
>>> jasmine.createSpy().andCallFake(function(error)
>>>> {
>>>> expect(error).toBeDefined();
>>>> - expect(error).toBeFileError(FileError.ENCODING_ERR);
>>>> +
>>> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>>> }),
>>>> win = createWin('window.resolveLocalFileSystemURI');
>>>>
>>>> @@ -331,7 +331,7 @@ describe('File API', function() {
>>>> expect(entry.removeRecursively).toBeDefined();
>>>> }),
>>>> fail = createFail('FileSystem');
>>>> -
>>>> +
>>>> runs(function() {
>>>> window.resolveLocalFileSystemURI(root.toURL(), win,
>>> fail);
>>>> });
>>>> @@ -357,7 +357,7 @@ describe('File API', function() {
>>>>
>>>> // create:false, exclusive:false, file does not exist
>>>> runs(function() {
>>>> - root.getFile(fileName, {create:false}, win, fail);
>>>> + root.getFile(fileName, {create:false}, win, fail);
>>>> });
>>>>
>>>> waitsFor(function() { return fail.wasCalled; }, "error
>>>> callback never called", Tests.TEST_TIMEOUT);
>>>> @@ -380,10 +380,10 @@ describe('File API', function() {
>>>> entry.remove(null, null);
>>>> }),
>>>> fail = createFail('DirectoryEntry');
>>>> -
>>>> +
>>>> // create:true, exclusive:false, file does not exist
>>>> runs(function() {
>>>> - root.getFile(fileName, {create: true}, win, fail);
>>>> + root.getFile(fileName, {create: true}, win, fail);
>>>> });
>>>>
>>>> waitsFor(function() { return win.wasCalled; }, "success
>>>> callback never called", Tests.TEST_TIMEOUT);
>>>> @@ -402,7 +402,7 @@ describe('File API', function() {
>>>> expect(entry.isDirectory).toBe(false);
>>>> expect(entry.name).toBe(fileName);
>>>> expect(entry.fullPath).toBe(filePath);
>>>> -
>>>> +
>>>> // cleanup
>>>> entry.remove(null, null);
>>>> }),
>>>> @@ -443,7 +443,7 @@ describe('File API', function() {
>>>> expect(entry.isDirectory).toBe(false);
>>>> expect(entry.name).toBe(fileName);
>>>> expect(entry.fullPath).toBe(filePath);
>>>> -
>>>> +
>>>> // cleanup
>>>> entry.remove(null, fail);
>>>> });
>>>> @@ -475,12 +475,12 @@ describe('File API', function() {
>>>> fail = jasmine.createSpy().andCallFake(function(error) {
>>>> expect(error).toBeDefined();
>>>>
>>> expect(error).toBeFileError(FileError.PATH_EXISTS_ERR);
>>>> -
>>>> +
>>>> // cleanup
>>>> existingFile.remove(null, fail);
>>>> }),
>>>> win = createWin('DirectoryEntry');
>>>> -
>>>> +
>>>> // create file to kick off it
>>>> runs(function() {
>>>> root.getFile(fileName, {create:true}, getFile, fail);
>>>> @@ -497,7 +497,7 @@ describe('File API', function() {
>>>> expect(entry.isDirectory).toBe(false);
>>>> expect(entry.name).toBe(fileName);
>>>> expect(entry.fullPath).toBe(filePath);
>>>> -
>>>> +
>>>> entry.remove(null, fail); //clean up
>>>> }),
>>>> fail = createFail('DirectoryEntry'),
>>>> @@ -514,7 +514,7 @@ describe('File API', function() {
>>>> expect(fail).not.toHaveBeenCalled();
>>>> });
>>>> });
>>>> -
>>>> +
>>>> // create file to kick off it
>>>> runs(function() {
>>>> root.getFile(fileName, {create:true}, getFile, fail);
>>>> @@ -529,7 +529,7 @@ describe('File API', function() {
>>>> expect(error).toBeFileError(FileError.ENCODING_ERR);
>>>> }),
>>>> win = createWin('DirectoryEntry');
>>>> -
>>>> +
>>>> // create:false, exclusive:false, invalid path
>>>> runs(function() {
>>>> root.getFile(fileName, {create:false}, win, fail);
>>>> @@ -551,7 +551,7 @@ describe('File API', function() {
>>>> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>>> }),
>>>> win = createWin('DirectoryEntry');
>>>> -
>>>> +
>>>> // create:false, exclusive:false, directory does not exist
>>>> runs(function() {
>>>> root.getDirectory(dirName, {create:false}, win, fail);
>>>> @@ -580,19 +580,19 @@ describe('File API', function() {
>>>> expect(win).toHaveBeenCalled();
>>>> expect(fail).not.toHaveBeenCalled();
>>>> });
>>>> -
>>>> +
>>>> }), win =
>>>> jasmine.createSpy().andCallFake(function(directory) {
>>>> expect(directory).toBeDefined();
>>>> expect(directory.isFile).toBe(false);
>>>> expect(directory.isDirectory).toBe(true);
>>>> expect(directory.name).toBe(dirName);
>>>> expect(directory.fullPath).toBe(dirPath);
>>>> -
>>>> +
>>>> // cleanup
>>>> directory.remove(null, fail);
>>>> }),
>>>> fail = createFail('DirectoryEntry');
>>>> -
>>>> +
>>>> // create:true, exclusive:false, directory does not exist
>>>> runs(function() {
>>>> root.getDirectory(dirName, {create: true}, getDir, fail);
>>>> @@ -627,7 +627,7 @@ describe('File API', function() {
>>>> directory.remove(null, fail);
>>>> }),
>>>> fail = createFail('DirectoryEntry');
>>>> -
>>>> +
>>>> // create:true, exclusive:false, directory does not exist
>>>> runs(function() {
>>>> root.getDirectory(dirName, {create: true}, getDir, fail);
>>>> @@ -645,15 +645,15 @@ describe('File API', function() {
>>>> expect(directory.isDirectory).toBe(true);
>>>> expect(directory.name).toBe(dirName);
>>>> expect(directory.fullPath).toBe(dirPath);
>>>> -
>>>> +
>>>> // cleanup
>>>> directory.remove(null, fail);
>>>> }),
>>>> fail = createFail('DirectoryEntry');
>>>> -
>>>> +
>>>> // create:true, exclusive:false, directory does not exist
>>>> runs(function() {
>>>> - root.getDirectory(dirName, {create: true}, win, fail);
>>>> + root.getDirectory(dirName, {create: true}, win, fail);
>>>> });
>>>>
>>>> waitsFor(function() { return win.wasCalled; }, "win never
>>>> called", Tests.TEST_TIMEOUT);
>>>> @@ -663,7 +663,7 @@ describe('File API', function() {
>>>> expect(fail).not.toHaveBeenCalled();
>>>> });
>>>> });
>>>> -
>>>> +
>>>> it("DirectoryEntry.getDirectory: create new directory
>>>> (exclusive)", function() {
>>>> var dirName = "de.create.exclusive.dir",
>>>> dirPath = root.fullPath + '/' + dirName,
>>>> @@ -673,14 +673,14 @@ describe('File API', function() {
>>>> expect(directory.isDirectory).toBe(true);
>>>> expect(directory.name).toBe(dirName);
>>>> expect(directory.fullPath).toBe(dirPath);
>>>> -
>>>> +
>>>> // cleanup
>>>> directory.remove(null, fail);
>>>> }),
>>>> fail = createFail('DirectoryEntry');
>>>> // create:true, exclusive:true, directory does not exist
>>>> runs(function() {
>>>> - root.getDirectory(dirName, {create: true,
>>>> exclusive:true}, win, fail);
>>>> + root.getDirectory(dirName, {create: true,
>>>> exclusive:true}, win, fail);
>>>> });
>>>>
>>>> waitsFor(function() { return win.wasCalled; }, "win never
>>>> called", Tests.TEST_TIMEOUT);
>>>> @@ -712,15 +712,15 @@ describe('File API', function() {
>>>> expect(directory.isDirectory).toBe(true);
>>>> expect(directory.name).toBe(dirName);
>>>> expect(directory.fullPath).toBe(dirPath);
>>>> -
>>>> +
>>>> // cleanup
>>>> directory.remove(null, fail);
>>>> }),
>>>> fail = createFail('DirectoryEntry');
>>>> -
>>>> +
>>>> // create directory to kick off it
>>>> runs(function() {
>>>> - root.getDirectory(dirName, {create:true}, getDir,
>>>> this.fail);
>>>> + root.getDirectory(dirName, {create:true}, getDir,
>>>> this.fail);
>>>> });
>>>>
>>>> waitsFor(function() { return getDir.wasCalled; }, "getDir
>>>> never called", Tests.TEST_TIMEOUT);
>>>> @@ -746,17 +746,17 @@ describe('File API', function() {
>>>> fail = jasmine.createSpy().andCallFake(function(error) {
>>>> expect(error).toBeDefined();
>>>>
>>> expect(error).toBeFileError(FileError.PATH_EXISTS_ERR);
>>>> -
>>>> +
>>>> // cleanup
>>>> existingDir.remove(null, fail);
>>>> }),
>>>> win = createWin('DirectoryEntry');
>>>> -
>>>> +
>>>> // create directory to kick off it
>>>> runs(function() {
>>>> root.getDirectory(dirName, {create:true}, getDir, fail);
>>>> });
>>>> -
>>>> +
>>>> waitsFor(function() { return getDir.wasCalled; }, "getDir
>>>> never called", Tests.TEST_TIMEOUT);
>>>> });
>>>> it("DirectoryEntry.getDirectory: get Entry for existing
>>>> directory", function() {
>>>> @@ -780,14 +780,14 @@ describe('File API', function() {
>>>> expect(directory.isFile).toBe(false);
>>>> expect(directory.isDirectory).toBe(true);
>>>> expect(directory.name).toBe(dirName);
>>>> -
>>>> +
>>>> expect(directory.fullPath).toBe(dirPath);
>>>> -
>>>> +
>>>> // cleanup
>>>> directory.remove(null, fail);
>>>> }),
>>>> fail = createFail('DirectoryEntry');
>>>> -
>>>> +
>>>> // create directory to kick off it
>>>> root.getDirectory(dirName, {create:true}, getDir, fail);
>>>> });
>>>> @@ -798,10 +798,10 @@ describe('File API', function() {
>>>> expect(error).toBeFileError(FileError.ENCODING_ERR);
>>>> }),
>>>> win = createWin('DirectoryEntry');
>>>> -
>>>> +
>>>> // create:false, exclusive:false, invalid path
>>>> runs(function() {
>>>> - root.getDirectory(dirName, {create:false}, win, fail);
>>>> + root.getDirectory(dirName, {create:false}, win, fail);
>>>> });
>>>>
>>>> waitsFor(function() { return fail.wasCalled; }, "fail never
>>>> called", Tests.TEST_TIMEOUT);
>>>> @@ -832,12 +832,12 @@ describe('File API', function() {
>>>> fail = jasmine.createSpy().andCallFake(function(error) {
>>>> expect(error).toBeDefined();
>>>>
>>>> expect(error).toBeFileError(FileError.TYPE_MISMATCH_ERR);
>>>> -
>>>> +
>>>> // cleanup
>>>> existingFile.remove(null, null);
>>>> }),
>>>> win = createWin('DirectoryEntry');
>>>> -
>>>> +
>>>> // create file to kick off it
>>>> runs(function() {
>>>> root.getFile(fileName, {create:true}, getDir, fail);
>>>> @@ -866,12 +866,12 @@ describe('File API', function() {
>>>> fail = jasmine.createSpy().andCallFake(function(error) {
>>>> expect(error).toBeDefined();
>>>>
>>>> expect(error).toBeFileError(FileError.TYPE_MISMATCH_ERR);
>>>> -
>>>> +
>>>> // cleanup
>>>> existingDir.remove(null, null);
>>>> }),
>>>> win = createWin('DirectoryEntry');
>>>> -
>>>> +
>>>> // create directory to kick off it
>>>> runs(function() {
>>>> root.getDirectory(dirName, {create:true}, getFile, fail);
>>>> @@ -929,7 +929,7 @@ describe('File API', function() {
>>>> waitsFor(function() { return entryCallback.wasCalled; },
>>>> "entryCallback never called", Tests.TEST_TIMEOUT);
>>>> });
>>>> it("createReader: create reader on existing directory",
>>> function()
>>>> {
>>>> - // create reader for root directory
>>>> + // create reader for root directory
>>>> var reader = root.createReader();
>>>> expect(reader).toBeDefined();
>>>> expect(typeof reader.readEntries).toBe('function');
>>>> @@ -964,8 +964,8 @@ describe('File API', function() {
>>>> expect(entries instanceof Array).toBe(true);
>>>> }),
>>>> fail = createFail('DirectoryReader');
>>>> -
>>>> - // create reader for root directory
>>>> +
>>>> + // create reader for root directory
>>>> reader = root.createReader();
>>>> // read entries
>>>> runs(function() {
>>>> @@ -986,7 +986,7 @@ describe('File API', function() {
>>>> // read entries
>>>> var readEntries =
>>>> jasmine.createSpy().andCallFake(function() {
>>>> var reader = directory.createReader();
>>>> -
>>>> +
>>>> runs(function() {
>>>> reader.readEntries(win, itReader);
>>>> });
>>>> @@ -1055,12 +1055,12 @@ describe('File API', function() {
>>>> expect(fileEntry).toBeDefined();
>>>> expect(typeof
>>> fileEntry.createWriter).toBe('function');
>>>> expect(typeof fileEntry.file).toBe('function');
>>>> -
>>>> - // cleanup
>>>> +
>>>> + // cleanup
>>>> fileEntry.remove(null, fail);
>>>> }),
>>>> fail = createFail('FileEntry');
>>>> -
>>>> +
>>>> // create a new file entry to kick off it
>>>> runs(function() {
>>>> root.getFile(fileName, {create:true}, itFileEntry, fail);
>>>> @@ -1093,12 +1093,12 @@ describe('File API', function() {
>>>> itWriter =
>>>> jasmine.createSpy().andCallFake(function(writer) {
>>>> expect(writer).toBeDefined();
>>>> expect(writer instanceof FileWriter).toBe(true);
>>>> -
>>>> - // cleanup
>>>> +
>>>> + // cleanup
>>>> itFile.remove(null, fail);
>>>> }),
>>>> fail = createFail('FileEntry');
>>>> -
>>>> +
>>>> // create a new file entry to kick off it
>>>> runs(function() {
>>>> root.getFile(fileName, {create:true}, entryCallback,
>>> fail);
>>>> @@ -1111,7 +1111,7 @@ describe('File API', function() {
>>>> newFile,
>>>> entryCallback =
>>>> jasmine.createSpy().andCallFake(function(fileEntry) {
>>>> newFile = fileEntry;
>>>> -
>>>> +
>>>> runs(function() {
>>>> fileEntry.file(itFile, fail);
>>>> });
>>>> @@ -1126,12 +1126,12 @@ describe('File API', function() {
>>>> itFile = jasmine.createSpy().andCallFake(function(file) {
>>>> expect(file).toBeDefined();
>>>> expect(file instanceof File).toBe(true);
>>>> -
>>>> - // cleanup
>>>> +
>>>> + // cleanup
>>>> newFile.remove(null, fail);
>>>> }),
>>>> fail = createFail('FileEntry');
>>>> -
>>>> +
>>>> // create a new file entry to kick off it
>>>> runs(function() {
>>>> root.getFile(fileName, {create:true}, entryCallback,
>>> fail);
>>>> @@ -1168,7 +1168,7 @@ describe('File API', function() {
>>>> }),
>>>> fail = createFail('FileEntry'),
>>>> win = createWin('FileEntry');
>>>> -
>>>> +
>>>> // create a new file entry to kick off it
>>>> runs(function() {
>>>> root.getFile(fileName, {create:true}, entryCallback,
>>> fail);
>>>> @@ -1236,7 +1236,7 @@ describe('File API', function() {
>>>> // cleanup
>>>> deleteEntry(fileName);
>>>> });
>>>> -
>>>> +
>>>> // create a new file entry
>>>> createFile(fileName, entryCallback, fail);
>>>> });
>>>> @@ -1262,7 +1262,7 @@ describe('File API', function() {
>>>> // cleanup
>>>> deleteEntry(dirName);
>>>> });
>>>> -
>>>> +
>>>> // create a new directory entry
>>>> runs(function() {
>>>> createDirectory(dirName, entryCallback, fail);
>>>> @@ -1293,7 +1293,7 @@ describe('File API', function() {
>>>> // cleanup
>>>> deleteEntry(fileName);
>>>> });
>>>> -
>>>> +
>>>> // create a new file entry
>>>> runs(function() {
>>>> createFile(fileName, entryCallback, fail);
>>>> @@ -1364,7 +1364,7 @@ describe('File API', function() {
>>>> deleteEntry(fileName);
>>>> }),
>>>> fail = createFail('Entry');
>>>> -
>>>> +
>>>> // create a new file entry
>>>> runs(function() {
>>>> createFile(fileName, itURL, fail);
>>>> @@ -1421,7 +1421,7 @@ describe('File API', function() {
>>>> });
>>>> });
>>>> expect(entry).toBeDefined();
>>>> -
>>>> +
>>>> runs(function() {
>>>> entry.remove(checkRemove, fail);
>>>> });
>>>> @@ -1435,7 +1435,7 @@ describe('File API', function() {
>>>> deleteEntry(fileName);
>>>> }),
>>>> fail = createFail('Entry');
>>>> -
>>>> +
>>>> // create a new file entry
>>>> runs(function() {
>>>> createFile(fileName, entryCallback, fail);
>>>> @@ -1594,7 +1594,7 @@ describe('File API', function() {
>>>> expect(entry2.isDirectory).toBe(false);
>>>> expect(entry2.fullPath).toBe(fullPath);
>>>> expect(entry2.name).toBe(file2);
>>>> -
>>>> +
>>>> // cleanup
>>>> deleteEntry(file1);
>>>> deleteEntry(file2);
>>>> @@ -1669,7 +1669,7 @@ describe('File API', function() {
>>>> expect(directory.isDirectory).toBe(true);
>>>> expect(directory.fullPath).toBe(dstPath);
>>>> expect(directory.name).toBe(dstDir);
>>>> -
>>>> +
>>>> runs(function() {
>>>> root.getDirectory(dstDir, {create:false},
>>>> itDirExists, fail);
>>>> });
>>>> @@ -1682,7 +1682,7 @@ describe('File API', function() {
>>>> expect(dirEntry.isDirectory).toBe(true);
>>>> expect(dirEntry.fullPath).toBe(dstPath);
>>>> expect(dirEntry.name).toBe(dstDir);
>>>> -
>>>> +
>>>> runs(function() {
>>>> dirEntry.getFile(file1, {create:false},
>>>> itFileExists, fail);
>>>> });
>>>> @@ -1735,7 +1735,7 @@ describe('File API', function() {
>>>> expect(directory.isDirectory).toBe(true);
>>>> expect(directory.fullPath).toBe(dstPath);
>>>> expect(directory.name).toBe(dstDir);
>>>> -
>>>> +
>>>> root.getDirectory(dstDir, {create:false},
>>> itDirExists,
>>>> fail);
>>>> },
>>>> itDirExists = function(dirEntry) {
>>>> @@ -1744,7 +1744,7 @@ describe('File API', function() {
>>>> expect(dirEntry.isDirectory).toBe(true);
>>>> expect(dirEntry.fullPath).toBe(dstPath);
>>>> expect(dirEntry.name).toBe(dstDir);
>>>> -
>>>> +
>>>> dirEntry.getFile(file1, {create:false},
>>> itFileExists,
>>>> fail);
>>>> },
>>>> itFileExists =
>>>> jasmine.createSpy().andCallFake(function(fileEntry) {
>>>> @@ -1784,7 +1784,7 @@ describe('File API', function() {
>>>> var copyDir =
>>>> jasmine.createSpy().andCallFake(function(fileEntry) {
>>>> // copy srcDir onto itself
>>>> runs(function() {
>>>> - directory.copyTo(root, null, win, itCopy);
>>>> + directory.copyTo(root, null, win, itCopy);
>>>> });
>>>>
>>>> waitsFor(function() { return itCopy.wasCalled; },
>>>> "itCopy never called", Tests.TEST_TIMEOUT);
>>>> @@ -1799,8 +1799,8 @@ describe('File API', function() {
>>>> itCopy = jasmine.createSpy().andCallFake(function(error)
>>> {
>>>> expect(error).toBeDefined();
>>>>
>>>> expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
>>>> -
>>>> - runs(function() {
>>>> +
>>>> + runs(function() {
>>>> root.getDirectory(srcDir, {create:false},
>>>> itDirectoryExists, fail);
>>>> });
>>>>
>>>> @@ -1810,7 +1810,7 @@ describe('File API', function() {
>>>> // returning confirms existence so just check
>>> fullPath
>>>> entry
>>>> expect(dirEntry).toBeDefined();
>>>> expect(dirEntry.fullPath).toBe(srcPath);
>>>> -
>>>> +
>>>> runs(function() {
>>>> dirEntry.getFile(file1, {create:false},
>>>> itFileExists, fail);
>>>> });
>>>> @@ -1826,7 +1826,7 @@ describe('File API', function() {
>>>> itFileExists =
>>>> jasmine.createSpy().andCallFake(function(fileEntry) {
>>>> expect(fileEntry).toBeDefined();
>>>> expect(fileEntry.fullPath).toBe(filePath);
>>>> -
>>>> +
>>>> // cleanup
>>>> deleteEntry(srcDir);
>>>> });
>>>> @@ -1855,7 +1855,7 @@ describe('File API', function() {
>>>> itCopy = jasmine.createSpy().andCallFake(function(error)
>>> {
>>>> expect(error).toBeDefined();
>>>>
>>>> expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
>>>> -
>>>> +
>>>> runs(function() {
>>>> root.getDirectory(srcDir, {create:false},
>>>> itDirectoryExists, fail);
>>>> });
>>>> @@ -1885,7 +1885,7 @@ describe('File API', function() {
>>>> waitsFor(function() { return entryCallback.wasCalled; },
>>>> "entryCallback never called", Tests.TEST_TIMEOUT);
>>>> });
>>>> it("copyTo: directory that does not exist", function() {
>>>> - var file1 = "entry.copy.dnf.file1",
>>>> + var file1 = "entry.copy.dnf.file1",
>>>> dstDir = "entry.copy.dnf.dstDir",
>>>> filePath = root.fullPath + '/' + file1,
>>>> dstPath = root.fullPath + '/' + dstDir,
>>>> @@ -1987,7 +1987,7 @@ describe('File API', function() {
>>>> expect(entry.isDirectory).toBe(false);
>>>> expect(entry.fullPath).toBe(dstPath);
>>>> expect(entry.name).toBe(file2);
>>>> -
>>>> +
>>>> runs(function() {
>>>> root.getFile(file2, {create:false},
>>> itMovedExists,
>>>> fail);
>>>> });
>>>> @@ -1997,7 +1997,7 @@ describe('File API', function() {
>>>> itMovedExists =
>>>> jasmine.createSpy().andCallFake(function(fileEntry) {
>>>> expect(fileEntry).toBeDefined();
>>>> expect(fileEntry.fullPath).toBe(dstPath);
>>>> -
>>>> +
>>>> runs(function() {
>>>> root.getFile(file1, {create:false}, win, itOrig);
>>>> });
>>>> @@ -2014,7 +2014,7 @@ describe('File API', function() {
>>>> //expect(navigator.fileMgr.itFileExists(srcPath) ===
>>>> false, "original file should not exist.");
>>>> expect(error).toBeDefined();
>>>> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>>> -
>>>> +
>>>> // cleanup
>>>> deleteEntry(file1);
>>>> deleteEntry(file2);
>>>> @@ -2057,7 +2057,7 @@ describe('File API', function() {
>>>>
>>>> waitsFor(function() { return itMove.wasCalled; },
>>>> "itMove never called", Tests.TEST_TIMEOUT);
>>>> });
>>>> -
>>>> +
>>>> // create a parent directory to move file to
>>>> runs(function() {
>>>> root.getDirectory(dir, {create: true}, moveFile,
>>>> fail);
>>>> @@ -2068,7 +2068,7 @@ describe('File API', function() {
>>>> itMovedExists =
>>>> jasmine.createSpy().andCallFake(function(fileEntry) {
>>>> expect(fileEntry).toBeDefined();
>>>> expect(fileEntry.fullPath).toBe(dstPath);
>>>> -
>>>> +
>>>> runs(function() {
>>>> root.getFile(file1, {create:false}, win, itOrig);
>>>> });
>>>> @@ -2084,7 +2084,7 @@ describe('File API', function() {
>>>> itOrig = jasmine.createSpy().andCallFake(function(error)
>>> {
>>>> expect(error).toBeDefined();
>>>> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>>> -
>>>> +
>>>> // cleanup
>>>> deleteEntry(file1);
>>>> deleteEntry(dir);
>>>> @@ -2131,7 +2131,7 @@ describe('File API', function() {
>>>> expect(directory.fullPath).toBe(dstPath);
>>>> expect(directory.name).toBe(dstDir);
>>>> // it that moved file exists in destination dir
>>>> -
>>>> +
>>>> runs(function() {
>>>> directory.getFile(file1, {create:false},
>>>> itMovedExists, fail);
>>>> });
>>>> @@ -2158,7 +2158,7 @@ describe('File API', function() {
>>>> itOrig = jasmine.createSpy().andCallFake(function(error)
>>> {
>>>> expect(error).toBeDefined();
>>>> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>>> -
>>>> +
>>>> // cleanup
>>>> deleteEntry(srcDir);
>>>> deleteEntry(dstDir);
>>>> @@ -2231,7 +2231,7 @@ describe('File API', function() {
>>>> itOrig = jasmine.createSpy().andCallFake(function(error)
>>> {
>>>> expect(error).toBeDefined();
>>>> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>>> -
>>>> +
>>>> // cleanup
>>>> deleteEntry(srcDir);
>>>> deleteEntry(dstDir);
>>>> @@ -2304,7 +2304,7 @@ describe('File API', function() {
>>>> itOrig = jasmine.createSpy().andCallFake(function(error)
>>> {
>>>> expect(error).toBeDefined();
>>>> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>>> -
>>>> +
>>>> // cleanup
>>>> deleteEntry(srcDir);
>>>> deleteEntry(dstDir);
>>>> @@ -2346,7 +2346,7 @@ describe('File API', function() {
>>>> itMove = jasmine.createSpy().andCallFake(function(error)
>>> {
>>>> expect(error).toBeDefined();
>>>>
>>>> expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
>>>> -
>>>> +
>>>> // it that original dir still exists
>>>> runs(function() {
>>>> root.getDirectory(srcDir, {create:false},
>>>> itDirectoryExists, fail);
>>>> @@ -2358,7 +2358,7 @@ describe('File API', function() {
>>>> // returning confirms existence so just check
>>> fullPath
>>>> entry
>>>> expect(dirEntry).toBeDefined();
>>>> expect(dirEntry.fullPath).toBe(srcPath);
>>>> -
>>>> +
>>>> runs(function() {
>>>> dirEntry.getFile(file1, {create:false},
>>>> itFileExists, fail);
>>>> });
>>>> @@ -2374,7 +2374,7 @@ describe('File API', function() {
>>>> itFileExists =
>>>> jasmine.createSpy().andCallFake(function(fileEntry) {
>>>> expect(fileEntry).toBeDefined();
>>>> expect(fileEntry.fullPath).toBe(filePath);
>>>> -
>>>> +
>>>> // cleanup
>>>> deleteEntry(srcDir);
>>>> });
>>>> @@ -2419,7 +2419,7 @@ describe('File API', function() {
>>>> itDirectoryExists =
>>>> jasmine.createSpy().andCallFake(function(entry) {
>>>> expect(entry).toBeDefined();
>>>> expect(entry.fullPath).toBe(srcPath);
>>>> -
>>>> +
>>>> // cleanup
>>>> deleteEntry(srcDir);
>>>> });
>>>> @@ -2447,7 +2447,7 @@ describe('File API', function() {
>>>> itMove = jasmine.createSpy().andCallFake(function(error)
>>> {
>>>> expect(error).toBeDefined();
>>>>
>>>> expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
>>>> -
>>>> +
>>>> //it that original file still exists
>>>> runs(function() {
>>>> root.getFile(file1, {create:false}, itFileExists,
>>>> fail);
>>>> @@ -2464,7 +2464,7 @@ describe('File API', function() {
>>>> itFileExists =
>>>> jasmine.createSpy().andCallFake(function(fileEntry) {
>>>> expect(fileEntry).toBeDefined();
>>>> expect(fileEntry.fullPath).toBe(filePath);
>>>> -
>>>> +
>>>> // cleanup
>>>> deleteEntry(file1);
>>>> });
>>>> @@ -2496,10 +2496,10 @@ describe('File API', function() {
>>>> // move file1 onto sub-directory
>>>> entry.moveTo(directory, subDir, win, itMove);
>>>> };
>>>> - // create sub-directory
>>>> + // create sub-directory
>>>> directory.getDirectory(subDir, {create: true},
>>>> moveFile, fail);
>>>> };
>>>> - // create top level directory
>>>> + // create top level directory
>>>> root.getDirectory(dstDir, {create: true},
>>>> createSubDirectory, fail);
>>>> },
>>>> itDirectoryExists = function(dirEntry) {
>>>> @@ -2526,7 +2526,7 @@ describe('File API', function() {
>>>> });
>>>>
>>>> waitsFor(function() { return itFileExists.wasCalled; },
>>>> "itFileExists never called", Tests.TEST_TIMEOUT);
>>>> -
>>>> +
>>>> runs(function() {
>>>> expect(itFileExists).toHaveBeenCalled();
>>>> expect(win).not.toHaveBeenCalled();
>>>> @@ -2564,7 +2564,7 @@ describe('File API', function() {
>>>> itFileExists =
>>>> jasmine.createSpy().andCallFake(function(fileEntry) {
>>>> expect(fileEntry).toBeDefined();
>>>> expect(fileEntry.fullPath).toBe(filePath);
>>>> -
>>>> +
>>>> // cleanup
>>>> deleteEntry(file1);
>>>> deleteEntry(srcDir);
>>>> @@ -2614,7 +2614,7 @@ describe('File API', function() {
>>>> itFileExists =
>>>> jasmine.createSpy().andCallFake(function(fileEntry) {
>>>> expect(fileEntry).toBeDefined();
>>>> expect(fileEntry.fullPath).toBe(filePath);
>>>> -
>>>> +
>>>> // cleanup
>>>> deleteEntry(file1);
>>>> deleteEntry(srcDir);
>>>> @@ -2650,14 +2650,14 @@ describe('File API', function() {
>>>> var itMove = function(error) {
>>>> expect(error).toBeDefined();
>>>>
>>>> expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
>>>> -
>>>> +
>>>> // it that destination directory still exists
>>>> directory.getDirectory(subDir,
>>> {create:false},
>>>> itDirectoryExists, fail);
>>>> };
>>>> - // create sub-directory
>>>> + // create sub-directory
>>>> directory.getDirectory(subDir, {create: true},
>>>> moveDir, fail);
>>>> };
>>>> - // create top level directory
>>>> + // create top level directory
>>>> root.getDirectory(dstDir, {create: true},
>>>> createSubDirectory, fail);
>>>> },
>>>> itDirectoryExists = function(dirEntry) {
>>>> @@ -2712,7 +2712,7 @@ describe('File API', function() {
>>>> expect(entry.isDirectory).toBe(false);
>>>> expect(entry.fullPath).toBe(file2Path);
>>>> expect(entry.name).toBe(file2);
>>>> -
>>>> +
>>>> // it that old file does not exists
>>>> root.getFile(file1, {create:false}, win,
>>> itFileMoved);
>>>> },
>>>> @@ -2725,7 +2725,7 @@ describe('File API', function() {
>>>> itFileExists =
>>>> jasmine.createSpy().andCallFake(function(fileEntry) {
>>>> expect(fileEntry).toBeDefined();
>>>> expect(fileEntry.fullPath).toBe(file2Path);
>>>> -
>>>> +
>>>> // cleanup
>>>> deleteEntry(file1);
>>>> deleteEntry(file2);
>>>> @@ -2777,14 +2777,14 @@ describe('File API', function() {
>>>> itFileExists = function(fileEntry) {
>>>> expect(fileEntry).toBeDefined();
>>>> expect(fileEntry.fullPath).toBe(filePath);
>>>> -
>>>> +
>>>> // check that old directory no longer exists
>>>> root.getDirectory(srcDir, {create:false}, win,
>>>> itRemoved);
>>>> },
>>>> itRemoved =
>>>> jasmine.createSpy().andCallFake(function(error){
>>>> expect(error).toBeDefined();
>>>> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>>> -
>>>> +
>>>> // cleanup
>>>> deleteEntry(srcDir);
>>>> deleteEntry(dstDir);
>>>> @@ -2807,7 +2807,7 @@ describe('File API', function() {
>>>> });
>>>> });
>>>> it("moveTo: directory that does not exist", function() {
>>>> - var file1 = "entry.move.dnf.file1",
>>>> + var file1 = "entry.move.dnf.file1",
>>>> dstDir = "entry.move.dnf.dstDir",
>>>> filePath = root.fullPath + '/' + file1,
>>>> dstPath = root.fullPath + '/' + dstDir,
>>>> @@ -2822,7 +2822,7 @@ describe('File API', function() {
>>>> itMove = jasmine.createSpy().andCallFake(function(error)
>>> {
>>>> expect(error).toBeDefined();
>>>> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>>> -
>>>> +
>>>> // cleanup
>>>> deleteEntry(file1);
>>>> });
>>>> @@ -2912,10 +2912,10 @@ describe('File API', function() {
>>>> reader.onloadend = verifier;
>>>> var myFile = new File();
>>>>
>>>> - myFile.fullPath = filePath;
>>>> + myFile.fullPath = filePath;
>>>> reader.readAsText(myFile);
>>>> };
>>>> -
>>>> +
>>>> // create a file, write to it, and read it in again
>>>> runs(function() {
>>>> root.getFile(fileName, {create: true}, create_writer,
>>>> fail);
>>>> @@ -2944,10 +2944,10 @@ describe('File API', function() {
>>>> var reader = new FileReader();
>>>> reader.onloadend = verifier;
>>>> var myFile = new File();
>>>> - myFile.fullPath = filePath;
>>>> + myFile.fullPath = filePath;
>>>> reader.readAsText(myFile);
>>>> };
>>>> -
>>>> +
>>>> // create a file, write to it, and read it in again
>>>> runs(function() {
>>>> root.getFile(fileName, {create: true}, read_file, fail);
>>>> @@ -2968,7 +2968,7 @@ describe('File API', function() {
>>>> });
>>>> reader.onerror = verifier;
>>>> var myFile = new File();
>>>> - myFile.fullPath = root.fullPath + '/' + "doesnotexist.err";
>>>> + myFile.fullPath = root.fullPath + '/' + "doesnotexist.err";
>>>>
>>>> runs(function() {
>>>> reader.readAsText(myFile);
>>>> @@ -2993,7 +2993,7 @@ describe('File API', function() {
>>>> },
>>>> // writes file and reads it back in
>>>> write_file = function(writer) {
>>>> - writer.onwriteend = read_file;
>>>> + writer.onwriteend = read_file;
>>>> writer.write(rule);
>>>> },
>>>> verifier = jasmine.createSpy().andCallFake(function(evt)
>>> {
>>>> @@ -3005,10 +3005,10 @@ describe('File API', function() {
>>>> var reader = new FileReader();
>>>> reader.onloadend = verifier;
>>>> var myFile = new File();
>>>> - myFile.fullPath = filePath;
>>>> + myFile.fullPath = filePath;
>>>> reader.readAsDataURL(myFile);
>>>> };
>>>> -
>>>> +
>>>> // create a file, write to it, and read it in again
>>>> runs(function() {
>>>> root.getFile(fileName, {create: true}, create_writer,
>>>> fail);
>>>> @@ -3089,7 +3089,7 @@ describe('File API', function() {
>>>> writer.write(rule);
>>>> }, fail);
>>>> };
>>>> -
>>>> +
>>>> // create file, then write and append to it
>>>> runs(function() {
>>>> createFile(fileName, write_file);
>>>> @@ -3120,7 +3120,7 @@ describe('File API', function() {
>>>> theWriter.onwriteend = anotherVerifier;
>>>> length += exception.length;
>>>> theWriter.seek(theWriter.length);
>>>> - theWriter.write(exception);
>>>> + theWriter.write(exception);
>>>> }),
>>>> anotherVerifier =
>>>> jasmine.createSpy().andCallFake(function(evt) {
>>>> expect(theWriter.length).toBe(length);
>>>> @@ -3135,7 +3135,7 @@ describe('File API', function() {
>>>> theWriter.onwriteend = verifier;
>>>> theWriter.write(rule);
>>>> };
>>>> -
>>>> +
>>>> // create file, then write and append to it
>>>> runs(function() {
>>>> var file = new File();
>>>> @@ -3168,7 +3168,7 @@ describe('File API', function() {
>>>> theWriter.onwriteend = anotherVerifier;
>>>> length = 12 + exception.length;
>>>> theWriter.seek(12);
>>>> - theWriter.write(exception);
>>>> + theWriter.write(exception);
>>>> }),
>>>> anotherVerifier =
>>>> jasmine.createSpy().andCallFake(function(evt) {
>>>> expect(theWriter.length).toBe(length);
>>>> @@ -3185,7 +3185,7 @@ describe('File API', function() {
>>>> theWriter.write(rule);
>>>> }, fail);
>>>> };
>>>> -
>>>> +
>>>> // create file, then write and append to it
>>>> runs(function() {
>>>> createFile(fileName, write_file);
>>>> @@ -3216,7 +3216,7 @@ describe('File API', function() {
>>>> theWriter.onwriteend = anotherVerifier;
>>>> length = 8 + exception.length;
>>>> theWriter.seek(8);
>>>> - theWriter.write(exception);
>>>> + theWriter.write(exception);
>>>> }),
>>>> anotherVerifier =
>>>> jasmine.createSpy().andCallFake(function(evt) {
>>>> expect(theWriter.length).toBe(length);
>>>> @@ -3233,7 +3233,7 @@ describe('File API', function() {
>>>> theWriter.write(rule);
>>>> }, fail);
>>>> };
>>>> -
>>>> +
>>>> // create file, then write and append to it
>>>> runs(function() {
>>>> createFile(fileName, write_file);
>>>> @@ -3271,7 +3271,7 @@ describe('File API', function() {
>>>> theWriter.write(rule);
>>>> }, fail);
>>>> };
>>>> -
>>>> +
>>>> // creates file, then write XML data
>>>> runs(function() {
>>>> createFile(fileName, write_file);
>>>> @@ -3305,10 +3305,10 @@ describe('File API', function() {
>>>> fileEntry.createWriter(function(writer) {
>>>> theWriter = writer;
>>>> theWriter.onwriteend = verifier;
>>>> - theWriter.write(rule);
>>>> + theWriter.write(rule);
>>>> }, fail);
>>>> };
>>>> -
>>>> +
>>>> // creates file, then write JSON content
>>>> runs(function() {
>>>> createFile(fileName, write_file);
>>>> @@ -3341,7 +3341,7 @@ describe('File API', function() {
>>>> // writes file and reads it back in
>>>> write_file = function(writer) {
>>>> theWriter = writer;
>>>> - theWriter.onwriteend = read_file;
>>>> + theWriter.onwriteend = read_file;
>>>> theWriter.write(rule);
>>>> },
>>>> // reads file and compares content to what was written
>>>> @@ -3395,7 +3395,7 @@ describe('File API', function() {
>>>> theWriter.write(rule);
>>>> }, fail);
>>>> };
>>>> -
>>>> +
>>>> // creates file, then write JSON content
>>>> runs(function() {
>>>> createFile(fileName, seek_file);
>>>> @@ -3413,20 +3413,20 @@ describe('File API', function() {
>>>> rule = "There is an exception to every rule. Except this
>>>> one.",
>>>> fail = createFail('FileWRiter'),
>>>> theWriter,
>>>> - // writes file content
>>>> + // writes file content
>>>> write_file = function(fileEntry) {
>>>> fileEntry.createWriter(function(writer) {
>>>> theWriter = writer;
>>>> theWriter.onwriteend = function(evt) {
>>>> truncate_file(theWriter);
>>>> - };
>>>> + };
>>>> theWriter.write(rule);
>>>> }, fail);
>>>> },
>>>> verifier = jasmine.createSpy().andCallFake(function(evt)
>>> {
>>>> expect(theWriter.length).toBe(36);
>>>> expect(theWriter.position).toBe(36);
>>>> -
>>>> +
>>>> // cleanup
>>>> deleteFile(fileName);
>>>> }),
>>>>
>>>>
>>>
>>
>>
>>
>> --
>> @purplecabbage
>> risingj.com
Re: spec commit: described test condition, updated to test for
NOT_FOUND_ERR
Posted by Mike Flores <mi...@gmail.com>.
Request to unsubscribe
On 5/23/12 8:38 AM, "Simon MacDonald" <si...@gmail.com> wrote:
>Hey Jesse,
>
>I'm probably the person who originally wrote the test and the intent
>was to test to see that we fire a ENCODING_ERR when the url passed
>into window.resolveLocalFileSystemURI() does not specify a protocol.
>
>In Java when you do a:
>
> URL testUrl = new URL("/this.is.not.a.valid.url");
>
>it throws a MalformedURLException complaining that no protocol exists.
>
>More damningly if you run the following code in Chrome:
>
> var url = '/this.is.not.a.valid.url';
> window.webkitResolveLocalFileSystemURL(url, function(fileEntry) {
> console.log("path = " + fileEntry.name);
> }, function(error) {
> console.log("Error = " + error.code);
> console.log("Encoding error = " + FileError.ENCODING_ERR);
> });
>
>you will see:
>
> Error = 5
> Encoding error = 5
>
>in the console so it appears that Chrome agrees with our implementation.
>
>It's my recommendation that the test case and Drew's change on BB
>should be reverted to the original behaviour and the WP code be
>changed to return a ENCODING_ERR if not protocol is specified so we
>all stay consistent.
>
>As to why there is a native implementation? At least on Android you
>can pass in "content://" type URL's which point to pictures, video,
>etc. in the Android content store. The
>window.resolveLocalFileSystemURI() method can be used to get a
>FileEntry from one of these weird content uri's so devs can manipulate
>the files.
>
>Simon Mac Donald
>http://hi.im/simonmacdonald
>
>
>On Tue, May 22, 2012 at 6:14 PM, Jesse <pu...@gmail.com> wrote:
>> I think the only person who knows the intent of the test case is whoever
>> wrote it.
>> I am sorry that a fix for WP7 has caused issues elsewhere, I will look
>>for
>> another solution. Ultimately we need the docs to state what error codes
>> are returned in what situation, perhaps an example for each error code,
>> that would be aligned with the tests.
>>
>> What exactly makes "/this.is.not.a.valid.url" an EncodingError?
>>
>> On WP7 I am relying on the SDK to tell me if it is well formed :
>>
>> if (!Uri.IsWellFormedUriString(fileOptions.Uri,
>>UriKind.RelativeOrAbsolute))
>> {
>> DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR,
>> ENCODING_ERR));
>> return;
>> }
>>
>> If indeed it is deemed that this is an EncodingError, do we even need to
>> call native to determine that?
>>
>>
>> On Tue, May 22, 2012 at 1:46 PM, Becky Gibson
>><gi...@gmail.com>wrote:
>>
>>> Just tested mobile-spec on iOS and was surprised to find a failing file
>>> test.
>>>
>>> Curious why the error code was changed from ENCODING_ERR to
>>>NOT_FOUND_ERR?
>>> To me the description in the spec would indicate that an invalid URL
>>> would return ENCODING_ERR?
>>>
>>> from http://www.w3.org/TR/file-system-api/#definitions: EncodingErrorA
>>> path or URL supplied to the API was malformed.
>>> NotFoundErrorA required file or directory could not be found at the
>>>time an
>>> operation was processed.
>>> The test that was changed is: window.resolveLocalFileSystemURI(
>>> "/this.is.not.a.valid.url", win, fail); IMHO
>>>"/this.is.not.a.valid.url" is
>>> NOT a valid url according to
>>> http://www.w3.org/Addressing/URL/url-spec.txt so it seems appropriate
>>> to return an encodingError? This was discussed in
>>> https://issues.apache.org/jira/browse/CB-671 where folks suggested it
>>>IS a
>>> valid URL?
>>>
>>> If we decide this is the appropriate return value, I'll have to do a
>>>bit of
>>> work on the iOS code as it uses the NSURL URLWithString: and
>>>isFileURL:
>>> apis to determine if the input is a valid File URL or not. I'm not
>>>sure
>>> that appending "file://" to the input parameter is really the best
>>> solution......
>>>
>>> NSURL* testUri = [NSURL URLWithString:strUri];
>>> if (!testUri || ![testUri isFileURL])
>>>
>>> I'm also wondering if this is something we should be changing without
>>>some
>>> kind of warning to users. While most people may just check for an
>>>error,
>>> it seems a bit odd to change the actual error code being returned.
>>>
>>> -becky
>>>
>>>
>>> On Tue, May 8, 2012 at 8:17 PM, <pu...@apache.org> wrote:
>>>
>>> > Updated Branches:
>>> > refs/heads/master 35a3f3f4a -> c3225a50f
>>> >
>>> >
>>> > described test condition, updated to test for NOT_FOUND_ERR
>>> >
>>> >
>>> > Project:
>>> >
>>>
>>>http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/rep
>>>o
>>> > Commit:
>>> >
>>>
>>>http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/com
>>>mit/c3225a50
>>> > Tree:
>>> >
>>>
>>>http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tre
>>>e/c3225a50
>>> > Diff:
>>> >
>>>
>>>http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/dif
>>>f/c3225a50
>>> >
>>> > Branch: refs/heads/master
>>> > Commit: c3225a50f48649bc66fd6c4e99b3e959d06a13b8
>>> > Parents: 35a3f3f
>>> > Author: Jesse MacFadyen <pu...@gmail.com>
>>> > Authored: Tue May 8 17:16:43 2012 -0700
>>> > Committer: Jesse MacFadyen <pu...@gmail.com>
>>> > Committed: Tue May 8 17:16:43 2012 -0700
>>> >
>>> >
>>>----------------------------------------------------------------------
>>> > autotest/tests/file.tests.js | 272
>>>++++++++++++++++++------------------
>>> > 1 files changed, 136 insertions(+), 136 deletions(-)
>>> >
>>>----------------------------------------------------------------------
>>> >
>>> >
>>> >
>>> >
>>>
>>>http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blo
>>>b/c3225a50/autotest/tests/file.tests.js
>>> >
>>>----------------------------------------------------------------------
>>> > diff --git a/autotest/tests/file.tests.js
>>>b/autotest/tests/file.tests.js
>>> > index de37980..860a6c1 100644
>>> > --- a/autotest/tests/file.tests.js
>>> > +++ b/autotest/tests/file.tests.js
>>> > @@ -31,10 +31,10 @@ describe('File API', function() {
>>> > // deletes specified file or directory
>>> > var deleteEntry = function(name, success, error) {
>>> > // deletes entry, if it exists
>>> > - window.resolveLocalFileSystemURI(root.toURL() + '/' + name,
>>> > + window.resolveLocalFileSystemURI(root.toURL() + '/' + name,
>>> > function(entry) {
>>> > if (entry.isDirectory === true) {
>>> > - entry.removeRecursively(success, error);
>>> > + entry.removeRecursively(success, error);
>>> > } else {
>>> > entry.remove(success, error);
>>> > }
>>> > @@ -42,7 +42,7 @@ describe('File API', function() {
>>> > };
>>> > // deletes file, if it exists, then invokes callback
>>> > var deleteFile = function(fileName, callback) {
>>> > - root.getFile(fileName, null,
>>> > + root.getFile(fileName, null,
>>> > // remove file system entry
>>> > function(entry) {
>>> > entry.remove(callback, function() {
>>> > console.log('[ERROR] deleteFile cleanup method invoked fail
>>>callback.');
>>> });
>>> > @@ -59,7 +59,7 @@ describe('File API', function() {
>>> > // deletes and re-creates the specified directory
>>> > var createDirectory = function(dirName, success, error) {
>>> > deleteEntry(dirName, function() {
>>> > - root.getDirectory(dirName, {create: true}, success,
>>>error);
>>> > + root.getDirectory(dirName, {create: true}, success,
>>>error);
>>> > }, error);
>>> > };
>>> >
>>> > @@ -111,7 +111,7 @@ describe('File API', function() {
>>> > expect(fileSystem.root).toBeDefined();
>>> > }),
>>> > fail = createFail('window.requestFileSystem');
>>> > -
>>> > +
>>> > // retrieve PERSISTENT file system
>>> > runs(function() {
>>> >
>>>window.requestFileSystem(LocalFileSystem.PERSISTENT,
>>> > 0, win, fail);
>>> > @@ -134,7 +134,7 @@ describe('File API', function() {
>>> > fail = createFail('window.requestFileSystem');
>>> >
>>> > // Request the file system
>>> > - runs(function() {
>>> > + runs(function() {
>>> >
>>>window.requestFileSystem(LocalFileSystem.TEMPORARY,
>>> 0,
>>> > win, fail);
>>> > });
>>> >
>>> > @@ -206,7 +206,7 @@ describe('File API', function() {
>>> > });
>>> >
>>> > waitsFor(function() { return win.wasCalled; },
>>> > "resolveLocalFileSystemURI callback never called",
>>>Tests.TEST_TIMEOUT);
>>> > -
>>> > +
>>> > runs(function() {
>>> > expect(win).toHaveBeenCalled();
>>> > expect(fail).not.toHaveBeenCalled();
>>> > @@ -237,13 +237,13 @@ describe('File API', function() {
>>> > });
>>> >
>>> > waitsFor(function() { return win.wasCalled; },
>>> > "resolveLocalFileSystemURI callback never called",
>>>Tests.TEST_TIMEOUT);
>>> > -
>>> > +
>>> > runs(function() {
>>> > expect(win).toHaveBeenCalled();
>>> > expect(fail).not.toHaveBeenCalled();
>>> > });
>>> > });
>>> > -
>>> > +
>>> > // create a new file entry
>>> > runs(function() {
>>> > createFile(fileName, resolveCallback, fail);
>>> > @@ -251,13 +251,13 @@ describe('File API', function() {
>>> >
>>> > waitsFor(function() { return
>>>resolveCallback.wasCalled;
>>> },
>>> > "createFile callback never called", Tests.TEST_TIMEOUT);
>>> > });
>>> > - it("should error out when resolving invalid file name",
>>> > function() {
>>> > + it("should error (NOT_FOUND_ERR) when resolving
>>> > (non-existent) invalid file name", function() {
>>> > var fail =
>>> jasmine.createSpy().andCallFake(function(error)
>>> > {
>>> > expect(error).toBeDefined();
>>> >
>>>expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>> > }),
>>> > win = createWin('window.resolveLocalFileSystemURI');
>>> > -
>>> > +
>>> > // lookup file system entry
>>> > runs(function() {
>>> >
>>> >
>>>window.resolveLocalFileSystemURI("file:///this.is.not.a.valid.file.txt",
>>> > win, fail);
>>> > @@ -270,10 +270,10 @@ describe('File API', function() {
>>> > expect(win).not.toHaveBeenCalled();
>>> > });
>>> > });
>>> > - it("resolve invalid URL", function() {
>>> > + it("should error (NOT_FOUND_ERR) when resolving
>>> > (non-existent) invalid URL", function() {
>>> > var fail =
>>> jasmine.createSpy().andCallFake(function(error)
>>> > {
>>> > expect(error).toBeDefined();
>>> > -
>>>expect(error).toBeFileError(FileError.ENCODING_ERR);
>>> > +
>>> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>> > }),
>>> > win = createWin('window.resolveLocalFileSystemURI');
>>> >
>>> > @@ -331,7 +331,7 @@ describe('File API', function() {
>>> > expect(entry.removeRecursively).toBeDefined();
>>> > }),
>>> > fail = createFail('FileSystem');
>>> > -
>>> > +
>>> > runs(function() {
>>> > window.resolveLocalFileSystemURI(root.toURL(), win,
>>> fail);
>>> > });
>>> > @@ -357,7 +357,7 @@ describe('File API', function() {
>>> >
>>> > // create:false, exclusive:false, file does not exist
>>> > runs(function() {
>>> > - root.getFile(fileName, {create:false}, win, fail);
>>> > + root.getFile(fileName, {create:false}, win, fail);
>>> > });
>>> >
>>> > waitsFor(function() { return fail.wasCalled; }, "error
>>> > callback never called", Tests.TEST_TIMEOUT);
>>> > @@ -380,10 +380,10 @@ describe('File API', function() {
>>> > entry.remove(null, null);
>>> > }),
>>> > fail = createFail('DirectoryEntry');
>>> > -
>>> > +
>>> > // create:true, exclusive:false, file does not exist
>>> > runs(function() {
>>> > - root.getFile(fileName, {create: true}, win, fail);
>>> > + root.getFile(fileName, {create: true}, win, fail);
>>> > });
>>> >
>>> > waitsFor(function() { return win.wasCalled; }, "success
>>> > callback never called", Tests.TEST_TIMEOUT);
>>> > @@ -402,7 +402,7 @@ describe('File API', function() {
>>> > expect(entry.isDirectory).toBe(false);
>>> > expect(entry.name).toBe(fileName);
>>> > expect(entry.fullPath).toBe(filePath);
>>> > -
>>> > +
>>> > // cleanup
>>> > entry.remove(null, null);
>>> > }),
>>> > @@ -443,7 +443,7 @@ describe('File API', function() {
>>> > expect(entry.isDirectory).toBe(false);
>>> > expect(entry.name).toBe(fileName);
>>> > expect(entry.fullPath).toBe(filePath);
>>> > -
>>> > +
>>> > // cleanup
>>> > entry.remove(null, fail);
>>> > });
>>> > @@ -475,12 +475,12 @@ describe('File API', function() {
>>> > fail =
>>>jasmine.createSpy().andCallFake(function(error) {
>>> > expect(error).toBeDefined();
>>> >
>>> expect(error).toBeFileError(FileError.PATH_EXISTS_ERR);
>>> > -
>>> > +
>>> > // cleanup
>>> > existingFile.remove(null, fail);
>>> > }),
>>> > win = createWin('DirectoryEntry');
>>> > -
>>> > +
>>> > // create file to kick off it
>>> > runs(function() {
>>> > root.getFile(fileName, {create:true}, getFile, fail);
>>> > @@ -497,7 +497,7 @@ describe('File API', function() {
>>> > expect(entry.isDirectory).toBe(false);
>>> > expect(entry.name).toBe(fileName);
>>> > expect(entry.fullPath).toBe(filePath);
>>> > -
>>> > +
>>> > entry.remove(null, fail); //clean up
>>> > }),
>>> > fail = createFail('DirectoryEntry'),
>>> > @@ -514,7 +514,7 @@ describe('File API', function() {
>>> > expect(fail).not.toHaveBeenCalled();
>>> > });
>>> > });
>>> > -
>>> > +
>>> > // create file to kick off it
>>> > runs(function() {
>>> > root.getFile(fileName, {create:true}, getFile, fail);
>>> > @@ -529,7 +529,7 @@ describe('File API', function() {
>>> >
>>>expect(error).toBeFileError(FileError.ENCODING_ERR);
>>> > }),
>>> > win = createWin('DirectoryEntry');
>>> > -
>>> > +
>>> > // create:false, exclusive:false, invalid path
>>> > runs(function() {
>>> > root.getFile(fileName, {create:false}, win, fail);
>>> > @@ -551,7 +551,7 @@ describe('File API', function() {
>>> >
>>>expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>> > }),
>>> > win = createWin('DirectoryEntry');
>>> > -
>>> > +
>>> > // create:false, exclusive:false, directory does not
>>>exist
>>> > runs(function() {
>>> > root.getDirectory(dirName, {create:false}, win,
>>>fail);
>>> > @@ -580,19 +580,19 @@ describe('File API', function() {
>>> > expect(win).toHaveBeenCalled();
>>> > expect(fail).not.toHaveBeenCalled();
>>> > });
>>> > -
>>> > +
>>> > }), win =
>>> > jasmine.createSpy().andCallFake(function(directory) {
>>> > expect(directory).toBeDefined();
>>> > expect(directory.isFile).toBe(false);
>>> > expect(directory.isDirectory).toBe(true);
>>> > expect(directory.name).toBe(dirName);
>>> > expect(directory.fullPath).toBe(dirPath);
>>> > -
>>> > +
>>> > // cleanup
>>> > directory.remove(null, fail);
>>> > }),
>>> > fail = createFail('DirectoryEntry');
>>> > -
>>> > +
>>> > // create:true, exclusive:false, directory does not exist
>>> > runs(function() {
>>> > root.getDirectory(dirName, {create: true}, getDir,
>>>fail);
>>> > @@ -627,7 +627,7 @@ describe('File API', function() {
>>> > directory.remove(null, fail);
>>> > }),
>>> > fail = createFail('DirectoryEntry');
>>> > -
>>> > +
>>> > // create:true, exclusive:false, directory does not exist
>>> > runs(function() {
>>> > root.getDirectory(dirName, {create: true}, getDir,
>>>fail);
>>> > @@ -645,15 +645,15 @@ describe('File API', function() {
>>> > expect(directory.isDirectory).toBe(true);
>>> > expect(directory.name).toBe(dirName);
>>> > expect(directory.fullPath).toBe(dirPath);
>>> > -
>>> > +
>>> > // cleanup
>>> > directory.remove(null, fail);
>>> > }),
>>> > fail = createFail('DirectoryEntry');
>>> > -
>>> > +
>>> > // create:true, exclusive:false, directory does not exist
>>> > runs(function() {
>>> > - root.getDirectory(dirName, {create: true}, win,
>>>fail);
>>> > + root.getDirectory(dirName, {create: true}, win,
>>>fail);
>>> > });
>>> >
>>> > waitsFor(function() { return win.wasCalled; }, "win never
>>> > called", Tests.TEST_TIMEOUT);
>>> > @@ -663,7 +663,7 @@ describe('File API', function() {
>>> > expect(fail).not.toHaveBeenCalled();
>>> > });
>>> > });
>>> > -
>>> > +
>>> > it("DirectoryEntry.getDirectory: create new directory
>>> > (exclusive)", function() {
>>> > var dirName = "de.create.exclusive.dir",
>>> > dirPath = root.fullPath + '/' + dirName,
>>> > @@ -673,14 +673,14 @@ describe('File API', function() {
>>> > expect(directory.isDirectory).toBe(true);
>>> > expect(directory.name).toBe(dirName);
>>> > expect(directory.fullPath).toBe(dirPath);
>>> > -
>>> > +
>>> > // cleanup
>>> > directory.remove(null, fail);
>>> > }),
>>> > fail = createFail('DirectoryEntry');
>>> > // create:true, exclusive:true, directory does not exist
>>> > runs(function() {
>>> > - root.getDirectory(dirName, {create: true,
>>> > exclusive:true}, win, fail);
>>> > + root.getDirectory(dirName, {create: true,
>>> > exclusive:true}, win, fail);
>>> > });
>>> >
>>> > waitsFor(function() { return win.wasCalled; }, "win never
>>> > called", Tests.TEST_TIMEOUT);
>>> > @@ -712,15 +712,15 @@ describe('File API', function() {
>>> > expect(directory.isDirectory).toBe(true);
>>> > expect(directory.name).toBe(dirName);
>>> > expect(directory.fullPath).toBe(dirPath);
>>> > -
>>> > +
>>> > // cleanup
>>> > directory.remove(null, fail);
>>> > }),
>>> > fail = createFail('DirectoryEntry');
>>> > -
>>> > +
>>> > // create directory to kick off it
>>> > runs(function() {
>>> > - root.getDirectory(dirName, {create:true}, getDir,
>>> > this.fail);
>>> > + root.getDirectory(dirName, {create:true}, getDir,
>>> > this.fail);
>>> > });
>>> >
>>> > waitsFor(function() { return getDir.wasCalled; }, "getDir
>>> > never called", Tests.TEST_TIMEOUT);
>>> > @@ -746,17 +746,17 @@ describe('File API', function() {
>>> > fail =
>>>jasmine.createSpy().andCallFake(function(error) {
>>> > expect(error).toBeDefined();
>>> >
>>> expect(error).toBeFileError(FileError.PATH_EXISTS_ERR);
>>> > -
>>> > +
>>> > // cleanup
>>> > existingDir.remove(null, fail);
>>> > }),
>>> > win = createWin('DirectoryEntry');
>>> > -
>>> > +
>>> > // create directory to kick off it
>>> > runs(function() {
>>> > root.getDirectory(dirName, {create:true}, getDir,
>>>fail);
>>> > });
>>> > -
>>> > +
>>> > waitsFor(function() { return getDir.wasCalled; }, "getDir
>>> > never called", Tests.TEST_TIMEOUT);
>>> > });
>>> > it("DirectoryEntry.getDirectory: get Entry for existing
>>> > directory", function() {
>>> > @@ -780,14 +780,14 @@ describe('File API', function() {
>>> > expect(directory.isFile).toBe(false);
>>> > expect(directory.isDirectory).toBe(true);
>>> > expect(directory.name).toBe(dirName);
>>> > -
>>> > +
>>> > expect(directory.fullPath).toBe(dirPath);
>>> > -
>>> > +
>>> > // cleanup
>>> > directory.remove(null, fail);
>>> > }),
>>> > fail = createFail('DirectoryEntry');
>>> > -
>>> > +
>>> > // create directory to kick off it
>>> > root.getDirectory(dirName, {create:true}, getDir, fail);
>>> > });
>>> > @@ -798,10 +798,10 @@ describe('File API', function() {
>>> >
>>>expect(error).toBeFileError(FileError.ENCODING_ERR);
>>> > }),
>>> > win = createWin('DirectoryEntry');
>>> > -
>>> > +
>>> > // create:false, exclusive:false, invalid path
>>> > runs(function() {
>>> > - root.getDirectory(dirName, {create:false}, win,
>>>fail);
>>> > + root.getDirectory(dirName, {create:false}, win,
>>>fail);
>>> > });
>>> >
>>> > waitsFor(function() { return fail.wasCalled; }, "fail
>>>never
>>> > called", Tests.TEST_TIMEOUT);
>>> > @@ -832,12 +832,12 @@ describe('File API', function() {
>>> > fail =
>>>jasmine.createSpy().andCallFake(function(error) {
>>> > expect(error).toBeDefined();
>>> >
>>> > expect(error).toBeFileError(FileError.TYPE_MISMATCH_ERR);
>>> > -
>>> > +
>>> > // cleanup
>>> > existingFile.remove(null, null);
>>> > }),
>>> > win = createWin('DirectoryEntry');
>>> > -
>>> > +
>>> > // create file to kick off it
>>> > runs(function() {
>>> > root.getFile(fileName, {create:true}, getDir, fail);
>>> > @@ -866,12 +866,12 @@ describe('File API', function() {
>>> > fail =
>>>jasmine.createSpy().andCallFake(function(error) {
>>> > expect(error).toBeDefined();
>>> >
>>> > expect(error).toBeFileError(FileError.TYPE_MISMATCH_ERR);
>>> > -
>>> > +
>>> > // cleanup
>>> > existingDir.remove(null, null);
>>> > }),
>>> > win = createWin('DirectoryEntry');
>>> > -
>>> > +
>>> > // create directory to kick off it
>>> > runs(function() {
>>> > root.getDirectory(dirName, {create:true}, getFile,
>>>fail);
>>> > @@ -929,7 +929,7 @@ describe('File API', function() {
>>> > waitsFor(function() { return entryCallback.wasCalled; },
>>> > "entryCallback never called", Tests.TEST_TIMEOUT);
>>> > });
>>> > it("createReader: create reader on existing directory",
>>> function()
>>> > {
>>> > - // create reader for root directory
>>> > + // create reader for root directory
>>> > var reader = root.createReader();
>>> > expect(reader).toBeDefined();
>>> > expect(typeof reader.readEntries).toBe('function');
>>> > @@ -964,8 +964,8 @@ describe('File API', function() {
>>> > expect(entries instanceof Array).toBe(true);
>>> > }),
>>> > fail = createFail('DirectoryReader');
>>> > -
>>> > - // create reader for root directory
>>> > +
>>> > + // create reader for root directory
>>> > reader = root.createReader();
>>> > // read entries
>>> > runs(function() {
>>> > @@ -986,7 +986,7 @@ describe('File API', function() {
>>> > // read entries
>>> > var readEntries =
>>> > jasmine.createSpy().andCallFake(function() {
>>> > var reader = directory.createReader();
>>> > -
>>> > +
>>> > runs(function() {
>>> > reader.readEntries(win, itReader);
>>> > });
>>> > @@ -1055,12 +1055,12 @@ describe('File API', function() {
>>> > expect(fileEntry).toBeDefined();
>>> > expect(typeof
>>> fileEntry.createWriter).toBe('function');
>>> > expect(typeof fileEntry.file).toBe('function');
>>> > -
>>> > - // cleanup
>>> > +
>>> > + // cleanup
>>> > fileEntry.remove(null, fail);
>>> > }),
>>> > fail = createFail('FileEntry');
>>> > -
>>> > +
>>> > // create a new file entry to kick off it
>>> > runs(function() {
>>> > root.getFile(fileName, {create:true}, itFileEntry,
>>>fail);
>>> > @@ -1093,12 +1093,12 @@ describe('File API', function() {
>>> > itWriter =
>>> > jasmine.createSpy().andCallFake(function(writer) {
>>> > expect(writer).toBeDefined();
>>> > expect(writer instanceof FileWriter).toBe(true);
>>> > -
>>> > - // cleanup
>>> > +
>>> > + // cleanup
>>> > itFile.remove(null, fail);
>>> > }),
>>> > fail = createFail('FileEntry');
>>> > -
>>> > +
>>> > // create a new file entry to kick off it
>>> > runs(function() {
>>> > root.getFile(fileName, {create:true}, entryCallback,
>>> fail);
>>> > @@ -1111,7 +1111,7 @@ describe('File API', function() {
>>> > newFile,
>>> > entryCallback =
>>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>>> > newFile = fileEntry;
>>> > -
>>> > +
>>> > runs(function() {
>>> > fileEntry.file(itFile, fail);
>>> > });
>>> > @@ -1126,12 +1126,12 @@ describe('File API', function() {
>>> > itFile =
>>>jasmine.createSpy().andCallFake(function(file) {
>>> > expect(file).toBeDefined();
>>> > expect(file instanceof File).toBe(true);
>>> > -
>>> > - // cleanup
>>> > +
>>> > + // cleanup
>>> > newFile.remove(null, fail);
>>> > }),
>>> > fail = createFail('FileEntry');
>>> > -
>>> > +
>>> > // create a new file entry to kick off it
>>> > runs(function() {
>>> > root.getFile(fileName, {create:true}, entryCallback,
>>> fail);
>>> > @@ -1168,7 +1168,7 @@ describe('File API', function() {
>>> > }),
>>> > fail = createFail('FileEntry'),
>>> > win = createWin('FileEntry');
>>> > -
>>> > +
>>> > // create a new file entry to kick off it
>>> > runs(function() {
>>> > root.getFile(fileName, {create:true}, entryCallback,
>>> fail);
>>> > @@ -1236,7 +1236,7 @@ describe('File API', function() {
>>> > // cleanup
>>> > deleteEntry(fileName);
>>> > });
>>> > -
>>> > +
>>> > // create a new file entry
>>> > createFile(fileName, entryCallback, fail);
>>> > });
>>> > @@ -1262,7 +1262,7 @@ describe('File API', function() {
>>> > // cleanup
>>> > deleteEntry(dirName);
>>> > });
>>> > -
>>> > +
>>> > // create a new directory entry
>>> > runs(function() {
>>> > createDirectory(dirName, entryCallback, fail);
>>> > @@ -1293,7 +1293,7 @@ describe('File API', function() {
>>> > // cleanup
>>> > deleteEntry(fileName);
>>> > });
>>> > -
>>> > +
>>> > // create a new file entry
>>> > runs(function() {
>>> > createFile(fileName, entryCallback, fail);
>>> > @@ -1364,7 +1364,7 @@ describe('File API', function() {
>>> > deleteEntry(fileName);
>>> > }),
>>> > fail = createFail('Entry');
>>> > -
>>> > +
>>> > // create a new file entry
>>> > runs(function() {
>>> > createFile(fileName, itURL, fail);
>>> > @@ -1421,7 +1421,7 @@ describe('File API', function() {
>>> > });
>>> > });
>>> > expect(entry).toBeDefined();
>>> > -
>>> > +
>>> > runs(function() {
>>> > entry.remove(checkRemove, fail);
>>> > });
>>> > @@ -1435,7 +1435,7 @@ describe('File API', function() {
>>> > deleteEntry(fileName);
>>> > }),
>>> > fail = createFail('Entry');
>>> > -
>>> > +
>>> > // create a new file entry
>>> > runs(function() {
>>> > createFile(fileName, entryCallback, fail);
>>> > @@ -1594,7 +1594,7 @@ describe('File API', function() {
>>> > expect(entry2.isDirectory).toBe(false);
>>> > expect(entry2.fullPath).toBe(fullPath);
>>> > expect(entry2.name).toBe(file2);
>>> > -
>>> > +
>>> > // cleanup
>>> > deleteEntry(file1);
>>> > deleteEntry(file2);
>>> > @@ -1669,7 +1669,7 @@ describe('File API', function() {
>>> > expect(directory.isDirectory).toBe(true);
>>> > expect(directory.fullPath).toBe(dstPath);
>>> > expect(directory.name).toBe(dstDir);
>>> > -
>>> > +
>>> > runs(function() {
>>> > root.getDirectory(dstDir, {create:false},
>>> > itDirExists, fail);
>>> > });
>>> > @@ -1682,7 +1682,7 @@ describe('File API', function() {
>>> > expect(dirEntry.isDirectory).toBe(true);
>>> > expect(dirEntry.fullPath).toBe(dstPath);
>>> > expect(dirEntry.name).toBe(dstDir);
>>> > -
>>> > +
>>> > runs(function() {
>>> > dirEntry.getFile(file1, {create:false},
>>> > itFileExists, fail);
>>> > });
>>> > @@ -1735,7 +1735,7 @@ describe('File API', function() {
>>> > expect(directory.isDirectory).toBe(true);
>>> > expect(directory.fullPath).toBe(dstPath);
>>> > expect(directory.name).toBe(dstDir);
>>> > -
>>> > +
>>> > root.getDirectory(dstDir, {create:false},
>>> itDirExists,
>>> > fail);
>>> > },
>>> > itDirExists = function(dirEntry) {
>>> > @@ -1744,7 +1744,7 @@ describe('File API', function() {
>>> > expect(dirEntry.isDirectory).toBe(true);
>>> > expect(dirEntry.fullPath).toBe(dstPath);
>>> > expect(dirEntry.name).toBe(dstDir);
>>> > -
>>> > +
>>> > dirEntry.getFile(file1, {create:false},
>>> itFileExists,
>>> > fail);
>>> > },
>>> > itFileExists =
>>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>>> > @@ -1784,7 +1784,7 @@ describe('File API', function() {
>>> > var copyDir =
>>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>>> > // copy srcDir onto itself
>>> > runs(function() {
>>> > - directory.copyTo(root, null, win,
>>>itCopy);
>>> > + directory.copyTo(root, null, win,
>>>itCopy);
>>> > });
>>> >
>>> > waitsFor(function() { return
>>>itCopy.wasCalled; },
>>> > "itCopy never called", Tests.TEST_TIMEOUT);
>>> > @@ -1799,8 +1799,8 @@ describe('File API', function() {
>>> > itCopy =
>>>jasmine.createSpy().andCallFake(function(error)
>>> {
>>> > expect(error).toBeDefined();
>>> >
>>> > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
>>> > -
>>> > - runs(function() {
>>> > +
>>> > + runs(function() {
>>> > root.getDirectory(srcDir, {create:false},
>>> > itDirectoryExists, fail);
>>> > });
>>> >
>>> > @@ -1810,7 +1810,7 @@ describe('File API', function() {
>>> > // returning confirms existence so just check
>>> fullPath
>>> > entry
>>> > expect(dirEntry).toBeDefined();
>>> > expect(dirEntry.fullPath).toBe(srcPath);
>>> > -
>>> > +
>>> > runs(function() {
>>> > dirEntry.getFile(file1, {create:false},
>>> > itFileExists, fail);
>>> > });
>>> > @@ -1826,7 +1826,7 @@ describe('File API', function() {
>>> > itFileExists =
>>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>>> > expect(fileEntry).toBeDefined();
>>> > expect(fileEntry.fullPath).toBe(filePath);
>>> > -
>>> > +
>>> > // cleanup
>>> > deleteEntry(srcDir);
>>> > });
>>> > @@ -1855,7 +1855,7 @@ describe('File API', function() {
>>> > itCopy =
>>>jasmine.createSpy().andCallFake(function(error)
>>> {
>>> > expect(error).toBeDefined();
>>> >
>>> > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
>>> > -
>>> > +
>>> > runs(function() {
>>> > root.getDirectory(srcDir, {create:false},
>>> > itDirectoryExists, fail);
>>> > });
>>> > @@ -1885,7 +1885,7 @@ describe('File API', function() {
>>> > waitsFor(function() { return entryCallback.wasCalled; },
>>> > "entryCallback never called", Tests.TEST_TIMEOUT);
>>> > });
>>> > it("copyTo: directory that does not exist", function() {
>>> > - var file1 = "entry.copy.dnf.file1",
>>> > + var file1 = "entry.copy.dnf.file1",
>>> > dstDir = "entry.copy.dnf.dstDir",
>>> > filePath = root.fullPath + '/' + file1,
>>> > dstPath = root.fullPath + '/' + dstDir,
>>> > @@ -1987,7 +1987,7 @@ describe('File API', function() {
>>> > expect(entry.isDirectory).toBe(false);
>>> > expect(entry.fullPath).toBe(dstPath);
>>> > expect(entry.name).toBe(file2);
>>> > -
>>> > +
>>> > runs(function() {
>>> > root.getFile(file2, {create:false},
>>> itMovedExists,
>>> > fail);
>>> > });
>>> > @@ -1997,7 +1997,7 @@ describe('File API', function() {
>>> > itMovedExists =
>>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>>> > expect(fileEntry).toBeDefined();
>>> > expect(fileEntry.fullPath).toBe(dstPath);
>>> > -
>>> > +
>>> > runs(function() {
>>> > root.getFile(file1, {create:false}, win,
>>>itOrig);
>>> > });
>>> > @@ -2014,7 +2014,7 @@ describe('File API', function() {
>>> > //expect(navigator.fileMgr.itFileExists(srcPath)
>>>===
>>> > false, "original file should not exist.");
>>> > expect(error).toBeDefined();
>>> >
>>>expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>> > -
>>> > +
>>> > // cleanup
>>> > deleteEntry(file1);
>>> > deleteEntry(file2);
>>> > @@ -2057,7 +2057,7 @@ describe('File API', function() {
>>> >
>>> > waitsFor(function() { return
>>>itMove.wasCalled; },
>>> > "itMove never called", Tests.TEST_TIMEOUT);
>>> > });
>>> > -
>>> > +
>>> > // create a parent directory to move file to
>>> > runs(function() {
>>> > root.getDirectory(dir, {create: true},
>>>moveFile,
>>> > fail);
>>> > @@ -2068,7 +2068,7 @@ describe('File API', function() {
>>> > itMovedExists =
>>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>>> > expect(fileEntry).toBeDefined();
>>> > expect(fileEntry.fullPath).toBe(dstPath);
>>> > -
>>> > +
>>> > runs(function() {
>>> > root.getFile(file1, {create:false}, win,
>>>itOrig);
>>> > });
>>> > @@ -2084,7 +2084,7 @@ describe('File API', function() {
>>> > itOrig =
>>>jasmine.createSpy().andCallFake(function(error)
>>> {
>>> > expect(error).toBeDefined();
>>> >
>>>expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>> > -
>>> > +
>>> > // cleanup
>>> > deleteEntry(file1);
>>> > deleteEntry(dir);
>>> > @@ -2131,7 +2131,7 @@ describe('File API', function() {
>>> > expect(directory.fullPath).toBe(dstPath);
>>> > expect(directory.name).toBe(dstDir);
>>> > // it that moved file exists in destination dir
>>> > -
>>> > +
>>> > runs(function() {
>>> > directory.getFile(file1, {create:false},
>>> > itMovedExists, fail);
>>> > });
>>> > @@ -2158,7 +2158,7 @@ describe('File API', function() {
>>> > itOrig =
>>>jasmine.createSpy().andCallFake(function(error)
>>> {
>>> > expect(error).toBeDefined();
>>> >
>>>expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>> > -
>>> > +
>>> > // cleanup
>>> > deleteEntry(srcDir);
>>> > deleteEntry(dstDir);
>>> > @@ -2231,7 +2231,7 @@ describe('File API', function() {
>>> > itOrig =
>>>jasmine.createSpy().andCallFake(function(error)
>>> {
>>> > expect(error).toBeDefined();
>>> >
>>>expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>> > -
>>> > +
>>> > // cleanup
>>> > deleteEntry(srcDir);
>>> > deleteEntry(dstDir);
>>> > @@ -2304,7 +2304,7 @@ describe('File API', function() {
>>> > itOrig =
>>>jasmine.createSpy().andCallFake(function(error)
>>> {
>>> > expect(error).toBeDefined();
>>> >
>>>expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>> > -
>>> > +
>>> > // cleanup
>>> > deleteEntry(srcDir);
>>> > deleteEntry(dstDir);
>>> > @@ -2346,7 +2346,7 @@ describe('File API', function() {
>>> > itMove =
>>>jasmine.createSpy().andCallFake(function(error)
>>> {
>>> > expect(error).toBeDefined();
>>> >
>>> > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
>>> > -
>>> > +
>>> > // it that original dir still exists
>>> > runs(function() {
>>> > root.getDirectory(srcDir, {create:false},
>>> > itDirectoryExists, fail);
>>> > @@ -2358,7 +2358,7 @@ describe('File API', function() {
>>> > // returning confirms existence so just check
>>> fullPath
>>> > entry
>>> > expect(dirEntry).toBeDefined();
>>> > expect(dirEntry.fullPath).toBe(srcPath);
>>> > -
>>> > +
>>> > runs(function() {
>>> > dirEntry.getFile(file1, {create:false},
>>> > itFileExists, fail);
>>> > });
>>> > @@ -2374,7 +2374,7 @@ describe('File API', function() {
>>> > itFileExists =
>>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>>> > expect(fileEntry).toBeDefined();
>>> > expect(fileEntry.fullPath).toBe(filePath);
>>> > -
>>> > +
>>> > // cleanup
>>> > deleteEntry(srcDir);
>>> > });
>>> > @@ -2419,7 +2419,7 @@ describe('File API', function() {
>>> > itDirectoryExists =
>>> > jasmine.createSpy().andCallFake(function(entry) {
>>> > expect(entry).toBeDefined();
>>> > expect(entry.fullPath).toBe(srcPath);
>>> > -
>>> > +
>>> > // cleanup
>>> > deleteEntry(srcDir);
>>> > });
>>> > @@ -2447,7 +2447,7 @@ describe('File API', function() {
>>> > itMove =
>>>jasmine.createSpy().andCallFake(function(error)
>>> {
>>> > expect(error).toBeDefined();
>>> >
>>> > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
>>> > -
>>> > +
>>> > //it that original file still exists
>>> > runs(function() {
>>> > root.getFile(file1, {create:false},
>>>itFileExists,
>>> > fail);
>>> > @@ -2464,7 +2464,7 @@ describe('File API', function() {
>>> > itFileExists =
>>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>>> > expect(fileEntry).toBeDefined();
>>> > expect(fileEntry.fullPath).toBe(filePath);
>>> > -
>>> > +
>>> > // cleanup
>>> > deleteEntry(file1);
>>> > });
>>> > @@ -2496,10 +2496,10 @@ describe('File API', function() {
>>> > // move file1 onto sub-directory
>>> > entry.moveTo(directory, subDir, win,
>>>itMove);
>>> > };
>>> > - // create sub-directory
>>> > + // create sub-directory
>>> > directory.getDirectory(subDir, {create:
>>>true},
>>> > moveFile, fail);
>>> > };
>>> > - // create top level directory
>>> > + // create top level directory
>>> > root.getDirectory(dstDir, {create: true},
>>> > createSubDirectory, fail);
>>> > },
>>> > itDirectoryExists = function(dirEntry) {
>>> > @@ -2526,7 +2526,7 @@ describe('File API', function() {
>>> > });
>>> >
>>> > waitsFor(function() { return itFileExists.wasCalled; },
>>> > "itFileExists never called", Tests.TEST_TIMEOUT);
>>> > -
>>> > +
>>> > runs(function() {
>>> > expect(itFileExists).toHaveBeenCalled();
>>> > expect(win).not.toHaveBeenCalled();
>>> > @@ -2564,7 +2564,7 @@ describe('File API', function() {
>>> > itFileExists =
>>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>>> > expect(fileEntry).toBeDefined();
>>> > expect(fileEntry.fullPath).toBe(filePath);
>>> > -
>>> > +
>>> > // cleanup
>>> > deleteEntry(file1);
>>> > deleteEntry(srcDir);
>>> > @@ -2614,7 +2614,7 @@ describe('File API', function() {
>>> > itFileExists =
>>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>>> > expect(fileEntry).toBeDefined();
>>> > expect(fileEntry.fullPath).toBe(filePath);
>>> > -
>>> > +
>>> > // cleanup
>>> > deleteEntry(file1);
>>> > deleteEntry(srcDir);
>>> > @@ -2650,14 +2650,14 @@ describe('File API', function() {
>>> > var itMove = function(error) {
>>> > expect(error).toBeDefined();
>>> >
>>> > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
>>> > -
>>> > +
>>> > // it that destination directory still
>>>exists
>>> > directory.getDirectory(subDir,
>>> {create:false},
>>> > itDirectoryExists, fail);
>>> > };
>>> > - // create sub-directory
>>> > + // create sub-directory
>>> > directory.getDirectory(subDir, {create:
>>>true},
>>> > moveDir, fail);
>>> > };
>>> > - // create top level directory
>>> > + // create top level directory
>>> > root.getDirectory(dstDir, {create: true},
>>> > createSubDirectory, fail);
>>> > },
>>> > itDirectoryExists = function(dirEntry) {
>>> > @@ -2712,7 +2712,7 @@ describe('File API', function() {
>>> > expect(entry.isDirectory).toBe(false);
>>> > expect(entry.fullPath).toBe(file2Path);
>>> > expect(entry.name).toBe(file2);
>>> > -
>>> > +
>>> > // it that old file does not exists
>>> > root.getFile(file1, {create:false}, win,
>>> itFileMoved);
>>> > },
>>> > @@ -2725,7 +2725,7 @@ describe('File API', function() {
>>> > itFileExists =
>>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>>> > expect(fileEntry).toBeDefined();
>>> > expect(fileEntry.fullPath).toBe(file2Path);
>>> > -
>>> > +
>>> > // cleanup
>>> > deleteEntry(file1);
>>> > deleteEntry(file2);
>>> > @@ -2777,14 +2777,14 @@ describe('File API', function() {
>>> > itFileExists = function(fileEntry) {
>>> > expect(fileEntry).toBeDefined();
>>> > expect(fileEntry.fullPath).toBe(filePath);
>>> > -
>>> > +
>>> > // check that old directory no longer exists
>>> > root.getDirectory(srcDir, {create:false}, win,
>>> > itRemoved);
>>> > },
>>> > itRemoved =
>>> > jasmine.createSpy().andCallFake(function(error){
>>> > expect(error).toBeDefined();
>>> >
>>>expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>> > -
>>> > +
>>> > // cleanup
>>> > deleteEntry(srcDir);
>>> > deleteEntry(dstDir);
>>> > @@ -2807,7 +2807,7 @@ describe('File API', function() {
>>> > });
>>> > });
>>> > it("moveTo: directory that does not exist", function() {
>>> > - var file1 = "entry.move.dnf.file1",
>>> > + var file1 = "entry.move.dnf.file1",
>>> > dstDir = "entry.move.dnf.dstDir",
>>> > filePath = root.fullPath + '/' + file1,
>>> > dstPath = root.fullPath + '/' + dstDir,
>>> > @@ -2822,7 +2822,7 @@ describe('File API', function() {
>>> > itMove =
>>>jasmine.createSpy().andCallFake(function(error)
>>> {
>>> > expect(error).toBeDefined();
>>> >
>>>expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>>> > -
>>> > +
>>> > // cleanup
>>> > deleteEntry(file1);
>>> > });
>>> > @@ -2912,10 +2912,10 @@ describe('File API', function() {
>>> > reader.onloadend = verifier;
>>> > var myFile = new File();
>>> >
>>> > - myFile.fullPath = filePath;
>>> > + myFile.fullPath = filePath;
>>> > reader.readAsText(myFile);
>>> > };
>>> > -
>>> > +
>>> > // create a file, write to it, and read it in again
>>> > runs(function() {
>>> > root.getFile(fileName, {create: true}, create_writer,
>>> > fail);
>>> > @@ -2944,10 +2944,10 @@ describe('File API', function() {
>>> > var reader = new FileReader();
>>> > reader.onloadend = verifier;
>>> > var myFile = new File();
>>> > - myFile.fullPath = filePath;
>>> > + myFile.fullPath = filePath;
>>> > reader.readAsText(myFile);
>>> > };
>>> > -
>>> > +
>>> > // create a file, write to it, and read it in again
>>> > runs(function() {
>>> > root.getFile(fileName, {create: true}, read_file,
>>>fail);
>>> > @@ -2968,7 +2968,7 @@ describe('File API', function() {
>>> > });
>>> > reader.onerror = verifier;
>>> > var myFile = new File();
>>> > - myFile.fullPath = root.fullPath + '/' +
>>>"doesnotexist.err";
>>> > + myFile.fullPath = root.fullPath + '/' +
>>>"doesnotexist.err";
>>> >
>>> > runs(function() {
>>> > reader.readAsText(myFile);
>>> > @@ -2993,7 +2993,7 @@ describe('File API', function() {
>>> > },
>>> > // writes file and reads it back in
>>> > write_file = function(writer) {
>>> > - writer.onwriteend = read_file;
>>> > + writer.onwriteend = read_file;
>>> > writer.write(rule);
>>> > },
>>> > verifier =
>>>jasmine.createSpy().andCallFake(function(evt)
>>> {
>>> > @@ -3005,10 +3005,10 @@ describe('File API', function() {
>>> > var reader = new FileReader();
>>> > reader.onloadend = verifier;
>>> > var myFile = new File();
>>> > - myFile.fullPath = filePath;
>>> > + myFile.fullPath = filePath;
>>> > reader.readAsDataURL(myFile);
>>> > };
>>> > -
>>> > +
>>> > // create a file, write to it, and read it in again
>>> > runs(function() {
>>> > root.getFile(fileName, {create: true}, create_writer,
>>> > fail);
>>> > @@ -3089,7 +3089,7 @@ describe('File API', function() {
>>> > writer.write(rule);
>>> > }, fail);
>>> > };
>>> > -
>>> > +
>>> > // create file, then write and append to it
>>> > runs(function() {
>>> > createFile(fileName, write_file);
>>> > @@ -3120,7 +3120,7 @@ describe('File API', function() {
>>> > theWriter.onwriteend = anotherVerifier;
>>> > length += exception.length;
>>> > theWriter.seek(theWriter.length);
>>> > - theWriter.write(exception);
>>> > + theWriter.write(exception);
>>> > }),
>>> > anotherVerifier =
>>> > jasmine.createSpy().andCallFake(function(evt) {
>>> > expect(theWriter.length).toBe(length);
>>> > @@ -3135,7 +3135,7 @@ describe('File API', function() {
>>> > theWriter.onwriteend = verifier;
>>> > theWriter.write(rule);
>>> > };
>>> > -
>>> > +
>>> > // create file, then write and append to it
>>> > runs(function() {
>>> > var file = new File();
>>> > @@ -3168,7 +3168,7 @@ describe('File API', function() {
>>> > theWriter.onwriteend = anotherVerifier;
>>> > length = 12 + exception.length;
>>> > theWriter.seek(12);
>>> > - theWriter.write(exception);
>>> > + theWriter.write(exception);
>>> > }),
>>> > anotherVerifier =
>>> > jasmine.createSpy().andCallFake(function(evt) {
>>> > expect(theWriter.length).toBe(length);
>>> > @@ -3185,7 +3185,7 @@ describe('File API', function() {
>>> > theWriter.write(rule);
>>> > }, fail);
>>> > };
>>> > -
>>> > +
>>> > // create file, then write and append to it
>>> > runs(function() {
>>> > createFile(fileName, write_file);
>>> > @@ -3216,7 +3216,7 @@ describe('File API', function() {
>>> > theWriter.onwriteend = anotherVerifier;
>>> > length = 8 + exception.length;
>>> > theWriter.seek(8);
>>> > - theWriter.write(exception);
>>> > + theWriter.write(exception);
>>> > }),
>>> > anotherVerifier =
>>> > jasmine.createSpy().andCallFake(function(evt) {
>>> > expect(theWriter.length).toBe(length);
>>> > @@ -3233,7 +3233,7 @@ describe('File API', function() {
>>> > theWriter.write(rule);
>>> > }, fail);
>>> > };
>>> > -
>>> > +
>>> > // create file, then write and append to it
>>> > runs(function() {
>>> > createFile(fileName, write_file);
>>> > @@ -3271,7 +3271,7 @@ describe('File API', function() {
>>> > theWriter.write(rule);
>>> > }, fail);
>>> > };
>>> > -
>>> > +
>>> > // creates file, then write XML data
>>> > runs(function() {
>>> > createFile(fileName, write_file);
>>> > @@ -3305,10 +3305,10 @@ describe('File API', function() {
>>> > fileEntry.createWriter(function(writer) {
>>> > theWriter = writer;
>>> > theWriter.onwriteend = verifier;
>>> > - theWriter.write(rule);
>>> > + theWriter.write(rule);
>>> > }, fail);
>>> > };
>>> > -
>>> > +
>>> > // creates file, then write JSON content
>>> > runs(function() {
>>> > createFile(fileName, write_file);
>>> > @@ -3341,7 +3341,7 @@ describe('File API', function() {
>>> > // writes file and reads it back in
>>> > write_file = function(writer) {
>>> > theWriter = writer;
>>> > - theWriter.onwriteend = read_file;
>>> > + theWriter.onwriteend = read_file;
>>> > theWriter.write(rule);
>>> > },
>>> > // reads file and compares content to what was
>>>written
>>> > @@ -3395,7 +3395,7 @@ describe('File API', function() {
>>> > theWriter.write(rule);
>>> > }, fail);
>>> > };
>>> > -
>>> > +
>>> > // creates file, then write JSON content
>>> > runs(function() {
>>> > createFile(fileName, seek_file);
>>> > @@ -3413,20 +3413,20 @@ describe('File API', function() {
>>> > rule = "There is an exception to every rule. Except
>>>this
>>> > one.",
>>> > fail = createFail('FileWRiter'),
>>> > theWriter,
>>> > - // writes file content
>>> > + // writes file content
>>> > write_file = function(fileEntry) {
>>> > fileEntry.createWriter(function(writer) {
>>> > theWriter = writer;
>>> > theWriter.onwriteend = function(evt) {
>>> > truncate_file(theWriter);
>>> > - };
>>> > + };
>>> > theWriter.write(rule);
>>> > }, fail);
>>> > },
>>> > verifier =
>>>jasmine.createSpy().andCallFake(function(evt)
>>> {
>>> > expect(theWriter.length).toBe(36);
>>> > expect(theWriter.position).toBe(36);
>>> > -
>>> > +
>>> > // cleanup
>>> > deleteFile(fileName);
>>> > }),
>>> >
>>> >
>>>
>>
>>
>>
>> --
>> @purplecabbage
>> risingj.com
Re: spec commit: described test condition, updated to test for NOT_FOUND_ERR
Posted by Simon MacDonald <si...@gmail.com>.
Hey Jesse,
I'm probably the person who originally wrote the test and the intent
was to test to see that we fire a ENCODING_ERR when the url passed
into window.resolveLocalFileSystemURI() does not specify a protocol.
In Java when you do a:
URL testUrl = new URL("/this.is.not.a.valid.url");
it throws a MalformedURLException complaining that no protocol exists.
More damningly if you run the following code in Chrome:
var url = '/this.is.not.a.valid.url';
window.webkitResolveLocalFileSystemURL(url, function(fileEntry) {
console.log("path = " + fileEntry.name);
}, function(error) {
console.log("Error = " + error.code);
console.log("Encoding error = " + FileError.ENCODING_ERR);
});
you will see:
Error = 5
Encoding error = 5
in the console so it appears that Chrome agrees with our implementation.
It's my recommendation that the test case and Drew's change on BB
should be reverted to the original behaviour and the WP code be
changed to return a ENCODING_ERR if not protocol is specified so we
all stay consistent.
As to why there is a native implementation? At least on Android you
can pass in "content://" type URL's which point to pictures, video,
etc. in the Android content store. The
window.resolveLocalFileSystemURI() method can be used to get a
FileEntry from one of these weird content uri's so devs can manipulate
the files.
Simon Mac Donald
http://hi.im/simonmacdonald
On Tue, May 22, 2012 at 6:14 PM, Jesse <pu...@gmail.com> wrote:
> I think the only person who knows the intent of the test case is whoever
> wrote it.
> I am sorry that a fix for WP7 has caused issues elsewhere, I will look for
> another solution. Â Ultimately we need the docs to state what error codes
> are returned in what situation, perhaps an example for each error code,
> that would be aligned with the tests.
>
> What exactly makes "/this.is.not.a.valid.url" an EncodingError?
>
> On WP7 I am relying on the SDK to tell me if it is well formed :
>
> if (!Uri.IsWellFormedUriString(fileOptions.Uri, UriKind.RelativeOrAbsolute))
> {
> Â Â Â DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR,
> ENCODING_ERR));
> Â Â Â return;
> }
>
> If indeed it is deemed that this is an EncodingError, do we even need to
> call native to determine that?
>
>
> On Tue, May 22, 2012 at 1:46 PM, Becky Gibson <gi...@gmail.com>wrote:
>
>> Just tested mobile-spec on iOS and was surprised to find a failing file
>> test.
>>
>> Curious why the error code was changed from ENCODING_ERR to NOT_FOUND_ERR?
>> Â To me the description in the spec would indicate that an invalid URL
>> would return ENCODING_ERR?
>>
>> from  http://www.w3.org/TR/file-system-api/#definitions: EncodingErrorA
>> path or URL supplied to the API was malformed.
>> NotFoundErrorA required file or directory could not be found at the time an
>> operation was processed.
>> The test that was changed is: Â window.resolveLocalFileSystemURI(
>> "/this.is.not.a.valid.url", win, fail); Â IMHO "/this.is.not.a.valid.url" is
>> NOT a valid url according to
>> http://www.w3.org/Addressing/URL/url-spec.txt so it seems appropriate
>> to return an encodingError? Â This was discussed in
>> https://issues.apache.org/jira/browse/CB-671 where folks suggested it IS a
>> valid URL?
>>
>> If we decide this is the appropriate return value, I'll have to do a bit of
>> work on the iOS code as it uses the NSURL URLWithString: Â and isFileURL:
>> apis to determine if the input is a valid File URL or not. Â I'm not sure
>> that appending "file://" to the input parameter is really the best
>> solution......
>>
>> NSURL* testUri = [NSURL URLWithString:strUri];
>> if (!testUri || ![testUri isFileURL])
>>
>> I'm also wondering if this is something we should be changing without some
>> kind of warning to users. Â While most people may just check for an error,
>> it seems a bit odd to change the actual error code being returned.
>>
>> -becky
>>
>>
>> On Tue, May 8, 2012 at 8:17 PM, <pu...@apache.org> wrote:
>>
>> > Updated Branches:
>> > Â refs/heads/master 35a3f3f4a -> c3225a50f
>> >
>> >
>> > described test condition, updated to test for NOT_FOUND_ERR
>> >
>> >
>> > Project:
>> >
>> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/repo
>> > Commit:
>> >
>> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/commit/c3225a50
>> > Tree:
>> >
>> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/c3225a50
>> > Diff:
>> >
>> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/c3225a50
>> >
>> > Branch: refs/heads/master
>> > Commit: c3225a50f48649bc66fd6c4e99b3e959d06a13b8
>> > Parents: 35a3f3f
>> > Author: Jesse MacFadyen <pu...@gmail.com>
>> > Authored: Tue May 8 17:16:43 2012 -0700
>> > Committer: Jesse MacFadyen <pu...@gmail.com>
>> > Committed: Tue May 8 17:16:43 2012 -0700
>> >
>> > ----------------------------------------------------------------------
>> > Â autotest/tests/file.tests.js | Â 272 ++++++++++++++++++------------------
>> > Â 1 files changed, 136 insertions(+), 136 deletions(-)
>> > ----------------------------------------------------------------------
>> >
>> >
>> >
>> >
>> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/c3225a50/autotest/tests/file.tests.js
>> > ----------------------------------------------------------------------
>> > diff --git a/autotest/tests/file.tests.js b/autotest/tests/file.tests.js
>> > index de37980..860a6c1 100644
>> > --- a/autotest/tests/file.tests.js
>> > +++ b/autotest/tests/file.tests.js
>> > @@ -31,10 +31,10 @@ describe('File API', function() {
>> > Â Â // deletes specified file or directory
>> > Â Â var deleteEntry = function(name, success, error) {
>> > Â Â Â Â // deletes entry, if it exists
>> > - Â Â Â Â window.resolveLocalFileSystemURI(root.toURL() + '/' + name,
>> > + Â Â Â Â window.resolveLocalFileSystemURI(root.toURL() + '/' + name,
>> > Â Â Â Â Â Â function(entry) {
>> > Â Â Â Â Â Â Â Â if (entry.isDirectory === true) {
>> > - Â Â Â Â Â Â Â Â Â Â entry.removeRecursively(success, error);
>> > + Â Â Â Â Â Â Â Â Â Â entry.removeRecursively(success, error);
>> > Â Â Â Â Â Â Â Â } else {
>> > Â Â Â Â Â Â Â Â Â Â entry.remove(success, error);
>> > Â Â Â Â Â Â Â Â }
>> > @@ -42,7 +42,7 @@ describe('File API', function() {
>> > Â Â };
>> > Â Â // deletes file, if it exists, then invokes callback
>> > Â Â var deleteFile = function(fileName, callback) {
>> > - Â Â Â Â root.getFile(fileName, null,
>> > + Â Â Â Â root.getFile(fileName, null,
>> > Â Â Â Â Â Â Â Â // remove file system entry
>> > Â Â Â Â Â Â Â Â function(entry) {
>> > Â Â Â Â Â Â Â Â Â Â entry.remove(callback, function() {
>> > console.log('[ERROR] deleteFile cleanup method invoked fail callback.');
>> });
>> > @@ -59,7 +59,7 @@ describe('File API', function() {
>> > Â Â // deletes and re-creates the specified directory
>> > Â Â var createDirectory = function(dirName, success, error) {
>> > Â Â Â Â deleteEntry(dirName, function() {
>> > - Â Â Â Â Â root.getDirectory(dirName, {create: true}, success, error);
>> > + Â Â Â Â Â root.getDirectory(dirName, {create: true}, success, error);
>> > Â Â Â Â }, error);
>> > Â Â };
>> >
>> > @@ -111,7 +111,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(fileSystem.root).toBeDefined();
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â fail = createFail('window.requestFileSystem');
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â // retrieve PERSISTENT file system
>> > Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â window.requestFileSystem(LocalFileSystem.PERSISTENT,
>> > 0, win, fail);
>> > @@ -134,7 +134,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â fail = createFail('window.requestFileSystem');
>> >
>> > Â Â Â Â Â Â Â Â // Request the file system
>> > - Â Â Â Â Â Â Â Â runs(function() {
>> > + Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â window.requestFileSystem(LocalFileSystem.TEMPORARY,
>> 0,
>> > win, fail);
>> > Â Â Â Â Â Â Â Â });
>> >
>> > @@ -206,7 +206,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â });
>> >
>> > Â Â Â Â Â Â Â Â Â Â waitsFor(function() { return win.wasCalled; },
>> > "resolveLocalFileSystemURI callback never called", Tests.TEST_TIMEOUT);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â expect(win).toHaveBeenCalled();
>> > Â Â Â Â Â Â Â Â Â Â Â Â expect(fail).not.toHaveBeenCalled();
>> > @@ -237,13 +237,13 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â });
>> >
>> > Â Â Â Â Â Â Â Â Â Â waitsFor(function() { return win.wasCalled; },
>> > "resolveLocalFileSystemURI callback never called", Tests.TEST_TIMEOUT);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â expect(win).toHaveBeenCalled();
>> > Â Â Â Â Â Â Â Â Â Â Â Â expect(fail).not.toHaveBeenCalled();
>> > Â Â Â Â Â Â Â Â Â Â });
>> > Â Â Â Â Â Â Â Â });
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â // create a new file entry
>> > Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â createFile(fileName, resolveCallback, fail);
>> > @@ -251,13 +251,13 @@ describe('File API', function() {
>> >
>> > Â Â Â Â Â Â Â Â waitsFor(function() { return resolveCallback.wasCalled;
>> },
>> > "createFile callback never called", Tests.TEST_TIMEOUT);
>> > Â Â Â Â Â Â });
>> > - Â Â Â Â Â Â it("should error out when resolving invalid file name",
>> > function() {
>> > + Â Â Â Â Â Â it("should error (NOT_FOUND_ERR) when resolving
>> > (non-existent) invalid file name", function() {
>> > Â Â Â Â Â Â Â Â var fail =
>> jasmine.createSpy().andCallFake(function(error)
>> > {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â win = createWin('window.resolveLocalFileSystemURI');
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â // lookup file system entry
>> > Â Â Â Â Â Â Â Â runs(function() {
>> >
>> > window.resolveLocalFileSystemURI("file:///this.is.not.a.valid.file.txt",
>> > win, fail);
>> > @@ -270,10 +270,10 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(win).not.toHaveBeenCalled();
>> > Â Â Â Â Â Â Â Â });
>> > Â Â Â Â Â Â });
>> > - Â Â Â Â Â Â it("resolve invalid URL", function() {
>> > + Â Â Â Â Â Â it("should error (NOT_FOUND_ERR) when resolving
>> > (non-existent) invalid URL", function() {
>> > Â Â Â Â Â Â Â Â var fail =
>> jasmine.createSpy().andCallFake(function(error)
>> > {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> > - Â Â Â Â Â Â Â Â Â Â expect(error).toBeFileError(FileError.ENCODING_ERR);
>> > +
>> Â expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â win = createWin('window.resolveLocalFileSystemURI');
>> >
>> > @@ -331,7 +331,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â expect(entry.removeRecursively).toBeDefined();
>> > Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â fail = createFail('FileSystem');
>> > -
>> > +
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â window.resolveLocalFileSystemURI(root.toURL(), win,
>> fail);
>> > Â Â Â Â Â Â });
>> > @@ -357,7 +357,7 @@ describe('File API', function() {
>> >
>> > Â Â Â Â Â Â // create:false, exclusive:false, file does not exist
>> > Â Â Â Â Â Â runs(function() {
>> > - Â Â Â Â Â Â Â Â root.getFile(fileName, {create:false}, win, fail);
>> > + Â Â Â Â Â Â Â Â root.getFile(fileName, {create:false}, win, fail);
>> > Â Â Â Â Â Â });
>> >
>> > Â Â Â Â Â Â waitsFor(function() { return fail.wasCalled; }, "error
>> > callback never called", Tests.TEST_TIMEOUT);
>> > @@ -380,10 +380,10 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â entry.remove(null, null);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â fail = createFail('DirectoryEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create:true, exclusive:false, file does not exist
>> > Â Â Â Â Â Â runs(function() {
>> > - Â Â Â Â Â Â Â Â root.getFile(fileName, {create: true}, win, fail);
>> > + Â Â Â Â Â Â Â Â root.getFile(fileName, {create: true}, win, fail);
>> > Â Â Â Â Â Â });
>> >
>> > Â Â Â Â Â Â waitsFor(function() { return win.wasCalled; }, "success
>> > callback never called", Tests.TEST_TIMEOUT);
>> > @@ -402,7 +402,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(entry.isDirectory).toBe(false);
>> > Â Â Â Â Â Â Â Â Â Â expect(entry.name).toBe(fileName);
>> > Â Â Â Â Â Â Â Â Â Â expect(entry.fullPath).toBe(filePath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â entry.remove(null, null);
>> > Â Â Â Â Â Â Â Â }),
>> > @@ -443,7 +443,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(entry.isDirectory).toBe(false);
>> > Â Â Â Â Â Â Â Â Â Â expect(entry.name).toBe(fileName);
>> > Â Â Â Â Â Â Â Â Â Â expect(entry.fullPath).toBe(filePath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â entry.remove(null, fail);
>> > Â Â Â Â Â Â Â Â });
>> > @@ -475,12 +475,12 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â fail = jasmine.createSpy().andCallFake(function(error) {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> >
>> expect(error).toBeFileError(FileError.PATH_EXISTS_ERR);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â existingFile.remove(null, fail);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â win = createWin('DirectoryEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create file to kick off it
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â root.getFile(fileName, {create:true}, getFile, fail);
>> > @@ -497,7 +497,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(entry.isDirectory).toBe(false);
>> > Â Â Â Â Â Â Â Â Â Â expect(entry.name).toBe(fileName);
>> > Â Â Â Â Â Â Â Â Â Â expect(entry.fullPath).toBe(filePath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â entry.remove(null, fail); //clean up
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â fail = createFail('DirectoryEntry'),
>> > @@ -514,7 +514,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â expect(fail).not.toHaveBeenCalled();
>> > Â Â Â Â Â Â Â Â Â Â });
>> > Â Â Â Â Â Â Â Â });
>> > -
>> > +
>> > Â Â Â Â Â Â // create file to kick off it
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â root.getFile(fileName, {create:true}, getFile, fail);
>> > @@ -529,7 +529,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeFileError(FileError.ENCODING_ERR);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â win = createWin('DirectoryEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create:false, exclusive:false, invalid path
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â root.getFile(fileName, {create:false}, win, fail);
>> > @@ -551,7 +551,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â win = createWin('DirectoryEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create:false, exclusive:false, directory does not exist
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â root.getDirectory(dirName, {create:false}, win, fail);
>> > @@ -580,19 +580,19 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â expect(win).toHaveBeenCalled();
>> > Â Â Â Â Â Â Â Â Â Â Â Â expect(fail).not.toHaveBeenCalled();
>> > Â Â Â Â Â Â Â Â Â Â });
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â }), win =
>> > jasmine.createSpy().andCallFake(function(directory) {
>> > Â Â Â Â Â Â Â Â Â Â expect(directory).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.isFile).toBe(false);
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.isDirectory).toBe(true);
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.name).toBe(dirName);
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.fullPath).toBe(dirPath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â directory.remove(null, fail);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â fail = createFail('DirectoryEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create:true, exclusive:false, directory does not exist
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â root.getDirectory(dirName, {create: true}, getDir, fail);
>> > @@ -627,7 +627,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â directory.remove(null, fail);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â fail = createFail('DirectoryEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create:true, exclusive:false, directory does not exist
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â root.getDirectory(dirName, {create: true}, getDir, fail);
>> > @@ -645,15 +645,15 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.isDirectory).toBe(true);
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.name).toBe(dirName);
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.fullPath).toBe(dirPath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â directory.remove(null, fail);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â fail = createFail('DirectoryEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create:true, exclusive:false, directory does not exist
>> > Â Â Â Â Â Â runs(function() {
>> > - Â Â Â Â Â Â Â Â root.getDirectory(dirName, {create: true}, win, fail);
>> > + Â Â Â Â Â Â Â Â root.getDirectory(dirName, {create: true}, win, fail);
>> > Â Â Â Â Â Â });
>> >
>> > Â Â Â Â Â Â waitsFor(function() { return win.wasCalled; }, "win never
>> > called", Tests.TEST_TIMEOUT);
>> > @@ -663,7 +663,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â expect(fail).not.toHaveBeenCalled();
>> > Â Â Â Â Â Â });
>> > Â Â Â Â });
>> > -
>> > +
>> > Â Â Â Â it("DirectoryEntry.getDirectory: create new directory
>> > (exclusive)", function() {
>> > Â Â Â Â Â Â var dirName = "de.create.exclusive.dir",
>> > Â Â Â Â Â Â Â Â dirPath = root.fullPath + '/' + dirName,
>> > @@ -673,14 +673,14 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.isDirectory).toBe(true);
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.name).toBe(dirName);
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.fullPath).toBe(dirPath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â directory.remove(null, fail);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â fail = createFail('DirectoryEntry');
>> > Â Â Â Â Â Â // create:true, exclusive:true, directory does not exist
>> > Â Â Â Â Â Â runs(function() {
>> > - Â Â Â Â Â Â Â Â root.getDirectory(dirName, {create: true,
>> > exclusive:true}, win, fail);
>> > + Â Â Â Â Â Â Â Â root.getDirectory(dirName, {create: true,
>> > exclusive:true}, win, fail);
>> > Â Â Â Â Â Â });
>> >
>> > Â Â Â Â Â Â waitsFor(function() { return win.wasCalled; }, "win never
>> > called", Tests.TEST_TIMEOUT);
>> > @@ -712,15 +712,15 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.isDirectory).toBe(true);
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.name).toBe(dirName);
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.fullPath).toBe(dirPath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â directory.remove(null, fail);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â fail = createFail('DirectoryEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create directory to kick off it
>> > Â Â Â Â Â Â runs(function() {
>> > - Â Â Â Â Â Â Â Â root.getDirectory(dirName, {create:true}, getDir,
>> > this.fail);
>> > + Â Â Â Â Â Â Â Â root.getDirectory(dirName, {create:true}, getDir,
>> > this.fail);
>> > Â Â Â Â Â Â });
>> >
>> > Â Â Â Â Â Â waitsFor(function() { return getDir.wasCalled; }, "getDir
>> > never called", Tests.TEST_TIMEOUT);
>> > @@ -746,17 +746,17 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â fail = jasmine.createSpy().andCallFake(function(error) {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> >
>> expect(error).toBeFileError(FileError.PATH_EXISTS_ERR);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â existingDir.remove(null, fail);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â win = createWin('DirectoryEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create directory to kick off it
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â root.getDirectory(dirName, {create:true}, getDir, fail);
>> > Â Â Â Â Â Â });
>> > -
>> > +
>> > Â Â Â Â Â Â waitsFor(function() { return getDir.wasCalled; }, "getDir
>> > never called", Tests.TEST_TIMEOUT);
>> > Â Â Â Â });
>> > Â Â Â Â it("DirectoryEntry.getDirectory: get Entry for existing
>> > directory", function() {
>> > @@ -780,14 +780,14 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.isFile).toBe(false);
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.isDirectory).toBe(true);
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.name).toBe(dirName);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.fullPath).toBe(dirPath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â directory.remove(null, fail);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â fail = createFail('DirectoryEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create directory to kick off it
>> > Â Â Â Â Â Â root.getDirectory(dirName, {create:true}, getDir, fail);
>> > Â Â Â Â });
>> > @@ -798,10 +798,10 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeFileError(FileError.ENCODING_ERR);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â win = createWin('DirectoryEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create:false, exclusive:false, invalid path
>> > Â Â Â Â Â Â runs(function() {
>> > - Â Â Â Â Â Â Â Â root.getDirectory(dirName, {create:false}, win, fail);
>> > + Â Â Â Â Â Â Â Â root.getDirectory(dirName, {create:false}, win, fail);
>> > Â Â Â Â Â Â });
>> >
>> > Â Â Â Â Â Â waitsFor(function() { return fail.wasCalled; }, "fail never
>> > called", Tests.TEST_TIMEOUT);
>> > @@ -832,12 +832,12 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â fail = jasmine.createSpy().andCallFake(function(error) {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> >
>> > expect(error).toBeFileError(FileError.TYPE_MISMATCH_ERR);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â existingFile.remove(null, null);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â win = createWin('DirectoryEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create file to kick off it
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â root.getFile(fileName, {create:true}, getDir, fail);
>> > @@ -866,12 +866,12 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â fail = jasmine.createSpy().andCallFake(function(error) {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> >
>> > expect(error).toBeFileError(FileError.TYPE_MISMATCH_ERR);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â existingDir.remove(null, null);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â win = createWin('DirectoryEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create directory to kick off it
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â root.getDirectory(dirName, {create:true}, getFile, fail);
>> > @@ -929,7 +929,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â waitsFor(function() { return entryCallback.wasCalled; },
>> > "entryCallback never called", Tests.TEST_TIMEOUT);
>> > Â Â Â Â });
>> > Â Â Â Â it("createReader: create reader on existing directory",
>> function()
>> > {
>> > - Â Â Â Â Â Â // create reader for root directory
>> > + Â Â Â Â Â Â // create reader for root directory
>> > Â Â Â Â Â Â var reader = root.createReader();
>> > Â Â Â Â Â Â expect(reader).toBeDefined();
>> > Â Â Â Â Â Â expect(typeof reader.readEntries).toBe('function');
>> > @@ -964,8 +964,8 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â expect(entries instanceof Array).toBe(true);
>> > Â Â Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â Â Â fail = createFail('DirectoryReader');
>> > -
>> > - Â Â Â Â Â Â Â Â // create reader for root directory
>> > +
>> > + Â Â Â Â Â Â Â Â // create reader for root directory
>> > Â Â Â Â Â Â Â Â reader = root.createReader();
>> > Â Â Â Â Â Â Â Â // read entries
>> > Â Â Â Â Â Â Â Â runs(function() {
>> > @@ -986,7 +986,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â // read entries
>> > Â Â Â Â Â Â Â Â Â Â Â Â var readEntries =
>> > jasmine.createSpy().andCallFake(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â var reader = directory.createReader();
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â reader.readEntries(win, itReader);
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â });
>> > @@ -1055,12 +1055,12 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(typeof
>> fileEntry.createWriter).toBe('function');
>> > Â Â Â Â Â Â Â Â Â Â expect(typeof fileEntry.file).toBe('function');
>> > -
>> > - Â Â Â Â Â Â Â Â Â Â // cleanup
>> > +
>> > + Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â fileEntry.remove(null, fail);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â fail = createFail('FileEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create a new file entry to kick off it
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â root.getFile(fileName, {create:true}, itFileEntry, fail);
>> > @@ -1093,12 +1093,12 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itWriter =
>> > jasmine.createSpy().andCallFake(function(writer) {
>> > Â Â Â Â Â Â Â Â Â Â expect(writer).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(writer instanceof FileWriter).toBe(true);
>> > -
>> > - Â Â Â Â Â Â Â Â Â Â // cleanup
>> > +
>> > + Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â itFile.remove(null, fail);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â fail = createFail('FileEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create a new file entry to kick off it
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â root.getFile(fileName, {create:true}, entryCallback,
>> fail);
>> > @@ -1111,7 +1111,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â newFile,
>> > Â Â Â Â Â Â Â Â entryCallback =
>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>> > Â Â Â Â Â Â Â Â Â Â newFile = fileEntry;
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â fileEntry.file(itFile, fail);
>> > Â Â Â Â Â Â Â Â Â Â });
>> > @@ -1126,12 +1126,12 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itFile = jasmine.createSpy().andCallFake(function(file) {
>> > Â Â Â Â Â Â Â Â Â Â expect(file).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(file instanceof File).toBe(true);
>> > -
>> > - Â Â Â Â Â Â Â Â Â Â // cleanup
>> > +
>> > + Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â newFile.remove(null, fail);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â fail = createFail('FileEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create a new file entry to kick off it
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â root.getFile(fileName, {create:true}, entryCallback,
>> fail);
>> > @@ -1168,7 +1168,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â fail = createFail('FileEntry'),
>> > Â Â Â Â Â Â Â Â win = createWin('FileEntry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create a new file entry to kick off it
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â root.getFile(fileName, {create:true}, entryCallback,
>> fail);
>> > @@ -1236,7 +1236,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(fileName);
>> > Â Â Â Â Â Â Â Â });
>> > -
>> > +
>> > Â Â Â Â Â Â // create a new file entry
>> > Â Â Â Â Â Â createFile(fileName, entryCallback, fail);
>> > Â Â Â Â });
>> > @@ -1262,7 +1262,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(dirName);
>> > Â Â Â Â Â Â Â Â });
>> > -
>> > +
>> > Â Â Â Â Â Â // create a new directory entry
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â createDirectory(dirName, entryCallback, fail);
>> > @@ -1293,7 +1293,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(fileName);
>> > Â Â Â Â Â Â Â Â });
>> > -
>> > +
>> > Â Â Â Â Â Â // create a new file entry
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â createFile(fileName, entryCallback, fail);
>> > @@ -1364,7 +1364,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(fileName);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â fail = createFail('Entry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create a new file entry
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â createFile(fileName, itURL, fail);
>> > @@ -1421,7 +1421,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â });
>> > Â Â Â Â Â Â Â Â Â Â });
>> > Â Â Â Â Â Â Â Â Â Â expect(entry).toBeDefined();
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â entry.remove(checkRemove, fail);
>> > Â Â Â Â Â Â Â Â Â Â });
>> > @@ -1435,7 +1435,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(fileName);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â fail = createFail('Entry');
>> > -
>> > +
>> > Â Â Â Â Â Â // create a new file entry
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â createFile(fileName, entryCallback, fail);
>> > @@ -1594,7 +1594,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(entry2.isDirectory).toBe(false);
>> > Â Â Â Â Â Â Â Â Â Â expect(entry2.fullPath).toBe(fullPath);
>> > Â Â Â Â Â Â Â Â Â Â expect(entry2.name).toBe(file2);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(file1);
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(file2);
>> > @@ -1669,7 +1669,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.isDirectory).toBe(true);
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.fullPath).toBe(dstPath);
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.name).toBe(dstDir);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â root.getDirectory(dstDir, {create:false},
>> > itDirExists, fail);
>> > Â Â Â Â Â Â Â Â Â Â });
>> > @@ -1682,7 +1682,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â Â expect(dirEntry.isDirectory).toBe(true);
>> > Â Â Â Â Â Â Â Â Â Â Â expect(dirEntry.fullPath).toBe(dstPath);
>> > Â Â Â Â Â Â Â Â Â Â Â expect(dirEntry.name).toBe(dstDir);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â dirEntry.getFile(file1, {create:false},
>> > itFileExists, fail);
>> > Â Â Â Â Â Â Â Â Â Â Â });
>> > @@ -1735,7 +1735,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.isDirectory).toBe(true);
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.fullPath).toBe(dstPath);
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.name).toBe(dstDir);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â root.getDirectory(dstDir, {create:false},
>> itDirExists,
>> > fail);
>> > Â Â Â Â Â Â Â Â },
>> > Â Â Â Â Â Â Â Â itDirExists = function(dirEntry) {
>> > @@ -1744,7 +1744,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â Â expect(dirEntry.isDirectory).toBe(true);
>> > Â Â Â Â Â Â Â Â Â Â Â expect(dirEntry.fullPath).toBe(dstPath);
>> > Â Â Â Â Â Â Â Â Â Â Â expect(dirEntry.name).toBe(dstDir);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â Â dirEntry.getFile(file1, {create:false},
>> itFileExists,
>> > fail);
>> > Â Â Â Â Â Â Â Â },
>> > Â Â Â Â Â Â Â Â itFileExists =
>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>> > @@ -1784,7 +1784,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â var copyDir =
>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>> > Â Â Â Â Â Â Â Â Â Â Â Â // copy srcDir onto itself
>> > Â Â Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > - Â Â Â Â Â Â Â Â Â Â Â Â Â Â directory.copyTo(root, null, win, itCopy);
>> > + Â Â Â Â Â Â Â Â Â Â Â Â Â Â directory.copyTo(root, null, win, itCopy);
>> > Â Â Â Â Â Â Â Â Â Â Â Â });
>> >
>> > Â Â Â Â Â Â Â Â Â Â Â Â waitsFor(function() { return itCopy.wasCalled; },
>> > "itCopy never called", Tests.TEST_TIMEOUT);
>> > @@ -1799,8 +1799,8 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itCopy = jasmine.createSpy().andCallFake(function(error)
>> {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> >
>> > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
>> > -
>> > - Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > +
>> > + Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â root.getDirectory(srcDir, {create:false},
>> > itDirectoryExists, fail);
>> > Â Â Â Â Â Â Â Â Â Â });
>> >
>> > @@ -1810,7 +1810,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â // returning confirms existence so just check
>> fullPath
>> > entry
>> > Â Â Â Â Â Â Â Â Â Â expect(dirEntry).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(dirEntry.fullPath).toBe(srcPath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â dirEntry.getFile(file1, {create:false},
>> > itFileExists, fail);
>> > Â Â Â Â Â Â Â Â Â Â });
>> > @@ -1826,7 +1826,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itFileExists =
>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry.fullPath).toBe(filePath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(srcDir);
>> > Â Â Â Â Â Â Â Â });
>> > @@ -1855,7 +1855,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itCopy = jasmine.createSpy().andCallFake(function(error)
>> {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> >
>> > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â root.getDirectory(srcDir, {create:false},
>> > itDirectoryExists, fail);
>> > Â Â Â Â Â Â Â Â Â Â });
>> > @@ -1885,7 +1885,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â waitsFor(function() { return entryCallback.wasCalled; },
>> > "entryCallback never called", Tests.TEST_TIMEOUT);
>> > Â Â Â Â });
>> > Â Â Â Â it("copyTo: directory that does not exist", function() {
>> > - Â Â Â Â Â Â var file1 = "entry.copy.dnf.file1",
>> > + Â Â Â Â Â Â var file1 = "entry.copy.dnf.file1",
>> > Â Â Â Â Â Â Â Â dstDir = "entry.copy.dnf.dstDir",
>> > Â Â Â Â Â Â Â Â filePath = root.fullPath + '/' + file1,
>> > Â Â Â Â Â Â Â Â dstPath = root.fullPath + '/' + dstDir,
>> > @@ -1987,7 +1987,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(entry.isDirectory).toBe(false);
>> > Â Â Â Â Â Â Â Â Â Â expect(entry.fullPath).toBe(dstPath);
>> > Â Â Â Â Â Â Â Â Â Â expect(entry.name).toBe(file2);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â root.getFile(file2, {create:false},
>> itMovedExists,
>> > fail);
>> > Â Â Â Â Â Â Â Â Â Â });
>> > @@ -1997,7 +1997,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itMovedExists =
>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry.fullPath).toBe(dstPath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â root.getFile(file1, {create:false}, win, itOrig);
>> > Â Â Â Â Â Â Â Â Â Â });
>> > @@ -2014,7 +2014,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â //expect(navigator.fileMgr.itFileExists(srcPath) ===
>> > false, "original file should not exist.");
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(file1);
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(file2);
>> > @@ -2057,7 +2057,7 @@ describe('File API', function() {
>> >
>> > Â Â Â Â Â Â Â Â Â Â Â Â waitsFor(function() { return itMove.wasCalled; },
>> > "itMove never called", Tests.TEST_TIMEOUT);
>> > Â Â Â Â Â Â Â Â Â Â });
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // create a parent directory to move file to
>> > Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â root.getDirectory(dir, {create: true}, moveFile,
>> > fail);
>> > @@ -2068,7 +2068,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itMovedExists =
>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry.fullPath).toBe(dstPath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â root.getFile(file1, {create:false}, win, itOrig);
>> > Â Â Â Â Â Â Â Â Â Â });
>> > @@ -2084,7 +2084,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itOrig = jasmine.createSpy().andCallFake(function(error)
>> {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(file1);
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(dir);
>> > @@ -2131,7 +2131,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.fullPath).toBe(dstPath);
>> > Â Â Â Â Â Â Â Â Â Â expect(directory.name).toBe(dstDir);
>> > Â Â Â Â Â Â Â Â Â Â // it that moved file exists in destination dir
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â directory.getFile(file1, {create:false},
>> > itMovedExists, fail);
>> > Â Â Â Â Â Â Â Â Â Â });
>> > @@ -2158,7 +2158,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itOrig = jasmine.createSpy().andCallFake(function(error)
>> {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(srcDir);
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(dstDir);
>> > @@ -2231,7 +2231,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itOrig = jasmine.createSpy().andCallFake(function(error)
>> {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(srcDir);
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(dstDir);
>> > @@ -2304,7 +2304,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itOrig = jasmine.createSpy().andCallFake(function(error)
>> {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(srcDir);
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(dstDir);
>> > @@ -2346,7 +2346,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itMove = jasmine.createSpy().andCallFake(function(error)
>> {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> >
>> > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // it that original dir still exists
>> > Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â root.getDirectory(srcDir, {create:false},
>> > itDirectoryExists, fail);
>> > @@ -2358,7 +2358,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â // returning confirms existence so just check
>> fullPath
>> > entry
>> > Â Â Â Â Â Â Â Â Â Â expect(dirEntry).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(dirEntry.fullPath).toBe(srcPath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â dirEntry.getFile(file1, {create:false},
>> > itFileExists, fail);
>> > Â Â Â Â Â Â Â Â Â Â });
>> > @@ -2374,7 +2374,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itFileExists =
>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry.fullPath).toBe(filePath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(srcDir);
>> > Â Â Â Â Â Â Â Â });
>> > @@ -2419,7 +2419,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itDirectoryExists =
>> > jasmine.createSpy().andCallFake(function(entry) {
>> > Â Â Â Â Â Â Â Â Â Â expect(entry).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(entry.fullPath).toBe(srcPath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(srcDir);
>> > Â Â Â Â Â Â Â Â });
>> > @@ -2447,7 +2447,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itMove = jasmine.createSpy().andCallFake(function(error)
>> {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> >
>> > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â //it that original file still exists
>> > Â Â Â Â Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â root.getFile(file1, {create:false}, itFileExists,
>> > fail);
>> > @@ -2464,7 +2464,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itFileExists =
>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry.fullPath).toBe(filePath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(file1);
>> > Â Â Â Â Â Â Â Â });
>> > @@ -2496,10 +2496,10 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â // move file1 onto sub-directory
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â entry.moveTo(directory, subDir, win, itMove);
>> > Â Â Â Â Â Â Â Â Â Â Â Â };
>> > - Â Â Â Â Â Â Â Â Â Â Â Â // create sub-directory
>> > + Â Â Â Â Â Â Â Â Â Â Â Â // create sub-directory
>> > Â Â Â Â Â Â Â Â Â Â Â Â directory.getDirectory(subDir, {create: true},
>> > moveFile, fail);
>> > Â Â Â Â Â Â Â Â Â Â };
>> > - Â Â Â Â Â Â Â Â Â Â // create top level directory
>> > + Â Â Â Â Â Â Â Â Â Â // create top level directory
>> > Â Â Â Â Â Â Â Â Â Â root.getDirectory(dstDir, {create: true},
>> > createSubDirectory, fail);
>> > Â Â Â Â Â Â Â Â },
>> > Â Â Â Â Â Â Â Â itDirectoryExists = function(dirEntry) {
>> > @@ -2526,7 +2526,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â });
>> >
>> > Â Â Â Â Â Â waitsFor(function() { return itFileExists.wasCalled; },
>> > "itFileExists never called", Tests.TEST_TIMEOUT);
>> > -
>> > +
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â expect(itFileExists).toHaveBeenCalled();
>> > Â Â Â Â Â Â Â Â expect(win).not.toHaveBeenCalled();
>> > @@ -2564,7 +2564,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itFileExists =
>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry.fullPath).toBe(filePath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(file1);
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(srcDir);
>> > @@ -2614,7 +2614,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itFileExists =
>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry.fullPath).toBe(filePath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(file1);
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(srcDir);
>> > @@ -2650,14 +2650,14 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â var itMove = function(error) {
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> >
>> > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â // it that destination directory still exists
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â directory.getDirectory(subDir,
>> {create:false},
>> > itDirectoryExists, fail);
>> > Â Â Â Â Â Â Â Â Â Â Â Â };
>> > - Â Â Â Â Â Â Â Â Â Â Â Â // create sub-directory
>> > + Â Â Â Â Â Â Â Â Â Â Â Â // create sub-directory
>> > Â Â Â Â Â Â Â Â Â Â Â Â directory.getDirectory(subDir, {create: true},
>> > moveDir, fail);
>> > Â Â Â Â Â Â Â Â Â Â };
>> > - Â Â Â Â Â Â Â Â Â Â // create top level directory
>> > + Â Â Â Â Â Â Â Â Â Â // create top level directory
>> > Â Â Â Â Â Â Â Â Â Â root.getDirectory(dstDir, {create: true},
>> > createSubDirectory, fail);
>> > Â Â Â Â Â Â Â Â },
>> > Â Â Â Â Â Â Â Â itDirectoryExists = function(dirEntry) {
>> > @@ -2712,7 +2712,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â expect(entry.isDirectory).toBe(false);
>> > Â Â Â Â Â Â Â Â Â Â expect(entry.fullPath).toBe(file2Path);
>> > Â Â Â Â Â Â Â Â Â Â expect(entry.name).toBe(file2);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // it that old file does not exists
>> > Â Â Â Â Â Â Â Â Â Â root.getFile(file1, {create:false}, win,
>> itFileMoved);
>> > Â Â Â Â Â Â Â Â },
>> > @@ -2725,7 +2725,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itFileExists =
>> > jasmine.createSpy().andCallFake(function(fileEntry) {
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry.fullPath).toBe(file2Path);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(file1);
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(file2);
>> > @@ -2777,14 +2777,14 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itFileExists = function(fileEntry) {
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(fileEntry.fullPath).toBe(filePath);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // check that old directory no longer exists
>> > Â Â Â Â Â Â Â Â Â Â root.getDirectory(srcDir, {create:false}, win,
>> > itRemoved);
>> > Â Â Â Â Â Â Â Â },
>> > Â Â Â Â Â Â Â Â itRemoved =
>> > jasmine.createSpy().andCallFake(function(error){
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(srcDir);
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(dstDir);
>> > @@ -2807,7 +2807,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â });
>> > Â Â Â Â });
>> > Â Â Â Â it("moveTo: directory that does not exist", function() {
>> > - Â Â Â Â Â Â var file1 = "entry.move.dnf.file1",
>> > + Â Â Â Â Â Â var file1 = "entry.move.dnf.file1",
>> > Â Â Â Â Â Â Â Â dstDir = "entry.move.dnf.dstDir",
>> > Â Â Â Â Â Â Â Â filePath = root.fullPath + '/' + file1,
>> > Â Â Â Â Â Â Â Â dstPath = root.fullPath + '/' + dstDir,
>> > @@ -2822,7 +2822,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â itMove = jasmine.createSpy().andCallFake(function(error)
>> {
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeDefined();
>> > Â Â Â Â Â Â Â Â Â Â expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteEntry(file1);
>> > Â Â Â Â Â Â Â Â });
>> > @@ -2912,10 +2912,10 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â reader.onloadend = verifier;
>> > Â Â Â Â Â Â Â Â Â Â var myFile = new File();
>> >
>> > - Â Â Â Â Â Â Â Â Â Â myFile.fullPath = filePath;
>> > + Â Â Â Â Â Â Â Â Â Â myFile.fullPath = filePath;
>> > Â Â Â Â Â Â Â Â Â Â reader.readAsText(myFile);
>> > Â Â Â Â Â Â Â Â };
>> > -
>> > +
>> > Â Â Â Â Â Â // create a file, write to it, and read it in again
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â root.getFile(fileName, {create: true}, create_writer,
>> > fail);
>> > @@ -2944,10 +2944,10 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â var reader = new FileReader();
>> > Â Â Â Â Â Â Â Â Â Â reader.onloadend = verifier;
>> > Â Â Â Â Â Â Â Â Â Â var myFile = new File();
>> > - Â Â Â Â Â Â Â Â Â Â myFile.fullPath = filePath;
>> > + Â Â Â Â Â Â Â Â Â Â myFile.fullPath = filePath;
>> > Â Â Â Â Â Â Â Â Â Â reader.readAsText(myFile);
>> > Â Â Â Â Â Â Â Â };
>> > -
>> > +
>> > Â Â Â Â Â Â // create a file, write to it, and read it in again
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â root.getFile(fileName, {create: true}, read_file, fail);
>> > @@ -2968,7 +2968,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â });
>> > Â Â Â Â Â Â reader.onerror = verifier;
>> > Â Â Â Â Â Â var myFile = new File();
>> > - Â Â Â Â Â Â myFile.fullPath = root.fullPath + '/' + "doesnotexist.err";
>> > + Â Â Â Â Â Â myFile.fullPath = root.fullPath + '/' + "doesnotexist.err";
>> >
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â reader.readAsText(myFile);
>> > @@ -2993,7 +2993,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â },
>> > Â Â Â Â Â Â Â Â // writes file and reads it back in
>> > Â Â Â Â Â Â Â Â write_file = function(writer) {
>> > - Â Â Â Â Â Â Â Â Â Â writer.onwriteend = read_file;
>> > + Â Â Â Â Â Â Â Â Â Â writer.onwriteend = read_file;
>> > Â Â Â Â Â Â Â Â Â Â writer.write(rule);
>> > Â Â Â Â Â Â Â Â },
>> > Â Â Â Â Â Â Â Â verifier = jasmine.createSpy().andCallFake(function(evt)
>> {
>> > @@ -3005,10 +3005,10 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â var reader = new FileReader();
>> > Â Â Â Â Â Â Â Â Â Â reader.onloadend = verifier;
>> > Â Â Â Â Â Â Â Â Â Â var myFile = new File();
>> > - Â Â Â Â Â Â Â Â Â Â myFile.fullPath = filePath;
>> > + Â Â Â Â Â Â Â Â Â Â myFile.fullPath = filePath;
>> > Â Â Â Â Â Â Â Â Â Â reader.readAsDataURL(myFile);
>> > Â Â Â Â Â Â Â Â };
>> > -
>> > +
>> > Â Â Â Â Â Â // create a file, write to it, and read it in again
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â root.getFile(fileName, {create: true}, create_writer,
>> > fail);
>> > @@ -3089,7 +3089,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â writer.write(rule);
>> > Â Â Â Â Â Â Â Â Â Â }, fail);
>> > Â Â Â Â Â Â Â Â };
>> > -
>> > +
>> > Â Â Â Â Â Â // create file, then write and append to it
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â createFile(fileName, write_file);
>> > @@ -3120,7 +3120,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â theWriter.onwriteend = anotherVerifier;
>> > Â Â Â Â Â Â Â Â Â Â length += exception.length;
>> > Â Â Â Â Â Â Â Â Â Â theWriter.seek(theWriter.length);
>> > - Â Â Â Â Â Â Â Â Â Â theWriter.write(exception);
>> > + Â Â Â Â Â Â Â Â Â Â theWriter.write(exception);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â anotherVerifier =
>> > jasmine.createSpy().andCallFake(function(evt) {
>> > Â Â Â Â Â Â Â Â Â Â expect(theWriter.length).toBe(length);
>> > @@ -3135,7 +3135,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â theWriter.onwriteend = verifier;
>> > Â Â Â Â Â Â Â Â Â Â theWriter.write(rule);
>> > Â Â Â Â Â Â Â Â };
>> > -
>> > +
>> > Â Â Â Â Â Â // create file, then write and append to it
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â var file = new File();
>> > @@ -3168,7 +3168,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â theWriter.onwriteend = anotherVerifier;
>> > Â Â Â Â Â Â Â Â Â Â length = 12 + exception.length;
>> > Â Â Â Â Â Â Â Â Â Â theWriter.seek(12);
>> > - Â Â Â Â Â Â Â Â Â Â theWriter.write(exception);
>> > + Â Â Â Â Â Â Â Â Â Â theWriter.write(exception);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â anotherVerifier =
>> > jasmine.createSpy().andCallFake(function(evt) {
>> > Â Â Â Â Â Â Â Â Â Â expect(theWriter.length).toBe(length);
>> > @@ -3185,7 +3185,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â theWriter.write(rule);
>> > Â Â Â Â Â Â Â Â Â Â }, fail);
>> > Â Â Â Â Â Â Â Â };
>> > -
>> > +
>> > Â Â Â Â Â Â // create file, then write and append to it
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â createFile(fileName, write_file);
>> > @@ -3216,7 +3216,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â theWriter.onwriteend = anotherVerifier;
>> > Â Â Â Â Â Â Â Â Â Â length = 8 + exception.length;
>> > Â Â Â Â Â Â Â Â Â Â theWriter.seek(8);
>> > - Â Â Â Â Â Â Â Â Â Â theWriter.write(exception);
>> > + Â Â Â Â Â Â Â Â Â Â theWriter.write(exception);
>> > Â Â Â Â Â Â Â Â }),
>> > Â Â Â Â Â Â Â Â anotherVerifier =
>> > jasmine.createSpy().andCallFake(function(evt) {
>> > Â Â Â Â Â Â Â Â Â Â expect(theWriter.length).toBe(length);
>> > @@ -3233,7 +3233,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â theWriter.write(rule);
>> > Â Â Â Â Â Â Â Â Â Â }, fail);
>> > Â Â Â Â Â Â Â Â };
>> > -
>> > +
>> > Â Â Â Â Â Â // create file, then write and append to it
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â createFile(fileName, write_file);
>> > @@ -3271,7 +3271,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â theWriter.write(rule);
>> > Â Â Â Â Â Â Â Â Â Â }, fail);
>> > Â Â Â Â Â Â Â Â };
>> > -
>> > +
>> > Â Â Â Â Â Â // creates file, then write XML data
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â createFile(fileName, write_file);
>> > @@ -3305,10 +3305,10 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â fileEntry.createWriter(function(writer) {
>> > Â Â Â Â Â Â Â Â Â Â Â Â theWriter = writer;
>> > Â Â Â Â Â Â Â Â Â Â Â Â theWriter.onwriteend = verifier;
>> > - Â Â Â Â Â Â Â Â Â Â Â Â theWriter.write(rule);
>> > + Â Â Â Â Â Â Â Â Â Â Â Â theWriter.write(rule);
>> > Â Â Â Â Â Â Â Â Â Â }, fail);
>> > Â Â Â Â Â Â Â Â };
>> > -
>> > +
>> > Â Â Â Â Â Â // creates file, then write JSON content
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â createFile(fileName, write_file);
>> > @@ -3341,7 +3341,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â // writes file and reads it back in
>> > Â Â Â Â Â Â Â Â write_file = function(writer) {
>> > Â Â Â Â Â Â Â Â Â Â theWriter = writer;
>> > - Â Â Â Â Â Â Â Â Â Â theWriter.onwriteend = read_file;
>> > + Â Â Â Â Â Â Â Â Â Â theWriter.onwriteend = read_file;
>> > Â Â Â Â Â Â Â Â Â Â theWriter.write(rule);
>> > Â Â Â Â Â Â Â Â },
>> > Â Â Â Â Â Â Â Â // reads file and compares content to what was written
>> > @@ -3395,7 +3395,7 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â Â Â Â Â theWriter.write(rule);
>> > Â Â Â Â Â Â Â Â Â Â }, fail);
>> > Â Â Â Â Â Â Â Â };
>> > -
>> > +
>> > Â Â Â Â Â Â // creates file, then write JSON content
>> > Â Â Â Â Â Â runs(function() {
>> > Â Â Â Â Â Â Â Â createFile(fileName, seek_file);
>> > @@ -3413,20 +3413,20 @@ describe('File API', function() {
>> > Â Â Â Â Â Â Â Â rule = "There is an exception to every rule. Â Except this
>> > one.",
>> > Â Â Â Â Â Â Â Â fail = createFail('FileWRiter'),
>> > Â Â Â Â Â Â Â Â theWriter,
>> > - Â Â Â Â Â Â Â Â // writes file content
>> > + Â Â Â Â Â Â Â Â // writes file content
>> > Â Â Â Â Â Â Â Â write_file = function(fileEntry) {
>> > Â Â Â Â Â Â Â Â Â Â fileEntry.createWriter(function(writer) {
>> > Â Â Â Â Â Â Â Â Â Â Â Â theWriter = writer;
>> > Â Â Â Â Â Â Â Â Â Â Â Â theWriter.onwriteend = function(evt) {
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â truncate_file(theWriter);
>> > - Â Â Â Â Â Â Â Â Â Â Â Â };
>> > + Â Â Â Â Â Â Â Â Â Â Â Â };
>> > Â Â Â Â Â Â Â Â Â Â Â Â theWriter.write(rule);
>> > Â Â Â Â Â Â Â Â Â Â }, fail);
>> > Â Â Â Â Â Â Â Â },
>> > Â Â Â Â Â Â Â Â verifier = jasmine.createSpy().andCallFake(function(evt)
>> {
>> > Â Â Â Â Â Â Â Â Â Â expect(theWriter.length).toBe(36);
>> > Â Â Â Â Â Â Â Â Â Â expect(theWriter.position).toBe(36);
>> > -
>> > +
>> > Â Â Â Â Â Â Â Â Â Â // cleanup
>> > Â Â Â Â Â Â Â Â Â Â deleteFile(fileName);
>> > Â Â Â Â Â Â Â Â }),
>> >
>> >
>>
>
>
>
> --
> @purplecabbage
> risingj.com
Re: spec commit: described test condition, updated to test for NOT_FOUND_ERR
Posted by Becky Gibson <gi...@gmail.com>.
No worries, Jesse. I just wanted to discuss it here before I made any
changes on the iOS side. Drew has already made a change for Blackberry -
not sure what Android does. Also would like to discuss the impact of
changing a return value in the code.
-becky
On Tue, May 22, 2012 at 6:14 PM, Jesse <pu...@gmail.com> wrote:
> I think the only person who knows the intent of the test case is whoever
> wrote it.
> I am sorry that a fix for WP7 has caused issues elsewhere, I will look for
> another solution. Ultimately we need the docs to state what error codes
> are returned in what situation, perhaps an example for each error code,
> that would be aligned with the tests.
>
> What exactly makes "/this.is.not.a.valid.url" an EncodingError?
>
> On WP7 I am relying on the SDK to tell me if it is well formed :
>
> if (!Uri.IsWellFormedUriString(fileOptions.Uri,
> UriKind.RelativeOrAbsolute))
> {
> DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR,
> ENCODING_ERR));
> return;
> }
>
> If indeed it is deemed that this is an EncodingError, do we even need to
> call native to determine that?
>
>
> On Tue, May 22, 2012 at 1:46 PM, Becky Gibson <gibson.becky@gmail.com
> >wrote:
>
> > Just tested mobile-spec on iOS and was surprised to find a failing file
> > test.
> >
> > Curious why the error code was changed from ENCODING_ERR to
> NOT_FOUND_ERR?
> > To me the description in the spec would indicate that an invalid URL
> > would return ENCODING_ERR?
> >
> > from http://www.w3.org/TR/file-system-api/#definitions: EncodingErrorA
> > path or URL supplied to the API was malformed.
> > NotFoundErrorA required file or directory could not be found at the time
> an
> > operation was processed.
> > The test that was changed is: window.resolveLocalFileSystemURI(
> > "/this.is.not.a.valid.url", win, fail); IMHO "/this.is.not.a.valid.url"
> is
> > NOT a valid url according to
> > http://www.w3.org/Addressing/URL/url-spec.txt so it seems appropriate
> > to return an encodingError? This was discussed in
> > https://issues.apache.org/jira/browse/CB-671 where folks suggested it
> IS a
> > valid URL?
> >
> > If we decide this is the appropriate return value, I'll have to do a bit
> of
> > work on the iOS code as it uses the NSURL URLWithString: and isFileURL:
> > apis to determine if the input is a valid File URL or not. I'm not sure
> > that appending "file://" to the input parameter is really the best
> > solution......
> >
> > NSURL* testUri = [NSURL URLWithString:strUri];
> > if (!testUri || ![testUri isFileURL])
> >
> > I'm also wondering if this is something we should be changing without
> some
> > kind of warning to users. While most people may just check for an error,
> > it seems a bit odd to change the actual error code being returned.
> >
> > -becky
> >
> >
> > On Tue, May 8, 2012 at 8:17 PM, <pu...@apache.org> wrote:
> >
> > > Updated Branches:
> > > refs/heads/master 35a3f3f4a -> c3225a50f
> > >
> > >
> > > described test condition, updated to test for NOT_FOUND_ERR
> > >
> > >
> > > Project:
> > >
> >
> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/repo
> > > Commit:
> > >
> >
> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/commit/c3225a50
> > > Tree:
> > >
> >
> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/c3225a50
> > > Diff:
> > >
> >
> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/c3225a50
> > >
> > > Branch: refs/heads/master
> > > Commit: c3225a50f48649bc66fd6c4e99b3e959d06a13b8
> > > Parents: 35a3f3f
> > > Author: Jesse MacFadyen <pu...@gmail.com>
> > > Authored: Tue May 8 17:16:43 2012 -0700
> > > Committer: Jesse MacFadyen <pu...@gmail.com>
> > > Committed: Tue May 8 17:16:43 2012 -0700
> > >
> > > ----------------------------------------------------------------------
> > > autotest/tests/file.tests.js | 272
> ++++++++++++++++++------------------
> > > 1 files changed, 136 insertions(+), 136 deletions(-)
> > > ----------------------------------------------------------------------
> > >
> > >
> > >
> > >
> >
> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/c3225a50/autotest/tests/file.tests.js
> > > ----------------------------------------------------------------------
> > > diff --git a/autotest/tests/file.tests.js
> b/autotest/tests/file.tests.js
> > > index de37980..860a6c1 100644
> > > --- a/autotest/tests/file.tests.js
> > > +++ b/autotest/tests/file.tests.js
> > > @@ -31,10 +31,10 @@ describe('File API', function() {
> > > // deletes specified file or directory
> > > var deleteEntry = function(name, success, error) {
> > > // deletes entry, if it exists
> > > - window.resolveLocalFileSystemURI(root.toURL() + '/' + name,
> > > + window.resolveLocalFileSystemURI(root.toURL() + '/' + name,
> > > function(entry) {
> > > if (entry.isDirectory === true) {
> > > - entry.removeRecursively(success, error);
> > > + entry.removeRecursively(success, error);
> > > } else {
> > > entry.remove(success, error);
> > > }
> > > @@ -42,7 +42,7 @@ describe('File API', function() {
> > > };
> > > // deletes file, if it exists, then invokes callback
> > > var deleteFile = function(fileName, callback) {
> > > - root.getFile(fileName, null,
> > > + root.getFile(fileName, null,
> > > // remove file system entry
> > > function(entry) {
> > > entry.remove(callback, function() {
> > > console.log('[ERROR] deleteFile cleanup method invoked fail
> callback.');
> > });
> > > @@ -59,7 +59,7 @@ describe('File API', function() {
> > > // deletes and re-creates the specified directory
> > > var createDirectory = function(dirName, success, error) {
> > > deleteEntry(dirName, function() {
> > > - root.getDirectory(dirName, {create: true}, success, error);
> > > + root.getDirectory(dirName, {create: true}, success, error);
> > > }, error);
> > > };
> > >
> > > @@ -111,7 +111,7 @@ describe('File API', function() {
> > > expect(fileSystem.root).toBeDefined();
> > > }),
> > > fail = createFail('window.requestFileSystem');
> > > -
> > > +
> > > // retrieve PERSISTENT file system
> > > runs(function() {
> > >
> window.requestFileSystem(LocalFileSystem.PERSISTENT,
> > > 0, win, fail);
> > > @@ -134,7 +134,7 @@ describe('File API', function() {
> > > fail = createFail('window.requestFileSystem');
> > >
> > > // Request the file system
> > > - runs(function() {
> > > + runs(function() {
> > > window.requestFileSystem(LocalFileSystem.TEMPORARY,
> > 0,
> > > win, fail);
> > > });
> > >
> > > @@ -206,7 +206,7 @@ describe('File API', function() {
> > > });
> > >
> > > waitsFor(function() { return win.wasCalled; },
> > > "resolveLocalFileSystemURI callback never called", Tests.TEST_TIMEOUT);
> > > -
> > > +
> > > runs(function() {
> > > expect(win).toHaveBeenCalled();
> > > expect(fail).not.toHaveBeenCalled();
> > > @@ -237,13 +237,13 @@ describe('File API', function() {
> > > });
> > >
> > > waitsFor(function() { return win.wasCalled; },
> > > "resolveLocalFileSystemURI callback never called", Tests.TEST_TIMEOUT);
> > > -
> > > +
> > > runs(function() {
> > > expect(win).toHaveBeenCalled();
> > > expect(fail).not.toHaveBeenCalled();
> > > });
> > > });
> > > -
> > > +
> > > // create a new file entry
> > > runs(function() {
> > > createFile(fileName, resolveCallback, fail);
> > > @@ -251,13 +251,13 @@ describe('File API', function() {
> > >
> > > waitsFor(function() { return resolveCallback.wasCalled;
> > },
> > > "createFile callback never called", Tests.TEST_TIMEOUT);
> > > });
> > > - it("should error out when resolving invalid file name",
> > > function() {
> > > + it("should error (NOT_FOUND_ERR) when resolving
> > > (non-existent) invalid file name", function() {
> > > var fail =
> > jasmine.createSpy().andCallFake(function(error)
> > > {
> > > expect(error).toBeDefined();
> > >
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > > }),
> > > win = createWin('window.resolveLocalFileSystemURI');
> > > -
> > > +
> > > // lookup file system entry
> > > runs(function() {
> > >
> > >
> window.resolveLocalFileSystemURI("file:///this.is.not.a.valid.file.txt",
> > > win, fail);
> > > @@ -270,10 +270,10 @@ describe('File API', function() {
> > > expect(win).not.toHaveBeenCalled();
> > > });
> > > });
> > > - it("resolve invalid URL", function() {
> > > + it("should error (NOT_FOUND_ERR) when resolving
> > > (non-existent) invalid URL", function() {
> > > var fail =
> > jasmine.createSpy().andCallFake(function(error)
> > > {
> > > expect(error).toBeDefined();
> > > -
> expect(error).toBeFileError(FileError.ENCODING_ERR);
> > > +
> > expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > > }),
> > > win = createWin('window.resolveLocalFileSystemURI');
> > >
> > > @@ -331,7 +331,7 @@ describe('File API', function() {
> > > expect(entry.removeRecursively).toBeDefined();
> > > }),
> > > fail = createFail('FileSystem');
> > > -
> > > +
> > > runs(function() {
> > > window.resolveLocalFileSystemURI(root.toURL(), win,
> > fail);
> > > });
> > > @@ -357,7 +357,7 @@ describe('File API', function() {
> > >
> > > // create:false, exclusive:false, file does not exist
> > > runs(function() {
> > > - root.getFile(fileName, {create:false}, win, fail);
> > > + root.getFile(fileName, {create:false}, win, fail);
> > > });
> > >
> > > waitsFor(function() { return fail.wasCalled; }, "error
> > > callback never called", Tests.TEST_TIMEOUT);
> > > @@ -380,10 +380,10 @@ describe('File API', function() {
> > > entry.remove(null, null);
> > > }),
> > > fail = createFail('DirectoryEntry');
> > > -
> > > +
> > > // create:true, exclusive:false, file does not exist
> > > runs(function() {
> > > - root.getFile(fileName, {create: true}, win, fail);
> > > + root.getFile(fileName, {create: true}, win, fail);
> > > });
> > >
> > > waitsFor(function() { return win.wasCalled; }, "success
> > > callback never called", Tests.TEST_TIMEOUT);
> > > @@ -402,7 +402,7 @@ describe('File API', function() {
> > > expect(entry.isDirectory).toBe(false);
> > > expect(entry.name).toBe(fileName);
> > > expect(entry.fullPath).toBe(filePath);
> > > -
> > > +
> > > // cleanup
> > > entry.remove(null, null);
> > > }),
> > > @@ -443,7 +443,7 @@ describe('File API', function() {
> > > expect(entry.isDirectory).toBe(false);
> > > expect(entry.name).toBe(fileName);
> > > expect(entry.fullPath).toBe(filePath);
> > > -
> > > +
> > > // cleanup
> > > entry.remove(null, fail);
> > > });
> > > @@ -475,12 +475,12 @@ describe('File API', function() {
> > > fail = jasmine.createSpy().andCallFake(function(error)
> {
> > > expect(error).toBeDefined();
> > >
> > expect(error).toBeFileError(FileError.PATH_EXISTS_ERR);
> > > -
> > > +
> > > // cleanup
> > > existingFile.remove(null, fail);
> > > }),
> > > win = createWin('DirectoryEntry');
> > > -
> > > +
> > > // create file to kick off it
> > > runs(function() {
> > > root.getFile(fileName, {create:true}, getFile, fail);
> > > @@ -497,7 +497,7 @@ describe('File API', function() {
> > > expect(entry.isDirectory).toBe(false);
> > > expect(entry.name).toBe(fileName);
> > > expect(entry.fullPath).toBe(filePath);
> > > -
> > > +
> > > entry.remove(null, fail); //clean up
> > > }),
> > > fail = createFail('DirectoryEntry'),
> > > @@ -514,7 +514,7 @@ describe('File API', function() {
> > > expect(fail).not.toHaveBeenCalled();
> > > });
> > > });
> > > -
> > > +
> > > // create file to kick off it
> > > runs(function() {
> > > root.getFile(fileName, {create:true}, getFile, fail);
> > > @@ -529,7 +529,7 @@ describe('File API', function() {
> > >
> expect(error).toBeFileError(FileError.ENCODING_ERR);
> > > }),
> > > win = createWin('DirectoryEntry');
> > > -
> > > +
> > > // create:false, exclusive:false, invalid path
> > > runs(function() {
> > > root.getFile(fileName, {create:false}, win, fail);
> > > @@ -551,7 +551,7 @@ describe('File API', function() {
> > >
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > > }),
> > > win = createWin('DirectoryEntry');
> > > -
> > > +
> > > // create:false, exclusive:false, directory does not exist
> > > runs(function() {
> > > root.getDirectory(dirName, {create:false}, win, fail);
> > > @@ -580,19 +580,19 @@ describe('File API', function() {
> > > expect(win).toHaveBeenCalled();
> > > expect(fail).not.toHaveBeenCalled();
> > > });
> > > -
> > > +
> > > }), win =
> > > jasmine.createSpy().andCallFake(function(directory) {
> > > expect(directory).toBeDefined();
> > > expect(directory.isFile).toBe(false);
> > > expect(directory.isDirectory).toBe(true);
> > > expect(directory.name).toBe(dirName);
> > > expect(directory.fullPath).toBe(dirPath);
> > > -
> > > +
> > > // cleanup
> > > directory.remove(null, fail);
> > > }),
> > > fail = createFail('DirectoryEntry');
> > > -
> > > +
> > > // create:true, exclusive:false, directory does not exist
> > > runs(function() {
> > > root.getDirectory(dirName, {create: true}, getDir,
> fail);
> > > @@ -627,7 +627,7 @@ describe('File API', function() {
> > > directory.remove(null, fail);
> > > }),
> > > fail = createFail('DirectoryEntry');
> > > -
> > > +
> > > // create:true, exclusive:false, directory does not exist
> > > runs(function() {
> > > root.getDirectory(dirName, {create: true}, getDir,
> fail);
> > > @@ -645,15 +645,15 @@ describe('File API', function() {
> > > expect(directory.isDirectory).toBe(true);
> > > expect(directory.name).toBe(dirName);
> > > expect(directory.fullPath).toBe(dirPath);
> > > -
> > > +
> > > // cleanup
> > > directory.remove(null, fail);
> > > }),
> > > fail = createFail('DirectoryEntry');
> > > -
> > > +
> > > // create:true, exclusive:false, directory does not exist
> > > runs(function() {
> > > - root.getDirectory(dirName, {create: true}, win, fail);
> > > + root.getDirectory(dirName, {create: true}, win, fail);
> > > });
> > >
> > > waitsFor(function() { return win.wasCalled; }, "win never
> > > called", Tests.TEST_TIMEOUT);
> > > @@ -663,7 +663,7 @@ describe('File API', function() {
> > > expect(fail).not.toHaveBeenCalled();
> > > });
> > > });
> > > -
> > > +
> > > it("DirectoryEntry.getDirectory: create new directory
> > > (exclusive)", function() {
> > > var dirName = "de.create.exclusive.dir",
> > > dirPath = root.fullPath + '/' + dirName,
> > > @@ -673,14 +673,14 @@ describe('File API', function() {
> > > expect(directory.isDirectory).toBe(true);
> > > expect(directory.name).toBe(dirName);
> > > expect(directory.fullPath).toBe(dirPath);
> > > -
> > > +
> > > // cleanup
> > > directory.remove(null, fail);
> > > }),
> > > fail = createFail('DirectoryEntry');
> > > // create:true, exclusive:true, directory does not exist
> > > runs(function() {
> > > - root.getDirectory(dirName, {create: true,
> > > exclusive:true}, win, fail);
> > > + root.getDirectory(dirName, {create: true,
> > > exclusive:true}, win, fail);
> > > });
> > >
> > > waitsFor(function() { return win.wasCalled; }, "win never
> > > called", Tests.TEST_TIMEOUT);
> > > @@ -712,15 +712,15 @@ describe('File API', function() {
> > > expect(directory.isDirectory).toBe(true);
> > > expect(directory.name).toBe(dirName);
> > > expect(directory.fullPath).toBe(dirPath);
> > > -
> > > +
> > > // cleanup
> > > directory.remove(null, fail);
> > > }),
> > > fail = createFail('DirectoryEntry');
> > > -
> > > +
> > > // create directory to kick off it
> > > runs(function() {
> > > - root.getDirectory(dirName, {create:true}, getDir,
> > > this.fail);
> > > + root.getDirectory(dirName, {create:true}, getDir,
> > > this.fail);
> > > });
> > >
> > > waitsFor(function() { return getDir.wasCalled; }, "getDir
> > > never called", Tests.TEST_TIMEOUT);
> > > @@ -746,17 +746,17 @@ describe('File API', function() {
> > > fail = jasmine.createSpy().andCallFake(function(error)
> {
> > > expect(error).toBeDefined();
> > >
> > expect(error).toBeFileError(FileError.PATH_EXISTS_ERR);
> > > -
> > > +
> > > // cleanup
> > > existingDir.remove(null, fail);
> > > }),
> > > win = createWin('DirectoryEntry');
> > > -
> > > +
> > > // create directory to kick off it
> > > runs(function() {
> > > root.getDirectory(dirName, {create:true}, getDir,
> fail);
> > > });
> > > -
> > > +
> > > waitsFor(function() { return getDir.wasCalled; }, "getDir
> > > never called", Tests.TEST_TIMEOUT);
> > > });
> > > it("DirectoryEntry.getDirectory: get Entry for existing
> > > directory", function() {
> > > @@ -780,14 +780,14 @@ describe('File API', function() {
> > > expect(directory.isFile).toBe(false);
> > > expect(directory.isDirectory).toBe(true);
> > > expect(directory.name).toBe(dirName);
> > > -
> > > +
> > > expect(directory.fullPath).toBe(dirPath);
> > > -
> > > +
> > > // cleanup
> > > directory.remove(null, fail);
> > > }),
> > > fail = createFail('DirectoryEntry');
> > > -
> > > +
> > > // create directory to kick off it
> > > root.getDirectory(dirName, {create:true}, getDir, fail);
> > > });
> > > @@ -798,10 +798,10 @@ describe('File API', function() {
> > >
> expect(error).toBeFileError(FileError.ENCODING_ERR);
> > > }),
> > > win = createWin('DirectoryEntry');
> > > -
> > > +
> > > // create:false, exclusive:false, invalid path
> > > runs(function() {
> > > - root.getDirectory(dirName, {create:false}, win, fail);
> > > + root.getDirectory(dirName, {create:false}, win, fail);
> > > });
> > >
> > > waitsFor(function() { return fail.wasCalled; }, "fail never
> > > called", Tests.TEST_TIMEOUT);
> > > @@ -832,12 +832,12 @@ describe('File API', function() {
> > > fail = jasmine.createSpy().andCallFake(function(error)
> {
> > > expect(error).toBeDefined();
> > >
> > > expect(error).toBeFileError(FileError.TYPE_MISMATCH_ERR);
> > > -
> > > +
> > > // cleanup
> > > existingFile.remove(null, null);
> > > }),
> > > win = createWin('DirectoryEntry');
> > > -
> > > +
> > > // create file to kick off it
> > > runs(function() {
> > > root.getFile(fileName, {create:true}, getDir, fail);
> > > @@ -866,12 +866,12 @@ describe('File API', function() {
> > > fail = jasmine.createSpy().andCallFake(function(error)
> {
> > > expect(error).toBeDefined();
> > >
> > > expect(error).toBeFileError(FileError.TYPE_MISMATCH_ERR);
> > > -
> > > +
> > > // cleanup
> > > existingDir.remove(null, null);
> > > }),
> > > win = createWin('DirectoryEntry');
> > > -
> > > +
> > > // create directory to kick off it
> > > runs(function() {
> > > root.getDirectory(dirName, {create:true}, getFile,
> fail);
> > > @@ -929,7 +929,7 @@ describe('File API', function() {
> > > waitsFor(function() { return entryCallback.wasCalled; },
> > > "entryCallback never called", Tests.TEST_TIMEOUT);
> > > });
> > > it("createReader: create reader on existing directory",
> > function()
> > > {
> > > - // create reader for root directory
> > > + // create reader for root directory
> > > var reader = root.createReader();
> > > expect(reader).toBeDefined();
> > > expect(typeof reader.readEntries).toBe('function');
> > > @@ -964,8 +964,8 @@ describe('File API', function() {
> > > expect(entries instanceof Array).toBe(true);
> > > }),
> > > fail = createFail('DirectoryReader');
> > > -
> > > - // create reader for root directory
> > > +
> > > + // create reader for root directory
> > > reader = root.createReader();
> > > // read entries
> > > runs(function() {
> > > @@ -986,7 +986,7 @@ describe('File API', function() {
> > > // read entries
> > > var readEntries =
> > > jasmine.createSpy().andCallFake(function() {
> > > var reader = directory.createReader();
> > > -
> > > +
> > > runs(function() {
> > > reader.readEntries(win, itReader);
> > > });
> > > @@ -1055,12 +1055,12 @@ describe('File API', function() {
> > > expect(fileEntry).toBeDefined();
> > > expect(typeof
> > fileEntry.createWriter).toBe('function');
> > > expect(typeof fileEntry.file).toBe('function');
> > > -
> > > - // cleanup
> > > +
> > > + // cleanup
> > > fileEntry.remove(null, fail);
> > > }),
> > > fail = createFail('FileEntry');
> > > -
> > > +
> > > // create a new file entry to kick off it
> > > runs(function() {
> > > root.getFile(fileName, {create:true}, itFileEntry,
> fail);
> > > @@ -1093,12 +1093,12 @@ describe('File API', function() {
> > > itWriter =
> > > jasmine.createSpy().andCallFake(function(writer) {
> > > expect(writer).toBeDefined();
> > > expect(writer instanceof FileWriter).toBe(true);
> > > -
> > > - // cleanup
> > > +
> > > + // cleanup
> > > itFile.remove(null, fail);
> > > }),
> > > fail = createFail('FileEntry');
> > > -
> > > +
> > > // create a new file entry to kick off it
> > > runs(function() {
> > > root.getFile(fileName, {create:true}, entryCallback,
> > fail);
> > > @@ -1111,7 +1111,7 @@ describe('File API', function() {
> > > newFile,
> > > entryCallback =
> > > jasmine.createSpy().andCallFake(function(fileEntry) {
> > > newFile = fileEntry;
> > > -
> > > +
> > > runs(function() {
> > > fileEntry.file(itFile, fail);
> > > });
> > > @@ -1126,12 +1126,12 @@ describe('File API', function() {
> > > itFile =
> jasmine.createSpy().andCallFake(function(file) {
> > > expect(file).toBeDefined();
> > > expect(file instanceof File).toBe(true);
> > > -
> > > - // cleanup
> > > +
> > > + // cleanup
> > > newFile.remove(null, fail);
> > > }),
> > > fail = createFail('FileEntry');
> > > -
> > > +
> > > // create a new file entry to kick off it
> > > runs(function() {
> > > root.getFile(fileName, {create:true}, entryCallback,
> > fail);
> > > @@ -1168,7 +1168,7 @@ describe('File API', function() {
> > > }),
> > > fail = createFail('FileEntry'),
> > > win = createWin('FileEntry');
> > > -
> > > +
> > > // create a new file entry to kick off it
> > > runs(function() {
> > > root.getFile(fileName, {create:true}, entryCallback,
> > fail);
> > > @@ -1236,7 +1236,7 @@ describe('File API', function() {
> > > // cleanup
> > > deleteEntry(fileName);
> > > });
> > > -
> > > +
> > > // create a new file entry
> > > createFile(fileName, entryCallback, fail);
> > > });
> > > @@ -1262,7 +1262,7 @@ describe('File API', function() {
> > > // cleanup
> > > deleteEntry(dirName);
> > > });
> > > -
> > > +
> > > // create a new directory entry
> > > runs(function() {
> > > createDirectory(dirName, entryCallback, fail);
> > > @@ -1293,7 +1293,7 @@ describe('File API', function() {
> > > // cleanup
> > > deleteEntry(fileName);
> > > });
> > > -
> > > +
> > > // create a new file entry
> > > runs(function() {
> > > createFile(fileName, entryCallback, fail);
> > > @@ -1364,7 +1364,7 @@ describe('File API', function() {
> > > deleteEntry(fileName);
> > > }),
> > > fail = createFail('Entry');
> > > -
> > > +
> > > // create a new file entry
> > > runs(function() {
> > > createFile(fileName, itURL, fail);
> > > @@ -1421,7 +1421,7 @@ describe('File API', function() {
> > > });
> > > });
> > > expect(entry).toBeDefined();
> > > -
> > > +
> > > runs(function() {
> > > entry.remove(checkRemove, fail);
> > > });
> > > @@ -1435,7 +1435,7 @@ describe('File API', function() {
> > > deleteEntry(fileName);
> > > }),
> > > fail = createFail('Entry');
> > > -
> > > +
> > > // create a new file entry
> > > runs(function() {
> > > createFile(fileName, entryCallback, fail);
> > > @@ -1594,7 +1594,7 @@ describe('File API', function() {
> > > expect(entry2.isDirectory).toBe(false);
> > > expect(entry2.fullPath).toBe(fullPath);
> > > expect(entry2.name).toBe(file2);
> > > -
> > > +
> > > // cleanup
> > > deleteEntry(file1);
> > > deleteEntry(file2);
> > > @@ -1669,7 +1669,7 @@ describe('File API', function() {
> > > expect(directory.isDirectory).toBe(true);
> > > expect(directory.fullPath).toBe(dstPath);
> > > expect(directory.name).toBe(dstDir);
> > > -
> > > +
> > > runs(function() {
> > > root.getDirectory(dstDir, {create:false},
> > > itDirExists, fail);
> > > });
> > > @@ -1682,7 +1682,7 @@ describe('File API', function() {
> > > expect(dirEntry.isDirectory).toBe(true);
> > > expect(dirEntry.fullPath).toBe(dstPath);
> > > expect(dirEntry.name).toBe(dstDir);
> > > -
> > > +
> > > runs(function() {
> > > dirEntry.getFile(file1, {create:false},
> > > itFileExists, fail);
> > > });
> > > @@ -1735,7 +1735,7 @@ describe('File API', function() {
> > > expect(directory.isDirectory).toBe(true);
> > > expect(directory.fullPath).toBe(dstPath);
> > > expect(directory.name).toBe(dstDir);
> > > -
> > > +
> > > root.getDirectory(dstDir, {create:false},
> > itDirExists,
> > > fail);
> > > },
> > > itDirExists = function(dirEntry) {
> > > @@ -1744,7 +1744,7 @@ describe('File API', function() {
> > > expect(dirEntry.isDirectory).toBe(true);
> > > expect(dirEntry.fullPath).toBe(dstPath);
> > > expect(dirEntry.name).toBe(dstDir);
> > > -
> > > +
> > > dirEntry.getFile(file1, {create:false},
> > itFileExists,
> > > fail);
> > > },
> > > itFileExists =
> > > jasmine.createSpy().andCallFake(function(fileEntry) {
> > > @@ -1784,7 +1784,7 @@ describe('File API', function() {
> > > var copyDir =
> > > jasmine.createSpy().andCallFake(function(fileEntry) {
> > > // copy srcDir onto itself
> > > runs(function() {
> > > - directory.copyTo(root, null, win, itCopy);
> > > + directory.copyTo(root, null, win, itCopy);
> > > });
> > >
> > > waitsFor(function() { return itCopy.wasCalled;
> },
> > > "itCopy never called", Tests.TEST_TIMEOUT);
> > > @@ -1799,8 +1799,8 @@ describe('File API', function() {
> > > itCopy =
> jasmine.createSpy().andCallFake(function(error)
> > {
> > > expect(error).toBeDefined();
> > >
> > > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
> > > -
> > > - runs(function() {
> > > +
> > > + runs(function() {
> > > root.getDirectory(srcDir, {create:false},
> > > itDirectoryExists, fail);
> > > });
> > >
> > > @@ -1810,7 +1810,7 @@ describe('File API', function() {
> > > // returning confirms existence so just check
> > fullPath
> > > entry
> > > expect(dirEntry).toBeDefined();
> > > expect(dirEntry.fullPath).toBe(srcPath);
> > > -
> > > +
> > > runs(function() {
> > > dirEntry.getFile(file1, {create:false},
> > > itFileExists, fail);
> > > });
> > > @@ -1826,7 +1826,7 @@ describe('File API', function() {
> > > itFileExists =
> > > jasmine.createSpy().andCallFake(function(fileEntry) {
> > > expect(fileEntry).toBeDefined();
> > > expect(fileEntry.fullPath).toBe(filePath);
> > > -
> > > +
> > > // cleanup
> > > deleteEntry(srcDir);
> > > });
> > > @@ -1855,7 +1855,7 @@ describe('File API', function() {
> > > itCopy =
> jasmine.createSpy().andCallFake(function(error)
> > {
> > > expect(error).toBeDefined();
> > >
> > > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
> > > -
> > > +
> > > runs(function() {
> > > root.getDirectory(srcDir, {create:false},
> > > itDirectoryExists, fail);
> > > });
> > > @@ -1885,7 +1885,7 @@ describe('File API', function() {
> > > waitsFor(function() { return entryCallback.wasCalled; },
> > > "entryCallback never called", Tests.TEST_TIMEOUT);
> > > });
> > > it("copyTo: directory that does not exist", function() {
> > > - var file1 = "entry.copy.dnf.file1",
> > > + var file1 = "entry.copy.dnf.file1",
> > > dstDir = "entry.copy.dnf.dstDir",
> > > filePath = root.fullPath + '/' + file1,
> > > dstPath = root.fullPath + '/' + dstDir,
> > > @@ -1987,7 +1987,7 @@ describe('File API', function() {
> > > expect(entry.isDirectory).toBe(false);
> > > expect(entry.fullPath).toBe(dstPath);
> > > expect(entry.name).toBe(file2);
> > > -
> > > +
> > > runs(function() {
> > > root.getFile(file2, {create:false},
> > itMovedExists,
> > > fail);
> > > });
> > > @@ -1997,7 +1997,7 @@ describe('File API', function() {
> > > itMovedExists =
> > > jasmine.createSpy().andCallFake(function(fileEntry) {
> > > expect(fileEntry).toBeDefined();
> > > expect(fileEntry.fullPath).toBe(dstPath);
> > > -
> > > +
> > > runs(function() {
> > > root.getFile(file1, {create:false}, win,
> itOrig);
> > > });
> > > @@ -2014,7 +2014,7 @@ describe('File API', function() {
> > > //expect(navigator.fileMgr.itFileExists(srcPath)
> ===
> > > false, "original file should not exist.");
> > > expect(error).toBeDefined();
> > >
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > > -
> > > +
> > > // cleanup
> > > deleteEntry(file1);
> > > deleteEntry(file2);
> > > @@ -2057,7 +2057,7 @@ describe('File API', function() {
> > >
> > > waitsFor(function() { return itMove.wasCalled;
> },
> > > "itMove never called", Tests.TEST_TIMEOUT);
> > > });
> > > -
> > > +
> > > // create a parent directory to move file to
> > > runs(function() {
> > > root.getDirectory(dir, {create: true},
> moveFile,
> > > fail);
> > > @@ -2068,7 +2068,7 @@ describe('File API', function() {
> > > itMovedExists =
> > > jasmine.createSpy().andCallFake(function(fileEntry) {
> > > expect(fileEntry).toBeDefined();
> > > expect(fileEntry.fullPath).toBe(dstPath);
> > > -
> > > +
> > > runs(function() {
> > > root.getFile(file1, {create:false}, win,
> itOrig);
> > > });
> > > @@ -2084,7 +2084,7 @@ describe('File API', function() {
> > > itOrig =
> jasmine.createSpy().andCallFake(function(error)
> > {
> > > expect(error).toBeDefined();
> > >
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > > -
> > > +
> > > // cleanup
> > > deleteEntry(file1);
> > > deleteEntry(dir);
> > > @@ -2131,7 +2131,7 @@ describe('File API', function() {
> > > expect(directory.fullPath).toBe(dstPath);
> > > expect(directory.name).toBe(dstDir);
> > > // it that moved file exists in destination dir
> > > -
> > > +
> > > runs(function() {
> > > directory.getFile(file1, {create:false},
> > > itMovedExists, fail);
> > > });
> > > @@ -2158,7 +2158,7 @@ describe('File API', function() {
> > > itOrig =
> jasmine.createSpy().andCallFake(function(error)
> > {
> > > expect(error).toBeDefined();
> > >
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > > -
> > > +
> > > // cleanup
> > > deleteEntry(srcDir);
> > > deleteEntry(dstDir);
> > > @@ -2231,7 +2231,7 @@ describe('File API', function() {
> > > itOrig =
> jasmine.createSpy().andCallFake(function(error)
> > {
> > > expect(error).toBeDefined();
> > >
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > > -
> > > +
> > > // cleanup
> > > deleteEntry(srcDir);
> > > deleteEntry(dstDir);
> > > @@ -2304,7 +2304,7 @@ describe('File API', function() {
> > > itOrig =
> jasmine.createSpy().andCallFake(function(error)
> > {
> > > expect(error).toBeDefined();
> > >
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > > -
> > > +
> > > // cleanup
> > > deleteEntry(srcDir);
> > > deleteEntry(dstDir);
> > > @@ -2346,7 +2346,7 @@ describe('File API', function() {
> > > itMove =
> jasmine.createSpy().andCallFake(function(error)
> > {
> > > expect(error).toBeDefined();
> > >
> > > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
> > > -
> > > +
> > > // it that original dir still exists
> > > runs(function() {
> > > root.getDirectory(srcDir, {create:false},
> > > itDirectoryExists, fail);
> > > @@ -2358,7 +2358,7 @@ describe('File API', function() {
> > > // returning confirms existence so just check
> > fullPath
> > > entry
> > > expect(dirEntry).toBeDefined();
> > > expect(dirEntry.fullPath).toBe(srcPath);
> > > -
> > > +
> > > runs(function() {
> > > dirEntry.getFile(file1, {create:false},
> > > itFileExists, fail);
> > > });
> > > @@ -2374,7 +2374,7 @@ describe('File API', function() {
> > > itFileExists =
> > > jasmine.createSpy().andCallFake(function(fileEntry) {
> > > expect(fileEntry).toBeDefined();
> > > expect(fileEntry.fullPath).toBe(filePath);
> > > -
> > > +
> > > // cleanup
> > > deleteEntry(srcDir);
> > > });
> > > @@ -2419,7 +2419,7 @@ describe('File API', function() {
> > > itDirectoryExists =
> > > jasmine.createSpy().andCallFake(function(entry) {
> > > expect(entry).toBeDefined();
> > > expect(entry.fullPath).toBe(srcPath);
> > > -
> > > +
> > > // cleanup
> > > deleteEntry(srcDir);
> > > });
> > > @@ -2447,7 +2447,7 @@ describe('File API', function() {
> > > itMove =
> jasmine.createSpy().andCallFake(function(error)
> > {
> > > expect(error).toBeDefined();
> > >
> > > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
> > > -
> > > +
> > > //it that original file still exists
> > > runs(function() {
> > > root.getFile(file1, {create:false},
> itFileExists,
> > > fail);
> > > @@ -2464,7 +2464,7 @@ describe('File API', function() {
> > > itFileExists =
> > > jasmine.createSpy().andCallFake(function(fileEntry) {
> > > expect(fileEntry).toBeDefined();
> > > expect(fileEntry.fullPath).toBe(filePath);
> > > -
> > > +
> > > // cleanup
> > > deleteEntry(file1);
> > > });
> > > @@ -2496,10 +2496,10 @@ describe('File API', function() {
> > > // move file1 onto sub-directory
> > > entry.moveTo(directory, subDir, win,
> itMove);
> > > };
> > > - // create sub-directory
> > > + // create sub-directory
> > > directory.getDirectory(subDir, {create: true},
> > > moveFile, fail);
> > > };
> > > - // create top level directory
> > > + // create top level directory
> > > root.getDirectory(dstDir, {create: true},
> > > createSubDirectory, fail);
> > > },
> > > itDirectoryExists = function(dirEntry) {
> > > @@ -2526,7 +2526,7 @@ describe('File API', function() {
> > > });
> > >
> > > waitsFor(function() { return itFileExists.wasCalled; },
> > > "itFileExists never called", Tests.TEST_TIMEOUT);
> > > -
> > > +
> > > runs(function() {
> > > expect(itFileExists).toHaveBeenCalled();
> > > expect(win).not.toHaveBeenCalled();
> > > @@ -2564,7 +2564,7 @@ describe('File API', function() {
> > > itFileExists =
> > > jasmine.createSpy().andCallFake(function(fileEntry) {
> > > expect(fileEntry).toBeDefined();
> > > expect(fileEntry.fullPath).toBe(filePath);
> > > -
> > > +
> > > // cleanup
> > > deleteEntry(file1);
> > > deleteEntry(srcDir);
> > > @@ -2614,7 +2614,7 @@ describe('File API', function() {
> > > itFileExists =
> > > jasmine.createSpy().andCallFake(function(fileEntry) {
> > > expect(fileEntry).toBeDefined();
> > > expect(fileEntry.fullPath).toBe(filePath);
> > > -
> > > +
> > > // cleanup
> > > deleteEntry(file1);
> > > deleteEntry(srcDir);
> > > @@ -2650,14 +2650,14 @@ describe('File API', function() {
> > > var itMove = function(error) {
> > > expect(error).toBeDefined();
> > >
> > > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
> > > -
> > > +
> > > // it that destination directory still
> exists
> > > directory.getDirectory(subDir,
> > {create:false},
> > > itDirectoryExists, fail);
> > > };
> > > - // create sub-directory
> > > + // create sub-directory
> > > directory.getDirectory(subDir, {create: true},
> > > moveDir, fail);
> > > };
> > > - // create top level directory
> > > + // create top level directory
> > > root.getDirectory(dstDir, {create: true},
> > > createSubDirectory, fail);
> > > },
> > > itDirectoryExists = function(dirEntry) {
> > > @@ -2712,7 +2712,7 @@ describe('File API', function() {
> > > expect(entry.isDirectory).toBe(false);
> > > expect(entry.fullPath).toBe(file2Path);
> > > expect(entry.name).toBe(file2);
> > > -
> > > +
> > > // it that old file does not exists
> > > root.getFile(file1, {create:false}, win,
> > itFileMoved);
> > > },
> > > @@ -2725,7 +2725,7 @@ describe('File API', function() {
> > > itFileExists =
> > > jasmine.createSpy().andCallFake(function(fileEntry) {
> > > expect(fileEntry).toBeDefined();
> > > expect(fileEntry.fullPath).toBe(file2Path);
> > > -
> > > +
> > > // cleanup
> > > deleteEntry(file1);
> > > deleteEntry(file2);
> > > @@ -2777,14 +2777,14 @@ describe('File API', function() {
> > > itFileExists = function(fileEntry) {
> > > expect(fileEntry).toBeDefined();
> > > expect(fileEntry.fullPath).toBe(filePath);
> > > -
> > > +
> > > // check that old directory no longer exists
> > > root.getDirectory(srcDir, {create:false}, win,
> > > itRemoved);
> > > },
> > > itRemoved =
> > > jasmine.createSpy().andCallFake(function(error){
> > > expect(error).toBeDefined();
> > >
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > > -
> > > +
> > > // cleanup
> > > deleteEntry(srcDir);
> > > deleteEntry(dstDir);
> > > @@ -2807,7 +2807,7 @@ describe('File API', function() {
> > > });
> > > });
> > > it("moveTo: directory that does not exist", function() {
> > > - var file1 = "entry.move.dnf.file1",
> > > + var file1 = "entry.move.dnf.file1",
> > > dstDir = "entry.move.dnf.dstDir",
> > > filePath = root.fullPath + '/' + file1,
> > > dstPath = root.fullPath + '/' + dstDir,
> > > @@ -2822,7 +2822,7 @@ describe('File API', function() {
> > > itMove =
> jasmine.createSpy().andCallFake(function(error)
> > {
> > > expect(error).toBeDefined();
> > >
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > > -
> > > +
> > > // cleanup
> > > deleteEntry(file1);
> > > });
> > > @@ -2912,10 +2912,10 @@ describe('File API', function() {
> > > reader.onloadend = verifier;
> > > var myFile = new File();
> > >
> > > - myFile.fullPath = filePath;
> > > + myFile.fullPath = filePath;
> > > reader.readAsText(myFile);
> > > };
> > > -
> > > +
> > > // create a file, write to it, and read it in again
> > > runs(function() {
> > > root.getFile(fileName, {create: true}, create_writer,
> > > fail);
> > > @@ -2944,10 +2944,10 @@ describe('File API', function() {
> > > var reader = new FileReader();
> > > reader.onloadend = verifier;
> > > var myFile = new File();
> > > - myFile.fullPath = filePath;
> > > + myFile.fullPath = filePath;
> > > reader.readAsText(myFile);
> > > };
> > > -
> > > +
> > > // create a file, write to it, and read it in again
> > > runs(function() {
> > > root.getFile(fileName, {create: true}, read_file,
> fail);
> > > @@ -2968,7 +2968,7 @@ describe('File API', function() {
> > > });
> > > reader.onerror = verifier;
> > > var myFile = new File();
> > > - myFile.fullPath = root.fullPath + '/' +
> "doesnotexist.err";
> > > + myFile.fullPath = root.fullPath + '/' +
> "doesnotexist.err";
> > >
> > > runs(function() {
> > > reader.readAsText(myFile);
> > > @@ -2993,7 +2993,7 @@ describe('File API', function() {
> > > },
> > > // writes file and reads it back in
> > > write_file = function(writer) {
> > > - writer.onwriteend = read_file;
> > > + writer.onwriteend = read_file;
> > > writer.write(rule);
> > > },
> > > verifier =
> jasmine.createSpy().andCallFake(function(evt)
> > {
> > > @@ -3005,10 +3005,10 @@ describe('File API', function() {
> > > var reader = new FileReader();
> > > reader.onloadend = verifier;
> > > var myFile = new File();
> > > - myFile.fullPath = filePath;
> > > + myFile.fullPath = filePath;
> > > reader.readAsDataURL(myFile);
> > > };
> > > -
> > > +
> > > // create a file, write to it, and read it in again
> > > runs(function() {
> > > root.getFile(fileName, {create: true}, create_writer,
> > > fail);
> > > @@ -3089,7 +3089,7 @@ describe('File API', function() {
> > > writer.write(rule);
> > > }, fail);
> > > };
> > > -
> > > +
> > > // create file, then write and append to it
> > > runs(function() {
> > > createFile(fileName, write_file);
> > > @@ -3120,7 +3120,7 @@ describe('File API', function() {
> > > theWriter.onwriteend = anotherVerifier;
> > > length += exception.length;
> > > theWriter.seek(theWriter.length);
> > > - theWriter.write(exception);
> > > + theWriter.write(exception);
> > > }),
> > > anotherVerifier =
> > > jasmine.createSpy().andCallFake(function(evt) {
> > > expect(theWriter.length).toBe(length);
> > > @@ -3135,7 +3135,7 @@ describe('File API', function() {
> > > theWriter.onwriteend = verifier;
> > > theWriter.write(rule);
> > > };
> > > -
> > > +
> > > // create file, then write and append to it
> > > runs(function() {
> > > var file = new File();
> > > @@ -3168,7 +3168,7 @@ describe('File API', function() {
> > > theWriter.onwriteend = anotherVerifier;
> > > length = 12 + exception.length;
> > > theWriter.seek(12);
> > > - theWriter.write(exception);
> > > + theWriter.write(exception);
> > > }),
> > > anotherVerifier =
> > > jasmine.createSpy().andCallFake(function(evt) {
> > > expect(theWriter.length).toBe(length);
> > > @@ -3185,7 +3185,7 @@ describe('File API', function() {
> > > theWriter.write(rule);
> > > }, fail);
> > > };
> > > -
> > > +
> > > // create file, then write and append to it
> > > runs(function() {
> > > createFile(fileName, write_file);
> > > @@ -3216,7 +3216,7 @@ describe('File API', function() {
> > > theWriter.onwriteend = anotherVerifier;
> > > length = 8 + exception.length;
> > > theWriter.seek(8);
> > > - theWriter.write(exception);
> > > + theWriter.write(exception);
> > > }),
> > > anotherVerifier =
> > > jasmine.createSpy().andCallFake(function(evt) {
> > > expect(theWriter.length).toBe(length);
> > > @@ -3233,7 +3233,7 @@ describe('File API', function() {
> > > theWriter.write(rule);
> > > }, fail);
> > > };
> > > -
> > > +
> > > // create file, then write and append to it
> > > runs(function() {
> > > createFile(fileName, write_file);
> > > @@ -3271,7 +3271,7 @@ describe('File API', function() {
> > > theWriter.write(rule);
> > > }, fail);
> > > };
> > > -
> > > +
> > > // creates file, then write XML data
> > > runs(function() {
> > > createFile(fileName, write_file);
> > > @@ -3305,10 +3305,10 @@ describe('File API', function() {
> > > fileEntry.createWriter(function(writer) {
> > > theWriter = writer;
> > > theWriter.onwriteend = verifier;
> > > - theWriter.write(rule);
> > > + theWriter.write(rule);
> > > }, fail);
> > > };
> > > -
> > > +
> > > // creates file, then write JSON content
> > > runs(function() {
> > > createFile(fileName, write_file);
> > > @@ -3341,7 +3341,7 @@ describe('File API', function() {
> > > // writes file and reads it back in
> > > write_file = function(writer) {
> > > theWriter = writer;
> > > - theWriter.onwriteend = read_file;
> > > + theWriter.onwriteend = read_file;
> > > theWriter.write(rule);
> > > },
> > > // reads file and compares content to what was written
> > > @@ -3395,7 +3395,7 @@ describe('File API', function() {
> > > theWriter.write(rule);
> > > }, fail);
> > > };
> > > -
> > > +
> > > // creates file, then write JSON content
> > > runs(function() {
> > > createFile(fileName, seek_file);
> > > @@ -3413,20 +3413,20 @@ describe('File API', function() {
> > > rule = "There is an exception to every rule. Except
> this
> > > one.",
> > > fail = createFail('FileWRiter'),
> > > theWriter,
> > > - // writes file content
> > > + // writes file content
> > > write_file = function(fileEntry) {
> > > fileEntry.createWriter(function(writer) {
> > > theWriter = writer;
> > > theWriter.onwriteend = function(evt) {
> > > truncate_file(theWriter);
> > > - };
> > > + };
> > > theWriter.write(rule);
> > > }, fail);
> > > },
> > > verifier =
> jasmine.createSpy().andCallFake(function(evt)
> > {
> > > expect(theWriter.length).toBe(36);
> > > expect(theWriter.position).toBe(36);
> > > -
> > > +
> > > // cleanup
> > > deleteFile(fileName);
> > > }),
> > >
> > >
> >
>
>
>
> --
> @purplecabbage
> risingj.com
>
Re: spec commit: described test condition, updated to test for NOT_FOUND_ERR
Posted by Jesse <pu...@gmail.com>.
I think the only person who knows the intent of the test case is whoever
wrote it.
I am sorry that a fix for WP7 has caused issues elsewhere, I will look for
another solution. Ultimately we need the docs to state what error codes
are returned in what situation, perhaps an example for each error code,
that would be aligned with the tests.
What exactly makes "/this.is.not.a.valid.url" an EncodingError?
On WP7 I am relying on the SDK to tell me if it is well formed :
if (!Uri.IsWellFormedUriString(fileOptions.Uri, UriKind.RelativeOrAbsolute))
{
DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR,
ENCODING_ERR));
return;
}
If indeed it is deemed that this is an EncodingError, do we even need to
call native to determine that?
On Tue, May 22, 2012 at 1:46 PM, Becky Gibson <gi...@gmail.com>wrote:
> Just tested mobile-spec on iOS and was surprised to find a failing file
> test.
>
> Curious why the error code was changed from ENCODING_ERR to NOT_FOUND_ERR?
> To me the description in the spec would indicate that an invalid URL
> would return ENCODING_ERR?
>
> from http://www.w3.org/TR/file-system-api/#definitions: EncodingErrorA
> path or URL supplied to the API was malformed.
> NotFoundErrorA required file or directory could not be found at the time an
> operation was processed.
> The test that was changed is: window.resolveLocalFileSystemURI(
> "/this.is.not.a.valid.url", win, fail); IMHO "/this.is.not.a.valid.url" is
> NOT a valid url according to
> http://www.w3.org/Addressing/URL/url-spec.txt so it seems appropriate
> to return an encodingError? This was discussed in
> https://issues.apache.org/jira/browse/CB-671 where folks suggested it IS a
> valid URL?
>
> If we decide this is the appropriate return value, I'll have to do a bit of
> work on the iOS code as it uses the NSURL URLWithString: and isFileURL:
> apis to determine if the input is a valid File URL or not. I'm not sure
> that appending "file://" to the input parameter is really the best
> solution......
>
> NSURL* testUri = [NSURL URLWithString:strUri];
> if (!testUri || ![testUri isFileURL])
>
> I'm also wondering if this is something we should be changing without some
> kind of warning to users. While most people may just check for an error,
> it seems a bit odd to change the actual error code being returned.
>
> -becky
>
>
> On Tue, May 8, 2012 at 8:17 PM, <pu...@apache.org> wrote:
>
> > Updated Branches:
> > refs/heads/master 35a3f3f4a -> c3225a50f
> >
> >
> > described test condition, updated to test for NOT_FOUND_ERR
> >
> >
> > Project:
> >
> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/repo
> > Commit:
> >
> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/commit/c3225a50
> > Tree:
> >
> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/c3225a50
> > Diff:
> >
> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/c3225a50
> >
> > Branch: refs/heads/master
> > Commit: c3225a50f48649bc66fd6c4e99b3e959d06a13b8
> > Parents: 35a3f3f
> > Author: Jesse MacFadyen <pu...@gmail.com>
> > Authored: Tue May 8 17:16:43 2012 -0700
> > Committer: Jesse MacFadyen <pu...@gmail.com>
> > Committed: Tue May 8 17:16:43 2012 -0700
> >
> > ----------------------------------------------------------------------
> > autotest/tests/file.tests.js | 272 ++++++++++++++++++------------------
> > 1 files changed, 136 insertions(+), 136 deletions(-)
> > ----------------------------------------------------------------------
> >
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/c3225a50/autotest/tests/file.tests.js
> > ----------------------------------------------------------------------
> > diff --git a/autotest/tests/file.tests.js b/autotest/tests/file.tests.js
> > index de37980..860a6c1 100644
> > --- a/autotest/tests/file.tests.js
> > +++ b/autotest/tests/file.tests.js
> > @@ -31,10 +31,10 @@ describe('File API', function() {
> > // deletes specified file or directory
> > var deleteEntry = function(name, success, error) {
> > // deletes entry, if it exists
> > - window.resolveLocalFileSystemURI(root.toURL() + '/' + name,
> > + window.resolveLocalFileSystemURI(root.toURL() + '/' + name,
> > function(entry) {
> > if (entry.isDirectory === true) {
> > - entry.removeRecursively(success, error);
> > + entry.removeRecursively(success, error);
> > } else {
> > entry.remove(success, error);
> > }
> > @@ -42,7 +42,7 @@ describe('File API', function() {
> > };
> > // deletes file, if it exists, then invokes callback
> > var deleteFile = function(fileName, callback) {
> > - root.getFile(fileName, null,
> > + root.getFile(fileName, null,
> > // remove file system entry
> > function(entry) {
> > entry.remove(callback, function() {
> > console.log('[ERROR] deleteFile cleanup method invoked fail callback.');
> });
> > @@ -59,7 +59,7 @@ describe('File API', function() {
> > // deletes and re-creates the specified directory
> > var createDirectory = function(dirName, success, error) {
> > deleteEntry(dirName, function() {
> > - root.getDirectory(dirName, {create: true}, success, error);
> > + root.getDirectory(dirName, {create: true}, success, error);
> > }, error);
> > };
> >
> > @@ -111,7 +111,7 @@ describe('File API', function() {
> > expect(fileSystem.root).toBeDefined();
> > }),
> > fail = createFail('window.requestFileSystem');
> > -
> > +
> > // retrieve PERSISTENT file system
> > runs(function() {
> > window.requestFileSystem(LocalFileSystem.PERSISTENT,
> > 0, win, fail);
> > @@ -134,7 +134,7 @@ describe('File API', function() {
> > fail = createFail('window.requestFileSystem');
> >
> > // Request the file system
> > - runs(function() {
> > + runs(function() {
> > window.requestFileSystem(LocalFileSystem.TEMPORARY,
> 0,
> > win, fail);
> > });
> >
> > @@ -206,7 +206,7 @@ describe('File API', function() {
> > });
> >
> > waitsFor(function() { return win.wasCalled; },
> > "resolveLocalFileSystemURI callback never called", Tests.TEST_TIMEOUT);
> > -
> > +
> > runs(function() {
> > expect(win).toHaveBeenCalled();
> > expect(fail).not.toHaveBeenCalled();
> > @@ -237,13 +237,13 @@ describe('File API', function() {
> > });
> >
> > waitsFor(function() { return win.wasCalled; },
> > "resolveLocalFileSystemURI callback never called", Tests.TEST_TIMEOUT);
> > -
> > +
> > runs(function() {
> > expect(win).toHaveBeenCalled();
> > expect(fail).not.toHaveBeenCalled();
> > });
> > });
> > -
> > +
> > // create a new file entry
> > runs(function() {
> > createFile(fileName, resolveCallback, fail);
> > @@ -251,13 +251,13 @@ describe('File API', function() {
> >
> > waitsFor(function() { return resolveCallback.wasCalled;
> },
> > "createFile callback never called", Tests.TEST_TIMEOUT);
> > });
> > - it("should error out when resolving invalid file name",
> > function() {
> > + it("should error (NOT_FOUND_ERR) when resolving
> > (non-existent) invalid file name", function() {
> > var fail =
> jasmine.createSpy().andCallFake(function(error)
> > {
> > expect(error).toBeDefined();
> > expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > }),
> > win = createWin('window.resolveLocalFileSystemURI');
> > -
> > +
> > // lookup file system entry
> > runs(function() {
> >
> > window.resolveLocalFileSystemURI("file:///this.is.not.a.valid.file.txt",
> > win, fail);
> > @@ -270,10 +270,10 @@ describe('File API', function() {
> > expect(win).not.toHaveBeenCalled();
> > });
> > });
> > - it("resolve invalid URL", function() {
> > + it("should error (NOT_FOUND_ERR) when resolving
> > (non-existent) invalid URL", function() {
> > var fail =
> jasmine.createSpy().andCallFake(function(error)
> > {
> > expect(error).toBeDefined();
> > - expect(error).toBeFileError(FileError.ENCODING_ERR);
> > +
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > }),
> > win = createWin('window.resolveLocalFileSystemURI');
> >
> > @@ -331,7 +331,7 @@ describe('File API', function() {
> > expect(entry.removeRecursively).toBeDefined();
> > }),
> > fail = createFail('FileSystem');
> > -
> > +
> > runs(function() {
> > window.resolveLocalFileSystemURI(root.toURL(), win,
> fail);
> > });
> > @@ -357,7 +357,7 @@ describe('File API', function() {
> >
> > // create:false, exclusive:false, file does not exist
> > runs(function() {
> > - root.getFile(fileName, {create:false}, win, fail);
> > + root.getFile(fileName, {create:false}, win, fail);
> > });
> >
> > waitsFor(function() { return fail.wasCalled; }, "error
> > callback never called", Tests.TEST_TIMEOUT);
> > @@ -380,10 +380,10 @@ describe('File API', function() {
> > entry.remove(null, null);
> > }),
> > fail = createFail('DirectoryEntry');
> > -
> > +
> > // create:true, exclusive:false, file does not exist
> > runs(function() {
> > - root.getFile(fileName, {create: true}, win, fail);
> > + root.getFile(fileName, {create: true}, win, fail);
> > });
> >
> > waitsFor(function() { return win.wasCalled; }, "success
> > callback never called", Tests.TEST_TIMEOUT);
> > @@ -402,7 +402,7 @@ describe('File API', function() {
> > expect(entry.isDirectory).toBe(false);
> > expect(entry.name).toBe(fileName);
> > expect(entry.fullPath).toBe(filePath);
> > -
> > +
> > // cleanup
> > entry.remove(null, null);
> > }),
> > @@ -443,7 +443,7 @@ describe('File API', function() {
> > expect(entry.isDirectory).toBe(false);
> > expect(entry.name).toBe(fileName);
> > expect(entry.fullPath).toBe(filePath);
> > -
> > +
> > // cleanup
> > entry.remove(null, fail);
> > });
> > @@ -475,12 +475,12 @@ describe('File API', function() {
> > fail = jasmine.createSpy().andCallFake(function(error) {
> > expect(error).toBeDefined();
> >
> expect(error).toBeFileError(FileError.PATH_EXISTS_ERR);
> > -
> > +
> > // cleanup
> > existingFile.remove(null, fail);
> > }),
> > win = createWin('DirectoryEntry');
> > -
> > +
> > // create file to kick off it
> > runs(function() {
> > root.getFile(fileName, {create:true}, getFile, fail);
> > @@ -497,7 +497,7 @@ describe('File API', function() {
> > expect(entry.isDirectory).toBe(false);
> > expect(entry.name).toBe(fileName);
> > expect(entry.fullPath).toBe(filePath);
> > -
> > +
> > entry.remove(null, fail); //clean up
> > }),
> > fail = createFail('DirectoryEntry'),
> > @@ -514,7 +514,7 @@ describe('File API', function() {
> > expect(fail).not.toHaveBeenCalled();
> > });
> > });
> > -
> > +
> > // create file to kick off it
> > runs(function() {
> > root.getFile(fileName, {create:true}, getFile, fail);
> > @@ -529,7 +529,7 @@ describe('File API', function() {
> > expect(error).toBeFileError(FileError.ENCODING_ERR);
> > }),
> > win = createWin('DirectoryEntry');
> > -
> > +
> > // create:false, exclusive:false, invalid path
> > runs(function() {
> > root.getFile(fileName, {create:false}, win, fail);
> > @@ -551,7 +551,7 @@ describe('File API', function() {
> > expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > }),
> > win = createWin('DirectoryEntry');
> > -
> > +
> > // create:false, exclusive:false, directory does not exist
> > runs(function() {
> > root.getDirectory(dirName, {create:false}, win, fail);
> > @@ -580,19 +580,19 @@ describe('File API', function() {
> > expect(win).toHaveBeenCalled();
> > expect(fail).not.toHaveBeenCalled();
> > });
> > -
> > +
> > }), win =
> > jasmine.createSpy().andCallFake(function(directory) {
> > expect(directory).toBeDefined();
> > expect(directory.isFile).toBe(false);
> > expect(directory.isDirectory).toBe(true);
> > expect(directory.name).toBe(dirName);
> > expect(directory.fullPath).toBe(dirPath);
> > -
> > +
> > // cleanup
> > directory.remove(null, fail);
> > }),
> > fail = createFail('DirectoryEntry');
> > -
> > +
> > // create:true, exclusive:false, directory does not exist
> > runs(function() {
> > root.getDirectory(dirName, {create: true}, getDir, fail);
> > @@ -627,7 +627,7 @@ describe('File API', function() {
> > directory.remove(null, fail);
> > }),
> > fail = createFail('DirectoryEntry');
> > -
> > +
> > // create:true, exclusive:false, directory does not exist
> > runs(function() {
> > root.getDirectory(dirName, {create: true}, getDir, fail);
> > @@ -645,15 +645,15 @@ describe('File API', function() {
> > expect(directory.isDirectory).toBe(true);
> > expect(directory.name).toBe(dirName);
> > expect(directory.fullPath).toBe(dirPath);
> > -
> > +
> > // cleanup
> > directory.remove(null, fail);
> > }),
> > fail = createFail('DirectoryEntry');
> > -
> > +
> > // create:true, exclusive:false, directory does not exist
> > runs(function() {
> > - root.getDirectory(dirName, {create: true}, win, fail);
> > + root.getDirectory(dirName, {create: true}, win, fail);
> > });
> >
> > waitsFor(function() { return win.wasCalled; }, "win never
> > called", Tests.TEST_TIMEOUT);
> > @@ -663,7 +663,7 @@ describe('File API', function() {
> > expect(fail).not.toHaveBeenCalled();
> > });
> > });
> > -
> > +
> > it("DirectoryEntry.getDirectory: create new directory
> > (exclusive)", function() {
> > var dirName = "de.create.exclusive.dir",
> > dirPath = root.fullPath + '/' + dirName,
> > @@ -673,14 +673,14 @@ describe('File API', function() {
> > expect(directory.isDirectory).toBe(true);
> > expect(directory.name).toBe(dirName);
> > expect(directory.fullPath).toBe(dirPath);
> > -
> > +
> > // cleanup
> > directory.remove(null, fail);
> > }),
> > fail = createFail('DirectoryEntry');
> > // create:true, exclusive:true, directory does not exist
> > runs(function() {
> > - root.getDirectory(dirName, {create: true,
> > exclusive:true}, win, fail);
> > + root.getDirectory(dirName, {create: true,
> > exclusive:true}, win, fail);
> > });
> >
> > waitsFor(function() { return win.wasCalled; }, "win never
> > called", Tests.TEST_TIMEOUT);
> > @@ -712,15 +712,15 @@ describe('File API', function() {
> > expect(directory.isDirectory).toBe(true);
> > expect(directory.name).toBe(dirName);
> > expect(directory.fullPath).toBe(dirPath);
> > -
> > +
> > // cleanup
> > directory.remove(null, fail);
> > }),
> > fail = createFail('DirectoryEntry');
> > -
> > +
> > // create directory to kick off it
> > runs(function() {
> > - root.getDirectory(dirName, {create:true}, getDir,
> > this.fail);
> > + root.getDirectory(dirName, {create:true}, getDir,
> > this.fail);
> > });
> >
> > waitsFor(function() { return getDir.wasCalled; }, "getDir
> > never called", Tests.TEST_TIMEOUT);
> > @@ -746,17 +746,17 @@ describe('File API', function() {
> > fail = jasmine.createSpy().andCallFake(function(error) {
> > expect(error).toBeDefined();
> >
> expect(error).toBeFileError(FileError.PATH_EXISTS_ERR);
> > -
> > +
> > // cleanup
> > existingDir.remove(null, fail);
> > }),
> > win = createWin('DirectoryEntry');
> > -
> > +
> > // create directory to kick off it
> > runs(function() {
> > root.getDirectory(dirName, {create:true}, getDir, fail);
> > });
> > -
> > +
> > waitsFor(function() { return getDir.wasCalled; }, "getDir
> > never called", Tests.TEST_TIMEOUT);
> > });
> > it("DirectoryEntry.getDirectory: get Entry for existing
> > directory", function() {
> > @@ -780,14 +780,14 @@ describe('File API', function() {
> > expect(directory.isFile).toBe(false);
> > expect(directory.isDirectory).toBe(true);
> > expect(directory.name).toBe(dirName);
> > -
> > +
> > expect(directory.fullPath).toBe(dirPath);
> > -
> > +
> > // cleanup
> > directory.remove(null, fail);
> > }),
> > fail = createFail('DirectoryEntry');
> > -
> > +
> > // create directory to kick off it
> > root.getDirectory(dirName, {create:true}, getDir, fail);
> > });
> > @@ -798,10 +798,10 @@ describe('File API', function() {
> > expect(error).toBeFileError(FileError.ENCODING_ERR);
> > }),
> > win = createWin('DirectoryEntry');
> > -
> > +
> > // create:false, exclusive:false, invalid path
> > runs(function() {
> > - root.getDirectory(dirName, {create:false}, win, fail);
> > + root.getDirectory(dirName, {create:false}, win, fail);
> > });
> >
> > waitsFor(function() { return fail.wasCalled; }, "fail never
> > called", Tests.TEST_TIMEOUT);
> > @@ -832,12 +832,12 @@ describe('File API', function() {
> > fail = jasmine.createSpy().andCallFake(function(error) {
> > expect(error).toBeDefined();
> >
> > expect(error).toBeFileError(FileError.TYPE_MISMATCH_ERR);
> > -
> > +
> > // cleanup
> > existingFile.remove(null, null);
> > }),
> > win = createWin('DirectoryEntry');
> > -
> > +
> > // create file to kick off it
> > runs(function() {
> > root.getFile(fileName, {create:true}, getDir, fail);
> > @@ -866,12 +866,12 @@ describe('File API', function() {
> > fail = jasmine.createSpy().andCallFake(function(error) {
> > expect(error).toBeDefined();
> >
> > expect(error).toBeFileError(FileError.TYPE_MISMATCH_ERR);
> > -
> > +
> > // cleanup
> > existingDir.remove(null, null);
> > }),
> > win = createWin('DirectoryEntry');
> > -
> > +
> > // create directory to kick off it
> > runs(function() {
> > root.getDirectory(dirName, {create:true}, getFile, fail);
> > @@ -929,7 +929,7 @@ describe('File API', function() {
> > waitsFor(function() { return entryCallback.wasCalled; },
> > "entryCallback never called", Tests.TEST_TIMEOUT);
> > });
> > it("createReader: create reader on existing directory",
> function()
> > {
> > - // create reader for root directory
> > + // create reader for root directory
> > var reader = root.createReader();
> > expect(reader).toBeDefined();
> > expect(typeof reader.readEntries).toBe('function');
> > @@ -964,8 +964,8 @@ describe('File API', function() {
> > expect(entries instanceof Array).toBe(true);
> > }),
> > fail = createFail('DirectoryReader');
> > -
> > - // create reader for root directory
> > +
> > + // create reader for root directory
> > reader = root.createReader();
> > // read entries
> > runs(function() {
> > @@ -986,7 +986,7 @@ describe('File API', function() {
> > // read entries
> > var readEntries =
> > jasmine.createSpy().andCallFake(function() {
> > var reader = directory.createReader();
> > -
> > +
> > runs(function() {
> > reader.readEntries(win, itReader);
> > });
> > @@ -1055,12 +1055,12 @@ describe('File API', function() {
> > expect(fileEntry).toBeDefined();
> > expect(typeof
> fileEntry.createWriter).toBe('function');
> > expect(typeof fileEntry.file).toBe('function');
> > -
> > - // cleanup
> > +
> > + // cleanup
> > fileEntry.remove(null, fail);
> > }),
> > fail = createFail('FileEntry');
> > -
> > +
> > // create a new file entry to kick off it
> > runs(function() {
> > root.getFile(fileName, {create:true}, itFileEntry, fail);
> > @@ -1093,12 +1093,12 @@ describe('File API', function() {
> > itWriter =
> > jasmine.createSpy().andCallFake(function(writer) {
> > expect(writer).toBeDefined();
> > expect(writer instanceof FileWriter).toBe(true);
> > -
> > - // cleanup
> > +
> > + // cleanup
> > itFile.remove(null, fail);
> > }),
> > fail = createFail('FileEntry');
> > -
> > +
> > // create a new file entry to kick off it
> > runs(function() {
> > root.getFile(fileName, {create:true}, entryCallback,
> fail);
> > @@ -1111,7 +1111,7 @@ describe('File API', function() {
> > newFile,
> > entryCallback =
> > jasmine.createSpy().andCallFake(function(fileEntry) {
> > newFile = fileEntry;
> > -
> > +
> > runs(function() {
> > fileEntry.file(itFile, fail);
> > });
> > @@ -1126,12 +1126,12 @@ describe('File API', function() {
> > itFile = jasmine.createSpy().andCallFake(function(file) {
> > expect(file).toBeDefined();
> > expect(file instanceof File).toBe(true);
> > -
> > - // cleanup
> > +
> > + // cleanup
> > newFile.remove(null, fail);
> > }),
> > fail = createFail('FileEntry');
> > -
> > +
> > // create a new file entry to kick off it
> > runs(function() {
> > root.getFile(fileName, {create:true}, entryCallback,
> fail);
> > @@ -1168,7 +1168,7 @@ describe('File API', function() {
> > }),
> > fail = createFail('FileEntry'),
> > win = createWin('FileEntry');
> > -
> > +
> > // create a new file entry to kick off it
> > runs(function() {
> > root.getFile(fileName, {create:true}, entryCallback,
> fail);
> > @@ -1236,7 +1236,7 @@ describe('File API', function() {
> > // cleanup
> > deleteEntry(fileName);
> > });
> > -
> > +
> > // create a new file entry
> > createFile(fileName, entryCallback, fail);
> > });
> > @@ -1262,7 +1262,7 @@ describe('File API', function() {
> > // cleanup
> > deleteEntry(dirName);
> > });
> > -
> > +
> > // create a new directory entry
> > runs(function() {
> > createDirectory(dirName, entryCallback, fail);
> > @@ -1293,7 +1293,7 @@ describe('File API', function() {
> > // cleanup
> > deleteEntry(fileName);
> > });
> > -
> > +
> > // create a new file entry
> > runs(function() {
> > createFile(fileName, entryCallback, fail);
> > @@ -1364,7 +1364,7 @@ describe('File API', function() {
> > deleteEntry(fileName);
> > }),
> > fail = createFail('Entry');
> > -
> > +
> > // create a new file entry
> > runs(function() {
> > createFile(fileName, itURL, fail);
> > @@ -1421,7 +1421,7 @@ describe('File API', function() {
> > });
> > });
> > expect(entry).toBeDefined();
> > -
> > +
> > runs(function() {
> > entry.remove(checkRemove, fail);
> > });
> > @@ -1435,7 +1435,7 @@ describe('File API', function() {
> > deleteEntry(fileName);
> > }),
> > fail = createFail('Entry');
> > -
> > +
> > // create a new file entry
> > runs(function() {
> > createFile(fileName, entryCallback, fail);
> > @@ -1594,7 +1594,7 @@ describe('File API', function() {
> > expect(entry2.isDirectory).toBe(false);
> > expect(entry2.fullPath).toBe(fullPath);
> > expect(entry2.name).toBe(file2);
> > -
> > +
> > // cleanup
> > deleteEntry(file1);
> > deleteEntry(file2);
> > @@ -1669,7 +1669,7 @@ describe('File API', function() {
> > expect(directory.isDirectory).toBe(true);
> > expect(directory.fullPath).toBe(dstPath);
> > expect(directory.name).toBe(dstDir);
> > -
> > +
> > runs(function() {
> > root.getDirectory(dstDir, {create:false},
> > itDirExists, fail);
> > });
> > @@ -1682,7 +1682,7 @@ describe('File API', function() {
> > expect(dirEntry.isDirectory).toBe(true);
> > expect(dirEntry.fullPath).toBe(dstPath);
> > expect(dirEntry.name).toBe(dstDir);
> > -
> > +
> > runs(function() {
> > dirEntry.getFile(file1, {create:false},
> > itFileExists, fail);
> > });
> > @@ -1735,7 +1735,7 @@ describe('File API', function() {
> > expect(directory.isDirectory).toBe(true);
> > expect(directory.fullPath).toBe(dstPath);
> > expect(directory.name).toBe(dstDir);
> > -
> > +
> > root.getDirectory(dstDir, {create:false},
> itDirExists,
> > fail);
> > },
> > itDirExists = function(dirEntry) {
> > @@ -1744,7 +1744,7 @@ describe('File API', function() {
> > expect(dirEntry.isDirectory).toBe(true);
> > expect(dirEntry.fullPath).toBe(dstPath);
> > expect(dirEntry.name).toBe(dstDir);
> > -
> > +
> > dirEntry.getFile(file1, {create:false},
> itFileExists,
> > fail);
> > },
> > itFileExists =
> > jasmine.createSpy().andCallFake(function(fileEntry) {
> > @@ -1784,7 +1784,7 @@ describe('File API', function() {
> > var copyDir =
> > jasmine.createSpy().andCallFake(function(fileEntry) {
> > // copy srcDir onto itself
> > runs(function() {
> > - directory.copyTo(root, null, win, itCopy);
> > + directory.copyTo(root, null, win, itCopy);
> > });
> >
> > waitsFor(function() { return itCopy.wasCalled; },
> > "itCopy never called", Tests.TEST_TIMEOUT);
> > @@ -1799,8 +1799,8 @@ describe('File API', function() {
> > itCopy = jasmine.createSpy().andCallFake(function(error)
> {
> > expect(error).toBeDefined();
> >
> > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
> > -
> > - runs(function() {
> > +
> > + runs(function() {
> > root.getDirectory(srcDir, {create:false},
> > itDirectoryExists, fail);
> > });
> >
> > @@ -1810,7 +1810,7 @@ describe('File API', function() {
> > // returning confirms existence so just check
> fullPath
> > entry
> > expect(dirEntry).toBeDefined();
> > expect(dirEntry.fullPath).toBe(srcPath);
> > -
> > +
> > runs(function() {
> > dirEntry.getFile(file1, {create:false},
> > itFileExists, fail);
> > });
> > @@ -1826,7 +1826,7 @@ describe('File API', function() {
> > itFileExists =
> > jasmine.createSpy().andCallFake(function(fileEntry) {
> > expect(fileEntry).toBeDefined();
> > expect(fileEntry.fullPath).toBe(filePath);
> > -
> > +
> > // cleanup
> > deleteEntry(srcDir);
> > });
> > @@ -1855,7 +1855,7 @@ describe('File API', function() {
> > itCopy = jasmine.createSpy().andCallFake(function(error)
> {
> > expect(error).toBeDefined();
> >
> > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
> > -
> > +
> > runs(function() {
> > root.getDirectory(srcDir, {create:false},
> > itDirectoryExists, fail);
> > });
> > @@ -1885,7 +1885,7 @@ describe('File API', function() {
> > waitsFor(function() { return entryCallback.wasCalled; },
> > "entryCallback never called", Tests.TEST_TIMEOUT);
> > });
> > it("copyTo: directory that does not exist", function() {
> > - var file1 = "entry.copy.dnf.file1",
> > + var file1 = "entry.copy.dnf.file1",
> > dstDir = "entry.copy.dnf.dstDir",
> > filePath = root.fullPath + '/' + file1,
> > dstPath = root.fullPath + '/' + dstDir,
> > @@ -1987,7 +1987,7 @@ describe('File API', function() {
> > expect(entry.isDirectory).toBe(false);
> > expect(entry.fullPath).toBe(dstPath);
> > expect(entry.name).toBe(file2);
> > -
> > +
> > runs(function() {
> > root.getFile(file2, {create:false},
> itMovedExists,
> > fail);
> > });
> > @@ -1997,7 +1997,7 @@ describe('File API', function() {
> > itMovedExists =
> > jasmine.createSpy().andCallFake(function(fileEntry) {
> > expect(fileEntry).toBeDefined();
> > expect(fileEntry.fullPath).toBe(dstPath);
> > -
> > +
> > runs(function() {
> > root.getFile(file1, {create:false}, win, itOrig);
> > });
> > @@ -2014,7 +2014,7 @@ describe('File API', function() {
> > //expect(navigator.fileMgr.itFileExists(srcPath) ===
> > false, "original file should not exist.");
> > expect(error).toBeDefined();
> > expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > -
> > +
> > // cleanup
> > deleteEntry(file1);
> > deleteEntry(file2);
> > @@ -2057,7 +2057,7 @@ describe('File API', function() {
> >
> > waitsFor(function() { return itMove.wasCalled; },
> > "itMove never called", Tests.TEST_TIMEOUT);
> > });
> > -
> > +
> > // create a parent directory to move file to
> > runs(function() {
> > root.getDirectory(dir, {create: true}, moveFile,
> > fail);
> > @@ -2068,7 +2068,7 @@ describe('File API', function() {
> > itMovedExists =
> > jasmine.createSpy().andCallFake(function(fileEntry) {
> > expect(fileEntry).toBeDefined();
> > expect(fileEntry.fullPath).toBe(dstPath);
> > -
> > +
> > runs(function() {
> > root.getFile(file1, {create:false}, win, itOrig);
> > });
> > @@ -2084,7 +2084,7 @@ describe('File API', function() {
> > itOrig = jasmine.createSpy().andCallFake(function(error)
> {
> > expect(error).toBeDefined();
> > expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > -
> > +
> > // cleanup
> > deleteEntry(file1);
> > deleteEntry(dir);
> > @@ -2131,7 +2131,7 @@ describe('File API', function() {
> > expect(directory.fullPath).toBe(dstPath);
> > expect(directory.name).toBe(dstDir);
> > // it that moved file exists in destination dir
> > -
> > +
> > runs(function() {
> > directory.getFile(file1, {create:false},
> > itMovedExists, fail);
> > });
> > @@ -2158,7 +2158,7 @@ describe('File API', function() {
> > itOrig = jasmine.createSpy().andCallFake(function(error)
> {
> > expect(error).toBeDefined();
> > expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > -
> > +
> > // cleanup
> > deleteEntry(srcDir);
> > deleteEntry(dstDir);
> > @@ -2231,7 +2231,7 @@ describe('File API', function() {
> > itOrig = jasmine.createSpy().andCallFake(function(error)
> {
> > expect(error).toBeDefined();
> > expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > -
> > +
> > // cleanup
> > deleteEntry(srcDir);
> > deleteEntry(dstDir);
> > @@ -2304,7 +2304,7 @@ describe('File API', function() {
> > itOrig = jasmine.createSpy().andCallFake(function(error)
> {
> > expect(error).toBeDefined();
> > expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > -
> > +
> > // cleanup
> > deleteEntry(srcDir);
> > deleteEntry(dstDir);
> > @@ -2346,7 +2346,7 @@ describe('File API', function() {
> > itMove = jasmine.createSpy().andCallFake(function(error)
> {
> > expect(error).toBeDefined();
> >
> > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
> > -
> > +
> > // it that original dir still exists
> > runs(function() {
> > root.getDirectory(srcDir, {create:false},
> > itDirectoryExists, fail);
> > @@ -2358,7 +2358,7 @@ describe('File API', function() {
> > // returning confirms existence so just check
> fullPath
> > entry
> > expect(dirEntry).toBeDefined();
> > expect(dirEntry.fullPath).toBe(srcPath);
> > -
> > +
> > runs(function() {
> > dirEntry.getFile(file1, {create:false},
> > itFileExists, fail);
> > });
> > @@ -2374,7 +2374,7 @@ describe('File API', function() {
> > itFileExists =
> > jasmine.createSpy().andCallFake(function(fileEntry) {
> > expect(fileEntry).toBeDefined();
> > expect(fileEntry.fullPath).toBe(filePath);
> > -
> > +
> > // cleanup
> > deleteEntry(srcDir);
> > });
> > @@ -2419,7 +2419,7 @@ describe('File API', function() {
> > itDirectoryExists =
> > jasmine.createSpy().andCallFake(function(entry) {
> > expect(entry).toBeDefined();
> > expect(entry.fullPath).toBe(srcPath);
> > -
> > +
> > // cleanup
> > deleteEntry(srcDir);
> > });
> > @@ -2447,7 +2447,7 @@ describe('File API', function() {
> > itMove = jasmine.createSpy().andCallFake(function(error)
> {
> > expect(error).toBeDefined();
> >
> > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
> > -
> > +
> > //it that original file still exists
> > runs(function() {
> > root.getFile(file1, {create:false}, itFileExists,
> > fail);
> > @@ -2464,7 +2464,7 @@ describe('File API', function() {
> > itFileExists =
> > jasmine.createSpy().andCallFake(function(fileEntry) {
> > expect(fileEntry).toBeDefined();
> > expect(fileEntry.fullPath).toBe(filePath);
> > -
> > +
> > // cleanup
> > deleteEntry(file1);
> > });
> > @@ -2496,10 +2496,10 @@ describe('File API', function() {
> > // move file1 onto sub-directory
> > entry.moveTo(directory, subDir, win, itMove);
> > };
> > - // create sub-directory
> > + // create sub-directory
> > directory.getDirectory(subDir, {create: true},
> > moveFile, fail);
> > };
> > - // create top level directory
> > + // create top level directory
> > root.getDirectory(dstDir, {create: true},
> > createSubDirectory, fail);
> > },
> > itDirectoryExists = function(dirEntry) {
> > @@ -2526,7 +2526,7 @@ describe('File API', function() {
> > });
> >
> > waitsFor(function() { return itFileExists.wasCalled; },
> > "itFileExists never called", Tests.TEST_TIMEOUT);
> > -
> > +
> > runs(function() {
> > expect(itFileExists).toHaveBeenCalled();
> > expect(win).not.toHaveBeenCalled();
> > @@ -2564,7 +2564,7 @@ describe('File API', function() {
> > itFileExists =
> > jasmine.createSpy().andCallFake(function(fileEntry) {
> > expect(fileEntry).toBeDefined();
> > expect(fileEntry.fullPath).toBe(filePath);
> > -
> > +
> > // cleanup
> > deleteEntry(file1);
> > deleteEntry(srcDir);
> > @@ -2614,7 +2614,7 @@ describe('File API', function() {
> > itFileExists =
> > jasmine.createSpy().andCallFake(function(fileEntry) {
> > expect(fileEntry).toBeDefined();
> > expect(fileEntry.fullPath).toBe(filePath);
> > -
> > +
> > // cleanup
> > deleteEntry(file1);
> > deleteEntry(srcDir);
> > @@ -2650,14 +2650,14 @@ describe('File API', function() {
> > var itMove = function(error) {
> > expect(error).toBeDefined();
> >
> > expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
> > -
> > +
> > // it that destination directory still exists
> > directory.getDirectory(subDir,
> {create:false},
> > itDirectoryExists, fail);
> > };
> > - // create sub-directory
> > + // create sub-directory
> > directory.getDirectory(subDir, {create: true},
> > moveDir, fail);
> > };
> > - // create top level directory
> > + // create top level directory
> > root.getDirectory(dstDir, {create: true},
> > createSubDirectory, fail);
> > },
> > itDirectoryExists = function(dirEntry) {
> > @@ -2712,7 +2712,7 @@ describe('File API', function() {
> > expect(entry.isDirectory).toBe(false);
> > expect(entry.fullPath).toBe(file2Path);
> > expect(entry.name).toBe(file2);
> > -
> > +
> > // it that old file does not exists
> > root.getFile(file1, {create:false}, win,
> itFileMoved);
> > },
> > @@ -2725,7 +2725,7 @@ describe('File API', function() {
> > itFileExists =
> > jasmine.createSpy().andCallFake(function(fileEntry) {
> > expect(fileEntry).toBeDefined();
> > expect(fileEntry.fullPath).toBe(file2Path);
> > -
> > +
> > // cleanup
> > deleteEntry(file1);
> > deleteEntry(file2);
> > @@ -2777,14 +2777,14 @@ describe('File API', function() {
> > itFileExists = function(fileEntry) {
> > expect(fileEntry).toBeDefined();
> > expect(fileEntry.fullPath).toBe(filePath);
> > -
> > +
> > // check that old directory no longer exists
> > root.getDirectory(srcDir, {create:false}, win,
> > itRemoved);
> > },
> > itRemoved =
> > jasmine.createSpy().andCallFake(function(error){
> > expect(error).toBeDefined();
> > expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > -
> > +
> > // cleanup
> > deleteEntry(srcDir);
> > deleteEntry(dstDir);
> > @@ -2807,7 +2807,7 @@ describe('File API', function() {
> > });
> > });
> > it("moveTo: directory that does not exist", function() {
> > - var file1 = "entry.move.dnf.file1",
> > + var file1 = "entry.move.dnf.file1",
> > dstDir = "entry.move.dnf.dstDir",
> > filePath = root.fullPath + '/' + file1,
> > dstPath = root.fullPath + '/' + dstDir,
> > @@ -2822,7 +2822,7 @@ describe('File API', function() {
> > itMove = jasmine.createSpy().andCallFake(function(error)
> {
> > expect(error).toBeDefined();
> > expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> > -
> > +
> > // cleanup
> > deleteEntry(file1);
> > });
> > @@ -2912,10 +2912,10 @@ describe('File API', function() {
> > reader.onloadend = verifier;
> > var myFile = new File();
> >
> > - myFile.fullPath = filePath;
> > + myFile.fullPath = filePath;
> > reader.readAsText(myFile);
> > };
> > -
> > +
> > // create a file, write to it, and read it in again
> > runs(function() {
> > root.getFile(fileName, {create: true}, create_writer,
> > fail);
> > @@ -2944,10 +2944,10 @@ describe('File API', function() {
> > var reader = new FileReader();
> > reader.onloadend = verifier;
> > var myFile = new File();
> > - myFile.fullPath = filePath;
> > + myFile.fullPath = filePath;
> > reader.readAsText(myFile);
> > };
> > -
> > +
> > // create a file, write to it, and read it in again
> > runs(function() {
> > root.getFile(fileName, {create: true}, read_file, fail);
> > @@ -2968,7 +2968,7 @@ describe('File API', function() {
> > });
> > reader.onerror = verifier;
> > var myFile = new File();
> > - myFile.fullPath = root.fullPath + '/' + "doesnotexist.err";
> > + myFile.fullPath = root.fullPath + '/' + "doesnotexist.err";
> >
> > runs(function() {
> > reader.readAsText(myFile);
> > @@ -2993,7 +2993,7 @@ describe('File API', function() {
> > },
> > // writes file and reads it back in
> > write_file = function(writer) {
> > - writer.onwriteend = read_file;
> > + writer.onwriteend = read_file;
> > writer.write(rule);
> > },
> > verifier = jasmine.createSpy().andCallFake(function(evt)
> {
> > @@ -3005,10 +3005,10 @@ describe('File API', function() {
> > var reader = new FileReader();
> > reader.onloadend = verifier;
> > var myFile = new File();
> > - myFile.fullPath = filePath;
> > + myFile.fullPath = filePath;
> > reader.readAsDataURL(myFile);
> > };
> > -
> > +
> > // create a file, write to it, and read it in again
> > runs(function() {
> > root.getFile(fileName, {create: true}, create_writer,
> > fail);
> > @@ -3089,7 +3089,7 @@ describe('File API', function() {
> > writer.write(rule);
> > }, fail);
> > };
> > -
> > +
> > // create file, then write and append to it
> > runs(function() {
> > createFile(fileName, write_file);
> > @@ -3120,7 +3120,7 @@ describe('File API', function() {
> > theWriter.onwriteend = anotherVerifier;
> > length += exception.length;
> > theWriter.seek(theWriter.length);
> > - theWriter.write(exception);
> > + theWriter.write(exception);
> > }),
> > anotherVerifier =
> > jasmine.createSpy().andCallFake(function(evt) {
> > expect(theWriter.length).toBe(length);
> > @@ -3135,7 +3135,7 @@ describe('File API', function() {
> > theWriter.onwriteend = verifier;
> > theWriter.write(rule);
> > };
> > -
> > +
> > // create file, then write and append to it
> > runs(function() {
> > var file = new File();
> > @@ -3168,7 +3168,7 @@ describe('File API', function() {
> > theWriter.onwriteend = anotherVerifier;
> > length = 12 + exception.length;
> > theWriter.seek(12);
> > - theWriter.write(exception);
> > + theWriter.write(exception);
> > }),
> > anotherVerifier =
> > jasmine.createSpy().andCallFake(function(evt) {
> > expect(theWriter.length).toBe(length);
> > @@ -3185,7 +3185,7 @@ describe('File API', function() {
> > theWriter.write(rule);
> > }, fail);
> > };
> > -
> > +
> > // create file, then write and append to it
> > runs(function() {
> > createFile(fileName, write_file);
> > @@ -3216,7 +3216,7 @@ describe('File API', function() {
> > theWriter.onwriteend = anotherVerifier;
> > length = 8 + exception.length;
> > theWriter.seek(8);
> > - theWriter.write(exception);
> > + theWriter.write(exception);
> > }),
> > anotherVerifier =
> > jasmine.createSpy().andCallFake(function(evt) {
> > expect(theWriter.length).toBe(length);
> > @@ -3233,7 +3233,7 @@ describe('File API', function() {
> > theWriter.write(rule);
> > }, fail);
> > };
> > -
> > +
> > // create file, then write and append to it
> > runs(function() {
> > createFile(fileName, write_file);
> > @@ -3271,7 +3271,7 @@ describe('File API', function() {
> > theWriter.write(rule);
> > }, fail);
> > };
> > -
> > +
> > // creates file, then write XML data
> > runs(function() {
> > createFile(fileName, write_file);
> > @@ -3305,10 +3305,10 @@ describe('File API', function() {
> > fileEntry.createWriter(function(writer) {
> > theWriter = writer;
> > theWriter.onwriteend = verifier;
> > - theWriter.write(rule);
> > + theWriter.write(rule);
> > }, fail);
> > };
> > -
> > +
> > // creates file, then write JSON content
> > runs(function() {
> > createFile(fileName, write_file);
> > @@ -3341,7 +3341,7 @@ describe('File API', function() {
> > // writes file and reads it back in
> > write_file = function(writer) {
> > theWriter = writer;
> > - theWriter.onwriteend = read_file;
> > + theWriter.onwriteend = read_file;
> > theWriter.write(rule);
> > },
> > // reads file and compares content to what was written
> > @@ -3395,7 +3395,7 @@ describe('File API', function() {
> > theWriter.write(rule);
> > }, fail);
> > };
> > -
> > +
> > // creates file, then write JSON content
> > runs(function() {
> > createFile(fileName, seek_file);
> > @@ -3413,20 +3413,20 @@ describe('File API', function() {
> > rule = "There is an exception to every rule. Except this
> > one.",
> > fail = createFail('FileWRiter'),
> > theWriter,
> > - // writes file content
> > + // writes file content
> > write_file = function(fileEntry) {
> > fileEntry.createWriter(function(writer) {
> > theWriter = writer;
> > theWriter.onwriteend = function(evt) {
> > truncate_file(theWriter);
> > - };
> > + };
> > theWriter.write(rule);
> > }, fail);
> > },
> > verifier = jasmine.createSpy().andCallFake(function(evt)
> {
> > expect(theWriter.length).toBe(36);
> > expect(theWriter.position).toBe(36);
> > -
> > +
> > // cleanup
> > deleteFile(fileName);
> > }),
> >
> >
>
--
@purplecabbage
risingj.com
Re: spec commit: described test condition, updated to test for NOT_FOUND_ERR
Posted by Becky Gibson <gi...@gmail.com>.
Just tested mobile-spec on iOS and was surprised to find a failing file
test.
Curious why the error code was changed from ENCODING_ERR to NOT_FOUND_ERR?
To me the description in the spec would indicate that an invalid URL
would return ENCODING_ERR?
from http://www.w3.org/TR/file-system-api/#definitions: EncodingErrorA
path or URL supplied to the API was malformed.
NotFoundErrorA required file or directory could not be found at the time an
operation was processed.
The test that was changed is: window.resolveLocalFileSystemURI(
"/this.is.not.a.valid.url", win, fail); IMHO "/this.is.not.a.valid.url" is
NOT a valid url according to
http://www.w3.org/Addressing/URL/url-spec.txt so it seems appropriate
to return an encodingError? This was discussed in
https://issues.apache.org/jira/browse/CB-671 where folks suggested it IS a
valid URL?
If we decide this is the appropriate return value, I'll have to do a bit of
work on the iOS code as it uses the NSURL URLWithString: and isFileURL:
apis to determine if the input is a valid File URL or not. I'm not sure
that appending "file://" to the input parameter is really the best
solution......
NSURL* testUri = [NSURL URLWithString:strUri];
if (!testUri || ![testUri isFileURL])
I'm also wondering if this is something we should be changing without some
kind of warning to users. While most people may just check for an error,
it seems a bit odd to change the actual error code being returned.
-becky
On Tue, May 8, 2012 at 8:17 PM, <pu...@apache.org> wrote:
> Updated Branches:
> refs/heads/master 35a3f3f4a -> c3225a50f
>
>
> described test condition, updated to test for NOT_FOUND_ERR
>
>
> Project:
> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/commit/c3225a50
> Tree:
> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/c3225a50
> Diff:
> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/c3225a50
>
> Branch: refs/heads/master
> Commit: c3225a50f48649bc66fd6c4e99b3e959d06a13b8
> Parents: 35a3f3f
> Author: Jesse MacFadyen <pu...@gmail.com>
> Authored: Tue May 8 17:16:43 2012 -0700
> Committer: Jesse MacFadyen <pu...@gmail.com>
> Committed: Tue May 8 17:16:43 2012 -0700
>
> ----------------------------------------------------------------------
> autotest/tests/file.tests.js | 272 ++++++++++++++++++------------------
> 1 files changed, 136 insertions(+), 136 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/c3225a50/autotest/tests/file.tests.js
> ----------------------------------------------------------------------
> diff --git a/autotest/tests/file.tests.js b/autotest/tests/file.tests.js
> index de37980..860a6c1 100644
> --- a/autotest/tests/file.tests.js
> +++ b/autotest/tests/file.tests.js
> @@ -31,10 +31,10 @@ describe('File API', function() {
> // deletes specified file or directory
> var deleteEntry = function(name, success, error) {
> // deletes entry, if it exists
> - window.resolveLocalFileSystemURI(root.toURL() + '/' + name,
> + window.resolveLocalFileSystemURI(root.toURL() + '/' + name,
> function(entry) {
> if (entry.isDirectory === true) {
> - entry.removeRecursively(success, error);
> + entry.removeRecursively(success, error);
> } else {
> entry.remove(success, error);
> }
> @@ -42,7 +42,7 @@ describe('File API', function() {
> };
> // deletes file, if it exists, then invokes callback
> var deleteFile = function(fileName, callback) {
> - root.getFile(fileName, null,
> + root.getFile(fileName, null,
> // remove file system entry
> function(entry) {
> entry.remove(callback, function() {
> console.log('[ERROR] deleteFile cleanup method invoked fail callback.'); });
> @@ -59,7 +59,7 @@ describe('File API', function() {
> // deletes and re-creates the specified directory
> var createDirectory = function(dirName, success, error) {
> deleteEntry(dirName, function() {
> - root.getDirectory(dirName, {create: true}, success, error);
> + root.getDirectory(dirName, {create: true}, success, error);
> }, error);
> };
>
> @@ -111,7 +111,7 @@ describe('File API', function() {
> expect(fileSystem.root).toBeDefined();
> }),
> fail = createFail('window.requestFileSystem');
> -
> +
> // retrieve PERSISTENT file system
> runs(function() {
> window.requestFileSystem(LocalFileSystem.PERSISTENT,
> 0, win, fail);
> @@ -134,7 +134,7 @@ describe('File API', function() {
> fail = createFail('window.requestFileSystem');
>
> // Request the file system
> - runs(function() {
> + runs(function() {
> window.requestFileSystem(LocalFileSystem.TEMPORARY, 0,
> win, fail);
> });
>
> @@ -206,7 +206,7 @@ describe('File API', function() {
> });
>
> waitsFor(function() { return win.wasCalled; },
> "resolveLocalFileSystemURI callback never called", Tests.TEST_TIMEOUT);
> -
> +
> runs(function() {
> expect(win).toHaveBeenCalled();
> expect(fail).not.toHaveBeenCalled();
> @@ -237,13 +237,13 @@ describe('File API', function() {
> });
>
> waitsFor(function() { return win.wasCalled; },
> "resolveLocalFileSystemURI callback never called", Tests.TEST_TIMEOUT);
> -
> +
> runs(function() {
> expect(win).toHaveBeenCalled();
> expect(fail).not.toHaveBeenCalled();
> });
> });
> -
> +
> // create a new file entry
> runs(function() {
> createFile(fileName, resolveCallback, fail);
> @@ -251,13 +251,13 @@ describe('File API', function() {
>
> waitsFor(function() { return resolveCallback.wasCalled; },
> "createFile callback never called", Tests.TEST_TIMEOUT);
> });
> - it("should error out when resolving invalid file name",
> function() {
> + it("should error (NOT_FOUND_ERR) when resolving
> (non-existent) invalid file name", function() {
> var fail = jasmine.createSpy().andCallFake(function(error)
> {
> expect(error).toBeDefined();
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> }),
> win = createWin('window.resolveLocalFileSystemURI');
> -
> +
> // lookup file system entry
> runs(function() {
>
> window.resolveLocalFileSystemURI("file:///this.is.not.a.valid.file.txt",
> win, fail);
> @@ -270,10 +270,10 @@ describe('File API', function() {
> expect(win).not.toHaveBeenCalled();
> });
> });
> - it("resolve invalid URL", function() {
> + it("should error (NOT_FOUND_ERR) when resolving
> (non-existent) invalid URL", function() {
> var fail = jasmine.createSpy().andCallFake(function(error)
> {
> expect(error).toBeDefined();
> - expect(error).toBeFileError(FileError.ENCODING_ERR);
> + expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> }),
> win = createWin('window.resolveLocalFileSystemURI');
>
> @@ -331,7 +331,7 @@ describe('File API', function() {
> expect(entry.removeRecursively).toBeDefined();
> }),
> fail = createFail('FileSystem');
> -
> +
> runs(function() {
> window.resolveLocalFileSystemURI(root.toURL(), win, fail);
> });
> @@ -357,7 +357,7 @@ describe('File API', function() {
>
> // create:false, exclusive:false, file does not exist
> runs(function() {
> - root.getFile(fileName, {create:false}, win, fail);
> + root.getFile(fileName, {create:false}, win, fail);
> });
>
> waitsFor(function() { return fail.wasCalled; }, "error
> callback never called", Tests.TEST_TIMEOUT);
> @@ -380,10 +380,10 @@ describe('File API', function() {
> entry.remove(null, null);
> }),
> fail = createFail('DirectoryEntry');
> -
> +
> // create:true, exclusive:false, file does not exist
> runs(function() {
> - root.getFile(fileName, {create: true}, win, fail);
> + root.getFile(fileName, {create: true}, win, fail);
> });
>
> waitsFor(function() { return win.wasCalled; }, "success
> callback never called", Tests.TEST_TIMEOUT);
> @@ -402,7 +402,7 @@ describe('File API', function() {
> expect(entry.isDirectory).toBe(false);
> expect(entry.name).toBe(fileName);
> expect(entry.fullPath).toBe(filePath);
> -
> +
> // cleanup
> entry.remove(null, null);
> }),
> @@ -443,7 +443,7 @@ describe('File API', function() {
> expect(entry.isDirectory).toBe(false);
> expect(entry.name).toBe(fileName);
> expect(entry.fullPath).toBe(filePath);
> -
> +
> // cleanup
> entry.remove(null, fail);
> });
> @@ -475,12 +475,12 @@ describe('File API', function() {
> fail = jasmine.createSpy().andCallFake(function(error) {
> expect(error).toBeDefined();
> expect(error).toBeFileError(FileError.PATH_EXISTS_ERR);
> -
> +
> // cleanup
> existingFile.remove(null, fail);
> }),
> win = createWin('DirectoryEntry');
> -
> +
> // create file to kick off it
> runs(function() {
> root.getFile(fileName, {create:true}, getFile, fail);
> @@ -497,7 +497,7 @@ describe('File API', function() {
> expect(entry.isDirectory).toBe(false);
> expect(entry.name).toBe(fileName);
> expect(entry.fullPath).toBe(filePath);
> -
> +
> entry.remove(null, fail); //clean up
> }),
> fail = createFail('DirectoryEntry'),
> @@ -514,7 +514,7 @@ describe('File API', function() {
> expect(fail).not.toHaveBeenCalled();
> });
> });
> -
> +
> // create file to kick off it
> runs(function() {
> root.getFile(fileName, {create:true}, getFile, fail);
> @@ -529,7 +529,7 @@ describe('File API', function() {
> expect(error).toBeFileError(FileError.ENCODING_ERR);
> }),
> win = createWin('DirectoryEntry');
> -
> +
> // create:false, exclusive:false, invalid path
> runs(function() {
> root.getFile(fileName, {create:false}, win, fail);
> @@ -551,7 +551,7 @@ describe('File API', function() {
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> }),
> win = createWin('DirectoryEntry');
> -
> +
> // create:false, exclusive:false, directory does not exist
> runs(function() {
> root.getDirectory(dirName, {create:false}, win, fail);
> @@ -580,19 +580,19 @@ describe('File API', function() {
> expect(win).toHaveBeenCalled();
> expect(fail).not.toHaveBeenCalled();
> });
> -
> +
> }), win =
> jasmine.createSpy().andCallFake(function(directory) {
> expect(directory).toBeDefined();
> expect(directory.isFile).toBe(false);
> expect(directory.isDirectory).toBe(true);
> expect(directory.name).toBe(dirName);
> expect(directory.fullPath).toBe(dirPath);
> -
> +
> // cleanup
> directory.remove(null, fail);
> }),
> fail = createFail('DirectoryEntry');
> -
> +
> // create:true, exclusive:false, directory does not exist
> runs(function() {
> root.getDirectory(dirName, {create: true}, getDir, fail);
> @@ -627,7 +627,7 @@ describe('File API', function() {
> directory.remove(null, fail);
> }),
> fail = createFail('DirectoryEntry');
> -
> +
> // create:true, exclusive:false, directory does not exist
> runs(function() {
> root.getDirectory(dirName, {create: true}, getDir, fail);
> @@ -645,15 +645,15 @@ describe('File API', function() {
> expect(directory.isDirectory).toBe(true);
> expect(directory.name).toBe(dirName);
> expect(directory.fullPath).toBe(dirPath);
> -
> +
> // cleanup
> directory.remove(null, fail);
> }),
> fail = createFail('DirectoryEntry');
> -
> +
> // create:true, exclusive:false, directory does not exist
> runs(function() {
> - root.getDirectory(dirName, {create: true}, win, fail);
> + root.getDirectory(dirName, {create: true}, win, fail);
> });
>
> waitsFor(function() { return win.wasCalled; }, "win never
> called", Tests.TEST_TIMEOUT);
> @@ -663,7 +663,7 @@ describe('File API', function() {
> expect(fail).not.toHaveBeenCalled();
> });
> });
> -
> +
> it("DirectoryEntry.getDirectory: create new directory
> (exclusive)", function() {
> var dirName = "de.create.exclusive.dir",
> dirPath = root.fullPath + '/' + dirName,
> @@ -673,14 +673,14 @@ describe('File API', function() {
> expect(directory.isDirectory).toBe(true);
> expect(directory.name).toBe(dirName);
> expect(directory.fullPath).toBe(dirPath);
> -
> +
> // cleanup
> directory.remove(null, fail);
> }),
> fail = createFail('DirectoryEntry');
> // create:true, exclusive:true, directory does not exist
> runs(function() {
> - root.getDirectory(dirName, {create: true,
> exclusive:true}, win, fail);
> + root.getDirectory(dirName, {create: true,
> exclusive:true}, win, fail);
> });
>
> waitsFor(function() { return win.wasCalled; }, "win never
> called", Tests.TEST_TIMEOUT);
> @@ -712,15 +712,15 @@ describe('File API', function() {
> expect(directory.isDirectory).toBe(true);
> expect(directory.name).toBe(dirName);
> expect(directory.fullPath).toBe(dirPath);
> -
> +
> // cleanup
> directory.remove(null, fail);
> }),
> fail = createFail('DirectoryEntry');
> -
> +
> // create directory to kick off it
> runs(function() {
> - root.getDirectory(dirName, {create:true}, getDir,
> this.fail);
> + root.getDirectory(dirName, {create:true}, getDir,
> this.fail);
> });
>
> waitsFor(function() { return getDir.wasCalled; }, "getDir
> never called", Tests.TEST_TIMEOUT);
> @@ -746,17 +746,17 @@ describe('File API', function() {
> fail = jasmine.createSpy().andCallFake(function(error) {
> expect(error).toBeDefined();
> expect(error).toBeFileError(FileError.PATH_EXISTS_ERR);
> -
> +
> // cleanup
> existingDir.remove(null, fail);
> }),
> win = createWin('DirectoryEntry');
> -
> +
> // create directory to kick off it
> runs(function() {
> root.getDirectory(dirName, {create:true}, getDir, fail);
> });
> -
> +
> waitsFor(function() { return getDir.wasCalled; }, "getDir
> never called", Tests.TEST_TIMEOUT);
> });
> it("DirectoryEntry.getDirectory: get Entry for existing
> directory", function() {
> @@ -780,14 +780,14 @@ describe('File API', function() {
> expect(directory.isFile).toBe(false);
> expect(directory.isDirectory).toBe(true);
> expect(directory.name).toBe(dirName);
> -
> +
> expect(directory.fullPath).toBe(dirPath);
> -
> +
> // cleanup
> directory.remove(null, fail);
> }),
> fail = createFail('DirectoryEntry');
> -
> +
> // create directory to kick off it
> root.getDirectory(dirName, {create:true}, getDir, fail);
> });
> @@ -798,10 +798,10 @@ describe('File API', function() {
> expect(error).toBeFileError(FileError.ENCODING_ERR);
> }),
> win = createWin('DirectoryEntry');
> -
> +
> // create:false, exclusive:false, invalid path
> runs(function() {
> - root.getDirectory(dirName, {create:false}, win, fail);
> + root.getDirectory(dirName, {create:false}, win, fail);
> });
>
> waitsFor(function() { return fail.wasCalled; }, "fail never
> called", Tests.TEST_TIMEOUT);
> @@ -832,12 +832,12 @@ describe('File API', function() {
> fail = jasmine.createSpy().andCallFake(function(error) {
> expect(error).toBeDefined();
>
> expect(error).toBeFileError(FileError.TYPE_MISMATCH_ERR);
> -
> +
> // cleanup
> existingFile.remove(null, null);
> }),
> win = createWin('DirectoryEntry');
> -
> +
> // create file to kick off it
> runs(function() {
> root.getFile(fileName, {create:true}, getDir, fail);
> @@ -866,12 +866,12 @@ describe('File API', function() {
> fail = jasmine.createSpy().andCallFake(function(error) {
> expect(error).toBeDefined();
>
> expect(error).toBeFileError(FileError.TYPE_MISMATCH_ERR);
> -
> +
> // cleanup
> existingDir.remove(null, null);
> }),
> win = createWin('DirectoryEntry');
> -
> +
> // create directory to kick off it
> runs(function() {
> root.getDirectory(dirName, {create:true}, getFile, fail);
> @@ -929,7 +929,7 @@ describe('File API', function() {
> waitsFor(function() { return entryCallback.wasCalled; },
> "entryCallback never called", Tests.TEST_TIMEOUT);
> });
> it("createReader: create reader on existing directory", function()
> {
> - // create reader for root directory
> + // create reader for root directory
> var reader = root.createReader();
> expect(reader).toBeDefined();
> expect(typeof reader.readEntries).toBe('function');
> @@ -964,8 +964,8 @@ describe('File API', function() {
> expect(entries instanceof Array).toBe(true);
> }),
> fail = createFail('DirectoryReader');
> -
> - // create reader for root directory
> +
> + // create reader for root directory
> reader = root.createReader();
> // read entries
> runs(function() {
> @@ -986,7 +986,7 @@ describe('File API', function() {
> // read entries
> var readEntries =
> jasmine.createSpy().andCallFake(function() {
> var reader = directory.createReader();
> -
> +
> runs(function() {
> reader.readEntries(win, itReader);
> });
> @@ -1055,12 +1055,12 @@ describe('File API', function() {
> expect(fileEntry).toBeDefined();
> expect(typeof fileEntry.createWriter).toBe('function');
> expect(typeof fileEntry.file).toBe('function');
> -
> - // cleanup
> +
> + // cleanup
> fileEntry.remove(null, fail);
> }),
> fail = createFail('FileEntry');
> -
> +
> // create a new file entry to kick off it
> runs(function() {
> root.getFile(fileName, {create:true}, itFileEntry, fail);
> @@ -1093,12 +1093,12 @@ describe('File API', function() {
> itWriter =
> jasmine.createSpy().andCallFake(function(writer) {
> expect(writer).toBeDefined();
> expect(writer instanceof FileWriter).toBe(true);
> -
> - // cleanup
> +
> + // cleanup
> itFile.remove(null, fail);
> }),
> fail = createFail('FileEntry');
> -
> +
> // create a new file entry to kick off it
> runs(function() {
> root.getFile(fileName, {create:true}, entryCallback, fail);
> @@ -1111,7 +1111,7 @@ describe('File API', function() {
> newFile,
> entryCallback =
> jasmine.createSpy().andCallFake(function(fileEntry) {
> newFile = fileEntry;
> -
> +
> runs(function() {
> fileEntry.file(itFile, fail);
> });
> @@ -1126,12 +1126,12 @@ describe('File API', function() {
> itFile = jasmine.createSpy().andCallFake(function(file) {
> expect(file).toBeDefined();
> expect(file instanceof File).toBe(true);
> -
> - // cleanup
> +
> + // cleanup
> newFile.remove(null, fail);
> }),
> fail = createFail('FileEntry');
> -
> +
> // create a new file entry to kick off it
> runs(function() {
> root.getFile(fileName, {create:true}, entryCallback, fail);
> @@ -1168,7 +1168,7 @@ describe('File API', function() {
> }),
> fail = createFail('FileEntry'),
> win = createWin('FileEntry');
> -
> +
> // create a new file entry to kick off it
> runs(function() {
> root.getFile(fileName, {create:true}, entryCallback, fail);
> @@ -1236,7 +1236,7 @@ describe('File API', function() {
> // cleanup
> deleteEntry(fileName);
> });
> -
> +
> // create a new file entry
> createFile(fileName, entryCallback, fail);
> });
> @@ -1262,7 +1262,7 @@ describe('File API', function() {
> // cleanup
> deleteEntry(dirName);
> });
> -
> +
> // create a new directory entry
> runs(function() {
> createDirectory(dirName, entryCallback, fail);
> @@ -1293,7 +1293,7 @@ describe('File API', function() {
> // cleanup
> deleteEntry(fileName);
> });
> -
> +
> // create a new file entry
> runs(function() {
> createFile(fileName, entryCallback, fail);
> @@ -1364,7 +1364,7 @@ describe('File API', function() {
> deleteEntry(fileName);
> }),
> fail = createFail('Entry');
> -
> +
> // create a new file entry
> runs(function() {
> createFile(fileName, itURL, fail);
> @@ -1421,7 +1421,7 @@ describe('File API', function() {
> });
> });
> expect(entry).toBeDefined();
> -
> +
> runs(function() {
> entry.remove(checkRemove, fail);
> });
> @@ -1435,7 +1435,7 @@ describe('File API', function() {
> deleteEntry(fileName);
> }),
> fail = createFail('Entry');
> -
> +
> // create a new file entry
> runs(function() {
> createFile(fileName, entryCallback, fail);
> @@ -1594,7 +1594,7 @@ describe('File API', function() {
> expect(entry2.isDirectory).toBe(false);
> expect(entry2.fullPath).toBe(fullPath);
> expect(entry2.name).toBe(file2);
> -
> +
> // cleanup
> deleteEntry(file1);
> deleteEntry(file2);
> @@ -1669,7 +1669,7 @@ describe('File API', function() {
> expect(directory.isDirectory).toBe(true);
> expect(directory.fullPath).toBe(dstPath);
> expect(directory.name).toBe(dstDir);
> -
> +
> runs(function() {
> root.getDirectory(dstDir, {create:false},
> itDirExists, fail);
> });
> @@ -1682,7 +1682,7 @@ describe('File API', function() {
> expect(dirEntry.isDirectory).toBe(true);
> expect(dirEntry.fullPath).toBe(dstPath);
> expect(dirEntry.name).toBe(dstDir);
> -
> +
> runs(function() {
> dirEntry.getFile(file1, {create:false},
> itFileExists, fail);
> });
> @@ -1735,7 +1735,7 @@ describe('File API', function() {
> expect(directory.isDirectory).toBe(true);
> expect(directory.fullPath).toBe(dstPath);
> expect(directory.name).toBe(dstDir);
> -
> +
> root.getDirectory(dstDir, {create:false}, itDirExists,
> fail);
> },
> itDirExists = function(dirEntry) {
> @@ -1744,7 +1744,7 @@ describe('File API', function() {
> expect(dirEntry.isDirectory).toBe(true);
> expect(dirEntry.fullPath).toBe(dstPath);
> expect(dirEntry.name).toBe(dstDir);
> -
> +
> dirEntry.getFile(file1, {create:false}, itFileExists,
> fail);
> },
> itFileExists =
> jasmine.createSpy().andCallFake(function(fileEntry) {
> @@ -1784,7 +1784,7 @@ describe('File API', function() {
> var copyDir =
> jasmine.createSpy().andCallFake(function(fileEntry) {
> // copy srcDir onto itself
> runs(function() {
> - directory.copyTo(root, null, win, itCopy);
> + directory.copyTo(root, null, win, itCopy);
> });
>
> waitsFor(function() { return itCopy.wasCalled; },
> "itCopy never called", Tests.TEST_TIMEOUT);
> @@ -1799,8 +1799,8 @@ describe('File API', function() {
> itCopy = jasmine.createSpy().andCallFake(function(error) {
> expect(error).toBeDefined();
>
> expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
> -
> - runs(function() {
> +
> + runs(function() {
> root.getDirectory(srcDir, {create:false},
> itDirectoryExists, fail);
> });
>
> @@ -1810,7 +1810,7 @@ describe('File API', function() {
> // returning confirms existence so just check fullPath
> entry
> expect(dirEntry).toBeDefined();
> expect(dirEntry.fullPath).toBe(srcPath);
> -
> +
> runs(function() {
> dirEntry.getFile(file1, {create:false},
> itFileExists, fail);
> });
> @@ -1826,7 +1826,7 @@ describe('File API', function() {
> itFileExists =
> jasmine.createSpy().andCallFake(function(fileEntry) {
> expect(fileEntry).toBeDefined();
> expect(fileEntry.fullPath).toBe(filePath);
> -
> +
> // cleanup
> deleteEntry(srcDir);
> });
> @@ -1855,7 +1855,7 @@ describe('File API', function() {
> itCopy = jasmine.createSpy().andCallFake(function(error) {
> expect(error).toBeDefined();
>
> expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
> -
> +
> runs(function() {
> root.getDirectory(srcDir, {create:false},
> itDirectoryExists, fail);
> });
> @@ -1885,7 +1885,7 @@ describe('File API', function() {
> waitsFor(function() { return entryCallback.wasCalled; },
> "entryCallback never called", Tests.TEST_TIMEOUT);
> });
> it("copyTo: directory that does not exist", function() {
> - var file1 = "entry.copy.dnf.file1",
> + var file1 = "entry.copy.dnf.file1",
> dstDir = "entry.copy.dnf.dstDir",
> filePath = root.fullPath + '/' + file1,
> dstPath = root.fullPath + '/' + dstDir,
> @@ -1987,7 +1987,7 @@ describe('File API', function() {
> expect(entry.isDirectory).toBe(false);
> expect(entry.fullPath).toBe(dstPath);
> expect(entry.name).toBe(file2);
> -
> +
> runs(function() {
> root.getFile(file2, {create:false}, itMovedExists,
> fail);
> });
> @@ -1997,7 +1997,7 @@ describe('File API', function() {
> itMovedExists =
> jasmine.createSpy().andCallFake(function(fileEntry) {
> expect(fileEntry).toBeDefined();
> expect(fileEntry.fullPath).toBe(dstPath);
> -
> +
> runs(function() {
> root.getFile(file1, {create:false}, win, itOrig);
> });
> @@ -2014,7 +2014,7 @@ describe('File API', function() {
> //expect(navigator.fileMgr.itFileExists(srcPath) ===
> false, "original file should not exist.");
> expect(error).toBeDefined();
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> -
> +
> // cleanup
> deleteEntry(file1);
> deleteEntry(file2);
> @@ -2057,7 +2057,7 @@ describe('File API', function() {
>
> waitsFor(function() { return itMove.wasCalled; },
> "itMove never called", Tests.TEST_TIMEOUT);
> });
> -
> +
> // create a parent directory to move file to
> runs(function() {
> root.getDirectory(dir, {create: true}, moveFile,
> fail);
> @@ -2068,7 +2068,7 @@ describe('File API', function() {
> itMovedExists =
> jasmine.createSpy().andCallFake(function(fileEntry) {
> expect(fileEntry).toBeDefined();
> expect(fileEntry.fullPath).toBe(dstPath);
> -
> +
> runs(function() {
> root.getFile(file1, {create:false}, win, itOrig);
> });
> @@ -2084,7 +2084,7 @@ describe('File API', function() {
> itOrig = jasmine.createSpy().andCallFake(function(error) {
> expect(error).toBeDefined();
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> -
> +
> // cleanup
> deleteEntry(file1);
> deleteEntry(dir);
> @@ -2131,7 +2131,7 @@ describe('File API', function() {
> expect(directory.fullPath).toBe(dstPath);
> expect(directory.name).toBe(dstDir);
> // it that moved file exists in destination dir
> -
> +
> runs(function() {
> directory.getFile(file1, {create:false},
> itMovedExists, fail);
> });
> @@ -2158,7 +2158,7 @@ describe('File API', function() {
> itOrig = jasmine.createSpy().andCallFake(function(error) {
> expect(error).toBeDefined();
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> -
> +
> // cleanup
> deleteEntry(srcDir);
> deleteEntry(dstDir);
> @@ -2231,7 +2231,7 @@ describe('File API', function() {
> itOrig = jasmine.createSpy().andCallFake(function(error) {
> expect(error).toBeDefined();
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> -
> +
> // cleanup
> deleteEntry(srcDir);
> deleteEntry(dstDir);
> @@ -2304,7 +2304,7 @@ describe('File API', function() {
> itOrig = jasmine.createSpy().andCallFake(function(error) {
> expect(error).toBeDefined();
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> -
> +
> // cleanup
> deleteEntry(srcDir);
> deleteEntry(dstDir);
> @@ -2346,7 +2346,7 @@ describe('File API', function() {
> itMove = jasmine.createSpy().andCallFake(function(error) {
> expect(error).toBeDefined();
>
> expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
> -
> +
> // it that original dir still exists
> runs(function() {
> root.getDirectory(srcDir, {create:false},
> itDirectoryExists, fail);
> @@ -2358,7 +2358,7 @@ describe('File API', function() {
> // returning confirms existence so just check fullPath
> entry
> expect(dirEntry).toBeDefined();
> expect(dirEntry.fullPath).toBe(srcPath);
> -
> +
> runs(function() {
> dirEntry.getFile(file1, {create:false},
> itFileExists, fail);
> });
> @@ -2374,7 +2374,7 @@ describe('File API', function() {
> itFileExists =
> jasmine.createSpy().andCallFake(function(fileEntry) {
> expect(fileEntry).toBeDefined();
> expect(fileEntry.fullPath).toBe(filePath);
> -
> +
> // cleanup
> deleteEntry(srcDir);
> });
> @@ -2419,7 +2419,7 @@ describe('File API', function() {
> itDirectoryExists =
> jasmine.createSpy().andCallFake(function(entry) {
> expect(entry).toBeDefined();
> expect(entry.fullPath).toBe(srcPath);
> -
> +
> // cleanup
> deleteEntry(srcDir);
> });
> @@ -2447,7 +2447,7 @@ describe('File API', function() {
> itMove = jasmine.createSpy().andCallFake(function(error) {
> expect(error).toBeDefined();
>
> expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
> -
> +
> //it that original file still exists
> runs(function() {
> root.getFile(file1, {create:false}, itFileExists,
> fail);
> @@ -2464,7 +2464,7 @@ describe('File API', function() {
> itFileExists =
> jasmine.createSpy().andCallFake(function(fileEntry) {
> expect(fileEntry).toBeDefined();
> expect(fileEntry.fullPath).toBe(filePath);
> -
> +
> // cleanup
> deleteEntry(file1);
> });
> @@ -2496,10 +2496,10 @@ describe('File API', function() {
> // move file1 onto sub-directory
> entry.moveTo(directory, subDir, win, itMove);
> };
> - // create sub-directory
> + // create sub-directory
> directory.getDirectory(subDir, {create: true},
> moveFile, fail);
> };
> - // create top level directory
> + // create top level directory
> root.getDirectory(dstDir, {create: true},
> createSubDirectory, fail);
> },
> itDirectoryExists = function(dirEntry) {
> @@ -2526,7 +2526,7 @@ describe('File API', function() {
> });
>
> waitsFor(function() { return itFileExists.wasCalled; },
> "itFileExists never called", Tests.TEST_TIMEOUT);
> -
> +
> runs(function() {
> expect(itFileExists).toHaveBeenCalled();
> expect(win).not.toHaveBeenCalled();
> @@ -2564,7 +2564,7 @@ describe('File API', function() {
> itFileExists =
> jasmine.createSpy().andCallFake(function(fileEntry) {
> expect(fileEntry).toBeDefined();
> expect(fileEntry.fullPath).toBe(filePath);
> -
> +
> // cleanup
> deleteEntry(file1);
> deleteEntry(srcDir);
> @@ -2614,7 +2614,7 @@ describe('File API', function() {
> itFileExists =
> jasmine.createSpy().andCallFake(function(fileEntry) {
> expect(fileEntry).toBeDefined();
> expect(fileEntry.fullPath).toBe(filePath);
> -
> +
> // cleanup
> deleteEntry(file1);
> deleteEntry(srcDir);
> @@ -2650,14 +2650,14 @@ describe('File API', function() {
> var itMove = function(error) {
> expect(error).toBeDefined();
>
> expect(error).toBeFileError(FileError.INVALID_MODIFICATION_ERR);
> -
> +
> // it that destination directory still exists
> directory.getDirectory(subDir, {create:false},
> itDirectoryExists, fail);
> };
> - // create sub-directory
> + // create sub-directory
> directory.getDirectory(subDir, {create: true},
> moveDir, fail);
> };
> - // create top level directory
> + // create top level directory
> root.getDirectory(dstDir, {create: true},
> createSubDirectory, fail);
> },
> itDirectoryExists = function(dirEntry) {
> @@ -2712,7 +2712,7 @@ describe('File API', function() {
> expect(entry.isDirectory).toBe(false);
> expect(entry.fullPath).toBe(file2Path);
> expect(entry.name).toBe(file2);
> -
> +
> // it that old file does not exists
> root.getFile(file1, {create:false}, win, itFileMoved);
> },
> @@ -2725,7 +2725,7 @@ describe('File API', function() {
> itFileExists =
> jasmine.createSpy().andCallFake(function(fileEntry) {
> expect(fileEntry).toBeDefined();
> expect(fileEntry.fullPath).toBe(file2Path);
> -
> +
> // cleanup
> deleteEntry(file1);
> deleteEntry(file2);
> @@ -2777,14 +2777,14 @@ describe('File API', function() {
> itFileExists = function(fileEntry) {
> expect(fileEntry).toBeDefined();
> expect(fileEntry.fullPath).toBe(filePath);
> -
> +
> // check that old directory no longer exists
> root.getDirectory(srcDir, {create:false}, win,
> itRemoved);
> },
> itRemoved =
> jasmine.createSpy().andCallFake(function(error){
> expect(error).toBeDefined();
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> -
> +
> // cleanup
> deleteEntry(srcDir);
> deleteEntry(dstDir);
> @@ -2807,7 +2807,7 @@ describe('File API', function() {
> });
> });
> it("moveTo: directory that does not exist", function() {
> - var file1 = "entry.move.dnf.file1",
> + var file1 = "entry.move.dnf.file1",
> dstDir = "entry.move.dnf.dstDir",
> filePath = root.fullPath + '/' + file1,
> dstPath = root.fullPath + '/' + dstDir,
> @@ -2822,7 +2822,7 @@ describe('File API', function() {
> itMove = jasmine.createSpy().andCallFake(function(error) {
> expect(error).toBeDefined();
> expect(error).toBeFileError(FileError.NOT_FOUND_ERR);
> -
> +
> // cleanup
> deleteEntry(file1);
> });
> @@ -2912,10 +2912,10 @@ describe('File API', function() {
> reader.onloadend = verifier;
> var myFile = new File();
>
> - myFile.fullPath = filePath;
> + myFile.fullPath = filePath;
> reader.readAsText(myFile);
> };
> -
> +
> // create a file, write to it, and read it in again
> runs(function() {
> root.getFile(fileName, {create: true}, create_writer,
> fail);
> @@ -2944,10 +2944,10 @@ describe('File API', function() {
> var reader = new FileReader();
> reader.onloadend = verifier;
> var myFile = new File();
> - myFile.fullPath = filePath;
> + myFile.fullPath = filePath;
> reader.readAsText(myFile);
> };
> -
> +
> // create a file, write to it, and read it in again
> runs(function() {
> root.getFile(fileName, {create: true}, read_file, fail);
> @@ -2968,7 +2968,7 @@ describe('File API', function() {
> });
> reader.onerror = verifier;
> var myFile = new File();
> - myFile.fullPath = root.fullPath + '/' + "doesnotexist.err";
> + myFile.fullPath = root.fullPath + '/' + "doesnotexist.err";
>
> runs(function() {
> reader.readAsText(myFile);
> @@ -2993,7 +2993,7 @@ describe('File API', function() {
> },
> // writes file and reads it back in
> write_file = function(writer) {
> - writer.onwriteend = read_file;
> + writer.onwriteend = read_file;
> writer.write(rule);
> },
> verifier = jasmine.createSpy().andCallFake(function(evt) {
> @@ -3005,10 +3005,10 @@ describe('File API', function() {
> var reader = new FileReader();
> reader.onloadend = verifier;
> var myFile = new File();
> - myFile.fullPath = filePath;
> + myFile.fullPath = filePath;
> reader.readAsDataURL(myFile);
> };
> -
> +
> // create a file, write to it, and read it in again
> runs(function() {
> root.getFile(fileName, {create: true}, create_writer,
> fail);
> @@ -3089,7 +3089,7 @@ describe('File API', function() {
> writer.write(rule);
> }, fail);
> };
> -
> +
> // create file, then write and append to it
> runs(function() {
> createFile(fileName, write_file);
> @@ -3120,7 +3120,7 @@ describe('File API', function() {
> theWriter.onwriteend = anotherVerifier;
> length += exception.length;
> theWriter.seek(theWriter.length);
> - theWriter.write(exception);
> + theWriter.write(exception);
> }),
> anotherVerifier =
> jasmine.createSpy().andCallFake(function(evt) {
> expect(theWriter.length).toBe(length);
> @@ -3135,7 +3135,7 @@ describe('File API', function() {
> theWriter.onwriteend = verifier;
> theWriter.write(rule);
> };
> -
> +
> // create file, then write and append to it
> runs(function() {
> var file = new File();
> @@ -3168,7 +3168,7 @@ describe('File API', function() {
> theWriter.onwriteend = anotherVerifier;
> length = 12 + exception.length;
> theWriter.seek(12);
> - theWriter.write(exception);
> + theWriter.write(exception);
> }),
> anotherVerifier =
> jasmine.createSpy().andCallFake(function(evt) {
> expect(theWriter.length).toBe(length);
> @@ -3185,7 +3185,7 @@ describe('File API', function() {
> theWriter.write(rule);
> }, fail);
> };
> -
> +
> // create file, then write and append to it
> runs(function() {
> createFile(fileName, write_file);
> @@ -3216,7 +3216,7 @@ describe('File API', function() {
> theWriter.onwriteend = anotherVerifier;
> length = 8 + exception.length;
> theWriter.seek(8);
> - theWriter.write(exception);
> + theWriter.write(exception);
> }),
> anotherVerifier =
> jasmine.createSpy().andCallFake(function(evt) {
> expect(theWriter.length).toBe(length);
> @@ -3233,7 +3233,7 @@ describe('File API', function() {
> theWriter.write(rule);
> }, fail);
> };
> -
> +
> // create file, then write and append to it
> runs(function() {
> createFile(fileName, write_file);
> @@ -3271,7 +3271,7 @@ describe('File API', function() {
> theWriter.write(rule);
> }, fail);
> };
> -
> +
> // creates file, then write XML data
> runs(function() {
> createFile(fileName, write_file);
> @@ -3305,10 +3305,10 @@ describe('File API', function() {
> fileEntry.createWriter(function(writer) {
> theWriter = writer;
> theWriter.onwriteend = verifier;
> - theWriter.write(rule);
> + theWriter.write(rule);
> }, fail);
> };
> -
> +
> // creates file, then write JSON content
> runs(function() {
> createFile(fileName, write_file);
> @@ -3341,7 +3341,7 @@ describe('File API', function() {
> // writes file and reads it back in
> write_file = function(writer) {
> theWriter = writer;
> - theWriter.onwriteend = read_file;
> + theWriter.onwriteend = read_file;
> theWriter.write(rule);
> },
> // reads file and compares content to what was written
> @@ -3395,7 +3395,7 @@ describe('File API', function() {
> theWriter.write(rule);
> }, fail);
> };
> -
> +
> // creates file, then write JSON content
> runs(function() {
> createFile(fileName, seek_file);
> @@ -3413,20 +3413,20 @@ describe('File API', function() {
> rule = "There is an exception to every rule. Except this
> one.",
> fail = createFail('FileWRiter'),
> theWriter,
> - // writes file content
> + // writes file content
> write_file = function(fileEntry) {
> fileEntry.createWriter(function(writer) {
> theWriter = writer;
> theWriter.onwriteend = function(evt) {
> truncate_file(theWriter);
> - };
> + };
> theWriter.write(rule);
> }, fail);
> },
> verifier = jasmine.createSpy().andCallFake(function(evt) {
> expect(theWriter.length).toBe(36);
> expect(theWriter.position).toBe(36);
> -
> +
> // cleanup
> deleteFile(fileName);
> }),
>
>