mocha 0.14.0.alpha → 0.14.0

data/test/acceptance/stubbing_method_accepting_block_parameter_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
-class StubbingMethodAcceptingBlockParameterTest < Test::Unit::TestCase
+class StubbingMethodAcceptingBlockParameterTest < Mocha::TestCase
 
   include AcceptanceTest
 

data/test/acceptance/stubbing_method_unnecessarily_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
-class StubbingMethodUnnecessarilyTest < Test::Unit::TestCase
+class StubbingMethodUnnecessarilyTest < Mocha::TestCase
 
   include AcceptanceTest
 

data/test/acceptance/stubbing_nil_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
-class StubbingNilTest < Test::Unit::TestCase
+class StubbingNilTest < Mocha::TestCase
 
   include AcceptanceTest
 

data/test/acceptance/stubbing_non_existent_any_instance_method_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
-class StubbingNonExistentAnyInstanceMethodTest < Test::Unit::TestCase
+class StubbingNonExistentAnyInstanceMethodTest < Mocha::TestCase
 
   include AcceptanceTest
 

data/test/acceptance/stubbing_non_existent_class_method_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
-class StubbingNonExistentClassMethodTest < Test::Unit::TestCase
+class StubbingNonExistentClassMethodTest < Mocha::TestCase
 
   include AcceptanceTest
 

data/test/acceptance/stubbing_non_existent_instance_method_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
-class StubbingNonExistentInstanceMethodTest < Test::Unit::TestCase
+class StubbingNonExistentInstanceMethodTest < Mocha::TestCase
 
   include AcceptanceTest
 

data/test/acceptance/stubbing_non_public_any_instance_method_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
-class StubbingNonPublicAnyInstanceMethodTest < Test::Unit::TestCase
+class StubbingNonPublicAnyInstanceMethodTest < Mocha::TestCase
 
   include AcceptanceTest
 

data/test/acceptance/stubbing_non_public_class_method_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
-class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
+class StubbingNonPublicClassMethodTest < Mocha::TestCase
 
   include AcceptanceTest
 

data/test/acceptance/stubbing_non_public_instance_method_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
-class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
+class StubbingNonPublicInstanceMethodTest < Mocha::TestCase
 
   include AcceptanceTest
 

data/test/acceptance/stubbing_on_non_mock_object_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
-class StubbingOnNonMockObjectTest < Test::Unit::TestCase
+class StubbingOnNonMockObjectTest < Mocha::TestCase
 
   include AcceptanceTest
 

data/test/acceptance/stubbing_same_class_method_on_parent_and_child_classes_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
-class StubbingSameClassMethodOnParentAndChildClassTest < Test::Unit::TestCase
+class StubbingSameClassMethodOnParentAndChildClassTest < Mocha::TestCase
 
   include AcceptanceTest
 

data/test/acceptance/throw_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
-class ThrowTest < Test::Unit::TestCase
+class ThrowTest < Mocha::TestCase
 
   include AcceptanceTest
 

data/test/acceptance/unstubbing_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha/setup'
 
-class UnstubbingTest < Test::Unit::TestCase
+class UnstubbingTest < Mocha::TestCase
 
   include AcceptanceTest
 

data/test/integration/mini_test_test.rb

@@ -1,9 +1,22 @@
 require File.expand_path('../../test_helper', __FILE__)
 
-require "minitest/unit"
+begin
+  require "minitest"
+rescue LoadError
+end
+begin
+  require "minitest/unit"
+rescue LoadError
+end
+
 require "mocha/setup"
 require "integration/shared_tests"
 
-class MiniTestTest < Test::Unit::TestCase
-  include SharedTests
-end
+if defined?(::Minitest) || defined?(MiniTest)
+  testcase = defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase
+  class MiniTestTest < testcase
+    include SharedTests
+  end
+else
+  puts "MiniTest not available - no point in running tests."
+end

data/test/minitest_result.rb

@@ -0,0 +1,49 @@
+require 'forwardable'
+
+class MinitestResult
+
+  class Failure
+    extend Forwardable
+    def_delegators :@failure, :message, :backtrace
+
+    def initialize(failure)
+      @failure = failure
+    end
+
+    def location
+      Minitest.filter_backtrace(backtrace)
+    end
+  end
+
+  def initialize(tests)
+    @tests = tests
+  end
+
+  def failures
+    @tests.map(&:failures).flatten.select { |r| Minitest::Assertion === r }.map { |f| Failure.new(f) }
+  end
+
+  def failure_count
+    failures.length
+  end
+
+  def failure_message_lines
+    failures.map { |f| f.message.split("\n") }.flatten
+  end
+
+  def errors
+    @tests.map(&:failures).flatten.select { |r| Minitest::UnexpectedError === r }
+  end
+
+  def error_count
+    errors.length
+  end
+
+  def error_messages
+    errors.map { |e| e.message.split("\n") }.flatten
+  end
+
+  def assertion_count
+    @tests.inject(0) { |total, test| total + test.assertions }
+  end
+end

data/test/test_helper.rb

@@ -8,4 +8,39 @@ $:.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'))
 
-require 'test/unit'
+begin
+  require 'minitest'
+rescue LoadError
+end
+begin
+  require 'minitest/unit'
+rescue LoadError
+end
+
+if defined?(::Minitest) || defined?(MiniTest)
+  begin
+    require 'minitest/autorun'
+  rescue LoadError
+    MiniTest::Unit.autorun
+  end
+  class Mocha::TestCase < defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase
+    def assert_nothing_raised(exception = StandardError)
+      yield
+    rescue exception => e
+      flunk "Unexpected exception raised: #{e}"
+    end
+
+    alias_method :assert_not_nil, :refute_nil
+    alias_method :assert_raise, :assert_raises
+    alias_method :assert_not_same, :refute_same
+    alias_method :assert_no_match, :refute_match
+  end
+else
+  require 'test/unit'
+  class Mocha::TestCase < Test::Unit::TestCase
+    def test_dummy
+      # Some versions (?) of Test::Unit try to run this base class as a test case
+      # and it fails because it has no test methods, so I'm adding a dummy test.
+    end
+  end
+end

data/test/test_runner.rb

@@ -1,6 +1,6 @@
-require 'test/unit/testcase'
-
-if defined?(MiniTest)
+if defined?(::Minitest::VERSION) && (Gem::Version.new(::Minitest::VERSION) >= Gem::Version.new('5.0.0'))
+  require File.expand_path('../minitest_result', __FILE__)
+elsif defined?(::MiniTest::Unit::VERSION) && (Gem::Version.new(::MiniTest::Unit::VERSION) < Gem::Version.new('5.0.0'))
   require File.expand_path('../mini_test_result', __FILE__)
 else
   require File.expand_path('../test_unit_result', __FILE__)
@@ -12,15 +12,22 @@ module TestRunner
   end
 
   def run_as_tests(methods = {})
-    base_class = defined?(MiniTest) ? MiniTest::Unit::TestCase : Test::Unit::TestCase
+    base_class = Mocha::TestCase
     test_class = Class.new(base_class) do
       methods.each do |(method_name, proc)|
         define_method(method_name, proc)
       end
     end
+
     tests = methods.keys.select { |m| m.to_s[/^test/] }.map { |m| test_class.new(m) }
 
-    if defined?(MiniTest)
+    if defined?(::Minitest::VERSION) && (Gem::Version.new(::Minitest::VERSION) >= Gem::Version.new('5.0.0'))
+      tests.each do |test|
+        test.run
+      end
+      Minitest::Runnable.runnables.delete(test_class)
+      test_result = MinitestResult.new(tests)
+    elsif defined?(::MiniTest::Unit::VERSION) && (Gem::Version.new(::MiniTest::Unit::VERSION) < Gem::Version.new('5.0.0'))
       runner = MiniTest::Unit.new
       tests.each do |test|
         test.run(runner)
@@ -44,5 +51,4 @@ module TestRunner
   def assert_failed(test_result)
     flunk "Test passed unexpectedly" unless test_result.failure_count + test_result.error_count > 0
   end
-
 end

data/test/unit/any_instance_method_test.rb

@@ -3,7 +3,7 @@ require 'method_definer'
 require 'mocha/mock'
 require 'mocha/any_instance_method'
 
-class AnyInstanceMethodTest < Test::Unit::TestCase
+class AnyInstanceMethodTest < Mocha::TestCase
 
   include Mocha
 

data/test/unit/array_inspect_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/inspect'
 
-class ArrayInspectTest < Test::Unit::TestCase
+class ArrayInspectTest < Mocha::TestCase
 
   def test_should_use_inspect
     array = [1, 2]

data/test/unit/backtrace_filter_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/backtrace_filter'
 
-class BacktraceFilterTest < Test::Unit::TestCase
+class BacktraceFilterTest < Mocha::TestCase
 
   include Mocha
 

data/test/unit/cardinality_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/cardinality'
 
-class CardinalityTest < Test::Unit::TestCase
+class CardinalityTest < Mocha::TestCase
 
   include Mocha
 

data/test/unit/central_test.rb

@@ -4,7 +4,7 @@ require 'mocha/central'
 require 'mocha/mock'
 require 'method_definer'
 
-class CentralTest < Test::Unit::TestCase
+class CentralTest < Mocha::TestCase
 
   include Mocha
 

data/test/unit/change_state_side_effect_test.rb

@@ -2,7 +2,7 @@ require File.expand_path('../../test_helper', __FILE__)
 
 require 'mocha/change_state_side_effect'
 
-class ChangeStateSideEffectTest < Test::Unit::TestCase
+class ChangeStateSideEffectTest < Mocha::TestCase
 
   include Mocha
 

data/test/unit/class_method_test.rb

@@ -4,7 +4,7 @@ require 'mocha/mock'
 
 require 'mocha/class_method'
 
-class ClassMethodTest < Test::Unit::TestCase
+class ClassMethodTest < Mocha::TestCase
 
   include Mocha
 

data/test/unit/class_methods_test.rb

@@ -2,7 +2,7 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/class_methods'
 require 'mocha/object_methods'
 
-class ClassMethodsTest < Test::Unit::TestCase
+class ClassMethodsTest < Mocha::TestCase
 
   def setup
     @klass = Class.new.extend(Mocha::ClassMethods, Mocha::ObjectMethods)

data/test/unit/configuration_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 require "mocha/configuration"
 
-class ConfigurationTest < Test::Unit::TestCase
+class ConfigurationTest < Mocha::TestCase
   def test_allow_temporarily_changes_config_when_given_block
     Mocha::Configuration.warn_when(:stubbing_method_unnecessarily)
     yielded = false

data/test/unit/date_time_inspect_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/inspect'
 
-class DateTimeInspectTest < Test::Unit::TestCase
+class DateTimeInspectTest < Mocha::TestCase
 
   def test_should_use_include_date_in_seconds
     time = Time.now

data/test/unit/exception_raiser_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/exception_raiser'
 require 'timeout'
 
-class ExceptionRaiserTest < Test::Unit::TestCase
+class ExceptionRaiserTest < Mocha::TestCase
 
   include Mocha
 

data/test/unit/expectation_list_test.rb

@@ -4,7 +4,7 @@ require 'mocha/expectation'
 require 'set'
 require 'method_definer'
 
-class ExpectationListTest < Test::Unit::TestCase
+class ExpectationListTest < Mocha::TestCase
 
   include Mocha
 

data/test/unit/expectation_test.rb

@@ -5,7 +5,7 @@ require 'mocha/sequence'
 require 'execution_point'
 require 'simple_counter'
 
-class ExpectationTest < Test::Unit::TestCase
+class ExpectationTest < Mocha::TestCase
 
   include Mocha
 

data/test/unit/hash_inspect_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/inspect'
 
-class HashInspectTest < Test::Unit::TestCase
+class HashInspectTest < Mocha::TestCase
 
   def test_should_keep_spacing_between_key_value
     hash = {:a => true}

data/test/unit/hooks_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/hooks'
 
-class HooksTest < Test::Unit::TestCase
+class HooksTest < Mocha::TestCase
   class Mocha::Mockery
     class << self
       attr_writer :instance

data/test/unit/in_state_ordering_constraint_test.rb

@@ -2,7 +2,7 @@ require File.expand_path('../../test_helper', __FILE__)
 
 require 'mocha/in_state_ordering_constraint'
 
-class InStateOrderingConstraintTest < Test::Unit::TestCase
+class InStateOrderingConstraintTest < Mocha::TestCase
 
   include Mocha