ShardClient tested for setex, ttl, expire

Author: Ben Buckman

test/test_sharding.js

@@ -22,7 +22,8 @@ var Sharding = require('../lib/sharding');
 var testUtils = require('./utils'),
     require_string = testUtils.require_string,
     require_error = testUtils.require_error,
-    require_number = testUtils.require_number;
+    require_number = testUtils.require_number,
+    require_number_pos = testUtils.require_number_pos;
 
 var MockLogger = testUtils.MockLogger;
 
@@ -239,7 +240,7 @@ describe('RedisShardingClient', function(){
       'end', 'send_command', 'server_info',
 
       // some @todo
-      'watch', 'unwatch', 'migrate', 'dump', 'select', /* and lots more... */
+      'watch', 'unwatch', 'migrate', 'dump', 'select', 'auth', /* and lots more... */
       ].forEach(function(command){
         assert.throws(function(){
           client[command]();
@@ -691,24 +692,56 @@ describe('RedisShardingClient', function(){
           });
         }
       ], done);
+    });
+
+
+    it('supports expiration', function(done){
+      var exKey = randomTestKey('setex:D');
+      shardClient.SETEX([exKey, "100", "setex val"], require_string("OK", 'SETEX'));
+      
+      // deliberate constraint
+      assert.throws(function(){
+        shardClient.exists([exKey], require_number(1, 'setext exists'));
+      }, /must be a string/);
+
+      shardClient.exists(exKey, require_number(1, 'setext exists'));
+      
+      // deliberate constraint
+      assert.throws(function(){
+        shardClient.ttl([exKey], require_number_pos('ttl with array'));
+      }, /must be a string/);
+
+      shardClient.ttl(exKey, require_number_pos('TTL'));
+
+      shardClient.PSETEX([exKey, "100", "psetex val"], require_string("OK", 'PSETEX'));
+      shardClient.PTTL(exKey, require_number_pos('PTTL'));
+
+      shardClient.set(exKey, 'bar', require_string("OK", 'set for expire'));
+      shardClient.EXPIRE(exKey, "1", require_number_pos('expire'));
+      setTimeout(function(){
+        shardClient.exists(exKey, require_number(1, 'expire check 1'));
+      }, 200);
+      setTimeout(function(){
+        shardClient.exists(exKey, require_number(0, 'expire check 2', done));
+      }, 1100);
+
+      // @todo expireat, pexpire, pexpireat...
+    });
 
 
       // @todo test more commands with array inputs...?
 
       // @todo test remaining commands:
       /*
       'persist', 'lpop', 'rpop',
-      'llen', 'scard', 'ttl', 'pttl',
+      'llen', 'scard', 'pttl',
       'smembers'
 
       'rename', 'renamenx',
-      'expire', 'expireat', 'pexpire', 'pexpireat'
 
-      'hincrby', 'sadd', 'setex', 'psetex', 'srem', 'lpush', 'rpush'
+      'hincrby', 'sadd', 'psetex', 'srem', 'lpush', 'rpush'
       */
 
-    });
-
   });  
 
 });

test/utils.js

@@ -18,18 +18,20 @@ exports.require_number = function require_number(expected, label, callback) {
     };
 };
 
-exports.require_number_any = function require_number_any(label) {
+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) {
+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;
     };
 };