RSokoban 0.73 → 0.74

data/test/tc_extensions.rb

@@ -0,0 +1,26 @@
+class TC_Extensions < Test::Unit::TestCase
+
+	def test_String_get_xsb_info_line
+		assert_equal "E-Mail:\n", "; E-Mail: \n".get_xsb_info_line
+	end
+	
+	def test_String_get_xsb_info_line_from_empty_info
+		assert_equal "\n", ";\n".get_xsb_info_line
+	end
+	
+	def test_String_get_xsb_info_line_with_semi_colon_in_it
+		assert ";foo;bar;\n", ";;foo;bar;\n".get_xsb_info_line
+	end
+	
+	def test_String_get_xsb_info_line_chomp
+		assert_equal "E-Mail:", "; E-Mail: \n".get_xsb_info_line_chomp
+	end
+	
+	def test_String_get_xsb_info_line_chomp_from_empty_info
+		assert_equal "", ";\n".get_xsb_info_line_chomp
+	end
+	
+	def test_String_get_xsb_info_line_chomp_with_semi_colon_in_it
+		assert_equal ";foo;bar;", ";;foo;bar;\n".get_xsb_info_line_chomp
+	end
+end

data/test/tc_game.rb

@@ -0,0 +1,28 @@
+class TC_Game < Test::Unit::TestCase
+
+	def setup
+		$RSOKOBAN_DATA_PATH = File.expand_path(File.dirname(__FILE__))
+		@game = RSokoban::Game.new :portable, 'original.xsb'
+		# Make Game@ui nil to not start the ui.
+		@game.instance_variable_set(:@ui, nil)
+		# Load the first level, without starting ui (see previous line)
+		@game.start_level
+	end
+	
+	def test_level_width
+		assert_equal 19, @game.level_width
+	end
+	
+	def test_level_height
+		assert_equal 11, @game.level_height
+	end
+	
+	def test_level_title
+		assert_equal '1', @game.level_title
+	end
+	
+	def test_man_x
+		assert_equal 11, @game.man_x
+	end
+	
+end

data/test/tc_level.rb

@@ -16,122 +16,116 @@ class TC_Level < Test::Unit::TestCase
 	          '#$$#',
 	          '#@ #',
 	          '####']
-	          
+	
+	def setup
+		@text_1 = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text1))
+		@text_2 = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text2))
+		@text_3 = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text3))
+		@original_1 = RSokoban::Level.new(RSokoban::RawLevel.new('1', Level1))
+	end
+	
 	def test_instance
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text1))
-		assert_equal true, ins.instance_of?(RSokoban::Level), "Must be an instance of RSokoban::Level"
+		assert_equal true, @text_1.instance_of?(RSokoban::Level), "Must be an instance of RSokoban::Level"
+	end
+	
+	def test_move_number
+		assert_equal 0, @text_1.move_number
 	end
 	
 	def test_floor_with_Text1
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text1))
 		expected = [ '#####',
             		 '#   #',
                  '#####']
-		assert_equal expected, ins.floor
+		assert_equal expected, @text_1.floor
 	end
 	
 	def test_floor_with_Text3
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text3))
 		expected = [ '####',
 								 '#  #',
 								 '#  #',
 								 '#  #',
 								 '####']
-		assert_equal expected, ins.floor
+		assert_equal expected, @text_3.floor
 	end
 	
 	def test_man_position
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text1))
-		assert_equal 3, ins.man.x
-		assert_equal 1, ins.man.y
+		assert_equal 3, @text_1.man.x
+		assert_equal 1, @text_1.man.y
 	end
 	
 	def test_crates_is_an_Array
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text1))
-		assert_equal true, ins.crates.instance_of?(Array), "Must be an Array"
+		assert_equal true, @text_1.crates.instance_of?(Array), "Must be an Array"
 	end
 	
 	def test_crates_with_Text1_must_be_of_size_1
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text1))
-		assert_equal 1, ins.crates.size
+		assert_equal 1, @text_1.crates.size
 	end
 	
 	def test_crates_contains_some_crate
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text1))
-		assert_equal true, ins.crates[0].instance_of?(RSokoban::Crate)
+		assert_equal true, @text_1.crates[0].instance_of?(RSokoban::Crate)
 	end
 	
 	def test_crates_with_Text2_must_be_of_size_3
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text2))
-		assert_equal 3, ins.crates.size
+		assert_equal 3, @text_2.crates.size
 	end
 	
 	def test_crates_positions
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text2))
-		assert_equal 2, ins.crates[0].x
-		assert_equal 1, ins.crates[0].y
+		assert_equal 2, @text_2.crates[0].x
+		assert_equal 1, @text_2.crates[0].y
 		
-		assert_equal 2, ins.crates[1].x
-		assert_equal 2, ins.crates[1].y
+		assert_equal 2, @text_2.crates[1].x
+		assert_equal 2, @text_2.crates[1].y
 		
-		assert_equal 2, ins.crates[2].x
-		assert_equal 3, ins.crates[2].y
+		assert_equal 2, @text_2.crates[2].x
+		assert_equal 3, @text_2.crates[2].y
 	end
 	
 	def test_several_crates_on_a_line
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text3))
-		assert_equal 1, ins.crates[0].x
-		assert_equal 2, ins.crates[0].y
+		assert_equal 1, @text_3.crates[0].x
+		assert_equal 2, @text_3.crates[0].y
 		
-		assert_equal 2, ins.crates[1].x
-		assert_equal 2, ins.crates[1].y
+		assert_equal 2, @text_3.crates[1].x
+		assert_equal 2, @text_3.crates[1].y
 	end
 	
 	def test_storages
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text1))
-		assert_equal true, ins.storages.instance_of?(Array), "Must be an Array"
+		assert_equal true, @text_1.storages.instance_of?(Array), "Must be an Array"
 	end
 	
 	def test_storages_with_Text1_must_be_of_size_1
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text1))
-		assert_equal 1, ins.storages.size
+		assert_equal 1, @text_1.storages.size
 	end
 	
 	def test_storages_with_Text2_must_be_of_size_3
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text2))
-		assert_equal 3, ins.storages.size
+		assert_equal 3, @text_2.storages.size
 	end
 	
 	def test_storages_contains_some_storage
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text1))
-		assert_equal true, ins.storages[0].instance_of?(RSokoban::Storage)
+		assert_equal true, @text_1.storages[0].instance_of?(RSokoban::Storage)
 	end
 	
 	def test_storages_positions
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text2))
-		assert_equal 1, ins.storages[0].x
-		assert_equal 1, ins.storages[0].y
+		assert_equal 1, @text_2.storages[0].x
+		assert_equal 1, @text_2.storages[0].y
 		
-		assert_equal 1, ins.storages[1].x
-		assert_equal 2, ins.storages[1].y
+		assert_equal 1, @text_2.storages[1].x
+		assert_equal 2, @text_2.storages[1].y
 		
-		assert_equal 1, ins.storages[2].x
-		assert_equal 3, ins.storages[2].y
+		assert_equal 1, @text_2.storages[2].x
+		assert_equal 3, @text_2.storages[2].y
 	end
 	
 	def test_several_storages_on_a_line
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text3))
-		assert_equal 1, ins.storages[0].x
-		assert_equal 1, ins.storages[0].y
+		assert_equal 1, @text_3.storages[0].x
+		assert_equal 1, @text_3.storages[0].y
 		
-		assert_equal 2, ins.storages[1].x
-		assert_equal 1, ins.storages[1].y
+		assert_equal 2, @text_3.storages[1].x
+		assert_equal 1, @text_3.storages[1].y
 	end
 	
 	def test_equality
-		ins1 = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text3))
-		ins2 = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text3))
-		assert ins1 == ins2
+		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text3))
+		assert ins == @text_3
 	end
 	
 	Level1 = ['    #####',
@@ -147,8 +141,15 @@ class TC_Level < Test::Unit::TestCase
 '    #######']
 
 	def test_rawLevel
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Level1))
-		assert_equal Level1, ins.map
+		assert_equal Level1, @original_1.map
+	end
+	
+	def test_width
+		assert_equal 19, @original_1.width
+	end
+	
+	def test_height
+		assert_equal 11, @original_1.height
 	end
 	
 	Level1_u = ['    #####',
@@ -164,8 +165,8 @@ class TC_Level < Test::Unit::TestCase
 '    #######']
 
 	def test_rawLevel_after_move_up
-		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Level1))
-		ins.move :up
+		ins = @original_1
+		ins.move(:up)
 		assert_equal Level1_u, ins.map
 	end
 	
@@ -177,7 +178,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_crate_on_storage_at_startup
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Text4))
-		assert_equal 'WIN move 1', ins.move(:up)
+		result = ins.move(:up)
+		assert_equal :win, result[:status]
+		assert_equal 1, result[:move_number]
 	end
 	
 	### Move up ##############################################
@@ -194,14 +197,16 @@ class TC_Level < Test::Unit::TestCase
 	               
 	def test_CanMoveUp1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveUp1))
-		assert_equal 'OK move 1', ins.moveUp
+		result = ins.move(:up)
+		assert_equal :ok, result[:status]
+		assert_equal 1, result[:move_number]
 		assert_equal 1, ins.man.x
 		assert_equal 1, ins.man.y
 	end
 	
 	def test_AfterMoveUp1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveUp1))
-		ins.moveUp
+		ins.move(:up)
 		assert_equal AfterMoveUp1, ins.map
 	end
 	
@@ -217,14 +222,16 @@ class TC_Level < Test::Unit::TestCase
 	              
 	def test_CanMoveUp2
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveUp2))
-		assert_equal 'OK move 1', ins.moveUp
+		result = ins.move(:up)
+		assert_equal :ok, result[:status]
+		assert_equal 1, result[:move_number]
 		assert_equal 1, ins.man.x
 		assert_equal 1, ins.man.y
 	end
 	
 	def test_AfterMoveUp2
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveUp2))
-		ins.moveUp
+		ins.move(:up)
 		assert_equal AfterMoveUp2, ins.map
 	end
 	
@@ -242,14 +249,16 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CanMoveUp3
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveUp3))
-		assert_equal 'OK move 1', ins.moveUp
+		result = ins.move(:up)
+		assert_equal :ok, result[:status]
+		assert_equal 1, result[:move_number]
 		assert_equal 1, ins.man.x
 		assert_equal 2, ins.man.y
 	end
 	
 	def test_AfterMoveUp3
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveUp3))
-		ins.moveUp
+		ins.move(:up)
 		assert_equal AfterMoveUp3, ins.map
 	end
 	
@@ -267,14 +276,16 @@ class TC_Level < Test::Unit::TestCase
 	              
 	def test_CanMoveUp4
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveUp4))
-		assert_equal 'WIN move 1', ins.moveUp
+		result = ins.move(:up)
+		assert_equal :win, result[:status]
+		assert_equal 1, result[:move_number]
 		assert_equal 1, ins.man.x
 		assert_equal 2, ins.man.y
 	end
 	
 	def test_AfterMoveUp4
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveUp4))
-		ins.moveUp
+		ins.move(:up)
 		assert_equal AfterMoveUp4, ins.map
 	end
 	
@@ -284,7 +295,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveUp1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveUp1))
-		assert_equal 'ERROR wall', ins.moveUp
+		result = ins.move(:up)
+		assert_equal :error, result[:status]
+		assert_equal 'wall', result[:message]
 		assert_equal CannotMoveUp1, ins.map
 	end
 	
@@ -295,7 +308,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveUp2
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveUp2))
-		assert_equal 'ERROR wall behind crate', ins.moveUp
+		result = ins.move(:up)
+		assert_equal :error, result[:status]
+		assert_equal 'wall behind crate', result[:message]
 		assert_equal CannotMoveUp2, ins.map
 	end
 	
@@ -308,7 +323,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveUp3
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveUp3))
-		assert_equal 'ERROR double crate', ins.moveUp
+		result = ins.move(:up)
+		assert_equal :error, result[:status]
+		assert_equal 'double crate', result[:message]
 		assert_equal CannotMoveUp3, ins.map
 	end
 	
@@ -321,7 +338,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveUp4
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveUp4))
-		assert_equal 'ERROR double crate', ins.moveUp
+		result = ins.move(:up)
+		assert_equal :error, result[:status]
+		assert_equal 'double crate', result[:message]
 		assert_equal CannotMoveUp4, ins.map
 	end
 	
@@ -334,7 +353,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveUp5
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveUp5))
-		assert_equal 'ERROR double crate', ins.moveUp
+		result = ins.move(:up)
+		assert_equal :error, result[:status]
+		assert_equal 'double crate', result[:message]
 		assert_equal CannotMoveUp5, ins.map
 	end
 	
@@ -347,7 +368,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveUp6
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveUp6))
-		assert_equal 'ERROR double crate', ins.moveUp
+		result = ins.move(:up)
+		assert_equal :error, result[:status]
+		assert_equal 'double crate', result[:message]
 		assert_equal CannotMoveUp6, ins.map
 	end
 	
@@ -365,12 +388,14 @@ class TC_Level < Test::Unit::TestCase
 	               
 	def test_CanMoveDown1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveDown1))
-		assert_equal 'OK move 1', ins.moveDown
+		result = ins.move(:down)
+		assert_equal :ok, result[:status]
+		assert_equal 1, result[:move_number]
 	end
 	
 	def test_AfterMoveDown1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveDown1))
-		ins.moveDown
+		ins.move(:down)
 		assert_equal AfterMoveDown1, ins.map
 	end
 	
@@ -386,12 +411,14 @@ class TC_Level < Test::Unit::TestCase
 	              
 	def test_CanMoveDown2
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveDown2))
-		assert_equal 'OK move 1', ins.moveDown
+		result = ins.move(:down)
+		assert_equal :ok, result[:status]
+		assert_equal 1, result[:move_number]
 	end
 	
 	def test_AfterMoveDown2
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveDown2))
-		ins.moveDown
+		ins.move(:down)
 		assert_equal AfterMoveDown2, ins.map
 	end
 	
@@ -409,12 +436,14 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CanMoveDown3
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveDown3))
-		assert_equal 'OK move 1', ins.moveDown
+		result = ins.move(:down)
+		assert_equal :ok, result[:status]
+		assert_equal 1, result[:move_number]
 	end
 	
 	def test_AfterMoveDown3
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveDown3))
-		ins.moveDown
+		ins.move(:down)
 		assert_equal AfterMoveDown3, ins.map
 	end
 	
@@ -432,12 +461,14 @@ class TC_Level < Test::Unit::TestCase
 	              
 	def test_CanMoveDown4
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveDown4))
-		assert_equal 'WIN move 1', ins.moveDown
+		result = ins.move(:down)
+		assert_equal :win, result[:status]
+		assert_equal 1, result[:move_number]
 	end
 	
 	def test_AfterMoveDown4
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveDown4))
-		ins.moveDown
+		ins.move(:down)
 		assert_equal AfterMoveDown4, ins.map
 	end
 	
@@ -447,7 +478,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveDown1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveDown1))
-		assert_equal 'ERROR wall', ins.moveDown
+		result = ins.move(:down)
+		assert_equal :error, result[:status]
+		assert_equal 'wall', result[:message]
 		assert_equal CannotMoveDown1, ins.map
 	end
 	
@@ -458,7 +491,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveDown2
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveDown2))
-		assert_equal 'ERROR wall behind crate', ins.moveDown
+		result = ins.move(:down)
+		assert_equal :error, result[:status]
+		assert_equal 'wall behind crate', result[:message]
 		assert_equal CannotMoveDown2, ins.map
 	end
 	
@@ -471,7 +506,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveDown3
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveDown3))
-		assert_equal 'ERROR double crate', ins.moveDown
+		result = ins.move(:down)
+		assert_equal :error, result[:status]
+		assert_equal 'double crate', result[:message]
 		assert_equal CannotMoveDown3, ins.map
 	end
 	
@@ -484,7 +521,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveDown4
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveDown4))
-		assert_equal 'ERROR double crate', ins.moveDown
+		result = ins.move(:down)
+		assert_equal :error, result[:status]
+		assert_equal 'double crate', result[:message]
 		assert_equal CannotMoveDown4, ins.map
 	end
 	
@@ -497,7 +536,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveDown5
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveDown5))
-		assert_equal 'ERROR double crate', ins.moveDown
+		result = ins.move(:down)
+		assert_equal :error, result[:status]
+		assert_equal 'double crate', result[:message]
 		assert_equal CannotMoveDown5, ins.map
 	end
 	
@@ -510,7 +551,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveDown6
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveDown6))
-		assert_equal 'ERROR double crate', ins.moveDown
+		result = ins.move(:down)
+		assert_equal :error, result[:status]
+		assert_equal 'double crate', result[:message]
 		assert_equal CannotMoveDown6, ins.map
 	end
 	
@@ -526,12 +569,14 @@ class TC_Level < Test::Unit::TestCase
 	               
 	def test_CanMoveLeft1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveLeft1))
-		assert_equal 'OK move 1', ins.moveLeft
+		result = ins.move(:left)
+		assert_equal :ok, result[:status]
+		assert_equal 1, result[:move_number]
 	end
 	
 	def test_AfterMoveLeft1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveLeft1))
-		ins.moveLeft
+		ins.move(:left)
 		assert_equal AfterMoveLeft1, ins.map
 	end
 	
@@ -545,12 +590,14 @@ class TC_Level < Test::Unit::TestCase
 	              
 	def test_CanMoveLeft2
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveLeft2))
-		assert_equal 'OK move 1', ins.moveLeft
+		result = ins.move(:left)
+		assert_equal :ok, result[:status]
+		assert_equal 1, result[:move_number]
 	end
 	
 	def test_AfterMoveLeft2
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveLeft2))
-		ins.moveLeft
+		ins.move(:left)
 		assert_equal AfterMoveLeft2, ins.map
 	end
 	
@@ -564,12 +611,14 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CanMoveLeft3
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveLeft3))
-		assert_equal 'OK move 1', ins.moveLeft
+		result = ins.move(:left)
+		assert_equal :ok, result[:status]
+		assert_equal 1, result[:move_number]
 	end
 	
 	def test_AfterMoveLeft3
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveLeft3))
-		ins.moveLeft
+		ins.move(:left)
 		assert_equal AfterMoveLeft3, ins.map
 	end
 	
@@ -583,12 +632,14 @@ class TC_Level < Test::Unit::TestCase
 	              
 	def test_CanMoveLeft4
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveLeft4))
-		assert_equal 'WIN move 1', ins.moveLeft
+		result = ins.move(:left)
+		assert_equal :win, result[:status]
+		assert_equal 1, result[:move_number]
 	end
 	
 	def test_AfterMoveLeft4
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveLeft4))
-		ins.moveLeft
+		ins.move(:left)
 		assert_equal AfterMoveLeft4, ins.map
 	end
 	
@@ -598,7 +649,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveLeft1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveLeft1))
-		assert_equal 'ERROR wall', ins.moveLeft
+		result = ins.move(:left)
+		assert_equal :error, result[:status]
+		assert_equal 'wall', result[:message]
 		assert_equal CannotMoveLeft1, ins.map
 	end
 	
@@ -608,7 +661,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveLeft2
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveLeft2))
-		assert_equal 'ERROR wall behind crate', ins.moveLeft
+		result = ins.move(:left)
+		assert_equal :error, result[:status]
+		assert_equal 'wall behind crate', result[:message]
 		assert_equal CannotMoveLeft2, ins.map
 	end
 	
@@ -618,7 +673,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveLeft3
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveLeft3))
-		assert_equal 'ERROR double crate', ins.moveLeft
+		result = ins.move(:left)
+		assert_equal :error, result[:status]
+		assert_equal 'double crate', result[:message]
 		assert_equal CannotMoveLeft3, ins.map
 	end
 	
@@ -634,12 +691,14 @@ class TC_Level < Test::Unit::TestCase
 	               
 	def test_CanMoveRight1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveRight1))
-		assert_equal 'OK move 1', ins.moveRight
+		result = ins.move(:right)
+		assert_equal :ok, result[:status]
+		assert_equal 1, result[:move_number]
 	end
 	
 	def test_AfterMoveRight1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveRight1))
-		ins.moveRight
+		ins.move(:right)
 		assert_equal AfterMoveRight1, ins.map
 	end
 	
@@ -653,12 +712,14 @@ class TC_Level < Test::Unit::TestCase
 	              
 	def test_CanMoveRight2
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveRight2))
-		assert_equal 'OK move 1', ins.moveRight
+		result = ins.move(:right)
+		assert_equal :ok, result[:status]
+		assert_equal 1, result[:move_number]
 	end
 	
 	def test_AfterMoveRight2
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveRight2))
-		ins.moveRight
+		ins.move(:right)
 		assert_equal AfterMoveRight2, ins.map
 	end
 	
@@ -672,12 +733,14 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CanMoveRight3
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveRight3))
-		assert_equal 'OK move 1', ins.moveRight
+		result = ins.move(:right)
+		assert_equal :ok, result[:status]
+		assert_equal 1, result[:move_number]
 	end
 	
 	def test_AfterMoveRight3
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveRight3))
-		ins.moveRight
+		ins.move(:right)
 		assert_equal AfterMoveRight3, ins.map
 	end
 	
@@ -691,12 +754,14 @@ class TC_Level < Test::Unit::TestCase
 	              
 	def test_CanMoveRight4
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveRight4))
-		assert_equal 'WIN move 1', ins.moveRight
+		result = ins.move(:right)
+		assert_equal :win, result[:status]
+		assert_equal 1, result[:move_number]
 	end
 	
 	def test_AfterMoveRight4
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveRight4))
-		ins.moveRight
+		ins.move(:right)
 		assert_equal AfterMoveRight4, ins.map
 	end
 	
@@ -706,7 +771,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveRight1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveRight1))
-		assert_equal 'ERROR wall', ins.moveRight
+		result = ins.move(:right)
+		assert_equal :error, result[:status]
+		assert_equal 'wall', result[:message]
 		assert_equal CannotMoveRight1, ins.map
 	end
 	
@@ -716,7 +783,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveRight2
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveRight2))
-		assert_equal 'ERROR wall behind crate', ins.moveRight
+		result = ins.move(:right)
+		assert_equal :error, result[:status]
+		assert_equal 'wall behind crate', result[:message]
 		assert_equal CannotMoveRight2, ins.map
 	end
 	
@@ -726,7 +795,9 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_CannotMoveRight3
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveRight3))
-		assert_equal 'ERROR double crate', ins.moveRight
+		result = ins.move(:right)
+		assert_equal :error, result[:status]
+		assert_equal 'double crate', result[:message]
 		assert_equal CannotMoveRight3, ins.map
 	end
 	
@@ -738,10 +809,12 @@ class TC_Level < Test::Unit::TestCase
 	
 	def test_solution_avec_une_seule_caisse
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Win1))
-		assert_equal 'WIN move 1', ins.moveRight
+		result = ins.move(:right)
+		assert_equal :win, result[:status]
+		assert_equal 1, result[:move_number]
 	end
 	
-	### BUG 1 #######################################
+	### BUGS #######################################
 	
 	# I need a 'crate on storage' in 1, 1. But Level#new don't know how to parse this.
 	# This is the picture I really want to test :
@@ -757,7 +830,7 @@ class TC_Level < Test::Unit::TestCase
 										  '#.#',
 										  '###']
 	
-	def test_bug_1
+	def test_bug_first
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveUpBug1))
 		# Changing 'o' to '*'
 		def ins.addStorage
@@ -768,6 +841,8 @@ class TC_Level < Test::Unit::TestCase
 		# I need to be sure that coord 1, 1 is '*'
 		assert_equal '#*#', ins.map[1]
 		
-		assert_equal 'ERROR wall behind crate', ins.moveUp
+		result = ins.move(:up)
+		assert_equal :error, result[:status]
+		assert_equal 'wall behind crate', result[:message]
 	end
 end