X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=test%2FTC_oute_sennichite.rb;h=926ef782f52eb05ceca9293e6b0e34f197db2739;hb=7e5b319747bf728f7c99ea86a367028166069747;hp=fda83b42efdf65d34e51f95216dd604b276893e7;hpb=f939399ae60b99d0a10b9a7ace7cce259fc0a241;p=shogi-server%2Fshogi-server.git

diff --git a/test/TC_oute_sennichite.rb b/test/TC_oute_sennichite.rb
index fda83b4..926ef78 100644
--- a/test/TC_oute_sennichite.rb
+++ b/test/TC_oute_sennichite.rb
@@ -5,43 +5,28 @@ class OuteSennichiteTest < ReadFileClient
   def test_oute_sennichite
     csa = File.open(filepath("oute_sennichite.csa")) {|f| f.read}
     handshake(csa)
-    #cmd2 "%KACHI"
-    sleep 1
-    result1 = cmd ""
-    result2 = cmd2 ""
-    result1 += read_nonblock(@socket1)
-    result2 += read_nonblock(@socket2)
+    @p1.wait(/#OUTE_SENNICHITE.#LOSE/m)
+    @p2.wait(/#OUTE_SENNICHITE.#WIN/m)
+    assert true
     logout12
-    assert_match(/#OUTE_SENNICHITE.#LOSE/m, result1)
-    assert_match(/#OUTE_SENNICHITE.#WIN/m, result2)
   end
 
   def test_oute_sennichite2
     csa = File.open(filepath("oute_sennichite2.csa")) {|f| f.read}
     handshake(csa)
-    #cmd2 "%KACHI"
-    sleep 1
-    result1 = cmd ""
-    result2 = cmd2 ""
-    result1 += read_nonblock(@socket1)
-    result2 += read_nonblock(@socket2)
+    @p1.wait(/#OUTE_SENNICHITE.#WIN/m)
+    @p2.wait(/#OUTE_SENNICHITE.#LOSE/m)
+    assert true
     logout12
-    assert_match(/#OUTE_SENNICHITE.#WIN/m, result1)
-    assert_match(/#OUTE_SENNICHITE.#LOSE/m, result2)
   end
 
   def test_oute_sennichite3
     csa = File.open(filepath("oute_sennichite3.csa")) {|f| f.read}
     handshake(csa)
-    #cmd2 "%KACHI"
-    sleep 1
-    result1 = cmd ""
-    result2 = cmd2 ""
-    result1 += read_nonblock(@socket1)
-    result2 += read_nonblock(@socket2)
+    @p1.wait(/#OUTE_SENNICHITE.#LOSE/m)
+    @p2.wait(/#OUTE_SENNICHITE.#WIN/m)
+    assert true
     logout12
-    assert_match(/#OUTE_SENNICHITE.#LOSE/m, result1)
-    assert_match(/#OUTE_SENNICHITE.#WIN/m, result2)
   end
 end # Client class