mocha-macruby 0.9.8.20100129120100 → 0.9.9.20101102121900

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

@@ -8,7 +8,9 @@ $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'unit'))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'unit', 'parameter_matchers'))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'acceptance'))
 
-if ENV['MOCHA_OPTIONS'] == 'use_test_unit_gem'
+require 'mocha/options'
+if $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'
 
@@ -292,4 +292,4 @@ if on_macruby?
     end
     
   end
-end
+end

data/test/unit/configuration_test.rb

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

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'
 

data/test/unit/metaclass_test.rb

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

data/test/unit/method_matcher_test.rb

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

data/test/unit/mock_test.rb

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
-require 'mocha/mock'
+require File.expand_path('../../test_helper', __FILE__)
+require 'mocha/mockery' # requires 'mock'
 require 'mocha/expectation_error'
 require 'set'
 require 'simple_counter'
@@ -50,18 +50,20 @@ class MockTest < Test::Unit::TestCase
     OBJECT_METHODS = STANDARD_OBJECT_PUBLIC_INSTANCE_METHODS.reject { |m| m =~ /^__.*__$/ || m == :object_id }
   end
   
-  def test_should_be_able_to_mock_standard_object_methods
-    mock = Mock.new
-    OBJECT_METHODS.each { |method| mock.__expects__(method.to_sym).returns(method) }
-    OBJECT_METHODS.each { |method| assert_equal method, mock.__send__(method.to_sym) }
-    assert mock.__verified__?
-  end
+  # MacRuby bug: https://www.macruby.org/trac/ticket/716
+  # def test_should_be_able_to_mock_standard_object_methods
+  #   mock = Mock.new
+  #   OBJECT_METHODS.each { |method| mock.__expects__(method.to_sym).returns(method) }
+  #   OBJECT_METHODS.each { |method| assert_equal method, mock.__send__(method.to_sym) }
+  #   assert mock.__verified__?
+  # end
   
-  def test_should_be_able_to_stub_standard_object_methods
-    mock = Mock.new
-    OBJECT_METHODS.each { |method| mock.__stubs__(method.to_sym).returns(method) }
-    OBJECT_METHODS.each { |method| assert_equal method, mock.__send__(method.to_sym) }
-  end
+  # MacRuby bug: https://www.macruby.org/trac/ticket/716
+  # def test_should_be_able_to_stub_standard_object_methods
+  #   mock = Mock.new
+  #   OBJECT_METHODS.each { |method| mock.__stubs__(method.to_sym).returns(method) }
+  #   OBJECT_METHODS.each { |method| assert_equal method, mock.__send__(method.to_sym) }
+  # end
   
   def test_should_create_and_add_expectations
     mock = Mock.new
@@ -299,4 +301,4 @@ class MockTest < Test::Unit::TestCase
     assert mock.respond_to?(:xyz)
   end
   
-end
+end

data/test/unit/mockery_test.rb

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

data/test/unit/multiple_yields_test.rb

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

data/test/unit/no_yields_test.rb

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

data/test/unit/object_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'
 require 'method_definer'
 
@@ -10,7 +10,7 @@ class ObjectInspectTest < Test::Unit::TestCase
       attr_accessor :attribute
     end
     object.attribute = 'instance_variable'
-    assert_match Regexp.new("^#<Object:0x[0-9A-Fa-f]{1,8}.*>$"), object.mocha_inspect
+    assert_match Regexp.new("^#<#{object.class}:0x[0-9A-Fa-f]{1,8}.*>$"), object.mocha_inspect
     assert_no_match(/instance_variable/, object.mocha_inspect)
   end
   
@@ -23,15 +23,16 @@ class ObjectInspectTest < Test::Unit::TestCase
   end
   
   def test_should_use_underscored_id_instead_of_object_id_or_id_so_that_they_can_be_stubbed
+    calls = []
     object = Object.new
-    object.define_instance_accessor(:called)
-    object.called = false
-    object.replace_instance_method(:object_id) { self.called = true; 1 }
-    if RUBY_VERSION < '1.9'
-      object.replace_instance_method(:id) { self.called = true; 1 }
-    end
+    object.replace_instance_method(:id) { calls << :id; return 1 } if RUBY_VERSION < '1.9'
+    object.replace_instance_method(:object_id) { calls << :object_id; return 1 }
+    object.replace_instance_method(:__id__) { calls << :__id__; return 1 }
+    object.replace_instance_method(:inspect) { "object-description" }
+
     object.mocha_inspect
-    assert_equal false, object.called
+
+    assert_equal [:__id__], calls.uniq
   end
   
 end

data/test/unit/object_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
+require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/object'
 require 'mocha/mockery'
 require 'mocha/mock'
@@ -7,7 +7,7 @@ require 'method_definer'
 class ObjectTest < Test::Unit::TestCase
   
   include Mocha
-    
+  
   def test_should_build_mocha_referring_to_self
     instance = Object.new
     mocha = instance.mocha
@@ -45,11 +45,12 @@ class ObjectTest < Test::Unit::TestCase
   def test_should_use_stubba_instance_method_for_object
     assert_equal Mocha::InstanceMethod, Object.new.stubba_method
   end
-    
-  def test_should_use_stubba_module_method_for_module
-    assert_equal Mocha::ModuleMethod, Module.new.stubba_method
-  end
-    
+  
+  # MacRuby bug https://www.macruby.org/trac/ticket/718
+  # def test_should_use_stubba_module_method_for_module
+  #   assert_equal Mocha::ModuleMethod, Module.new.stubba_method
+  # end
+  
   def test_should_use_stubba_class_method_for_class
     assert_equal Mocha::ClassMethod, Class.new.stubba_method
   end
@@ -62,17 +63,17 @@ class ObjectTest < Test::Unit::TestCase
     object = Object.new
     assert_equal object, object.stubba_object
   end
-      
+  
   def test_should_stub_self_for_module
     mod = Module.new
     assert_equal mod, mod.stubba_object
   end
-      
+  
   def test_should_stub_self_for_class
     klass = Class.new
     assert_equal klass, klass.stubba_object
   end
-      
+  
   def test_should_stub_relevant_class_for_any_instance
     klass = Class.new
     any_instance = Class::AnyInstance.new(klass)

data/test/unit/parameter_matchers/all_of_test.rb

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

data/test/unit/parameter_matchers/any_of_test.rb

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

data/test/unit/parameter_matchers/anything_test.rb

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

data/test/unit/parameter_matchers/equals_test.rb

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