minitest 5.16.2 → 6.0.5

data/test/minitest/test_minitest_benchmark.rb

@@ -17,7 +17,7 @@ class TestMinitestBenchmark < Minitest::Test
   def test_cls_runnable_methods
     assert_equal [], Minitest::Benchmark.runnable_methods
 
-    c = Class.new(Minitest::Benchmark) do
+    c = Class.new Minitest::Benchmark do
       def bench_blah
       end
     end
@@ -25,6 +25,20 @@ class TestMinitestBenchmark < Minitest::Test
     assert_equal ["bench_blah"], c.runnable_methods
   end
 
+  def test_cls_run
+    c = Class.new Minitest::Benchmark do
+      def bench_dummy
+        assert true
+      end
+    end
+
+    reporter = Minitest::StatisticsReporter.new(StringIO.new(+""))
+
+    c.run c, "bench_dummy", reporter
+
+    assert_equal 1, reporter.count
+  end
+
   def test_cls_bench_range
     assert_equal [1, 10, 100, 1_000, 10_000], Minitest::Benchmark.bench_range
   end

data/test/minitest/test_minitest_reporter.rb

@@ -1,8 +1,8 @@
 require "minitest/autorun"
-require "minitest/metametameta"
+require_relative "metametameta"
 require "forwardable"
 
-class Runnable
+class FakeTest < Minitest::Test
   def woot
     assert true
   end
@@ -13,10 +13,6 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   attr_accessor :r, :io
 
   def new_composite_reporter
-    # Ruby bug in older versions of 2.2 & 2.3 on all platforms
-    # Latest Windows builds were 2.2.6 and 2.3.3.  Latest Ruby releases were
-    # 2.2.10 and 2.3.8.
-    skip if windows? && RUBY_VERSION < '2.4'
     reporter = Minitest::CompositeReporter.new
     reporter << Minitest::SummaryReporter.new(self.io)
     reporter << Minitest::ProgressReporter.new(self.io)
@@ -31,13 +27,14 @@ class TestMinitestReporter < MetaMetaMetaTestCase
 
   def setup
     super
-    self.io = StringIO.new("")
+    self.io = StringIO.new(+"")
     self.r  = new_composite_reporter
+    @et = @ft = @pt = @st = @sse = nil
   end
 
   def error_test
-    unless defined? @et then
-      @et = Minitest::Test.new(:woot)
+    unless @et then
+      @et = FakeTest.new :woot
       @et.failures << Minitest::UnexpectedError.new(begin
                                                       raise "no"
                                                     rescue => e
@@ -48,9 +45,28 @@ class TestMinitestReporter < MetaMetaMetaTestCase
     @et
   end
 
+  def system_stack_error_test
+    unless @sse then
+
+      ex = SystemStackError.new
+
+      pre  = ("a".."c").to_a
+      mid  = ("aa".."ad").to_a * 67
+      post = ("d".."f").to_a
+      ary  = pre + mid + post
+
+      ex.set_backtrace ary
+
+      @sse = FakeTest.new :woot
+      @sse.failures << Minitest::UnexpectedError.new(ex)
+      @sse = Minitest::Result.from @sse
+    end
+    @sse
+  end
+
   def fail_test
-    unless defined? @ft then
-      @ft = Minitest::Test.new(:woot)
+    unless @ft then
+      @ft = FakeTest.new :woot
       @ft.failures <<   begin
                           raise Minitest::Assertion, "boo"
                         rescue Minitest::Assertion => e
@@ -62,12 +78,18 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   end
 
   def passing_test
-    @pt ||= Minitest::Result.from Minitest::Test.new(:woot)
+    @pt ||= Minitest::Result.from FakeTest.new(:woot)
+  end
+
+  def passing_test_with_metadata
+    test = FakeTest.new :woot
+    test.metadata[:meta] = :data
+    @pt ||= Minitest::Result.from test
   end
 
   def skip_test
-    unless defined? @st then
-      @st = Minitest::Test.new(:woot)
+    unless @st then
+      @st = FakeTest.new :woot
       @st.failures << begin
                         raise Minitest::Skip
                       rescue Minitest::Assertion => e
@@ -166,6 +188,29 @@ class TestMinitestReporter < MetaMetaMetaTestCase
     assert_equal 0, r.assertions
   end
 
+  def test_record_pass_with_metadata
+    reporter = self.r
+
+    def reporter.metadata
+      @metadata
+    end
+
+    def reporter.record result
+      super
+      @metadata = result.metadata if result.metadata?
+    end
+
+    r.record passing_test_with_metadata
+
+    exp = { :meta => :data }
+    assert_equal exp, reporter.metadata
+
+    assert_equal ".", io.string
+    assert_empty r.results
+    assert_equal 1, r.count
+    assert_equal 0, r.assertions
+  end
+
   def test_record_fail
     fail_test = self.fail_test
     r.record fail_test
@@ -200,7 +245,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
     r.start
     r.report
 
-    exp = clean <<-EOM
+    exp = <<~EOM
       Run options:
 
       # Running:
@@ -220,7 +265,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
     r.record passing_test
     r.report
 
-    exp = clean <<-EOM
+    exp = <<~EOM
       Run options:
 
       # Running:
@@ -240,7 +285,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
     r.record fail_test
     r.report
 
-    exp = clean <<-EOM
+    exp = <<~EOM
       Run options:
 
       # Running:
@@ -250,7 +295,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
       Finished in 0.00
 
         1) Failure:
-      Minitest::Test#woot [FILE:LINE]:
+      FakeTest#woot [FILE:LINE]:
       boo
 
       1 runs, 0 assertions, 1 failures, 0 errors, 0 skips
@@ -264,7 +309,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
     r.record error_test
     r.report
 
-    exp = clean <<-EOM
+    exp = <<~EOM
       Run options:
 
       # Running:
@@ -274,10 +319,46 @@ class TestMinitestReporter < MetaMetaMetaTestCase
       Finished in 0.00
 
         1) Error:
-      Minitest::Test#woot:
+      FakeTest#woot:
       RuntimeError: no
-          FILE:LINE:in `error_test'
-          FILE:LINE:in `test_report_error'
+          FILE:LINE:in 'error_test'
+          FILE:LINE:in 'test_report_error'
+
+      1 runs, 0 assertions, 0 failures, 1 errors, 0 skips
+    EOM
+
+    assert_equal exp, normalize_output(io.string)
+  end
+
+  def test_report_error__sse
+    r.start
+    r.record system_stack_error_test
+    r.report
+
+    exp = <<~EOM
+      Run options:
+
+      # Running:
+
+      E
+
+      Finished in 0.00
+
+        1) Error:
+      FakeTest#woot:
+      SystemStackError: 274 -> 12
+          a
+          b
+          c
+           +->> 67 cycles of 4 lines:
+           | aa
+           | ab
+           | ac
+           | ad
+           +-<<
+          d
+          e
+          f
 
       1 runs, 0 assertions, 0 failures, 1 errors, 0 skips
     EOM
@@ -293,7 +374,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
       r.report
     end
 
-    exp = clean <<-EOM
+    exp = <<~EOM
       Run options:
 
       # Running:
@@ -309,4 +390,48 @@ class TestMinitestReporter < MetaMetaMetaTestCase
 
     assert_equal exp, normalize_output(io.string)
   end
+
+  def test_report_failure_uses_backtrace_filter
+    filter = Minitest::BacktraceFilter.new
+    def filter.filter _bt
+      ["foo.rb:123:in 'foo'"]
+    end
+
+    with_backtrace_filter filter do
+      r.start
+      r.record fail_test
+      r.report
+    end
+
+    exp = "FakeTest#woot [foo.rb:123]"
+
+    assert_includes io.string, exp
+  end
+
+  def test_report_failure_uses_backtrace_filter_complex_sorbet
+    backtrace = <<~EOBT
+      /Users/user/.gem/ruby/3.2.2/gems/minitest-5.20.0/lib/minitest/assertions.rb:183:in 'assert'
+      example_test.rb:9:in 'assert_false'
+      /Users/user/.gem/ruby/3.2.2/gems/sorbet-runtime-0.5.11068/lib/types/private/methods/call_validation.rb:256:in 'bind_call'
+      /Users/user/.gem/ruby/3.2.2/gems/sorbet-runtime-0.5.11068/lib/types/private/methods/call_validation.rb:256:in 'validate_call'
+      /Users/user/.gem/ruby/3.2.2/gems/sorbet-runtime-0.5.11068/lib/types/private/methods/_methods.rb:275:in 'block in _on_method_added'
+      example_test.rb:25:in 'test_something'
+      /Users/user/.gem/ruby/3.2.2/gems/minitest-5.20.0/lib/minitest/test.rb:94:in 'block (3 levels) in run'
+      /Users/user/.gem/ruby/3.2.2/gems/minitest-5.20.0/lib/minitest/test.rb:191:in 'capture_exceptions'
+      /Users/user/.gem/ruby/3.2.2/gems/minitest-5.20.0/lib/minitest/test.rb:89:in 'block (2 levels) in run'
+      ... so many lines ...
+    EOBT
+
+    filter = Minitest::BacktraceFilter.new %r%lib/minitest|gems/sorbet%
+
+    with_backtrace_filter filter do
+      begin
+        assert_equal 1, 2
+      rescue Minitest::Assertion => e
+        e.set_backtrace backtrace.lines.map(&:chomp)
+
+        assert_match "example_test.rb:25", e.location
+      end
+    end
+  end
 end