From 18ef8f10782e202f1605ff2d3d59241f62989b67 Mon Sep 17 00:00:00 2001
From: ntalbott <ntalbott@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 2 Oct 2003 02:20:42 +0000
Subject: 	* 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
---
 test/testunit/collector/test_objectspace.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'test/testunit/collector')

diff --git a/test/testunit/collector/test_objectspace.rb b/test/testunit/collector/test_objectspace.rb
index d596e1d311..9e102536a5 100644
--- a/test/testunit/collector/test_objectspace.rb
+++ b/test/testunit/collector/test_objectspace.rb
@@ -17,7 +17,7 @@ module Test
           end
 
           @tc2 = Class.new(TestCase) do
-            def test_3
+            def test_0
             end
           end
 
@@ -34,9 +34,9 @@ module Test
         
         def test_basic_collection
           expected = TestSuite.new("name")
+          expected << @tc2.new('test_0')
           expected << @tc1.new('test_1')
           expected << @tc1.new('test_2')
-          expected << @tc2.new('test_3')
           assert_equal(expected, ObjectSpace.new(@object_space).collect("name"))
         end
         
@@ -47,25 +47,25 @@ module Test
           assert_equal(expected, collector.collect)
 
           expected = TestSuite.new(ObjectSpace::NAME)
+          expected << @tc2.new('test_0')
           expected << @tc1.new('test_1')
           expected << @tc1.new('test_2')
-          expected << @tc2.new('test_3')
           collector = ObjectSpace.new(@object_space)
           collector.filter = proc{|test| true}
           assert_equal(expected, collector.collect)
 
           expected = TestSuite.new(ObjectSpace::NAME)
+          expected << @tc2.new('test_0')
           expected << @tc1.new('test_1')
-          expected << @tc2.new('test_3')
           collector = ObjectSpace.new(@object_space)
-          collector.filter = proc{|test| ['test_1', 'test_3'].include?(test.method_name)}
+          collector.filter = proc{|test| ['test_1', 'test_0'].include?(test.method_name)}
           assert_equal(expected, collector.collect)
 
           expected = TestSuite.new(ObjectSpace::NAME)
+          expected << @tc2.new('test_0')
           expected << @tc1.new('test_1')
-          expected << @tc2.new('test_3')
           collector = ObjectSpace.new(@object_space)
-          collector.filter = [proc{|test| test.method_name == 'test_1'}, proc{|test| test.method_name == 'test_3'}]
+          collector.filter = [proc{|test| test.method_name == 'test_1'}, proc{|test| test.method_name == 'test_0'}]
           assert_equal(expected, collector.collect)
         end
       end
-- 
cgit v1.2.3