* lib/test/unit/assertions.rb: should not capture an

	  AssertionFailedError unless explicitly requested.

	* test/testunit/test_assertions.rb: ditto.

	* test/testunit/collector/test_objectspace.rb: fixed a test failure
	  caused by methods being returned in different orders on different
	  platforms by moving test sorting from TestSuite into the locations
	  where suites are constructed. [ruby-talk:83156]

	* lib/test/unit/testcase.rb: ditto.

	* lib/test/unit/testsuite.rb: ditto.

	* lib/test/unit/collector/objectspace.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/test/testunit/test_assertions.rb b/test/testunit/test_assertions.rb
index ee52a503a6..ec4b2c0c13 100644
--- a/test/testunit/test_assertions.rb
+++ b/test/testunit/test_assertions.rb
@@ -283,6 +283,11 @@ module Test
             raise "Error"
           }
         }
+        check_fails("Failure") do
+          assert_nothing_raised do
+            flunk("Failure")
+          end
+        end
       end
       
       def test_flunk