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

- old
+ new

@@ -1,133 +1,151 @@ -require File.expand_path("../redis_mock", File.dirname(__FILE__)) +module Lint -include RedisMock::Helper + module Strings -test "SET and GET" do |r| - r.set("foo", "s1") + def test_set_and_get + r.set("foo", "s1") - assert "s1" == r.get("foo") -end + assert_equal "s1", r.get("foo") + end -test "SET and GET with brackets" do |r| - r["foo"] = "s1" + def test_set_and_get_with_brackets + r["foo"] = "s1" - assert "s1" == r["foo"] -end + assert_equal "s1", r["foo"] + end -test "SET and GET with brackets and symbol" do |r| - r[:foo] = "s1" + def test_set_and_get_with_brackets_and_symbol + r[:foo] = "s1" - assert "s1" == r[:foo] -end + assert_equal "s1", r[:foo] + end -test "SET and GET with newline characters" do |r| - r.set("foo", "1\n") + def test_set_and_get_with_newline_characters + r.set("foo", "1\n") - assert "1\n" == r.get("foo") -end + assert_equal "1\n", r.get("foo") + end -test "SET and GET with ASCII characters" do |r| - with_external_encoding("ASCII-8BIT") do - (0..255).each do |i| - str = "#{i.chr}---#{i.chr}" - r.set("foo", str) + def test_set_and_get_with_ascii_characters + if defined?(Encoding) + with_external_encoding("ASCII-8BIT") do + (0..255).each do |i| + str = "#{i.chr}---#{i.chr}" + r.set("foo", str) - assert str == r.get("foo") + assert_equal str, r.get("foo") + end + end + end end - end -end if defined?(Encoding) -test "SETEX" do - redis_mock(:setex => lambda { |*args| "+#{args.join(" ")}" }) do - r = Redis.new(OPTIONS.merge(:port => 6380)) + def test_setex + assert r.setex("foo", 1, "bar") + assert_equal "bar", r.get("foo") + assert [0, 1].include? r.ttl("foo") + end - assert_equal "foo 1 s1", r.setex("foo", 1, "s1") - end -end + def test_psetex + return if version < "2.5.4" -test "GETSET" do |r| - r.set("foo", "bar") + assert r.psetex("foo", 1000, "bar") + assert_equal "bar", r.get("foo") + assert [0, 1].include? r.ttl("foo") + end - assert "bar" == r.getset("foo", "baz") - assert "baz" == r.get("foo") -end + def test_getset + r.set("foo", "bar") -test "SETNX" do |r| - r.set("foo", "s1") + assert_equal "bar", r.getset("foo", "baz") + assert_equal "baz", r.get("foo") + end - assert "s1" == r.get("foo") + def test_setnx + r.set("foo", "s1") - r.setnx("foo", "s2") + assert_equal "s1", r.get("foo") - assert "s1" == r.get("foo") -end + r.setnx("foo", "s2") -test "INCR" do |r| - assert 1 == r.incr("foo") - assert 2 == r.incr("foo") - assert 3 == r.incr("foo") -end + assert_equal "s1", r.get("foo") + end -test "INCRBY" do |r| - assert 1 == r.incrby("foo", 1) - assert 3 == r.incrby("foo", 2) - assert 6 == r.incrby("foo", 3) -end + def test_incr + assert_equal 1, r.incr("foo") + assert_equal 2, r.incr("foo") + assert_equal 3, r.incr("foo") + end -test "DECR" do |r| - r.set("foo", 3) + def test_incrby + assert_equal 1, r.incrby("foo", 1) + assert_equal 3, r.incrby("foo", 2) + assert_equal 6, r.incrby("foo", 3) + end - assert 2 == r.decr("foo") - assert 1 == r.decr("foo") - assert 0 == r.decr("foo") -end + def test_incrbyfloat + return if version < "2.5.4" -test "DECRBY" do |r| - r.set("foo", 6) + assert_equal 1.23, r.incrbyfloat("foo", 1.23) + assert_equal 2 , r.incrbyfloat("foo", 0.77) + assert_equal 1.9 , r.incrbyfloat("foo", -0.1) + end - assert 3 == r.decrby("foo", 3) - assert 1 == r.decrby("foo", 2) - assert 0 == r.decrby("foo", 1) -end + def test_decr + r.set("foo", 3) -test "APPEND" do |r| - r.set "foo", "s" - r.append "foo", "1" + assert_equal 2, r.decr("foo") + assert_equal 1, r.decr("foo") + assert_equal 0, r.decr("foo") + end - assert "s1" == r.get("foo") -end + def test_decrby + r.set("foo", 6) -test "GETBIT" do |r| - r.set("foo", "a") + assert_equal 3, r.decrby("foo", 3) + assert_equal 1, r.decrby("foo", 2) + assert_equal 0, r.decrby("foo", 1) + end - assert_equal 1, r.getbit("foo", 1) - assert_equal 1, r.getbit("foo", 2) - assert_equal 0, r.getbit("foo", 3) - assert_equal 0, r.getbit("foo", 4) - assert_equal 0, r.getbit("foo", 5) - assert_equal 0, r.getbit("foo", 6) - assert_equal 1, r.getbit("foo", 7) -end + def test_append + r.set "foo", "s" + r.append "foo", "1" -test "SETBIT" do |r| - r.set("foo", "a") + assert_equal "s1", r.get("foo") + end - r.setbit("foo", 6, 1) + def test_getbit + r.set("foo", "a") - assert_equal "c", r.get("foo") -end + assert_equal 1, r.getbit("foo", 1) + assert_equal 1, r.getbit("foo", 2) + assert_equal 0, r.getbit("foo", 3) + assert_equal 0, r.getbit("foo", 4) + assert_equal 0, r.getbit("foo", 5) + assert_equal 0, r.getbit("foo", 6) + assert_equal 1, r.getbit("foo", 7) + end -test "GETRANGE" do |r| - r.set("foo", "abcde") + def test_setbit + r.set("foo", "a") - assert_equal "bcd", r.getrange("foo", 1, 3) - assert_equal "abcde", r.getrange("foo", 0, -1) -end + r.setbit("foo", 6, 1) -test "SETRANGE" do |r| - r.set("foo", "abcde") + assert_equal "c", r.get("foo") + end - r.setrange("foo", 1, "bar") + def test_getrange + r.set("foo", "abcde") - assert_equal "abare", r.get("foo") + assert_equal "bcd", r.getrange("foo", 1, 3) + assert_equal "abcde", r.getrange("foo", 0, -1) + end + + def test_setrange + r.set("foo", "abcde") + + r.setrange("foo", 1, "bar") + + assert_equal "abare", r.get("foo") + end + end end