Add some test cases (#15)

Author: supercaracal

Rakefile

@@ -14,7 +14,7 @@ desc 'Wait for cluster to be ready'
 task :wait do
   $LOAD_PATH.unshift(File.expand_path('test', __dir__))
   require 'redis_client/cluster/controller'
-  nodes = (7000..7005).map { |port| "redis://127.0.0.1:#{port}" }
+  nodes = (7000..7005).map { |port| "#{ENV.fetch('REDIS_SCHEME', 'redis')}://127.0.0.1:#{port}" }
   ctrl = ::RedisClient::Cluster::Controller.new(nodes)
   ctrl.wait_for_cluster_to_be_ready
 end

lib/redis_client/cluster/node_key.rb

@@ -16,10 +16,15 @@ def hashify(node_key)
       end
 
       def split(node_key)
-        node_key.split(DELIMITER)
+        pos = node_key&.rindex(DELIMITER, -1)
+        return [node_key, nil] if pos.nil?
+
+        [node_key[0, pos], node_key[pos + 1, node_key.size - pos - 1]]
       end
 
       def build_from_uri(uri)
+        return '' if uri.nil?
+
         "#{uri.host}#{DELIMITER}#{uri.port}"
       end
 

test/redis_client/cluster/test_command.rb

@@ -13,7 +13,7 @@ class TestCommand < Minitest::Test
 
       def test_load
         [
-          { nodes: @clients, error: nil },
+          { nodes: @raw_clients, error: nil },
           { nodes: [], error: ::RedisClient::Cluster::InitialSetupError },
           { nodes: [''], error: NoMethodError },
           { nodes: nil, error: ::RedisClient::Cluster::InitialSetupError }
@@ -64,7 +64,7 @@ def test_parse_command_details
       end
 
       def test_extract_first_key
-        cmd = ::RedisClient::Cluster::Command.load(@clients)
+        cmd = ::RedisClient::Cluster::Command.load(@raw_clients)
         [
           { command: %w[SET foo 1], want: 'foo' },
           { command: %w[GET foo], want: 'foo' },
@@ -83,7 +83,7 @@ def test_extract_first_key
       end
 
       def test_should_send_to_primary?
-        cmd = ::RedisClient::Cluster::Command.load(@clients)
+        cmd = ::RedisClient::Cluster::Command.load(@raw_clients)
         [
           { command: %w[SET foo 1], want: true },
           { command: %w[GET foo], want: false },
@@ -98,7 +98,7 @@ def test_should_send_to_primary?
       end
 
       def test_should_send_to_replica?
-        cmd = ::RedisClient::Cluster::Command.load(@clients)
+        cmd = ::RedisClient::Cluster::Command.load(@raw_clients)
         [
           { command: %w[SET foo 1], want: false },
           { command: %w[GET foo], want: true },
@@ -167,7 +167,7 @@ def test_dig_details
       end
 
       def test_determine_first_key_position
-        cmd = ::RedisClient::Cluster::Command.load(@clients)
+        cmd = ::RedisClient::Cluster::Command.load(@raw_clients)
         [
           { command: %w[EVAL "return ARGV[1]" 0 hello], want: 3 },
           { command: [['EVAL'], '"return ARGV[1]"', 0, 'hello'], want: 3 },
@@ -192,7 +192,7 @@ def test_determine_first_key_position
       end
 
       def test_determine_optional_key_position
-        cmd = ::RedisClient::Cluster::Command.load(@clients)
+        cmd = ::RedisClient::Cluster::Command.load(@raw_clients)
         [
           { params: { command: %w[XREAD COUNT 2 STREAMS mystream writers 0-0 0-0], option_name: 'streams' }, want: 4 },
           { params: { command: %w[XREADGROUP GROUP group consumer STREAMS key id], option_name: 'streams' }, want: 5 },
@@ -210,7 +210,7 @@ def test_determine_optional_key_position
       end
 
       def test_extract_hash_tag
-        cmd = ::RedisClient::Cluster::Command.load(@clients)
+        cmd = ::RedisClient::Cluster::Command.load(@raw_clients)
         [
           { key: 'foo', want: '' },
           { key: 'foo{bar}baz', want: 'bar' },

test/redis_client/cluster/test_key_slot_converter.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'testing_helper'
+require 'redis_client/cluster/key_slot_converter'
+
+class RedisClient
+  class Cluster
+    class TestKeySlotConverter < Minitest::Test
+      include TestingHelper
+
+      def test_convert
+        (1..255).map { |i| "key#{i}" }.each_with_index do |key, idx|
+          want = @raw_clients.first.call('CLUSTER', 'KEYSLOT', key)
+          got = ::RedisClient::Cluster::KeySlotConverter.convert(key)
+          assert_equal(want, got, "Case: #{idx}")
+        end
+      end
+    end
+  end
+end

test/redis_client/cluster/test_node_key.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'uri'
+require 'testing_helper'
+require 'redis_client/cluster/node_key'
+
+class RedisClient
+  class Cluster
+    class TestNodeKey < Minitest::Test
+      def test_hashify
+        [
+          { node_key: '127.0.0.1:6379', want: { host: '127.0.0.1', port: '6379' } },
+          { node_key: '::1:6379', want: { host: '::1', port: '6379' } },
+          { node_key: 'foobar', want: { host: 'foobar', port: nil } },
+          { node_key: '', want: { host: '', port: nil } },
+          { node_key: nil, want: { host: nil, port: nil } }
+        ].each_with_index do |c, idx|
+          got = ::RedisClient::Cluster::NodeKey.hashify(c[:node_key])
+          assert_equal(c[:want], got, "Case: #{idx}")
+        end
+      end
+
+      def test_split
+        [
+          { node_key: '127.0.0.1:6379', want: ['127.0.0.1', '6379'] },
+          { node_key: '::1:6379', want: ['::1', '6379'] },
+          { node_key: 'foobar', want: ['foobar', nil] },
+          { node_key: '', want: ['', nil] },
+          { node_key: nil, want: [nil, nil] }
+        ].each_with_index do |c, idx|
+          got = ::RedisClient::Cluster::NodeKey.split(c[:node_key])
+          assert_equal(c[:want], got, "Case: #{idx}")
+        end
+      end
+
+      def test_build_from_uri
+        [
+          { uri: URI('redis://127.0.0.1:6379'), want: '127.0.0.1:6379' },
+          { uri: nil, want: '' }
+        ].each_with_index do |c, idx|
+          got = ::RedisClient::Cluster::NodeKey.build_from_uri(c[:uri])
+          assert_equal(c[:want], got, "Case: #{idx}")
+        end
+      end
+
+      def test_build_from_host_port
+        [
+          { params: { host: '127.0.0.1', port: 6379 }, want: '127.0.0.1:6379' },
+          { params: { host: nil, port: nil }, want: ':' }
+        ].each_with_index do |c, idx|
+          got = ::RedisClient::Cluster::NodeKey.build_from_host_port(c[:params][:host], c[:params][:port])
+          assert_equal(c[:want], got, "Case: #{idx}")
+        end
+      end
+    end
+  end
+end

test/testing_helper.rb

@@ -9,11 +9,11 @@ module TestingHelper
     NODE_ADDRS = (7000..7005).map { |port| "#{REDIS_SCHEME}://127.0.0.1:#{port}" }.freeze
 
     def setup
-      @clients = NODE_ADDRS.map { |addr| ::RedisClient.config(url: addr).new_client }
+      @raw_clients = NODE_ADDRS.map { |addr| ::RedisClient.config(url: addr).new_client }
     end
 
     def teardown
-      @clients&.each(&:close)
+      @raw_clients&.each(&:close)
     end
   end
 end