test-unit 2.0.0 → 2.0.1

data/test/test_testcase.rb

@@ -420,6 +420,54 @@ module Test
         check("Should not be interrupted", !success_test.interrupted?)
       end
 
+      def test_inherited_test_should_be_ignored
+        test_case = Class.new(TestCase) do
+          def test_nothing
+          end
+        end
+
+        sub_test_case = Class.new(test_case) do
+          def test_fail
+            flunk
+          end
+        end
+
+        assert_nothing_thrown do
+          test_case.new("test_nothing")
+        end
+
+        assert_nothing_thrown do
+          sub_test_case.new("test_fail")
+        end
+
+        assert_throw(:invalid_test) do
+          sub_test_case.new("test_nothing")
+        end
+      end
+
+      def test_mixin_test_should_not_be_ignored
+        test_module = Module.new do
+          def test_nothing
+          end
+        end
+
+        test_case = Class.new(Test::Unit::TestCase) do
+          include test_module
+
+          def test_fail
+            flunk
+          end
+        end
+
+        assert_nothing_thrown do
+          test_case.new("test_nothing")
+        end
+
+        assert_nothing_thrown do
+          test_case.new("test_fail")
+        end
+      end
+
       private
       def check(message, passed)
         add_assertion

data/test/{testunit_test_util.rb → testunit-test-util.rb}

@@ -4,7 +4,7 @@ module TestUnitTestUtil
     assert_equal(expected, faults.collect {|fault| fault.message})
   end
 
-  def run_test(test_case, name)
+  def _run_test(test_case, name)
     result = Test::Unit::TestResult.new
     test = test_case.new(name)
     yield(test) if block_given?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: test-unit
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -10,19 +10,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-18 00:00:00 +09:00
+date: 2008-11-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.6.0
+        version: 1.8.2
     version: 
-description: Test::Unit (Classic) - Nathaniel Talbott's originial test-unit, externalized from the ruby project as a gem (for tool developers).
+description: Test::Unit 2.x - Improved version of Test::Unit bundled in Ruby 1.8.x.  Ruby 1.9.x bundles miniunit not Test::Unit. Test::Unit bundled in Ruby 1.8.x had not been improved but unbundled Test::Unit (Test::Unit 2.x) will be improved actively.
 email: 
 - kou@cozmixng.org
 - ryand-ruby@zenspider.com
@@ -39,7 +40,12 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- TODO
 - bin/testrb
+- html/classic.html
+- html/index.html
+- html/index.html.ja
+- html/test-unit-classic.png
 - lib/test/unit.rb
 - lib/test/unit/assertionfailederror.rb
 - lib/test/unit/assertions.rb
@@ -50,6 +56,7 @@ files:
 - lib/test/unit/collector/dir.rb
 - lib/test/unit/collector/load.rb
 - lib/test/unit/collector/objectspace.rb
+- lib/test/unit/color-scheme.rb
 - lib/test/unit/color.rb
 - lib/test/unit/diff.rb
 - lib/test/unit/error.rb
@@ -79,28 +86,30 @@ files:
 - sample/subtracter.rb
 - sample/tc_adder.rb
 - sample/tc_subtracter.rb
+- sample/test_user.rb
 - sample/ts_examples.rb
-- test/collector/test_descendant.rb
+- test/collector/test-descendant.rb
+- test/collector/test-load.rb
 - test/collector/test_dir.rb
-- test/collector/test_load.rb
 - test/collector/test_objectspace.rb
 - test/run-test.rb
+- test/test-attribute.rb
+- test/test-color-scheme.rb
+- test/test-color.rb
+- test/test-diff.rb
+- test/test-emacs-runner.rb
+- test/test-fixture.rb
+- test/test-notification.rb
+- test/test-omission.rb
+- test/test-pending.rb
+- test/test-priority.rb
 - test/test_assertions.rb
-- test/test_attribute.rb
-- test/test_color.rb
-- test/test_diff.rb
-- test/test_emacs_runner.rb
 - test/test_error.rb
 - test/test_failure.rb
-- test/test_fixture.rb
-- test/test_notification.rb
-- test/test_omission.rb
-- test/test_pending.rb
-- test/test_priority.rb
 - test/test_testcase.rb
 - test/test_testresult.rb
 - test/test_testsuite.rb
-- test/testunit_test_util.rb
+- test/testunit-test-util.rb
 - test/ui/test_testrunmediator.rb
 - test/util/test_backtracefilter.rb
 - test/util/test_observable.rb
@@ -128,31 +137,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: test-unit
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Test::Unit (Classic) - Nathaniel Talbott's originial test-unit, externalized from the ruby project as a gem (for tool developers).
+summary: Test::Unit 2.x - Improved version of Test::Unit bundled in Ruby 1.8.x
 test_files: 
-- test/test_pending.rb
 - test/test_testcase.rb
-- test/test_color.rb
 - test/test_failure.rb
-- test/test_diff.rb
-- test/test_fixture.rb
 - test/collector/test_objectspace.rb
-- test/collector/test_load.rb
 - test/collector/test_dir.rb
-- test/collector/test_descendant.rb
-- test/test_attribute.rb
-- test/test_emacs_runner.rb
 - test/test_testsuite.rb
 - test/test_assertions.rb
 - test/util/test_observable.rb
 - test/util/test_procwrapper.rb
 - test/util/test_backtracefilter.rb
 - test/ui/test_testrunmediator.rb
-- test/test_priority.rb
 - test/test_testresult.rb
-- test/test_omission.rb
 - test/test_error.rb
-- test/test_notification.rb

data/test/test_fixture.rb

@@ -1,275 +0,0 @@
-class TestUnitFixture < Test::Unit::TestCase
-  def test_setup_without_option
-    test_case = assert_setup([:setup,
-                              :custom_setup_method0,
-                              :custom_setup_method1,
-                              :custom_setup_method3],
-                             [])
-    assert_inherited_setup([:setup,
-                            :custom_setup_method0,
-                            :custom_setup_method1,
-                            :custom_setup_method3],
-                           test_case)
-    assert_inherited_setup([:setup], nil)
-  end
-
-  def test_setup_with_before_option
-    test_case = assert_setup([:custom_setup_method3,
-                              :custom_setup_method0,
-                              :custom_setup_method1,
-                              :setup],
-                             [[{:before => :append}],
-                              [{:before => :append}],
-                              [{:before => :prepend}],
-                              [{:before => :prepend}]])
-    assert_inherited_setup([:custom_setup_method3,
-                            :custom_setup_method0,
-                            :custom_setup_method1,
-                            :setup],
-                           test_case)
-    assert_inherited_setup([:setup], nil)
-  end
-
-  def test_setup_with_after_option
-    test_case = assert_setup([:setup,
-                              :custom_setup_method3,
-                              :custom_setup_method0,
-                              :custom_setup_method1],
-                             [[{:after => :append}],
-                              [{:after => :append}],
-                              [{:after => :prepend}],
-                              [{:after => :prepend}]])
-    assert_inherited_setup([:setup,
-                            :custom_setup_method3,
-                            :custom_setup_method0,
-                            :custom_setup_method1],
-                           test_case)
-    assert_inherited_setup([:setup], nil)
-  end
-
-  def test_setup_with_invalid_option
-    assert_invalid_setup_option(:unknown => true)
-    assert_invalid_setup_option(:before => :unknown)
-    assert_invalid_setup_option(:after => :unknown)
-  end
-
-  def test_teardown_without_option
-    test_case = assert_teardown([:custom_teardown_method3,
-                                 :custom_teardown_method1,
-                                 :custom_teardown_method0,
-                                 :teardown],
-                                [])
-    assert_inherited_teardown([:custom_teardown_method3,
-                               :custom_teardown_method1,
-                               :custom_teardown_method0,
-                               :teardown],
-                              test_case)
-    assert_inherited_teardown([:teardown], nil)
-  end
-
-  def test_teardown_with_before_option
-    test_case = assert_teardown([:custom_teardown_method3,
-                                 :custom_teardown_method0,
-                                 :custom_teardown_method1,
-                                 :teardown],
-                                [[{:before => :append}],
-                                 [{:before => :append}],
-                                 [{:before => :prepend}],
-                                 [{:before => :prepend}]])
-    assert_inherited_teardown([:custom_teardown_method3,
-                               :custom_teardown_method0,
-                               :custom_teardown_method1,
-                               :teardown],
-                              test_case)
-    assert_inherited_teardown([:teardown], nil)
-  end
-
-  def test_teardown_with_after_option
-    test_case = assert_teardown([:teardown,
-                                 :custom_teardown_method3,
-                                 :custom_teardown_method0,
-                                 :custom_teardown_method1],
-                                [[{:after => :append}],
-                                 [{:after => :append}],
-                                 [{:after => :prepend}],
-                                 [{:after => :prepend}]])
-    assert_inherited_teardown([:teardown,
-                               :custom_teardown_method3,
-                               :custom_teardown_method0,
-                               :custom_teardown_method1],
-                              test_case)
-    assert_inherited_teardown([:teardown], nil)
-  end
-
-  def test_teardown_with_invalid_option
-    assert_invalid_teardown_option(:unknown => true)
-    assert_invalid_teardown_option(:before => :unknown)
-    assert_invalid_teardown_option(:after => :unknown)
-  end
-
-  private
-  def assert_setup(expected, setup_options)
-    called = []
-    test_case = Class.new(Test::Unit::TestCase) do
-      @@called = called
-      def setup
-        @@called << :setup
-      end
-
-      setup(*(setup_options[0] || []))
-      def custom_setup_method0
-        @@called << :custom_setup_method0
-      end
-
-      def custom_setup_method1
-        @@called << :custom_setup_method1
-      end
-      setup(*[:custom_setup_method1, *(setup_options[1] || [])])
-
-      setup(*(setup_options[2] || []))
-      def custom_setup_method2
-        @@called << :custom_setup_method2
-      end
-      unregister_setup(:custom_setup_method2)
-
-      setup(*(setup_options[3] || []))
-      def custom_setup_method3
-        @@called << :custom_setup_method3
-      end
-
-      def test_nothing
-      end
-    end
-
-    test_case.new("test_nothing").run(Test::Unit::TestResult.new) {}
-    assert_equal(expected, called)
-    test_case
-  end
-
-  def assert_inherited_setup(expected, parent)
-    called = []
-    inherited_test_case = Class.new(parent || Test::Unit::TestCase) do
-      @@called = called
-      def setup
-        @@called << :setup
-      end
-
-      def custom_setup_method0
-        @@called << :custom_setup_method0
-      end
-
-      def custom_setup_method1
-        @@called << :custom_setup_method1
-      end
-
-      def custom_setup_method2
-        @@called << :custom_setup_method2
-      end
-
-      def custom_setup_method3
-        @@called << :custom_setup_method3
-      end
-
-      def test_nothing
-      end
-    end
-
-    inherited_test_case.new("test_nothing").run(Test::Unit::TestResult.new) {}
-    assert_equal(expected, called)
-  end
-
-  def assert_teardown(expected, teardown_options)
-    called = []
-    test_case = Class.new(Test::Unit::TestCase) do
-      @@called = called
-      def teardown
-        @@called << :teardown
-      end
-
-      teardown(*(teardown_options[0] || []))
-      def custom_teardown_method0
-        @@called << :custom_teardown_method0
-      end
-
-      def custom_teardown_method1
-        @@called << :custom_teardown_method1
-      end
-      teardown(*[:custom_teardown_method1, *(teardown_options[1] || [])])
-
-      teardown(*(teardown_options[2] || []))
-      def custom_teardown_method2
-        @@called << :custom_teardown_method2
-      end
-      unregister_teardown(:custom_teardown_method2)
-
-      teardown(*(teardown_options[3] || []))
-      def custom_teardown_method3
-        @@called << :custom_teardown_method3
-      end
-
-      def test_nothing
-      end
-    end
-
-    test_case.new("test_nothing").run(Test::Unit::TestResult.new) {}
-    assert_equal(expected, called)
-    test_case
-  end
-
-  def assert_inherited_teardown(expected, parent)
-    called = []
-    inherited_test_case = Class.new(parent || Test::Unit::TestCase) do
-      @@called = called
-      def teardown
-        @@called << :teardown
-      end
-
-      def custom_teardown_method0
-        @@called << :custom_teardown_method0
-      end
-
-      def custom_teardown_method1
-        @@called << :custom_teardown_method1
-      end
-
-      def custom_teardown_method2
-        @@called << :custom_teardown_method2
-      end
-
-      def custom_teardown_method3
-        @@called << :custom_teardown_method3
-      end
-
-      def test_nothing
-      end
-    end
-
-    inherited_test_case.new("test_nothing").run(Test::Unit::TestResult.new) {}
-    assert_equal(expected, called)
-  end
-
-  def assert_invalid_option(fixture_type, option)
-    exception = assert_raise(ArgumentError) do
-      Class.new(Test::Unit::TestCase) do
-        def test_nothing
-        end
-
-        send(fixture_type, option)
-        def fixture
-        end
-      end
-    end
-    assert_equal("must be {:before => :prepend}, {:before => :append}, " +
-                 "{:after => :prepend} or {:after => :append}" +
-                 ": #{option.inspect}",
-                 exception.message)
-  end
-
-  def assert_invalid_setup_option(option)
-    assert_invalid_option(:setup, option)
-  end
-
-  def assert_invalid_teardown_option(option)
-    assert_invalid_option(:teardown, option)
-  end
-end