jferris-mocha 0.9.7.20090911190113 → 0.9.8.20100526112143

data/test/acceptance/stubbing_non_public_class_method_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 StubbingNonPublicClassMethodTest < Test::Unit::TestCase
@@ -25,7 +25,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
       klass.stubs(:private_method)
     end
     assert_passed(test_result)
-    assert !@logger.warnings.include?("stubbing non-public method: #{klass}.private_method")
+    assert !@logger.warnings.include?("stubbing non-public method: #{klass.mocha_inspect}.private_method")
   end
   
   def test_should_allow_stubbing_protected_class_method
@@ -40,7 +40,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
       klass.stubs(:protected_method)
     end
     assert_passed(test_result)
-    assert !@logger.warnings.include?("stubbing non-public method: #{klass}.protected_method")
+    assert !@logger.warnings.include?("stubbing non-public method: #{klass.mocha_inspect}.protected_method")
   end
   
   def test_should_warn_when_stubbing_private_class_method
@@ -55,7 +55,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
       klass.stubs(:private_method)
     end
     assert_passed(test_result)
-    assert @logger.warnings.include?("stubbing non-public method: #{klass}.private_method")
+    assert @logger.warnings.include?("stubbing non-public method: #{klass.mocha_inspect}.private_method")
   end
   
   def test_should_warn_when_stubbing_protected_class_method
@@ -70,7 +70,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
       klass.stubs(:protected_method)
     end
     assert_passed(test_result)
-    assert @logger.warnings.include?("stubbing non-public method: #{klass}.protected_method")
+    assert @logger.warnings.include?("stubbing non-public method: #{klass.mocha_inspect}.protected_method")
   end
   
   def test_should_prevent_stubbing_private_class_method
@@ -85,7 +85,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
       klass.stubs(:private_method)
     end
     assert_failed(test_result)
-    assert test_result.error_messages.include?("Mocha::StubbingError: stubbing non-public method: #{klass}.private_method")
+    assert test_result.error_messages.include?("Mocha::StubbingError: stubbing non-public method: #{klass.mocha_inspect}.private_method")
   end
   
   def test_should_prevent_stubbing_protected_class_method
@@ -100,7 +100,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
       klass.stubs(:protected_method)
     end
     assert_failed(test_result)
-    assert test_result.error_messages.include?("Mocha::StubbingError: stubbing non-public method: #{klass}.protected_method")
+    assert test_result.error_messages.include?("Mocha::StubbingError: stubbing non-public method: #{klass.mocha_inspect}.protected_method")
   end
   
   def test_should_default_to_allow_stubbing_private_class_method
@@ -114,7 +114,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
       klass.stubs(:private_method)
     end
     assert_passed(test_result)
-    assert !@logger.warnings.include?("stubbing non-public method: #{klass}.private_method")
+    assert !@logger.warnings.include?("stubbing non-public method: #{klass.mocha_inspect}.private_method")
   end
   
   def test_should_default_to_allow_stubbing_protected_class_method
@@ -128,7 +128,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
       klass.stubs(:protected_method)
     end
     assert_passed(test_result)
-    assert !@logger.warnings.include?("stubbing non-public method: #{klass}.protected_method")
+    assert !@logger.warnings.include?("stubbing non-public method: #{klass.mocha_inspect}.protected_method")
   end
   
   def test_should_allow_stubbing_public_class_method

data/test/acceptance/stubbing_non_public_instance_method_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 StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
@@ -23,7 +23,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       instance.stubs(:private_method)
     end
     assert_passed(test_result)
-    assert !@logger.warnings.include?("stubbing non-public method: #{instance}.private_method")
+    assert !@logger.warnings.include?("stubbing non-public method: #{instance.mocha_inspect}.private_method")
   end
   
   def test_should_allow_stubbing_protected_instance_method
@@ -36,7 +36,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       instance.stubs(:protected_method)
     end
     assert_passed(test_result)
-    assert !@logger.warnings.include?("stubbing non-public method: #{instance}.protected_method")
+    assert !@logger.warnings.include?("stubbing non-public method: #{instance.mocha_inspect}.protected_method")
   end
   
   def test_should_warn_when_stubbing_private_instance_method
@@ -49,7 +49,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       instance.stubs(:private_method)
     end
     assert_passed(test_result)
-    assert @logger.warnings.include?("stubbing non-public method: #{instance}.private_method")
+    assert @logger.warnings.include?("stubbing non-public method: #{instance.mocha_inspect}.private_method")
   end
   
   def test_should_warn_when_stubbing_protected_instance_method
@@ -62,7 +62,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       instance.stubs(:protected_method)
     end
     assert_passed(test_result)
-    assert @logger.warnings.include?("stubbing non-public method: #{instance}.protected_method")
+    assert @logger.warnings.include?("stubbing non-public method: #{instance.mocha_inspect}.protected_method")
   end
   
   def test_should_prevent_stubbing_private_instance_method
@@ -75,7 +75,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       instance.stubs(:private_method)
     end
     assert_failed(test_result)
-    assert test_result.error_messages.include?("Mocha::StubbingError: stubbing non-public method: #{instance}.private_method")
+    assert test_result.error_messages.include?("Mocha::StubbingError: stubbing non-public method: #{instance.mocha_inspect}.private_method")
   end
   
   def test_should_prevent_stubbing_protected_instance_method
@@ -88,7 +88,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       instance.stubs(:protected_method)
     end
     assert_failed(test_result)
-    assert test_result.error_messages.include?("Mocha::StubbingError: stubbing non-public method: #{instance}.protected_method")
+    assert test_result.error_messages.include?("Mocha::StubbingError: stubbing non-public method: #{instance.mocha_inspect}.protected_method")
   end
   
   def test_should_default_to_allow_stubbing_private_instance_method
@@ -100,7 +100,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       instance.stubs(:private_method)
     end
     assert_passed(test_result)
-    assert !@logger.warnings.include?("stubbing non-public method: #{instance}.private_method")
+    assert !@logger.warnings.include?("stubbing non-public method: #{instance.mocha_inspect}.private_method")
   end
   
   def test_should_default_to_allow_stubbing_protected_instance_method
@@ -112,7 +112,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       instance.stubs(:protected_method)
     end
     assert_passed(test_result)
-    assert !@logger.warnings.include?("stubbing non-public method: #{instance}.protected_method")
+    assert !@logger.warnings.include?("stubbing non-public method: #{instance.mocha_inspect}.protected_method")
   end
   
   def test_should_allow_stubbing_public_instance_method

data/test/acceptance/stubbing_on_non_mock_object_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 StubbingOnNonMockObjectTest < Test::Unit::TestCase
@@ -20,7 +20,7 @@ class StubbingOnNonMockObjectTest < Test::Unit::TestCase
       non_mock_object.stubs(:existing_method)
     end
     assert_passed(test_result)
-    assert !@logger.warnings.include?("stubbing method on non-mock object: #{non_mock_object}.existing_method")
+    assert !@logger.warnings.include?("stubbing method on non-mock object: #{non_mock_object.mocha_inspect}.existing_method")
   end
   
   def test_should_warn_on_stubbing_method_on_non_mock_object
@@ -30,7 +30,7 @@ class StubbingOnNonMockObjectTest < Test::Unit::TestCase
       non_mock_object.stubs(:existing_method)
     end
     assert_passed(test_result)
-    assert @logger.warnings.include?("stubbing method on non-mock object: #{non_mock_object}.existing_method")
+    assert @logger.warnings.include?("stubbing method on non-mock object: #{non_mock_object.mocha_inspect}.existing_method")
   end
   
   def test_should_prevent_stubbing_method_on_non_mock_object
@@ -40,7 +40,7 @@ class StubbingOnNonMockObjectTest < Test::Unit::TestCase
       non_mock_object.stubs(:existing_method)
     end
     assert_failed(test_result)
-    assert test_result.error_messages.include?("Mocha::StubbingError: stubbing method on non-mock object: #{non_mock_object}.existing_method")
+    assert test_result.error_messages.include?("Mocha::StubbingError: stubbing method on non-mock object: #{non_mock_object.mocha_inspect}.existing_method")
   end
   
   def test_should_default_to_allow_stubbing_method_on_non_mock_object
@@ -49,7 +49,7 @@ class StubbingOnNonMockObjectTest < Test::Unit::TestCase
       non_mock_object.stubs(:existing_method)
     end
     assert_passed(test_result)
-    assert !@logger.warnings.include?("stubbing method on non-mock object: #{non_mock_object}.existing_method")
+    assert !@logger.warnings.include?("stubbing method on non-mock object: #{non_mock_object.mocha_inspect}.existing_method")
   end
   
   def test_should_allow_stubbing_method_on_mock_object

data/test/mini_test_result.rb

@@ -0,0 +1,74 @@
+require 'stringio'
+require 'test/unit/testcase'
+require 'minitest/unit'
+
+class MiniTestResult
+  def self.parse_failure(raw)
+    matches = %r{(Failure)\:\n([^\(]+)\(([^\)]+)\) \[([^\]]+)\]\:\n(.*)\n}m.match(raw)
+    return nil unless matches
+    Failure.new(matches[2], matches[3], [matches[4]], matches[5])
+  end
+  
+  def self.parse_error(raw)
+    matches = %r{(Error)\:\n([^\(]+)\(([^\)]+)\)\:\n(.+?)\n.+    (.*)\n}m.match(raw)
+    return nil unless matches
+    Error.new(matches[2], matches[3], matches[4], [matches[5]])
+  end
+  
+  class Failure
+    attr_reader :method, :test_case, :location, :message
+    def initialize(method, test_case, location, message)
+      @method, @test_case, @location, @message = method, test_case, location, message
+    end
+  end
+  
+  class Error
+    class Exception
+      attr_reader :message, :backtrace
+      def initialize(message, location)
+        @message, @backtrace = message, location
+      end
+    end
+    
+    attr_reader :method, :test_case, :exception
+    def initialize(method, test_case, message, backtrace)
+      @method, @test_case, @exception = method, test_case, Exception.new(message, backtrace)
+    end
+  end
+  
+  def initialize(runner, test)
+    @runner, @test = runner, test
+  end
+  
+  def failure_count
+    @runner.failures
+  end
+  
+  def assertion_count
+    @test._assertions
+  end
+  
+  def error_count
+    @runner.errors
+  end
+  
+  def passed?
+    @test.passed?
+  end
+  
+  def failures
+    @runner.report.map { |puked| MiniTestResult.parse_failure(puked) }.compact
+  end
+  
+  def errors
+    @runner.report.map { |puked| MiniTestResult.parse_error(puked) }.compact
+  end
+  
+  def failure_messages
+    failures.map(&:message)
+  end
+  
+  def error_messages
+    errors.map { |e| e.exception.message }
+  end
+end

data/test/test_helper.rb

@@ -9,6 +9,7 @@ $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'unit', 'parameter
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'acceptance'))
 
 if ENV['MOCHA_OPTIONS'] == 'use_test_unit_gem'
+  require 'rubygems'
   gem 'test-unit'
 end
 

data/test/test_runner.rb

@@ -1,23 +1,37 @@
-require 'test/unit/testresult'
 require 'test/unit/testcase'
 
+if defined?(MiniTest)
+  require 'mocha/integration/mini_test'
+  require File.expand_path('../mini_test_result', __FILE__)
+else
+  require 'test/unit/testresult'
+end
+
 module TestRunner
-  
-  def run_as_test(test_result = Test::Unit::TestResult.new, &block)
+  def run_as_test(test_result = nil, &block)
     test_class = Class.new(Test::Unit::TestCase) do
       define_method(:test_me, &block)
     end
     test = test_class.new(:test_me)
-    test.run(test_result) {}
-    class << test_result
-      attr_reader :failures, :errors
-      def failure_messages
-        failures.map { |failure| failure.message }
-      end
-      def error_messages
-        errors.map { |error| error.message }
+    
+    if defined?(Test::Unit::TestResult)
+      test_result ||= Test::Unit::TestResult.new
+      test.run(test_result) {}
+      class << test_result
+        attr_reader :failures, :errors
+        def failure_messages
+          failures.map { |failure| failure.message }
+        end
+        def error_messages
+          errors.map { |error| error.message }
+        end
       end
+    else
+      runner = MiniTest::Unit.new
+      test.run(runner)
+      test_result = MiniTestResult.new(runner, test)
     end
+    
     test_result
   end
   

data/test/unit/any_instance_method_test.rb

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

data/test/unit/array_inspect_test.rb

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

data/test/unit/backtrace_filter_test.rb

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

data/test/unit/cardinality_test.rb

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

data/test/unit/central_test.rb

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

data/test/unit/change_state_side_effect_test.rb

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

data/test/unit/class_method_test.rb

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

data/test/unit/configuration_test.rb

@@ -0,0 +1,38 @@
+require File.expand_path('../../test_helper', __FILE__)
+require "mocha/configuration"
+
+class ConfigurationTest < Test::Unit::TestCase
+  def test_allow_temporarily_changes_config_when_given_block
+    Mocha::Configuration.warn_when(:stubbing_method_unnecessarily)
+    yielded = false
+    Mocha::Configuration.allow(:stubbing_method_unnecessarily) do
+      yielded = true
+      assert Mocha::Configuration.allow?(:stubbing_method_unnecessarily)
+    end
+    assert yielded
+    assert Mocha::Configuration.warn_when?(:stubbing_method_unnecessarily)
+  end
+
+  def test_prevent_temporarily_changes_config_when_given_block
+    Mocha::Configuration.allow(:stubbing_method_unnecessarily)
+    yielded = false
+    Mocha::Configuration.prevent(:stubbing_method_unnecessarily) do
+      yielded = true
+      assert Mocha::Configuration.prevent?(:stubbing_method_unnecessarily)
+    end
+    assert yielded
+    assert Mocha::Configuration.allow?(:stubbing_method_unnecessarily)
+  end
+
+  def test_warn_when_temporarily_changes_config_when_given_block
+    Mocha::Configuration.allow(:stubbing_method_unnecessarily)
+    yielded = false
+    Mocha::Configuration.warn_when(:stubbing_method_unnecessarily) do
+      yielded = true
+      assert Mocha::Configuration.warn_when?(:stubbing_method_unnecessarily)
+    end
+    assert yielded
+    assert Mocha::Configuration.allow?(:stubbing_method_unnecessarily)
+  end
+end
+

data/test/unit/date_time_inspect_test.rb

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

data/test/unit/exception_raiser_test.rb

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

data/test/unit/expectation_list_test.rb

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

data/test/unit/expectation_test.rb

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

data/test/unit/hash_inspect_test.rb

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

data/test/unit/in_state_ordering_constraint_test.rb

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