RSokoban 0.73 → 0.74

data/test/tc_level_loader.rb

@@ -18,25 +18,12 @@ class TC_LevelLoader < Test::Unit::TestCase
 	
 	def test_title_of_set
 		ins = RSokoban::LevelLoader.new "test_file1.xsb"
-		assert_equal 'test level', ins.set.title
+		assert_equal 'test level', ins.title
 	end
 	
 	def test_description_of_set
 		ins = RSokoban::LevelLoader.new "test_file1.xsb"
-		assert_equal "one simple level to test\n", ins.set.description
-	end
-	
-	def test_map
-		ins = RSokoban::LevelLoader.new "test_file1.xsb"
-		expected = [ '#####',
-                 '#.$@#',
-                 '#####']
-    assert_equal expected, ins.set.rawLevels[0].map
-	end
-	
-	def test_title_of_level
-		ins = RSokoban::LevelLoader.new "test_file1.xsb"
-		assert_equal "1", ins.set.rawLevels[0].title
+		assert_equal "one simple level to test\n", ins.file_description
 	end
 	
 	def test_level_1
@@ -87,14 +74,22 @@ class TC_LevelLoader < Test::Unit::TestCase
 	
 	def test_get_size_of_set
 		ins = RSokoban::LevelLoader.new "original.xsb"
-		assert_equal 90, ins.set.size
+		assert_equal 90, ins.size
 	end
 	
+	def test_get_the_description_of_a_set
+		ins = RSokoban::LevelLoader.new "original.xsb"
+		desc = "Copyright: a\nE-Mail:\nWeb Site:\n\nThe 50 original levels from Sokoban plus the 40 from Extra.\n"
+		assert_equal desc, ins.file_description
+	end
+	
+	####### BUGS ############################
+	
 	# 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
+		assert_equal 6, ins.size
 	end
 	
 end

data/test/tc_move_recorder.rb

@@ -6,6 +6,7 @@ class TC_MoveRecorder < Test::Unit::TestCase
 		# For testing purpose, add a method to reset the queue of moves.
 		def @mr.empty_for_testing
 			@queue = []
+			@redo =[]
 		end
 		
 		# For testing purpose, add a method to fill the queue of moves with known values.
@@ -23,13 +24,6 @@ class TC_MoveRecorder < Test::Unit::TestCase
 		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
@@ -86,6 +80,15 @@ class TC_MoveRecorder < Test::Unit::TestCase
 		end
 	end
 	
+	### undo ###
+	
+	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_undo_give_the_last_move
 		@mr.fill_for_testing [:up, :up, :left]
 		assert_equal :left, @mr.undo
@@ -97,4 +100,35 @@ class TC_MoveRecorder < Test::Unit::TestCase
 		assert_equal [:up, :up], @mr.get_for_testing
 	end
 	
+	### redo ###
+	
+	def test_redo_exception
+		@mr.empty_for_testing
+		assert_raise(RSokoban::EmptyRedoError) do
+			@mr.redo
+		end
+	end
+	
+	def test_redo_give_the_last_undo
+		@mr.fill_for_testing [:up, :up, :left]
+		@mr.undo
+		assert_equal :left, @mr.redo
+	end
+	
+	def test_redo_refill_undo
+		@mr.fill_for_testing [:up, :up, :left]
+		@mr.undo
+		@mr.redo
+		assert_equal :left, @mr.undo
+	end
+	
+	def test_record_reset_redo
+		@mr.fill_for_testing [:up, :up, :left]
+		@mr.undo
+		@mr.record :down
+		assert_raise(RSokoban::EmptyRedoError) do
+			@mr.redo
+		end
+	end
+	
 end

data/test/tc_move_result.rb

@@ -0,0 +1,45 @@
+class TC_MoveResult < Test::Unit::TestCase
+	
+	def setup
+		@res_ok = RSokoban::MoveResult.new(:status => :ok, :move_number => 123)
+		@res_win = RSokoban::MoveResult.new(:status => :win, :move_number => 456)
+		@res_err = RSokoban::MoveResult.new(:status => :error, :message => 'wall')
+	end
+	
+	def test_status_ok
+		assert_equal :ok, @res_ok[:status]
+	end
+	
+	def test_question_ok
+		assert_equal true, @res_ok.ok?
+	end
+	
+	def test_move_number_ok
+		assert_equal 123, @res_ok[:move_number]
+	end
+	
+	def test_status_win
+		assert_equal :win, @res_win[:status]
+	end
+	
+	def test_question_win
+		assert_equal true, @res_win.win?
+	end
+	
+	def test_move_number_win
+		assert_equal 456, @res_win[:move_number]
+	end
+	
+	def test_status_error
+		assert_equal :error, @res_err[:status]
+	end
+	
+	def test_question_error
+		assert_equal true, @res_err.error?
+	end
+	
+	def test_message
+		assert_equal 'wall', @res_err[:message]
+	end
+	
+end

data/test/test.rb

@@ -16,3 +16,6 @@ require "../test/tc_move_recorder"
 require "../test/tc_map"
 require "../test/ui/tc_console"
 require "../test/ui/tc_player_action"
+require "../test/tc_extensions"
+require "../test/tc_game"
+require "../test/tc_move_result"

data/test/ui/tc_console.rb

@@ -7,7 +7,9 @@ class TC_Console < Test::Unit::TestCase
 		def @console.public_parse(*args)
 			parse(*args)
 		end
-		
+		# Lets pretend the set of levels used by @console is 99 levels length.
+		@console.instance_variable_set(:@set_total, 99)
+
 		@pa = RSokoban::UI::PlayerAction.new
 	end
 	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: RSokoban
 version: !ruby/object:Gem::Version 
-  version: "0.73"
+  version: "0.74"
 platform: ruby
 authors: 
 - Xavier Nayrac
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +01:00
+date: 2011-01-31 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,8 @@ files:
 - lib/rsokoban/ui/curses_console.rb
 - lib/rsokoban/ui/base_ui.rb
 - lib/rsokoban/ui/tk_ui.rb
+- lib/rsokoban/ui/tk_dialogs.rb
+- lib/rsokoban/ui/tk_box.rb
 - lib/rsokoban/ui/console.rb
 - lib/rsokoban/ui/player_action.rb
 - lib/rsokoban/level_loader.rb
@@ -41,7 +43,9 @@ files:
 - lib/rsokoban/position.rb
 - lib/rsokoban/level.rb
 - lib/rsokoban/map.rb
+- lib/rsokoban/extensions.rb
 - lib/rsokoban/level_set.rb
+- lib/rsokoban/move_result.rb
 - lib/rsokoban/man.rb
 - bin/rsokoban
 - data/original.xsb
@@ -66,22 +70,25 @@ files:
 - README.rdoc
 - TODO
 - NEWS
-- RSokoban-0.73.gem
 - VERSION
 - COPYING
+- Rakefile
 - test/test_file1.xsb
 - test/tc_move_recorder.rb
 - test/tc_level_loader.rb
 - test/test_file2.xsb
 - test/tc_level.rb
+- test/tc_move_result.rb
 - test/tc_position.rb
 - test/original.xsb
 - test/ui
 - test/ui/tc_console.rb
 - test/ui/tc_player_action.rb
 - test/tc_map.rb
+- test/tc_extensions.rb
 - test/tc_raw_level.rb
 - test/tc_man.rb
+- test/tc_game.rb
 - test/test.rb
 - test/tc_moveable.rb
 - test/tc_level_set.rb