added assert.isNotEmpty and assert.isDefined

vowsjs · Aug 12, 2011 · c7f9e3c · c7f9e3c
1 parent 484b5f4
commit c7f9e3c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/lib/assert/macros.js b/lib/assert/macros.js
@@ -104,6 +104,11 @@ assert.isEmpty = function (actual, message) {
         assert.fail(actual, 0, message || "expected {actual} to be empty", "length", assert.isEmpty);
     }
 };
+assert.isNotEmpty = function (actual, message) {
+    if ((isObject(actual) && Object.keys(actual).length === 0) || actual.length === 0) {
+        assert.fail(actual, 0, message || "expected {actual} to be not empty", "length", assert.isNotEmpty);
+    }
+};
 
 assert.length = function (actual, expected, message) {
     if (actual.length !== expected) {
@@ -152,6 +157,11 @@ assert.isUndefined = function (actual, message) {
         assert.fail(actual, undefined, message || "expected {actual} to be {expected}", "===", assert.isUndefined);
     }
 };
+assert.isDefined = function (actual, message) {
+    if(actual === undefined) {
+        assert.fail(actual, 0, message || "expected {actual} to be defined", "===", assert.isDefined);
+    }
+};
 assert.isString = function (actual, message) {
     assertTypeOf(actual, 'string', message || "expected {actual} to be a String", assert.isString);
 };

diff --git a/test/assert-test.js b/test/assert-test.js
@@ -16,6 +16,10 @@ vows.describe('vows/assert').addBatch({
             assert.length("hello world", 11);
             assert.length([1, 2, 3], 3);
         },
+        "`isDefined`": function (assert) {
+            assert.isDefined(null);
+            assertError(assert.isDefined, undefined);
+        },
         "`include`": function (assert) {
             assert.include("hello world", "world");
             assert.include([0, 42, 0],    42);
@@ -78,6 +82,10 @@ vows.describe('vows/assert').addBatch({
             assert.isUndefined(undefined);
             assertError(assert.isUndefined, null);
         },
+        "`isDefined`": function (assert) {
+            assert.isDefined(null);
+            assertError(assert.isDefined, undefined);
+        },
         "`isNull`": function (assert) {
             assert.isNull(null);
             assertError(assert.isNull, 0);
@@ -101,6 +109,14 @@ vows.describe('vows/assert').addBatch({
             assert.isEmpty({});
             assert.isEmpty([]);
             assert.isEmpty("");
+        },
+        "`isNotEmpty`": function (assert) {
+            assert.isNotEmpty({goo:true});
+            assert.isNotEmpty([1]);
+            assert.isNotEmpty(" ");
+            assertError(assert.isNotEmpty, {});
+            assertError(assert.isNotEmpty, []);
+            assertError(assert.isNotEmpty, "");
         }
     }
 }).export(module);