From f10884d1c4a2a34d78f6afe2aded1409b79093ae Mon Sep 17 00:00:00 2001
From: cloudhead <self@cloudhead.net>
Date: Sun, 13 Jun 2010 15:30:54 -0400
Subject: [PATCH] improved assertion error messages. added tests

---
 lib/assert/macros.js | 10 +++++-----
 test/vows-test.js    | 10 ++++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/assert/macros.js b/lib/assert/macros.js
index 0246885..bd7f509 100644
--- a/lib/assert/macros.js
+++ b/lib/assert/macros.js
@@ -32,12 +32,12 @@ assert.matches = assert.match;
 
 assert.isTrue = function (actual, message) {
     if (actual !== true) {
-        assert.fail(actual, true, message || "expected {actual} to be {expected}", "===", assert.isTrue);
+        assert.fail(actual, true, message || "expected {expected}, got {actual}", "===", assert.isTrue);
     }
 };
 assert.isFalse = function (actual, message) {
     if (actual !== false) {
-        assert.fail(actual, false, message || "expected {actual} to be {expected}", "===", assert.isFalse);
+        assert.fail(actual, false, message || "expected {expected}, got {actual}", "===", assert.isFalse);
     }
 };
 assert.isZero = function (actual, message) {
@@ -47,7 +47,7 @@ assert.isZero = function (actual, message) {
 };
 assert.isNotZero = function (actual, message) {
     if (actual === 0) {
-        assert.fail(actual, 0, message || "expected {expected}, got {actual}", "===", assert.isNotZero);
+        assert.fail(actual, 0, message || "expected non-zero value, got {actual}", "===", assert.isNotZero);
     }
 };
 
@@ -117,12 +117,12 @@ assert.isNaN = function (actual, message) {
 };
 assert.isNull = function (actual, message) {
     if (actual !== null) {
-        assert.fail(actual, null, message || "expected {actual} to be {expected}", "===", assert.isNull);
+        assert.fail(actual, null, message || "expected {expected}, got {actual}", "===", assert.isNull);
     }
 };
 assert.isNotNull = function (actual, message) {
     if (actual === null) {
-        assert.fail(actual, null, message || "expected {actual} to not be {expected}", "===", assert.isNotNull);
+        assert.fail(actual, null, message || "expected non-null value, got {actual}", "===", assert.isNotNull);
     }
 };
 assert.isUndefined = function (actual, message) {
diff --git a/test/vows-test.js b/test/vows-test.js
index c864feb..cb28977 100644
--- a/test/vows-test.js
+++ b/test/vows-test.js
@@ -44,6 +44,16 @@ vows.describe("Vows").addVows({
             assert.isNumber(0);
             assert.isNaN(0/0);
         },
+        "testing value": function (it) {
+            assert.isFalse(false);
+            assert.isTrue(true);
+            assert.isZero(0);
+            assert.isNotZero(1);
+            assert.isNull(null);
+            assert.isNotNull(0);
+            assert.greater(5, 4);
+            assert.lesser(4, 5);
+        },
         "testing emptiness": function (it) {
             assert.isEmpty({});
             assert.isEmpty([]);