Changeset 4867

Timestamp:

08/30/06 06:57:38 (2 years ago)

Author:

madrobby

Message:

script.aculo.us: add more flesh to bdd-style JavaScript testing

Files:

• spinoffs/scriptaculous/src/unittest.js (modified) (7 diffs)
• spinoffs/scriptaculous/test/unit/bdd_test.html (modified) (4 diffs)
• spinoffs/scriptaculous/test/unit/unittest_test.html (modified) (2 diffs)

spinoffs/scriptaculous/src/unittest.js

@@ -159 +159 @@
-        for(var testcase in testcases) {
-          if(/^test/.test(testcase)) {
-
+
+
+
+
+
-          }
-        }
@@ -230 +234 @@
-    }
-    return (
+      (this.options.context ? this.options.context + ': ': '') + 
-      this.tests.length + " tests, " + 
-      assertions + " assertions, " + 
@@ -333 +338 @@
-    this.assert(object != null, message);
-  },
+  assertType: function(expected, actual) {
+    var message = arguments[2] || 'assertType';
+    try { 
+      (actual.constructor == expected) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + (actual.constructor) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertNotOfType: function(expected, actual) {
+    var message = arguments[2] || 'assertNotOfType';
+    try { 
+      (actual.constructor != expected) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + (actual.constructor) + '"'); }
+    catch(e) { this.error(e); }
+  },
-  assertInstanceOf: function(expected, actual) {
-    var message = arguments[2] || 'assertInstanceOf';
@@ -346 +367 @@
-      this.fail(message + ": object was an instance of the not expected type"); }
-    catch(e) { this.error(e); } 
+  },
+  assertReturnsTrue: function(method, obj) {
+    var message = arguments[2] || 'assertReturnsTrue';
+    try {
+      var m = obj[method];
+      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
+      m() ? this.pass() : 
+      this.fail(message + ": method returned false"); }
+    catch(e) { this.error(e); }
+  },
+  assertReturnsFalse: function(method, obj) {
+    var message = arguments[2] || 'assertReturnsFalse';
+    try {
+      var m = obj[method];
+      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
+      !m() ? this.pass() : 
+      this.fail(message + ": method returned true"); }
+    catch(e) { this.error(e); }
-  },
-  assertRaise: function(exceptionName, method) {
@@ -388 +427 @@
-    
-    if(typeof test == 'string') {
+      test = test.gsub(/(\.should[^\(]+\()/,'#{0}this,');
+      test = test.gsub(/(\.should[^\(]+)\(this,\)/,'#{1}(this)');
-      this.test = function() {
-        eval('with(this){'+test+'}');
@@ -421 +462 @@
-});
-
+// *EXPERIMENTAL* BDD-style testing to please non-technical folk
+// This draws many ideas from RSpec http://rspec.rubyforge.org/
+
+Test.setupBDDExtensionMethods = function(){
+  var METHODMAP = {
+    shouldEqual:     'assertEqual',
+    shouldNotEqual:  'assertNotEqual',
+    shouldEqualEnum: 'assertEnumEqual',
+    shouldBeA:       'assertType',
+    shouldNotBeA:    'assertNotOfType',
+    shouldBeAn:      'assertType',
+    shouldNotBeAn:   'assertNotOfType',
+    shouldBeNull:    'assertNull',
+    shouldNotBeNull: 'assertNotNull',
+    
+    shouldBe:        'assertReturnsTrue',
+    shouldNotBe:     'assertReturnsFalse'
+  };
+  Test.BDDMethods = {};
+  for(m in METHODMAP) {
+    Test.BDDMethods[m] = eval(
+      'function(){'+
+      'var args = $A(arguments);'+
+      'var scope = args.shift();'+
+      'scope.'+METHODMAP[m]+'.apply(scope,(args || []).concat([this])); }');
+  }
+  [Array.prototype, String.prototype, Number.prototype].each(
+    function(p){ Object.extend(p, Test.BDDMethods) }
+  );
+}
+
-Test.context = function(name, spec, log){
+  Test.setupBDDExtensionMethods();
+  
-  var compiledSpec = {};
+  var titles = {};
-  for(specName in spec) {
-    switch(specName){
@@ -438 +513 @@
-        });
-        compiledSpec[testName] = body.join('\n');
-
-
-
+
+
+
+
-};

spinoffs/scriptaculous/test/unit/bdd_test.html

@@ -9 +9 @@
-  <script src="../../src/unittest.js" type="text/javascript"></script>
-  <link rel="stylesheet" href="../test.css" type="text/css" />
-  <style type="text/css" media="screen">
-  /* <![CDATA[ */
-    #testcss1 { font-size:11px; color: #f00; }
-    #testcss2 { font-size:12px; color: #0f0; display: none; }
-  /* ]]> */
-  </style>
-</head>
-<body>
-<h1>script.aculo.us Unit test file</h1>
-<p>
-  Testing alternate BDD-style syntax for unit tests
-</p>
-
-<!-- Log output -->
@@ -32 +23 @@
-var moo = 0;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  
-  setup: function() {
@@ -43 +48 @@
-  },
-  
-etup should run
+hould run setup
-    assert($('d').innerHTML == 'setup!');
-    assert(moo == 1);
-  },
-  
-teardown should ru
+should run teardow
-    assert(moo == 1);
-  },
-  
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    assertEqual(1, 1);
-    assertEqual('a', 'a');
@@ -59 +102 @@
-    var x = 1;
-    var y = 1;
+    assertEqual(1, x)
-    assertEqual(x, y);
-  },
-  
-
+
+
+
+
+
+
+
-    wait(10,function(){
-assertEqual(1,1
+'a'.shouldEqual('a'
-    });
-    
-    wait(10,function(){
-assertEqual(1,1
+'a'.shouldEqual('a'
-      wait(10,function(){
-assertEqual(1,1
+'a'.shouldEqual('a'
-        wait(10,function(){
-assertEqual(1,1
+'a'.shouldEqual('a'
-        });
-      });

spinoffs/scriptaculous/test/unit/unittest_test.html

@@ -45 +45 @@
-<script type="text/javascript" language="javascript" charset="utf-8">
-// <![CDATA[
+
+  var testObj = {
+    isNice: function(){
+      return true;
+    },
+    isBroken: function(){
+      return false;
+    }
+  }
-
-  new Test.Unit.Runner({
@@ -105 +114 @@
-      assertNotInstanceOf(Effect.Parallel, new Effect.Opacity('testcss1',{sync:true}), "(note: fails with firefox 1.0.X, fixed in Deer Park)");   
-    }},
+    
+    testAssertReturns: function() { with(this) {
+      
+      assertReturnsTrue('isNice',testObj);
+      assertReturnsFalse('isBroken',testObj);
+      
+      assertReturnsTrue('nice',testObj);
+      assertReturnsFalse('broken',testObj);
+      
+    }},
-  
-    testAssertVisible: function() { with(this) {