X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=test%2FTC_buoy.rb;h=8f6237ff18b88de858a194c475e0fb8ee3c0f251;hb=d168a77d26b0ee995991ee798ef1f675bdb30528;hp=1c15ca01822791b802ef4a137a1c835bb00ff879;hpb=457848cef7fa6fa068cb1d28c25119ff85101a6b;p=shogi-server%2Fshogi-server.git

diff --git a/test/TC_buoy.rb b/test/TC_buoy.rb
index 1c15ca0..8f6237f 100644
--- a/test/TC_buoy.rb
+++ b/test/TC_buoy.rb
@@ -9,14 +9,32 @@ require 'mock_log_message'
 
 class TestBuoyGame < Test::Unit::TestCase
   def test_equal
-    g1 = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 1)
-    g2 = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 1)
+    g1 = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 1, nil, nil)
+    g2 = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 1, nil, nil)
+    assert_equal g1, g2
+  end
+
+  def test_equal2
+    g1 = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 1, 10, 20)
+    g2 = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 1, 10, 20)
     assert_equal g1, g2
   end
 
   def test_not_equal
-    g1 = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 1)
-    g2 = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 2)
+    g1 = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 1, nil, nil)
+    g2 = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 2, nil, nil)
+    assert_not_equal g1, g2
+  end
+
+  def test_not_equal2
+    g1 = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 1, 10, 20)
+    g2 = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 1, 10, 200)
+    assert_not_equal g1, g2
+  end
+
+  def test_not_equal3
+    g1 = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 1, 10, nil)
+    g2 = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 1, 10, 200)
     assert_not_equal g1, g2
   end
 end
@@ -49,7 +67,18 @@ class TestBuoy < Test::Unit::TestCase
   end
 
   def test_add_game
-    game = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 1)
+    game = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 1, nil, nil)
+    @buoy.add_game(game)
+    assert !@buoy.is_new_game?("buoy_1234-900-0")
+    game2 = @buoy.get_game(game.game_name)
+    assert_equal game, game2
+
+    @buoy.delete_game game
+    assert @buoy.is_new_game?("buoy_1234-900-0")
+  end
+
+  def test_add_game2
+    game = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 1, 10, 20)
     @buoy.add_game(game)
     assert !@buoy.is_new_game?("buoy_1234-900-0")
     game2 = @buoy.get_game(game.game_name)
@@ -60,9 +89,9 @@ class TestBuoy < Test::Unit::TestCase
   end
 
   def test_update_game
-    game = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 2)
+    game = ShogiServer::BuoyGame.new("buoy_1234-900-0", [], "p1", 2, nil, nil)
     @buoy.add_game(game)
-    g2 = ShogiServer::BuoyGame.new(game.game_name, game.moves, game.owner, game.count-1)
+    g2 = ShogiServer::BuoyGame.new(game.game_name, game.moves, game.owner, game.count-1, nil, nil)
     @buoy.update_game(g2)
     
     get = @buoy.get_game(g2.game_name)