Clean up tests following is_keys_position_request merge

Author: gavrie

Cargo.toml

@@ -13,6 +13,10 @@ readme = "README.md"
 name = "hello"
 crate-type = ["cdylib"]
 
+[[example]]
+name = "keys_pos"
+crate-type = ["cdylib"]
+
 [[example]]
 name = "data_type"
 crate-type = ["cdylib"]

examples/hello.rs

@@ -1,22 +1,13 @@
 #[macro_use]
 extern crate redis_module;
 
-use redis_module::{parse_integer, Context, RedisError, RedisResult, RedisValue};
+use redis_module::{parse_integer, Context, RedisError, RedisResult};
 
-fn hello_mul(ctx: &Context, args: Vec<String>) -> RedisResult {
+fn hello_mul(_: &Context, args: Vec<String>) -> RedisResult {
     if args.len() < 2 {
         return Err(RedisError::WrongArity);
     }
 
-    if ctx.is_keys_position_request() {
-        for i in 1..args.len() {
-            if i % 2 == 0 {
-                ctx.key_at_pos(i as i32);
-            }
-        }
-        return Ok(RedisValue::NoReply);
-    }
-
     let nums = args
         .into_iter()
         .skip(1)
@@ -38,7 +29,7 @@ redis_module! {
     version: 1,
     data_types: [],
     commands: [
-        ["hello.mul", hello_mul, "getkeys-api", 1, 1, 1],
+        ["hello.mul", hello_mul, "", 0, 0, 0],
     ],
 }
 

examples/keys_pos.rs

@@ -0,0 +1,81 @@
+#[macro_use]
+extern crate redis_module;
+
+use redis_module::{Context, RedisError, RedisResult, RedisValue};
+
+fn keys_pos(ctx: &Context, args: Vec<String>) -> RedisResult {
+    // Number of args (excluding command name) must be even
+    if (args.len() - 1) % 2 != 0 {
+        return Err(RedisError::WrongArity);
+    }
+
+    if ctx.is_keys_position_request() {
+        for i in 1..args.len() {
+            if (i - 1) % 2 == 0 {
+                ctx.key_at_pos(i as i32);
+            }
+        }
+        return Ok(RedisValue::NoReply);
+    }
+
+    let reply: Vec<_> = args.iter().skip(1).step_by(2).collect();
+
+    return Ok(reply.into());
+}
+
+//////////////////////////////////////////////////////
+
+redis_module! {
+    name: "keys_pos",
+    version: 1,
+    data_types: [],
+    commands: [
+        ["keys_pos", keys_pos, "getkeys-api", 1, 1, 1],
+    ],
+}
+
+//////////////////////////////////////////////////////
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use redis_module::RedisValue;
+
+    fn into_string_vec(args: &[&str]) -> Vec<String> {
+        args.iter().map(|v| String::from(*v)).collect()
+    }
+
+    fn into_redisvalue_vec(args: &[&str]) -> Vec<RedisValue> {
+        args.iter()
+            .map(|&s| RedisValue::BulkString(s.to_string()))
+            .collect()
+    }
+
+    #[test]
+    fn test_keys_pos() {
+        let result = keys_pos(
+            &Context::dummy(),
+            into_string_vec(&["keys_pos", "a", "1", "b", "2"]),
+        );
+
+        match result {
+            Ok(RedisValue::Array(v)) => {
+                assert_eq!(v, into_redisvalue_vec(&["a", "b"]));
+            }
+            _ => assert!(false, "Bad result: {:?}", result),
+        }
+    }
+
+    #[test]
+    fn test_keys_pos_bad_args() {
+        let result = keys_pos(
+            &Context::dummy(),
+            into_string_vec(&["keys_pos", "a", "1", "b"]),
+        );
+
+        match result {
+            Err(RedisError::WrongArity) => (),
+            _ => assert!(false, "Bad result: {:?}", result),
+        }
+    }
+}

src/context.rs

@@ -7,7 +7,7 @@ use crate::raw;
 use crate::LogLevel;
 use crate::{RedisError, RedisResult, RedisString, RedisValue};
 
-/// Redis is a structure that's designed to give us a high-level interface to
+/// `Context` is a structure that's designed to give us a high-level interface to
 /// the Redis module API by abstracting away the raw C FFI calls.
 pub struct Context {
     ctx: *mut raw::RedisModuleCtx,
@@ -57,6 +57,11 @@ impl Context {
     }
 
     pub fn is_keys_position_request(&self) -> bool {
+        // HACK: Used for tests, where the context is null
+        if self.ctx.is_null() {
+            return false;
+        }
+
         let result = unsafe { raw::RedisModule_IsKeysPositionRequest.unwrap()(self.ctx) };
 
         result != 0