test-unit 2.0.7 → 2.0.8

data/History.txt

@@ -1,3 +1,26 @@
+=== 2.0.8 / 2010-06-02
+
+* 5 major enchancements
+  * collect *_test.rb and *-test.rb files as test files.
+  * [#28181] improve assert_in_delta message.
+    [Suggested by David MARCHALAND]
+  * show string encoding in assert_equal failure message if
+    they are different.
+  * change default color scheme:
+    * success: green back + white
+    * failure: red back + white
+  * add capture_output.
+
+* 2 bug fixes
+  * fix a bug that console runner on verbose mode causes an
+    error for long test name (>= 61).
+  * [#28093] Autorunner ignores all files in a directory named test by default
+    [Reported by Florian Frank]
+
+* Thanks
+  * Florian Frank
+  * David MARCHALAND
+
 === 2.0.7 / 2010-03-09
 
 * 4 major enhancements
@@ -14,7 +37,7 @@
   * [#27792] require 'fileutils' and 'tmpdir' lazily for non-priority
     mode users. [Suggested by David MARCHALAND]
 
-* 2n bug fixes
+* 2 bug fixes
   * [#27892] modify processed arguments array destructively.
     [Reported by Bob Saveland]
   * work without HOME environment variable.

data/README.txt

@@ -54,3 +54,4 @@ This software is distributed under the same terms as ruby.
 * David MARCHALAND: Suggestions and bug reports.
 * Andrew Grimm: A bug report.
 * Champak Ch: A bug report.
+* Florian Frank: A bug report.

data/lib/test/unit/assertions.rb

@@ -1,6 +1,6 @@
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
-#             Copyright (c) 2009 Kouhei Sutou.
+#             Copyright (c) 2009-2010 Kouhei Sutou. All rights reserved.
 # License:: Ruby license.
 
 require 'test/unit/assertionfailederror'
@@ -80,10 +80,23 @@ module Test
       public
       def assert_equal(expected, actual, message=nil)
         diff = AssertionMessage.delayed_diff(expected, actual)
-        full_message = build_message(message, <<EOT, expected, actual, diff)
+        if expected.respond_to?(:encoding) and
+            actual.respond_to?(:encoding) and
+            expected.encoding != actual.encoding
+          format = <<EOT
+<?>(?) expected but was
+<?>(?).?
+EOT
+          full_message = build_message(message, format,
+                                       expected, expected.encoding.name,
+                                       actual, actual.encoding.name,
+                                       diff)
+        else
+          full_message = build_message(message, <<EOT, expected, actual, diff)
 <?> expected but was
 <?>.?
 EOT
+        end
         begin
           assert_block(full_message) { expected == actual }
         rescue AssertionFailedError => failure
@@ -539,18 +552,73 @@ EOT
       public
       def assert_in_delta(expected_float, actual_float, delta, message="")
         _wrap_assertion do
-          {expected_float => "first float", actual_float => "second float", delta => "delta"}.each do |float, name|
-            assert_respond_to(float, :to_f, "The arguments must respond to to_f; the #{name} did not")
-          end
-          assert_operator(delta, :>=, 0.0, "The delta should not be negative")
-          full_message = build_message(message, <<EOT, expected_float, actual_float, delta)
-<?> and
-<?> expected to be within
-<?> of each other.
+          _assert_in_delta_validate_arguments(expected_float,
+                                              actual_float,
+                                              delta)
+          full_message = _assert_in_delta_message(expected_float,
+                                                  actual_float,
+                                                  delta,
+                                                  message)
+          assert_block(full_message) do
+            (expected_float.to_f - actual_float.to_f).abs <= delta.to_f
+          end
+        end
+      end
+
+      # :stopdoc:
+      private
+      def _assert_in_delta_validate_arguments(expected_float,
+                                              actual_float,
+                                              delta)
+        {
+          expected_float => "first float",
+          actual_float => "second float",
+          delta => "delta"
+        }.each do |float, name|
+          assert_respond_to(float, :to_f,
+                            "The arguments must respond to to_f; " +
+                            "the #{name} did not")
+        end
+        assert_operator(delta, :>=, 0.0, "The delta should not be negative")
+      end
+
+      def _assert_in_delta_message(expected_float, actual_float, delta,
+                                   message)
+        format = <<-EOT
+<?> expected but was
+<?> (tolerance <?>).
+EOT
+        arguments = [expected_float, actual_float, delta]
+        normalized_expected = expected_float.to_f
+        normalized_actual = actual_float.to_f
+        normalized_delta = delta.to_f
+        relation_format = nil
+        relation_arguments = nil
+        if normalized_actual < normalized_expected - normalized_delta
+          relation_format = "<<?> < <?>-<?>(?) <= <?>+<?>(?)>"
+          relation_arguments = [actual_float,
+                                expected_float, delta, expected_float - delta,
+                                expected_float, delta, expected_float + delta]
+        elsif normalized_expected - normalized_delta < normalized_actual
+          relation_format = "<<?>-<?>(?) <= <?>+<?>(?) < <?>>"
+          relation_arguments = [expected_float, delta, expected_float - delta,
+                                expected_float, delta, expected_float + delta,
+                                actual_float]
+        end
+
+        if relation_format
+          format << <<-EOT
+
+Relation:
+#{relation_format}
 EOT
-          assert_block(full_message) { (expected_float.to_f - actual_float.to_f).abs <= delta.to_f }
+          arguments.concat(relation_arguments)
         end
+
+        build_message(message, format, *arguments)
       end
+      public
+      # :startdoc:
 
       ##
       # Passes if the method send returns a true value.

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

@@ -15,7 +15,7 @@ module Test
           super
           @system_excludes = [/~\z/, /\A\.\#/]
           @system_directory_excludes = [/\A(?:CVS|\.svn|\.git)\z/]
-          @patterns = [/\Atest[_\-].+\.rb\z/m]
+          @patterns = [/\Atest[_\-].+\.rb\z/m, /[_\-]test\.rb\z/]
           @excludes = []
           @base = nil
         end
@@ -28,11 +28,17 @@ module Test
         def collect(*froms)
           add_load_path(@base) do
             froms = ["."] if froms.empty?
-            test_suites = froms.collect do |from|
-              test_suite = collect_recursive(resolve_path(from), find_test_cases)
-              test_suite = nil if test_suite.tests.empty?
-              test_suite
-            end.compact
+            test_suites = []
+            already_gathered = find_test_cases
+            froms.each do |from|
+              from = resolve_path(from)
+              if from.directory?
+                test_suite = collect_recursive(from, already_gathered)
+                test_suites << test_suite unless test_suite.tests.empty?
+              else
+                collect_file(from, test_suites, already_gathered)
+              end
+            end
 
             if test_suites.size > 1
               test_suite = TestSuite.new("[#{froms.join(', ')}]")
@@ -88,6 +94,8 @@ module Test
         end
 
         def collect_file(path, test_suites, already_gathered)
+          @program_file ||= File.expand_path($0)
+          return if @program_file == path.to_s
           add_load_path(path.expand_path.dirname) do
             require(path.to_s)
             find_test_cases(already_gathered).each do |test_case|

data/lib/test/unit/color-scheme.rb

@@ -8,8 +8,12 @@ module Test
       class << self
         @@default = nil
         def default
-          @@default ||= new("success" => Color.new("green", :bold => true),
-                            "failure" => Color.new("red", :bold => true),
+          @@default ||= new("success" =>
+                              Color.new("green", :foreground => false) +
+                              Color.new("white", :bold => true),
+                            "failure" =>
+                              Color.new("red", :foreground => false) +
+                              Color.new("white", :bold => true),
                             "pending" => Color.new("magenta", :bold => true),
                             "omission" => Color.new("blue", :bold => true),
                             "notification" => Color.new("cyan", :bold => true),

data/lib/test/unit/diff.rb

@@ -717,7 +717,16 @@ module Test
 
       def diff(differ_class, from, to, options={})
         differ = differ_class.new(from.split(/\r?\n/), to.split(/\r?\n/))
-        differ.diff(options).join("\n")
+        lines = differ.diff(options)
+        if Object.const_defined?(:EncodingError)
+          begin
+            lines.join("\n")
+          rescue EncodingError
+            lines.collect {|line| line.force_encoding("ASCII-8BIT")}.join("\n")
+          end
+        else
+          lines.join("\n")
+        end
       end
     end
   end

data/lib/test/unit/testcase.rb

@@ -19,6 +19,7 @@ require 'test/unit/priority'
 require 'test/unit/testsuite'
 require 'test/unit/assertionfailederror'
 require 'test/unit/util/backtracefilter'
+require 'test/unit/util/output'
 require 'test/unit/util/method-owner-finder'
 
 module Test
@@ -82,6 +83,7 @@ module Test
       include Priority
       include Assertions
       include Util::BacktraceFilter
+      include Util::Output
 
       STARTED = name + "::STARTED" # :nodoc:
       FINISHED = name + "::FINISHED" # :nodoc:

data/lib/test/unit/ui/console/testrunner.rb

@@ -188,7 +188,7 @@ module Test
             right_space = 8 * 2
             left_space = @progress_row_max - right_space
             left_space = left_space - indent.size - name.size
-            tab_stop = "\t" * ((left_space - 1) / 8)
+            tab_stop = "\t" * ([left_space - 1, 0].max / 8)
             output_single("#{indent}#{name}:#{tab_stop}", nil, VERBOSE)
             @test_start = Time.now
           end

data/lib/test/unit/util/backtracefilter.rb

@@ -9,6 +9,7 @@ module Test
         module_function
         def filter_backtrace(backtrace, prefix=nil)
           return ["No backtrace"] unless(backtrace)
+          return backtrace if ENV["TEST_UNIT_ALL_BACKTRACE"]
           split_p = if(prefix)
             prefix.split(TESTUNIT_FILE_SEPARATORS)
           else

data/lib/test/unit/version.rb

@@ -2,6 +2,6 @@
 # HACK: quick and dirty to get integrated into the new project - ryan
 module Test
   module Unit
-    VERSION = '2.0.7'
+    VERSION = '2.0.8'
   end
 end

data/test/collector/test-load.rb

@@ -13,8 +13,9 @@ class TestUnitCollectorLoad < Test::Unit::TestCase
     ::Object.const_set(@temporary_test_cases_module_name, Module.new)
 
     @test_dir = Pathname(Dir.tmpdir) + "test-unit"
-    @test_dir.rmtree if @test_dir.exist?
-    @test_dir.mkpath
+    @extra_test_dir = Pathname(Dir.tmpdir) + "test-unit-extra"
+    ensure_clean_directory(@test_dir)
+    ensure_clean_directory(@extra_test_dir)
   end
 
   setup
@@ -215,6 +216,53 @@ EOT
     end
   end
 
+  setup
+  def setup_extra_top_level_test_cases
+    @test_cases12 = @extra_test_dir + "test_cases12.rb"
+    @test_cases12.open("w") do |test_case|
+      test_case.puts(<<-EOT)
+module #{@temporary_test_cases_module_name}
+  class TestCase121 < Test::Unit::TestCase
+    def test121_1
+    end
+
+    def test121_2
+    end
+  end
+
+  class TestCase122 < Test::Unit::TestCase
+    def test122_1
+    end
+
+    def test122_2
+    end
+  end
+end
+EOT
+    end
+  end
+
+  setup
+  def setup_sub_level_extra_test_cases
+    @sub_extra_test_dir = @extra_test_dir + "sub"
+    @sub_extra_test_dir.mkpath
+
+    @cases13_test = @sub_extra_test_dir + "13cases_test.rb"
+    @cases13_test.open("w") do |test_case|
+      test_case.puts(<<-EOT)
+module #{@temporary_test_cases_module_name}
+  class SubTestCase13 < Test::Unit::TestCase
+    def test13_1
+    end
+
+    def test13_2
+    end
+  end
+end
+EOT
+    end
+  end
+
   def teardown
     @test_dir.rmtree if @test_dir.exist?
     ::Object.send(:remove_const, @temporary_test_cases_module_name)
@@ -231,6 +279,21 @@ EOT
                    @sub_test_dir.to_s)
   end
 
+  def test_simple_collect_test_suffix
+    assert_collect([:suite, {:name => @extra_test_dir.basename.to_s},
+                    [:suite, {:name => _test_case_name("TestCase121")},
+                     [:test, {:name => "test121_1"}],
+                     [:test, {:name => "test121_2"}]],
+                    [:suite, {:name => _test_case_name("TestCase122")},
+                     [:test, {:name => "test122_1"}],
+                     [:test, {:name => "test122_2"}]],
+                    [:suite, {:name => @sub_extra_test_dir.basename.to_s},
+                     [:suite, {:name => _test_case_name("SubTestCase13")},
+                      [:test, {:name => "test13_1"}],
+                      [:test, {:name => "test13_2"}]]]],
+                   @extra_test_dir.to_s)
+  end
+
   def test_multilevel_collect
     assert_collect([:suite, {:name => "."},
                     [:suite, {:name => _test_case_name("TestCase1")},
@@ -253,13 +316,39 @@ EOT
   end
 
   def test_collect_file
-    assert_collect([:suite, {:name => @test_case1.basename.to_s},
-                    [:suite, {:name => _test_case_name("TestCase1")},
-                     [:test, {:name => "test1_1"}],
-                     [:test, {:name => "test1_2"}]]],
+    assert_collect([:suite, {:name => _test_case_name("TestCase1")},
+                    [:test, {:name => "test1_1"}],
+                    [:test, {:name => "test1_2"}]],
                    @test_case1.to_s)
+  end
 
-    assert_collect(nil, @no_load_sub_test_case5.to_s)
+  def test_collect_file_no_pattern_match_file_name
+    assert_collect([:suite, {:name => _test_case_name("NoLoadSubTestCase5")},
+                    [:test, {:name => "test5_1"}],
+                    [:test, {:name => "test5_2"}]],
+                   @no_load_sub_test_case5.to_s)
+  end
+
+  def test_collect_file_test_cases
+    assert_collect([:suite, {:name => "[#{@test_cases12}]"},
+                    [:suite, {:name => _test_case_name("TestCase121")},
+                     [:test, {:name => "test121_1"}],
+                     [:test, {:name => "test121_2"}]],
+                    [:suite, {:name => _test_case_name("TestCase122")},
+                     [:test, {:name => "test122_1"}],
+                     [:test, {:name => "test122_2"}]]],
+                   @test_cases12.to_s)
+  end
+
+  def test_collect_files
+    assert_collect([:suite,
+                    {:name => "[#{@test_case1}, #{@test_case2}]"},
+                    [:suite, {:name => _test_case_name("TestCase1")},
+                     [:test, {:name => "test1_1"}],
+                     [:test, {:name => "test1_2"}]],
+                    [:suite, {:name => _test_case_name("TestCase2")},
+                     [:test, {:name => "test2"}]]],
+                   @test_case1.to_s, @test_case2.to_s)
   end
 
   def test_nil_pattern
@@ -297,7 +386,7 @@ EOT
                       [:test, {:name => "test4_2"}]],
                      [:suite, {:name => _test_case_name("SubTestCase6")},
                       [:test, {:name => "test6"}]]],
-                   [:suite, {:name => @sub2_test_dir.basename.to_s},
+                    [:suite, {:name => @sub2_test_dir.basename.to_s},
                      [:suite, {:name => _test_case_name("Sub2TestCase8")},
                       [:test, {:name => "test8_1"}],
                       [:test, {:name => "test8_2"}]],
@@ -318,6 +407,11 @@ EOT
     end
   end
 
+  def ensure_clean_directory(directory)
+    directory.rmtree if directory.exist?
+    directory.mkpath
+  end
+
   def keep_required_files
     required_files = $".dup
     yield

data/test/test-color-scheme.rb

@@ -1,8 +1,10 @@
 class TestUnitColorScheme < Test::Unit::TestCase
   def test_default
     assert_equal({
-                   "success" => color("green", :bold => true),
-                   "failure" => color("red", :bold => true),
+                   "success" => color("green", :foreground => false) +
+                                color("white", :bold => true),
+                   "failure" => color("red", :foreground => false) +
+                                color("white", :bold => true),
                    "pending" => color("magenta", :bold => true),
                    "omission" => color("blue", :bold => true),
                    "notification" => color("cyan", :bold => true),

data/test/test_assertions.rb

@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
+#
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-#             Copyright (c) 2009 Kouhei Sutou.
+#             Copyright (c) 2009-2010 Kouhei Sutou. All rights reserved.
 # License:: Ruby license.
 
 require 'test/unit'
@@ -311,6 +313,21 @@ EOM
         end
       end
 
+      def test_assert_equal_with_different_encoding
+        utf8_string = "こんにちは"
+        unless utf8_string.respond_to?(:force_encoding)
+          omit("encoding test is for Ruby >= 1.9")
+        end
+        ascii_8bit_string = utf8_string.dup.force_encoding("ascii-8bit")
+        message = <<-EOM.chomp
+<"こんにちは">("UTF-8") expected but was
+<#{ascii_8bit_string.inspect}>("ASCII-8BIT").
+EOM
+        check_fails(message) do
+          assert_equal(utf8_string, ascii_8bit_string)
+        end
+      end
+
       def test_assert_raise_success
         return_value = nil
         check_nothing_fails(true) do
@@ -811,7 +828,12 @@ EOM
           end
           assert_in_delta(0.1, float_thing, 0.1)
         }
-        check_fails("message.\n<0.5> and\n<0.4> expected to be within\n<0.05> of each other.") {
+        check_fails("message.\n" +
+                    "<0.5> expected but was\n" +
+                    "<0.4> (tolerance <0.05>).\n" +
+                    "\n" +
+                    "Relation:\n" +
+                    "<<0.4> < <0.5>-<0.05>(0.45) <= <0.5>+<0.05>(0.55)>") {
           assert_in_delta(0.5, 0.4, 0.05, "message")
         }
         object = Object.new

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: test-unit
 version: !ruby/object:Gem::Version 
-  version: 2.0.7
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 8
+  version: 2.0.8
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -10,39 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 +09:00
+date: 2010-06-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.4
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.5.0
-    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
-    version: 
+        segments: 
+        - 2
+        - 4
+        - 0
+        version: 2.4.0
+  type: :development
+  version_requirements: *id001
 description: |-
   Test::Unit 2.x - Improved version of Test::Unit bundled in
   Ruby 1.8.x.
@@ -158,30 +147,32 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: test-unit
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Test::Unit 2.x - Improved version of Test::Unit bundled in Ruby 1.8.x
 test_files: 
 - test/test_failure.rb
-- test/collector/test_objectspace.rb
-- test/collector/test_dir.rb
-- test/test_testsuite.rb
-- test/test_assertions.rb
-- test/util/test_observable.rb
 - test/util/test_procwrapper.rb
 - test/util/test_backtracefilter.rb
+- test/util/test_observable.rb
+- test/test_testsuite.rb
+- test/test_error.rb
 - test/ui/test_testrunmediator.rb
+- test/collector/test_dir.rb
+- test/collector/test_objectspace.rb
 - test/test_testresult.rb
-- test/test_error.rb
+- test/test_assertions.rb