diff --git a/test/functional_test.html b/test/functional/functional_test.html similarity index 100% rename from test/functional_test.html rename to test/functional/functional_test.html diff --git a/test/functional_tests.js b/test/functional/functional_tests.js similarity index 100% rename from test/functional_tests.js rename to test/functional/functional_tests.js diff --git a/test/lib/_unittest.js b/test/lib/_unittest.js deleted file mode 100644 index 2af3ca49..00000000 --- a/test/lib/_unittest.js +++ /dev/null @@ -1,669 +0,0 @@ -// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// (c) 2005 Jon Tirsen (http://www.tirsen.com) -// (c) 2005 Michael Schuerig (http://www.schuerig.de/michael/) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -// experimental, Firefox-only -Event.simulateMouse = function(element, eventName) { - var options = Object.extend({ - pointerX: 0, - pointerY: 0, - buttons: 0 - }, arguments[2] || {}); - var oEvent = document.createEvent("MouseEvents"); - oEvent.initMouseEvent(eventName, true, true, document.defaultView, - options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, - false, false, false, false, 0, $(element)); - - if (this.mark) Element.remove(this.mark); - - var style = 'position: absolute; width: 5px; height: 5px;' + - 'top: #{pointerY}px; left: #{pointerX}px;'.interpolate(options) + - 'border-top: 1px solid red; border-left: 1px solid red;' - - this.mark = new Element('div', { style: style }); - this.mark.appendChild(document.createTextNode(" ")); - document.body.appendChild(this.mark); - - if (this.step) - alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options)); - - $(element).dispatchEvent(oEvent); -}; - -// Note: Due to a fix in Firefox 1.0.5/6 that probably fixed "too much", this doesn't work in 1.0.6 or DP2. -// You need to downgrade to 1.0.4 for now to get this working -// See https://bugzilla.mozilla.org/show_bug.cgi?id=289940 for the fix that fixed too much -Event.simulateKey = function(element, eventName) { - var options = Object.extend({ - ctrlKey: false, - altKey: false, - shiftKey: false, - metaKey: false, - keyCode: 0, - charCode: 0 - }, arguments[2] || {}); - - var oEvent = document.createEvent("KeyEvents"); - oEvent.initKeyEvent(eventName, true, true, window, - options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, - options.keyCode, options.charCode ); - $(element).dispatchEvent(oEvent); -}; - -Event.simulateKeys = function(element, command) { - for (var i=0; i' + testName + ''); - }, - - setStatus: function(status) { - this.getLastLogLine().addClassName(status); - $(this.getLastLogLine().getElementsByTagName('td')[1]).update(status); - }, - - finish: function(status, summary) { - if (!this.element) return; - this.setStatus(status); - this.message(summary); - }, - - message: function(message) { - if (!this.element) return; - this.getMessageCell().update(this._toHTML(message)); - }, - - summary: function(summary) { - if (!this.element) return; - var div = $(this.element.getElementsByTagName('div')[0]); - div.update(this._toHTML(summary)); - }, - - getLastLogLine: function() { - //return this.element.descendants('tr').last(); - var trs = this.element.getElementsByTagName('tr'); - return $(trs[trs.length - 1]); - }, - - getMessageCell: function() { - return this.getLastLogLine().down('td', 2); - var tds = this.getLastLogLine().getElementsByTagName('td'); - return $(tds[2]); - }, - - _createLogTable: function() { - var html = '
running...
' + - '' + - '' + - '' + - '
StatusTestMessage
'; - this.element.update(html); - - }, - - appendActionButtons: function(actions) { - actions = $H(actions); - if (!actions.any()) return; - var div = new Element("div", {className: 'action_buttons'}); - alert(actions); - actions.inject(div, function(container, action) { - var button = new Element("input").setValue(action.key).observe("click", action.value); - button.type = "button"; - return container.insert(button); - }); - this.getMessageCell().insert(div); - }, - - _toHTML: function(txt) { - return txt.escapeHTML().replace(/\n/g,"
"); - } -}); - -Test.Unit.Runner = Class.create({ - initialize: function(testcases) { - var options = this.options = Object.extend({ - testLog: 'testlog' - }, arguments[1] || {}); - - options.resultsURL = this.queryParams.resultsURL; - - this.tests = this.getTests(testcases); - this.currentTest = 0; - - var onload = function(){ - this.logger = new Test.Unit.Logger($(options.testLog)); - this.runTests.bind(this).delay(0.1); - }.bind(this); - - document.body ? onload() : Event.observe(window, 'load', onload); - - }, - - queryParams: window.location.search.parseQuery(), - - getTests: function(testcases) { - var tests, options = this.options; - if (this.queryParams.tests) tests = this.queryParams.tests.split(','); - else if (options.tests) tests = options.tests; - else if (options.test) tests = [option.test]; - else tests = Object.keys(testcases).grep(/^test/); - - return tests.map(function(test) { - if (testcases[test]) - return new Test.Unit.Testcase(test, testcases[test], testcases.setup, testcases.teardown); - }).compact(); - }, - - getResult: function() { - var results = { - tests: this.tests.length, - assertions: 0, - failures: 0, - errors: 0 - }; - - return this.tests.inject(results, function(results, test) { - results.assertions += test.assertions; - results.failures += test.failures; - results.errors += test.errors; - return results; - }); - }, - - postResults: function() { - if (this.options.resultsURL) { - new Ajax.Request(this.options.resultsURL, - { method: 'get', parameters: this.getResult(), asynchronous: false }); - } - }, - - runTests: function() { - var test = this.tests[this.currentTest], actions; - - if (!test) return this.finish(); - if (!test.isWaiting) this.logger.start(test.name); - test.run(); - if (test.isWaiting) { - this.logger.message("Waiting for " + test.timeToWait + "ms"); - setTimeout(this.runTests.bind(this), test.timeToWait || 1000); - return; - } - - this.logger.finish(test.status(), test.summary()); - if (actions = test.actions) this.logger.appendActionButtons(actions); - this.currentTest++; - // tail recursive, hopefully the browser will skip the stackframe - this.runTests(); - }, - - finish: function() { - this.postResults(); - this.logger.summary(this.summary()); - this.fireCompletionEvent(); - }, - - fireCompletionEvent: function() { - document.fire('tests:completed', { - result: this.getResult() - }); - }, - - summary: function() { - return '#{tests} tests, #{assertions} assertions, #{failures} failures, #{errors} errors' - .interpolate(this.getResult()); - } -}); - -Test.Unit.MessageTemplate = Class.create({ - initialize: function(string) { - var parts = []; - (string || '').scan(/(?=[^\\])\?|(?:\\\?|[^\?])+/, function(part) { - parts.push(part[0]); - }); - this.parts = parts; - }, - - evaluate: function(params) { - return this.parts.map(function(part) { - return part == '?' ? Test.Unit.inspect(params.shift()) : part.replace(/\\\?/, '?'); - }).join(''); - } -}); - -Test.Unit.Assertions = { - buildMessage: function(message, template) { - var args = $A(arguments).slice(2); - return (message ? message + '\n' : '') + new Test.Unit.MessageTemplate(template).evaluate(args); - }, - - flunk: function(message) { - this.assertBlock(message || 'Flunked', function() { return false }); - }, - - assertBlock: function(message, block) { - try { - block.call(this) ? this.pass() : this.fail(message); - } catch(e) { this.error(e) } - }, - - assert: function(expression, message) { - message = this.buildMessage(message || 'assert', 'got ', expression); - this.assertBlock(message, function() { return expression }); - }, - - assertEqual: function(expected, actual, message) { - message = this.buildMessage(message || 'assertEqual', 'expected , actual: ', expected, actual); - this.assertBlock(message, function() { return expected == actual }); - }, - - assertNotEqual: function(expected, actual, message) { - message = this.buildMessage(message || 'assertNotEqual', 'expected , actual: ', expected, actual); - this.assertBlock(message, function() { return expected != actual }); - }, - - assertEnumEqual: function(expected, actual, message) { - expected = $A(expected); - actual = $A(actual); - message = this.buildMessage(message || 'assertEnumEqual', 'expected , actual: ', expected, actual); - this.assertBlock(message, function() { - return expected.length == actual.length && expected.zip(actual).all(function(pair) { return pair[0] == pair[1] }); - }); - }, - - assertEnumNotEqual: function(expected, actual, message) { - expected = $A(expected); - actual = $A(actual); - message = this.buildMessage(message || 'assertEnumNotEqual', ' was the same as ', expected, actual); - this.assertBlock(message, function() { - return expected.length != actual.length || expected.zip(actual).any(function(pair) { return pair[0] != pair[1] }); - }); - }, - - _isEnumEqualUnordered: function() { - if (expected.length != actual.length) return false; - - for (var i = 0, len = expected.length; i < len; i++) { - var foundIndex = actual.indexOf(expected[i]); - if (foundIndex > -1) { - actual.splice(foundIndex, 1); - } - else return false; - } - return true; - }, - - assertEnumEqualUnordered: function(expected, actual, message) { - expected = $A(expected); - actual = $A(actual); - message = this.buildMessage(message || 'assertEnumEqualUnordered', 'expected , actual: ', expected, actual); - this.assertBlock(message, function() { - return this._isEnumEqualUnordered(expected, actual); - }); - }, - - assertHashEqual: function(expected, actual, message) { - expected = $H(expected); - actual = $H(actual); - var expected_array = expected.toArray().sort(), actual_array = actual.toArray().sort(); - message = this.buildMessage(message || 'assertHashEqual', '\nexpected:\n\nactual:\n', expected, actual); - // from now we recursively zip & compare nested arrays - var block = function() { - return expected_array.length == actual_array.length && - expected_array.zip(actual_array).all(function(pair) { - return pair.all(Object.isArray) ? - pair[0].zip(pair[1]).all(arguments.callee) : pair[0] == pair[1]; - }); - }; - this.assertBlock(message, block); - }, - - assertHashNotEqual: function(expected, actual, message) { - expected = $H(expected); - actual = $H(actual); - var expected_array = expected.toArray().sort(), actual_array = actual.toArray().sort(); - message = this.buildMessage(message || 'assertHashNotEqual', ' was the same as ', expected, actual); - // from now we recursively zip & compare nested arrays - var block = function() { - return !(expected_array.length == actual_array.length && - expected_array.zip(actual_array).all(function(pair) { - return pair.all(Object.isArray) ? - pair[0].zip(pair[1]).all(arguments.callee) : pair[0] == pair[1]; - })); - }; - this.assertBlock(message, block); - }, - - _isIdenticalRecursive: function(value1, value2) { - - var type1 = Object.isArray(value1) ? 'array' : typeof value1; - var type2 = Object.isArray(value2) ? 'array' : typeof value2; - - if (type1 !== type2) return false; - - if (type1 === 'array') { - return this._isArrayIdentical(value1, value2); - } - else if (type1 === 'object') { - return this._isObjectIdentical(value1, value2); - } - else { - return this._isPrimitiveIdentical(value1, value2); - } - }, - - _isArrayIdentical: function(array1, array2) { - if (array1.length !== array2.length) return false; - var i = array1.length; - while (i--) { - if (!this._isIdenticalRecursive(array1[i], array2[i])) return false; - } - return true; - }, - - _isObjectIdentical: function(object1, object2) { - var prop; - for (prop in object1) { - if (!this._isIdenticalRecursive(object1[prop], object2[prop])) return false; - } - for (prop in object2) { - if (!this._isIdenticalRecursive(object2[prop], object1[prop])) return false; - } - return true; - }, - - _isPrimitiveIdentical: function(primitive1, primitive2) { - return primitive1 === primitive2; - }, - - assertObjectIdentical: function(expected, actual, message) { - message = this.buildMessage( - message || 'assertObjectIdentical', '\nexpected:\n\nactual:\n', $H(expected), $H(actual)); - - this.assertBlock(message, function(){ - return this._isIdenticalRecursive(expected, actual); - }, this); - }, - - assertIdentical: function(expected, actual, message) { - message = this.buildMessage(message || 'assertIdentical', 'expected , actual: ', expected, actual); - this.assertBlock(message, function() { return expected === actual }); - }, - - assertNotIdentical: function(expected, actual, message) { - message = this.buildMessage(message || 'assertNotIdentical', 'expected , actual: ', expected, actual); - this.assertBlock(message, function() { return expected !== actual }); - }, - - assertNaN: function(obj, message) { - message = this.buildMessage(message || 'assertNull', 'got ', obj); - this.assertBlock(message, function() { return isNaN(obj); }); - }, - - assertNotNaN: function(obj, message) { - message = this.buildMessage(message || 'assertNull', 'got ', obj); - this.assertBlock(message, function() { return !isNaN(obj); }); - }, - - assertNull: function(obj, message) { - message = this.buildMessage(message || 'assertNull', 'got ', obj); - this.assertBlock(message, function() { return obj === null }); - }, - - assertNotNull: function(obj, message) { - message = this.buildMessage(message || 'assertNotNull', 'got ', obj); - this.assertBlock(message, function() { return obj !== null }); - }, - - assertUndefined: function(obj, message) { - message = this.buildMessage(message || 'assertUndefined', 'got ', obj); - this.assertBlock(message, function() { return typeof obj == "undefined" }); - }, - - assertNotUndefined: function(obj, message) { - message = this.buildMessage(message || 'assertNotUndefined', 'got ', obj); - this.assertBlock(message, function() { return typeof obj != "undefined" }); - }, - - assertNullOrUndefined: function(obj, message) { - message = this.buildMessage(message || 'assertNullOrUndefined', 'got ', obj); - this.assertBlock(message, function() { return obj == null }); - }, - - assertNotNullOrUndefined: function(obj, message) { - message = this.buildMessage(message || 'assertNotNullOrUndefined', 'got ', obj); - this.assertBlock(message, function() { return obj != null }); - }, - - assertArray: function(obj, message) { - message = this.buildMessage(message || 'assertArray', 'got ', obj); - this.assertBlock(message, function() { return Object.isArray(obj); }); - }, - - assertMatch: function(expected, actual, message) { - message = this.buildMessage(message || 'assertMatch', 'regex did not match ', expected, actual); - this.assertBlock(message, function() { return new RegExp(expected).exec(actual) }); - }, - - assertNoMatch: function(expected, actual, message) { - message = this.buildMessage(message || 'assertNoMatch', 'regex matched ', expected, actual); - this.assertBlock(message, function() { return !(new RegExp(expected).exec(actual)) }); - }, - - assertHidden: function(element, message) { - message = this.buildMessage(message || 'assertHidden', '? isn\'t hidden.', element); - this.assertBlock(message, function() { return element.style.display == 'none' }); - }, - - assertInstanceOf: function(expected, actual, message) { - message = this.buildMessage(message || 'assertInstanceOf', ' was not an instance of the expected type', actual); - this.assertBlock(message, function() { return actual instanceof expected }); - }, - - assertNotInstanceOf: function(expected, actual, message) { - message = this.buildMessage(message || 'assertNotInstanceOf', ' was an instance of the expected type', actual); - this.assertBlock(message, function() { return !(actual instanceof expected) }); - }, - - assertRespondsTo: function(method, obj, message) { - message = this.buildMessage(message || 'assertRespondsTo', 'object doesn\'t respond to ', method); - this.assertBlock(message, function() { return (method in obj && typeof obj[method] == 'function') }); - }, - - assertRaise: function(exceptionName, method, message) { - message = this.buildMessage(message || 'assertRaise', ' exception expected but none was raised', exceptionName); - var block = function() { - try { - method(); - return false; - } catch(e) { - if (e.name == exceptionName) return true; - else throw e; - } - }; - this.assertBlock(message, block); - }, - - assertNothingRaised: function(method, message) { - try { - method(); - this.assert(true, "Expected nothing to be thrown"); - } catch(e) { - message = this.buildMessage(message || 'assertNothingRaised', ' was thrown when nothing was expected.', e); - this.flunk(message); - } - }, - - _isVisible: function(element) { - element = $(element); - if (!element.parentNode) return true; - this.assertNotNull(element); - if (element.style && Element.getStyle(element, 'display') == 'none') - return false; - - return arguments.callee.call(this, element.parentNode); - }, - - assertVisible: function(element, message) { - message = this.buildMessage(message, '? was not visible.', element); - this.assertBlock(message, function() { return this._isVisible(element) }); - }, - - assertNotVisible: function(element, message) { - message = this.buildMessage(message, '? was not hidden and didn\'t have a hidden parent either.', element); - this.assertBlock(message, function() { return !this._isVisible(element) }); - }, - - assertElementsMatch: function() { - var pass = true, expressions = $A(arguments), elements = $A(expressions.shift()); - if (elements.length != expressions.length) { - message = this.buildMessage('assertElementsMatch', 'size mismatch: ? elements, ? expressions (?).', elements.length, expressions.length, expressions); - this.flunk(message); - pass = false; - } - elements.zip(expressions).all(function(pair, index) { - var element = $(pair.first()), expression = pair.last(); - if (element.match(expression)) return true; - message = this.buildMessage('assertElementsMatch', 'In index : expected but got ?', index, expression, element); - this.flunk(message); - pass = false; - }.bind(this)) - - if (pass) this.assert(true, "Expected all elements to match."); - }, - - assertElementMatches: function(element, expression, message) { - this.assertElementsMatch([element], expression); - } -}; - -Test.Unit.Testcase = Class.create(Test.Unit.Assertions, { - initialize: function(name, test, setup, teardown) { - this.name = name; - this.test = test || Prototype.emptyFunction; - this.setup = setup || Prototype.emptyFunction; - this.teardown = teardown || Prototype.emptyFunction; - this.messages = []; - this.actions = {}; - }, - - isWaiting: false, - timeToWait: 1000, - assertions: 0, - failures: 0, - errors: 0, - isRunningFromRake: window.location.port == 4711, - - wait: function(time, nextPart) { - this.isWaiting = true; - this.test = nextPart; - this.timeToWait = time; - }, - - run: function(rethrow) { - try { - try { - if (!this.isWaiting) this.setup(); - this.isWaiting = false; - this.test(); - } finally { - if (!this.isWaiting) { - this.teardown(); - } - } - } - catch(e) { - if (rethrow) throw e; - this.error(e, this); - } - }, - - summary: function() { - var msg = '#{assertions} assertions, #{failures} failures, #{errors} errors\n'; - return msg.interpolate(this) + this.messages.join("\n"); - }, - - pass: function() { - this.assertions++; - }, - - fail: function(message) { - this.failures++; - var line = ""; - try { - throw new Error("stack"); - } catch(e){ - line = (/\.html:(\d+)/.exec(e.stack || '') || ['',''])[1]; - } - this.messages.push("Failure: " + message + (line ? " Line #" + line : "")); - }, - - info: function(message) { - this.messages.push("Info: " + message); - }, - - error: function(error, test) { - this.errors++; - this.actions['retry with throw'] = function() { test.run(true) }; - this.messages.push(error.name + ": "+ error.message + "(" + Test.Unit.inspect(error) + ")"); - }, - - status: function() { - if (this.failures > 0) return 'failed'; - if (this.errors > 0) return 'error'; - return 'passed'; - }, - - benchmark: function(operation, iterations) { - var startAt = new Date(); - (iterations || 1).times(operation); - var timeTaken = ((new Date())-startAt); - this.info((arguments[2] || 'Operation') + ' finished ' + - iterations + ' iterations in ' + (timeTaken/1000)+'s' ); - return timeTaken; - }, - - assertIsChainable: function(methodName, object, message) { - message = this.buildMessage(message || "assertIsChainable", " of is not chainable", methodName, object); - this.assertBlock(message, function() { - return object[methodName].call(object) === object; - }); - } -}); - diff --git a/test/unit/bootstrap.js b/test/unit/bootstrap.js index 3a7a6b4f..073ab9b5 100644 --- a/test/unit/bootstrap.js +++ b/test/unit/bootstrap.js @@ -94,8 +94,6 @@ canvasLoader.addModule({ name: 'canvas_assertions', type: 'js', path: 'test/lib/canvas_assertions.js', varName: 'assertSameColor' }); canvasLoader.addModule({ name: 'ape_anim', type: 'js', path: 'core/anim.js', varName: 'APE.anim' }); - canvasLoader.addModule({ name: 'toggle_button', type: 'js', path: 'ui/button/toggle_button.widget.js', varName: 'APE.widget.ToggleButton' }); - canvasLoader.addModule({ name: 'text_placeholder', type: 'js', path: 'ui/dashboard_textplaceholder.js', varName: 'Dashboard.TextPlaceholder' }); canvasLoader.insert(); })(this); \ No newline at end of file diff --git a/test/unit/suite_runner.html b/test/unit/suite_runner.html index 4da81f85..77af9257 100644 --- a/test/unit/suite_runner.html +++ b/test/unit/suite_runner.html @@ -46,14 +46,7 @@ 'canvas_path_group.html', 'canvas_util.html', 'canvas_color.html', - 'canvas_parser.html', - 'commands/canvas_transform_command.html', - 'commands/canvas_add_command.html', - 'commands/canvas_remove_command.html', - 'commands/canvas_command_history.html', - 'toggle_button.html', - 'text_placeholder.html', - 'svg_cache.html' + 'canvas_parser.html' ]); function testModules(modules) {