Improved stability of test results.

[shogi-server/shogi-server.git] / test / TC_board.rb

diff --git a/test/TC_board.rb b/test/TC_board.rb
index 8001108..6008af5 100644 (file)
--- a/test/TC_board.rb
+++ b/test/TC_board.rb
@@ -3,102 +3,8 @@ $:.unshift File.join(File.dirname(__FILE__), "..")
 require 'test/unit'
 require 'shogi_server'
 require 'shogi_server/board'
 require 'test/unit'
 require 'shogi_server'
 require 'shogi_server/board'

-require 'shogi_server/piece_ky'

 require 'shogi_server/piece'
 
 require 'shogi_server/piece'
 

-module ShogiServer
-class Board
-  def set_from_str(strs)
-    strs.split(/\n/).each do |str|
-      if (str =~ /^P\d/)
-        str.sub!(/^P(.)/, '')
-        y = $1.to_i
-        x = 9
-        while (str.length > 2)
-          str.sub!(/^(...?)/, '')
-          one = $1
-          if (one =~ /^([\+\-])(..)/)
-            sg = $1
-            name = $2
-            if (sg == "+")
-              sente = true
-            else
-              sente = false
-            end
-            if ((x < 1) || (9 < x) || (y < 1) || (9 < y))
-              raise "bad position #{x} #{y}"
-            end
-            case (name)
-            when "FU"
-              PieceFU::new(self, x, y, sente)
-            when "KY"
-              PieceKY::new(self, x, y, sente)
-            when "KE"
-              PieceKE::new(self, x, y, sente)
-            when "GI"
-              PieceGI::new(self, x, y, sente)
-            when "KI"
-              PieceKI::new(self, x, y, sente)
-            when "OU"
-              PieceOU::new(self, x, y, sente)
-            when "KA"
-              PieceKA::new(self, x, y, sente)
-            when "HI"
-              PieceHI::new(self, x, y, sente)
-            when "TO"
-              PieceFU::new(self, x, y, sente, true)
-            when "NY"
-              PieceKY::new(self, x, y, sente, true)
-            when "NK"
-              PieceKE::new(self, x, y, sente, true)
-            when "NG"
-              PieceGI::new(self, x, y, sente, true)
-            when "UM"
-              PieceKA::new(self, x, y, sente, true)
-            when "RY"
-              PieceHI::new(self, x, y, sente, true)
-            else
-              raise "unkown piece #{name}"
-            end
-          end
-          x = x - 1
-        end
-      elsif (str =~ /^P([\+\-])/)
-        sg = $1
-        if (sg == "+")
-          sente = true
-        else
-          sente = false
-        end
-        str.sub!(/^../, '')
-        while (str.length > 3)
-          str.sub!(/^..(..)/, '')
-          name = $1
-          case (name)
-          when "FU"
-            PieceFU::new(self, 0, 0, sente)
-          when "KY"
-            PieceKY::new(self, 0, 0, sente)
-          when "KE"
-            PieceKE::new(self, 0, 0, sente)
-          when "GI"
-            PieceGI::new(self, 0, 0, sente)
-          when "KI"
-            PieceKI::new(self, 0, 0, sente)
-          when "KA"
-            PieceKA::new(self, 0, 0, sente)
-          when "HI"
-            PieceHI::new(self, 0, 0, sente)
-          else
-            raise "unkown piece #{name}"
-          end
-        end
-      end
-    end
-  end
-end
-end
-

 class Test_kachi < Test::Unit::TestCase
   def test_kachi_good
     b = ShogiServer::Board.new
 class Test_kachi < Test::Unit::TestCase
   def test_kachi_good
     b = ShogiServer::Board.new


@@ -779,3 +685,75 @@ EOM
     assert_equal(false, b.uchifuzume?(true))
  end
 end
     assert_equal(false, b.uchifuzume?(true))
  end
 end

+
+class TestBoardForBuoy < Test::Unit::TestCase
+  def setup
+    @board = ShogiServer::Board.new
+  end
+
+  def test_set_from_moves_empty
+    moves = []
+    rt = @board.set_from_moves moves
+    assert_equal(:normal, rt)
+  end
+
+  def test_set_from_moves
+    moves = ["+7776FU", "-3334FU"]
+    assert_nothing_raised do
+      @board.set_from_moves moves
+    end
+
+    correct = ShogiServer::Board.new
+    correct.set_from_str <<EOF
+P1-KY-KE-GI-KI-OU-KI-GI-KE-KY
+P2 * -HI *  *  *  *  * -KA * 
+P3-FU-FU-FU-FU-FU-FU * -FU-FU
+P4 *  *  *  *  *  * -FU *  * 
+P5 *  *  *  *  *  *  *  *  * 
+P6 *  * +FU *  *  *  *  *  * 
+P7+FU+FU * +FU+FU+FU+FU+FU+FU
+P8 * +KA *  *  *  *  * +HI * 
+P9+KY+KE+GI+KI+OU+KI+GI+KE+KY
++
+EOF
+    assert_equal(correct.to_s, @board.to_s)
+  end
+
+  def test_set_from_moves_error1
+    moves = ["+7776FU", "-3435FU"]
+    assert_raise ArgumentError do
+      @board.set_from_moves moves
+    end
+  end
+
+  def test_set_from_moves_error2
+    moves = ["+7776FU", "+8786FU"]
+    assert_raise ArgumentError do
+      @board.set_from_moves moves
+    end
+  end
+end # TestBoardForBuoy
+
+class TestSplitMoves < Test::Unit::TestCase
+  def test_split_moves1
+    rs = ShogiServer::Board::split_moves "+7776FU"
+    assert_equal ["+7776FU"], rs
+  end
+
+  def test_split_moves2
+    rs = ShogiServer::Board::split_moves "+7776FU-3334FU"
+    assert_equal ["+7776FU", "-3334FU"], rs
+  end
+
+  def test_split_moves3
+    assert_nothing_raised do
+      ShogiServer::Board::split_moves ""
+    end
+  end
+
+  def test_split_moves_error1
+    assert_raise ShogiServer::WrongMoves do
+      ShogiServer::Board::split_moves "dummy"
+    end
+  end
+end