test-unit 3.3.1 → 3.3.6

data/lib/test/unit/code-snippet-fetcher.rb

@@ -31,9 +31,11 @@ module Test
           break if first_line.nil?
           encoding = detect_encoding(first_line) || Encoding::UTF_8
           first_line.force_encoding(encoding)
-          file.set_encoding(encoding)
           lines << first_line
-          lines.concat(file.readlines)
+          file.each_line do |line|
+            line.force_encoding(encoding)
+            lines << line
+          end
         end
         lines
       end

data/lib/test/unit/collector/load.rb

@@ -111,7 +111,7 @@ module Test
           return if @program_file == expanded_path.to_s
           add_load_path(expanded_path.dirname) do
             begin
-              require(path.basename.to_s)
+              require(expanded_path.to_s)
             rescue LoadError
               @require_failed_infos << {:path => expanded_path, :exception => $!}
             end
@@ -131,8 +131,6 @@ module Test
           return yield if path.nil?
 
           path = path.to_s
-          return yield if $LOAD_PATH.index(path)
-
           begin
             $LOAD_PATH.unshift(path)
             yield

data/lib/test/unit/data.rb

@@ -187,7 +187,7 @@ module Test
         #
         # @param [String] file_name full path to test data file.
         #   File format is automatically detected from filename extension.
-        # @raise [ArgumentError] if +file_name+ is not supported file format.
+        # @raise [ArgumentError] if `file_name` is not supported file format.
         # @see Loader#load
         #
         # @example Load data from CSV file
@@ -211,7 +211,7 @@ module Test
           #
           # @param [String] file_name full path to test data file.
           #   File format is automatically detected from filename extension.
-          # @raise [ArgumentError] if +file_name+ is not supported file format.
+          # @raise [ArgumentError] if `file_name` is not supported file format.
           # @see #load_csv
           # @see #load_tsv
           # @api private

data/lib/test/unit/notification.rb

@@ -65,15 +65,17 @@ module Test
       # Notify some information.
       #
       # Example:
-      #   def test_notification
-      #     notify("I'm here!")
-      #     # Reached here
-      #     notify("Special!") if special_case?
-      #     # Reached here too
-      #   end
+      #
+      #     def test_notification
+      #       notify("I'm here!")
+      #       # Reached here
+      #       notify("Special!") if special_case?
+      #       # Reached here too
+      #     end
       #
       # options:
-      #   :backtrace override backtrace.
+      #
+      #     :backtrace override backtrace.
       def notify(message, options={}, &block)
         backtrace = filter_backtrace(options[:backtrace] || caller)
         notification = Notification.new(name, backtrace, message,

data/lib/test/unit/omission.rb

@@ -65,17 +65,18 @@ module Test
       # Omit the test or part of the test.
       #
       # Example:
-      #   def test_omission
-      #     omit
-      #     # Not reached here
-      #   end
       #
-      #   def test_omission_with_here
-      #     omit do
-      #       # Not ran here
+      #     def test_omission
+      #       omit
+      #       # Not reached here
+      #     end
+      #
+      #     def test_omission_with_here
+      #       omit do
+      #         # Not ran here
+      #       end
+      #       # Reached here
       #     end
-      #     # Reached here
-      #   end
       def omit(message=nil, &block)
         message ||= "omitted."
         if block_given?
@@ -91,20 +92,21 @@ module Test
       # true.
       #
       # Example:
-      #   def test_omission
-      #     omit_if("".empty?)
-      #     # Not reached here
-      #   end
       #
-      #   def test_omission_with_here
-      #     omit_if(true) do
-      #       # Not ran here
+      #     def test_omission
+      #       omit_if("".empty?)
+      #       # Not reached here
       #     end
-      #     omit_if(false) do
-      #       # Reached here
+      #
+      #     def test_omission_with_here
+      #       omit_if(true) do
+      #         # Not ran here
+      #       end
+      #       omit_if(false) do
+      #         # Reached here
+      #       end
+      #       # Reached here too
       #     end
-      #     # Reached here too
-      #   end
       def omit_if(condition, *args, &block)
         if condition
           omit(*args, &block)
@@ -117,20 +119,21 @@ module Test
       # not true.
       #
       # Example:
-      #   def test_omission
-      #     omit_unless("string".empty?)
-      #     # Not reached here
-      #   end
       #
-      #   def test_omission_with_here
-      #     omit_unless(true) do
-      #       # Reached here
+      #     def test_omission
+      #       omit_unless("string".empty?)
+      #       # Not reached here
       #     end
-      #     omit_unless(false) do
-      #       # Not ran here
+      #
+      #     def test_omission_with_here
+      #       omit_unless(true) do
+      #         # Reached here
+      #       end
+      #       omit_unless(false) do
+      #         # Not ran here
+      #       end
+      #       # Reached here too
       #     end
-      #     # Reached here too
-      #   end
       def omit_unless(condition, *args, &block)
         if condition
           block.call if block

data/lib/test/unit/pending.rb

@@ -65,19 +65,20 @@ module Test
       # Marks the test or part of the test is pending.
       #
       # Example:
-      #   def test_pending
-      #     pend
-      #     # Not reached here
-      #   end
       #
-      #   def test_pending_with_here
-      #     pend do
-      #       # Ran here
-      #       # Fails if the block doesn't raise any error.
-      #       # Because it means the block is passed unexpectedly.
+      #     def test_pending
+      #       pend
+      #       # Not reached here
+      #     end
+      #
+      #     def test_pending_with_here
+      #       pend do
+      #         # Ran here
+      #         # Fails if the block doesn't raise any error.
+      #         # Because it means the block is passed unexpectedly.
+      #       end
+      #       # Reached here
       #     end
-      #     # Reached here
-      #   end
       def pend(message=nil, &block)
         message ||= "pended."
         if block_given?

data/lib/test/unit/priority.rb

@@ -148,15 +148,19 @@ module Test
         end
 
         def escape_class_name(class_name)
-          class_name.gsub(/(?:[: \\\/])/, "_")
+          escape_name(class_name)
         end
 
         def escaped_method_name
-          @test.method_name.to_s.gsub(/(?:[: ]|[!?=]$)/) do |matched|
+          escape_name(@test.method_name.to_s)
+        end
+
+        def escape_name(name)
+          name.gsub(/(?:[: \/!?=])/) do |matched|
             case matched
             when ":"
               "_colon_"
-            when " "
+            when " ", "/"
               "_"
             when "!"
               ".destructive"

data/lib/test/unit/testcase.rb

@@ -186,27 +186,29 @@ module Test
         # scope.
         #
         # Here is an example test case:
-        #   class TestMyClass < Test::Unit::TestCase
-        #     class << self
-        #       def startup
-        #         ...
+        #
+        #     class TestMyClass < Test::Unit::TestCase
+        #       class << self
+        #         def startup
+        #           ...
+        #         end
         #       end
-        #     end
         #
-        #     def setup
-        #       ...
-        #     end
+        #       def setup
+        #         ...
+        #       end
         #
-        #     def test_my_class1
-        #       ...
-        #     end
+        #       def test_my_class1
+        #         ...
+        #       end
         #
-        #     def test_my_class2
-        #       ...
+        #       def test_my_class2
+        #         ...
+        #       end
         #     end
-        #   end
         #
         # Here is a call order:
+        #
         # * startup
         # * setup
         # * test_my_class1 (or test_my_class2)
@@ -222,27 +224,29 @@ module Test
         # down fixture information used in test case scope.
         #
         # Here is an example test case:
-        #   class TestMyClass < Test::Unit::TestCase
-        #     class << self
-        #       def shutdown
-        #         ...
+        #
+        #     class TestMyClass < Test::Unit::TestCase
+        #       class << self
+        #         def shutdown
+        #           ...
+        #         end
         #       end
-        #     end
         #
-        #     def teardown
-        #       ...
-        #     end
+        #       def teardown
+        #         ...
+        #       end
         #
-        #     def test_my_class1
-        #       ...
-        #     end
+        #       def test_my_class1
+        #         ...
+        #       end
         #
-        #     def test_my_class2
-        #       ...
+        #       def test_my_class2
+        #         ...
+        #       end
         #     end
-        #   end
         #
         # Here is a call order:
+        #
         # * test_my_class1 (or test_my_class2)
         # * teardown
         # * test_my_class2 (or test_my_class1)
@@ -257,7 +261,7 @@ module Test
         @@test_orders = {}
 
         # Returns the current test order. This returns
-        # +:alphabetic+ by default.
+        # `:alphabetic` by default.
         def test_order
           ancestors.each do |ancestor|
             order = @@test_orders[ancestor]
@@ -269,12 +273,15 @@ module Test
         # Sets the current test order.
         #
         # Here are the available _order_:
-        # [:alphabetic]
-        #   Default. Tests are sorted in alphabetic order.
-        # [:random]
-        #   Tests are sorted in random order.
-        # [:defined]
-        #   Tests are sorted in defined order.
+        #
+        # :alphabetic
+        # : Default. Tests are sorted in alphabetic order.
+        #
+        # :random
+        # : Tests are sorted in random order.
+        #
+        # :defined
+        # : Tests are sorted in defined order.
         def test_order=(order)
           @@test_orders[self] = order
         end
@@ -285,22 +292,22 @@ module Test
         # In declarative syntax usage, the following two
         # test definitions are the almost same:
         #
-        #   description "register user"
-        #   def test_register_user
-        #     ...
-        #   end
+        #     description "register user"
+        #     def test_register_user
+        #       ...
+        #     end
         #
-        #   test "register user" do
-        #     ...
-        #   end
+        #     test "register user" do
+        #       ...
+        #     end
         #
         # In test method mark usage, the "my_test_method" is
         # treated as a test method:
         #
-        #   test
-        #   def my_test_method
-        #     assert_equal("call me", ...)
-        #   end
+        #     test
+        #     def my_test_method
+        #       assert_equal("call me", ...)
+        #     end
         def test(*test_description_or_targets, &block)
           if block_given?
             test_description = test_description_or_targets.first
@@ -334,10 +341,10 @@ module Test
         # normal user" description with "test_register"
         # test.
         #
-        #   description "register a normal user"
-        #   def test_register
-        #     ...
-        #   end
+        #     description "register a normal user"
+        #     def test_register
+        #       ...
+        #     end
         def description(value, target=nil)
           targets = [target].compact
           attribute(:description, value, {}, *targets)
@@ -349,20 +356,22 @@ module Test
         # the same in meaning:
         #
         # Standard:
-        #   class TestParent < Test::Unit::TestCase
-        #     class TestChild < self
-        #       def test_in_child
+        #
+        #     class TestParent < Test::Unit::TestCase
+        #       class TestChild < self
+        #         def test_in_child
+        #         end
         #       end
         #     end
-        #   end
         #
         # Syntax sugar:
-        #   class TestParent < Test::Unit::TestCase
-        #     sub_test_case("TestChild") do
-        #       def test_in_child
+        #
+        #     class TestParent < Test::Unit::TestCase
+        #       sub_test_case("TestChild") do
+        #         def test_in_child
+        #         end
         #       end
         #     end
-        #   end
         #
         # The difference of them are the following:
         #
@@ -559,35 +568,37 @@ module Test
       #
       # You can add additional setup tasks by the following
       # code:
-      #   class TestMyClass < Test::Unit::TestCase
-      #     def setup
-      #       ...
-      #     end
       #
-      #     setup
-      #     def my_setup1
-      #       ...
-      #     end
+      #     class TestMyClass < Test::Unit::TestCase
+      #       def setup
+      #         ...
+      #       end
       #
-      #     setup do
-      #       ... # setup callback1
-      #     end
+      #       setup
+      #       def my_setup1
+      #         ...
+      #       end
       #
-      #     setup
-      #     def my_setup2
-      #       ...
-      #     end
+      #       setup do
+      #         ... # setup callback1
+      #       end
       #
-      #     setup do
-      #       ... # setup callback2
-      #     end
+      #       setup
+      #       def my_setup2
+      #         ...
+      #       end
+      #
+      #       setup do
+      #         ... # setup callback2
+      #       end
       #
-      #     def test_my_class
-      #       ...
+      #       def test_my_class
+      #         ...
+      #       end
       #     end
-      #   end
       #
       # Here is a call order:
+      #
       # * setup
       # * my_setup1
       # * setup callback1
@@ -604,35 +615,37 @@ module Test
       #
       # You can add additional cleanup tasks by the following
       # code:
-      #   class TestMyClass < Test::Unit::TestCase
-      #     def cleanup
-      #       ...
-      #     end
       #
-      #     cleanup
-      #     def my_cleanup1
-      #       ...
-      #     end
+      #     class TestMyClass < Test::Unit::TestCase
+      #       def cleanup
+      #         ...
+      #       end
       #
-      #     cleanup do
-      #       ... # cleanup callback1
-      #     end
+      #       cleanup
+      #       def my_cleanup1
+      #         ...
+      #       end
       #
-      #     cleanup
-      #     def my_cleanup2
-      #       ...
-      #     end
+      #       cleanup do
+      #         ... # cleanup callback1
+      #       end
       #
-      #     cleanup do
-      #       ... # cleanup callback2
-      #     end
+      #       cleanup
+      #       def my_cleanup2
+      #         ...
+      #       end
       #
-      #     def test_my_class
-      #       ...
+      #       cleanup do
+      #         ... # cleanup callback2
+      #       end
+      #
+      #       def test_my_class
+      #         ...
+      #       end
       #     end
-      #   end
       #
       # Here is a call order:
+      #
       # * test_my_class
       # * cleanup callback2
       # * my_cleanup2
@@ -647,35 +660,37 @@ module Test
       #
       # You can add additional teardown tasks by the following
       # code:
-      #   class TestMyClass < Test::Unit::TestCase
-      #     def teardown
-      #       ...
-      #     end
       #
-      #     teardown
-      #     def my_teardown1
-      #       ...
-      #     end
+      #     class TestMyClass < Test::Unit::TestCase
+      #       def teardown
+      #         ...
+      #       end
       #
-      #     teardown do
-      #       ... # teardown callback1
-      #     end
+      #       teardown
+      #       def my_teardown1
+      #         ...
+      #       end
       #
-      #     teardown
-      #     def my_teardown2
-      #       ...
-      #     end
+      #       teardown do
+      #         ... # teardown callback1
+      #       end
       #
-      #     teardown do
-      #       ... # teardown callback2
-      #     end
+      #       teardown
+      #       def my_teardown2
+      #         ...
+      #       end
+      #
+      #       teardown do
+      #         ... # teardown callback2
+      #       end
       #
-      #     def test_my_class
-      #       ...
+      #       def test_my_class
+      #         ...
+      #       end
       #     end
-      #   end
       #
       # Here is a call order:
+      #
       # * test_my_class
       # * teardown callback2
       # * my_teardown2
@@ -695,13 +710,13 @@ module Test
 
       # Returns a label of test data for the test. If the
       # test isn't associated with any test data, it returns
-      # +nil+.
+      # `nil`.
       def data_label
         @internal_data.test_data_label
       end
 
       # Returns test data for the test. If the test isn't associated
-      # with any test data, it returns +nil+.
+      # with any test data, it returns `nil`.
       def data
         @internal_data.test_data
       end