test/lint/strings.rb in redis-2.2.2 vs test/lint/strings.rb in redis-3.0.0.rc1

@@ -1,5 +1,9 @@
+require File.expand_path("../redis_mock", File.dirname(__FILE__))
+
+include RedisMock::Helper
+
 test "SET and GET" do |r|
   r.set("foo", "s1")
 
   assert "s1" == r.get("foo")
 end
@@ -31,18 +35,16 @@
       assert str == r.get("foo")
     end
   end
 end if defined?(Encoding)
 
-test "SETEX" do |r|
-  r.setex("foo", 1, "s1")
+test "SETEX" do
+  redis_mock(:setex => lambda { |*args| "+#{args.join(" ")}" }) do
+    r = Redis.new(OPTIONS.merge(:port => 6380))
 
-  assert "s1" == r.get("foo")
-
-  sleep 2
-
-  assert nil == r.get("foo")
+    assert_equal "foo 1 s1", r.setex("foo", 1, "s1")
+  end
 end
 
 test "GETSET" do |r|
   r.set("foo", "bar")
 
@@ -91,15 +93,9 @@
 test "APPEND" do |r|
   r.set "foo", "s"
   r.append "foo", "1"
 
   assert "s1" == r.get("foo")
-end
-
-test "SUBSTR" do |r|
-  r.set "foo", "lorem"
-
-  assert "ore" == r.substr("foo", 1, 3)
 end
 
 test "GETBIT" do |r|
   r.set("foo", "a")