Refactored Player#set_sente_from_str().

diff --git a/shogi_server/command.rb b/shogi_server/command.rb
index ba4fe1d..fe0ddf4 100644 (file)
--- a/shogi_server/command.rb
+++ b/shogi_server/command.rb
@@ -543,13 +543,7 @@ module ShogiServer
         if (@command_name == "GAME")
           @player.status = "game_waiting"
           @player.game_name = @game_name
-          if (@my_sente_str == "+")
-            @player.sente = true
-          elsif (@my_sente_str == "-")
-            @player.sente = false
-          else
-            @player.sente = nil
-          end
+          @player.set_sente_from_str(@my_sente_str)
         else                # challenge
           @player.write_safe(sprintf("##[ERROR] can't find rival for %s\n", @game_name))
           @player.status = "connected"

diff --git a/shogi_server/player.rb b/shogi_server/player.rb
index 3a86c96..7e235f9 100644 (file)
--- a/shogi_server/player.rb
+++ b/shogi_server/player.rb
@@ -115,6 +115,16 @@ class BasicPlayer
       @player_id = @password = nil
     end
   end
+
+  def set_sente_from_str(str)
+    case str
+    when "+": @sente = true
+    when "-": @sente = false
+    else
+      # str should be "*"
+      @sente = nil
+    end
+  end
 end
 
 

diff --git a/test/TC_player.rb b/test/TC_player.rb
index 6858bad..78dd946 100644 (file)
--- a/test/TC_player.rb
+++ b/test/TC_player.rb
@@ -41,5 +41,11 @@ class TestPlayer < Test::Unit::TestCase
     assert(@p.is_human?)
     assert(!@p.is_computer?)
   end
+
+  def test_set_sente_from_str
+    assert_equal true,  @p.set_sente_from_str("+")
+    assert_equal false, @p.set_sente_from_str("-")
+    assert_nil          @p.set_sente_from_str("*")
+  end
 end