src/jj.base.js test/mock_spec.js @@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), *%w[lib helpers]) desc "Build the jj.js file" task :dist do - content = %w(jj jj.method_proxy jj.stub jj.mock).inject('') do |js, name| + content = %w(jj.base jj.method_proxy jj.stub jj.mock).inject('') do |js, name| js << read_js(name) end Rakefile @@ -14,6 +14,7 @@ def read_template end def write_dist(content) + FileUtils.rm_rf(File.dirname(JJ_DIST)) FileUtils.mkdir_p(File.dirname(JJ_DIST)) File.open(JJ_DIST, 'w') do |f| f << content lib/helpers.rb @@ -1,7 +1,7 @@ JJ.MockProxy = function(target) { JJ.mockCache[target] = this; this.target = target; - this.methods = { }; + this.expectations = { }; this.storePristine(); } @@ -20,6 +20,7 @@ JJ.extend(JJ.MockProxy.prototype, { method: function(name, fn) { this[name] = new JJ.MethodProxy(this, name, (fn || this.target[name])); + this.expect(this[name]); if (!fn) { this.fakeProperties.push(name); } return this[name]; }, @@ -35,6 +36,6 @@ JJ.extend(JJ.MockProxy.prototype, { }, expect: function(method) { - this.methods[method] = this.methods[method] || new JJ.MethodExpectation(method); + this.expectations[method] = this.expectations[method] || new JJ.MethodExpectation(method); } }); src/jj.mock.js @@ -2,8 +2,9 @@ $(Screw).bind('loaded', function() { $('.status').fn({ display: function() { - $(this).text( - $('.passed').length + $('.failed').length + ' test(s), ' + $('.failed').length + ' failure(s)' + $(this).html( + $('.passed').length + $('.failed').length + ' test(s), ' + $('.failed').length + ' failure(s)<br />' + + ((new Date() - Screw.suite_start_time)/1000.0).toString() + " seconds elapsed" ); } }); test/screw-unit/screw.behaviors.js @@ -26,16 +26,17 @@ .bind('failed', function(e, reason) { $(this) .addClass('failed') - .append($('<p class="error">').text(reason.toString())) + .append($('<p class="error"></p>').text(reason.toString())); var file = reason.fileName || reason.sourceURL; var line = reason.lineNumber || reason.line; if (file || line) { - $(this).append($('<p class="error">').text('line ' + line + ', ' + file)); + $(this).append($('<p class="error"></p>').text('line ' + line + ', ' + file)); } }) }) .bind('before', function() { + Screw.suite_start_time = new Date(); $('.status').text('Running...'); }) .bind('after', function() { test/screw-unit/screw.events.js @@ -1,60 +1,84 @@ Screw.Matchers = (function($) { return matchers = { expect: function(actual) { - var funcname = function(f) { - var s = f.toString().match(/function (\w*)/)[1]; - if ((s == null) || (s.length == 0)) return "anonymous"; - return s; - }; - - var stacktrace = function() { - var s = ""; - for(var a = arguments.caller; a != null; a = a.caller) { - s += funcname(a.callee) + "\n"; - if (a.caller == a) break; - } - return s; - }; - return { to: function(matcher, expected, not) { var matched = matcher.match(expected, actual); if (not ? matched : !matched) { - console.debug(0); - console.debug(stacktrace()); - console.debug(1); throw(matcher.failure_message(expected, actual, not)); } }, - + to_not: function(matcher, expected) { this.to(matcher, expected, true); } } }, - + equal: { match: function(expected, actual) { + if(expected == actual) return true; + if(actual == undefined) return false; + if (expected instanceof Array) { for (var i = 0; i < actual.length; i++) if (!Screw.Matchers.equal.match(expected[i], actual[i])) return false; return actual.length == expected.length; } else if (expected instanceof Object) { for (var key in expected) - if (expected[key] != actual[key]) return false; + if (!this.match(expected[key], actual[key])) return false; for (var key in actual) - if (actual[key] != expected[key]) return false; + if (!this.match(actual[key], expected[key])) return false; return true; - } else { - return expected == actual; } + return false; }, - + failure_message: function(expected, actual, not) { return 'expected ' + $.print(actual) + (not ? ' to not equal ' : ' to equal ') + $.print(expected); } }, + be_gt: { + match: function(expected, actual) { + return actual > expected; + }, + + failure_message: function(expected, actual, not) { + return 'expected ' + $.print(actual) + (not ? ' to not ' : ' to ') + 'be greater than ' + $.print(expected); + } + }, + + be_gte: { + match: function(expected, actual) { + return actual >= expected; + }, + + failure_message: function(expected, actual, not) { + return 'expected ' + $.print(actual) + (not ? ' to not ' : ' to ') + 'be greater than or equal to ' + $.print(expected); + } + }, + + be_lt: { + match: function(expected, actual) { + return actual < expected; + }, + + failure_message: function(expected, actual, not) { + return 'expected ' + $.print(actual) + (not ? ' to not ' : ' to ') + 'be less than ' + $.print(expected); + } + }, + + be_lte: { + match: function(expected, actual) { + return actual <= expected; + }, + + failure_message: function(expected, actual, not) { + return 'expected ' + $.print(actual) + (not ? ' to not ' : ' to ') + 'be less than or equal to ' + $.print(expected); + } + }, + match: { match: function(expected, actual) { if (expected.constructor == RegExp) @@ -62,19 +86,19 @@ Screw.Matchers = (function($) { else return actual.indexOf(expected) > -1; }, - + failure_message: function(expected, actual, not) { return 'expected ' + $.print(actual) + (not ? ' to not match ' : ' to match ') + $.print(expected); } }, - + be_empty: { match: function(expected, actual) { if (actual.length == undefined) throw(actual.toString() + " does not respond to length"); - + return actual.length == 0; }, - + failure_message: function(expected, actual, not) { return 'expected ' + $.print(actual) + (not ? ' to not be empty' : ' to be empty'); } test/screw-unit/screw.matchers.js @@ -12,7 +12,7 @@ <script src="../dist/jj.js" type="text/javascript"></script> <script src="./jj_spec.js" type="text/javascript"></script> - <script src="./screw_jj_spec.js" type="text/javascript"></script> + <script src="./mock_spec.js" type="text/javascript"></script> <link rel="stylesheet" href="./screw-unit/screw.css" /> </head> test/suite.html src/jj.js test/screw_jj_spec.js a0a1bb93436f7e38176fd900922c286f9ca8b59a Pat Nakajima patnakajima@gmail.com http://github.com/nakajima/jj/commit/c442c5796f4332ff06b4aaa6237c43cfa0724e61 c442c5796f4332ff06b4aaa6237c43cfa0724e61 2009-01-14T16:38:41-08:00 2009-01-14T16:38:41-08:00 updated screw.unit, added JJ.satisfied() method for non-screw-unit dependent way of ensuring that mocked methods were called c0383503b220556e12742fb7bc65bd97266e216b Pat Nakajima patnakajima@gmail.com