Export utils and commands to share (with sentinel client, or others)

index.js

@@ -2,6 +2,7 @@
 
 var net = require("net"),
     util = require("./lib/util"),
+    reply_to_object = require("./lib/utils").reply_to_object,
     Queue = require("./lib/queue"),
     to_array = require("./lib/to_array"),
     events = require("events"),
@@ -537,23 +538,6 @@ function try_callback(callback, reply) {
     }
 }
 
-// hgetall converts its replies to an Object.  If the reply is empty, null is returned.
-function reply_to_object(reply) {
-    var obj = {}, j, jl, key, val;
-
-    if (reply.length === 0) {
-        return null;
-    }
-
-    for (j = 0, jl = reply.length; j < jl; j += 2) {
-        key = reply[j].toString();
-        val = reply[j + 1];
-        obj[key] = val;
-    }
-
-    return obj;
-}
-
 function reply_to_strings(reply) {
     var i;
 
@@ -902,6 +886,8 @@ commands = set_union(["get", "set", "setnx", "setex", "append", "strlen", "del",
     "persist", "slaveof", "debug", "config", "subscribe", "unsubscribe", "psubscribe", "punsubscribe", "publish", "watch", "unwatch", "cluster",
     "restore", "migrate", "dump", "object", "client", "eval", "evalsha"], require("./lib/commands"));
 
+exports.commands = commands;
+
 commands.forEach(function (fullCommand) {
     var command = fullCommand.split(' ')[0];
 

lib/utils.js

@@ -0,0 +1,20 @@
+// hgetall converts its replies to an Object.  If the reply is empty, null is returned.
+function reply_to_object(reply) {
+    var obj = {}, j, jl, key, val;
+
+    if (reply.length === 0) {
+        return null;
+    }
+
+    for (j = 0, jl = reply.length; j < jl; j += 2) {
+        key = reply[j].toString();
+        val = reply[j + 1];
+        obj[key] = val;
+    }
+
+    return obj;
+}
+
+module.exports = {
+    reply_to_object: reply_to_object
+};

test.js

@@ -14,81 +14,30 @@ var redis = require("./index"),
     tests = {},
     connected = false,
     ended = false,
-    next, cur_start, run_next_test, all_tests, all_start, test_count;
+    next, last, cur_start, run_next_test, all_tests, all_start, test_count;
 
 
 // Set this to truthy to see the wire protocol and other debugging info
 redis.debug_mode = process.argv[2];
 
-function server_version_at_least(connection, desired_version) {
-    // Return true if the server version >= desired_version
-    var version = connection.server_info.versions;
-    for (var i = 0; i < 3; i++) {
-        if (version[i] > desired_version[i]) return true;
-        if (version[i] < desired_version[i]) return false;
-    }
-    return true;
-}
-
-function buffers_to_strings(arr) {
-    return arr.map(function (val) {
-        return val.toString();
-    });
-}
-
-function require_number(expected, label) {
-    return function (err, results) {
-        assert.strictEqual(null, err, label + " expected " + expected + ", got error: " + err);
-        assert.strictEqual(expected, results, label + " " + expected + " !== " + results);
-        assert.strictEqual(typeof results, "number", label);
-        return true;
-    };
-}
-
-function require_number_any(label) {
-    return function (err, results) {
-        assert.strictEqual(null, err, label + " expected any number, got error: " + err);
-        assert.strictEqual(typeof results, "number", label + " " + results + " is not a number");
-        return true;
-    };
-}
-
-function require_number_pos(label) {
-    return function (err, results) {
-        assert.strictEqual(null, err, label + " expected positive number, got error: " + err);
-        assert.strictEqual(true, (results > 0), label + " " + results + " is not a positive number");
-        return true;
-    };
-}
-
-function require_string(str, label) {
-    return function (err, results) {
-        assert.strictEqual(null, err, label + " expected string '" + str + "', got error: " + err);
-        assert.equal(str, results, label + " " + str + " does not match " + results);
-        return true;
-    };
-}
-
-function require_null(label) {
-    return function (err, results) {
-        assert.strictEqual(null, err, label + " expected null, got error: " + err);
-        assert.strictEqual(null, results, label + ": " + results + " is not null");
-        return true;
-    };
-}
-
-function require_error(label) {
-    return function (err, results) {
-        assert.notEqual(err, null, label + " err is null, but an error is expected here.");
-        return true;
-    };
-}
-
-function is_empty_array(obj) {
-    return Array.isArray(obj) && obj.length === 0;
-}
+// separated test helpers
+var testUtils = require('./utils'),
+    buffers_to_strings = testUtils.buffers_to_strings,
+    require_number = testUtils.require_number,
+    require_number_any = testUtils.require_number_any,
+    require_number_pos = testUtils.require_number_pos,
+    require_string = testUtils.require_string,
+    require_null = testUtils.require_null,
+    require_error = testUtils.require_error,
+    is_empty_array = testUtils.is_empty_array,
+    server_version_at_least = testUtils.server_version_at_least;
+
+next = exports.next = function next(name) {
+    console.log(" \x1b[33m" + (Date.now() - cur_start) + "\x1b[0m ms");
+    run_next_test();
+};
 
-function last(name, fn) {
+last = exports.last = function last(name, fn) {
     return function (err, results) {
         fn(err, results);
         next(name);

test_utils.js

@@ -0,0 +1,90 @@
+// test runner utils, separated from mranney's test.js.
+
+var assert = require('assert');
+
+exports.buffers_to_strings = function buffers_to_strings(arr) {
+    return arr.map(function (val) {
+        return val.toString();
+    });
+};
+
+exports.require_number = function require_number(expected, label, callback) {
+    return function (err, results) {
+        assert.strictEqual(null, err, label + " expected " + expected + ", got error: " + err);
+        assert.strictEqual(expected, results, label + " " + expected + " !== " + results);
+        assert.strictEqual(typeof results, "number", label);
+        if (typeof callback === 'function') callback();
+        return true;
+    };
+};
+
+exports.require_number_any = function require_number_any(label, callback) {
+    return function (err, results) {
+        assert.strictEqual(null, err, label + " expected any number, got error: " + err);
+        assert.strictEqual(typeof results, "number", label + " " + results + " is not a number");
+        if (typeof callback === 'function') callback();
+        return true;
+    };
+};
+
+exports.require_number_pos = function require_number_pos(label, callback) {
+    return function (err, results) {
+        assert.strictEqual(null, err, label + " expected positive number, got error: " + err);
+        assert.strictEqual(true, (results > 0), label + " " + results + " is not a positive number");
+        if (typeof callback === 'function') callback();
+        return true;
+    };
+};
+
+exports.require_string = function require_string(str, label, callback) {
+    return function (err, results) {
+        assert.strictEqual(null, err, label + " expected string '" + str + "', got error: " + err);
+        assert.strictEqual(str, results, label + " " + str + " does not match " + results);
+        if (typeof callback === 'function') callback();
+        return true;
+    };
+};
+
+exports.require_null = function require_null(label, callback) {
+    return function (err, results) {
+        assert.strictEqual(null, err, label + " expected null, got error: " + err);
+        assert.strictEqual(null, results, label + ": " + results + " is not null");
+        if (typeof callback === 'function') callback();
+        return true;
+    };
+};
+
+exports.require_error = function require_error(label, callback) {
+    return function (err, results) {
+        assert.notEqual(err, null, label + " err is null, but an error is expected here.");
+        if (typeof callback === 'function') callback();
+        return true;
+    };
+};
+
+exports.is_empty_array = function is_empty_array(obj) {
+    return Array.isArray(obj) && obj.length === 0;
+};
+
+exports.server_version_at_least = function server_version_at_least(connection, desired_version) {
+    // Return true if the server version >= desired_version
+    var version = connection.server_info.versions;
+    for (var i = 0; i < 3; i++) {
+        if (version[i] > desired_version[i]) return true;
+        if (version[i] < desired_version[i]) return false;
+    }
+    return true;
+};
+
+
+function MockLogger(){
+  var self = this;
+  this.msgs = [];
+  this.toConsole = false;
+}
+MockLogger.prototype.log = function() {
+  var args = Array.prototype.slice.call(arguments);
+  this.msgs.push(args);
+  if (this.toConsole) console.log.apply(this, args);
+};
+exports.MockLogger = MockLogger;