Stop passing chrome.test.fail as ErrorCallback

chrome.test.fail cannot be used as ErrorCallback because it throws exception when the number of arguments doesn't match.
This wrong use of chrome.test.fail makes the error output useless when something goes wrong.

BUG=None
TEST=browser_tests

Review URL: https://codereview.chromium.org/258523004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266271 0039d316-1c4b-4281-b951-d872f2087c98
parent c899862a
...@@ -34,8 +34,9 @@ function readFileAndExpectContent(entry, expectedContent) { ...@@ -34,8 +34,9 @@ function readFileAndExpectContent(entry, expectedContent) {
chrome.test.fail('Error reading file contents.'); chrome.test.fail('Error reading file contents.');
}; };
reader.readAsText(file); reader.readAsText(file);
}, }, function(error) {
chrome.test.fail.bind(null, 'Unable to get file snapshot.')); chrome.test.fail('Unable to get file snapshot: ' + error.name);
});
} }
/** /**
......
...@@ -47,8 +47,9 @@ function verifyDirectory(entry, successCallback) { ...@@ -47,8 +47,9 @@ function verifyDirectory(entry, successCallback) {
'Entry has no createReader method.'); 'Entry has no createReader method.');
var reader = entry.createReader(); var reader = entry.createReader();
reader.readEntries(successCallback, reader.readEntries(successCallback, function (error) {
chrome.test.fail.bind(null, 'Error reading directory.')); chrome.test.fail('Error reading directory: ' + error.name);
});
} }
/** /**
......
...@@ -109,10 +109,9 @@ function readTest(entry, expectSuccess) { ...@@ -109,10 +109,9 @@ function readTest(entry, expectSuccess) {
function getSiblingTest(entry) { function getSiblingTest(entry) {
var error = 'Got file (\'' + entry.fullPath.concat('.foo') + '\') for which' + var error = 'Got file (\'' + entry.fullPath.concat('.foo') + '\') for which' +
'file access was not granted.'; 'file access was not granted.';
entry.filesystem.root.getFile( entry.filesystem.root.getFile(entry.fullPath.concat('.foo'), {},
entry.fullPath.concat('.foo'), {}, function(entry) { chrome.test.fail(error); },
chrome.test.fail.bind(null, error), chrome.test.succeed);
chrome.test.succeed);
} }
/** /**
......
...@@ -112,10 +112,9 @@ function readTest(entry, expectSuccess) { ...@@ -112,10 +112,9 @@ function readTest(entry, expectSuccess) {
function getSiblingTest(entry) { function getSiblingTest(entry) {
var error = 'Got file (\'' + entry.fullPath.concat('.foo') + '\') for which' + var error = 'Got file (\'' + entry.fullPath.concat('.foo') + '\') for which' +
'file access was not granted.'; 'file access was not granted.';
entry.filesystem.root.getFile( entry.filesystem.root.getFile(entry.fullPath.concat('.foo'), {},
entry.fullPath.concat('.foo'), {}, function (entry) { chrome.test.fail(error); },
chrome.test.fail.bind(null, error), chrome.test.succeed);
chrome.test.succeed);
} }
/** /**
......
...@@ -103,10 +103,13 @@ function readFileAndExpectContent( ...@@ -103,10 +103,13 @@ function readFileAndExpectContent(
reader.onload = function() { reader.onload = function() {
assertEqAndRunCallback(expectedContent, reader.result, message, callback); assertEqAndRunCallback(expectedContent, reader.result, message, callback);
}; };
reader.onerror = chrome.test.fail.bind(null, 'Reading file.'); reader.onerror = function(event) {
chrome.test.fail('Failed to read: ' + reader.error.name);
};
entry.file(reader.readAsText.bind(reader), entry.file(reader.readAsText.bind(reader),
chrome.test.fail.bind(null, 'Getting file.')); function(error) {
chrome.test.fail('Failed to get file: ' + error.name);
});
}); });
} }
...@@ -149,8 +152,9 @@ function abortWriteFile(volumeId, entry, path, callback) { ...@@ -149,8 +152,9 @@ function abortWriteFile(volumeId, entry, path, callback) {
} }
writer.write(new Blob(['xxxxx'], {'type': 'text/plain'})); writer.write(new Blob(['xxxxx'], {'type': 'text/plain'}));
}, }, function(error) {
chrome.test.fail.bind(null, 'Error creating writer.')); chrome.test.fail('Error creating writer: ' + error.name);
});
}); });
} }
...@@ -190,8 +194,9 @@ function abortTruncateFile(volumeId, entry, path, callback) { ...@@ -190,8 +194,9 @@ function abortTruncateFile(volumeId, entry, path, callback) {
} }
writer.truncate(10); writer.truncate(10);
}, }, function(error) {
chrome.test.fail.bind(null, 'Error creating writer.')); chrome.test.fail('Error creating writer: ' + error.name);
});
}); });
} }
......
...@@ -202,7 +202,7 @@ function verifyDirectoryEntry(directoryEntry, verifyFunction) { ...@@ -202,7 +202,7 @@ function verifyDirectoryEntry(directoryEntry, verifyFunction) {
function verifyJPEG(parentDirectoryEntry, filename, expectedFileLength, function verifyJPEG(parentDirectoryEntry, filename, expectedFileLength,
doneCallback) { doneCallback) {
function verifyFileEntry(fileEntry) { function verifyFileEntry(fileEntry) {
fileEntry.file(verifyFile, chrome.test.fail) fileEntry.file(verifyFile, chrome.test.fail);
} }
function verifyFile(file) { function verifyFile(file) {
...@@ -212,10 +212,11 @@ function verifyJPEG(parentDirectoryEntry, filename, expectedFileLength, ...@@ -212,10 +212,11 @@ function verifyJPEG(parentDirectoryEntry, filename, expectedFileLength,
var arraybuffer = e.target.result; var arraybuffer = e.target.result;
chrome.test.assertEq(expectedFileLength, arraybuffer.byteLength); chrome.test.assertEq(expectedFileLength, arraybuffer.byteLength);
doneCallback(); doneCallback();
} };
reader.onerror = reader.onerror = function(e) {
chrome.test.fail.bind(null, "Unable to read test image: " + filename); chrome.test.fail("Unable to read test image: " + filename);
};
reader.readAsArrayBuffer(file); reader.readAsArrayBuffer(file);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment