ruby-changes:18895
From: ryan <ko1@a...>
Date: Sun, 20 Feb 2011 05:46:26 +0900 (JST)
Subject: [ruby-changes:18895] Ruby:r30920 (trunk): lib/minitest/*.rb: Imported minitest 2.0.2 r6207
ryan 2011-02-20 05:44:08 +0900 (Sun, 20 Feb 2011) New Revision: 30920 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30920 Log: lib/minitest/*.rb: Imported minitest 2.0.2 r6207 Modified files: trunk/ChangeLog trunk/lib/minitest/autorun.rb trunk/lib/minitest/benchmark.rb trunk/lib/minitest/mock.rb trunk/lib/minitest/pride.rb trunk/lib/minitest/spec.rb trunk/lib/minitest/unit.rb trunk/test/minitest/test_minitest_benchmark.rb trunk/test/minitest/test_minitest_mock.rb trunk/test/minitest/test_minitest_spec.rb trunk/test/minitest/test_minitest_unit.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 30919) +++ ChangeLog (revision 30920) @@ -1,3 +1,8 @@ +Sun Feb 20 05:33:17 2011 Ryan Davis <ryand-ruby@z...> + + * lib/minitest/*.rb: Imported minitest 2.0.2 r6207. + * test/minitest/*: ditto + Sun Feb 20 02:14:09 2011 KOSAKI Motohiro <kosaki.motohiro@g...> * signal.c (sig_trap): avoid pthread_sigmask(xx, &mask, &mask) usage Index: lib/minitest/autorun.rb =================================================================== --- lib/minitest/autorun.rb (revision 30919) +++ lib/minitest/autorun.rb (revision 30920) @@ -1,8 +1,8 @@ -############################################################ -# This file is imported from a different project. -# DO NOT make modifications in this repo. -# File a patch instead and assign it to Ryan Davis -############################################################ +###################################################################### +# This file is imported from the minitest project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis. +###################################################################### require 'minitest/unit' require 'minitest/spec' Index: lib/minitest/unit.rb =================================================================== --- lib/minitest/unit.rb (revision 30919) +++ lib/minitest/unit.rb (revision 30920) @@ -1,8 +1,8 @@ -############################################################ -# This file is imported from a different project. -# DO NOT make modifications in this repo. -# File a patch instead and assign it to Ryan Davis -############################################################ +###################################################################### +# This file is imported from the minitest project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis. +###################################################################### require 'optparse' @@ -100,7 +100,8 @@ # Fails unless the block returns a true value. def assert_block msg = nil - assert yield, "Expected block to return true value." + msg = message(msg) { "Expected block to return true value" } + assert yield, msg end ## Index: lib/minitest/pride.rb =================================================================== --- lib/minitest/pride.rb (revision 30919) +++ lib/minitest/pride.rb (revision 30920) @@ -1,8 +1,8 @@ -############################################################ -# This file is imported from a different project. -# DO NOT make modifications in this repo. -# File a patch instead and assign it to Ryan Davis -############################################################ +###################################################################### +# This file is imported from the minitest project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis. +###################################################################### require "minitest/unit" Index: lib/minitest/mock.rb =================================================================== --- lib/minitest/mock.rb (revision 30919) +++ lib/minitest/mock.rb (revision 30920) @@ -1,8 +1,8 @@ -############################################################ -# This file is imported from a different project. -# DO NOT make modifications in this repo. -# File a patch instead and assign it to Ryan Davis -############################################################ +###################################################################### +# This file is imported from the minitest project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis. +###################################################################### class MockExpectationError < StandardError; end Index: lib/minitest/benchmark.rb =================================================================== --- lib/minitest/benchmark.rb (revision 30919) +++ lib/minitest/benchmark.rb (revision 30920) @@ -1,8 +1,8 @@ -############################################################ -# This file is imported from a different project. -# DO NOT make modifications in this repo. -# File a patch instead and assign it to Ryan Davis -############################################################ +###################################################################### +# This file is imported from the minitest project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis. +###################################################################### require 'minitest/unit' require 'minitest/spec' Index: lib/minitest/spec.rb =================================================================== --- lib/minitest/spec.rb (revision 30919) +++ lib/minitest/spec.rb (revision 30920) @@ -1,8 +1,8 @@ -############################################################ -# This file is imported from a different project. -# DO NOT make modifications in this repo. -# File a patch instead and assign it to Ryan Davis -############################################################ +###################################################################### +# This file is imported from the minitest project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis. +###################################################################### #!/usr/bin/ruby -w Index: test/minitest/test_minitest_mock.rb =================================================================== --- test/minitest/test_minitest_mock.rb (revision 30919) +++ test/minitest/test_minitest_mock.rb (revision 30920) @@ -1,8 +1,8 @@ -############################################################ -# This file is imported from a different project. -# DO NOT make modifications in this repo. -# File a patch instead and assign it to Ryan Davis -############################################################ +###################################################################### +# This file is imported from the minitest project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis. +###################################################################### require 'minitest/mock' require 'minitest/unit' Index: test/minitest/test_minitest_benchmark.rb =================================================================== --- test/minitest/test_minitest_benchmark.rb (revision 30919) +++ test/minitest/test_minitest_benchmark.rb (revision 30920) @@ -1,8 +1,8 @@ -############################################################ -# This file is imported from a different project. -# DO NOT make modifications in this repo. -# File a patch instead and assign it to Ryan Davis -############################################################ +###################################################################### +# This file is imported from the minitest project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis. +###################################################################### require 'minitest/autorun' require 'minitest/benchmark' Index: test/minitest/test_minitest_spec.rb =================================================================== --- test/minitest/test_minitest_spec.rb (revision 30919) +++ test/minitest/test_minitest_spec.rb (revision 30920) @@ -1,8 +1,8 @@ -############################################################ -# This file is imported from a different project. -# DO NOT make modifications in this repo. -# File a patch instead and assign it to Ryan Davis -############################################################ +###################################################################### +# This file is imported from the minitest project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis. +###################################################################### require 'minitest/spec' Index: test/minitest/test_minitest_unit.rb =================================================================== --- test/minitest/test_minitest_unit.rb (revision 30919) +++ test/minitest/test_minitest_unit.rb (revision 30920) @@ -1,8 +1,8 @@ -############################################################ -# This file is imported from a different project. -# DO NOT make modifications in this repo. -# File a patch instead and assign it to Ryan Davis -############################################################ +###################################################################### +# This file is imported from the minitest project. +# DO NOT make modifications in this repo. They _will_ be reverted! +# File a patch instead and assign it to Ryan Davis. +###################################################################### require 'stringio' require 'pathname' @@ -409,8 +409,8 @@ end def test_assert_block_triggered - util_assert_triggered 'Expected block to return true value.' do - @tc.assert_block do + util_assert_triggered "blah.\nExpected block to return true value." do + @tc.assert_block "blah" do false end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/