redis 4.0.1 → 4.0.3

data/test/cluster_commands_on_strings_test.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+require_relative 'lint/strings'
+
+# ruby -w -Itest test/cluster_commands_on_strings_test.rb
+# @see https://redis.io/commands#string
+class TestClusterCommandsOnStrings < Test::Unit::TestCase
+  include Helper::Cluster
+  include Lint::Strings
+
+  def mock(*args, &block)
+    redis_cluster_mock(*args, &block)
+  end
+end

data/test/cluster_commands_on_transactions_test.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+# ruby -w -Itest test/cluster_commands_on_transactions_test.rb
+# @see https://redis.io/commands#transactions
+class TestClusterCommandsOnTransactions < Test::Unit::TestCase
+  include Helper::Cluster
+
+  def test_discard
+    assert_raise(Redis::Cluster::AmbiguousNodeError) do
+      redis.discard
+    end
+  end
+
+  def test_exec
+    assert_raise(Redis::Cluster::AmbiguousNodeError) do
+      redis.exec
+    end
+  end
+
+  def test_multi
+    assert_raise(Redis::Cluster::AmbiguousNodeError) do
+      redis.multi
+    end
+  end
+
+  def test_unwatch
+    assert_raise(Redis::Cluster::AmbiguousNodeError) do
+      redis.unwatch
+    end
+  end
+
+  def test_watch
+    assert_raise(Redis::CommandError, "CROSSSLOT Keys in request don't hash to the same slot") do
+      redis.watch('key1', 'key2')
+    end
+
+    assert_equal 'OK', redis.watch('{key}1', '{key}2')
+  end
+end

data/test/cluster_commands_on_value_types_test.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+require_relative 'lint/value_types'
+
+# ruby -w -Itest test/cluster_commands_on_value_types_test.rb
+class TestClusterCommandsOnValueTypes < Test::Unit::TestCase
+  include Helper::Cluster
+  include Lint::ValueTypes
+
+  def test_move
+    assert_raise(Redis::CommandError) { super }
+  end
+end

data/test/commands_on_geo_test.rb

@@ -0,0 +1,116 @@
+require_relative "helper"
+
+class TestCommandsGeo < Test::Unit::TestCase
+  include Helper::Client
+
+  def setup
+    super
+
+    target_version "3.2.0" do
+      added_items_count = r.geoadd("Sicily", 13.361389, 38.115556, "Palermo", 15.087269, 37.502669, "Catania")
+      assert_equal 2, added_items_count
+    end
+  end
+
+  def test_georadius_with_sort
+    target_version "3.2.0" do
+      nearest_cities = r.georadius("Sicily", 15, 37, 200, 'km', sort: 'asc')
+      assert_equal %w(Catania Palermo), nearest_cities
+
+      farthest_cities = r.georadius("Sicily", 15, 37, 200, 'km', sort: 'desc')
+      assert_equal %w(Palermo Catania), farthest_cities
+    end
+  end
+
+  def test_georadius_with_count
+    target_version "3.2.0" do
+      city = r.georadius("Sicily", 15, 37, 200, 'km', count: 1)
+      assert_equal %w(Catania), city
+    end
+  end
+
+  def test_georadius_with_options_count_sort
+    target_version "3.2.0" do
+      city = r.georadius("Sicily", 15, 37, 200, 'km', sort: :desc, options: :WITHDIST, count: 1)
+      assert_equal [["Palermo", "190.4424"]], city
+    end
+  end
+
+  def test_georadiusbymember_with_sort
+    target_version "3.2.0" do
+      nearest_cities = r.georadiusbymember("Sicily", "Catania", 200, 'km', sort: 'asc')
+      assert_equal %w(Catania Palermo), nearest_cities
+
+      farthest_cities = r.georadiusbymember("Sicily", "Catania", 200, 'km', sort: 'desc')
+      assert_equal %w(Palermo Catania), farthest_cities
+    end
+  end
+
+  def test_georadiusbymember_with_count
+    target_version "3.2.0" do
+      city = r.georadiusbymember("Sicily", "Catania", 200, 'km', count: 1)
+      assert_equal %w(Catania), city
+    end
+  end
+
+  def test_georadiusbymember_with_options_count_sort
+    target_version "3.2.0" do
+      city = r.georadiusbymember("Sicily", "Catania", 200, 'km', sort: :desc, options: :WITHDIST, count: 1)
+      assert_equal [["Palermo", "166.2742"]], city
+    end
+  end
+
+  def test_geopos
+    target_version "3.2.0" do
+      location = r.geopos("Sicily", "Catania")
+      assert_equal [["15.08726745843887329", "37.50266842333162032"]], location
+
+      locations = r.geopos("Sicily", ["Palermo", "Catania"])
+      assert_equal [["13.36138933897018433", "38.11555639549629859"], ["15.08726745843887329", "37.50266842333162032"]], locations
+    end
+  end
+
+  def test_geopos_nonexistant_location
+    target_version "3.2.0" do
+      location = r.geopos("Sicily", "Rome")
+      assert_equal [nil], location
+
+      locations = r.geopos("Sicily", ["Rome", "Catania"])
+      assert_equal [nil, ["15.08726745843887329", "37.50266842333162032"]], locations
+    end
+  end
+
+  def test_geodist
+    target_version "3.2.0" do
+      distination_in_meters = r.geodist("Sicily", "Palermo", "Catania")
+      assert_equal "166274.1516", distination_in_meters
+
+      distination_in_feet = r.geodist("Sicily", "Palermo", "Catania", 'ft')
+      assert_equal "545518.8700", distination_in_feet
+    end
+  end
+
+  def test_geodist_with_nonexistant_location
+    target_version "3.2.0" do
+      distination = r.geodist("Sicily", "Palermo", "Rome")
+      assert_equal nil, distination
+    end
+  end
+
+  def test_geohash
+    target_version "3.2.0" do
+      geohash = r.geohash("Sicily", "Palermo")
+      assert_equal ["sqc8b49rny0"], geohash
+
+      geohashes = r.geohash("Sicily", ["Palermo", "Catania"])
+      assert_equal %w(sqc8b49rny0 sqdtr74hyu0), geohashes
+    end
+  end
+
+  def test_geohash_with_nonexistant_location
+    target_version "3.2.0" do
+      geohashes = r.geohash("Sicily", ["Palermo", "Rome"])
+      assert_equal ["sqc8b49rny0", nil], geohashes
+    end
+  end
+end

data/test/commands_on_hashes_test.rb

@@ -1,19 +1,7 @@
-require_relative "helper"
-require_relative "lint/hashes"
+require_relative 'helper'
+require_relative 'lint/hashes'
 
 class TestCommandsOnHashes < Test::Unit::TestCase
-
   include Helper::Client
   include Lint::Hashes
-
-  def test_mapped_hmget_in_a_pipeline_returns_hash
-    r.hset("foo", "f1", "s1")
-    r.hset("foo", "f2", "s2")
-
-    result = r.pipelined do
-      r.mapped_hmget("foo", "f1", "f2")
-    end
-
-    assert_equal result[0], { "f1" => "s1", "f2" => "s2" }
-  end
 end

data/test/commands_on_hyper_log_log_test.rb

@@ -1,19 +1,7 @@
-require_relative "helper"
-require_relative "lint/hyper_log_log"
+require_relative 'helper'
+require_relative 'lint/hyper_log_log'
 
 class TestCommandsOnHyperLogLog < Test::Unit::TestCase
-
   include Helper::Client
   include Lint::HyperLogLog
-
-  def test_pfmerge
-    target_version "2.8.9" do
-      r.pfadd "foo", "s1"
-      r.pfadd "bar", "s2"
-
-      assert_equal true, r.pfmerge("res", "foo", "bar")
-      assert_equal 2, r.pfcount("res")
-    end
-  end
-
 end

data/test/commands_on_lists_test.rb

@@ -1,18 +1,7 @@
-require_relative "helper"
-require_relative "lint/lists"
+require_relative 'helper'
+require_relative 'lint/lists'
 
 class TestCommandsOnLists < Test::Unit::TestCase
-
   include Helper::Client
   include Lint::Lists
-
-  def test_rpoplpush
-    r.rpush "foo", "s1"
-    r.rpush "foo", "s2"
-
-    assert_equal "s2", r.rpoplpush("foo", "bar")
-    assert_equal ["s2"], r.lrange("bar", 0, -1)
-    assert_equal "s1", r.rpoplpush("foo", "bar")
-    assert_equal ["s1", "s2"], r.lrange("bar", 0, -1)
-  end
 end

data/test/commands_on_sets_test.rb

@@ -1,75 +1,7 @@
-require_relative "helper"
-require_relative "lint/sets"
+require_relative 'helper'
+require_relative 'lint/sets'
 
 class TestCommandsOnSets < Test::Unit::TestCase
-
   include Helper::Client
   include Lint::Sets
-
-  def test_smove
-    r.sadd "foo", "s1"
-    r.sadd "bar", "s2"
-
-    assert r.smove("foo", "bar", "s1")
-    assert r.sismember("bar", "s1")
-  end
-
-  def test_sinter
-    r.sadd "foo", "s1"
-    r.sadd "foo", "s2"
-    r.sadd "bar", "s2"
-
-    assert_equal ["s2"], r.sinter("foo", "bar")
-  end
-
-  def test_sinterstore
-    r.sadd "foo", "s1"
-    r.sadd "foo", "s2"
-    r.sadd "bar", "s2"
-
-    r.sinterstore("baz", "foo", "bar")
-
-    assert_equal ["s2"], r.smembers("baz")
-  end
-
-  def test_sunion
-    r.sadd "foo", "s1"
-    r.sadd "foo", "s2"
-    r.sadd "bar", "s2"
-    r.sadd "bar", "s3"
-
-    assert_equal ["s1", "s2", "s3"], r.sunion("foo", "bar").sort
-  end
-
-  def test_sunionstore
-    r.sadd "foo", "s1"
-    r.sadd "foo", "s2"
-    r.sadd "bar", "s2"
-    r.sadd "bar", "s3"
-
-    r.sunionstore("baz", "foo", "bar")
-
-    assert_equal ["s1", "s2", "s3"], r.smembers("baz").sort
-  end
-
-  def test_sdiff
-    r.sadd "foo", "s1"
-    r.sadd "foo", "s2"
-    r.sadd "bar", "s2"
-    r.sadd "bar", "s3"
-
-    assert_equal ["s1"], r.sdiff("foo", "bar")
-    assert_equal ["s3"], r.sdiff("bar", "foo")
-  end
-
-  def test_sdiffstore
-    r.sadd "foo", "s1"
-    r.sadd "foo", "s2"
-    r.sadd "bar", "s2"
-    r.sadd "bar", "s3"
-
-    r.sdiffstore("baz", "foo", "bar")
-
-    assert_equal ["s1"], r.smembers("baz")
-  end
 end

data/test/commands_on_sorted_sets_test.rb

@@ -1,150 +1,7 @@
-require_relative "helper"
-require_relative "lint/sorted_sets"
+require_relative 'helper'
+require_relative 'lint/sorted_sets'
 
 class TestCommandsOnSortedSets < Test::Unit::TestCase
-
   include Helper::Client
   include Lint::SortedSets
-
-  def test_zlexcount
-    target_version "2.8.9" do
-      r.zadd "foo", 0, "aaren"
-      r.zadd "foo", 0, "abagael"
-      r.zadd "foo", 0, "abby"
-      r.zadd "foo", 0, "abbygail"
-
-      assert_equal 4, r.zlexcount("foo", "[a", "[a\xff")
-      assert_equal 4, r.zlexcount("foo", "[aa", "[ab\xff")
-      assert_equal 3, r.zlexcount("foo", "(aaren", "[ab\xff")
-      assert_equal 2, r.zlexcount("foo", "[aba", "(abbygail")
-      assert_equal 1, r.zlexcount("foo", "(aaren", "(abby")
-    end
-  end
-
-  def test_zrangebylex
-    target_version "2.8.9" do
-      r.zadd "foo", 0, "aaren"
-      r.zadd "foo", 0, "abagael"
-      r.zadd "foo", 0, "abby"
-      r.zadd "foo", 0, "abbygail"
-
-      assert_equal ["aaren", "abagael", "abby", "abbygail"], r.zrangebylex("foo", "[a", "[a\xff")
-      assert_equal ["aaren", "abagael"], r.zrangebylex("foo", "[a", "[a\xff", :limit => [0, 2])
-      assert_equal ["abby", "abbygail"], r.zrangebylex("foo", "(abb", "(abb\xff")
-      assert_equal ["abbygail"], r.zrangebylex("foo", "(abby", "(abby\xff")
-    end
-  end
-
-  def test_zrevrangebylex
-    target_version "2.9.9" do
-      r.zadd "foo", 0, "aaren"
-      r.zadd "foo", 0, "abagael"
-      r.zadd "foo", 0, "abby"
-      r.zadd "foo", 0, "abbygail"
-
-      assert_equal ["abbygail", "abby", "abagael", "aaren"], r.zrevrangebylex("foo", "[a\xff", "[a")
-      assert_equal ["abbygail", "abby"], r.zrevrangebylex("foo", "[a\xff", "[a", :limit => [0, 2])
-      assert_equal ["abbygail", "abby"], r.zrevrangebylex("foo", "(abb\xff", "(abb")
-      assert_equal ["abbygail"], r.zrevrangebylex("foo", "(abby\xff", "(abby")
-    end
-  end
-
-  def test_zcount
-    r.zadd "foo", 1, "s1"
-    r.zadd "foo", 2, "s2"
-    r.zadd "foo", 3, "s3"
-
-    assert_equal 2, r.zcount("foo", 2, 3)
-  end
-
-  def test_zunionstore
-    r.zadd "foo", 1, "s1"
-    r.zadd "bar", 2, "s2"
-    r.zadd "foo", 3, "s3"
-    r.zadd "bar", 4, "s4"
-
-    assert_equal 4, r.zunionstore("foobar", ["foo", "bar"])
-    assert_equal ["s1", "s2", "s3", "s4"], r.zrange("foobar", 0, -1)
-  end
-
-  def test_zunionstore_with_weights
-    r.zadd "foo", 1, "s1"
-    r.zadd "foo", 3, "s3"
-    r.zadd "bar", 20, "s2"
-    r.zadd "bar", 40, "s4"
-
-    assert_equal 4, r.zunionstore("foobar", ["foo", "bar"])
-    assert_equal ["s1", "s3", "s2", "s4"], r.zrange("foobar", 0, -1)
-
-    assert_equal 4, r.zunionstore("foobar", ["foo", "bar"], :weights => [10, 1])
-    assert_equal ["s1", "s2", "s3", "s4"], r.zrange("foobar", 0, -1)
-  end
-
-  def test_zunionstore_with_aggregate
-    r.zadd "foo", 1, "s1"
-    r.zadd "foo", 2, "s2"
-    r.zadd "bar", 4, "s2"
-    r.zadd "bar", 3, "s3"
-
-    assert_equal 3, r.zunionstore("foobar", ["foo", "bar"])
-    assert_equal ["s1", "s3", "s2"], r.zrange("foobar", 0, -1)
-
-    assert_equal 3, r.zunionstore("foobar", ["foo", "bar"], :aggregate => :min)
-    assert_equal ["s1", "s2", "s3"], r.zrange("foobar", 0, -1)
-
-    assert_equal 3, r.zunionstore("foobar", ["foo", "bar"], :aggregate => :max)
-    assert_equal ["s1", "s3", "s2"], r.zrange("foobar", 0, -1)
-  end
-
-  def test_zinterstore
-    r.zadd "foo", 1, "s1"
-    r.zadd "bar", 2, "s1"
-    r.zadd "foo", 3, "s3"
-    r.zadd "bar", 4, "s4"
-
-    assert_equal 1, r.zinterstore("foobar", ["foo", "bar"])
-    assert_equal ["s1"], r.zrange("foobar", 0, -1)
-  end
-
-  def test_zinterstore_with_weights
-    r.zadd "foo", 1, "s1"
-    r.zadd "foo", 2, "s2"
-    r.zadd "foo", 3, "s3"
-    r.zadd "bar", 20, "s2"
-    r.zadd "bar", 30, "s3"
-    r.zadd "bar", 40, "s4"
-
-    assert_equal 2, r.zinterstore("foobar", ["foo", "bar"])
-    assert_equal ["s2", "s3"], r.zrange("foobar", 0, -1)
-
-    assert_equal 2, r.zinterstore("foobar", ["foo", "bar"], :weights => [10, 1])
-    assert_equal ["s2", "s3"], r.zrange("foobar", 0, -1)
-
-    assert_equal 40.0, r.zscore("foobar", "s2")
-    assert_equal 60.0, r.zscore("foobar", "s3")
-  end
-
-  def test_zinterstore_with_aggregate
-    r.zadd "foo", 1, "s1"
-    r.zadd "foo", 2, "s2"
-    r.zadd "foo", 3, "s3"
-    r.zadd "bar", 20, "s2"
-    r.zadd "bar", 30, "s3"
-    r.zadd "bar", 40, "s4"
-
-    assert_equal 2, r.zinterstore("foobar", ["foo", "bar"])
-    assert_equal ["s2", "s3"], r.zrange("foobar", 0, -1)
-    assert_equal 22.0, r.zscore("foobar", "s2")
-    assert_equal 33.0, r.zscore("foobar", "s3")
-
-    assert_equal 2, r.zinterstore("foobar", ["foo", "bar"], :aggregate => :min)
-    assert_equal ["s2", "s3"], r.zrange("foobar", 0, -1)
-    assert_equal 2.0, r.zscore("foobar", "s2")
-    assert_equal 3.0, r.zscore("foobar", "s3")
-
-    assert_equal 2, r.zinterstore("foobar", ["foo", "bar"], :aggregate => :max)
-    assert_equal ["s2", "s3"], r.zrange("foobar", 0, -1)
-    assert_equal 20.0, r.zscore("foobar", "s2")
-    assert_equal 30.0, r.zscore("foobar", "s3")
-  end
 end