mocha 0.9.8 → 0.9.9

data/lib/mocha/integration/mini_test/{version_131_and_above.rb → version_140.rb}

@@ -7,33 +7,28 @@ module Mocha
     
     module MiniTest
       
-      def self.translate(exception)
-        return exception unless exception.kind_of?(::Mocha::ExpectationError)
-        translated_exception = ::MiniTest::Assertion.new(exception.message)
-        translated_exception.set_backtrace(exception.backtrace)
-        translated_exception
-      end
-      
-      module Version131AndAbove
+      module Version140
+        def self.included(mod)
+          $stderr.puts "Monkey patching MiniTest v1.4.0" if $options['debug']
+        end
         def run runner
           assertion_counter = AssertionCounter.new(self)
           result = '.'
-          name = (self.respond_to?(:name) ? self.name : self.__name__)
           begin
             begin
               @passed = nil
               self.setup
-              self.__send__ name
+              self.__send__ self.__name__
               mocha_verify(assertion_counter)
               @passed = true
             rescue Exception => e
               @passed = false
-              result = runner.puke(self.class, name, Mocha::Integration::MiniTest.translate(e))
+              result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
             ensure
               begin
                 self.teardown
               rescue Exception => e
-                result = runner.puke(self.class, name, Mocha::Integration::MiniTest.translate(e))
+                result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
               end
             end
           ensure

data/lib/mocha/integration/mini_test/version_141.rb

@@ -0,0 +1,56 @@
+require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/expectation_error'
+
+module Mocha
+  
+  module Integration
+    
+    module MiniTest
+            
+      module Version141
+        def self.included(mod)
+          $stderr.puts "Monkey patching MiniTest v1.4.1"
+        end
+        def run runner
+          trap 'INFO' do
+            warn '%s#%s %.2fs' % [self.class, self.__name__,
+              (Time.now - runner.start_time)]
+            runner.status $stderr
+          end
+
+          assertion_counter = AssertionCounter.new(self)
+          result = '.'
+          begin
+            begin
+              @passed = nil
+              self.setup
+              self.__send__ self.__name__
+              mocha_verify(assertion_counter)
+              @passed = true
+            rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
+              raise
+            rescue Exception => e
+              @passed = false
+              result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
+            ensure
+              begin
+                self.teardown
+              rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
+                raise
+              rescue Exception => e
+                result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
+              end
+              trap 'INFO', 'DEFAULT'
+            end
+          ensure
+            mocha_teardown
+          end
+          result
+        end
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/mocha/integration/mini_test/version_142_and_above.rb

@@ -0,0 +1,56 @@
+require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/expectation_error'
+
+module Mocha
+  
+  module Integration
+    
+    module MiniTest
+      
+      module Version142AndAbove
+        def self.included(mod)
+          $stderr.puts "Monkey patching MiniTest >= v1.4.2" if $options['debug']
+        end
+        def run runner
+          trap 'INFO' do
+            warn '%s#%s %.2fs' % [self.class, self.__name__,
+              (Time.now - runner.start_time)]
+            runner.status $stderr
+          end if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
+          
+          assertion_counter = AssertionCounter.new(self)
+          result = '.'
+          begin
+            begin
+              @passed = nil
+              self.setup
+              self.__send__ self.__name__
+              mocha_verify(assertion_counter)
+              @passed = true
+            rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
+              raise
+            rescue Exception => e
+              @passed = false
+              result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
+            ensure
+              begin
+                self.teardown
+              rescue *PASSTHROUGH_EXCEPTIONS
+                raise
+              rescue Exception => e
+                result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
+              end
+              trap 'INFO', 'DEFAULT' if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
+            end
+          ensure
+            mocha_teardown
+          end
+          result
+        end
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/mocha/integration/test_unit.rb

@@ -3,7 +3,8 @@ require 'mocha/api'
 if !Test::Unit::TestCase.ancestors.include?(Mocha::API)
  
   require 'mocha/integration/test_unit/gem_version_200'
-  require 'mocha/integration/test_unit/gem_version_201_and_above'
+  require 'mocha/integration/test_unit/gem_version_201_to_202'
+  require 'mocha/integration/test_unit/gem_version_203_to_209'
   require 'mocha/integration/test_unit/ruby_version_185_and_below'
   require 'mocha/integration/test_unit/ruby_version_186_and_above'
   
@@ -17,20 +18,34 @@ if !Test::Unit::TestCase.ancestors.include?(Mocha::API)
         remove_method :run
         
         test_unit_version = begin
-          require 'test/unit/version'
+          load 'test/unit/version.rb'
           Test::Unit::VERSION
         rescue LoadError
           '1.x'
         end
 
-        if test_unit_version == '2.0.0'
+        if $options['debug']
+          $stderr.puts "Detected Ruby version: #{RUBY_VERSION}"
+          $stderr.puts "Detected Test::Unit version: #{test_unit_version}"
+        end
+
+        if (test_unit_version == '1.x') || (test_unit_version == '1.2.3')
+          if RUBY_VERSION < '1.8.6'
+            include Mocha::Integration::TestUnit::RubyVersion185AndBelow
+          else
+            include Mocha::Integration::TestUnit::RubyVersion186AndAbove
+          end
+        elsif (test_unit_version == '2.0.0')
           include Mocha::Integration::TestUnit::GemVersion200
-        elsif test_unit_version >= '2.0.1'
-          include Mocha::Integration::TestUnit::GemVersion201AndAbove
-        elsif RUBY_VERSION < '1.8.6'
-          include Mocha::Integration::TestUnit::RubyVersion185AndBelow
+        elsif (test_unit_version >= '2.0.1') && (test_unit_version <= '2.0.2')
+          include Mocha::Integration::TestUnit::GemVersion201To202
+        elsif (test_unit_version >= '2.0.3') && (test_unit_version <= '2.0.9')
+          include Mocha::Integration::TestUnit::GemVersion203To209
+        elsif (test_unit_version > '2.0.9')
+          $stderr.puts "*** Test::Unit integration has not been verified but patching anyway ***" if $options['debug']
+          include Mocha::Integration::TestUnit::GemVersion203To209
         else
-          include Mocha::Integration::TestUnit::RubyVersion186AndAbove
+          $stderr.puts "*** No Mocha integration for Test::Unit version ***" if $options['debug']
         end
         
       end

data/lib/mocha/integration/test_unit/gem_version_200.rb

@@ -9,6 +9,9 @@ module Mocha
     module TestUnit
       
       module GemVersion200
+        def self.included(mod)
+          $stderr.puts "Monkey patching Test::Unit gem v2.0.0" if $options['debug']
+        end
         def run(result)
           assertion_counter = AssertionCounter.new(result)
           begin

data/lib/mocha/integration/test_unit/{gem_version_201_and_above.rb → gem_version_201_to_202.rb}

@@ -8,7 +8,10 @@ module Mocha
     
     module TestUnit
       
-      module GemVersion201AndAbove
+      module GemVersion201To202
+        def self.included(mod)
+          $stderr.puts "Monkey patching Test::Unit gem >= v2.0.1 and <= v2.0.2" if $options['debug']
+        end
         def run(result)
           assertion_counter = AssertionCounter.new(result)
           begin

data/lib/mocha/integration/test_unit/gem_version_203_to_209.rb

@@ -0,0 +1,52 @@
+require 'test/unit/testcase'
+require 'mocha/integration/test_unit/assertion_counter'
+require 'mocha/expectation_error'
+
+module Mocha
+  
+  module Integration
+    
+    module TestUnit
+      
+      module GemVersion203To209
+        def self.included(mod)
+          $stderr.puts "Monkey patching Test::Unit gem >= v2.0.3 and <= v2.0.9" if $options['debug']
+        end
+        def run(result)
+          assertion_counter = AssertionCounter.new(result)
+          begin
+            @_result = result
+            yield(Test::Unit::TestCase::STARTED, name)
+            begin
+              begin
+                run_setup
+                run_test
+                mocha_verify(assertion_counter)
+              rescue Mocha::ExpectationError => e
+                add_failure(e.message, e.backtrace)
+              rescue Exception
+                @interrupted = true
+                raise unless handle_exception($!)
+              ensure
+                begin
+                  run_teardown
+                rescue Exception
+                  raise unless handle_exception($!)
+                end
+              end
+            ensure
+              mocha_teardown
+            end
+            result.add_run
+            yield(Test::Unit::TestCase::FINISHED, name)
+          ensure
+            # @_result = nil # For test-spec's after_all :<
+          end
+        end
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/mocha/integration/test_unit/ruby_version_185_and_below.rb

@@ -9,6 +9,9 @@ module Mocha
     module TestUnit
       
       module RubyVersion185AndBelow
+        def self.included(mod)
+          $stderr.puts "Monkey patching Test::Unit for Ruby <= v1.8.5" if $options['debug']
+        end
         def run(result)
           assertion_counter = AssertionCounter.new(result)
           yield(Test::Unit::TestCase::STARTED, name)

data/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb

@@ -9,6 +9,9 @@ module Mocha
     module TestUnit
       
       module RubyVersion186AndAbove
+        def self.included(mod)
+          $stderr.puts "Monkey patching Test::Unit for Ruby >= v1.8.6" if $options['debug']
+        end
         def run(result)
           assertion_counter = AssertionCounter.new(result)
           yield(Test::Unit::TestCase::STARTED, name)

data/lib/mocha/mock.rb

@@ -2,7 +2,6 @@ require 'mocha/expectation'
 require 'mocha/expectation_list'
 require 'mocha/metaclass'
 require 'mocha/names'
-require 'mocha/mockery'
 require 'mocha/method_matcher'
 require 'mocha/parameters_matcher'
 require 'mocha/unexpected_invocation'

data/lib/mocha/module_method.rb

@@ -1,4 +1,4 @@
-require 'mocha/module_method'
+require 'mocha/class_method'
 
 module Mocha
 

data/lib/mocha/options.rb

@@ -0,0 +1 @@
+$options = (ENV['MOCHA_OPTIONS'] || '').split(',').inject({}) { |hash, key| hash[key] = true; hash }

data/lib/mocha/parameter_matchers/base.rb

@@ -2,12 +2,60 @@ module Mocha
   
   module ParameterMatchers
     
-    class Base # :nodoc:
+    class Base 
       
-      def to_matcher
+      def to_matcher # :nodoc:
         self
       end
       
+      # :call-seq: &(matcher) -> parameter_matcher
+      #
+      # A short hand way of specifying multiple matchers that should
+      # all match.
+      #
+      # Returns a new +AllOf+ parameter matcher combining the
+      # given matcher and the receiver.
+      #
+      # The following statements are equivalent:
+      #   object = mock()
+      #   object.expects(:run).with(all_of(has_key(:foo), has_key(:bar)))
+      #   object.run(:foo => 'foovalue', :bar => 'barvalue')
+      #
+      #   # with the shorthand
+      #   object.expects(:run).with(has_key(:foo) & has_key(:bar))
+      #   object.run(:foo => 'foovalue', :bar => 'barvalue)
+      def &(matcher)
+        AllOf.new(self, matcher)
+      end
+      
+      # :call-seq: |(matcher) -> parameter_matcher
+      #
+      # A short hand way of specifying multiple matchers, only at least
+      # one of which should pass.
+      #
+      # Returns a new +AnyOf+ parameter matcher combining the
+      # given matcher and the receiver.
+      #
+      # The following statements are equivalent:
+      #   object = mock()
+      #   object.expects(:run).with(any_of(has_key(:foo), has_key(:bar)))
+      #   object.run(:foo => 'foovalue')
+      #
+      #   # with the shorthand
+      #   object.expects(:run).with(has_key(:foo) | has_key(:bar))
+      #   object.run(:foo => 'foovalue')
+      #
+      # This shorthand will not work with an implicit equals match. Instead,
+      # an explicit equals matcher should be used:
+      #
+      #   object.expects(:run).with(equals(1) | equals(2))
+      #   object.run(1) # passes
+      #   object.run(2) # passes
+      #   object.run(3) # fails
+      def |(matcher)
+        AnyOf.new(self, matcher)
+      end
+      
     end
     
   end

data/test/acceptance/acceptance_test_helper.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
+require File.expand_path('../../test_helper', __FILE__)
 require 'test_runner'
 require 'mocha/configuration'
 

data/test/acceptance/api_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha_standalone'
 require 'simple_counter'
 

data/test/acceptance/bug_18914_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class Bug18914Test < Test::Unit::TestCase

data/test/acceptance/bug_21465_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class Bug21465Test < Test::Unit::TestCase

data/test/acceptance/bug_21563_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class Bug21563Test < Test::Unit::TestCase

data/test/acceptance/expected_invocation_count_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class ExpectedInvocationCountTest < Test::Unit::TestCase

data/test/acceptance/failure_messages_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class FailureMessagesTest < Test::Unit::TestCase

data/test/acceptance/minitest_test.rb

@@ -1,153 +1,157 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 
-begin
-  require 'rubygems'
-  gem 'minitest'
-rescue Gem::LoadError
-  # MiniTest gem not available
-end
+if defined?(MiniTest)
+  $stderr.puts "TODO: Running suite with MiniTest, running the MiniTestAdapterTest results in an error so skipping it for now."
+else
+  begin
+    require 'rubygems'
+    gem 'minitest'
+  rescue Gem::LoadError
+    # MiniTest gem not available
+  end
 
-begin
-  require 'minitest/unit'
-rescue LoadError
-  # MiniTest not available
-end
+  begin
+    require 'minitest/unit'
+  rescue LoadError
+    # MiniTest not available
+  end
 
-if defined?(MiniTest)
+  if defined?(MiniTest)
   
-  # monkey-patch MiniTest now that it has hopefully been loaded
-  require 'mocha/integration/mini_test'
+    # monkey-patch MiniTest now that it has hopefully been loaded
+    require 'mocha/integration/mini_test'
 
-  class MiniTestSampleTest < MiniTest::Unit::TestCase
-  
-    def test_mocha_with_fulfilled_expectation
-      mockee = mock()
-      mockee.expects(:blah)
-      mockee.blah
-    end
-  
-    def test_mocha_with_unfulfilled_expectation
-      mockee = mock()
-      mockee.expects(:blah)
-    end
+    class MiniTestSampleTest < MiniTest::Unit::TestCase
+  
+      def test_mocha_with_fulfilled_expectation
+        mockee = mock()
+        mockee.expects(:blah)
+        mockee.blah
+      end
+  
+      def test_mocha_with_unfulfilled_expectation
+        mockee = mock()
+        mockee.expects(:blah)
+      end
+  
+      def test_mocha_with_unexpected_invocation
+        mockee = mock()
+        mockee.blah
+      end
+  
+      def test_stubba_with_fulfilled_expectation
+        stubbee = Class.new { define_method(:blah) {} }.new
+        stubbee.expects(:blah)
+        stubbee.blah
+      end
+  
+      def test_stubba_with_unfulfilled_expectation
+        stubbee = Class.new { define_method(:blah) {} }.new
+        stubbee.expects(:blah)
+      end
+  
+      def test_mocha_with_matching_parameter
+        mockee = mock()
+        mockee.expects(:blah).with(has_key(:wibble))
+        mockee.blah(:wibble => 1)
+      end
+  
+      def test_mocha_with_non_matching_parameter
+        mockee = mock()
+        mockee.expects(:blah).with(has_key(:wibble))
+        mockee.blah(:wobble => 2)
+      end
   
-    def test_mocha_with_unexpected_invocation
-      mockee = mock()
-      mockee.blah
     end
-  
-    def test_stubba_with_fulfilled_expectation
-      stubbee = Class.new { define_method(:blah) {} }.new
-      stubbee.expects(:blah)
-      stubbee.blah
-    end
-  
-    def test_stubba_with_unfulfilled_expectation
-      stubbee = Class.new { define_method(:blah) {} }.new
-      stubbee.expects(:blah)
-    end
-  
-    def test_mocha_with_matching_parameter
-      mockee = mock()
-      mockee.expects(:blah).with(has_key(:wibble))
-      mockee.blah(:wibble => 1)
-    end
-  
-    def test_mocha_with_non_matching_parameter
-      mockee = mock()
-      mockee.expects(:blah).with(has_key(:wibble))
-      mockee.blah(:wobble => 2)
-    end
-  
-  end
 
-  class MiniTestTest < Test::Unit::TestCase
+    class MiniTestTest < Test::Unit::TestCase
   
-    def setup
-      @output = StringIO.new
-      MiniTest::Unit.output = @output
-      @runner = MiniTest::Unit.new
-    end
+      def setup
+        @output = StringIO.new
+        MiniTest::Unit.output = @output
+        @runner = MiniTest::Unit.new
+      end
   
-    attr_reader :runner
+      attr_reader :runner
   
-    def test_should_pass_mocha_test
-      runner.run(%w(-n test_mocha_with_fulfilled_expectation))
+      def test_should_pass_mocha_test
+        runner.run(%w(-n test_mocha_with_fulfilled_expectation))
     
-      assert_equal 0, runner.failures
-      assert_equal 0, runner.errors
-      assert_equal 1, runner.assertion_count
-    end
+        assert_equal 0, runner.failures
+        assert_equal 0, runner.errors
+        assert_equal 1, runner.assertion_count
+      end
 
-    def test_should_fail_mocha_test_due_to_unfulfilled_expectation
-      runner.run(%w(-n test_mocha_with_unfulfilled_expectation))
+      def test_should_fail_mocha_test_due_to_unfulfilled_expectation
+        runner.run(%w(-n test_mocha_with_unfulfilled_expectation))
       
-      assert_equal 1, runner.failures
-      assert_equal 0, runner.errors
-      assert_equal 1, runner.assertion_count
-      assert_not_all_expectation_were_satisfied
-    end
-  
-    def test_should_fail_mocha_test_due_to_unexpected_invocation
-      runner.run(%w(-n test_mocha_with_unexpected_invocation))
+        assert_equal 1, runner.failures
+        assert_equal 0, runner.errors
+        assert_equal 1, runner.assertion_count
+        assert_not_all_expectation_were_satisfied
+      end
+  
+      def test_should_fail_mocha_test_due_to_unexpected_invocation
+        runner.run(%w(-n test_mocha_with_unexpected_invocation))
     
-      assert_equal 1, runner.failures
-      assert_equal 0, runner.errors
-      assert_equal 0, runner.assertion_count
-      assert_unexpected_invocation
-    end
-  
-    def test_should_pass_stubba_test
-      runner.run(%w(-n test_stubba_with_fulfilled_expectation))
+        assert_equal 1, runner.failures
+        assert_equal 0, runner.errors
+        assert_equal 0, runner.assertion_count
+        assert_unexpected_invocation
+      end
+  
+      def test_should_pass_stubba_test
+        runner.run(%w(-n test_stubba_with_fulfilled_expectation))
     
-      assert_equal 0, runner.failures
-      assert_equal 0, runner.errors
-      assert_equal 1, runner.assertion_count
-    end
+        assert_equal 0, runner.failures
+        assert_equal 0, runner.errors
+        assert_equal 1, runner.assertion_count
+      end
   
-    def test_should_fail_stubba_test_due_to_unfulfilled_expectation
-      runner.run(%w(-n test_stubba_with_unfulfilled_expectation))
+      def test_should_fail_stubba_test_due_to_unfulfilled_expectation
+        runner.run(%w(-n test_stubba_with_unfulfilled_expectation))
     
-      assert_equal 1, runner.failures
-      assert_equal 0, runner.errors
-      assert_equal 1, runner.assertion_count
-      assert_not_all_expectation_were_satisfied
-    end
-  
-    def test_should_pass_mocha_test_with_matching_parameter
-      runner.run(%w(-n test_mocha_with_matching_parameter))
+        assert_equal 1, runner.failures
+        assert_equal 0, runner.errors
+        assert_equal 1, runner.assertion_count
+        assert_not_all_expectation_were_satisfied
+      end
+  
+      def test_should_pass_mocha_test_with_matching_parameter
+        runner.run(%w(-n test_mocha_with_matching_parameter))
     
-      assert_equal 0, runner.failures
-      assert_equal 0, runner.errors
-      assert_equal 1, runner.assertion_count
-    end
+        assert_equal 0, runner.failures
+        assert_equal 0, runner.errors
+        assert_equal 1, runner.assertion_count
+      end
   
-    def test_should_fail_mocha_test_with_non_matching_parameter
-      runner.run(%w(-n test_mocha_with_non_matching_parameter))
+      def test_should_fail_mocha_test_with_non_matching_parameter
+        runner.run(%w(-n test_mocha_with_non_matching_parameter))
       
-      assert_equal 1, runner.failures
-      assert_equal 0, runner.errors
-      assert_equal 0, runner.assertion_count # unexpected invocation occurs before expectation is verified
-      assert_unexpected_invocation
-    end
+        assert_equal 1, runner.failures
+        assert_equal 0, runner.errors
+        assert_equal 0, runner.assertion_count # unexpected invocation occurs before expectation is verified
+        assert_unexpected_invocation
+      end
   
-    private
+      private
   
-    def output
-      @output.rewind
-      @output.read
-    end
+      def output
+        @output.rewind
+        @output.read
+      end
   
-    def assert_unexpected_invocation
-      assert_match Regexp.new('unexpected invocation'), output, "MiniTest output:\n#{output}"
-    end
+      def assert_unexpected_invocation
+        assert_match Regexp.new('unexpected invocation'), output, "MiniTest output:\n#{output}"
+      end
+  
+      def assert_not_all_expectation_were_satisfied
+        assert_match Regexp.new('not all expectations were satisfied'), output, "MiniTest output:\n#{output}"
+      end
   
-    def assert_not_all_expectation_were_satisfied
-      assert_match Regexp.new('not all expectations were satisfied'), output, "MiniTest output:\n#{output}"
     end
   
+  else
+    $stderr.puts "MiniTest is not available, so MiniTestAdapterTest has not been run."
   end
-  
-else
-  warn "MiniTest is not available, so MiniTestAdapterTest has not been run."
 end