mocha 0.9.11 → 0.9.12

data/RELEASE.rdoc

@@ -1,4 +1,10 @@
-= 0.9.11 ()
+= 0.9.12 ()
+* Make Mocha's tests pass under Ruby 1.9.2 i.e. using MiniTest. One of the main issues was that we were not parsing stacktraces on MiniTest errors comprehensively enough.
+* Avoid 'circular require considered harmful' warning when running Mocha's tests in Ruby 1.9.2
+* Make performance tests work on Ruby 1.9.2 i.e. using MiniTest.
+* Declare rake as a *development* dependency with newer versions of Rubygems since it's only needed to carry out developer-related tasks.
+
+= 0.9.11 (1613ed2267fef5927ea06adfdbcf512b89eadaad)
 * Added explicit support for minitest v1.5.0 to v2.0.2.
 * Make testable by rubygems-test.
 * Update links to my blog and make other links consistent.

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 require 'rake/testtask'
 
 module Mocha
-  VERSION = "0.9.11"
+  VERSION = "0.9.12"
 end
 
 desc "Run all tests"
@@ -58,16 +58,22 @@ end
 
 def benchmark_test_case(klass, iterations)
   require 'benchmark'
-  load 'test/unit/ui/console/testrunner.rb' unless defined?(Test::Unit::UI::Console::TestRunner)
-  unless $silent_option
-    begin
-      load 'test/unit/ui/console/outputlevel.rb' unless defined?(Test::Unit::UI::Console::OutputLevel::SILENT)
-      $silent_option = { :output_level => Test::Unit::UI::Console::OutputLevel::SILENT }
-    rescue LoadError
-      $silent_option = Test::Unit::UI::SILENT
+
+  if defined?(MiniTest)
+    MiniTest::Unit.output = StringIO.new
+    Benchmark.realtime { iterations.times { |i| MiniTest::Unit.new.run(klass) } }
+  else
+    load 'test/unit/ui/console/testrunner.rb' unless defined?(Test::Unit::UI::Console::TestRunner)
+    unless $silent_option
+      begin
+        load 'test/unit/ui/console/outputlevel.rb' unless defined?(Test::Unit::UI::Console::OutputLevel::SILENT)
+        $silent_option = { :output_level => Test::Unit::UI::Console::OutputLevel::SILENT }
+      rescue LoadError
+        $silent_option = Test::Unit::UI::SILENT
+      end
     end
+    Benchmark.realtime { iterations.times { Test::Unit::UI::Console::TestRunner.run(klass, $silent_option) } }
   end
-  time = Benchmark.realtime { iterations.times { Test::Unit::UI::Console::TestRunner.run(klass, $silent_option) } }
 end
 
 desc 'Generate RDoc'
@@ -152,7 +158,7 @@ def build_specification(version = Mocha::VERSION)
     s.summary = "Mocking and stubbing library"
     s.version = version
     s.platform = Gem::Platform::RUBY
-      s.author = 'James Mead'
+    s.author = 'James Mead'
     s.description = <<-EOF
       Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.
     EOF
@@ -164,7 +170,12 @@ def build_specification(version = Mocha::VERSION)
     s.extra_rdoc_files = ['README.rdoc', 'COPYING.rdoc']
     s.rdoc_options << '--title' << 'Mocha' << '--main' << 'README.rdoc' << '--line-numbers'
 
-    s.add_dependency('rake')
+    if Gem::RubyGemsVersion < '1.2.0'
+      s.add_dependency('rake')
+    else
+      s.add_development_dependency('rake')
+    end
+
     s.files = FileList['{lib,test,examples}/**/*.rb', '[A-Z]*', '.gemtest'].exclude('TODO').to_a
   end
 end

data/lib/mocha/mock.rb

@@ -6,7 +6,6 @@ require 'mocha/method_matcher'
 require 'mocha/parameters_matcher'
 require 'mocha/unexpected_invocation'
 require 'mocha/argument_iterator'
-require 'mocha/mockery'
 
 module Mocha # :nodoc:
   
@@ -160,6 +159,7 @@ module Mocha # :nodoc:
         if (matching_expectation = @expectations.match(symbol, *arguments)) || (!matching_expectation && !@everything_stubbed)
           matching_expectation.invoke(&block) if matching_expectation
           message = UnexpectedInvocation.new(self, symbol, *arguments).to_s
+          require 'mocha/mockery'
           message << Mockery.instance.mocha_inspect
           raise ExpectationError.new(message, caller)
         end

data/test/mini_test_result.rb

@@ -3,16 +3,21 @@ require 'test/unit/testcase'
 require 'minitest/unit'
 
 class MiniTestResult
+  
+  FAILURE_PATTERN = %r{(Failure)\:\n([^\(]+)\(([^\)]+)\) \[([^\]]+)\]\:\n(.*)\n}m
+  ERROR_PATTERN   = %r{(Error)\:\n([^\(]+)\(([^\)]+)\)\:\n(.+?)\n}m
+  
   def self.parse_failure(raw)
-    matches = %r{(Failure)\:\n([^\(]+)\(([^\)]+)\) \[([^\]]+)\]\:\n(.*)\n}m.match(raw)
+    matches = FAILURE_PATTERN.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)
+    matches = ERROR_PATTERN.match(raw)
     return nil unless matches
-    Error.new(matches[2], matches[3], matches[4], [matches[5]])
+    backtrace = raw.gsub(ERROR_PATTERN, '').split("\n").map(&:strip)
+    Error.new(matches[2], matches[3], matches[4], backtrace)
   end
   
   class Failure
@@ -68,6 +73,10 @@ class MiniTestResult
     failures.map(&:message)
   end
   
+  def failure_message_lines
+    failure_messages.map { |message| message.split("\n") }.flatten
+  end
+  
   def error_messages
     errors.map { |e| e.exception.message }
   end

data/test/test_runner.rb

@@ -8,8 +8,11 @@ else
 end
 
 module TestRunner
-  def run_test_case(test_class, test_result = nil)
-    test = test_class.suite
+  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)
     
     if defined?(Test::Unit::TestResult)
       test_result ||= Test::Unit::TestResult.new
@@ -35,13 +38,6 @@ module TestRunner
     test_result
   end
   
-  def run_as_test(test_result = nil, &block)
-    test_class = Class.new(Test::Unit::TestCase) do
-      define_method(:test_me, &block)
-    end
-    run_test_case(test_class)
-  end
-  
   def assert_passed(test_result)
     flunk "Test failed unexpectedly with message: #{test_result.failures}" if test_result.failure_count > 0
     flunk "Test failed unexpectedly with message: #{test_result.errors}" if test_result.error_count > 0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mocha
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 35
   prerelease: false
   segments: 
   - 0
   - 9
-  - 11
-  version: 0.9.11
+  - 12
+  version: 0.9.12
 platform: ruby
 authors: 
 - James Mead
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 +00:00
+date: 2011-02-13 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id001
 description: "      Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.\n"
 email: mocha-developer@googlegroups.com
@@ -132,7 +132,6 @@ files:
 - test/acceptance/exception_rescue_test.rb
 - test/acceptance/expected_invocation_count_test.rb
 - test/acceptance/failure_messages_test.rb
-- test/acceptance/github_issue_20_test.rb
 - test/acceptance/minitest_test.rb
 - test/acceptance/mocha_example_test.rb
 - test/acceptance/mocha_test_result_test.rb

data/test/acceptance/github_issue_20_test.rb

@@ -1,45 +0,0 @@
-require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
-
-class GithubIssue20Test < Test::Unit::TestCase
-
-  include AcceptanceTest
-
-  def setup
-    setup_acceptance_test
-  end
-
-  def teardown
-    teardown_acceptance_test
-  end
-
-  class MyClass
-    def my_instance_method
-      :original_value
-    end
-    # class << self
-    #   attr_accessor :my_instance
-    # end
-  end
-
-  def test_me
-    # MyClass.my_instance = MyClass.new
-    test_case = Class.new(Test::Unit::TestCase) do
-      def setup
-        @my_instance = MyClass.new
-      end
-      def test_1
-        @my_instance.stubs(:my_instance_method).returns(:first_value)
-        assert_equal :first_value, @my_instance.my_instance_method
-      end
-      def test_2
-        assert_equal :original_value, @my_instance.my_instance_method
-        MyClass.any_instance.stubs(:my_instance_method).returns(:second_value)
-        assert_equal :second_value, @my_instance.my_instance_method
-      end
-    end
-    test_result = run_test_case(test_case)
-    assert_passed(test_result)
-  end
-
-end