X-Git-Url: http://git.sourceforge.jp/view?p=shogi-server%2Fshogi-server.git;a=blobdiff_plain;f=test%2FTC_game.rb;h=6fba0f0836009f909e7351b5545a281b3634c9ae;hp=52227e0029f7be49e59bd8d9a93c821cefecd60c;hb=73ae3557f07139fd776880101630ff12bb666259;hpb=08ed00749c918df719407c0d8de72deac7cef3da

diff --git a/test/TC_game.rb b/test/TC_game.rb
index 52227e0..6fba0f0 100644
--- a/test/TC_game.rb
+++ b/test/TC_game.rb
@@ -26,6 +26,14 @@ $league.event = "test"
 
 class TestGame < Test::Unit::TestCase
 
+  def test_parse_time
+    assert_equal ShogiServer::Game::TimeControlParams.new(1500,0,0,false,false),
+                 ShogiServer::Game.parse_time("hoge-1500-0")
+    assert_equal ShogiServer::Game::TimeControlParams.new(600, 0, 10, false, false),
+                 ShogiServer::Game.parse_time("hoge-600-10F")
+    assert_equal true, ShogiServer::Game.parse_time("hoge-600-10f").error
+  end
+
   def test_new
     game_name = "hoge-1500-0"
     board = ShogiServer::Board.new
@@ -42,7 +50,7 @@ class TestGame < Test::Unit::TestCase
 
     p1_out = <<EOF
 BEGIN Game_Summary
-Protocol_Version:1.1
+Protocol_Version:1.2
 Protocol_Mode:Server
 Format:Shogi 1.0
 Declaration:Jishogi 1.1
@@ -57,6 +65,7 @@ BEGIN Time
 Time_Unit:1sec
 Total_Time:1500
 Byoyomi:0
+Increment:0
 Least_Time_Per_Move:#{$options["least-time-per-move"]}
 END Time
 BEGIN Position
@@ -77,7 +86,7 @@ EOF
 
     p2_out = <<EOF
 BEGIN Game_Summary
-Protocol_Version:1.1
+Protocol_Version:1.2
 Protocol_Mode:Server
 Format:Shogi 1.0
 Declaration:Jishogi 1.1
@@ -92,6 +101,115 @@ BEGIN Time
 Time_Unit:1sec
 Total_Time:1500
 Byoyomi:0
+Increment:0
+Least_Time_Per_Move:#{$options["least-time-per-move"]}
+END Time
+BEGIN Position
+P1-KY-KE-GI-KI-OU-KI-GI-KE-KY
+P2 * -HI *  *  *  *  * -KA * 
+P3-FU-FU-FU-FU-FU-FU-FU-FU-FU
+P4 *  *  *  *  *  *  *  *  * 
+P5 *  *  *  *  *  *  *  *  * 
+P6 *  *  *  *  *  *  *  *  * 
+P7+FU+FU+FU+FU+FU+FU+FU+FU+FU
+P8 * +KA *  *  *  *  * +HI * 
+P9+KY+KE+GI+KI+OU+KI+GI+KE+KY
++
+END Position
+END Game_Summary
+EOF
+    assert_equal(p2_out, p2.out.first)
+
+    file = Pathname.new(game.logfile)
+    log = file.read
+    assert_equal(<<EOF, log.gsub(/^\$START_TIME.*?\n/,''))
+V2
+N+p1
+N-p2
+'Max_Moves:#{$options["max-moves"]}
+'Least_Time_Per_Move:#{$options["least-time-per-move"]}
+$EVENT:#{game.game_id}
+P1-KY-KE-GI-KI-OU-KI-GI-KE-KY
+P2 * -HI *  *  *  *  * -KA * 
+P3-FU-FU-FU-FU-FU-FU-FU-FU-FU
+P4 *  *  *  *  *  *  *  *  * 
+P5 *  *  *  *  *  *  *  *  * 
+P6 *  *  *  *  *  *  *  *  * 
+P7+FU+FU+FU+FU+FU+FU+FU+FU+FU
+P8 * +KA *  *  *  *  * +HI * 
+P9+KY+KE+GI+KI+OU+KI+GI+KE+KY
++
+EOF
+  end
+
+  def test_new_fischer
+    game_name = "hoge-600-10F"
+    board = ShogiServer::Board.new
+    board.initial
+    p1 = MockPlayer.new
+    p1.sente = true
+    p1.name  = "p1"
+    p2 = MockPlayer.new
+    p2.sente = false
+    p2.name  = "p2"
+
+    game = ShogiServer::Game.new game_name, p1, p2, board
+    assert_equal "", game.last_move
+
+    p1_out = <<EOF
+BEGIN Game_Summary
+Protocol_Version:1.2
+Protocol_Mode:Server
+Format:Shogi 1.0
+Declaration:Jishogi 1.1
+Game_ID:#{game.game_id}
+Name+:p1
+Name-:p2
+Your_Turn:+
+Rematch_On_Draw:NO
+To_Move:+
+Max_Moves:#{$options["max-moves"]}
+BEGIN Time
+Time_Unit:1sec
+Total_Time:600
+Byoyomi:0
+Increment:10
+Least_Time_Per_Move:#{$options["least-time-per-move"]}
+END Time
+BEGIN Position
+P1-KY-KE-GI-KI-OU-KI-GI-KE-KY
+P2 * -HI *  *  *  *  * -KA * 
+P3-FU-FU-FU-FU-FU-FU-FU-FU-FU
+P4 *  *  *  *  *  *  *  *  * 
+P5 *  *  *  *  *  *  *  *  * 
+P6 *  *  *  *  *  *  *  *  * 
+P7+FU+FU+FU+FU+FU+FU+FU+FU+FU
+P8 * +KA *  *  *  *  * +HI * 
+P9+KY+KE+GI+KI+OU+KI+GI+KE+KY
++
+END Position
+END Game_Summary
+EOF
+    assert_equal(p1_out, p1.out.first)
+
+    p2_out = <<EOF
+BEGIN Game_Summary
+Protocol_Version:1.2
+Protocol_Mode:Server
+Format:Shogi 1.0
+Declaration:Jishogi 1.1
+Game_ID:#{game.game_id}
+Name+:p1
+Name-:p2
+Your_Turn:-
+Rematch_On_Draw:NO
+To_Move:+
+Max_Moves:#{$options["max-moves"]}
+BEGIN Time
+Time_Unit:1sec
+Total_Time:600
+Byoyomi:0
+Increment:10
 Least_Time_Per_Move:#{$options["least-time-per-move"]}
 END Time
 BEGIN Position
@@ -118,6 +236,7 @@ N+p1
 N-p2
 'Max_Moves:#{$options["max-moves"]}
 'Least_Time_Per_Move:#{$options["least-time-per-move"]}
+'Increment:10
 $EVENT:#{game.game_id}
 P1-KY-KE-GI-KI-OU-KI-GI-KE-KY
 P2 * -HI *  *  *  *  * -KA * 
@@ -148,7 +267,7 @@ EOF
 
     p1_out = <<EOF
 BEGIN Game_Summary
-Protocol_Version:1.1
+Protocol_Version:1.2
 Protocol_Mode:Server
 Format:Shogi 1.0
 Declaration:Jishogi 1.1
@@ -163,6 +282,7 @@ BEGIN Time
 Time_Unit:1sec
 Total_Time:1500
 Byoyomi:0
+Increment:0
 Least_Time_Per_Move:#{$options["least-time-per-move"]}
 END Time
 BEGIN Position
@@ -184,7 +304,7 @@ EOF
 
     p2_out = <<EOF
 BEGIN Game_Summary
-Protocol_Version:1.1
+Protocol_Version:1.2
 Protocol_Mode:Server
 Format:Shogi 1.0
 Declaration:Jishogi 1.1
@@ -199,6 +319,7 @@ BEGIN Time
 Time_Unit:1sec
 Total_Time:1500
 Byoyomi:0
+Increment:0
 Least_Time_Per_Move:#{$options["least-time-per-move"]}
 END Time
 BEGIN Position
@@ -259,7 +380,7 @@ EOF
 
     p1_out = <<EOF
 BEGIN Game_Summary
-Protocol_Version:1.1
+Protocol_Version:1.2
 Protocol_Mode:Server
 Format:Shogi 1.0
 Declaration:Jishogi 1.1
@@ -274,6 +395,7 @@ BEGIN Time
 Time_Unit:1sec
 Total_Time:1500
 Byoyomi:0
+Increment:0
 Least_Time_Per_Move:#{$options["least-time-per-move"]}
 END Time
 BEGIN Position
@@ -296,7 +418,7 @@ EOF
 
     p2_out = <<EOF
 BEGIN Game_Summary
-Protocol_Version:1.1
+Protocol_Version:1.2
 Protocol_Mode:Server
 Format:Shogi 1.0
 Declaration:Jishogi 1.1
@@ -311,6 +433,7 @@ BEGIN Time
 Time_Unit:1sec
 Total_Time:1500
 Byoyomi:0
+Increment:0
 Least_Time_Per_Move:#{$options["least-time-per-move"]}
 END Time
 BEGIN Position