add toBeWithinArray custom jasmine matcher

Author: etpinard

test/jasmine/assets/custom_matchers.js

@@ -64,25 +64,11 @@ var matchers = {
         };
     },
 
-    // toBeCloseTo... but for arrays
     toBeCloseToArray: function() {
         return {
             compare: function(actual, expected, precision, msgExtra) {
-                precision = coercePosition(precision);
-
-                var passed;
-
-                if(Array.isArray(actual) && Array.isArray(expected)) {
-                    var tested = actual.map(function(element, i) {
-                        return isClose(element, expected[i], precision);
-                    });
-
-                    passed = (
-                        expected.length === actual.length &&
-                        tested.indexOf(false) < 0
-                    );
-                }
-                else passed = false;
+                var testFn = makeIsCloseFn(coercePosition(precision));
+                var passed = assertArray(actual, expected, testFn);
 
                 var message = [
                     'Expected', actual, 'to be close to', expected, msgExtra
@@ -96,30 +82,11 @@ var matchers = {
         };
     },
 
-    // toBeCloseTo... but for 2D arrays
     toBeCloseTo2DArray: function() {
         return {
             compare: function(actual, expected, precision, msgExtra) {
-                precision = coercePosition(precision);
-
-                var passed = true;
-
-                if(expected.length !== actual.length) passed = false;
-                else {
-                    for(var i = 0; i < expected.length; ++i) {
-                        if(expected[i].length !== actual[i].length) {
-                            passed = false;
-                            break;
-                        }
-
-                        for(var j = 0; j < expected[i].length; ++j) {
-                            if(!isClose(actual[i][j], expected[i][j], precision)) {
-                                passed = false;
-                                break;
-                            }
-                        }
-                    }
-                }
+                var testFn = makeIsCloseFn(coercePosition(precision));
+                var passed = assert2DArray(actual, expected, testFn);
 
                 var message = [
                     'Expected',
@@ -140,7 +107,29 @@ var matchers = {
     toBeWithin: function() {
         return {
             compare: function(actual, expected, tolerance, msgExtra) {
-                var passed = Math.abs(actual - expected) < tolerance;
+                var testFn = makeIsWithinFn(tolerance);
+                var passed = testFn(actual, expected);
+
+                var message = [
+                    'Expected', actual,
+                    'to be close to', expected,
+                    'within', tolerance,
+                    msgExtra
+                ].join(' ');
+
+                return {
+                    pass: passed,
+                    message: message
+                };
+            }
+        };
+    },
+
+    toBeWithinArray: function() {
+        return {
+            compare: function(actual, expected, tolerance, msgExtra) {
+                var testFn = makeIsWithinFn(tolerance);
+                var passed = assertArray(actual, expected, testFn);
 
                 var message = [
                     'Expected', actual,
@@ -183,15 +172,59 @@ var matchers = {
     }
 };
 
-function isClose(actual, expected, precision) {
-    if(isNumeric(actual) && isNumeric(expected)) {
-        return Math.abs(actual - expected) < precision;
+function assertArray(actual, expected, testFn) {
+    if(Array.isArray(actual) && Array.isArray(expected)) {
+        var tested = actual.map(function(element, i) {
+            return testFn(element, expected[i]);
+        });
+
+        return (
+            expected.length === actual.length &&
+            tested.indexOf(false) < 0
+        );
     }
+    return false;
+}
 
-    return (
-        actual === expected ||
-        (isNaN(actual) && isNaN(expected))
-    );
+function assert2DArray(actual, expected, testFn) {
+    if(expected.length !== actual.length) return false;
+
+    for(var i = 0; i < expected.length; i++) {
+        if(expected[i].length !== actual[i].length) {
+            return false;
+        }
+
+        for(var j = 0; j < expected[i].length; j++) {
+            if(!testFn(actual[i][j], expected[i][j])) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
+function makeIsCloseFn(precision) {
+    return function isClose(actual, expected) {
+        if(isNumeric(actual) && isNumeric(expected)) {
+            return Math.abs(actual - expected) < precision;
+        }
+        return (
+            actual === expected ||
+            (isNaN(actual) && isNaN(expected))
+        );
+    };
+}
+
+function makeIsWithinFn(tolerance) {
+    return function isWithin(actual, expected) {
+        if(isNumeric(actual) && isNumeric(expected)) {
+            return Math.abs(actual - expected) < tolerance;
+        }
+        return (
+            actual === expected ||
+            (isNaN(actual) && isNaN(expected))
+        );
+    };
 }
 
 function coercePosition(precision) {