X-Git-Url: http://git.sourceforge.jp/view?p=shogi-server%2Fshogi-server.git;a=blobdiff_plain;f=test%2FTC_before_agree.rb;h=76cabe32437e8d43db41ad65e4472d0e4a6a3f2a;hp=ceeebe7f9a4b1dcb46f46625614e23d3cbb55bdd;hb=1899be10b8b1ba8527c52036e4d7dc278fddbcc2;hpb=738c0fbf30cc30134a652c9055404716295225d7;ds=sidebyside

diff --git a/test/TC_before_agree.rb b/test/TC_before_agree.rb
index ceeebe7..76cabe3 100644
--- a/test/TC_before_agree.rb
+++ b/test/TC_before_agree.rb
@@ -1,53 +1,49 @@
-require "baseclient"
+$:.unshift File.join(File.dirname(__FILE__), "..")
+$topdir = File.expand_path File.dirname(__FILE__)
+require "test/baseclient"
 require "kconv"
 
 class TestBeforeAgree < BaseClient
 
   def test_gote_logout_after_sente_agree
     login
-    result  = cmd  "AGREE"
-    result2 = cmd2 "LOGOUT"
 
-    result  += read_nonblock(@socket1)
-    result2 += read_nonblock(@socket2)
-
-    assert(/^REJECT/ =~ result)
-    assert(/^REJECT/ =~ result2)
+    @p1.puts "AGREE"
+    sleep 0.1
+    @p2.puts "LOGOUT"
+    @p1.wait /^REJECT/
+    @p2.wait /^REJECT/
+    assert true
   end
 
   def test_sente_logout_after_gote_agree
     login
-    result2 = cmd2 "AGREE"
-    result  = cmd  "LOGOUT"
-
-    result  += read_nonblock(@socket1)
-    result2 += read_nonblock(@socket2)
 
-    assert(/^REJECT/ =~ result)
-    assert(/^REJECT/ =~ result2)
+    @p2.puts "AGREE"
+    sleep 0.1
+    @p1.puts "LOGOUT"
+    @p1.wait /^REJECT/
+    @p2.wait /^REJECT/
+    assert true
   end
 
   def test_gote_logout_before_sente_agree
     login
-    result  = ""
-    result2 = cmd2 "LOGOUT"
 
-    result  += read_nonblock(@socket1)
-    result2 += read_nonblock(@socket2)
-
-    assert(/^REJECT/ =~ result)
-    assert(/^REJECT/ =~ result2)
+    sleep 0.1
+    @p2.puts "LOGOUT"
+    @p1.wait /^REJECT/
+    @p2.wait /^REJECT/
+    assert true
   end
 
   def test_sente_logout_before_gote_agree
     login
-    result2 = ""
-    result  = cmd  "LOGOUT"
-
-    result  += read_nonblock(@socket1)
-    result2 += read_nonblock(@socket2)
 
-    assert(/^REJECT/ =~ result)
-    assert(/^REJECT/ =~ result2)
+    sleep 0.1
+    @p1.puts "LOGOUT"
+    @p1.wait /^REJECT/
+    @p2.wait /^REJECT/
+    assert true
   end
 end