test-unit 2.5.1 → 2.5.2

data/lib/test/unit/testsuite.rb

@@ -80,7 +80,7 @@ module Test
       end
       
       def empty?
-        tests.empty?
+        size.zero?
       end
 
       # Overridden to return the name given the suite at

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

@@ -8,6 +8,7 @@
 
 require 'test/unit/color-scheme'
 require 'test/unit/code-snippet-fetcher'
+require 'test/unit/fault-location-detector'
 require 'test/unit/diff'
 require 'test/unit/ui/testrunner'
 require 'test/unit/ui/testrunnermediator'
@@ -47,6 +48,7 @@ module Test
             @current_output_level = NORMAL
             @faults = []
             @code_snippet_fetcher = CodeSnippetFetcher.new
+            @test_suites = []
           end
 
           private
@@ -202,6 +204,7 @@ module Test
 
           def output_fault_backtrace(fault)
             snippet_is_shown = false
+            detector = FaultLocationDetector.new(fault, @code_snippet_fetcher)
             backtrace = fault.location
             # workaround for test-spec. :<
             # see also GitHub:#22
@@ -209,14 +212,14 @@ module Test
             backtrace.each_with_index do |entry, i|
               output(entry)
               next if snippet_is_shown
-              snippet_is_shown = output_code_snippet(entry, fault_color(fault))
+              next unless detector.target?(entry)
+              file, line_number, = detector.split_backtrace_entry(entry)
+              snippet_is_shown = output_code_snippet(file, line_number,
+                                                     fault_color(fault))
             end
           end
 
-          def output_code_snippet(entry, target_line_color=nil)
-            return false unless /\A(.*):(\d+)/ =~ entry
-            file = $1
-            line_number = $2.to_i
+          def output_code_snippet(file, line_number, target_line_color=nil)
             lines = @code_snippet_fetcher.fetch(file, line_number)
             return false if lines.empty?
 
@@ -333,6 +336,8 @@ module Test
           end
 
           def test_suite_started(suite)
+            last_test_suite = @test_suites.last
+            @test_suites << suite
             if @top_level
               @top_level = false
               return
@@ -344,13 +349,16 @@ module Test
             else
               _color = color("case")
             end
-            output_single(suite.name, _color, VERBOSE)
+            prefix = "#{last_test_suite.name}::"
+            suite_name = suite.name.sub(/\A#{Regexp.escape(prefix)}/, "")
+            output_single(suite_name, _color, VERBOSE)
             output(": ", nil, VERBOSE)
             @indent += 2
           end
 
           def test_suite_finished(suite)
             @indent -= 2
+            @test_suites.pop
           end
 
           def indent

data/lib/test/unit/ui/testrunnermediator.rb

@@ -34,6 +34,7 @@ module Test
 
           result = create_result
 
+          Test::Unit.run_at_start_hooks
           start_time = Time.now
           begin
             with_listener(result) do
@@ -46,10 +47,27 @@ module Test
             elapsed_time = Time.now - start_time
             notify_listeners(FINISHED, elapsed_time)
           end
+          Test::Unit.run_at_exit_hooks
 
           result
         end
 
+        # Just for backward compatibility for NetBeans.
+        # NetBeans should not use monkey patching. NetBeans
+        # should use runner change public API.
+        #
+        # See GitHub#38
+        #   https://github.com/test-unit/test-unit/issues/38
+        def run_suite(result=nil)
+          if result.nil?
+            run
+          else
+            @suite.run(result) do |channel, value|
+              notify_listeners(channel, value)
+            end
+          end
+        end
+
         private
         # A factory method to create the result the mediator
         # should run with. Can be overridden by subclasses if
@@ -88,12 +106,6 @@ module Test
                                    pass_assertion_listener)
           end
         end
-
-        def run_suite(result)
-          @suite.run(result) do |channel, value|
-            notify_listeners(channel, value)
-          end
-        end
       end
     end
   end

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

@@ -24,7 +24,7 @@ module Test
           end
 
           jruby_internal_p = lambda do |entry|
-            (/\Aorg\/jruby\// =~ entry) ? true : false
+            entry.start_with?("org/jruby/")
           end
 
           found_prefix = false

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = '2.5.1'
+    VERSION = '2.5.2'
   end
 end

data/test/test-color-scheme.rb

@@ -54,28 +54,35 @@ class TestUnitColorScheme < Test::Unit::TestCase
     end
 
     def test_default
-      assert_equal({
-                     "pass" => 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),
-                     "error" => color("yellow", :bold => true) +
-                                color("black", :foreground => false),
-                     "case" => color("white", :bold => true) +
-                               color("blue", :foreground => false),
-                     "suite" => color("white", :bold => true) +
-                                color("green", :foreground => false),
-                     "diff-inserted-tag" => color("red", :bold => true),
-                     "diff-deleted-tag" => color("green", :bold => true),
-                     "diff-difference-tag" => color("cyan", :bold => true),
-                     "diff-inserted" => color("red", :foreground => false) +
-                                        color("white", :bold => true),
-                     "diff-deleted" => color("green", :foreground => false) +
-                                       color("white", :bold => true),
-                   },
+      expected_schema = {
+        "pass"                => color("green",   :background => true) +
+                                 color("white",   :bold       => true),
+        "failure"             => color("red",     :background => true) +
+                                 color("white",   :bold       => true),
+        "pending"             => color("magenta", :background => true) +
+                                 color("white",   :bold       => true),
+        "omission"            => color("blue",    :background => true) +
+                                 color("white",   :bold       => true),
+        "notification"        => color("cyan",    :background => true) +
+                                 color("white",   :bold       => true),
+        "error"               => color("black",   :background => true) +
+                                 color("yellow",  :bold       => true),
+        "case"                => color("blue",    :background => true) +
+                                 color("white",   :bold       => true),
+        "suite"               => color("green",   :background => true) +
+                                 color("white",   :bold       => true),
+        "diff-inserted-tag"   => color("red",     :background => true) +
+                                 color("black",   :bold       => true),
+        "diff-deleted-tag"    => color("green",   :background => true) +
+                                 color("black",   :bold       => true),
+        "diff-difference-tag" => color("cyan",    :background => true) +
+                                 color("white",   :bold       => true),
+        "diff-inserted"       => color("red",     :background => true) +
+                                 color("white",   :bold       => true),
+        "diff-deleted"        => color("green",   :background => true) +
+                                 color("white",   :bold       => true),
+      }
+      assert_equal(expected_schema,
                    Test::Unit::ColorScheme.default.to_hash)
     end
   end

data/test/test-color.rb

@@ -3,7 +3,7 @@ class TestUnitColor < Test::Unit::TestCase
     assert_escape_sequence(["31"], color("red"))
     assert_escape_sequence(["32", "1"], color("green", :bold => true))
     assert_escape_sequence(["0"], color("reset"))
-    assert_escape_sequence(["45"], color("magenta", :foreground => false))
+    assert_escape_sequence(["45"], color("magenta", :background => true))
   end
 
   def test_mix_color_escape_sequence

data/test/test-fault-location-detector.rb

@@ -0,0 +1,125 @@
+# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+#
+# License: Ruby's
+
+require "test-unit"
+require "test/unit/fault-location-detector"
+require "testunit-test-util"
+
+class TestFaultLocationDetector < Test::Unit::TestCase
+  include TestUnitTestUtil
+
+  def setup
+    @fetcher = Test::Unit::CodeSnippetFetcher.new
+  end
+
+  private
+  def run_test_case(test_case)
+    suite = test_case.suite
+    result = Test::Unit::TestResult.new
+    suite.run(result) {}
+    result.faults[0]
+  end
+
+  def assert_detect(fault, target_line_number)
+    detector = Test::Unit::FaultLocationDetector.new(fault, @fetcher)
+
+    expected = fault.location.collect do |backtrace_entry|
+      _, line_number, = detector.split_backtrace_entry(backtrace_entry)
+      [backtrace_entry, target_line_number == line_number]
+    end
+    actual = fault.location.collect do |backtrace_entry|
+      [backtrace_entry, detector.target?(backtrace_entry)]
+    end
+    assert_equal(expected, actual)
+  end
+
+  module AlwaysFailAssertion
+    private
+    def assert_always_failed
+      assert_true(false)
+    end
+  end
+
+  class TestSourceLocation < self
+    setup
+    def setup_check_source_location
+      unless lambda {}.respond_to?(:source_location)
+        omit("Need Proc#source_location")
+      end
+    end
+
+    def test_detected
+      target_line_number = nil
+      test_case = Class.new(Test::Unit::TestCase) do
+        include AlwaysFailAssertion
+
+        test "failed" do
+          target_line_number = __LINE__; assert_always_failed
+        end
+      end
+
+      fault = run_test_case(test_case)
+      assert_detect(fault, target_line_number)
+    end
+
+    class TestOneLine < self
+      def test_brace
+        target_line_number = nil
+        test_case = Class.new(Test::Unit::TestCase) do
+          include AlwaysFailAssertion
+
+          test("failed") {target_line_number = __LINE__; assert_always_failed}
+
+          def other_method
+            # body
+          end
+        end
+
+        fault = run_test_case(test_case)
+        assert_detect(fault, target_line_number)
+      end
+
+      def test_do_end
+        target_line_number = nil
+        test_case = Class.new(Test::Unit::TestCase) do
+          include AlwaysFailAssertion
+
+          test "failed" do target_line_number = __LINE__; assert_always_failed; end
+
+          def other_method
+            # body
+          end
+        end
+
+        fault = run_test_case(test_case)
+        assert_detect(fault, target_line_number)
+      end
+    end
+  end
+
+  class TestMethodName < self
+    def test_detected
+      test_case = Class.new(Test::Unit::TestCase) do
+        include AlwaysFailAssertion
+
+        class << self
+          def target_line_number
+            @@target_line_number
+          end
+
+          def target_line_number=(line_number)
+            @@target_line_number = line_number
+          end
+        end
+
+        def test_failed
+          self.class.target_line_number = __LINE__; assert_always_failed
+        end
+      end
+
+      fault = run_test_case(test_case)
+      assert_detect(fault, test_case.target_line_number)
+    end
+  end
+end

data/test/test-testcase.rb

@@ -1,5 +1,7 @@
 # Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# Copyright:: Copyright (c) 2008-2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright:: Copyright (c) 2011  Haruka Yoshihara <yoshihara@clear-code.com>
+# Copyright:: Copyright (c) 2000-2002  Nathaniel Talbott
 # License:: Ruby license.
 
 require 'test/unit'
@@ -46,7 +48,7 @@ module Test
           "TC_FailureError"
         end
       end
- 
+
       def test_add_failed_assertion
         test_case = @tc_failure_error.new(:test_failure)
         check("passed? should start out true", test_case.return_passed?)
@@ -585,6 +587,158 @@ module Test
         add_assertion
         raise AssertionFailedError.new(message) unless passed
       end
+
+      class TestTestDefined < self
+        class TestNoQuery < self
+          def test_have_test
+            test_case = Class.new(TestCase) do
+              def test_nothing
+              end
+            end
+            assert_true(test_case.test_defined?({}))
+          end
+
+          def test_no_test
+            test_case = Class.new(TestCase) do
+            end
+            assert_false(test_case.test_defined?({}))
+          end
+        end
+
+        class TestPath < self
+          def test_base_name
+            test_case = Class.new(TestCase) do
+              def test_nothing
+              end
+            end
+            base_name = File.basename(__FILE__)
+            assert_true(test_case.test_defined?(:path => base_name))
+          end
+
+          def test_absolute_path
+            test_case = Class.new(TestCase) do
+              def test_nothing
+              end
+            end
+            assert_true(test_case.test_defined?(:path => __FILE__))
+          end
+
+          def test_not_match
+            test_case = Class.new(TestCase) do
+              def test_nothing
+              end
+            end
+            assert_false(test_case.test_defined?(:path => "nonexistent.rb"))
+          end
+        end
+
+        class TestLine < self
+          def test_before
+            line_before = nil
+            test_case = Class.new(TestCase) do
+              line_before = __LINE__
+              def test_nothing
+              end
+            end
+            assert_false(test_case.test_defined?(:line => line_before))
+          end
+
+          def test_def
+            line_def = nil
+            test_case = Class.new(TestCase) do
+              line_def = __LINE__; def test_nothing
+              end
+            end
+            assert_true(test_case.test_defined?(:line => line_def))
+          end
+
+          def test_after
+            line_after = nil
+            test_case = Class.new(TestCase) do
+              def test_nothing
+              end
+              line_after = __LINE__
+            end
+            assert_true(test_case.test_defined?(:line => line_after))
+          end
+        end
+
+        class TestMethodName < self
+          def test_match
+            test_case = Class.new(TestCase) do
+              def test_nothing
+              end
+            end
+            assert_true(test_case.test_defined?(:method_name => "test_nothing"))
+          end
+
+          def test_not_match
+            test_case = Class.new(TestCase) do
+              def test_nothing
+              end
+            end
+            query = {:method_name => "test_nonexistent"}
+            assert_false(test_case.test_defined?(query))
+          end
+        end
+
+        class TestCombine < self
+          def test_line_middle
+            line_middle = nil
+            test_case = Class.new(TestCase) do
+              def test_before
+              end
+              line_middle = __LINE__
+              def test_after
+              end
+            end
+            query = {
+              :path => __FILE__,
+              :line => line_middle,
+              :method_name => "test_before",
+            }
+            assert_true(test_case.test_defined?(query))
+          end
+
+          def test_line_after_def
+            line_after_def = nil
+            test_case = Class.new(TestCase) do
+              def test_before
+              end
+
+              line_after_def = __LINE__; def test_after
+              end
+            end
+            query = {
+              :path => __FILE__,
+              :line => line_after_def,
+              :method_name => "test_before",
+            }
+            assert_false(test_case.test_defined?(query))
+          end
+        end
+      end
+
+      class TestSubTestCase < self
+        def test_name
+          test_case = Class.new(TestCase)
+          sub_test_case = test_case.sub_test_case("sub test case") do
+          end
+          assert_equal("sub test case", sub_test_case.name)
+        end
+
+        def test_suite
+          test_case = Class.new(TestCase)
+          sub_test_case = test_case.sub_test_case("sub test case") do
+            def test_nothing
+            end
+          end
+          test_method_names = sub_test_case.suite.tests.collect do |test|
+            test.method_name
+          end
+          assert_equal(["test_nothing"], test_method_names)
+        end
+      end
     end
   end
 end