RSokoban 0.71 → 0.73

data/test/tc_level.rb

@@ -148,7 +148,7 @@ class TC_Level < Test::Unit::TestCase
 
 	def test_rawLevel
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Level1))
-		assert_equal Level1, ins.picture
+		assert_equal Level1, ins.map
 	end
 	
 	Level1_u = ['    #####',
@@ -166,7 +166,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_rawLevel_after_move_up
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', Level1))
 		ins.move :up
-		assert_equal Level1_u, ins.picture
+		assert_equal Level1_u, ins.map
 	end
 	
 	Text4 = [ '####',
@@ -202,7 +202,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_AfterMoveUp1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveUp1))
 		ins.moveUp
-		assert_equal AfterMoveUp1, ins.picture
+		assert_equal AfterMoveUp1, ins.map
 	end
 	
 	CanMoveUp2 = ['###',
@@ -225,7 +225,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_AfterMoveUp2
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveUp2))
 		ins.moveUp
-		assert_equal AfterMoveUp2, ins.picture
+		assert_equal AfterMoveUp2, ins.map
 	end
 	
 	CanMoveUp3 = ['###',
@@ -250,7 +250,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_AfterMoveUp3
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveUp3))
 		ins.moveUp
-		assert_equal AfterMoveUp3, ins.picture
+		assert_equal AfterMoveUp3, ins.map
 	end
 	
 	CanMoveUp4 = ['###',
@@ -275,7 +275,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_AfterMoveUp4
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveUp4))
 		ins.moveUp
-		assert_equal AfterMoveUp4, ins.picture
+		assert_equal AfterMoveUp4, ins.map
 	end
 	
 	CannotMoveUp1 = ['###',
@@ -285,7 +285,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_CannotMoveUp1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveUp1))
 		assert_equal 'ERROR wall', ins.moveUp
-		assert_equal CannotMoveUp1, ins.picture
+		assert_equal CannotMoveUp1, ins.map
 	end
 	
 	CannotMoveUp2 = ['###',
@@ -296,7 +296,7 @@ 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
-		assert_equal CannotMoveUp2, ins.picture
+		assert_equal CannotMoveUp2, ins.map
 	end
 	
 	CannotMoveUp3 = ['###',
@@ -309,7 +309,7 @@ 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
-		assert_equal CannotMoveUp3, ins.picture
+		assert_equal CannotMoveUp3, ins.map
 	end
 	
 	CannotMoveUp4 = ['###',
@@ -322,7 +322,7 @@ 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
-		assert_equal CannotMoveUp4, ins.picture
+		assert_equal CannotMoveUp4, ins.map
 	end
 	
 	CannotMoveUp5 = ['###',
@@ -335,7 +335,7 @@ 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
-		assert_equal CannotMoveUp5, ins.picture
+		assert_equal CannotMoveUp5, ins.map
 	end
 	
 	CannotMoveUp6 = ['###',
@@ -348,7 +348,7 @@ 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
-		assert_equal CannotMoveUp6, ins.picture
+		assert_equal CannotMoveUp6, ins.map
 	end
 	
 	### Move down ##############################################
@@ -371,7 +371,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_AfterMoveDown1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveDown1))
 		ins.moveDown
-		assert_equal AfterMoveDown1, ins.picture
+		assert_equal AfterMoveDown1, ins.map
 	end
 	
 	CanMoveDown2 = ['###',
@@ -392,7 +392,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_AfterMoveDown2
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveDown2))
 		ins.moveDown
-		assert_equal AfterMoveDown2, ins.picture
+		assert_equal AfterMoveDown2, ins.map
 	end
 	
 	CanMoveDown3 = ['###',
@@ -415,7 +415,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_AfterMoveDown3
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveDown3))
 		ins.moveDown
-		assert_equal AfterMoveDown3, ins.picture
+		assert_equal AfterMoveDown3, ins.map
 	end
 	
 	CanMoveDown4 = ['###',
@@ -438,7 +438,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_AfterMoveDown4
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveDown4))
 		ins.moveDown
-		assert_equal AfterMoveDown4, ins.picture
+		assert_equal AfterMoveDown4, ins.map
 	end
 	
 	CannotMoveDown1 = ['###',
@@ -448,7 +448,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_CannotMoveDown1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveDown1))
 		assert_equal 'ERROR wall', ins.moveDown
-		assert_equal CannotMoveDown1, ins.picture
+		assert_equal CannotMoveDown1, ins.map
 	end
 	
 	CannotMoveDown2 = ['###',
@@ -459,7 +459,7 @@ 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
-		assert_equal CannotMoveDown2, ins.picture
+		assert_equal CannotMoveDown2, ins.map
 	end
 	
 	CannotMoveDown3 = ['###',
@@ -472,7 +472,7 @@ 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
-		assert_equal CannotMoveDown3, ins.picture
+		assert_equal CannotMoveDown3, ins.map
 	end
 	
 	CannotMoveDown4 = ['###',
@@ -485,7 +485,7 @@ 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
-		assert_equal CannotMoveDown4, ins.picture
+		assert_equal CannotMoveDown4, ins.map
 	end
 	
 	CannotMoveDown5 = ['###',
@@ -498,7 +498,7 @@ 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
-		assert_equal CannotMoveDown5, ins.picture
+		assert_equal CannotMoveDown5, ins.map
 	end
 	
 	CannotMoveDown6 = ['###',
@@ -511,7 +511,7 @@ 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
-		assert_equal CannotMoveDown6, ins.picture
+		assert_equal CannotMoveDown6, ins.map
 	end
 	
 	### Move left ##############################################
@@ -532,7 +532,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_AfterMoveLeft1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveLeft1))
 		ins.moveLeft
-		assert_equal AfterMoveLeft1, ins.picture
+		assert_equal AfterMoveLeft1, ins.map
 	end
 	
 	CanMoveLeft2 = ['####',
@@ -551,7 +551,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_AfterMoveLeft2
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveLeft2))
 		ins.moveLeft
-		assert_equal AfterMoveLeft2, ins.picture
+		assert_equal AfterMoveLeft2, ins.map
 	end
 	
 	CanMoveLeft3 = ['#####',
@@ -570,7 +570,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_AfterMoveLeft3
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveLeft3))
 		ins.moveLeft
-		assert_equal AfterMoveLeft3, ins.picture
+		assert_equal AfterMoveLeft3, ins.map
 	end
 	
 	CanMoveLeft4 = ['#####',
@@ -589,7 +589,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_AfterMoveLeft4
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveLeft4))
 		ins.moveLeft
-		assert_equal AfterMoveLeft4, ins.picture
+		assert_equal AfterMoveLeft4, ins.map
 	end
 	
 	CannotMoveLeft1 = ['###',
@@ -599,7 +599,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_CannotMoveLeft1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveLeft1))
 		assert_equal 'ERROR wall', ins.moveLeft
-		assert_equal CannotMoveLeft1, ins.picture
+		assert_equal CannotMoveLeft1, ins.map
 	end
 	
 	CannotMoveLeft2 = ['####',
@@ -609,7 +609,7 @@ 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
-		assert_equal CannotMoveLeft2, ins.picture
+		assert_equal CannotMoveLeft2, ins.map
 	end
 	
 	CannotMoveLeft3 = ['######',
@@ -619,7 +619,7 @@ 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
-		assert_equal CannotMoveLeft3, ins.picture
+		assert_equal CannotMoveLeft3, ins.map
 	end
 	
 	### Move right ##############################################
@@ -640,7 +640,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_AfterMoveRight1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveRight1))
 		ins.moveRight
-		assert_equal AfterMoveRight1, ins.picture
+		assert_equal AfterMoveRight1, ins.map
 	end
 	
 	CanMoveRight2 = ['####',
@@ -659,7 +659,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_AfterMoveRight2
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveRight2))
 		ins.moveRight
-		assert_equal AfterMoveRight2, ins.picture
+		assert_equal AfterMoveRight2, ins.map
 	end
 	
 	CanMoveRight3 = ['#####',
@@ -678,7 +678,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_AfterMoveRight3
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveRight3))
 		ins.moveRight
-		assert_equal AfterMoveRight3, ins.picture
+		assert_equal AfterMoveRight3, ins.map
 	end
 	
 	CanMoveRight4 = ['#####',
@@ -697,7 +697,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_AfterMoveRight4
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CanMoveRight4))
 		ins.moveRight
-		assert_equal AfterMoveRight4, ins.picture
+		assert_equal AfterMoveRight4, ins.map
 	end
 	
 	CannotMoveRight1 = ['###',
@@ -707,7 +707,7 @@ class TC_Level < Test::Unit::TestCase
 	def test_CannotMoveRight1
 		ins = RSokoban::Level.new(RSokoban::RawLevel.new('1', CannotMoveRight1))
 		assert_equal 'ERROR wall', ins.moveRight
-		assert_equal CannotMoveRight1, ins.picture
+		assert_equal CannotMoveRight1, ins.map
 	end
 	
 	CannotMoveRight2 = ['####',
@@ -717,7 +717,7 @@ 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
-		assert_equal CannotMoveRight2, ins.picture
+		assert_equal CannotMoveRight2, ins.map
 	end
 	
 	CannotMoveRight3 = ['######',
@@ -727,7 +727,7 @@ 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
-		assert_equal CannotMoveRight3, ins.picture
+		assert_equal CannotMoveRight3, ins.map
 	end
 	
 	### WIN ########################################################
@@ -766,7 +766,7 @@ class TC_Level < Test::Unit::TestCase
 		ins.addStorage
 		
 		# I need to be sure that coord 1, 1 is '*'
-		assert_equal '#*#', ins.picture[1]
+		assert_equal '#*#', ins.map[1]
 		
 		assert_equal 'ERROR wall behind crate', ins.moveUp
 	end

data/test/tc_level_loader.rb

@@ -26,12 +26,12 @@ class TC_LevelLoader < Test::Unit::TestCase
 		assert_equal "one simple level to test\n", ins.set.description
 	end
 	
-	def test_picture
+	def test_map
 		ins = RSokoban::LevelLoader.new "test_file1.xsb"
 		expected = [ '#####',
                  '#.$@#',
                  '#####']
-    assert_equal expected, ins.set.rawLevels[0].picture
+    assert_equal expected, ins.set.rawLevels[0].map
 	end
 	
 	def test_title_of_level
@@ -85,4 +85,16 @@ class TC_LevelLoader < Test::Unit::TestCase
 		end
 	end
 	
+	def test_get_size_of_set
+		ins = RSokoban::LevelLoader.new "original.xsb"
+		assert_equal 90, ins.set.size
+	end
+	
+	# There was a bug where size was majored by one when the xsb file
+	# finish by several blank lines.
+	def test_get_size_of_set_buggy
+		ins = RSokoban::LevelLoader.new "test_file2.xsb"
+		assert_equal 6, ins.set.size
+	end
+	
 end

data/test/tc_level_set.rb

@@ -39,4 +39,12 @@ class TC_LevelSet < Test::Unit::TestCase
 		ins = RSokoban::LevelSet.new
 		assert_equal [], ins.rawLevels
 	end
+	
+	def test_get_size
+		ins = RSokoban::LevelSet.new
+		list = [].push(RSokoban::RawLevel.new('title', ['###']))
+		ins.rawLevels = list
+		assert_equal 1, ins.size
+	end
+	
 end

data/test/tc_map.rb

@@ -0,0 +1,40 @@
+class TC_Map < Test::Unit::TestCase
+
+	def setup
+		@map = RSokoban::Map.new
+	end
+	
+	def test_default_picture_is_empy
+		assert_equal [], RSokoban::Map.new.rows
+	end
+	
+	def test_assigning_rows
+		@map.rows = ['###', '# #', '###']
+		assert_equal ['###', '# #', '###'], @map.rows
+	end
+	
+	def test_get_height
+		@map.rows = ['###', '# #', '###']
+		assert_equal 3, @map.height
+	end
+	
+	def test_get_width
+		@map.rows = ['###', '####', '##']
+		assert_equal 4, @map.width
+	end
+	
+	def test_get_a_row
+		@map.rows = ['###', '# #', '###']
+		assert_equal '# #', @map[1]
+	end
+	
+	def test_each_row
+		@map.rows = ['#', '##', '###']
+		expected = '#'
+		@map.each {|row|
+			assert_equal expected, row
+			expected += '#'
+		}
+	end
+	
+end

data/test/tc_move_recorder.rb

@@ -0,0 +1,100 @@
+class TC_MoveRecorder < Test::Unit::TestCase
+
+	def setup
+		@mr = RSokoban::MoveRecorder.new
+		
+		# For testing purpose, add a method to reset the queue of moves.
+		def @mr.empty_for_testing
+			@queue = []
+		end
+		
+		# For testing purpose, add a method to fill the queue of moves with known values.
+		def @mr.fill_for_testing list
+			@queue = list
+		end
+		
+		# For testing purpose, add a method to get the queue of moves.
+		def @mr.get_for_testing
+			@queue
+		end
+	end
+	
+	def test_create_instance
+		assert @mr.instance_of?(RSokoban::MoveRecorder)
+	end
+	
+	def test_raise_exception_if_we_undo_an_empty_queue
+		@mr.empty_for_testing
+		assert_raise(RSokoban::EmptyMoveQueueError) do
+			@mr.undo
+		end
+	end
+	
+	def test_record_up
+		@mr.empty_for_testing
+		@mr.record :up
+		assert_equal [:up], @mr.get_for_testing
+	end
+	
+	def test_record_down
+		@mr.empty_for_testing
+		@mr.record :down
+		assert_equal [:down], @mr.get_for_testing
+	end
+	
+	def test_record_left
+		@mr.empty_for_testing
+		@mr.record :left
+		assert_equal [:left], @mr.get_for_testing
+	end
+	
+	def test_record_right
+		@mr.empty_for_testing
+		@mr.record :right
+		assert_equal [:right], @mr.get_for_testing
+	end
+	
+	
+	def test_record_up_and_push
+		@mr.empty_for_testing
+		@mr.record :up, :push
+		assert_equal [:UP], @mr.get_for_testing
+	end
+	
+	def test_record_down_and_push
+		@mr.empty_for_testing
+		@mr.record :down, :push
+		assert_equal [:DOWN], @mr.get_for_testing
+	end
+	
+	def test_record_left_and_push
+		@mr.empty_for_testing
+		@mr.record :left, :push
+		assert_equal [:LEFT], @mr.get_for_testing
+	end
+	
+	def test_record_right_and_push
+		@mr.empty_for_testing
+		@mr.record :right, :push
+		assert_equal [:RIGHT], @mr.get_for_testing
+	end
+	
+	
+	def test_record_nothing_else_than_direction
+		assert_raise(ArgumentError) do
+			@mr.record :north
+		end
+	end
+	
+	def test_undo_give_the_last_move
+		@mr.fill_for_testing [:up, :up, :left]
+		assert_equal :left, @mr.undo
+	end
+	
+	def test_undo_diminish_the_queue
+		@mr.fill_for_testing [:up, :up, :left]
+		@mr.undo
+		assert_equal [:up, :up], @mr.get_for_testing
+	end
+	
+end

data/test/tc_raw_level.rb

@@ -21,15 +21,15 @@ class TC_RawLevel < Test::Unit::TestCase
                '#.$@#',
                '#####']
                
-	def test_picture_accessors
+	def test_map_accessors
 		ins = RSokoban::RawLevel.new
-		ins.picture = Picture1
-		assert_equal Picture1, ins.picture
+		ins.map = Picture1
+		assert_equal Picture1, ins.map.rows
 	end
 	
-	def test_default_picture
+	def test_default_map
 		ins = RSokoban::RawLevel.new
-		assert_equal [], ins.picture
+		assert_equal RSokoban::Map.new, ins.map
 	end
 	
 end

data/test/test.rb

@@ -12,5 +12,7 @@ require "../test/tc_raw_level"
 require "../test/tc_position"
 require "../test/tc_moveable"
 require "../test/tc_man"
+require "../test/tc_move_recorder"
+require "../test/tc_map"
 require "../test/ui/tc_console"
-
+require "../test/ui/tc_player_action"

data/test/test_file2.xsb

@@ -47,3 +47,5 @@
 #.$@#
 #####
 ; 6
+
+

data/test/ui/tc_console.rb

@@ -7,10 +7,13 @@ class TC_Console < Test::Unit::TestCase
 		def @console.public_parse(*args)
 			parse(*args)
 		end
+		
+		@pa = RSokoban::UI::PlayerAction.new
 	end
 	
 	def test_string_quit_must_returns_symbol_quit
-		assert_equal :quit, @console.public_parse('quit')
+		@pa.action = :quit
+		assert_equal @pa, @console.public_parse('quit')
 	end
 	
 	def test_string_help_must_returns_symbol_help
@@ -18,43 +21,53 @@ class TC_Console < Test::Unit::TestCase
 	end
 	
 	def test_string_retry_must_returns_symbol_retry
-		assert_equal :retry, @console.public_parse('retry')
+		@pa.action = :retry
+		assert_equal @pa, @console.public_parse('retry')
 	end
 	
 	def test_string_up_must_returns_symbol_up
-		assert_equal :up, @console.public_parse('up')
+		@pa.action = :up
+		assert_equal @pa, @console.public_parse('up')
 	end
 	
 	def test_string_down_must_returns_symbol_down
-		assert_equal :down, @console.public_parse('down')
+		@pa.action = :down
+		assert_equal @pa, @console.public_parse('down')
 	end
 	
 	def test_string_right_must_returns_symbol_right
-		assert_equal :right, @console.public_parse('right')
+		@pa.action = :right
+		assert_equal @pa, @console.public_parse('right')
 	end
 	
 	def test_string_left_must_returns_symbol_left
-		assert_equal :left, @console.public_parse('left')
+		@pa.action = :left
+		assert_equal @pa, @console.public_parse('left')
 	end
 	
 	def test_string_z_must_returns_symbol_up
-		assert_equal :up, @console.public_parse('z')
+		@pa.action = :up
+		assert_equal @pa, @console.public_parse('z')
 	end
 	
 	def test_string_s_must_returns_symbol_down
-		assert_equal :down, @console.public_parse('s')
+		@pa.action = :down
+		assert_equal @pa, @console.public_parse('s')
 	end
 	
-	def test_string_q_must_returns_symbol_left
-		assert_equal :left, @console.public_parse('q')
+	def test_string_q_must_returns_action_left
+		@pa.action = :left
+		assert_equal @pa, @console.public_parse('q')
 	end
 	
 	def test_string_d_must_returns_symbol_right
-		assert_equal :right, @console.public_parse('d')
+		@pa.action = :right
+		assert_equal @pa, @console.public_parse('d')
 	end
 	
 	def test_string_representing_a_number_must_returns_this_number
-		assert_equal 12, @console.public_parse("12")
+		@pa.action = 12
+		assert_equal @pa, @console.public_parse("12")
 	end
 	
 	def test_must_return_nil_if_number_is_negative
@@ -66,7 +79,8 @@ class TC_Console < Test::Unit::TestCase
 	end
 	
 	def test_xsb_filename_must_returns_itself
-		assert_equal 'some_levels.xsb', @console.public_parse("some_levels.xsb")
+		@pa.action = 'some_levels.xsb'
+		assert_equal @pa, @console.public_parse("some_levels.xsb")
 	end
 	
 	def test_anything_else_must_returns_nil