Changeset 8643

Timestamp:

01/14/08 14:16:27 (9 months ago)

Author:

tobie

Message:

prototype: Add Test.Unit.MessageTemplate class. Add flunk, buildMessage and assertBlock methods to Test.Unit.Assertions. Refactor accordingly.

Files:

• spinoffs/prototype/trunk/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/trunk/test/lib/unittest.js (modified) (2 diffs)
• spinoffs/prototype/trunk/test/unit/unit_tests.html (modified) (2 diffs)

spinoffs/prototype/trunk/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add Test.Unit.MessageTemplate class. Add flunk, buildMessage and assertBlock methods to Test.Unit.Assertions. Refactor accordingly. [Tobie Langel]
-
-* Remove useless binding in Template#evaluate. [Tobie Langel]

spinoffs/prototype/trunk/test/lib/unittest.js

@@ -234 +234 @@
-});
-
+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 = {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    expected = $A(expected);
-    actual = $A(actual);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    expected = $A(expected);
-    actual = $A(actual);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    expected = $H(expected);
-    actual = $H(actual);
-    var expected_array = expected.toArray().sort(), actual_array = actual.toArray().sort();
+    message = this.buildMessage(message || 'assertHashEqual', 'expected <?>, actual: <?>', expected, actual);
-    // from now we recursively zip & compare nested arrays
-try { expected_array.length == actual_array.length && 
-expected_array.zip(actual_array).all(function(pair) {
-return pair.all(function(i){ return i && i.constructor == Array }) ?
-pair[0].zip(pair[1]).all(arguments.callee) : pair[0] == pair[1];
-}) ?
-this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) + 
-      ', actual ' + Test.Unit.inspect(actual)); }
-catch(e) { this.error(e); }
-
-assertHashNotEqual: function(expected, actual) {
-  var message = arguments[2] || "assertHashEqual";
+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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    try { 
-      method();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-  _isVisible: function(element) {
-    element = $(element);
@@ -418 +432 @@
-      return false;
-    
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  assertElementsMatch: function() {
-
+pass = true, 
-    if (elements.length != expressions.length) {
-
-
+
+
+
-    }
-    elements.zip(expressions).all(function(pair, index) {
-      var element = $(pair.first()), expression = pair.last();
-      if (element.match(expression)) return true;
-
-
-
-
+
+
+
+
+
+
+
+
+
-    this.assertElementsMatch([element], expression);
-  }

spinoffs/prototype/trunk/test/unit/unit_tests.html

@@ -66 +66 @@
-      }
-    }},
+
+    testBuildMessage:  function() {
+      this.assertEqual("'foo' 'bar'", this.buildMessage('', '? ?', 'foo', 'bar'))
+    },
-    
-    testAssertEqual: function() { with(this) {
@@ -173 +177 @@
-      Element.hide('testcss1');
-      assertNotVisible('testcss1_span'); // hidden by parent
+    }},
+
+    testAssertElementsMatch: function() { with(this) {
+      assertElementsMatch($$('#tlist'), '#tlist');   
+      assertElementMatches($('tlist'), '#tlist');   
-    }}
-