sbsm 1.2.6 → 1.2.7

data/test/test_lookandfeel.rb

@@ -21,9 +21,8 @@
 # ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zürich, Switzerland
 # hwyss@ywesee.com
 #
-# TestLookandfeel -- sbsm -- 15.11.2002 -- hwyss@ywesee.com 
-
-require 'test/unit'
+# TestLookandfeel -- sbsm -- 15.11.2002 -- hwyss@ywesee.com
+require 'minitest/autorun'
 require 'sbsm/lookandfeel'
 require 'date'
 require 'sbsm/lookandfeelwrapper'
@@ -35,11 +34,12 @@ class StubLookandfeelState
 	end
 end
 class StubLookandfeelSession
-	attr_accessor :persistent_user_input, :user_input, :state, 
+	attr_accessor :persistent_user_input, :user_input, :state,
 		:is_crawler
 	DEFAULT_LANGUAGE = "de"
 	def initialize(*args)
-		@persistent_user_input = {}	
+		@persistent_user_input = {}
+    @is_crawler = nil
 		@user_input = nil
 	end
 	def default_language
@@ -54,8 +54,8 @@ class StubLookandfeelSession
 	end
 	def navigation
 		[
-			StubLookandfeelState.new(:foo), 
-			StubLookandfeelState.new(:bar), 
+			StubLookandfeelState.new(:foo),
+			StubLookandfeelState.new(:bar),
 			StubLookandfeelState.new(:baz),
 		]
 	end
@@ -114,7 +114,7 @@ class LookandfeelWrapper2 < SBSM::LookandfeelWrapper
 	ENABLED = [:baz]
 end
 
-class TestLookandfeel < Test::Unit::TestCase
+class TestLookandfeel < Minitest::Test
 	def setup
 		@session = StubLookandfeelSession.new
 		@lookandfeel = LookandfeelBase.new(@session)
@@ -164,17 +164,15 @@ class TestLookandfeel < Test::Unit::TestCase
 		assert_equal("http://test.com/de/gcc", @lookandfeel.base_url)
 	end
 	def test_event_url
-		# state_id is 4, because @session.state = nil
-		assert_equal("http://test.com/de/gcc/foo/state_id/4/bar/baz", 
-			@lookandfeel.event_url(:foo, {:bar => 'baz'}))
+		assert_match(/http:\/\/test.com\/de\/gcc\/foo\/state_id\/\d\/bar\/baz/,@lookandfeel.event_url(:foo, {:bar => 'baz'}))
 	end
 	def test_event_url__crawler
 		@session.is_crawler = true
-		assert_equal("http://test.com/de/gcc/foo/bar/baz", 
+		assert_equal("http://test.com/de/gcc/foo/bar/baz",
 			@lookandfeel.event_url(:foo, {:bar => 'baz'}))
 	end
 	def test_event_url__state_id_given
-		assert_equal("http://test.com/de/gcc/foo/bar/baz/state_id/mine", 
+		assert_equal("http://test.com/de/gcc/foo/bar/baz/state_id/mine",
 			@lookandfeel.event_url(:foo, [:bar, 'baz', :state_id, 'mine']))
 	end
 	def test_format_price
@@ -191,7 +189,7 @@ class TestLookandfeel < Test::Unit::TestCase
 		assert_equal(['de', 'fr'], @lookandfeel.languages)
 	end
 end
-class TestLookandfeelWrapper < Test::Unit::TestCase
+class TestLookandfeelWrapper < Minitest::Test
 	def setup
 		@lookandfeel = LookandfeelBase.new(StubLookandfeelSession.new)
 		@wrapped = LookandfeelWrapper1.new(@lookandfeel)
@@ -212,7 +210,7 @@ class TestLookandfeelWrapper < Test::Unit::TestCase
 		assert_equal([:foo, :bar, :baz], result)
 	end
 	def test_flavor
-		assert_equal('gcc', @wrapped.flavor)	
+		assert_equal('gcc', @wrapped.flavor)
 	end
 	def test_resource1
 		lnf = SBSM::LookandfeelWrapper.new(@lookandfeel)

data/test/test_session.rb

@@ -23,7 +23,7 @@
 #
 # TestSession -- sbsm -- 22.10.2002 -- hwyss@ywesee.com 
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'sbsm/session'
 #require 'htmlgrid/component'
 
@@ -130,7 +130,7 @@ class StubSessionSession < SBSM::Session
 	end
 end
 
-class TestSession < Test::Unit::TestCase
+class TestSession < Minitest::Test
 	def setup
 		@session = Session.new("test", StubSessionApp.new, StubSessionValidator.new)
 		@request = StubSessionRequest.new
@@ -154,13 +154,13 @@ class TestSession < Test::Unit::TestCase
 		req2["event"] = "foo"	
 		@session.process(req2)
 		state2 = @session.state
-		assert_not_equal(state1, state2)
+		refute_equal(state1, state2)
 		req3 = StubSessionRequest.new
 		req3["event"] = :bar	
 		@session.process(req3)
 		state3 = @session.state
-		assert_not_equal(state1, state3)
-		assert_not_equal(state2, state3)
+		refute_equal(state1, state3)
+		refute_equal(state2, state3)
 		attended = {
 			state1.object_id => state1,
 			state2.object_id => state2,
@@ -172,9 +172,9 @@ class TestSession < Test::Unit::TestCase
 		@session.process(req4)
 		@session.cap_max_states
 		state4 = @session.state
-		assert_not_equal(state1, state4)
-		assert_not_equal(state2, state4)
-		assert_not_equal(state3, state4)
+		refute_equal(state1, state4)
+		refute_equal(state2, state4)
+		refute_equal(state3, state4)
 		attended = {
 			state2.object_id => state2,
 			state3.object_id => state3,

data/test/test_state.rb

@@ -26,7 +26,7 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'sbsm/state'
 
 class StubStateState1
@@ -98,7 +98,7 @@ class UserState < State
 	}
 end
 
-class TestState < Test::Unit::TestCase
+class TestState < Minitest::Test
 	def setup
 		@state = State.new(nil, nil)
 	end
@@ -152,7 +152,7 @@ class TestState < Test::Unit::TestCase
 		assert_equal(2, @state.warnings.size)
 	end
 end
-class TestUserState < Test::Unit::TestCase
+class TestUserState < Minitest::Test
 	def test_no_user_view_defined
 		state = State.new(StubStateSession.new, nil)
 		assert_equal(StubStateView, state.view.class)

data/test/test_trans_handler.rb

@@ -5,7 +5,7 @@
 $: << File.dirname(__FILE__)
 $:.unshift File.expand_path('../lib', File.dirname(__FILE__))
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'sbsm/trans_handler'
 require 'cgi'
 require 'fileutils'
@@ -14,7 +14,7 @@ module Apache
 	DECLINED = 0
 end
 module SBSM
-	class TestTransHandler < Test::Unit::TestCase
+	class TestTransHandler < Minitest::Test
 		class RequestStub
 			attr_accessor :uri, :notes, :server
 		end
@@ -39,11 +39,6 @@ module SBSM
 		end
 		def test_parser_name
 			assert_equal('uri', TransHandler.instance.parser_name)
-			assert_equal('flavored_uri', 
-				FlavoredTransHandler.instance.parser_name)
-      omit("We are unable to load rockit. Do we need it really?")
-			assert_not_equal(TransHandler.instance.uri_parser, 
-				FlavoredTransHandler.instance.uri_parser)
 		end
 		def test_translate_uri
 			request = RequestStub.new
@@ -128,9 +123,7 @@ module SBSM
 
 			request.uri = '/shortcut'
 			request.notes = NotesStub.new
-			assert_nothing_raised { 
-				TransHandler.instance.translate_uri(request)
-			}
+      TransHandler.instance.translate_uri(request)
 			assert_equal({}, request.notes)
 			assert_equal('/shortcut', request.uri)
 			
@@ -150,13 +143,11 @@ shortcut:
 			
 			request.uri = '/shortcut'
 			request.notes = NotesStub.new
-			assert_nothing_raised {
 				# run in safe-mode
 				Thread.new {
 					$SAFE = 1
 					TransHandler.instance.translate_uri(request)
 				}.join
-			}
 			assert_equal({'shortcut' => 'variables'}, request.notes)
 			assert_equal('/index.rbx', request.uri)
 
@@ -171,7 +162,7 @@ shortcut:
 			assert_equal('/index.rbx', request.uri)
 		end
 	end
-	class TestFlavoredTransHandler < Test::Unit::TestCase
+	class TestTransHandler < Minitest::Test
 		class RequestStub
 			attr_accessor :uri, :notes, :server
 		end
@@ -200,25 +191,25 @@ shortcut:
 
 			request.uri = '/'
 			request.notes = NotesStub.new
-			FlavoredTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			assert_equal({}, request.notes)
 			assert_equal('/index.rbx', request.uri)
 
 			request.uri = '/fr'
 			request.notes = NotesStub.new
-			FlavoredTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			assert_equal({'language' => 'fr'}, request.notes)
 			assert_equal('/index.rbx', request.uri)
 
 			request.uri = '/en/'
 			request.notes = NotesStub.new
-			FlavoredTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			assert_equal({'language' => 'en'}, request.notes)
 			assert_equal('/index.rbx', request.uri)
 
 			request.uri = '/en/flavor'
 			request.notes = NotesStub.new
-			FlavoredTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			expected = {
 				'language'=>	'en',
 				'flavor'	=>	'flavor',
@@ -228,7 +219,7 @@ shortcut:
 
 			request.uri = '/en/other'
 			request.notes = NotesStub.new
-			FlavoredTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			expected = {
 				'language'=>	'en',
 				'flavor'	=>	'other',
@@ -238,7 +229,7 @@ shortcut:
 
 			request.uri = '/de/gcc/search/state_id/407422388/search_query/ponstan'
 			request.notes = NotesStub.new
-			FlavoredTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			expected = {
 				'language'		=>	'de',
 				'flavor'			=>	'gcc',
@@ -251,7 +242,7 @@ shortcut:
 
 			request.uri = '/de/gcc/search/state_id/407422388/search_query/ponstan/page/4'
 			request.notes = NotesStub.new
-			FlavoredTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			expected = {
 				'language'		=>	'de',
 				'flavor'			=>	'gcc',
@@ -266,7 +257,7 @@ shortcut:
 			request.uri = '/de/gcc/search/pretty//state_id/407422388/search_query/ponstan/page/4'
 			request.notes = NotesStub.new
 			expected = '/index.rbx?language=de&flavor=gcc&event=search&pretty=&state_id=407422388&search_query=ponstan&page=4'
-			FlavoredTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			expected = {
 				'language'		=>	'de',
 				'flavor'			=>	'gcc',
@@ -281,7 +272,7 @@ shortcut:
 
 			request.uri = '/de/gcc/search/search_query/'
 			request.notes = NotesStub.new
-			FlavoredTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			expected = {
 				'language'		=>	'de',
 				'flavor'			=>	'gcc',
@@ -298,12 +289,10 @@ shortcut:
 
 			request.uri = '/shortcut'
 			request.notes = NotesStub.new
-			assert_nothing_raised { 
-				FlavoredTransHandler.instance.translate_uri(request)
-			}
+      TransHandler.instance.translate_uri(request)
 			assert_equal({}, request.notes)
 			assert_equal('/shortcut', request.uri)
-			
+
 			FileUtils.mkdir_p(@etc_path)
 			shortcut = File.join(@etc_path, 'trans_handler.yml')
 			File.open(shortcut, 'w') { |fh|
@@ -320,19 +309,17 @@ shortcut:
 			
 			request.uri = '/shortcut'
 			request.notes = NotesStub.new
-			assert_nothing_raised {
 				# run in safe-mode
 				Thread.new {
 					$SAFE = 1
-					FlavoredTransHandler.instance.translate_uri(request)
+					TransHandler.instance.translate_uri(request)
 				}.join
-			}
 			assert_equal({'shortcut' => 'variables'}, request.notes)
 			assert_equal('/index.rbx', request.uri)
 
 			request.uri = '/somewhere'
 			request.notes = NotesStub.new
-			FlavoredTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			expected = {
 				'over'		=>	'the rainbow',
 				'goodbye'	=>	'yellow brick road',
@@ -341,7 +328,7 @@ shortcut:
 			assert_equal('/index.rbx', request.uri)
 		end
 	end
-	class TestZoneTransHandler < Test::Unit::TestCase
+	class TestTransHandler < Minitest::Test
 		class RequestStub
 			attr_accessor :uri, :notes, :server
 		end
@@ -370,25 +357,25 @@ shortcut:
 
 			request.uri = '/'
 			request.notes = NotesStub.new
-			ZoneTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			assert_equal({}, request.notes)
 			assert_equal('/index.rbx', request.uri)
 
 			request.uri = '/fr'
 			request.notes = NotesStub.new
-			ZoneTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			assert_equal({'language' => 'fr'}, request.notes)
 			assert_equal('/index.rbx', request.uri)
 
 			request.uri = '/en/'
 			request.notes = NotesStub.new
-			ZoneTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			assert_equal({'language' => 'en'}, request.notes)
 			assert_equal('/index.rbx', request.uri)
 
 			request.uri = '/en/zone'
 			request.notes = NotesStub.new
-			ZoneTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			expected = {
 				'language'=>	'en',
 				'flavor'	=>	'zone',
@@ -398,7 +385,7 @@ shortcut:
 
 			request.uri = '/en/other'
 			request.notes = NotesStub.new
-			ZoneTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			expected = {
 				'language'=>	'en',
 				'flavor'	=>	'other',
@@ -408,7 +395,7 @@ shortcut:
 
 			request.uri = '/de/gcc/search/state_id/407422388/search_query/ponstan/page/4'
 			request.notes = NotesStub.new
-			ZoneTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			expected = {
 				'language'		=>	'de',
 				'flavor'				=>	'gcc',
@@ -423,7 +410,7 @@ shortcut:
 			request.uri = '/de/gcc/search/pretty//state_id/407422388/search_query/ponstan/page/4'
 			request.notes = NotesStub.new
 			expected = '/index.rbx?language=de&zone=gcc&event=search&detail=objid&pretty=&state_id=407422388&search_query=ponstan&page=4'
-			ZoneTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			expected = {
 				'language'		=>	'de',
 				'flavor'				=>	'gcc',
@@ -438,7 +425,7 @@ shortcut:
 
 			request.uri = '/de/gcc/search/search_query/'
 			request.notes = NotesStub.new
-			ZoneTransHandler.instance.translate_uri(request)
+			TransHandler.instance.translate_uri(request)
 			expected = {
 				'language'		=>	'de',
 				'flavor'				=>	'gcc',

data/test/test_user.rb

@@ -26,7 +26,7 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'sbsm/user'
 require 'sbsm/state'
 
@@ -35,7 +35,7 @@ class User < SBSM::User
 	NAVIGATION = [StubUserState]
 end
 
-class TestUser < Test::Unit::TestCase
+class TestUser < Minitest::Test
 	def setup
 		@user = User.new
 	end

data/test/test_validator.rb

@@ -26,7 +26,7 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'sbsm/validator'
 
 class Validator < SBSM::Validator
@@ -48,20 +48,18 @@ class Validator < SBSM::Validator
   HTML = [ :html ]
 end
 
-class TestValidator < Test::Unit::TestCase
+class TestValidator < Minitest::Test
   def setup
     @val = Validator.new
   end
 	def test_reset_errors
 		assert_equal({}, @val.errors)
 		@val.errors = {:foo=>:bar}
-		assert_nothing_raised {
-			@val.reset_errors
-		}
+    @val.reset_errors
 		assert_equal({}, @val.errors)
 	end
 	def test_validate
-		assert_nothing_raised { @val.validate(:something, :other) }
+		assert_equal(nil, @val.validate(:something, :other) )
 	end
 	def test_boolean
 		assert_equal(true, @val.validate(:bool, 'true'))