From e4b16eff50b01b396838a2229c540f752fc975bc Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 1 Jun 2011 05:12:55 +0000 Subject: MOSTLY Imported minitest 2.2.1 (r6277) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31887 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/minitest/test_minitest_benchmark.rb | 17 ++- test/minitest/test_minitest_mock.rb | 4 +- test/minitest/test_minitest_spec.rb | 91 ++++++++++++- test/minitest/test_minitest_unit.rb | 224 +++++++++++++++++++++++++++++-- 4 files changed, 317 insertions(+), 19 deletions(-) (limited to 'test') diff --git a/test/minitest/test_minitest_benchmark.rb b/test/minitest/test_minitest_benchmark.rb index 47f55232e6..cdd7c3c640 100644 --- a/test/minitest/test_minitest_benchmark.rb +++ b/test/minitest/test_minitest_benchmark.rb @@ -50,6 +50,21 @@ class TestMiniTestBenchmark < MiniTest::Unit::TestCase assert_fit :exponential, x, y, 0.95, 13.81148, -0.1820 end + def test_fit_constant_clean + x = (1..5).to_a + y = [5.0, 5.0, 5.0, 5.0, 5.0] + + assert_fit :linear, x, y, nil, 5.0, 0 + end + + def test_fit_constant_noisy + x = (1..5).to_a + y = [1.0, 1.2, 1.0, 0.8, 1.0] + + # verified in numbers and R + assert_fit :linear, x, y, nil, 1.12, -0.04 + end + def test_fit_linear_clean # y = m * x + b where m = 2.2, b = 3.1 x = (1..5).to_a @@ -96,7 +111,7 @@ class TestMiniTestBenchmark < MiniTest::Unit::TestCase def assert_fit msg, x, y, fit, exp_a, exp_b a, b, rr = send "fit_#{msg}", x, y - assert_operator rr, :>=, fit + assert_operator rr, :>=, fit if fit assert_in_delta exp_a, a assert_in_delta exp_b, b end diff --git a/test/minitest/test_minitest_mock.rb b/test/minitest/test_minitest_mock.rb index 5d0bae8ad7..311f5fa7fb 100644 --- a/test/minitest/test_minitest_mock.rb +++ b/test/minitest/test_minitest_mock.rb @@ -89,10 +89,10 @@ class TestMiniTestMock < MiniTest::Unit::TestCase def test_assign_per_mock_return_values a = MiniTest::Mock.new b = MiniTest::Mock.new - + a.expect(:foo, :a) b.expect(:foo, :b) - + assert_equal :a, a.foo assert_equal :b, b.foo end diff --git a/test/minitest/test_minitest_spec.rb b/test/minitest/test_minitest_spec.rb index b0a6474a71..942156abdb 100644 --- a/test/minitest/test_minitest_spec.rb +++ b/test/minitest/test_minitest_spec.rb @@ -5,6 +5,7 @@ ###################################################################### require 'minitest/spec' +require 'stringio' MiniTest::Unit.autorun @@ -202,34 +203,112 @@ describe MiniTest::Spec do end class TestMeta < MiniTest::Unit::TestCase - def test_structure + def test_setup + srand 42 + MiniTest::Unit::TestCase.reset + end + + def util_structure x = y = z = nil + before_list = [] + after_list = [] x = describe "top-level thingy" do - before {} - after {} + before { before_list << 1 } + after { after_list << 1 } it "top-level-it" do end y = describe "inner thingy" do - before {} + before { before_list << 2 } + after { after_list << 2 } it "inner-it" do end z = describe "very inner thingy" do - before {} + before { before_list << 3 } + after { after_list << 3 } it "inner-it" do end end end end + return x, y, z, before_list, after_list + end + + def test_structure + x, y, z, * = util_structure + assert_equal "top-level thingy", x.to_s assert_equal "top-level thingy::inner thingy", y.to_s assert_equal "top-level thingy::inner thingy::very inner thingy", z.to_s + assert_equal "top-level thingy", x.desc + assert_equal "inner thingy", y.desc + assert_equal "very inner thingy", z.desc + top_methods = %w(setup teardown test_0001_top_level_it) - inner_methods = %w(setup test_0001_inner_it) + inner_methods = %w(setup teardown test_0001_inner_it) assert_equal top_methods, x.instance_methods(false).sort.map {|o| o.to_s } assert_equal inner_methods, y.instance_methods(false).sort.map {|o| o.to_s } assert_equal inner_methods, z.instance_methods(false).sort.map {|o| o.to_s } end + + def test_setup_teardown_behavior + _, _, z, before_list, after_list = util_structure + + tc = z.new(nil) + tc.setup + tc.teardown + + assert_equal [1, 2, 3], before_list + assert_equal [3, 2, 1], after_list + end + + def test_children + MiniTest::Spec.children.clear + + x = y = z = nil + x = describe "top-level thingy" do + y = describe "first thingy" do end + + it "top-level-it" do end + + z = describe "second thingy" do end + end + + assert_equal [x], MiniTest::Spec.children + assert_equal [y, z], x.children + assert_equal [], y.children + assert_equal [], z.children + end + + def test_describe_first_structure + x = y = z = nil + x = describe "top-level thingy" do + y = describe "first thingy" do end + + it "top-level-it" do end + + z = describe "second thingy" do end + end + + assert_equal ['test_0001_top_level_it'], + x.instance_methods.grep(/^test/).map {|o| o.to_s} + assert_equal [], y.instance_methods.grep(/^test/) + assert_equal [], z.instance_methods.grep(/^test/) + end + + def test_structure_subclasses + z = nil + x = Class.new MiniTest::Spec do + def xyz; end + end + y = Class.new x do + z = describe("inner") {} + end + + assert_respond_to x.new(nil), "xyz" + assert_respond_to y.new(nil), "xyz" + assert_respond_to z.new(nil), "xyz" + end end diff --git a/test/minitest/test_minitest_unit.rb b/test/minitest/test_minitest_unit.rb index eaf1aa475e..bc4ffac7b7 100644 --- a/test/minitest/test_minitest_unit.rb +++ b/test/minitest/test_minitest_unit.rb @@ -51,6 +51,7 @@ Finished tests in 0.00 def teardown MiniTest::Unit.output = $stdout + # HACK for ruby-trunk: MiniTest::Unit.runner = nil Object.send :remove_const, :ATestCase if defined? ATestCase end @@ -254,7 +255,7 @@ RuntimeError: unhandled exception assert_report expected end - def test_run_failing # TODO: add error test + def test_run_failing tc = Class.new(MiniTest::Unit::TestCase) do def test_something assert true @@ -349,6 +350,36 @@ Finished tests in 0.00 S. +Finished tests in 0.00 + +2 tests, 1 assertions, 0 failures, 0 errors, 1 skips +" + assert_report expected + end + + def test_run_skip_verbose + tc = Class.new(MiniTest::Unit::TestCase) do + def test_something + assert true + end + + def test_skip + skip "not yet" + end + end + + Object.const_set(:ATestCase, tc) + + @tu.run %w[--seed 42 --verbose] + + expected = "Run options: --seed 42 --verbose + +# Running tests: + +ATestCase#test_skip = 0.00 s = S +ATestCase#test_something = 0.00 s = . + + Finished tests in 0.00 1) Skipped: @@ -360,6 +391,60 @@ not yet assert_report expected end + def test_default_runner_is_minitest_unit + skip "ruby-trunk won't run with runner code :(" + + assert_instance_of MiniTest::Unit, MiniTest::Unit.runner + end + + def test_run_with_other_runner + skip "ruby-trunk won't run with runner code :(" + + runner = Class.new(MiniTest::Unit) do + # Run once before each suite + def _run_suite(suite, type) + begin + suite.before_suite + super(suite, type) + end + end + end + + tc = Class.new(MiniTest::Unit::TestCase) do + + def self.before_suite + MiniTest::Unit.output.puts "Running #{self.name} tests" + @@foo = 1 + end + + def test_something + assert_equal 1, @@foo + end + + def test_something_else + assert_equal 1, @@foo + end + end + + Object.const_set(:ATestCase, tc) + MiniTest::Unit.runner = runner.new + @tu.run %w[--seed 42] + + # We should only see 'running ATestCase tests' once + expected = "Run options: --seed 42 + +# Running tests: + +Running ATestCase tests +.. + +Finished tests in 0.00 + +2 tests, 2 assertions, 0 failures, 0 errors, 0 skips +" + assert_report expected + end + def util_expand_bt bt if RUBY_VERSION =~ /^1\.9/ then bt.map { |f| (f =~ /^\./) ? File.expand_path(f) : f } @@ -434,12 +519,115 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase @tc.assert_equal 1, 1 end - def test_assert_equal_different - util_assert_triggered "Expected 1, not 2." do + def test_assert_equal_different_diff_deactivated + without_diff do + util_assert_triggered util_msg("haha" * 10, "blah" * 10) do + o1 = "haha" * 10 + o2 = "blah" * 10 + + @tc.assert_equal o1, o2 + end + end + end + + def test_assert_equal_different_hex + c = Class.new do + def initialize s; @name = s; end + end + + o1 = c.new "a" + o2 = c.new "b" + msg = "--- expected + +++ actual + @@ -1 +1 @@ + -#<#:0xXXXXXX @name=\"a\"> + +#<#:0xXXXXXX @name=\"b\"> + .".gsub(/^ +/, "") + + util_assert_triggered msg do + @tc.assert_equal o1, o2 + end + end + + def test_assert_equal_different_hex_invisible + o1 = Object.new + o2 = Object.new + + msg = "No visible difference. + You should look at your implementation of Object#==. + #.".gsub(/^ +/, "") + + util_assert_triggered msg do + @tc.assert_equal o1, o2 + end + end + + def test_assert_equal_different_long + msg = "--- expected + +++ actual + @@ -1 +1 @@ + -\"hahahahahahahahahahahahahahahahahahahaha\" + +\"blahblahblahblahblahblahblahblahblahblah\" + .".gsub(/^ +/, "") + + util_assert_triggered msg do + o1 = "haha" * 10 + o2 = "blah" * 10 + + @tc.assert_equal o1, o2 + end + end + + def test_assert_equal_different_long_invisible + msg = "No visible difference. + You should look at your implementation of String#==. + \"blahblahblahblahblahblahblahblahblahblah\".".gsub(/^ +/, "") + + util_assert_triggered msg do + o1 = "blah" * 10 + o2 = "blah" * 10 + def o1.== o + false + end + @tc.assert_equal o1, o2 + end + end + + def test_assert_equal_different_long_msg + msg = "message. + --- expected + +++ actual + @@ -1 +1 @@ + -\"hahahahahahahahahahahahahahahahahahahaha\" + +\"blahblahblahblahblahblahblahblahblahblah\" + .".gsub(/^ +/, "") + + util_assert_triggered msg do + o1 = "haha" * 10 + o2 = "blah" * 10 + @tc.assert_equal o1, o2, "message" + end + end + + def test_assert_equal_different_short + util_assert_triggered util_msg(1, 2) do @tc.assert_equal 1, 2 end end + def test_assert_equal_different_short_msg + util_assert_triggered util_msg(1, 2, "message") do + @tc.assert_equal 1, 2, "message" + end + end + + def test_assert_equal_different_short_multiline + msg = "--- expected\n+++ actual\n@@ -1,2 +1,2 @@\n \"a\n-b\"\n+c\"\n." + util_assert_triggered msg do + @tc.assert_equal "a\nb", "a\nc" + end + end + def test_assert_in_delta @tc.assert_in_delta 0.0, 1.0 / 1000, 0.1 end @@ -590,7 +778,7 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase end def test_assert_output_triggered_both - util_assert_triggered "In stdout.\nExpected \"yay\", not \"boo\"." do + util_assert_triggered util_msg("yay", "boo", "In stdout") do @tc.assert_output "yay", "blah" do print "boo" $stderr.print "blah blah" @@ -599,7 +787,7 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase end def test_assert_output_triggered_err - util_assert_triggered "In stderr.\nExpected \"blah\", not \"blah blah\"." do + util_assert_triggered util_msg("blah", "blah blah", "In stderr") do @tc.assert_output nil, "blah" do $stderr.print "blah blah" end @@ -607,7 +795,7 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase end def test_assert_output_triggered_out - util_assert_triggered "In stdout.\nExpected \"blah\", not \"blah blah\"." do + util_assert_triggered util_msg("blah", "blah blah", "In stdout") do @tc.assert_output "blah" do print "blah blah" end @@ -786,7 +974,7 @@ FILE:LINE:in `test_assert_raises_triggered_subclass' def test_assert_silent_triggered_err @assertion_count = 2 - util_assert_triggered "In stderr.\nExpected \"\", not \"blah blah\"." do + util_assert_triggered util_msg("", "blah blah", "In stderr") do @tc.assert_silent do $stderr.print "blah blah" end @@ -794,7 +982,7 @@ FILE:LINE:in `test_assert_raises_triggered_subclass' end def test_assert_silent_triggered_out - util_assert_triggered "In stdout.\nExpected \"\", not \"blah blah\"." do + util_assert_triggered util_msg("", "blah blah", "In stdout") do @tc.assert_silent do print "blah blah" end @@ -889,8 +1077,9 @@ FILE:LINE:in `test_assert_raises_triggered_subclass' def test_message @assertion_count = 0 - assert_equal "blah2.", @tc.message { "blah2" }.call - assert_equal "blah2.", @tc.message("") { "blah2" }.call + assert_equal "blah2.", @tc.message { "blah2" }.call + assert_equal "blah2.", @tc.message("") { "blah2" }.call + assert_equal "blah1.\nblah2.", @tc.message(:blah1) { "blah2" }.call assert_equal "blah1.\nblah2.", @tc.message("blah1") { "blah2" }.call end @@ -1101,4 +1290,19 @@ FILE:LINE:in `test_assert_raises_triggered_subclass' assert_equal expected, msg end + + def util_msg exp, act, msg = nil + s = "Expected: #{exp.inspect}\n Actual: #{act.inspect}." + s = "#{msg}.\n#{s}" if msg + s + end + + def without_diff + old_diff = MiniTest::Assertions.diff + MiniTest::Assertions.diff = nil + + yield + ensure + MiniTest::Assertions.diff = old_diff + end end -- cgit v1.2.3