mocha 0.12.10 → 0.13.0

data/lib/mocha/integration/assertion_counter.rb

@@ -0,0 +1,13 @@
+module Mocha
+  module Integration
+    class AssertionCounter
+      def initialize(test_case)
+        @test_case = test_case
+      end
+
+      def increment
+        @test_case.assert(true)
+      end
+    end
+  end
+end

data/lib/mocha/integration/mini_test.rb

@@ -1,71 +1,53 @@
-require 'mocha/api'
-require 'mocha/options'
-
-if !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API)
-
-  require 'mocha/integration/mini_test/exception_translation'
-  require 'mocha/integration/mini_test/version_13'
-  require 'mocha/integration/mini_test/version_140'
-  require 'mocha/integration/mini_test/version_141'
-  require 'mocha/integration/mini_test/version_142_to_172'
-  require 'mocha/integration/mini_test/version_200'
-  require 'mocha/integration/mini_test/version_201_to_222'
-  require 'mocha/integration/mini_test/version_230_to_2101'
-  require 'mocha/integration/mini_test/version_2110_to_2111'
-  require 'mocha/integration/mini_test/version_2112_to_320'
-  require 'mocha/integration/mini_test/version_330_to_410'
-  require 'mocha/integration/mini_test/version_420_to_433'
-  require 'mocha/integration/mini_test/version_440'
-  require 'mocha/integration/mini_test/version_450_to_461'
-
-  module MiniTest
-    class Unit
-      class TestCase
-
-        include Mocha::API
-
-        alias_method :run_before_mocha, :run
-        remove_method :run
+require 'mocha/debug'
+
+require 'mocha/integration/mini_test/nothing'
+require 'mocha/integration/mini_test/version_13'
+require 'mocha/integration/mini_test/version_140'
+require 'mocha/integration/mini_test/version_141'
+require 'mocha/integration/mini_test/version_142_to_172'
+require 'mocha/integration/mini_test/version_200'
+require 'mocha/integration/mini_test/version_201_to_222'
+require 'mocha/integration/mini_test/version_230_to_2101'
+require 'mocha/integration/mini_test/version_2110_to_2111'
+require 'mocha/integration/mini_test/version_2112_to_320'
+require 'mocha/integration/mini_test/adapter'
+
+module Mocha
+  module Integration
+    module MiniTest
+      def self.activate
+        return false unless defined?(::MiniTest::Unit::TestCase)
 
         mini_test_version = begin
-          Gem::Version.new(MiniTest::Unit::VERSION)
+          Gem::Version.new(::MiniTest::Unit::VERSION)
         rescue LoadError
           Gem::Version.new('0.0.0')
         end
 
-        $stderr.puts "Detected MiniTest version: #{mini_test_version}" if $mocha_options['debug']
-
-        if Gem::Requirement.new('>= 1.3.0', '<= 1.3.1').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version13
-        elsif Gem::Requirement.new('1.4.0').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version140
-        elsif Gem::Requirement.new('1.4.1').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version141
-        elsif Gem::Requirement.new('>= 1.4.2', '<= 1.7.2').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version142To172
-        elsif Gem::Requirement.new('2.0.0').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version200
-        elsif Gem::Requirement.new('>= 2.0.1', '<= 2.2.2').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version201To222
-        elsif Gem::Requirement.new('>= 2.3.0', '<= 2.10.1').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version230To2101
-        elsif Gem::Requirement.new('>= 2.11.0', '<= 2.11.1').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version2110To2111
-        elsif Gem::Requirement.new('>= 2.11.2', '<= 3.2.0').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version2112To320
-        elsif Gem::Requirement.new('>= 3.3.0', '<= 4.1.0').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version330To410
-        elsif Gem::Requirement.new('>= 4.2.0', '<= 4.3.3').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version420To433
-        elsif Gem::Requirement.new('>= 4.4.0', '<= 4.4.0').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version440
-        elsif Gem::Requirement.new('>= 4.5.0', '<= 4.6.1').satisfied_by?(mini_test_version)
-          include Mocha::Integration::MiniTest::Version450To461
-        else
-          raise "No Mocha monkey-patch for MiniTest version"
+        Debug.puts "Detected MiniTest version: #{mini_test_version}"
+
+        integration_module = [
+          MiniTest::Adapter,
+          MiniTest::Version2112To320,
+          MiniTest::Version2110To2111,
+          MiniTest::Version230To2101,
+          MiniTest::Version201To222,
+          MiniTest::Version200,
+          MiniTest::Version142To172,
+          MiniTest::Version141,
+          MiniTest::Version140,
+          MiniTest::Version13,
+          MiniTest::Nothing
+        ].detect { |m| m.applicable_to?(mini_test_version) }
+
+        unless ::MiniTest::Unit::TestCase < integration_module
+          Debug.puts "Applying #{integration_module.description}"
+          ::MiniTest::Unit::TestCase.send(:include, integration_module)
         end
-
       end
+      true
     end
   end
 end
+
+

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

@@ -0,0 +1,54 @@
+require 'mocha/api'
+require 'mocha/integration/assertion_counter'
+require 'mocha/expectation_error_factory'
+
+module Mocha
+  module Integration
+    module MiniTest
+
+      # Integrates Mocha into recent versions of MiniTest.
+      #
+      # See the source code for an example of how to integrate Mocha into a test library.
+      module Adapter
+        include Mocha::API
+
+        # @private
+        def self.applicable_to?(mini_test_version)
+          Gem::Requirement.new('>= 3.3.0').satisfied_by?(mini_test_version)
+        end
+
+        # @private
+        def self.description
+          "adapter for MiniTest gem >= v3.3.0"
+        end
+
+        # @private
+        def self.included(mod)
+          Mocha::ExpectationErrorFactory.exception_class = ::MiniTest::Assertion
+        end
+
+        # @private
+        def before_setup
+          mocha_setup
+          super
+        end
+
+        # @private
+        def before_teardown
+          return unless passed?
+          assertion_counter = Integration::AssertionCounter.new(self)
+          mocha_verify(assertion_counter)
+        ensure
+          super
+        end
+
+        # @private
+        def after_teardown
+          super
+          mocha_teardown
+        end
+      end
+    end
+  end
+end
+

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

@@ -1,20 +1,14 @@
 require 'mocha/expectation_error'
 
 module Mocha
-
   module Integration
-
     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
-
     end
-
   end
-
 end

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

@@ -0,0 +1,19 @@
+module Mocha
+  module Integration
+    module MiniTest
+      module Nothing
+        def self.applicable_to?(test_unit_version, ruby_version = nil)
+          true
+        end
+
+        def self.description
+          "nothing (no MiniTest integration available)"
+        end
+
+        def self.included(mod)
+          raise "No MiniTest integration available"
+        end
+      end
+    end
+  end
+end

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

@@ -1,44 +1,51 @@
-require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/integration/assertion_counter'
+require 'mocha/integration/monkey_patcher'
+require 'mocha/integration/mini_test/exception_translation'
 
 module Mocha
-
   module Integration
-
     module MiniTest
-
       module Version13
+        def self.applicable_to?(mini_test_version)
+          Gem::Requirement.new('>= 1.3.0', '<= 1.3.1').satisfied_by?(mini_test_version)
+        end
+
+        def self.description
+          "monkey patch for MiniTest gem v1.3"
+        end
+
         def self.included(mod)
-          $stderr.puts "Monkey patching MiniTest v1.3" if $mocha_options['debug']
+          MonkeyPatcher.apply(mod, RunMethodPatch)
         end
-        def run runner
-          assertion_counter = AssertionCounter.new(self)
-          result = '.'
-          begin
+
+        module RunMethodPatch
+          def run runner
+            assertion_counter = AssertionCounter.new(self)
+            result = '.'
             begin
-              @passed = nil
-              self.setup
-              self.__send__ self.name
-              mocha_verify(assertion_counter)
-              @passed = true
-            rescue Exception => e
-              @passed = false
-              result = runner.puke(self.class, self.name, Mocha::Integration::MiniTest.translate(e))
-            ensure
               begin
-                self.teardown
+                @passed = nil
+                self.setup
+                self.__send__ self.name
+                mocha_verify(assertion_counter)
+                @passed = true
               rescue Exception => e
+                @passed = false
                 result = runner.puke(self.class, self.name, Mocha::Integration::MiniTest.translate(e))
+              ensure
+                begin
+                  self.teardown
+                rescue Exception => e
+                  result = runner.puke(self.class, self.name, Mocha::Integration::MiniTest.translate(e))
+                end
               end
+            ensure
+              mocha_teardown
             end
-          ensure
-            mocha_teardown
+            result
           end
-          result
         end
       end
-
     end
-
   end
-
 end

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

@@ -1,45 +1,51 @@
-require 'mocha/integration/mini_test/assertion_counter'
-require 'mocha/expectation_error'
+require 'mocha/integration/assertion_counter'
+require 'mocha/integration/monkey_patcher'
+require 'mocha/integration/mini_test/exception_translation'
 
 module Mocha
-
   module Integration
-
     module MiniTest
-
       module Version140
+        def self.applicable_to?(mini_test_version)
+          Gem::Requirement.new('1.4.0').satisfied_by?(mini_test_version)
+        end
+
+        def self.description
+          "monkey patch for MiniTest gem v1.4.0"
+        end
+
         def self.included(mod)
-          $stderr.puts "Monkey patching MiniTest v1.4.0" if $mocha_options['debug']
+          MonkeyPatcher.apply(mod, RunMethodPatch)
         end
-        def run runner
-          assertion_counter = AssertionCounter.new(self)
-          result = '.'
-          begin
+
+        module RunMethodPatch
+          def run runner
+            assertion_counter = AssertionCounter.new(self)
+            result = '.'
             begin
-              @passed = nil
-              self.setup
-              self.__send__ self.__name__
-              mocha_verify(assertion_counter)
-              @passed = true
-            rescue Exception => e
-              @passed = false
-              result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
-            ensure
               begin
-                self.teardown
+                @passed = nil
+                self.setup
+                self.__send__ self.__name__
+                mocha_verify(assertion_counter)
+                @passed = true
               rescue Exception => e
+                @passed = false
                 result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
+              ensure
+                begin
+                  self.teardown
+                rescue Exception => e
+                  result = runner.puke(self.class, self.__name__, Mocha::Integration::MiniTest.translate(e))
+                end
               end
+            ensure
+              mocha_teardown
             end
-          ensure
-            mocha_teardown
+            result
           end
-          result
         end
       end
-
     end
-
   end
-
 end

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

@@ -1,56 +1,62 @@
-require 'mocha/integration/mini_test/assertion_counter'
-require 'mocha/expectation_error'
+require 'mocha/integration/assertion_counter'
+require 'mocha/integration/monkey_patcher'
+require 'mocha/integration/mini_test/exception_translation'
 
 module Mocha
-
   module Integration
-
     module MiniTest
-
       module Version141
+        def self.applicable_to?(mini_test_version)
+          Gem::Requirement.new('1.4.1').satisfied_by?(mini_test_version)
+        end
+
+        def self.description
+          "monkey patch for MiniTest gem v1.4.1"
+        end
+
         def self.included(mod)
-          $stderr.puts "Monkey patching MiniTest v1.4.1"
+          MonkeyPatcher.apply(mod, RunMethodPatch)
         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
+        module RunMethodPatch
+          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
-              @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
+                @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
-              trap 'INFO', 'DEFAULT'
+            ensure
+              mocha_teardown
             end
-          ensure
-            mocha_teardown
+            result
           end
-          result
         end
       end
-
     end
-
   end
-
 end