Changeset 14309

Timestamp:

07/07/08 09:28:26 (5 months ago)

Author:

dylan

Message:

fixes #6249, add doh.assertNotEqual, thanks harobed for the patch/cla, \!strict

Files:

• util/trunk/doh/runner.js (modified) (6 diffs)

util/trunk/doh/runner.js

@@ -622 +622 @@
 }
 
+doh.isNot = doh.assertNotEqual = function(/*Object*/ notExpected, /*Object*/ actual){
+        // summary:
+        //              are the passed notexpected and actual objects/values deeply
+        //              not equivalent?
+
+        // Compare undefined always with three equal signs, because undefined==null
+        // is true, but undefined===null is false. 
+        if((notExpected === undefined)&&(actual === undefined)){ 
+        throw new doh._AssertFailure("assertNotEqual() failed: not expected |"+notExpected+"| but got |"+actual+"|");
+        }
+        if(arguments.length < 2){ 
+                throw doh._AssertFailure("assertEqual failed because it was not passed 2 arguments"); 
+        } 
+        if((notExpected === actual)||(notExpected == actual)){ 
+        throw new doh._AssertFailure("assertNotEqual() failed: not expected |"+notExpected+"| but got |"+actual+"|");
+        }
+        if(     (this._isArray(notExpected) && this._isArray(actual))&&
+                (this._arrayEq(notExpected, actual)) ){
+                throw new doh._AssertFailure("assertNotEqual() failed: not expected |"+notExpected+"| but got |"+actual+"|");
+        }
+        if( ((typeof notExpected == "object")&&((typeof actual == "object")))&&
+                (this._objPropEq(notExpected, actual)) ){
+        throw new doh._AssertFailure("assertNotEqual() failed: not expected |"+notExpected+"| but got |"+actual+"|");
+        }
+    return true;
+}
+
 doh._arrayEq = function(expected, actual){
         if(expected.length != actual.length){ return false; }
@@ -635 +662 @@
                 return actual instanceof Date && expected.getTime()==actual.getTime();
         }
+        var x;
         // Make sure ALL THE SAME properties are in both objects!
-        for(var x in actual){ // Lets check "actual" here, expected is checked below.
+        for(x in actual){ // Lets check "actual" here, expected is checked below.
                 if(expected[x] === undefined){
                         return false;
@@ -642 +670 @@
         };
 
-        for(var x in expected){
+        for(x in expected){
                 if(!doh.assertEqual(expected[x], actual[x])){
                         return false;
@@ -917 +945 @@
 (function(){
         // scope protection
+        var x;
         try{
                 if(typeof dojo != "undefined"){
@@ -963 +992 @@
                                 // find runner.js, load _browserRunner relative to it
                                 var scripts = document.getElementsByTagName("script");
-                                for(var x=0; x<scripts.length; x++){
+                                for(x=0; x<scripts.length; x++){
                                         var s = scripts[x].src;
                                         if(s && (s.substr(-9) == "runner.js")){
@@ -983 +1012 @@
                         var testUrl = "";
                         var testModule = "dojo.tests.module";
-                        for(var x=0; x<arguments.length; x++){
+                        for(x=0; x<arguments.length; x++){
                                 if(arguments[x].indexOf("=") > 0){
                                         var tp = arguments[x].split("=");