Changeset 7631

Timestamp:

03/17/07 20:36:54 (22 months ago)

Author:

alex

Message:

changing the names to assert* from is*. Refs #2550

Location:

dojo/trunk/tests

Files:

• runner.js (modified) (4 diffs)
• _base.js (modified) (4 diffs)

dojo/trunk/tests/runner.js

@@ -430 +430 @@
 //
 
-tests.isTrue = function(/*Object*/ condition){
+tests.assertTrue = function(/*Object*/ condition){
         // summary:
         //              is the passed item "truthy"?
         if(!eval(condition)){
-                throw tests._AssertFailure("isTrue('" + condition + "') failed");
-        }
-}
-
-tests.isFalse = function(/*Object*/ condition){
+                throw tests._AssertFailure("assertTrue('" + condition + "') failed");
+        }
+}
+
+tests.assertFalse = function(/*Object*/ condition){
         // summary:
         //              is the passed item "falsey"?
         if(eval(condition)){
-                throw tests._AssertFailure("isFalse('" + condition + "') failed");
-        }
-}
-
-tests.isEq = function(/*Object*/ expected, /*Object*/ actual){
+                throw tests._AssertFailure("assertFalse('" + condition + "') failed");
+        }
+}
+
+tests.assertEqual = function(/*Object*/ expected, /*Object*/ actual){
         // summary:
         //              are the passed expected and actual objects/values deeply
@@ -467 +467 @@
                 return true;
         }
-        throw new tests._AssertFailure("isEq() failed: expected |"+expected+"| but got |"+actual+"|");
+        throw new tests._AssertFailure("assertEqual() failed: expected |"+expected+"| but got |"+actual+"|");
 }
 
@@ -474 +474 @@
         // FIXME: we're not handling circular refs. Do we care?
         for(var x=0; x<expected.length; x++){
-                if(!tests.isEq(expected[x], actual[x])){ return false; }
+                if(!tests.assertEqual(expected[x], actual[x])){ return false; }
         }
         return true;
@@ -481 +481 @@
 tests._objPropEq = function(expected, actual){
         for(var x in expected){
-                if(!tests.isEq(expected[x], actual[x])){
+                if(!tests.assertEqual(expected[x], actual[x])){
                         return false;
                 }

dojo/trunk/tests/_base.js

@@ -12 +12 @@
                 function sanityCheckHarness(t){
                         // sanity checks
-                        t.isTrue(true);
-                        t.isFalse(false);
-                        t.isFalse(0);
-                        t.isFalse(null);
+                        t.assertTrue(true);
+                        t.assertFalse(false);
+                        t.assertFalse(0);
+                        t.assertFalse(null);
                         var tObj = { w00t: false, blarg: true };
-                        t.isEq(
+                        t.assertEqual(
                                 ["thinger", "blah", tObj], 
                                 ["thinger", "blah", tObj]
                         );
-                        t.isEq(tObj, tObj);
+                        t.assertEqual(tObj, tObj);
                 },
                 /*
                 // uncomment to tests exception handling
-                function sanityCheckIsTrue(t){
+                function sanityCheckassertTrue(t){
                         // should throw an error
-                        t.isTrue(false);
+                        t.assertTrue(false);
                 },
-                function sanityCheckIsFalse(t){
+                function sanityCheckassertFalse(t){
                         // should throw an error
-                        t.isFalse(true);
+                        t.assertFalse(true);
                 },
-                function sanityCheckIsEq(t){
+                function sanityCheckassertEqual(t){
                         // should throw an error
-                        t.isEq("foo", "bar");
+                        t.assertEqual("foo", "bar");
                 },
                 */
@@ -45 +45 @@
                         },
                         runTest: function(t){
-                                t.isEq("blah", this.foo);
+                                t.assertEqual("blah", this.foo);
                         },
                         tearDown: function(t){
@@ -57 +57 @@
                 [
                         function dojoIsAvailable(t){
-                                t.isTrue(testGlobal["dojo"]);
+                                t.assertTrue(testGlobal["dojo"]);
                         }
                 ]
@@ -72 +72 @@
                                         var d = new tests.Deferred();
                                         setTimeout(d.getTestCallback(function(){
-                                                t.isTrue(true);
-                                                t.isFalse(false);
+                                                t.assertTrue(true);
+                                                t.assertFalse(false);
                                         }), 50);
                                         return d;