test-unit 2.4.8 → 2.4.9

data/lib/test-unit.rb

@@ -1,3 +1,13 @@
 module Test
-  autoload :Unit, "test/unit"
+  module Unit
+    autoload :TestCase, "test/unit/testcase"
+    autoload :AutoRunner, "test/unit/autorunner"
+  end
+end
+
+# experimental. It is for "ruby -rtest-unit -e run test/test_*.rb".
+# Is this API OK or dirty?
+def run
+  self.class.send(:undef_method, :run)
+  require "test/unit"
 end

data/lib/test/unit.rb

@@ -310,19 +310,23 @@ module Test # :nodoc:
   module Unit
     # Set true when Test::Unit has run.  If set to true Test::Unit
     # will not automatically run at exit.
-    def self.run=(flag)
-      @run = flag
+    #
+    # @deprecated Use Test::Unit::AutoRunner.need_auto_run= instead.
+    def self.run=(have_run)
+      AutoRunner.need_auto_run = (not have_run)
     end
 
     # Already tests have run?
+    #
+    # @deprecated Use Test::Unit::AutoRunner.need_auto_run? instead.
     def self.run?
-      @run ||= false
+      not AutoRunner.need_auto_run?
     end
   end
 end
 
 at_exit do
-  unless $! || Test::Unit.run?
+  if $!.nil? and Test::Unit::AutoRunner.need_auto_run?
     exit Test::Unit::AutoRunner.run
   end
 end

data/lib/test/unit/assertions.rb

@@ -1755,7 +1755,30 @@ EOT
           def result(parameters)
             raise "The number of parameters does not match the number of substitutions." if(parameters.size != count)
             params = parameters.dup
-            @parts.collect{|e| e == '?' ? params.shift : e.gsub(/\\\?/m, '?')}.join('')
+            expanded_template = ""
+            @parts.each do |part|
+              if part == '?'
+                encoding_safe_concat(expanded_template, params.shift)
+              else
+                expanded_template << part.gsub(/\\\?/m, '?')
+              end
+            end
+            expanded_template
+          end
+
+          private
+          if Object.const_defined?(:Encoding)
+            def encoding_safe_concat(buffer, parameter)
+              if Encoding.compatible?(buffer.encoding, parameter.encoding)
+                buffer << parameter
+              else
+                buffer << parameter.dup.force_encoding(buffer.encoding)
+              end
+            end
+          else
+            def encoding_safe_concat(buffer, parameter)
+              buffer << parameter
+            end
           end
         end
 

data/lib/test/unit/autorunner.rb

@@ -1,4 +1,5 @@
 require 'test/unit/color-scheme'
+require 'test/unit/priority'
 require 'optparse'
 
 module Test
@@ -48,22 +49,31 @@ module Test
         def prepare(hook=Proc.new)
           PREPARE_HOOKS << hook
         end
-      end
 
-      def self.run(force_standalone=false, default_dir=nil, argv=ARGV, &block)
-        r = new(force_standalone || standalone?, &block)
-        r.base = default_dir
-        r.prepare
-        r.process_args(argv)
-        r.run
-      end
+        def run(force_standalone=false, default_dir=nil, argv=ARGV, &block)
+          r = new(force_standalone || standalone?, &block)
+          r.base = default_dir
+          r.prepare
+          r.process_args(argv)
+          r.run
+        end
 
-      def self.standalone?
-        return false unless("-e" == $0)
-        ObjectSpace.each_object(Class) do |klass|
-          return false if(klass < TestCase)
+        def standalone?
+          return false unless("-e" == $0)
+          ObjectSpace.each_object(Class) do |klass|
+            return false if(klass < TestCase)
+          end
+          true
+        end
+
+        @@need_auto_run = true
+        def need_auto_run?
+          @@need_auto_run
+        end
+
+        def need_auto_run=(need)
+          @@need_auto_run = need
         end
-        true
       end
 
       register_collector(:descendant) do |auto_runner|
@@ -117,7 +127,6 @@ module Test
       attr_writer :runner, :collector
 
       def initialize(standalone)
-        Unit.run = true
         @standalone = standalone
         @runner = default_runner
         @collector = default_collector
@@ -144,7 +153,6 @@ module Test
       end
 
       def process_args(args=ARGV)
-        args = args.dup
         begin
           args.unshift(*@default_arguments)
           options.order!(args) {|arg| @to_run << arg}
@@ -357,6 +365,7 @@ module Test
       end
 
       def run
+        self.class.need_auto_run = false
         suite = @collector[self]
         return false if suite.nil?
         return true if suite.empty?
@@ -365,8 +374,9 @@ module Test
         @runner_options[:color_scheme] ||= @color_scheme
         @runner_options[:listeners] ||= []
         @runner_options[:listeners].concat(@listeners)
-        Dir.chdir(@workdir) if @workdir
-        runner.run(suite, @runner_options).passed?
+        change_work_directory do
+          runner.run(suite, @runner_options).passed?
+        end
       end
 
       def load_config(file)
@@ -416,6 +426,14 @@ module Test
         file = global_config_file
         load_config(file) if file and File.exist?(file)
       end
+
+      def change_work_directory(&block)
+        if @workdir
+          Dir.chdir(@workdir, &block)
+        else
+          yield
+        end
+      end
     end
   end
 end

data/lib/test/unit/color-scheme.rb

@@ -94,7 +94,7 @@ module Test
             256
           else
             case ENV["TERM"]
-            when "xterm-256color"
+            when /-256color\z/
               256
             else
               8

data/lib/test/unit/testcase.rb

@@ -104,6 +104,7 @@ module Test
 
       class << self
         def inherited(sub_class) # :nodoc:
+          require "test/unit"
           DESCENDANTS << sub_class
         end
 

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

@@ -8,6 +8,7 @@
 
 require 'test/unit/color-scheme'
 require 'test/unit/code-snippet-fetcher'
+require 'test/unit/diff'
 require 'test/unit/ui/testrunner'
 require 'test/unit/ui/testrunnermediator'
 require 'test/unit/ui/console/outputlevel'
@@ -168,8 +169,7 @@ module Test
           end
 
           def output_fault_in_detail(fault)
-            if @use_color and fault.is_a?(Failure) and
-                fault.inspected_expected and fault.inspected_actual
+            if fault.is_a?(Failure)
               output_single(fault.label, fault_color(fault))
               output(":")
               output(fault.test_name)
@@ -429,7 +429,7 @@ module Test
           def guess_color_availability
             return false unless @output.tty?
             case ENV["TERM"]
-            when /term(?:-color)?\z/, "screen"
+            when /term(?:-(?:256)?color)?\z/, "screen"
               true
             else
               return true if ENV["EMACS"] == "t"

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

@@ -37,7 +37,7 @@ module Test
         end
 
         def start_mediator
-          @mediator.run_suite
+          @mediator.run
         end
 
         def diff_target_string?(string)

data/lib/test/unit/ui/testrunnermediator.rb

@@ -29,8 +29,8 @@ module Test
 
         # Runs the suite the TestRunnerMediator was created
         # with.
-        def run_suite
-          Unit.run = true
+        def run
+          AutoRunner.need_auto_run = false
 
           result = create_result
           finished_listener = result.add_listener(TestResult::FINISHED) do |*args|
@@ -51,9 +51,7 @@ module Test
             notify_listeners(RESET, @suite.size)
             notify_listeners(STARTED, result)
 
-            @suite.run(result) do |channel, value|
-              notify_listeners(channel, value)
-            end
+            run_suite(result)
           ensure
             elapsed_time = Time.now - start_time
             result.remove_listener(TestResult::FAULT, fault_listener)
@@ -80,6 +78,12 @@ module Test
           yield
           Time.now - begin_time
         end
+
+        def run_suite(result)
+          @suite.run(result) do |channel, value|
+            notify_listeners(channel, value)
+          end
+        end
       end
     end
   end

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = '2.4.8'
+    VERSION = '2.4.9'
   end
 end

data/test/test-assertions.rb

@@ -1907,5 +1907,20 @@ EOM
         end
       end
     end
+
+    class TestTemplate < Test::Unit::TestCase
+      def test_incompatible_encoding_by_diff
+        need_encoding
+        assert_raise(AssertionFailedError) do
+          assert_equal("UTF-8の日本語\n" * 3,
+                       ("Shift_JISの日本語\n" * 3).force_encoding("ASCII-8BIT"))
+        end
+      end
+
+      private
+      def need_encoding
+        omit("need Encoding") unless Object.const_defined?(:Encoding)
+      end
+    end
   end
 end

data/test/ui/test_testrunmediator.rb

@@ -13,7 +13,7 @@ class TestUnitUIMediator < Test::Unit::TestCase
       finished = true
     end
     assert_raise(Interrupt) do
-      mediator.run_suite
+      mediator.run
     end
     assert(finished)
   end

metadata

@@ -1,81 +1,66 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: test-unit
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 2.4.9
   prerelease: 
-  segments: 
-  - 2
-  - 4
-  - 8
-  version: 2.4.8
 platform: ruby
-authors: 
+authors:
 - Kouhei Sutou
 - Haruka Yoshihara
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2012-06-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  type: :development
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &3359000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: yard
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *3359000
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &3371220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: jeweler
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *3371220
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &3367460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
-description: |
-  Ruby 1.9.x bundles minitest not Test::Unit. Test::Unit
+  prerelease: false
+  version_requirements: *3367460
+description: ! 'Ruby 1.9.x bundles minitest not Test::Unit. Test::Unit
+
   bundled in Ruby 1.8.x had not been improved but unbundled
+
   Test::Unit (test-unit) is improved actively.
 
-email: 
+'
+email:
 - kou@cozmixng.org
 - yoshihara@clear-code.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
 - TODO
-files: 
+files:
 - COPYING
 - GPL
 - PSFL
@@ -164,37 +149,28 @@ files:
 - test/util/test_observable.rb
 - test/util/test_procwrapper.rb
 homepage: http://test-unit.rubyforge.org/
-licenses: 
+licenses:
 - Ruby's and PSFL (lib/test/unit/diff.rb)
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: test-unit
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: test-unit - Improved version of Test::Unit bundled in Ruby 1.8.x.
 test_files: []
-