test-unit 2.1.2 → 2.2.0

data/test/test-fixture.rb

@@ -129,6 +129,43 @@ class TestUnitFixture < Test::Unit::TestCase
     assert_called_fixtures(expected_teardown_calls, test_case)
   end
 
+  def test_teardown_with_exception
+    test_case = Class.new(Test::Unit::TestCase) do
+      def called_ids
+        @called_ids ||= []
+      end
+
+      def called(id)
+        called_ids << id
+      end
+
+      def teardown
+        called(:teardown)
+        raise "teardown"
+      end
+
+      teardown
+      def custom_teardown_method0
+        called(:custom_teardown_method0)
+        raise "custom_teardown_method0"
+      end
+
+      teardown
+      def custom_teardown_method1
+        called(:custom_teardown_method1)
+        raise "custom_teardown_method1"
+      end
+
+      def test_nothing
+      end
+    end
+
+    assert_called_fixtures([:custom_teardown_method1,
+                            :custom_teardown_method0,
+                            :teardown],
+                           test_case)
+  end
+
   private
   def assert_called_fixtures(expected, test_case)
     test = test_case.new("test_nothing")

data/test/test-testcase.rb

@@ -284,8 +284,15 @@ module Test
       def test_startup_shutdown
         called = []
         test_case = Class.new(TestCase) do
-          @@called = called
           class << self
+            def called
+              @@called
+            end
+
+            def called=(called)
+              @@called = called
+            end
+
             def startup
               @@called << :startup
             end
@@ -294,13 +301,14 @@ module Test
               @@called << :shutdown
             end
           end
+          self.called = called
 
           def setup
-            @@called << :setup
+            self.class.called << :setup
           end
 
           def teardown
-            @@called << :teardown
+            self.class.called << :teardown
           end
 
           def test1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: test-unit
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: false
   segments: 
   - 2
-  - 1
   - 2
-  version: 2.1.2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-25 00:00:00 +09:00
+date: 2011-02-14 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -156,6 +156,7 @@ files:
 - test/collector/test_dir.rb
 - test/collector/test_objectspace.rb
 - test/run-test.rb
+- test/test-assertions.rb
 - test/test-attribute.rb
 - test/test-color-scheme.rb
 - test/test-color.rb
@@ -167,7 +168,6 @@ files:
 - test/test-pending.rb
 - test/test-priority.rb
 - test/test-testcase.rb
-- test/test_assertions.rb
 - test/test_error.rb
 - test/test_failure.rb
 - test/test_testresult.rb
@@ -227,4 +227,3 @@ test_files:
 - test/util/test_observable.rb
 - test/util/test_procwrapper.rb
 - test/test_error.rb
-- test/test_assertions.rb