Move createDoNotCallSpy and waitsForAny into test-runner.js
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/0128681d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/tree/0128681d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/diff/0128681d Branch: refs/heads/master Commit: 0128681d690f436f0fddff862913843752b6a1c8 Parents: 6d4eff9 Author: Andrew Grieve <agri...@chromium.org> Authored: Wed Sep 26 23:18:05 2012 -0400 Committer: Andrew Grieve <agri...@chromium.org> Committed: Wed Sep 26 23:18:05 2012 -0400 ---------------------------------------------------------------------- autotest/test-runner.js | 32 +++++++++++++++++++++++++++++ autotest/tests/filetransfer.tests.js | 26 ----------------------- 2 files changed, 32 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/0128681d/autotest/test-runner.js ---------------------------------------------------------------------- diff --git a/autotest/test-runner.js b/autotest/test-runner.js index c295608..f72b3cc 100644 --- a/autotest/test-runner.js +++ b/autotest/test-runner.js @@ -28,3 +28,35 @@ if (window.sessionStorage != null) { // Android devices. var Tests = function() {}; Tests.TEST_TIMEOUT = 7500; + +// Creates a spy that will fail if called. +function createDoNotCallSpy(name, opt_extraMessage) { + return jasmine.createSpy().andCallFake(function() { + var errorMessage = name + ' should not have been called.'; + if (arguments.length) { + errorMessage += ' Got args: ' + JSON.stringify(arguments); + } + if (opt_extraMessage) { + errorMessage += '\n' + opt_extraMessage; + } + expect(false).toBe(true, errorMessage); + }); +} + +// Waits for any of the given spys to be called. +// Last param may be a custom timeout duration. +function waitsForAny() { + var spys = [].slice.call(arguments); + var timeout = Tests.TEST_TIMEOUT; + if (typeof spys[spys.length - 1] == 'number') { + timeout = spys.pop(); + } + waitsFor(function() { + for (var i = 0; i < spys.length; ++i) { + if (spys[i].wasCalled) { + return true; + } + } + return false; + }, "Expecting callbacks to be called.", timeout); +} http://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec/blob/0128681d/autotest/tests/filetransfer.tests.js ---------------------------------------------------------------------- diff --git a/autotest/tests/filetransfer.tests.js b/autotest/tests/filetransfer.tests.js index bde70b6..f3653b4 100644 --- a/autotest/tests/filetransfer.tests.js +++ b/autotest/tests/filetransfer.tests.js @@ -23,32 +23,6 @@ describe('FileTransfer', function() { // https://github.com/don/cordova-filetransfer var server = "http://cordova-filetransfer.jitsu.com";; - // Creates a spy that will fail if called. - function createDoNotCallSpy(name, opt_extraMessage) { - return jasmine.createSpy().andCallFake(function() { - var errorMessage = name + ' should not have been called.'; - if (arguments.length) { - errorMessage += ' Got args: ' + JSON.stringify(arguments); - } - if (opt_extraMessage) { - errorMessage += '\n' + opt_extraMessage; - } - expect(false).toBe(true, errorMessage); - }); - } - - // Waits for any of the given spys to be called. - function waitsForAny() { - var spys = arguments; - waitsFor(function() { - for (var i = 0; i < spys.length; ++i) { - if (spys[i].wasCalled) { - return true; - } - } - return false; - }, "Expecting success or failure callbacks to be called.", Tests.TEST_TIMEOUT); - } // deletes and re-creates the specified content var writeFile = function(fileName, fileContent, success, error) { deleteFile(fileName, function() {
