単純に駒の価値で決める評価関数追加

diff --git a/lib/bushido/player.rb b/lib/bushido/player.rb
index d85f107..c5aa6c0 100644
--- a/lib/bushido/player.rb
+++ b/lib/bushido/player.rb
@@ -2,26 +2,19 @@

 module Bushido
   class Player
-    # facade
     def self.test_case(params = {})
       params = {
         :player => :black,
-        :return_player => false,
       }.merge(params)
       player = Player.create2(params[:player], Board.new)
       player.deal(params[:deal])
       player.initial_put_on(params[:init])
       Array.wrap(params[:exec]).each{|v|player.execute(v)}
-      if params[:return_player]
-        player
-      else
-        player.soldier_names.sort
-      end
+      player
     end

-    # facade
     def self.test_case2(params = {})
-      test_case({:return_player => true}.merge(params))
+      test_case(params).soldier_names.sort
     end

     # 互換性のため一時的に。
@@ -251,7 +244,7 @@ module Bushido
       s
     end

-    # Player.test_case2.pieces_compact_str # => "歩九 角 飛 香二 桂二 銀二 金二 玉"
+    # Player.test_case.pieces_compact_str # => "歩九 角 飛 香二 桂二 銀二 金二 玉"
     def pieces_compact_str
       pieces.group_by{|e|e.class}.collect{|klass, pieces|
         count = ""
diff --git a/lib/bushido/soldier.rb b/lib/bushido/soldier.rb
index cf80ae9..5849f3e 100644
--- a/lib/bushido/soldier.rb
+++ b/lib/bushido/soldier.rb
@@ -38,7 +38,7 @@ module Bushido
     end

     # 正式な棋譜の表記で返す
-    #  Player.test_case2(:init => "５五と").board["５五"].formality_name # => "▲5五と"
+    #  Player.test_case(:init => "５五と").board["５五"].formality_name # => "▲5五と"
     def formality_name
       "#{@player.location.mark}#{point ? point.name : '(どこにも置いてない)'}#{self}"
     end
diff --git a/spec/player_spec.rb b/spec/player_spec.rb
index 9d5ca07..4e6ea14 100644
--- a/spec/player_spec.rb
+++ b/spec/player_spec.rb
@@ -23,24 +23,24 @@ module Bushido
     context "配置" do
       context "できる" do
         it "歩を相手の陣地に" do
-          Player.test_case(:init => "5三歩").should == ["▲5三歩"]
+          Player.test_case2(:init => "5三歩").should == ["▲5三歩"]
         end
         it "成っている歩を相手の陣地に" do
-          Player.test_case(:init => "5三と").should == ["▲5三と"]
+          Player.test_case2(:init => "5三と").should == ["▲5三と"]
         end
         it "後手が置ける" do
-          Player.test_case(:init => "５五飛", :player => :white).should == ["▽5五飛↓"]
+          Player.test_case2(:init => "５五飛", :player => :white).should == ["▽5五飛↓"]
         end
       end
       context "できない" do
         it "成っている金を相手の陣地に" do
-          expect { Player.test_case(:init => "5三成金").to }.to raise_error(SyntaxError)
+          expect { Player.test_case2(:init => "5三成金").to }.to raise_error(SyntaxError)
         end
         it "すでに駒があるところに駒を配置できない" do
-          expect { Player.test_case(:init => ["5三銀", "5三銀"]).to }.to raise_error(PieceAlredyExist)
+          expect { Player.test_case2(:init => ["5三銀", "5三銀"]).to }.to raise_error(PieceAlredyExist)
         end
         it "飛車は二枚持ってないので二枚配置できない" do
-          expect { Player.test_case(:init => ["5二飛", "5二飛"]) }.to raise_error(PieceNotFound)
+          expect { Player.test_case2(:init => ["5二飛", "5二飛"]) }.to raise_error(PieceNotFound)
         end
       end
     end
@@ -70,65 +70,65 @@ FIELD
     context "移動" do
       context "できる" do
         it "普通に" do
-          Player.test_case(:init => "７七歩", :exec => "７六歩").should == ["▲7六歩"]
+          Player.test_case2(:init => "７七歩", :exec => "７六歩").should == ["▲7六歩"]
         end
         it "後手の歩を(画面上では下がることに注意)" do
-          Player.test_case(:player => :white, :init => "３三歩", :exec => "３四歩").should == ["▽3四歩↓"]
+          Player.test_case2(:player => :white, :init => "３三歩", :exec => "３四歩").should == ["▽3四歩↓"]
         end
         it "成銀を" do
-          Player.test_case(:init => "４二成銀", :exec => "３二成銀").should == ["▲3二全"]
+          Player.test_case2(:init => "４二成銀", :exec => "３二成銀").should == ["▲3二全"]
         end
         it "龍を" do
-          Player.test_case(:init => "４二龍", :exec => "３二龍").should == ["▲3二龍"]
+          Player.test_case2(:init => "４二龍", :exec => "３二龍").should == ["▲3二龍"]
         end
         it "駒の指定なしで動かす" do
           # 初手 "７六" とした場合、そこに来れるのは真下の、"歩" のみなので "７六歩" とする
           # というのはやりすぎなので保留
         end
         it "推測結果が複数パターンあるけど移動元が明確であれば推測しないのでエラーにならない" do
-          Player.test_case(:init => ["６九金", "４九金"], :exec => "５九金(49)").should == ["▲5九金", "▲6九金"]
+          Player.test_case2(:init => ["６九金", "４九金"], :exec => "５九金(49)").should == ["▲5九金", "▲6九金"]
         end
       end

       context "できない" do
         it "４二に移動できる銀が見つからず、持駒の銀を打とうとしたが、４二にはすでに駒があったので" do
-          expect { Player.test_case(:init => "４二銀", :exec => "４二銀") }.to raise_error(PieceAlredyExist)
+          expect { Player.test_case2(:init => "４二銀", :exec => "４二銀") }.to raise_error(PieceAlredyExist)
         end
         it "推測結果が複数パターンがあったので" do
-          expect { Player.test_case(:init => ["６九金", "４九金"], :exec => "５九金") }.to raise_error(AmbiguousFormatError)
+          expect { Player.test_case2(:init => ["６九金", "４九金"], :exec => "５九金") }.to raise_error(AmbiguousFormatError)
         end
         it "ルール上、成っている状態から成らない状態に戻れないので(盤上に飛が見つからないので)" do
-          expect { Player.test_case(:init => "５五龍", :exec => "５六飛") }.to raise_error(MovableSoldierNotFound)
+          expect { Player.test_case2(:init => "５五龍", :exec => "５六飛") }.to raise_error(MovableSoldierNotFound)
         end
         it "ルール上、成っている状態から成らない状態に戻れないので(移動元を明記しても同様。ただ例外の種類が異なる)" do
-          expect { Player.test_case(:init => "５五龍", :exec => "５六飛(55)") }.to raise_error(PromotedPieceToNormalPiece)
+          expect { Player.test_case2(:init => "５五龍", :exec => "５六飛(55)") }.to raise_error(PromotedPieceToNormalPiece)
         end
       end

       context "成" do
         context "成れる" do
           it "相手陣地に入るときに成る" do
-            Player.test_case(:init => "２四歩", :exec => "２三歩成").should == ["▲2三と"]
+            Player.test_case2(:init => "２四歩", :exec => "２三歩成").should == ["▲2三と"]
           end
           it "相手陣地から出るときに成る" do
-            Player.test_case(:init => "５一飛", :exec => "５四飛成").should == ["▲5四龍"]
+            Player.test_case2(:init => "５一飛", :exec => "５四飛成").should == ["▲5四龍"]
           end
           it "後手が相手の3段目に入ったタイミングで成る(バグっていたので消さないように)" do
-            Player.test_case(:player => :white, :init => "４五桂", :exec => "５七桂成").should == ["▽5七圭↓"]
+            Player.test_case2(:player => :white, :init => "４五桂", :exec => "５七桂成").should == ["▽5七圭↓"]
           end
         end
         context "成れない" do
           it "自分の陣地に入るタイミングでは" do
-            expect { Player.test_case(:init => "５五飛", :exec => "５九飛成") }.to raise_error(NotPromotable)
+            expect { Player.test_case2(:init => "５五飛", :exec => "５九飛成") }.to raise_error(NotPromotable)
           end
           it "自分の陣地から出るタイミングでも" do
-            expect { Player.test_case(:init => "５九飛", :exec => "５五飛成") }.to raise_error(NotPromotable)
+            expect { Player.test_case2(:init => "５九飛", :exec => "５五飛成") }.to raise_error(NotPromotable)
           end
           it "天王山から一歩動いただけじゃ" do
-            expect { Player.test_case(:init => "５五飛", :exec => "５六飛成") }.to raise_error(NotPromotable)
+            expect { Player.test_case2(:init => "５五飛", :exec => "５六飛成") }.to raise_error(NotPromotable)
           end
           it "飛がないので" do
-            expect { Player.test_case(:init => "５五龍", :exec => "５一飛成") }.to raise_error(MovableSoldierNotFound)
+            expect { Player.test_case2(:init => "５五龍", :exec => "５一飛成") }.to raise_error(MovableSoldierNotFound)
           end
         end
       end
@@ -136,15 +136,15 @@ FIELD
       context "不成" do
         context "できる" do
           it "成と明示しなかったので" do
-            Player.test_case(:init => "５五桂", :exec => "４三桂").should == ["▲4三桂"]
+            Player.test_case2(:init => "５五桂", :exec => "４三桂").should == ["▲4三桂"]
           end
           it "不成の指定をしたので" do
-            Player.test_case(:init => "５五桂", :exec => "４三桂不成").should == ["▲4三桂"]
+            Player.test_case2(:init => "５五桂", :exec => "４三桂不成").should == ["▲4三桂"]
           end
         end
         context "できない" do
           it "移動できる見込みがないとき" do
-            expect { Player.test_case(:init => "５三桂", :exec => "４一桂") }.to raise_error(NotPutInPlaceNotBeMoved)
+            expect { Player.test_case2(:init => "５三桂", :exec => "４一桂") }.to raise_error(NotPutInPlaceNotBeMoved)
           end
         end
       end
@@ -163,10 +163,10 @@ FIELD
         context "取れない" do
           # 相手がいないと同角は失敗するので「相手がいない」というエラーすることも検討
           it "一人で同を使う(同角で２五がわかった上で移動しようとしたけど自分の飛車がいるために移動できなかった)" do
-            expect { Player.test_case(:init => ["２五飛", "８八角"], :exec => ["５五飛", "同角"]) }.to raise_error(MovableSoldierNotFound, /5五に移動できる角がありません/)
+            expect { Player.test_case2(:init => ["２五飛", "８八角"], :exec => ["５五飛", "同角"]) }.to raise_error(MovableSoldierNotFound, /5五に移動できる角がありません/)
           end
           it "初手に同歩" do
-            expect { Player.test_case(:exec => "同歩") }.to raise_error(BeforePointNotFound)
+            expect { Player.test_case2(:exec => "同歩") }.to raise_error(BeforePointNotFound)
           end
         end
       end
@@ -175,46 +175,46 @@ FIELD
     context "打つ" do
       context "打てる" do
         it "空いているところに" do
-          Player.test_case(:exec => "５五歩打").should == ["▲5五歩"]
+          Player.test_case2(:exec => "５五歩打").should == ["▲5五歩"]
         end

         # 棋譜の表記方法：日本将棋連盟 http://www.shogi.or.jp/faq/kihuhyouki.html
         # > ※「打」と記入するのはあくまでもその地点に盤上の駒を動かすこともできる場合のみです。それ以外の場合は、持駒を打つ場合も「打」はつけません。
         it "打は曖昧なときだけ付く" do
-          Player.test_case(:exec => "５五歩").should == ["▲5五歩"]
-          Player.test_case2(:exec => "５五歩").parsed_info.last_kif.should == "5五歩打"
+          Player.test_case2(:exec => "５五歩").should == ["▲5五歩"]
+          Player.test_case(:exec => "５五歩").parsed_info.last_kif.should == "5五歩打"
         end

         it "盤上に龍があってその横に飛を「打」をつけずに打った(打つときに他の駒もそこに来れるケース)" do
-          Player.test_case2(:deal => "飛", :init => "１一龍", :exec => "２一飛").parsed_info.last_kif.should == "2一飛打"
+          Player.test_case(:deal => "飛", :init => "１一龍", :exec => "２一飛").parsed_info.last_kif.should == "2一飛打"
         end

         it "と金は二歩にならないので" do
-          Player.test_case(:init => "５五と", :exec => "５六歩打").should == ["▲5五と", "▲5六歩"]
+          Player.test_case2(:init => "５五と", :exec => "５六歩打").should == ["▲5五と", "▲5六歩"]
         end
       end

       context "打てない" do
         it "場外に" do
-          expect { Player.test_case(:exec => "５十飛打") }.to raise_error(PositionSyntaxError)
+          expect { Player.test_case2(:exec => "５十飛打") }.to raise_error(PositionSyntaxError)
         end
         it "自分の駒の上に" do
-          expect { Player.test_case(:init => "５五飛", :exec => "５五角打") }.to raise_error(PieceAlredyExist)
+          expect { Player.test_case2(:init => "５五飛", :exec => "５五角打") }.to raise_error(PieceAlredyExist)
         end
         it "相手の駒の上に" do
           expect { LiveFrame.testcase3(:exec => ["５五飛打", "５五角打"]) }.to raise_error(PieceAlredyExist)
         end
         it "卍という駒がないので" do
-          expect { Player.test_case(:exec => "５五卍打") }.to raise_error(SyntaxError)
+          expect { Player.test_case2(:exec => "５五卍打") }.to raise_error(SyntaxError)
         end
         it "成った状態で" do
-          expect { Player.test_case(:exec => "５五龍打") }.to raise_error(PromotedPiecePutOnError)
+          expect { Player.test_case2(:exec => "５五龍打") }.to raise_error(PromotedPiecePutOnError)
         end
         it "１一歩打だとそれ以上動けないので" do
-          expect { Player.test_case(:exec => "１一歩打") }.to raise_error(NotPutInPlaceNotBeMoved)
+          expect { Player.test_case2(:exec => "１一歩打") }.to raise_error(NotPutInPlaceNotBeMoved)
         end
         it "二歩なので" do
-          expect { Player.test_case(:init => "５五歩", :exec => "５九歩打") }.to raise_error(DoublePawn)
+          expect { Player.test_case2(:init => "５五歩", :exec => "５九歩打") }.to raise_error(DoublePawn)
         end
       end
     end
@@ -228,56 +228,56 @@ FIELD
         context "龍" do
           it "パターンA" do
             @params.update(:init => ["９一龍", "８四龍"])
-            Player.test_case2(@params.merge(:exec => "８二龍引")).parsed_info.last_kif_pair.should == ["8二龍(91)", "8二龍引"]
-            Player.test_case2(@params.merge(:exec => "８二龍上")).parsed_info.last_kif_pair.should == ["8二龍(84)", "8二龍上"]
+            Player.test_case(@params.merge(:exec => "８二龍引")).parsed_info.last_kif_pair.should == ["8二龍(91)", "8二龍引"]
+            Player.test_case(@params.merge(:exec => "８二龍上")).parsed_info.last_kif_pair.should == ["8二龍(84)", "8二龍上"]
           end
           it "パターンB" do
             @params.update(:init => ["５二龍", "２三龍"])
-            Player.test_case2(@params.merge(:exec => "４三龍寄")).parsed_info.last_kif_pair.should == ["4三龍(23)", "4三龍寄"]
-            Player.test_case2(@params.merge(:exec => "４三龍引")).parsed_info.last_kif_pair.should == ["4三龍(52)", "4三龍引"]
+            Player.test_case(@params.merge(:exec => "４三龍寄")).parsed_info.last_kif_pair.should == ["4三龍(23)", "4三龍寄"]
+            Player.test_case(@params.merge(:exec => "４三龍引")).parsed_info.last_kif_pair.should == ["4三龍(52)", "4三龍引"]
           end
           it "パターンC" do
             @params.update(:init => ["５五龍", "１五龍"])
-            Player.test_case2(@params.merge(:exec => "３五龍左")).parsed_info.last_kif_pair.should == ["3五龍(55)", "3五龍左"]
-            Player.test_case2(@params.merge(:exec => "３五龍右")).parsed_info.last_kif_pair.should == ["3五龍(15)", "3五龍右"]
+            Player.test_case(@params.merge(:exec => "３五龍左")).parsed_info.last_kif_pair.should == ["3五龍(55)", "3五龍左"]
+            Player.test_case(@params.merge(:exec => "３五龍右")).parsed_info.last_kif_pair.should == ["3五龍(15)", "3五龍右"]
           end
           it "パターンD" do
             @params.update(:init => ["９九龍", "８九龍"])
-            Player.test_case2(@params.merge(:exec => "８八龍左")).parsed_info.last_kif_pair.should == ["8八龍(99)", "8八龍左"]
-            Player.test_case2(@params.merge(:exec => "８八龍右")).parsed_info.last_kif_pair.should == ["8八龍(89)", "8八龍右"]
+            Player.test_case(@params.merge(:exec => "８八龍左")).parsed_info.last_kif_pair.should == ["8八龍(99)", "8八龍左"]
+            Player.test_case(@params.merge(:exec => "８八龍右")).parsed_info.last_kif_pair.should == ["8八龍(89)", "8八龍右"]
           end
           it "パターンE" do
             @params.update(:init => ["２八龍", "１九龍"])
-            Player.test_case2(@params.merge(:exec => "１七龍左")).parsed_info.last_kif_pair.should == ["1七龍(28)", "1七龍左"]
-            Player.test_case2(@params.merge(:exec => "１七龍右")).parsed_info.last_kif_pair.should == ["1七龍(19)", "1七龍右"]
+            Player.test_case(@params.merge(:exec => "１七龍左")).parsed_info.last_kif_pair.should == ["1七龍(28)", "1七龍左"]
+            Player.test_case(@params.merge(:exec => "１七龍右")).parsed_info.last_kif_pair.should == ["1七龍(19)", "1七龍右"]
           end
         end

         context "馬" do
           it "パターンA" do
             @params.update(:init => ["９一馬", "８一馬"])
-            Player.test_case2(@params.merge(:exec => "８二馬左")).parsed_info.last_kif_pair.should == ["8二馬(91)", "8二馬左"]
-            Player.test_case2(@params.merge(:exec => "８二馬右")).parsed_info.last_kif_pair.should == ["8二馬(81)", "8二馬右"]
+            Player.test_case(@params.merge(:exec => "８二馬左")).parsed_info.last_kif_pair.should == ["8二馬(91)", "8二馬左"]
+            Player.test_case(@params.merge(:exec => "８二馬右")).parsed_info.last_kif_pair.should == ["8二馬(81)", "8二馬右"]
           end
           it "パターンB" do
             @params.update(:init => ["９五馬", "６三馬"])
-            Player.test_case2(@params.merge(:exec => "８五馬寄")).parsed_info.last_kif_pair.should == ["8五馬(95)", "8五馬寄"]
-            Player.test_case2(@params.merge(:exec => "８五馬引")).parsed_info.last_kif_pair.should == ["8五馬(63)", "8五馬引"]
+            Player.test_case(@params.merge(:exec => "８五馬寄")).parsed_info.last_kif_pair.should == ["8五馬(95)", "8五馬寄"]
+            Player.test_case(@params.merge(:exec => "８五馬引")).parsed_info.last_kif_pair.should == ["8五馬(63)", "8五馬引"]
           end
           it "パターンC" do
             @params.update(:init => ["１一馬", "３四馬"])
-            Player.test_case2(@params.merge(:exec => "１二馬引")).parsed_info.last_kif_pair.should == ["1二馬(11)", "1二馬引"]
-            Player.test_case2(@params.merge(:exec => "１二馬上")).parsed_info.last_kif_pair.should == ["1二馬(34)", "1二馬上"]
+            Player.test_case(@params.merge(:exec => "１二馬引")).parsed_info.last_kif_pair.should == ["1二馬(11)", "1二馬引"]
+            Player.test_case(@params.merge(:exec => "１二馬上")).parsed_info.last_kif_pair.should == ["1二馬(34)", "1二馬上"]
           end
           it "パターンD" do
             @params.update(:init => ["９九馬", "５九馬"])
-            Player.test_case2(@params.merge(:exec => "７七馬左")).parsed_info.last_kif_pair.should == ["7七馬(99)", "7七馬左"]
-            Player.test_case2(@params.merge(:exec => "７七馬右")).parsed_info.last_kif_pair.should == ["7七馬(59)", "7七馬右"]
+            Player.test_case(@params.merge(:exec => "７七馬左")).parsed_info.last_kif_pair.should == ["7七馬(99)", "7七馬左"]
+            Player.test_case(@params.merge(:exec => "７七馬右")).parsed_info.last_kif_pair.should == ["7七馬(59)", "7七馬右"]
           end
           it "パターンE" do
             @params.update(:init => ["４七馬", "１八馬"])
-            Player.test_case2(@params.merge(:exec => "２九馬左")).parsed_info.last_kif_pair.should == ["2九馬(47)", "2九馬左"]
-            Player.test_case2(@params.merge(:exec => "２九馬右")).parsed_info.last_kif_pair.should == ["2九馬(18)", "2九馬右"]
+            Player.test_case(@params.merge(:exec => "２九馬左")).parsed_info.last_kif_pair.should == ["2九馬(47)", "2九馬左"]
+            Player.test_case(@params.merge(:exec => "２九馬右")).parsed_info.last_kif_pair.should == ["2九馬(18)", "2九馬右"]
           end
         end
       end
@@ -288,7 +288,7 @@ FIELD
               "______", "______", "４五と",
               "______", "______", "______",
             ]})
-        Player.test_case2(@params.merge(:exec => "５五と")).parsed_info.last_kif_pair.should == ["5五と(45)", "5五と"]
+        Player.test_case(@params.merge(:exec => "５五と")).parsed_info.last_kif_pair.should == ["5五と(45)", "5五と"]
       end

       it "右下だけ" do
@@ -297,7 +297,7 @@ FIELD
               "______", "______", "______",
               "______", "______", "４六と",
             ]})
-        Player.test_case2(@params.merge(:exec => "５五と")).parsed_info.last_kif_pair.should == ["5五と(46)", "5五と"]
+        Player.test_case(@params.merge(:exec => "５五と")).parsed_info.last_kif_pair.should == ["5五と(46)", "5五と"]
       end

       it "真下だけ" do
@@ -306,7 +306,7 @@ FIELD
               "______", "______", "______",
               "______", "５六と", "______",
             ]})
-        Player.test_case2(@params.merge(:exec => "５五と")).parsed_info.last_kif_pair.should == ["5五と(56)", "5五と"]
+        Player.test_case(@params.merge(:exec => "５五と")).parsed_info.last_kif_pair.should == ["5五と(56)", "5五と"]
       end

       it "下面" do
@@ -315,9 +315,9 @@ FIELD
               "______", "______", "______",
               "６六と", "５六と", "４六と",
             ]})
-        Player.test_case2(@params.merge(:exec => "５五と右")).parsed_info.last_kif_pair.should == ["5五と(46)", "5五と右"]
-        Player.test_case2(@params.merge(:exec => "５五と直")).parsed_info.last_kif_pair.should == ["5五と(56)", "5五と直"]
-        Player.test_case2(@params.merge(:exec => "５五と左")).parsed_info.last_kif_pair.should == ["5五と(66)", "5五と左"]
+        Player.test_case(@params.merge(:exec => "５五と右")).parsed_info.last_kif_pair.should == ["5五と(46)", "5五と右"]
+        Player.test_case(@params.merge(:exec => "５五と直")).parsed_info.last_kif_pair.should == ["5五と(56)", "5五と直"]
+        Player.test_case(@params.merge(:exec => "５五と左")).parsed_info.last_kif_pair.should == ["5五と(66)", "5五と左"]
       end

       it "縦に二つ" do
@@ -326,8 +326,8 @@ FIELD
               "______", "______", "______",
               "______", "５六と", "______",
             ]})
-        Player.test_case2(@params.merge(:exec => "５五と引")).parsed_info.last_kif_pair.should == ["5五と(54)", "5五と引"]
-        Player.test_case2(@params.merge(:exec => "５五と上")).parsed_info.last_kif_pair.should == ["5五と(56)", "5五と上"]
+        Player.test_case(@params.merge(:exec => "５五と引")).parsed_info.last_kif_pair.should == ["5五と(54)", "5五と引"]
+        Player.test_case(@params.merge(:exec => "５五と上")).parsed_info.last_kif_pair.should == ["5五と(56)", "5五と上"]
       end

       it "左と左下" do
@@ -336,8 +336,8 @@ FIELD
               "６五と", "______", "______",
               "６六と", "______", "______",
             ]})
-        Player.test_case2(@params.merge(:exec => "５五と寄")).parsed_info.last_kif_pair.should == ["5五と(65)", "5五と寄"]
-        Player.test_case2(@params.merge(:exec => "５五と上")).parsed_info.last_kif_pair.should == ["5五と(66)", "5五と上"]
+        Player.test_case(@params.merge(:exec => "５五と寄")).parsed_info.last_kif_pair.should == ["5五と(65)", "5五と寄"]
+        Player.test_case(@params.merge(:exec => "５五と上")).parsed_info.last_kif_pair.should == ["5五と(66)", "5五と上"]
       end

       it "左上と左下" do
@@ -346,8 +346,8 @@ FIELD
               "______", "______", "______",
               "６六銀", "______", "______",
             ]})
-        Player.test_case2(@params.merge(:exec => "５五銀引")).parsed_info.last_kif_pair.should == ["5五銀(64)", "5五銀引"]
-        Player.test_case2(@params.merge(:exec => "５五銀上")).parsed_info.last_kif_pair.should == ["5五銀(66)", "5五銀上"]
+        Player.test_case(@params.merge(:exec => "５五銀引")).parsed_info.last_kif_pair.should == ["5五銀(64)", "5五銀引"]
+        Player.test_case(@params.merge(:exec => "５五銀上")).parsed_info.last_kif_pair.should == ["5五銀(66)", "5五銀上"]
       end

       it "左右" do
@@ -356,8 +356,8 @@ FIELD
               "６五と", "______", "４五と",
               "______", "______", "______",
             ]})
-        Player.test_case2(@params.merge(:exec => "５五と左")).parsed_info.last_kif_pair.should == ["5五と(65)", "5五と左"]
-        Player.test_case2(@params.merge(:exec => "５五と右")).parsed_info.last_kif_pair.should == ["5五と(45)", "5五と右"]
+        Player.test_case(@params.merge(:exec => "５五と左")).parsed_info.last_kif_pair.should == ["5五と(65)", "5五と左"]
+        Player.test_case(@params.merge(:exec => "５五と右")).parsed_info.last_kif_pair.should == ["5五と(45)", "5五と右"]
       end

       it "同" do
@@ -365,22 +365,22 @@ FIELD
       end

       it "直と不成が重なるとき「不成」と「直」の方が先にくる" do
-        Player.test_case2(:init => ["３四銀", "２四銀"], :exec => "２三銀直不成").parsed_info.last_kif_pair.should == ["2三銀(24)", "2三銀直不成"]
+        Player.test_case(:init => ["３四銀", "２四銀"], :exec => "２三銀直不成").parsed_info.last_kif_pair.should == ["2三銀(24)", "2三銀直不成"]
       end

       it "２三銀引成できる？" do
-        Player.test_case2(:init => ["３二銀", "３四銀"], :exec => "２三銀引成").parsed_info.last_kif_pair.should == ["2三銀成(32)", "2三銀引成"]
+        Player.test_case(:init => ["３二銀", "３四銀"], :exec => "２三銀引成").parsed_info.last_kif_pair.should == ["2三銀成(32)", "2三銀引成"]
       end
     end

     it "指したあと前回の手を確認できる" do
-      Player.test_case2(:init => "５五飛", :exec => "５一飛成").parsed_info.last_kif.should == "5一飛成(55)"
-      Player.test_case2(:init => "５一龍", :exec => "１一龍").parsed_info.last_kif.should   == "1一龍(51)"
-      Player.test_case2(:exec => "５五飛打").parsed_info.last_kif.should                    == "5五飛打"
+      Player.test_case(:init => "５五飛", :exec => "５一飛成").parsed_info.last_kif.should == "5一飛成(55)"
+      Player.test_case(:init => "５一龍", :exec => "１一龍").parsed_info.last_kif.should   == "1一龍(51)"
+      Player.test_case(:exec => "５五飛打").parsed_info.last_kif.should                    == "5五飛打"
     end

     it "持駒の確認" do
-      Player.test_case2.pieces_compact_str.should == "歩九 角 飛 香二 桂二 銀二 金二 玉"
+      Player.test_case.pieces_compact_str.should == "歩九 角 飛 香二 桂二 銀二 金二 玉"
     end

     it "全体確認" do
@@ -408,5 +408,9 @@ FIELD
 +---------------------------+
 FIELD
     end
+
+    it do
+
+    end
   end
 end
diff --git a/spec/soldier_spec.rb b/spec/soldier_spec.rb
index 405ae87..34197d2 100644
--- a/spec/soldier_spec.rb
+++ b/spec/soldier_spec.rb
@@ -10,10 +10,10 @@ module Bushido

     context "文字列表現" do
       it "先手後手のマーク付き" do
-        Player.test_case2(:init => "５五と").board["５五"].formality_name.should == "▲5五と"
+        Player.test_case(:init => "５五と").board["５五"].formality_name.should == "▲5五と"
       end
       it "先手後手のマーク無し" do
-        Player.test_case2(:init => "５五と").board["５五"].piece_current_name.should == "と"
+        Player.test_case(:init => "５五と").board["５五"].piece_current_name.should == "と"
       end
       it "盤上に置いてない場合" do
         soldier.formality_name.should == "▲(どこにも置いてない)歩"