Merge branch '201312-KinPenalty' into wdoor-stable

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

diff --git a/test/TC_before_agree.rb b/test/TC_before_agree.rb
index c3761ac..76cabe3 100644 (file)
--- a/test/TC_before_agree.rb
+++ b/test/TC_before_agree.rb
@@ -1,30 +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_before_agree_gote_logout
+  def test_gote_logout_after_sente_agree
     login
-    result  = cmd  "AGREE"
-    result2 = cmd2 "LOGOUT"
 
-    result  += read_nonblock(@socket1)
-    result2 += read_nonblock(@socket2)
+    @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
 
-    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_before_agree_sente_logout
+  def test_gote_logout_before_sente_agree
     login
-    sleep 0.5
-    result2 = cmd2 "AGREE"
-    result  = cmd  "LOGOUT"
 
-    result  += read_nonblock(@socket1)
-    result2 += read_nonblock(@socket2)
+    sleep 0.1
+    @p2.puts "LOGOUT"
+    @p1.wait /^REJECT/
+    @p2.wait /^REJECT/
+    assert true
+  end
+
+  def test_sente_logout_before_gote_agree
+    login
 
-    assert(/^REJECT/ =~ result)
-    assert(/^REJECT/ =~ result2)
+    sleep 0.1
+    @p1.puts "LOGOUT"
+    @p1.wait /^REJECT/
+    @p2.wait /^REJECT/
+    assert true
   end
 end