mocha 0.9.10 → 0.9.11

data/README.rdoc

@@ -6,7 +6,7 @@ It can be used with many testing frameworks e.g. {Test::Unit}[http://www.ruby-do
 
 Mocha provides a unified, simple and readable syntax for both traditional mocking and partial mocking.
 
-Mocha was harvested from projects at {Reevoo}[http://www.reevoo.com] by me ({James}[http://blog.floehopper.org]) and my (then) colleagues {Ben}[http://www.techbelly.com/], {Chris}[http://chrisroos.co.uk] and {Paul}[http://po-ru.com].
+Mocha was harvested from projects at {Reevoo}[http://www.reevoo.com/] by me ({James}[http://jamesmead.org/]) and my (then) colleagues {Ben}[http://www.techbelly.com/], {Chris}[http://chrisroos.co.uk/] and {Paul}[http://po-ru.com/].
 
 == Download and Installation
 
@@ -14,7 +14,7 @@ Install the gem with the following command...
 
   $ gem install mocha
 
-Or install the {Rails}[http://www.rubyonrails.org] plugin...
+Or install the {Rails}[http://www.rubyonrails.org/] plugin...
 
   $ script/plugin install git://github.com/floehopper/mocha.git
 
@@ -29,7 +29,7 @@ Or download Mocha...
 * Quick Start - {Usage Examples}[http://mocha.rubyforge.org/examples/misc.html]
 * Traditional mocking - {Star Trek Example}[http://mocha.rubyforge.org/examples/mocha.html]
 * Setting expectations on real classes - {Order Example}[http://mocha.rubyforge.org/examples/stubba.html]
-* More examples on {Floehopper's Blog}[http://blog.floehopper.org]
+* More examples on {James Mead's Blog}[http://jamesmead.org/blog/]
 * {Mailing List Archives}[http://groups.google.com/group/mocha-developer]
 
 == License

data/RELEASE.rdoc

@@ -1,4 +1,12 @@
-= 0.9.10 ()
+= 0.9.11 ()
+* 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.
+* Added a URI parameter matcher that ignores the order of query parameters so that tests can be independent of undefined hash ordering (patch by Paul Battley).
+* Include unexpected invocation in failure message and change the language slightly to make the failure message less confusing. See http://floehopper.lighthouseapp.com/projects/22289/tickets/52.
+* No need to create regular expression every time the BacktraceFilter#filtered method is called. See http://floehopper.lighthouseapp.com/projects/22289-mocha/tickets/66.
+
+= 0.9.10 (31182ea8b38b79aa50702aa839f6a29ebcf7d684)
 * Added Mocha::ObjectMethods#unstub method - https://github.com/floehopper/mocha/issues#issue/6
 * Inherit Mocha::ExpectationError from Exception instead of StandardError to reduce the chances of a test passing by accident - thanks to James Sanders (jsanders) - https://github.com/floehopper/mocha/issues#issue/15
 * Fixed bug - GitHub README page to link correctly to code examples - https://github.com/floehopper/mocha/issues/closed#issue/11

data/Rakefile

@@ -3,14 +3,17 @@ require 'rake/gempackagetask'
 require 'rake/testtask'
 
 module Mocha
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
 end
 
 desc "Run all tests"
-task 'default' => ['test:units', 'test:acceptance', 'test:performance']
+task 'default' => ['test', 'test:performance']
+
+desc "Run unit & acceptance tests"
+task 'test' => ['test:units', 'test:acceptance']
 
 namespace 'test' do
-  
+
   unit_tests = FileList['test/unit/**/*_test.rb']
   acceptance_tests = FileList['test/acceptance/*_test.rb']
 
@@ -162,7 +165,7 @@ def build_specification(version = Mocha::VERSION)
     s.rdoc_options << '--title' << 'Mocha' << '--main' << 'README.rdoc' << '--line-numbers'
 
     s.add_dependency('rake')
-    s.files = FileList['{lib,test,examples}/**/*.rb', '[A-Z]*'].exclude('TODO').to_a
+    s.files = FileList['{lib,test,examples}/**/*.rb', '[A-Z]*', '.gemtest'].exclude('TODO').to_a
   end
 end
 

data/lib/mocha/backtrace_filter.rb

@@ -5,11 +5,11 @@ module Mocha
     LIB_DIRECTORY = File.expand_path(File.join(File.dirname(__FILE__), "..")) + File::SEPARATOR
 
     def initialize(lib_directory = LIB_DIRECTORY)
-      @lib_directory = lib_directory
+      @path_pattern = Regexp.new(lib_directory)
     end
 
     def filtered(backtrace)
-      backtrace.reject { |location| Regexp.new(@lib_directory).match(File.expand_path(location)) }
+      backtrace.reject { |location| @path_pattern.match(File.expand_path(location)) }
     end
 
   end

data/lib/mocha/expectation.rb

@@ -458,9 +458,9 @@ module Mocha # :nodoc:
       message = "#{@cardinality.mocha_inspect}, "
       message << case @invocation_count
         when 0 then "not yet invoked"
-        when 1 then "already invoked once"
-        when 2 then "already invoked twice"
-        else "already invoked #{@invocation_count} times"
+        when 1 then "invoked once"
+        when 2 then "invoked twice"
+        else "invoked #{@invocation_count} times"
       end
       message << ": "
       message << method_signature

data/lib/mocha/integration/mini_test.rb

@@ -6,7 +6,9 @@ if !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API)
   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_and_above'
+  require 'mocha/integration/mini_test/version_142_to_172'
+  require 'mocha/integration/mini_test/version_200'
+  require 'mocha/integration/mini_test/version_201_to_202'
   
   module MiniTest
     class Unit
@@ -31,11 +33,15 @@ if !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API)
           include Mocha::Integration::MiniTest::Version140
         elsif (mini_test_version == '1.4.1')
           include Mocha::Integration::MiniTest::Version141
-        elsif (mini_test_version >= '1.4.2') && (mini_test_version <= '1.6.0')
-          include Mocha::Integration::MiniTest::Version142AndAbove
-        elsif (mini_test_version > '1.6.0')
+        elsif (mini_test_version >= '1.4.2') && (mini_test_version <= '1.7.2')
+          include Mocha::Integration::MiniTest::Version142To172
+        elsif (mini_test_version == '2.0.0')
+          include Mocha::Integration::MiniTest::Version200
+        elsif (mini_test_version >= '2.0.1') && (mini_test_version <= '2.0.2')
+          include Mocha::Integration::MiniTest::Version201To202
+        elsif (mini_test_version > '2.0.2')
           $stderr.puts "*** MiniTest integration has not been verified but patching anyway ***" if $options['debug']
-          include Mocha::Integration::MiniTest::Version142AndAbove
+          include Mocha::Integration::MiniTest::Version201To202
         else
           $stderr.puts "*** No Mocha integration for MiniTest version ***" if $options['debug']
         end

data/lib/mocha/integration/mini_test/{version_142_and_above.rb → version_142_to_172.rb}

@@ -7,9 +7,9 @@ module Mocha
     
     module MiniTest
       
-      module Version142AndAbove
+      module Version142To172
         def self.included(mod)
-          $stderr.puts "Monkey patching MiniTest >= v1.4.2" if $options['debug']
+          $stderr.puts "Monkey patching MiniTest >= v1.4.2 and <= v1.7.2" if $options['debug']
         end
         def run runner
           trap 'INFO' do

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

@@ -0,0 +1,57 @@
+require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/expectation_error'
+
+module Mocha
+  
+  module Integration
+    
+    module MiniTest
+      
+      module Version200
+        def self.included(mod)
+          $stderr.puts "Monkey patching MiniTest v2.0.0" if $options['debug']
+        end
+        def run runner
+          trap 'INFO' do
+            time = Time.now - runner.start_time
+            warn "%s#%s %.2fs" % [self.class, self.__name__, time]
+            runner.status $stderr
+          end if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
+          
+          assertion_counter = AssertionCounter.new(self)
+          result = ""
+          begin
+            begin
+              @passed = nil
+              self.setup
+              self.__send__ self.__name__
+              mocha_verify(assertion_counter)
+              result = "." unless io?
+              @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' if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
+            end
+          ensure
+            mocha_teardown
+          end
+          result
+        end
+      end
+      
+    end
+    
+  end
+  
+end

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

@@ -0,0 +1,57 @@
+require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/expectation_error'
+
+module Mocha
+  
+  module Integration
+    
+    module MiniTest
+      
+      module Version201To202
+        def self.included(mod)
+          $stderr.puts "Monkey patching MiniTest >= v2.0.1 <= v2.0.2" if $options['debug']
+        end
+        def run runner
+          trap 'INFO' do
+            time = runner.start_time ? Time.now - runner.start_time : 0
+            warn "%s#%s %.2fs" % [self.class, self.__name__, time]
+            runner.status $stderr
+          end if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
+          
+          assertion_counter = AssertionCounter.new(self)
+          result = ""
+          begin
+            begin
+              @passed = nil
+              self.setup
+              self.__send__ self.__name__
+              mocha_verify(assertion_counter)
+              result = "." unless io?
+              @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' if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
+            end
+          ensure
+            mocha_teardown
+          end
+          result
+        end
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/mocha/mock.rb

@@ -158,6 +158,7 @@ module Mocha # :nodoc:
         matching_expectation_allowing_invocation.invoke(&block)
       else
         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
           message << Mockery.instance.mocha_inspect
           raise ExpectationError.new(message, caller)

data/lib/mocha/parameter_matchers.rb

@@ -25,3 +25,4 @@ require 'mocha/parameter_matchers/optionally'
 require 'mocha/parameter_matchers/regexp_matches'
 require 'mocha/parameter_matchers/responds_with'
 require 'mocha/parameter_matchers/yaml_equivalent'
+require 'mocha/parameter_matchers/query_string'

data/lib/mocha/parameter_matchers/query_string.rb

@@ -0,0 +1,47 @@
+require 'mocha/parameter_matchers/base'
+require 'uri'
+
+module Mocha
+  module ParameterMatchers
+
+    # :call-seq: has_equivalent_query_string(uri) -> parameter_matcher
+    #
+    # Matches a URI without regard to the ordering of parameters in the query string
+    #   object = mock()
+    #   object.expects(:method_1).with(has_equivalent_query_string('http://example.com/foo?a=1&b=2))
+    #   object.method_1('http://example.com/foo?b=2&a=1')
+    #   # no error raised
+    #
+    #   object = mock()
+    #   object.expects(:method_1).with(has_equivalent_query_string('http://example.com/foo?a=1&b=2))
+    #   object.method_1('http://example.com/foo?a=1&b=3')
+    #   # error raised, because the query parameters were different
+    def has_equivalent_query_string(uri)
+      QueryStringMatches.new(uri)
+    end
+
+    class QueryStringMatches < Base # :nodoc:
+
+      def initialize(uri)
+        @uri = URI.parse(uri)
+      end
+
+      def matches?(available_parameters)
+        actual = explode(URI.parse(available_parameters.shift))
+        expected = explode(@uri)
+        actual == expected
+      end
+
+      def mocha_inspect
+        "has_equivalent_query_string(#{@uri.mocha_inspect})"
+      end
+
+    private
+      def explode(uri)
+        query_hash = (uri.query || '').split('&').inject({}){ |h, kv| h.merge(Hash[*kv.split('=')]) }
+        URI::Generic::COMPONENT.inject({}){ |h, k| h.merge(k => uri.__send__(k)) }.merge(:query => query_hash)
+      end
+
+    end
+  end
+end

data/test/acceptance/exception_rescue_test.rb

@@ -23,8 +23,7 @@ class ExceptionRescueTest < Test::Unit::TestCase
       end
     end
     assert_failed(test_result)
-    failure_message_lines = test_result.failure_messages.first.split("\n")
-    assert_equal "unexpected invocation: #<Mock:mock>.some_method()", failure_message_lines.first
+    assert_equal "unexpected invocation: #<Mock:mock>.some_method()", test_result.failure_message_lines[0]
   end
 
   def test_invocation_never_expected_exception_is_not_caught_by_standard_rescue
@@ -38,8 +37,7 @@ class ExceptionRescueTest < Test::Unit::TestCase
       end
     end
     assert_failed(test_result)
-    failure_message_lines = test_result.failure_messages.first.split("\n")
-    assert_equal "unexpected invocation: #<Mock:mock>.some_method()", failure_message_lines.first
+    assert_equal "unexpected invocation: #<Mock:mock>.some_method()", test_result.failure_message_lines[0]
   end
 
   def test_unsatisfied_expectation_exception_is_not_caught_by_standard_rescue
@@ -48,11 +46,10 @@ class ExceptionRescueTest < Test::Unit::TestCase
       mock.expects(:some_method)
     end
     assert_failed(test_result)
-    failure_message_lines = test_result.failure_messages.first.split("\n")
     assert_equal [
       "not all expectations were satisfied",
       "unsatisfied expectations:",
       "- expected exactly once, not yet invoked: #<Mock:mock>.some_method(any_parameters)"
-    ], failure_message_lines
+    ], test_result.failure_message_lines
   end
 end

data/test/acceptance/expected_invocation_count_test.rb

@@ -29,7 +29,11 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
       1.times { mock.method }
     end
     assert_failed(test_result)
-    assert_equal ["unexpected invocation: #<Mock:mock>.method()\nsatisfied expectations:\n- expected never, not yet invoked: #<Mock:mock>.method(any_parameters)\n"], test_result.failure_messages
+    assert_equal [
+      "unexpected invocation: #<Mock:mock>.method()",
+      "unsatisfied expectations:",
+      "- expected never, invoked once: #<Mock:mock>.method(any_parameters)"
+    ], test_result.failure_message_lines
   end
   
   def test_should_pass_if_method_is_expected_twice_and_is_called_twice
@@ -48,7 +52,11 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
       1.times { mock.method }
     end
     assert_failed(test_result)
-    assert_equal ["not all expectations were satisfied\nunsatisfied expectations:\n- expected exactly twice, already invoked once: #<Mock:mock>.method(any_parameters)\n"], test_result.failure_messages
+    assert_equal [
+      "not all expectations were satisfied",
+      "unsatisfied expectations:",
+      "- expected exactly twice, invoked once: #<Mock:mock>.method(any_parameters)"
+    ], test_result.failure_message_lines
   end
   
   def test_should_fail_fast_if_method_is_expected_twice_but_is_called_three_times
@@ -58,7 +66,11 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
       3.times { mock.method }
     end
     assert_failed(test_result)
-    assert_equal ["unexpected invocation: #<Mock:mock>.method()\nsatisfied expectations:\n- expected exactly twice, already invoked twice: #<Mock:mock>.method(any_parameters)\n"], test_result.failure_messages
+    assert_equal [
+      "unexpected invocation: #<Mock:mock>.method()",
+      "unsatisfied expectations:",
+      "- expected exactly twice, invoked 3 times: #<Mock:mock>.method(any_parameters)"
+    ], test_result.failure_message_lines
   end
   
   def test_should_pass_if_method_is_expected_between_two_and_four_times_and_is_called_twice
@@ -95,7 +107,11 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
       1.times { mock.method }
     end
     assert_failed(test_result)
-    assert_equal ["not all expectations were satisfied\nunsatisfied expectations:\n- expected between 2 and 4 times, already invoked once: #<Mock:mock>.method(any_parameters)\n"], test_result.failure_messages
+    assert_equal [
+      "not all expectations were satisfied",
+      "unsatisfied expectations:",
+      "- expected between 2 and 4 times, invoked once: #<Mock:mock>.method(any_parameters)"
+    ], test_result.failure_message_lines
   end
 
   def test_should_fail_fast_if_method_is_expected_between_two_and_four_times_and_is_called_five_times
@@ -105,7 +121,11 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
       5.times { mock.method }
     end
     assert_failed(test_result)
-    assert_equal ["unexpected invocation: #<Mock:mock>.method()\nsatisfied expectations:\n- expected between 2 and 4 times, already invoked 4 times: #<Mock:mock>.method(any_parameters)\n"], test_result.failure_messages
+    assert_equal [
+      "unexpected invocation: #<Mock:mock>.method()",
+      "unsatisfied expectations:",
+      "- expected between 2 and 4 times, invoked 5 times: #<Mock:mock>.method(any_parameters)"
+    ], test_result.failure_message_lines
   end
   
   def test_should_pass_if_method_is_expected_at_least_once_and_is_called_once
@@ -133,7 +153,11 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
       0.times { mock.method }
     end
     assert_failed(test_result)
-    assert_equal ["not all expectations were satisfied\nunsatisfied expectations:\n- expected at least once, not yet invoked: #<Mock:mock>.method(any_parameters)\n"], test_result.failure_messages
+    assert_equal [
+      "not all expectations were satisfied",
+      "unsatisfied expectations:",
+      "- expected at least once, not yet invoked: #<Mock:mock>.method(any_parameters)"
+    ], test_result.failure_message_lines
   end
   
   def test_should_pass_if_method_is_expected_at_most_once_and_is_never_called
@@ -161,7 +185,11 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
       2.times { mock.method }
     end
     assert_failed(test_result)
-    assert_equal ["unexpected invocation: #<Mock:mock>.method()\nsatisfied expectations:\n- expected at most once, already invoked once: #<Mock:mock>.method(any_parameters)\n"], test_result.failure_messages
+    assert_equal [
+      "unexpected invocation: #<Mock:mock>.method()",
+      "unsatisfied expectations:",
+      "- expected at most once, invoked twice: #<Mock:mock>.method(any_parameters)"
+    ], test_result.failure_message_lines
   end
   
   def test_should_pass_if_method_is_never_expected_and_is_never_called_even_if_everything_is_stubbed
@@ -180,7 +208,11 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
       1.times { stub.method }
     end
     assert_failed(test_result)
-    assert_equal ["unexpected invocation: #<Mock:stub>.method()\nsatisfied expectations:\n- expected never, not yet invoked: #<Mock:stub>.method(any_parameters)\n"], test_result.failure_messages
+    assert_equal [
+      "unexpected invocation: #<Mock:stub>.method()",
+      "unsatisfied expectations:",
+      "- expected never, invoked once: #<Mock:stub>.method(any_parameters)"
+    ], test_result.failure_message_lines
   end
   
   def test_should_fail_fast_if_there_is_no_matching_expectation
@@ -190,7 +222,11 @@ class ExpectedInvocationCountTest < Test::Unit::TestCase
       1.times { mock.method }
     end
     assert_failed(test_result)
-    assert_equal ["unexpected invocation: #<Mock:mock>.method()\nunsatisfied expectations:\n- expected exactly once, not yet invoked: #<Mock:mock>.method(1)\n"], test_result.failure_messages
+    assert_equal [
+      "unexpected invocation: #<Mock:mock>.method()",
+      "unsatisfied expectations:",
+      "- expected exactly once, not yet invoked: #<Mock:mock>.method(1)"
+    ], test_result.failure_message_lines
   end
   
 end

data/test/acceptance/github_issue_20_test.rb

@@ -0,0 +1,45 @@
+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

data/test/acceptance/multiple_expectations_failure_message_test.rb

@@ -0,0 +1,68 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+require 'mocha'
+
+class FailureMessageTest < Test::Unit::TestCase
+
+  include AcceptanceTest
+  
+  def setup
+    setup_acceptance_test
+  end
+  
+  def teardown
+    teardown_acceptance_test
+  end
+
+  def test_should_include_unexpected_invocation_in_unsatisfied_expectation_message
+    test_result = run_as_test do
+      mock = mock('mock')
+      mock.expects(:method_one).once
+      2.times { mock.method_one }
+    end
+    assert_failed(test_result)
+    assert_equal [
+      "unexpected invocation: #<Mock:mock>.method_one()",
+      "unsatisfied expectations:",
+      "- expected exactly once, invoked twice: #<Mock:mock>.method_one(any_parameters)"
+     ], test_result.failure_message_lines
+  end
+
+  def test_should_report_satisfied_expectations_as_well_as_unsatisfied_expectations
+    test_result = run_as_test do
+      mock = mock('mock')
+      mock.expects(:method_one).once
+      mock.expects(:method_two).twice
+      1.times { mock.method_one }
+      1.times { mock.method_two }
+    end
+    assert_failed(test_result)
+    assert_equal [
+      "not all expectations were satisfied",
+       "unsatisfied expectations:",
+       "- expected exactly twice, invoked once: #<Mock:mock>.method_two(any_parameters)",
+       "satisfied expectations:",
+       "- expected exactly once, invoked once: #<Mock:mock>.method_one(any_parameters)"
+    ], test_result.failure_message_lines
+  end
+
+  def test_should_report_multiple_satisfied_expectations
+    test_result = run_as_test do
+      mock = mock('mock')
+      mock.expects(:method_one).once
+      mock.expects(:method_two).twice
+      mock.expects(:method_three).times(3)
+      1.times { mock.method_one }
+      2.times { mock.method_two }
+      2.times { mock.method_three }
+    end
+    assert_failed(test_result)
+    assert_equal [
+      "not all expectations were satisfied",
+      "unsatisfied expectations:",
+      "- expected exactly 3 times, invoked twice: #<Mock:mock>.method_three(any_parameters)",
+      "satisfied expectations:",
+      "- expected exactly twice, invoked twice: #<Mock:mock>.method_two(any_parameters)",
+      "- expected exactly once, invoked once: #<Mock:mock>.method_one(any_parameters)"
+     ], test_result.failure_message_lines
+  end
+end

data/test/acceptance/parameter_matcher_test.rb

@@ -243,4 +243,58 @@ class ParameterMatcherTest < Test::Unit::TestCase
     assert_failed(test_result)
   end
 
+  def test_should_match_parameter_that_has_identical_query_string
+    test_result = run_as_test do
+      mock = mock()
+      mock.expects(:method).with(has_equivalent_query_string('http://example.com/foo?a=1&b=2'))
+      mock.method('http://example.com/foo?a=1&b=2')
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_match_parameter_that_has_rearranged_query_string
+    test_result = run_as_test do
+      mock = mock()
+      mock.expects(:method).with(has_equivalent_query_string('http://example.com/foo?b=2&a=1'))
+      mock.method('http://example.com/foo?a=1&b=2')
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_not_match_parameter_that_does_not_have_the_same_query_parameters
+    test_result = run_as_test do
+      mock = mock()
+      mock.expects(:method).with(has_equivalent_query_string('http://example.com/foo?a=1'))
+      mock.method('http://example.com/foo?a=1&b=2')
+    end
+    assert_failed(test_result)
+  end
+
+  def test_should_not_match_parameter_that_has_no_query_parameters_when_they_are_expected
+    test_result = run_as_test do
+      mock = mock()
+      mock.expects(:method).with(has_equivalent_query_string('http://example.com/foo'))
+      mock.method('http://example.com/foo?a=1&b=2')
+    end
+    assert_failed(test_result)
+  end
+
+  def test_should_not_match_parameter_that_has_the_same_query_string_bit_which_differs_otherwise
+    test_result = run_as_test do
+      mock = mock()
+      mock.expects(:method).with(has_equivalent_query_string('http://a.example.com/foo?a=1&b=2'))
+      mock.method('http://b.example.com/foo?a=1&b=2')
+    end
+    assert_failed(test_result)
+  end
+
+  def test_should_match_parameter_with_no_domain_or_scheme
+    test_result = run_as_test do
+      mock = mock()
+      mock.expects(:method).with(has_equivalent_query_string('/foo?a=1&b=2'))
+      mock.method('/foo?a=1&b=2')
+    end
+    assert_passed(test_result)
+  end
+
 end

data/test/test_runner.rb

@@ -8,11 +8,8 @@ else
 end
 
 module TestRunner
-  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)
+  def run_test_case(test_class, test_result = nil)
+    test = test_class.suite
     
     if defined?(Test::Unit::TestResult)
       test_result ||= Test::Unit::TestResult.new
@@ -22,6 +19,9 @@ module TestRunner
         def failure_messages
           failures.map { |failure| failure.message }
         end
+        def failure_message_lines
+          failure_messages.map { |message| message.split("\n") }.flatten
+        end
         def error_messages
           errors.map { |error| error.message }
         end
@@ -35,6 +35,13 @@ 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

data/test/unit/expectation_test.rb

@@ -296,7 +296,7 @@ class ExpectationTest < Test::Unit::TestCase
     expectation = new_expectation.times(2)
     1.times {expectation.invoke}
     assert !expectation.verified?
-    assert_match(/expected exactly twice, already invoked once/i, expectation.mocha_inspect)
+    assert_match(/expected exactly twice, invoked once/i, expectation.mocha_inspect)
   end
   
   def test_should_not_verify_successfully_if_expected_call_was_made_too_many_times

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mocha
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: false
   segments: 
   - 0
   - 9
-  - 10
-  version: 0.9.10
+  - 11
+  version: 0.9.11
 platform: ruby
 authors: 
 - James Mead
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-25 00:00:00 +00:00
+date: 2011-02-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,9 @@ files:
 - lib/mocha/integration/mini_test/version_13.rb
 - lib/mocha/integration/mini_test/version_140.rb
 - lib/mocha/integration/mini_test/version_141.rb
-- lib/mocha/integration/mini_test/version_142_and_above.rb
+- lib/mocha/integration/mini_test/version_142_to_172.rb
+- lib/mocha/integration/mini_test/version_200.rb
+- lib/mocha/integration/mini_test/version_201_to_202.rb
 - lib/mocha/integration/mini_test.rb
 - lib/mocha/integration/test_unit/assertion_counter.rb
 - lib/mocha/integration/test_unit/gem_version_200.rb
@@ -103,6 +105,7 @@ files:
 - lib/mocha/parameter_matchers/not.rb
 - lib/mocha/parameter_matchers/object.rb
 - lib/mocha/parameter_matchers/optionally.rb
+- lib/mocha/parameter_matchers/query_string.rb
 - lib/mocha/parameter_matchers/regexp_matches.rb
 - lib/mocha/parameter_matchers/responds_with.rb
 - lib/mocha/parameter_matchers/yaml_equivalent.rb
@@ -129,12 +132,14 @@ 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
 - test/acceptance/mock_test.rb
 - test/acceptance/mock_with_initializer_block_test.rb
 - test/acceptance/mocked_methods_dispatch_test.rb
+- test/acceptance/multiple_expectations_failure_message_test.rb
 - test/acceptance/optional_parameters_test.rb
 - test/acceptance/parameter_matcher_test.rb
 - test/acceptance/partial_mocks_test.rb
@@ -222,6 +227,7 @@ files:
 - Rakefile
 - README.rdoc
 - RELEASE.rdoc
+- .gemtest
 has_rdoc: true
 homepage: http://mocha.rubyforge.org
 licenses: []