test-unit 2.5.2 → 2.5.3

data/Rakefile

@@ -22,13 +22,6 @@ doc_en_dir = reference_base_dir + "en"
 html_base_dir = Pathname.new("doc/html")
 html_reference_dir = html_base_dir + spec.name
 YARD::Rake::YardocTask.new do |task|
-  task.options += ["--title", spec.name]
-  # task.options += ["--charset", "UTF-8"]
-  task.options += ["--readme", "README.textile"]
-  task.options += ["--files", "doc/text/**/*"]
-  task.options += ["--output-dir", doc_en_dir.to_s]
-  task.options += ["--charset", "utf-8"]
-  task.files += FileList["lib/**/*.rb"]
 end
 
 task :yard do

data/lib/test/unit.rb

@@ -496,8 +496,10 @@ module Test # :nodoc:
   end
 end
 
-at_exit do
-  if $!.nil? and Test::Unit::AutoRunner.need_auto_run?
-    exit Test::Unit::AutoRunner.run
+Module.new do
+  at_exit do
+    if $!.nil? and Test::Unit::AutoRunner.need_auto_run?
+      exit Test::Unit::AutoRunner.run
+    end
   end
 end

data/lib/test/unit/assertions.rb

@@ -1,6 +1,6 @@
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
-#             Copyright (c) 2009-2010 Kouhei Sutou. All rights reserved.
+#             Copyright (c) 2009-2012 Kouhei Sutou. All rights reserved.
 # License:: Ruby license.
 
 require 'test/unit/assertionfailederror'
@@ -85,6 +85,47 @@ module Test
         end
       end
 
+      # Asserts that +object+ is false or nil.
+      #
+      # @note Just for minitest compatibility. :<
+      #
+      # @param [Object] object The object to be asserted.
+      # @return [void]
+      #
+      # @example Pass patterns
+      #   refute(false)    # => pass
+      #   refute(nil)      # => pass
+      #
+      # @example Fialure patterns
+      #   refute(true)     # => failure
+      #   refute("string") # => failure
+      #
+      # @since 2.5.3
+      def refute(object, message=nil)
+        _wrap_assertion do
+          assertion_message = nil
+          case message
+          when nil, String, Proc
+          when AssertionMessage
+            assertion_message = message
+          else
+            error_message = "assertion message must be String, Proc or "
+            error_message << "#{AssertionMessage}: "
+            error_message << "<#{message.inspect}>(<#{message.class}>)"
+            raise ArgumentError, error_message, filter_backtrace(caller)
+          end
+          assert_block("refute should not be called with a block.") do
+            !block_given?
+          end
+          assertion_message ||= build_message(message,
+                                              "<?> is neither nil or false.",
+                                              object)
+          assert_block(assertion_message) do
+            not object
+          end
+        end
+      end
+
       ##
       # Passes if +expected+ == +actual+.
       #
@@ -163,15 +204,8 @@ EOT
         _assert_raise(assert_expected_exception, *args, &block)
       end
 
-      ##
-      # Alias of assert_raise.
-      #
-      # Will be deprecated in 1.9, and removed in 2.0.
-
-      public
-      def assert_raises(*args, &block)
-        assert_raise(*args, &block)
-      end
+      # Just for minitest compatibility. :<
+      alias_method :assert_raises, :assert_raise
 
       ##
       # Passes if the block raises one of the given
@@ -344,6 +378,11 @@ EOT
         end
       end
 
+      # Just for minitest compatibility. :<
+      #
+      # @since 2.5.3
+      alias_method :refute_respond_to, :assert_not_respond_to
+
       ##
       # Passes if +string+ =~ +pattern+.
       #
@@ -466,6 +505,11 @@ EOT
         assert_block(full_message) { !actual.equal?(expected) }
       end
 
+      # Just for minitest compatibility. :<
+      #
+      # @since 2.5.3
+      alias_method :refute_same, :assert_not_same
+
       ##
       # Passes if +expected+ != +actual+
       #
@@ -478,6 +522,11 @@ EOT
         assert_block(full_message) { expected != actual }
       end
 
+      # Just for minitest compatibility. :<
+      #
+      # @since 2.5.3
+      alias_method :refute_equal, :assert_not_equal
+
       ##
       # Passes if ! +object+ .nil?
       #
@@ -490,6 +539,11 @@ EOT
         assert_block(full_message){!object.nil?}
       end
 
+      # Just for minitest compatibility. :<
+      #
+      # @since 2.5.3
+      alias_method :refute_nil, :assert_not_nil
+
       ##
       # Passes if +regexp+ !~ +string+
       #
@@ -510,6 +564,11 @@ EOT
         end
       end
 
+      # Just for minitest compatibility. :<
+      #
+      # @since 2.5.3
+      alias_method :refute_match, :assert_not_match
+
       ##
       # Deprecated. Use #assert_not_match instead.
       #
@@ -578,13 +637,10 @@ EOT
         end
       end
 
-      ##
-      # Alias of assert_throw.
+      # Just for minitest compatibility. :<
       #
-      # Will be deprecated in 1.9, and removed in 2.0.
-      def assert_throws(*args, &block)
-        assert_throw(*args, &block)
-      end
+      # @since 2.5.3
+      alias_method :assert_throws, :assert_throw
 
       ##
       # Passes if block does not throw anything.
@@ -661,6 +717,11 @@ EOT
         end
       end
 
+      # Just for minitest compatibility. :<
+      #
+      # @since 2.5.3
+      alias_method :refute_in_delta, :assert_not_in_delta
+
       # :stopdoc:
       private
       def _assert_in_delta_validate_arguments(expected_float,
@@ -1285,6 +1346,11 @@ EOT
         end
       end
 
+      # Just for minitest compatibility. :<
+      #
+      # @since 2.5.3
+      alias_method :assert_includes, :assert_include
+
       ##
       # Passes if +collection+ doesn't include +object+.
       #

data/lib/test/unit/attribute-matcher.rb

@@ -0,0 +1,26 @@
+module Test
+  module Unit
+    class AttributeMatcher
+      def initialize(test)
+        @test = test
+      end
+
+      def match?(expression)
+        matched = instance_eval(expression)
+        if matched.nil?
+          false
+        else
+          matched
+        end
+      end
+
+      def method_missing(name, *args)
+        if args.empty?
+          @test[name]
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/test/unit/autorunner.rb

@@ -1,5 +1,6 @@
 require 'test/unit/color-scheme'
 require 'test/unit/priority'
+require 'test/unit/attribute-matcher'
 require 'optparse'
 
 module Test
@@ -276,6 +277,19 @@ module Test
             end
           end
 
+          o.on('--attribute=EXPRESSION', String,
+               "Runs tests that matches EXPRESSION.",
+               "EXPRESSION is evaluated as Ruby's expression.",
+               "Test attribute name can be used with no receiver in EXPRESSION.",
+               "EXPRESSION examples:",
+               "  !slow",
+               "  tag == 'important' and !slow") do |expression|
+            @filters << lambda do |test|
+              matcher = AttributeMatcher.new(test)
+              matcher.match?(expression)
+            end
+          end
+
           priority_filter = Proc.new do |test|
             if @filters == [priority_filter]
               Priority::Checker.new(test).need_to_run?

data/lib/test/unit/diff.rb

@@ -723,6 +723,12 @@ module Test
       end
 
       def diff(differ_class, from, to, options={})
+        if from.respond_to?(:valid_encoding?) and not from.valid_encoding?
+          from = from.dup.force_encoding("ASCII-8BIT")
+        end
+        if to.respond_to?(:valid_encoding?) and not to.valid_encoding?
+          to = to.dup.force_encoding("ASCII-8BIT")
+        end
         differ = differ_class.new(from.split(/\r?\n/), to.split(/\r?\n/))
         lines = differ.diff(options)
         if Object.const_defined?(:EncodingError)

data/lib/test/unit/testcase.rb

@@ -106,6 +106,7 @@ module Test
         def inherited(sub_class) # :nodoc:
           require "test/unit"
           DESCENDANTS << sub_class
+          super
         end
 
         @@added_methods = {}
@@ -289,7 +290,8 @@ module Test
         #     ...
         #   end
         def description(value, target=nil)
-          attribute(:description, value, {}, target || [])
+          targets = [target].compact
+          attribute(:description, value, {}, *targets)
         end
 
         # Defines a sub test case.

data/lib/test/unit/ui/console/testrunner.rb

@@ -268,6 +268,14 @@ module Test
             output("")
             from, to = prepare_for_diff(failure.expected, failure.actual)
             if from and to
+              if need_encoding
+                unless from.valid_encoding?
+                  from = from.dup.force_encoding("ASCII-8BIT")
+                end
+                unless to.valid_encoding?
+                  to = to.dup.force_encoding("ASCII-8BIT")
+                end
+              end
               from_lines = from.split(/\r?\n/)
               to_lines = to.split(/\r?\n/)
               if need_encoding

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = '2.5.2'
+    VERSION = '2.5.3'
   end
 end

data/test/test-assertions.rb

@@ -1351,6 +1351,66 @@ EOM
       end
     end
 
+    class TestRefute < TestCase
+      include AssertionCheckable
+
+      class TestPass < self
+        def test_nil
+          check_nothing_fails do
+            refute(nil)
+          end
+        end
+
+        def test_false
+          check_nothing_fails do
+            refute(false)
+          end
+        end
+
+        def test_with_message
+          check_nothing_fails do
+            refute(nil, "successful refute")
+          end
+        end
+      end
+
+      class TestFailure < self
+        def test_true
+          check_fail("<true> is neither nil or false.") do
+            refute(true)
+          end
+        end
+
+        def test_with_message
+          check_fail("failed refute.\n" +
+                       "<true> is neither nil or false.") do
+            refute(true, "failed refute")
+          end
+        end
+
+        def test_fail_with_assertion_message
+          check_fail("user message.\n" +
+                       "placeholder <:in> message") do
+            refute(true, build_message("user message",
+                                       "placeholder <?> message",
+                                       :in))
+          end
+        end
+
+        def test_error_invalid_message_true
+          check_fail("assertion message must be String, Proc or " +
+                       "Test::Unit::Assertions::AssertionMessage: " +
+                "<false>(<FalseClass>)") do
+            begin
+              refute(true, false)
+            rescue ArgumentError
+              raise AssertionFailedError, $!.message
+            end
+          end
+        end
+      end
+    end
+
     class TestAssertInDelta < TestCase
       include AssertionCheckable
 

data/test/test-attribute-matcher.rb

@@ -0,0 +1,38 @@
+require 'test/unit'
+require 'testunit-test-util'
+
+class TestAttributeMatcher < Test::Unit::TestCase
+  include TestUnitTestUtil
+
+  def setup
+    @test = {}
+    @matcher = Test::Unit::AttributeMatcher.new(@test)
+  end
+
+  def test_nonexistent
+    assert_false(@matcher.match?("nonexistent"))
+  end
+
+  def test_existent
+    @test[:existent] = true
+    assert_true(@matcher.match?("existent"))
+  end
+
+  def test_and
+    @test[:slow] = true
+    @test[:important] = true
+    assert_true(@matcher.match?("important and slow"))
+  end
+
+  def test_complex
+    @test[:tags] = [:slow, :web]
+    @test[:bug] = "2929"
+    assert_true(@matcher.match?("tags.include?(:web) or bug == '29'"))
+  end
+
+  def test_exception
+    assert_raise(NoMethodError) do
+      @matcher.match?("nonexistent > 100")
+    end
+  end
+end

data/test/test-attribute.rb

@@ -83,4 +83,30 @@ class TestUnitAttribute < Test::Unit::TestCase
                  ],
                  changed_attributes)
   end
+
+  class TestDescription < self
+    def test_decoration_style
+      test_case = Class.new(TestStack) do
+        description "Test for push"
+        def test_push
+        end
+      end
+
+      test_push = test_case.new("test_push")
+      assert_equal({"description" => "Test for push"},
+                   test_push.attributes)
+    end
+
+    def test_explicit_test_name_style
+      test_case = Class.new(TestStack) do
+        def test_push
+        end
+        description "Test for push", :test_push
+      end
+
+      test_push = test_case.new("test_push")
+      assert_equal({"description" => "Test for push"},
+                   test_push.attributes)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-unit
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Ruby 1.9.x bundles minitest not Test::Unit. Test::Unit
 
   bundled in Ruby 1.8.x had not been improved but unbundled
@@ -80,89 +96,91 @@ files:
 - COPYING
 - GPL
 - PSFL
-- lib/test-unit.rb
-- lib/test/unit.rb
+- lib/test/unit/autorunner.rb
 - lib/test/unit/attribute.rb
+- lib/test/unit/failure.rb
 - lib/test/unit/data.rb
+- lib/test/unit/testsuitecreator.rb
 - lib/test/unit/color.rb
-- lib/test/unit/version.rb
-- lib/test/unit/runner/emacs.rb
-- lib/test/unit/runner/console.rb
-- lib/test/unit/runner/xml.rb
+- lib/test/unit/exceptionhandler.rb
+- lib/test/unit/assertionfailederror.rb
+- lib/test/unit/testresult.rb
+- lib/test/unit/util/observable.rb
+- lib/test/unit/util/method-owner-finder.rb
+- lib/test/unit/util/procwrapper.rb
+- lib/test/unit/util/output.rb
+- lib/test/unit/util/backtracefilter.rb
+- lib/test/unit/ui/xml/testrunner.rb
+- lib/test/unit/ui/testrunnermediator.rb
+- lib/test/unit/ui/testrunner.rb
 - lib/test/unit/ui/testrunnerutilities.rb
 - lib/test/unit/ui/emacs/testrunner.rb
-- lib/test/unit/ui/testrunner.rb
-- lib/test/unit/ui/xml/testrunner.rb
-- lib/test/unit/ui/console/outputlevel.rb
 - lib/test/unit/ui/console/testrunner.rb
-- lib/test/unit/ui/testrunnermediator.rb
-- lib/test/unit/assertionfailederror.rb
-- lib/test/unit/failure.rb
-- lib/test/unit/autorunner.rb
-- lib/test/unit/fault-location-detector.rb
-- lib/test/unit/exceptionhandler.rb
+- lib/test/unit/ui/console/outputlevel.rb
+- lib/test/unit/attribute-matcher.rb
+- lib/test/unit/version.rb
 - lib/test/unit/assertions.rb
-- lib/test/unit/error.rb
-- lib/test/unit/omission.rb
-- lib/test/unit/fixture.rb
-- lib/test/unit/collector/descendant.rb
-- lib/test/unit/collector/load.rb
-- lib/test/unit/collector/xml.rb
-- lib/test/unit/collector/dir.rb
-- lib/test/unit/collector/objectspace.rb
-- lib/test/unit/code-snippet-fetcher.rb
-- lib/test/unit/testsuitecreator.rb
 - lib/test/unit/color-scheme.rb
-- lib/test/unit/testcase.rb
-- lib/test/unit/util/method-owner-finder.rb
-- lib/test/unit/util/output.rb
-- lib/test/unit/util/procwrapper.rb
-- lib/test/unit/util/observable.rb
-- lib/test/unit/util/backtracefilter.rb
-- lib/test/unit/pending.rb
-- lib/test/unit/testresult.rb
 - lib/test/unit/collector.rb
 - lib/test/unit/diff.rb
+- lib/test/unit/pending.rb
+- lib/test/unit/omission.rb
+- lib/test/unit/testsuite.rb
+- lib/test/unit/fault-location-detector.rb
 - lib/test/unit/priority.rb
+- lib/test/unit/runner/xml.rb
+- lib/test/unit/runner/console.rb
+- lib/test/unit/runner/emacs.rb
 - lib/test/unit/notification.rb
-- lib/test/unit/testsuite.rb
-- sample/test_subtracter.rb
+- lib/test/unit/fixture.rb
+- lib/test/unit/code-snippet-fetcher.rb
+- lib/test/unit/testcase.rb
+- lib/test/unit/collector/dir.rb
+- lib/test/unit/collector/xml.rb
+- lib/test/unit/collector/load.rb
+- lib/test/unit/collector/objectspace.rb
+- lib/test/unit/collector/descendant.rb
+- lib/test/unit/error.rb
+- lib/test/unit.rb
+- lib/test-unit.rb
 - sample/subtracter.rb
+- sample/adder.rb
 - sample/test_user.rb
+- sample/test_subtracter.rb
 - sample/test_adder.rb
-- sample/adder.rb
-- test/testunit-test-util.rb
+- test/run-test.rb
 - test/test-testcase.rb
-- test/ui/test_testrunmediator.rb
-- test/test_testresult.rb
-- test/test-pending.rb
 - test/test-emacs-runner.rb
-- test/test-fixture.rb
-- test/test-attribute.rb
+- test/testunit-test-util.rb
+- test/test-code-snippet.rb
 - test/test_failure.rb
-- test/test-data.rb
-- test/test_testsuite.rb
-- test/collector/test_objectspace.rb
-- test/collector/test-descendant.rb
-- test/collector/test_dir.rb
-- test/collector/test-load.rb
-- test/run-test.rb
 - test/test-assertions.rb
+- test/test-attribute.rb
 - test/test-priority.rb
+- test/test-fixture.rb
+- test/test-color-scheme.rb
 - test/util/test_backtracefilter.rb
-- test/util/test_observable.rb
-- test/util/test_procwrapper.rb
-- test/util/test-method-owner-finder.rb
 - test/util/test-output.rb
+- test/util/test-method-owner-finder.rb
+- test/util/test_procwrapper.rb
+- test/util/test_observable.rb
+- test/test-diff.rb
+- test/ui/test_testrunmediator.rb
 - test/fixtures/plus.csv
 - test/test-fault-location-detector.rb
-- test/test-code-snippet.rb
-- test/test_error.rb
-- test/test-diff.rb
 - test/test-notification.rb
-- test/test-color-scheme.rb
+- test/test_testsuite.rb
+- test/test_testresult.rb
 - test/test-omission.rb
 - test/test-color.rb
+- test/test_error.rb
+- test/test-data.rb
+- test/test-pending.rb
+- test/test-attribute-matcher.rb
+- test/collector/test_objectspace.rb
+- test/collector/test-load.rb
+- test/collector/test-descendant.rb
+- test/collector/test_dir.rb
 homepage: http://test-unit.rubyforge.org/
 licenses:
 - Ruby's and PSFL (lib/test/unit/diff.rb)
@@ -176,12 +194,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1080508134508588033
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1080508134508588033
 requirements: []
 rubyforge_project: test-unit
 rubygems_version: 1.8.23
@@ -189,36 +213,37 @@ signing_key:
 specification_version: 3
 summary: test-unit - Improved version of Test::Unit bundled in Ruby 1.8.x.
 test_files:
-- test/testunit-test-util.rb
+- test/run-test.rb
 - test/test-testcase.rb
-- test/ui/test_testrunmediator.rb
-- test/test_testresult.rb
-- test/test-pending.rb
 - test/test-emacs-runner.rb
-- test/test-fixture.rb
-- test/test-attribute.rb
+- test/testunit-test-util.rb
+- test/test-code-snippet.rb
 - test/test_failure.rb
-- test/test-data.rb
-- test/test_testsuite.rb
-- test/collector/test_objectspace.rb
-- test/collector/test-descendant.rb
-- test/collector/test_dir.rb
-- test/collector/test-load.rb
-- test/run-test.rb
 - test/test-assertions.rb
+- test/test-attribute.rb
 - test/test-priority.rb
+- test/test-fixture.rb
+- test/test-color-scheme.rb
 - test/util/test_backtracefilter.rb
-- test/util/test_observable.rb
-- test/util/test_procwrapper.rb
-- test/util/test-method-owner-finder.rb
 - test/util/test-output.rb
+- test/util/test-method-owner-finder.rb
+- test/util/test_procwrapper.rb
+- test/util/test_observable.rb
+- test/test-diff.rb
+- test/ui/test_testrunmediator.rb
 - test/fixtures/plus.csv
 - test/test-fault-location-detector.rb
-- test/test-code-snippet.rb
-- test/test_error.rb
-- test/test-diff.rb
 - test/test-notification.rb
-- test/test-color-scheme.rb
+- test/test_testsuite.rb
+- test/test_testresult.rb
 - test/test-omission.rb
 - test/test-color.rb
+- test/test_error.rb
+- test/test-data.rb
+- test/test-pending.rb
+- test/test-attribute-matcher.rb
+- test/collector/test_objectspace.rb
+- test/collector/test-load.rb
+- test/collector/test-descendant.rb
+- test/collector/test_dir.rb
 has_rdoc: