mocha 0.9.5 → 0.9.6

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

@@ -0,0 +1,49 @@
+require 'test/unit/testcase'
+require 'mocha/integration/test_unit/assertion_counter'
+require 'mocha/expectation_error'
+
+module Mocha
+  
+  module Integration
+    
+    module TestUnit
+      
+      module GemVersion201AndAbove
+        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
+          end
+        end
+      end
+      
+    end
+    
+  end
+  
+end

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

@@ -0,0 +1,48 @@
+require 'test/unit/testcase'
+require 'mocha/integration/test_unit/assertion_counter'
+require 'mocha/expectation_error'
+
+module Mocha
+  
+  module Integration
+    
+    module TestUnit
+      
+      module RubyVersion185AndBelow
+        def run(result)
+          assertion_counter = AssertionCounter.new(result)
+          yield(Test::Unit::TestCase::STARTED, name)
+          @_result = result
+          begin
+            begin
+              setup
+              __send__(@method_name)
+              mocha_verify(assertion_counter)
+            rescue Mocha::ExpectationError => e
+              add_failure(e.message, e.backtrace)
+            rescue Test::Unit::AssertionFailedError => e
+              add_failure(e.message, e.backtrace)
+            rescue StandardError, ScriptError
+              add_error($!)
+            ensure
+              begin
+                teardown
+              rescue Test::Unit::AssertionFailedError => e
+                add_failure(e.message, e.backtrace)
+              rescue StandardError, ScriptError
+                add_error($!)
+              end
+            end
+          ensure
+            mocha_teardown
+          end
+          result.add_run
+          yield(Test::Unit::TestCase::FINISHED, name)
+        end
+      end
+      
+    end
+    
+  end
+  
+end

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

@@ -0,0 +1,50 @@
+require 'test/unit/testcase'
+require 'mocha/integration/test_unit/assertion_counter'
+require 'mocha/expectation_error'
+
+module Mocha
+  
+  module Integration
+    
+    module TestUnit
+      
+      module RubyVersion186AndAbove
+        def run(result)
+          assertion_counter = AssertionCounter.new(result)
+          yield(Test::Unit::TestCase::STARTED, name)
+          @_result = result
+          begin
+            begin
+              setup
+              __send__(@method_name)
+              mocha_verify(assertion_counter)
+            rescue Mocha::ExpectationError => e
+              add_failure(e.message, e.backtrace)
+            rescue Test::Unit::AssertionFailedError => e
+              add_failure(e.message, e.backtrace)
+            rescue Exception
+              raise if Test::Unit::TestCase::PASSTHROUGH_EXCEPTIONS.include? $!.class
+              add_error($!)
+            ensure
+              begin
+                teardown
+              rescue Test::Unit::AssertionFailedError => e
+                add_failure(e.message, e.backtrace)
+              rescue Exception
+                raise if Test::Unit::TestCase::PASSTHROUGH_EXCEPTIONS.include? $!.class
+                add_error($!)
+              end
+            end
+          ensure
+            mocha_teardown
+          end
+          result.add_run
+          yield(Test::Unit::TestCase::FINISHED, name)
+        end
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/mocha/parameter_matchers/has_entry.rb

@@ -41,6 +41,7 @@ module Mocha
       
       def matches?(available_parameters)
         parameter = available_parameters.shift
+        return false unless parameter.respond_to?(:keys) && parameter.respond_to?(:[])
         matching_keys = parameter.keys.select { |key| @key.to_matcher.matches?([key]) }
         matching_keys.any? { |key| @value.to_matcher.matches?([parameter[key]]) }
       end

data/lib/mocha_standalone.rb

@@ -1,2 +1,2 @@
-require 'mocha/standalone'
-require 'mocha/object'
+require 'mocha/api'
+require 'mocha/object'

data/test/acceptance/{standalone_test.rb → api_test.rb}

@@ -7,7 +7,7 @@ end
 
 class NotATestUnitTestCase
   
-  include Mocha::Standalone
+  include Mocha::API
   
   attr_reader :assertion_counter
   
@@ -87,7 +87,7 @@ end
 
 require 'test/unit'
 
-class StandaloneTest < Test::Unit::TestCase
+class APITest < Test::Unit::TestCase
   
   attr_reader :sample_test
 

data/test/acceptance/bug_21465_test.rb

@@ -14,7 +14,7 @@ class Bug21465Test < Test::Unit::TestCase
   end
   
   def test_should_allow_expected_method_name_to_be_a_string
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects('wibble')
       mock.wibble
@@ -23,7 +23,7 @@ class Bug21465Test < Test::Unit::TestCase
   end
   
   def test_should_allow_stubbed_method_name_to_be_a_string
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.stubs('wibble')
       mock.wibble

data/test/acceptance/bug_21563_test.rb

@@ -14,7 +14,7 @@ class Bug21563Test < Test::Unit::TestCase
   end
   
   def test_should_allow_stubbing_of_verified_method
-    test_result = run_test do
+    test_result = run_as_test do
       object = Object.new
       object.stubs(:verified?).returns(false)
       assert !object.verified?

data/test/acceptance/expected_invocation_count_test.rb

@@ -14,7 +14,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
 
   def test_should_pass_if_method_is_never_expected_and_is_never_called
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).never
       0.times { mock.method }
@@ -23,7 +23,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
   
   def test_should_fail_fast_if_method_is_never_expected_but_is_called_once
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).never
       1.times { mock.method }
@@ -33,7 +33,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
   
   def test_should_pass_if_method_is_expected_twice_and_is_called_twice
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).twice
       2.times { mock.method }
@@ -42,7 +42,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
   
   def test_should_fail_if_method_is_expected_twice_but_is_called_once
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).twice
       1.times { mock.method }
@@ -52,7 +52,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
   
   def test_should_fail_fast_if_method_is_expected_twice_but_is_called_three_times
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).twice
       3.times { mock.method }
@@ -62,7 +62,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
   
   def test_should_pass_if_method_is_expected_between_two_and_four_times_and_is_called_twice
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).times(2..4)
       2.times { mock.method }
@@ -71,7 +71,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
 
   def test_should_pass_if_method_is_expected_between_two_and_four_times_and_is_called_three_times
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).times(2..4)
       3.times { mock.method }
@@ -80,7 +80,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
 
   def test_should_pass_if_method_is_expected_between_two_and_four_times_and_is_called_four_times
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).times(2..4)
       4.times { mock.method }
@@ -89,7 +89,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
 
   def test_should_fail_if_method_is_expected_between_two_and_four_times_and_is_called_once
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).times(2..4)
       1.times { mock.method }
@@ -99,7 +99,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
 
   def test_should_fail_fast_if_method_is_expected_between_two_and_four_times_and_is_called_five_times
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).times(2..4)
       5.times { mock.method }
@@ -109,7 +109,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
   
   def test_should_pass_if_method_is_expected_at_least_once_and_is_called_once
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).at_least_once
       1.times { mock.method }
@@ -118,7 +118,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
   
   def test_should_pass_if_method_is_expected_at_least_once_and_is_called_twice
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).at_least_once
       2.times { mock.method }
@@ -127,7 +127,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
   
   def test_should_fail_if_method_is_expected_at_least_once_but_is_never_called
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).at_least_once
       0.times { mock.method }
@@ -137,7 +137,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
   
   def test_should_pass_if_method_is_expected_at_most_once_and_is_never_called
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).at_most_once
       0.times { mock.method }
@@ -146,7 +146,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
   
   def test_should_pass_if_method_is_expected_at_most_once_and_called_once
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).at_most_once
       1.times { mock.method }
@@ -155,7 +155,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
   
   def test_should_fail_fast_if_method_is_expected_at_most_once_but_is_called_twice
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).at_most_once
       2.times { mock.method }
@@ -165,7 +165,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
   
   def test_should_pass_if_method_is_never_expected_and_is_never_called_even_if_everything_is_stubbed
-    test_result = run_test do
+    test_result = run_as_test do
       stub = stub_everything('stub')
       stub.expects(:method).never
       0.times { stub.method }
@@ -174,7 +174,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
   
   def test_should_fail_fast_if_method_is_never_expected_but_is_called_once_even_if_everything_is_stubbed
-    test_result = run_test do
+    test_result = run_as_test do
       stub = stub_everything('stub')
       stub.expects(:method).never
       1.times { stub.method }
@@ -184,7 +184,7 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
   end
   
   def test_should_fail_fast_if_there_is_no_matching_expectation
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.expects(:method).with(1)
       1.times { mock.method }

data/test/acceptance/failure_messages_test.rb

@@ -18,28 +18,28 @@ class FailureMessagesTest < Test::Unit::TestCase
   class Foo; end
   
   def test_should_display_class_name_when_expectation_was_on_class
-    test_result = run_test do
+    test_result = run_as_test do
       Foo.expects(:bar)
     end
     assert_match Regexp.new('FailureMessagesTest::Foo'), test_result.failures[0].message
   end
   
   def test_should_display_class_name_and_address_when_expectation_was_on_instance
-    test_result = run_test do
+    test_result = run_as_test do
       Foo.new.expects(:bar)
     end
     assert_match Regexp.new("#<FailureMessagesTest::Foo:#{OBJECT_ADDRESS_PATTERN}>"), test_result.failures[0].message
   end
   
   def test_should_display_class_name_and_any_instance_prefix_when_expectation_was_on_any_instance
-    test_result = run_test do
+    test_result = run_as_test do
       Foo.any_instance.expects(:bar)
     end
     assert_match Regexp.new('#<AnyInstance:FailureMessagesTest::Foo>'), test_result.failures[0].message
   end
   
   def test_should_display_mock_name_when_expectation_was_on_named_mock
-    test_result = run_test do
+    test_result = run_as_test do
       foo = mock('foo')
       foo.expects(:bar)
     end
@@ -47,7 +47,7 @@ class FailureMessagesTest < Test::Unit::TestCase
   end
   
   def test_should_display_mock_address_when_expectation_was_on_unnamed_mock
-    test_result = run_test do
+    test_result = run_as_test do
       foo = mock()
       foo.expects(:bar)
     end
@@ -55,7 +55,7 @@ class FailureMessagesTest < Test::Unit::TestCase
   end
   
   def test_should_display_string_when_expectation_was_on_string
-    test_result = run_test do
+    test_result = run_as_test do
       'Foo'.expects(:bar)
     end
     assert_match Regexp.new("'Foo'"), test_result.failures[0].message

data/test/acceptance/minitest_test.rb

@@ -1,7 +1,22 @@
 require File.join(File.dirname(__FILE__), "acceptance_test_helper")
-require 'mocha'
+
+begin
+  require 'rubygems'
+  gem 'minitest'
+rescue Gem::LoadError
+  # MiniTest gem not available
+end
+
+begin
+  require 'minitest/unit'
+rescue LoadError
+  # MiniTest not available
+end
 
 if defined?(MiniTest)
+  
+  # monkey-patch MiniTest now that it has hopefully been loaded
+  require 'mocha/integration/mini_test'
 
   class MiniTestSampleTest < MiniTest::Unit::TestCase
   
@@ -46,7 +61,7 @@ if defined?(MiniTest)
   
   end
 
-  class MiniTestAdapterTest < Test::Unit::TestCase
+  class MiniTestTest < Test::Unit::TestCase
   
     def setup
       @output = StringIO.new
@@ -59,14 +74,16 @@ if defined?(MiniTest)
     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
 
     def test_should_fail_mocha_test_due_to_unfulfilled_expectation
       runner.run(%w(-n test_mocha_with_unfulfilled_expectation))
-    
-      assert_equal 1, runner.errors
+      
+      assert_equal 1, runner.failures
+      assert_equal 0, runner.errors
       assert_equal 1, runner.assertion_count
       assert_not_all_expectation_were_satisfied
     end
@@ -74,7 +91,8 @@ if defined?(MiniTest)
     def test_should_fail_mocha_test_due_to_unexpected_invocation
       runner.run(%w(-n test_mocha_with_unexpected_invocation))
     
-      assert_equal 1, runner.errors
+      assert_equal 1, runner.failures
+      assert_equal 0, runner.errors
       assert_equal 0, runner.assertion_count
       assert_unexpected_invocation
     end
@@ -82,6 +100,7 @@ if defined?(MiniTest)
     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
@@ -89,22 +108,26 @@ if defined?(MiniTest)
     def test_should_fail_stubba_test_due_to_unfulfilled_expectation
       runner.run(%w(-n test_stubba_with_unfulfilled_expectation))
     
-      assert_equal 1, runner.errors
+      assert_equal 1, runner.failures
+      assert_equal 0, runner.errors
       assert_equal 1, runner.assertion_count
-      assert_match Regexp.new('not all expectations were satisfied'), output
+      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
   
     def test_should_fail_mocha_test_with_non_matching_parameter
       runner.run(%w(-n test_mocha_with_non_matching_parameter))
-    
-      assert_equal 1, runner.errors
+      
+      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