github-migration
/
prototype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prototype: Test.Unit refactoring. Allow running multiple instances of Test.Unit.Runner on the same page. Allow rake to run specific testcases. Closes #10704, #10705, #10706.

This commit is contained in:
Tobie Langel 2008-01-06 00:34:39 +00:00
parent 7c86e29805
commit 0008fe4aed
20 changed files with 233 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -1,5 +1,7 @@
*SVN*
* Test.Unit refactoring. Allow running multiple instances of Test.Unit.Runner on the same page. Allow rake to run specific testcases (e.g.: rake test BROWSERS=firefox TESTS=array TESTCASES=testUniq,test$w). Closes #10704, #10705, #10706. [nicwilliams, Tobie Langel]
* Optimize property detection of outerHTML. Avoids triggering FOUC in Safari 3.0.4. Closes #10702. [subimage, Tobie Langel]
* Add document.loaded, a boolean that is set to true once dom:loaded is fired. Setting document.loaded to true before the document is loaded prevents dom:loaded from being fired. [Tobie Langel]

9
Rakefile
View File

@ -37,16 +37,17 @@ task :test => [:dist, :test_units]
require 'test/lib/jstest'
desc "Runs all the JavaScript unit tests and collects the results"
JavaScriptTestTask.new(:test_units) do |t|
testcases = ENV['TESTCASES']
tests_to_run = ENV['TESTS'] && ENV['TESTS'].split(',')
browsers_to_test = ENV['BROWSERS'] && ENV['BROWSERS'].split(',')
t.mount("/dist")
t.mount("/test")
Dir["test/unit/*.html"].sort.each do |test_file|
test_file = "/#{test_file}"
test_name = test_file[/.*\/(.+?)\.html/, 1]
t.run(test_file) unless tests_to_run && !tests_to_run.include?(test_name)
tests = testcases ? { :url => "/#{test_file}", :testcases => testcases } : "/#{test_file}"
test_filename = test_file[/.*\/(.+?)\.html/, 1]
t.run(tests) unless tests_to_run && !tests_to_run.include?(test_filename)
end
%w( safari firefox ie konqueror opera ).each do |browser|

2
src/dom.js
View File

@ -185,7 +185,7 @@ Element.Methods = {
},
descendants: function(element) {
return $(element).getElementsBySelector("*");
return $(element).select("*");
},
firstDescendant: function(element) {

10
test/lib/jstest.rb
View File

@ -308,7 +308,12 @@ class JavaScriptTestTask < ::Rake::TaskLib
browser.setup
puts "\nStarted tests in #{browser}"
@tests.each do |test|
browser.visit("http://localhost:4711#{test}?resultsURL=http://localhost:4711/results&t=" + ("%.6f" % Time.now.to_f))
params = "resultsURL=http://localhost:4711/results&t=" + ("%.6f" % Time.now.to_f)
if test.is_a?(Hash)
params << "&tests=#{test[:testcases]}" if test[:testcases]
test = test[:url]
end
browser.visit("http://localhost:4711#{test}?#{params}")
result = @queue.pop
result.each { |k, v| results[k] += v }
@ -349,7 +354,8 @@ class JavaScriptTestTask < ::Rake::TaskLib
@server.mount(path, NonCachingFileHandler, dir)
end
# test should be specified as a url
# test should be specified as a url or as a hash of the form
# {:url => "url", :testcases => "testFoo,testBar"}
def run(test)
@tests<<test
end

380
test/lib/unittest.js
View File

@ -35,16 +35,14 @@ Event.simulateMouse = function(element, eventName) {
false, false, false, false, 0, $(element));
if(this.mark) Element.remove(this.mark);
this.mark = document.createElement('div');
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);
this.mark.style.position = 'absolute';
this.mark.style.top = options.pointerY + "px";
this.mark.style.left = options.pointerX + "px";
this.mark.style.width = "5px";
this.mark.style.height = "5px;";
this.mark.style.borderTop = "1px solid red;"
this.mark.style.borderLeft = "1px solid red;"
if(this.step)
alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options));
@ -78,104 +76,110 @@ Event.simulateKeys = function(element, command) {
}
};
var Test = {}
Test.Unit = {};
var Test = {
Unit: {
inspect: Object.inspect // security exception workaround
}
};
// security exception workaround
Test.Unit.inspect = Object.inspect;
Test.Unit.Logger = Class.create();
Test.Unit.Logger.prototype = {
initialize: function(log) {
this.log = $(log);
if (this.log) {
this._createLogTable();
}
Test.Unit.Logger = Class.create({
initialize: function(element) {
this.element = $(element);
if (this.element) this._createLogTable();
},
start: function(testName) {
if (!this.log) return;
this.testName = testName;
this.lastLogLine = document.createElement('tr');
this.statusCell = document.createElement('td');
this.nameCell = document.createElement('td');
this.nameCell.appendChild(document.createTextNode(testName));
this.messageCell = document.createElement('td');
this.lastLogLine.appendChild(this.statusCell);
this.lastLogLine.appendChild(this.nameCell);
this.lastLogLine.appendChild(this.messageCell);
this.loglines.appendChild(this.lastLogLine);
if (!this.element) return;
this.element.down('tbody').insert('<tr><td>' + testName + '</td><td></td><td></td></tr>');
},
setStatus: function(status) {
this.getLastLogLine().addClassName(status).down('td', 1).update(status);
},
finish: function(status, summary) {
if (!this.log) return;
this.lastLogLine.className = status;
this.statusCell.innerHTML = status;
this.messageCell.innerHTML = this._toHTML(summary);
if (!this.element) return;
this.setStatus(status);
this.message(summary);
},
message: function(message) {
if (!this.log) return;
this.messageCell.innerHTML = this._toHTML(message);
if (!this.element) return;
this.getMessageCell().update(this._toHTML(message));
},
summary: function(summary) {
if (!this.log) return;
this.logsummary.innerHTML = this._toHTML(summary);
if (!this.element) return;
this.element.down('div').update(this._toHTML(summary));
},
getLastLogLine: function() {
return this.element.select('tr').last()
},
getMessageCell: function() {
return this.getLastLogLine().down('td', 2);
},
_createLogTable: function() {
this.log.innerHTML =
'<div id="logsummary"></div>' +
'<table id="logtable">' +
var html = '<div class="logsummary">running...</div>' +
'<table class="logtable">' +
'<thead><tr><th>Status</th><th>Test</th><th>Message</th></tr></thead>' +
'<tbody id="loglines"></tbody>' +
'<tbody class="loglines"></tbody>' +
'</table>';
this.logsummary = $('logsummary')
this.loglines = $('loglines');
this.element.update(html)
},
appendActionButtons: function(actions) {
actions = $H(actions);
if (!actions.any()) return;
var div = new Element("div", {className: 'action_buttons'});
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,"<br/>");
}
}
});
Test.Unit.Runner = Class.create();
Test.Unit.Runner.prototype = {
Test.Unit.Runner = Class.create({
initialize: function(testcases) {
this.options = Object.extend({
var options = this.options = Object.extend({
testLog: 'testlog'
}, arguments[1] || {});
this.options.resultsURL = this.parseResultsURLQueryParameter();
if (this.options.testLog) {
this.options.testLog = $(this.options.testLog) || null;
}
if(this.options.tests) {
this.tests = [];
for(var i = 0; i < this.options.tests.length; i++) {
if(/^test/.test(this.options.tests[i])) {
this.tests.push(new Test.Unit.Testcase(this.options.tests[i], testcases[this.options.tests[i]], testcases["setup"], testcases["teardown"]));
}
}
} else {
if (this.options.test) {
this.tests = [new Test.Unit.Testcase(this.options.test, testcases[this.options.test], testcases["setup"], testcases["teardown"])];
} else {
this.tests = [];
for(var testcase in testcases) {
if(/^test/.test(testcase)) {
this.tests.push(new Test.Unit.Testcase(testcase, testcases[testcase], testcases["setup"], testcases["teardown"]));
}
}
}
}
options.resultsURL = this.queryParams.resultsURL;
options.testLog = $(options.testLog);
this.tests = this.getTests(testcases, options);
this.currentTest = 0;
this.logger = new Test.Unit.Logger(this.options.testLog);
Event.observe(window, "load", function() {
setTimeout(this.runTests.bind(this), 100);
this.logger = new Test.Unit.Logger(options.testLog);
Event.observe(window, "load", function() {
this.runTests.bind(this).delay(0.1);
}.bind(this));
},
parseResultsURLQueryParameter: function() {
return window.location.search.parseQuery()["resultsURL"];
queryParams: window.location.search.parseQuery(),
getTests: function(testcases, options) {
var tests;
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();
},
// Returns:
// "ERROR" if there was an error,
// "FAILURE" if there was a failure, or
// "SUCCESS" if there was neither
getResult: function() {
var results = {
tests: this.tests.length,
@ -198,100 +202,38 @@ Test.Unit.Runner.prototype = {
{ method: 'get', parameters: this.getResult(), asynchronous: false });
}
},
runTests: function() {
var test = this.tests[this.currentTest];
if (!test) {
// finished!
this.postResults();
this.logger.summary(this.summary());
return;
}
if(!test.isWaiting) {
this.logger.start(test.name);
}
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);
} else {
this.logger.finish(test.status(), test.summary());
var actionButtons = test.actionButtons();
if (actionButtons)
$(this.logger.lastLogLine).down('td', 2).appendChild(actionButtons);
this.currentTest++;
// tail recursive, hopefully the browser will skip the stackframe
this.runTests();
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());
},
summary: function() {
return '#{tests} tests, #{assertions} assertions, #{failures} failures, #{errors} errors'
.interpolate(this.getResult());
}
}
});
Test.Unit.Assertions = Class.create();
Test.Unit.Assertions.prototype = {
initialize: function() {
this.assertions = 0;
this.failures = 0;
this.errors = 0;
this.messages = [];
this.actions = {};
},
summary: function() {
return (
this.assertions + " assertions, " +
this.failures + " failures, " +
this.errors + " errors" + "\n" +
this.messages.join("\n"));
},
actionButtons: function() {
if (!Object.keys(this.actions).any()) return false;
var div = $(document.createElement("div"));
div.addClassName("action_buttons");
for (var title in this.actions) {
var button = $(document.createElement("input"));
button.value = title;
button.type = "button";
button.observe("click", this.actions[title]);
div.appendChild(button);
}
return div;
},
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';
},
isRunningFromRake: (function() {
return window.location.port == 4711;
})(),
Test.Unit.Assertions = {
assert: function(expression) {
var message = arguments[1] || 'assert: got "' + Test.Unit.inspect(expression) + '"';
try { expression ? this.pass() :
@ -497,7 +439,86 @@ Test.Unit.Assertions.prototype = {
},
assertElementMatches: function(element, expression) {
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);
@ -506,39 +527,4 @@ Test.Unit.Assertions.prototype = {
iterations + ' iterations in ' + (timeTaken/1000)+'s' );
return timeTaken;
}
}
Test.Unit.Testcase = Class.create();
Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.prototype), {
initialize: function(name, test, setup, teardown) {
Test.Unit.Assertions.prototype.initialize.bind(this)();
this.name = name;
this.test = test || function() {};
this.setup = setup || function() {};
this.teardown = teardown || function() {};
this.isWaiting = false;
this.timeToWait = 1000;
},
wait: function(time, nextPart) {
this.isWaiting = true;
this.test = nextPart;
this.timeToWait = time;
},
run: function(rethrow) {
try {
try {
if (!this.isWaiting) this.setup.bind(this)();
this.isWaiting = false;
this.test.bind(this)();
} finally {
if(!this.isWaiting) {
this.teardown.bind(this)();
}
}
}
catch(e) {
if (rethrow) throw e;
this.error(e, this);
}
}
});

15
test/test.css
View File

@ -12,38 +12,39 @@ body {
margin-bottom: 2em;
}
#logsummary {
.logsummary {
margin-top: 1em;
margin-bottom: 1em;
padding: 1ex;
border: 1px solid #000;
font-weight: bold;
}
#logtable {
.logtable {
width:100%;
border-collapse: collapse;
border: 1px dotted #666;
}
#logtable td, #logtable th {
.logtable td, .logtable th {
text-align: left;
padding: 3px 8px;
border: 1px dotted #666;
}
#logtable .passed {
.logtable .passed {
background-color: #cfc;
}
#logtable .failed, #logtable .error {
.logtable .failed, .logtable .error {
background-color: #fcc;
}
#logtable td div.action_buttons {
.logtable td div.action_buttons {
display: inline;
}
#logtable td div.action_buttons input {
.logtable td div.action_buttons input {
margin: 0 5px;
font-size: 10px;
}

2
test/unit/ajax.html
View File

@ -411,7 +411,7 @@
info(message);
}
}}
}, 'testlog');
});
// ]]>
</script>
</body>

2
test/unit/array.html
View File

@ -218,7 +218,7 @@
assertEnumEqual(['a', 'b', 'c', 'd'], $w(' a b\nc\t\nd\n'));
}}
}, 'testlog');
});
// ]]>
</script>
</body>

2
test/unit/base.html
View File

@ -623,7 +623,7 @@
assertEqual("valueOf", new Foo().valueOf());
}}
}, 'testlog');
});
// ]]>
</script>

2
test/unit/dom.html
View File

@ -1683,7 +1683,7 @@
assertEqual(Node[pair.key], pair.value);
}, this);
}}
}, 'testlog');
});
function preservingBrowserDimensions(callback) {
var original = document.viewport.getDimensions();

2
test/unit/element_mixins.html
View File

@ -66,7 +66,7 @@ Element.addMethods();
return (input.focus != null);
}));
}}
}, 'testlog');
});
// ]]>
</script>
</body>

2
test/unit/enumerable.html
View File

@ -318,7 +318,7 @@
assertEqual(26, Fixtures.Primes.size());
assertEqual(0, [].size());
}}
}, 'testlog');
});
// ]]>
</script>
</body>

2
test/unit/event.html
View File

@ -242,7 +242,7 @@
}}
}, 'testlog');
});
document.observe("dom:loaded", function(event) {
eventResults.contentLoaded = {

2
test/unit/hash.html
View File

@ -226,7 +226,7 @@
assertEqual("key=bar", new Hash(new Hash(foo)).toQueryString());
}}
}, 'testlog');
});
// ]]>
</script>
</body>

2
test/unit/number.html
View File

@ -61,7 +61,7 @@
assertEqual('-293', (-293).toJSON());
}}
}, 'testlog');
});
// ]]>
</script>

2
test/unit/position.html
View File

@ -81,7 +81,7 @@
assert(!Position.within($('body_absolute'), 10, 20), 'outside bottom');
}}
}, 'testlog');
});
// ]]>
</script>

2
test/unit/range.html
View File

@ -86,7 +86,7 @@
);
}}
}, 'testlog');
});
// ]]>
</script>
</body>

2
test/unit/selector.html
View File

@ -431,7 +431,7 @@
assert(typeof results[1].show == 'function');
assert(typeof results[2].show == 'function');
}}
}, 'testlog');
});
// ]]>
</script>
</body>

2
test/unit/string.html
View File

@ -565,7 +565,7 @@
assertIdentical(false, 'false'.evalJSON());
assertEqual('"', '"\\""'.evalJSON());
}}
}, 'testlog');
});
// ]]>
</script>
</body>

14
test/unit/unit_tests.html
View File

@ -22,6 +22,7 @@
<!-- Log output -->
<div id="testlog"> </div>
<div id="testlog_2"> </div>
<!-- Test elements follow -->
<div id="test_1" class="a bbbbbbbbbbbb cccccccccc dddd"> </div>
@ -173,7 +174,18 @@
assertNotVisible('testcss1_span'); // hidden by parent
}}
}, "testlog");
});
new Test.Unit.Runner({
testDummy: function() { with(this) {
assert(true);
}},
testMultipleTestRunner: function() { with(this) {
assertEqual('passed', $('testlog_2').down('td', 1).innerHTML);
}}
}, {testLog: 'testlog_2'});
// ]]>
</script>
</body>