rr 0.1.7 → 0.1.8

data/CHANGES

@@ -1,3 +1,8 @@
+* 0.1.8
+- TimesCalledError Message Formatted to be on multiple lines
+- ScenarioNotFoundError Message includes all Scenarios for the Double
+- ScenarioOrderError shows list of remaining ordered scenarios
+
 * 0.1.7
 - Fixed [#12194] Double#reset_doubles are not clearing Ordered Scenarios bug
 - Added Space#reset

data/Rakefile

@@ -21,7 +21,7 @@ def run_suite
 end
 
 PKG_NAME = "rr"
-PKG_VERSION = "0.1.7"
+PKG_VERSION = "0.1.8"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

data/examples/rr/double_dispatching_example.rb

@@ -97,7 +97,10 @@ describe Double, " method dispatching where there are scenarios" do
 
     proc {@object.foobar(:arg1, :arg2)}.should raise_error(
       Errors::ScenarioNotFoundError,
-      "No scenario for foobar(:arg1, :arg2)"
+      "No scenario for foobar(:arg1, :arg2)\n" <<
+      "in\n" <<
+      "- foobar(1, 2)\n" <<
+      "- foobar(3)"
     )
   end
 end

data/examples/rr/double_register_scenario_example.rb

@@ -14,7 +14,7 @@ describe Double, "#register_scenario" do
   end
   
   it "adds the scenario to the scenarios list" do
-    scenario = Scenario.new(@space)
+    scenario = Scenario.new(@space, @double)
 
     @double.scenarios.should_not include(scenario)
     @double.register_scenario scenario

data/examples/rr/double_verify_example.rb

@@ -11,7 +11,7 @@ describe Double, "#verify" do
   end
 
   it "verifies each scenario was met" do
-    scenario = Scenario.new(@space)
+    scenario = Scenario.new(@space, @double)
     @double.register_scenario scenario
     
     scenario.with(1).once.returns {nil}

data/examples/rr/expectations/any_argument_expectation_example.rb

@@ -11,8 +11,8 @@ module Expectations
       @expectation.should == AnyArgumentExpectation.new
     end
 
-    it "returns false when comparing with ArgumentEqualityError" do
-      @expectation.should_not == ArgumentEqualityError.new(1)
+    it "returns false when comparing with ArgumentEqualityExpectation" do
+      @expectation.should_not == ArgumentEqualityExpectation.new(1)
     end
   end
 

data/examples/rr/expectations/anything_argument_equality_expectation_example.rb

@@ -2,9 +2,9 @@ require "examples/example_helper"
 
 module RR
 module Expectations
-  describe ArgumentEqualityError, "#exact_match? with anything argument" do
+  describe ArgumentEqualityExpectation, "#exact_match? with anything argument" do
     before do
-      @expectation = ArgumentEqualityError.new(anything)
+      @expectation = ArgumentEqualityExpectation.new(anything)
     end
     
     it "returns true when passed in an Anything module" do
@@ -20,9 +20,9 @@ module Expectations
     end
   end
 
-  describe ArgumentEqualityError, "#wildcard_match? with is_a String argument" do
+  describe ArgumentEqualityExpectation, "#wildcard_match? with is_a String argument" do
     before do
-      @expectation = ArgumentEqualityError.new(anything)
+      @expectation = ArgumentEqualityExpectation.new(anything)
     end
 
     it "returns true when passed correct number of arguments" do

data/examples/rr/expectations/argument_equality_expectation_example.rb

@@ -2,26 +2,26 @@ require "examples/example_helper"
 
 module RR
 module Expectations
-  describe ArgumentEqualityError, "==" do
+  describe ArgumentEqualityExpectation, "==" do
     before do
-      @expectation = ArgumentEqualityError.new(1, 2, 3)
+      @expectation = ArgumentEqualityExpectation.new(1, 2, 3)
     end
     
     it "returns true when passed in expected_arguments are equal" do
-      @expectation.should == ArgumentEqualityError.new(1, 2, 3)
+      @expectation.should == ArgumentEqualityExpectation.new(1, 2, 3)
     end
 
     it "returns false when passed in expected_arguments are not equal" do
-      @expectation.should_not == ArgumentEqualityError.new(1, 2)
-      @expectation.should_not == ArgumentEqualityError.new(1)
-      @expectation.should_not == ArgumentEqualityError.new(:something)
-      @expectation.should_not == ArgumentEqualityError.new()
+      @expectation.should_not == ArgumentEqualityExpectation.new(1, 2)
+      @expectation.should_not == ArgumentEqualityExpectation.new(1)
+      @expectation.should_not == ArgumentEqualityExpectation.new(:something)
+      @expectation.should_not == ArgumentEqualityExpectation.new()
     end
   end
 
-  describe ArgumentEqualityError, "#exact_match?" do
+  describe ArgumentEqualityExpectation, "#exact_match?" do
     before do
-      @expectation = ArgumentEqualityError.new(1, 2, 3)
+      @expectation = ArgumentEqualityExpectation.new(1, 2, 3)
     end
 
     it "returns true when all arguments exactly match" do
@@ -33,16 +33,16 @@ module Expectations
     end
   end
 
-  describe ArgumentEqualityError, "#wildcard_match?" do
+  describe ArgumentEqualityExpectation, "#wildcard_match?" do
     it "returns false when not exact match" do
-      @expectation = ArgumentEqualityError.new(1)
+      @expectation = ArgumentEqualityExpectation.new(1)
       @expectation.should_not be_wildcard_match(1, 2, 3)
       @expectation.should_not be_wildcard_match("whatever")
       @expectation.should_not be_wildcard_match("whatever", "else")
     end
 
     it "returns true when exact match" do
-      @expectation = ArgumentEqualityError.new(1, 2)
+      @expectation = ArgumentEqualityExpectation.new(1, 2)
       @expectation.should be_wildcard_match(1, 2)
       @expectation.should_not be_wildcard_match(1)
       @expectation.should_not be_wildcard_match("whatever", "else")

data/examples/rr/expectations/boolean_argument_equality_expectation_example.rb

@@ -2,9 +2,9 @@ require "examples/example_helper"
 
 module RR
 module Expectations
-  describe ArgumentEqualityError, "#exact_match? with is_a argument" do
+  describe ArgumentEqualityExpectation, "#exact_match? with is_a argument" do
     before do
-      @expectation = ArgumentEqualityError.new(boolean)
+      @expectation = ArgumentEqualityExpectation.new(boolean)
     end
     
     it "returns true when passed in an IsA module" do
@@ -21,9 +21,9 @@ module Expectations
     end
   end
 
-  describe ArgumentEqualityError, "#wildcard_match? with is_a Boolean argument" do
+  describe ArgumentEqualityExpectation, "#wildcard_match? with is_a Boolean argument" do
     before do
-      @expectation = ArgumentEqualityError.new(boolean)
+      @expectation = ArgumentEqualityExpectation.new(boolean)
     end
 
     it "returns true when passed a Boolean" do

data/examples/rr/expectations/duck_type_argument_equality_expectation_example.rb

@@ -2,9 +2,9 @@ require "examples/example_helper"
 
 module RR
 module Expectations
-  describe ArgumentEqualityError, "#exact_match? with duck_type argument" do
+  describe ArgumentEqualityExpectation, "#exact_match? with duck_type argument" do
     before do
-      @expectation = ArgumentEqualityError.new(duck_type(:to_s))
+      @expectation = ArgumentEqualityExpectation.new(duck_type(:to_s))
     end
     
     it "returns true when passed in an DuckType matcher with the same argument list" do
@@ -25,7 +25,7 @@ module Expectations
     end
   end
 
-  describe ArgumentEqualityError, "#wildcard_match? with DuckType argument" do
+  describe ArgumentEqualityExpectation, "#wildcard_match? with DuckType argument" do
     before do
       @matching_object = Object.new
       def @matching_object.quack
@@ -39,7 +39,7 @@ module Expectations
 
       @not_match_object = Object.new
 
-      @expectation = ArgumentEqualityError.new(duck_type(:quack, :waddle))
+      @expectation = ArgumentEqualityExpectation.new(duck_type(:quack, :waddle))
     end
 
     it "returns true when object matches all required methods" do

data/examples/rr/expectations/is_a_argument_equality_expectation_example.rb

@@ -2,9 +2,9 @@ require "examples/example_helper"
 
 module RR
 module Expectations
-  describe ArgumentEqualityError, "#exact_match? with is_a argument" do
+  describe ArgumentEqualityExpectation, "#exact_match? with is_a argument" do
     before do
-      @expectation = ArgumentEqualityError.new(is_a(String))
+      @expectation = ArgumentEqualityExpectation.new(is_a(String))
     end
     
     it "returns true when passed in an IsA module" do
@@ -24,9 +24,9 @@ module Expectations
     end
   end
 
-  describe ArgumentEqualityError, "#wildcard_match? with is_a String argument" do
+  describe ArgumentEqualityExpectation, "#wildcard_match? with is_a String argument" do
     before do
-      @expectation = ArgumentEqualityError.new(is_a(String))
+      @expectation = ArgumentEqualityExpectation.new(is_a(String))
     end
 
     it "returns true when passed a String" do

data/examples/rr/expectations/numeric_argument_equality_expectation_example.rb

@@ -2,9 +2,9 @@ require "examples/example_helper"
 
 module RR
 module Expectations
-  describe ArgumentEqualityError, "#exact_match? with is_a argument" do
+  describe ArgumentEqualityExpectation, "#exact_match? with is_a argument" do
     before do
-      @expectation = ArgumentEqualityError.new(numeric)
+      @expectation = ArgumentEqualityExpectation.new(numeric)
     end
     
     it "returns true when passed in an IsA module" do
@@ -20,9 +20,9 @@ module Expectations
     end
   end
 
-  describe ArgumentEqualityError, "#wildcard_match? with is_a Numeric argument" do
+  describe ArgumentEqualityExpectation, "#wildcard_match? with is_a Numeric argument" do
     before do
-      @expectation = ArgumentEqualityError.new(numeric)
+      @expectation = ArgumentEqualityExpectation.new(numeric)
     end
 
     it "returns true when passed a Numeric" do

data/examples/rr/expectations/range_argument_equality_expectation_example.rb

@@ -2,9 +2,9 @@ require "examples/example_helper"
 
 module RR
 module Expectations
-  describe ArgumentEqualityError, "#exact_match? with range argument" do
+  describe ArgumentEqualityExpectation, "#exact_match? with range argument" do
     before do
-      @expectation = ArgumentEqualityError.new(2..5)
+      @expectation = ArgumentEqualityExpectation.new(2..5)
     end
     
     it "returns true when passed in an Range matcher with the same argument list" do
@@ -25,9 +25,9 @@ module Expectations
     end
   end
 
-  describe ArgumentEqualityError, "#wildcard_match? with Range argument" do
+  describe ArgumentEqualityExpectation, "#wildcard_match? with Range argument" do
     before do
-      @expectation = ArgumentEqualityError.new(2..6)
+      @expectation = ArgumentEqualityExpectation.new(2..6)
     end
 
     it "returns true when string matches the range" do

data/examples/rr/expectations/regexp_argument_equality_expectation_example.rb

@@ -2,9 +2,9 @@ require "examples/example_helper"
 
 module RR
 module Expectations
-  describe ArgumentEqualityError, "#exact_match? with regexp argument" do
+  describe ArgumentEqualityExpectation, "#exact_match? with regexp argument" do
     before do
-      @expectation = ArgumentEqualityError.new(/abc/)
+      @expectation = ArgumentEqualityExpectation.new(/abc/)
     end
     
     it "returns true when passed in an Regexp matcher with the same argument list" do
@@ -25,7 +25,7 @@ module Expectations
     end
   end
 
-  describe ArgumentEqualityError, "#wildcard_match? with Regexp argument" do
+  describe ArgumentEqualityExpectation, "#wildcard_match? with Regexp argument" do
     before do
       @matching_object = Object.new
       def @matching_object.quack
@@ -39,7 +39,7 @@ module Expectations
 
       @not_match_object = Object.new
 
-      @expectation = ArgumentEqualityError.new(/abc/)
+      @expectation = ArgumentEqualityExpectation.new(/abc/)
     end
 
     it "returns true when string matches the regexp" do

data/examples/rr/expectations/times_called_expectation/times_called_expectation_at_least_example.rb

@@ -31,7 +31,7 @@ module Expectations
         @expectation.verify!
       end.should raise_error(
         RR::Errors::TimesCalledError,
-        "Called 1 time. Expected at least 3 times."
+        "Called 1 time.\nExpected at least 3 times."
       )
     end
   end

data/examples/rr/expectations/times_called_expectation/times_called_expectation_at_most_example.rb

@@ -54,7 +54,7 @@ module Expectations
       3.times {@expectation.attempt!}
       proc do
         @expectation.attempt!
-      end.should raise_error(Errors::TimesCalledError, "Called 4 times. Expected at most 3 times.")
+      end.should raise_error(Errors::TimesCalledError, "Called 4 times.\nExpected at most 3 times.")
     end
 
     it "passes when times called == times" do

data/examples/rr/expectations/times_called_expectation/times_called_expectation_integer_example.rb

@@ -36,7 +36,7 @@ module Expectations
       @expectation.attempt!
       proc {@expectation.verify!}.should raise_error(
         Errors::TimesCalledError,
-        "Called 1 time. Expected 2 times."
+        "Called 1 time.\nExpected 2 times."
       )
     end
 
@@ -45,7 +45,7 @@ module Expectations
       @expectation.attempt!
       proc do
         @expectation.attempt!
-      end.should raise_error(Errors::TimesCalledError, "Called 3 times. Expected 2 times.")
+      end.should raise_error(Errors::TimesCalledError, "Called 3 times.\nExpected 2 times.")
     end
 
     it "has a backtrace to where the TimesCalledExpectation was instantiated on failure" do
@@ -62,7 +62,7 @@ module Expectations
     it "has an error message that includes the number of times called and expected number of times" do
       proc do
         @expectation.verify!
-      end.should raise_error(Errors::TimesCalledError, "Called 0 times. Expected 2 times.")
+      end.should raise_error(Errors::TimesCalledError, "Called 0 times.\nExpected 2 times.")
     end
   end
 

data/examples/rr/expectations/times_called_expectation/times_called_expectation_range_example.rb

@@ -42,7 +42,7 @@ module Expectations
       @expectation.attempt!
       proc do
         @expectation.attempt!
-      end.should raise_error(Errors::TimesCalledError, "Called 3 times. Expected 1..2 times.")
+      end.should raise_error(Errors::TimesCalledError, "Called 3 times.\nExpected 1..2 times.")
     end
   end
 

data/examples/rr/extensions/double_methods_example.rb

@@ -25,7 +25,7 @@ module Extensions
 
       scenario = creator.foobar(1, 2) {:baz}
       scenario.times_called_expectation.matcher.should == TimesCalledMatchers::IntegerMatcher.new(1)
-      scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityError
+      scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityExpectation
       scenario.argument_expectation.expected_arguments.should == [1, 2]
 
       @subject.foobar(1, 2).should == :baz
@@ -55,7 +55,7 @@ module Extensions
 
       scenario = creator.foobar(1, 2) {:baz}
       scenario.times_called_expectation.should == nil
-      scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityError
+      scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityExpectation
       @subject.foobar(1, 2).should == :baz
     end
   end
@@ -83,7 +83,7 @@ module Extensions
 
       scenario = creator.foobar(1, 2)
       scenario.times_called_expectation.times.should == 1
-      scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityError
+      scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityExpectation
       scenario.argument_expectation.expected_arguments.should == [1, 2]
 
       @subject.foobar(1, 2).should == :original_value
@@ -121,7 +121,7 @@ module Extensions
 
       scenario = creator.foobar(1, 2)
       scenario.times_called_expectation.matcher.should == TimesCalledMatchers::IntegerMatcher.new(0)
-      scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityError
+      scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityExpectation
       scenario.argument_expectation.expected_arguments.should == [1, 2]
     end
   end

data/examples/rr/scenario_example.rb

@@ -14,7 +14,7 @@ end
 describe Scenario, "#with" do
   it_should_behave_like "RR::Scenario"
 
-  it "sets an ArgumentEqualityError" do
+  it "sets an ArgumentEqualityExpectation" do
     @scenario.with(1).should === @scenario
     @scenario.should be_exact_match(1)
     @scenario.should_not be_exact_match(2)
@@ -58,8 +58,8 @@ describe Scenario, "#with_no_args" do
     @scenario.with_no_args.should === @scenario
   end
 
-  it "sets an ArgumentEqualityError with no arguments" do
-    @scenario.argument_expectation.should == Expectations::ArgumentEqualityError.new()
+  it "sets an ArgumentEqualityExpectation with no arguments" do
+    @scenario.argument_expectation.should == Expectations::ArgumentEqualityExpectation.new()
   end
 
   it "sets return value when block passed in" do
@@ -153,7 +153,7 @@ describe Scenario, "#at_most" do
       @scenario.call
     end.should raise_error(
       Errors::TimesCalledError,
-      "Called 3 times. Expected at most 2 times."
+      "Called 3 times.\nExpected at most 2 times."
     )
   end
 
@@ -355,7 +355,13 @@ describe Scenario, "#call implemented by a proc" do
 
     proc do
       @object.foobar(2)
-    end.should raise_error(Errors::ScenarioOrderError)
+    end.should raise_error(
+      Errors::ScenarioOrderError,
+      "foobar(2)\n" <<
+      "called out of order in list\n" <<
+      "- foobar(1)\n" <<
+      "- foobar(2)"
+    )
   end
 
   it "dispatches to Space#verify_ordered_scenario when ordered" do
@@ -527,4 +533,27 @@ describe Scenario, "#verify" do
     proc {@scenario.verify}.should_not raise_error
   end
 end
+
+describe Scenario, "#method_name" do
+  it_should_behave_like "RR::Scenario"
+
+  it "returns the Double's method_name" do
+    @double.method_name.should == :foobar
+    @scenario.method_name.should == :foobar
+  end
+end
+
+describe Scenario, "#expected_arguments" do
+  it_should_behave_like "RR::Scenario"
+
+  it "returns argument expectation's expected_arguments when there is a argument expectation" do
+    @scenario.with(1, 2)
+    @scenario.expected_arguments.should == [1, 2]
+  end
+
+  it "returns an empty array when there is no argument expectation" do
+    @scenario.argument_expectation.should be_nil
+    @scenario.expected_arguments.should == []
+  end
+end
 end

data/examples/rr/space_verify_example.rb

@@ -139,7 +139,13 @@ describe Space, "#verify_ordered_scenario where the passed in scenario is not at
 
     proc do
       @space.verify_ordered_scenario(second_scenario)
-    end.should raise_error(Errors::ScenarioOrderError)
+    end.should raise_error(
+      Errors::ScenarioOrderError,
+      "foobar()\n" <<
+      "called out of order in list\n" <<
+      "- foobar()\n" <<
+      "- foobar()"
+    )
   end
 end
 end

data/examples/rr/times_called_matchers/any_times_matcher_example.rb

@@ -0,0 +1,61 @@
+require "examples/example_helper"
+
+module RR
+module TimesCalledMatchers
+  describe TimesCalledMatcher, ".create when passed a AnyTimesMatcher" do
+    it "returns the passed in argument" do
+      matcher = AnyTimesMatcher.new(5)
+      TimesCalledMatcher.create(matcher).should === matcher
+    end
+  end
+
+  describe AnyTimesMatcher, "#possible_match?" do
+    before do
+      @times = 3
+      @matcher = AnyTimesMatcher.new(@times)
+    end
+
+    it "always returns true" do
+      @matcher.should be_possible_match(0)
+      @matcher.should be_possible_match(99999)
+    end
+  end
+
+  describe AnyTimesMatcher, "#matches?" do
+    before do
+      @times = 3
+      @matcher = AnyTimesMatcher.new(@times)
+    end
+
+    it "always returns true" do
+      @matcher.should be_matches(0)
+      @matcher.should be_matches(99999)
+    end
+  end
+
+  describe AnyTimesMatcher, "#attempt?" do
+    before do
+      @times = 3
+      @matcher = AnyTimesMatcher.new(@times)
+    end
+
+    it "always returns true" do
+      @matcher.should be_attempt(0)
+      @matcher.should be_attempt(99999)
+    end
+  end  
+
+  describe AnyTimesMatcher, "#error_message" do
+    before do
+      @times = 3
+      @matcher = AnyTimesMatcher.new(@times)
+    end
+
+    it "has an error message" do
+      @matcher.error_message(2).should == (
+        "Called 2 times.\nExpected any number of times."
+      )
+    end
+  end
+end
+end

data/examples/rr/times_called_matchers/at_least_matcher_example.rb

@@ -66,7 +66,7 @@ module TimesCalledMatchers
 
     it "has an error message" do
       @matcher.error_message(2).should == (
-        "Called 2 times. Expected at least 3 times."
+        "Called 2 times.\nExpected at least 3 times."
       )
     end
   end

data/examples/rr/times_called_matchers/at_most_matcher_example.rb

@@ -74,7 +74,7 @@ module TimesCalledMatchers
 
     it "has an error message" do
       @matcher.error_message(5).should == (
-        "Called 5 times. Expected at most 3 times."
+        "Called 5 times.\nExpected at most 3 times."
       )
     end
   end

data/examples/rr/times_called_matchers/integer_matcher_example.rb

@@ -80,7 +80,7 @@ module TimesCalledMatchers
 
     it "has an error message" do
       @matcher.error_message(2).should == (
-        "Called 2 times. Expected 3 times."
+        "Called 2 times.\nExpected 3 times."
       )
     end
   end

data/examples/rr/times_called_matchers/proc_matcher_example.rb

@@ -67,7 +67,7 @@ module TimesCalledMatchers
 
     it "has an error message" do
       @matcher.error_message(1).should =~
-        /Called 1 time. Expected #<Proc.*> times./
+        /Called 1 time.\nExpected #<Proc.*> times./
     end
   end
 end

data/examples/rr/times_called_matchers/range_matcher_example.rb

@@ -86,7 +86,7 @@ module TimesCalledMatchers
 
     it "has an error message" do
       @matcher.error_message(1).should == (
-        "Called 1 time. Expected 2..4 times."
+        "Called 1 time.\nExpected 2..4 times."
       )
     end
   end

data/examples/rr/times_called_matchers/times_called_matcher_example.rb

@@ -26,7 +26,7 @@ module TimesCalledMatchers
 
     it "has an error message" do
       @matcher.error_message(5).should == (
-        "Called 5 times. Expected 3 times."
+        "Called 5 times.\nExpected 3 times."
       )
     end
   end

data/lib/rr.rb

@@ -29,6 +29,7 @@ require "rr/wildcard_matchers/regexp"
 require "rr/wildcard_matchers/range"
 
 require "rr/times_called_matchers/times_called_matcher"
+require "rr/times_called_matchers/any_times_matcher"
 require "rr/times_called_matchers/integer_matcher"
 require "rr/times_called_matchers/range_matcher"
 require "rr/times_called_matchers/proc_matcher"

data/lib/rr/double.rb

@@ -77,11 +77,17 @@ module RR
         end
       end
       matching_scenarios.first.call(*args) unless matching_scenarios.empty?
+      scenario_not_found_error(*args)
+    end
 
-      formatted_errors = args.collect {|arg| arg.inspect}.join(', ')
-      raise Errors::ScenarioNotFoundError, "No scenario for #{@method_name}(#{formatted_errors})"
+    protected
+    def scenario_not_found_error(*args)
+      message = "No scenario for #{Scenario.formatted_name(@method_name, args)}\n"
+      message << "in\n"
+      message << Scenario.list_message_part(@scenarios)
+      raise Errors::ScenarioNotFoundError, message
     end
-    
+
     def placeholder_name
       "__rr__#{@method_name}"
     end

data/lib/rr/expectations/argument_equality_expectation.rb

@@ -1,6 +1,6 @@
 module RR
   module Expectations
-    class ArgumentEqualityError
+    class ArgumentEqualityExpectation
       attr_reader :expected_arguments
 
       def initialize(*expected_arguments)

data/lib/rr/extensions/double_methods.rb

@@ -30,7 +30,7 @@ module Extensions
     end
     alias_method :dont_allow, :do_not_allow
 
-    # Sets up an Anything wildcard ArgumentEqualityError
+    # Sets up an Anything wildcard ArgumentEqualityExpectation
     # that succeeds when passed any argument.
     #   mock(object).method_name(anything) {return_value}
     #   object.method_name("an arbitrary value") # passes
@@ -38,7 +38,7 @@ module Extensions
       RR::WildcardMatchers::Anything.new
     end
 
-    # Sets up an IsA wildcard ArgumentEqualityError
+    # Sets up an IsA wildcard ArgumentEqualityExpectation
     # that succeeds when passed an argument of a certain type.
     #   mock(object).method_name(is_a(String)) {return_value}
     #   object.method_name("A String") # passes
@@ -46,7 +46,7 @@ module Extensions
       RR::WildcardMatchers::IsA.new(klass)
     end
 
-    # Sets up an Numeric wildcard ArgumentEqualityError
+    # Sets up an Numeric wildcard ArgumentEqualityExpectation
     # that succeeds when passed an argument that is ::Numeric.
     #   mock(object).method_name(numeric) {return_value}
     #   object.method_name(99) # passes
@@ -54,7 +54,7 @@ module Extensions
       RR::WildcardMatchers::Numeric.new
     end
 
-    # Sets up an Boolean wildcard ArgumentEqualityError
+    # Sets up an Boolean wildcard ArgumentEqualityExpectation
     # that succeeds when passed an argument that is a ::Boolean.
     #   mock(object).method_name(boolean) {return_value}
     #   object.method_name(false) # passes
@@ -62,7 +62,7 @@ module Extensions
       RR::WildcardMatchers::Boolean.new
     end
 
-    # Sets up a DuckType wildcard ArgumentEqualityError
+    # Sets up a DuckType wildcard ArgumentEqualityExpectation
     # that succeeds when passed the argument implements the methods.
     #   arg = Object.new
     #   def arg.foo; end

data/lib/rr/scenario.rb

@@ -1,33 +1,47 @@
 module RR
   # RR::Scenario is the use case for a method call.
-  # It has the ArgumentEqualityError, TimesCalledExpectation,
+  # It has the ArgumentEqualityExpectation, TimesCalledExpectation,
   # and the implementation.
   class Scenario
-    attr_reader :times_called, :argument_expectation, :times_called_expectation
+    class << self
+      def formatted_name(method_name, args)
+        formatted_errors = args.collect {|arg| arg.inspect}.join(', ')
+        "#{method_name}(#{formatted_errors})"
+      end
+
+      def list_message_part(scenarios)
+        scenarios.collect do |scenario|
+          "- #{formatted_name(scenario.method_name, scenario.expected_arguments)}"
+        end.join("\n")
+      end
+    end
+
+    attr_reader :times_called, :argument_expectation, :times_called_expectation, :double
 
-    def initialize(space)
+    def initialize(space, double)
       @space = space
       @implementation = nil
       @argument_expectation = nil
       @times_called_expectation = nil
       @times_called = 0
       @after_call = nil
+      @double = double
       @yields = nil
     end
 
-    # Scenario#with creates an ArgumentEqualityError for the
+    # Scenario#with creates an ArgumentEqualityExpectation for the
     # Scenario. it takes a list of expected arguments.
     #
     # Passing in a block sets the return value.
     #
     #   mock(subject).method_name.with(1, 2) {:return_value}
     def with(*args, &returns)
-      @argument_expectation = Expectations::ArgumentEqualityError.new(*args)
+      @argument_expectation = Expectations::ArgumentEqualityExpectation.new(*args)
       returns(&returns) if returns
       self
     end
 
-    # Scenario#with_any_args creates an AnyArgumentEqualityError
+    # Scenario#with_any_args creates an AnyArgumentEqualityExpectation
     # for the Scenario.
     #
     # Passing in a block sets the return value.
@@ -39,14 +53,14 @@ module RR
       self
     end
 
-    # Scenario#with_no_args creates an ArgumentEqualityError with
+    # Scenario#with_no_args creates an ArgumentEqualityExpectation with
     # no arguments for the Scenario.
     #
     # Passing in a block sets the return value.
     #
     #   mock(subject).method_name.with_no_args {:return_value}
     def with_no_args(&returns)
-      @argument_expectation = Expectations::ArgumentEqualityError.new()
+      @argument_expectation = Expectations::ArgumentEqualityExpectation.new()
       returns(&returns) if returns
       self
     end
@@ -182,7 +196,9 @@ module RR
     #
     # Passing in an argument causes Scenario to return the argument.
     def returns(value=nil, &implementation)
-      raise ArgumentError, "returns cannot accept both an argument and a block" if value && implementation
+      if value && implementation
+        raise ArgumentError, "returns cannot accept both an argument and a block"
+      end
       if value
         implemented_by proc {value}
       else
@@ -236,14 +252,14 @@ module RR
     protected :call_implementation
 
     # Scenario#exact_match? returns true when the passed in arguments
-    # exactly match the ArgumentEqualityError arguments.
+    # exactly match the ArgumentEqualityExpectation arguments.
     def exact_match?(*arguments)
       return false unless @argument_expectation 
       @argument_expectation.exact_match?(*arguments)
     end
 
     # Scenario#wildcard_match? returns true when the passed in arguments
-    # wildcard match the ArgumentEqualityError arguments.
+    # wildcard match the ArgumentEqualityExpectation arguments.
     def wildcard_match?(*arguments)
       return false unless @argument_expectation
       @argument_expectation.wildcard_match?(*arguments)
@@ -264,5 +280,16 @@ module RR
       @times_called_expectation.verify!
       true
     end
+
+    # The method name that this Scenario is attatched to
+    def method_name
+      double.method_name
+    end
+
+    # The Argumentns that this Scenario expects
+    def expected_arguments
+      return [] unless argument_expectation
+      argument_expectation.expected_arguments
+    end
   end
 end

data/lib/rr/space.rb

@@ -45,7 +45,7 @@ module RR
 
     # Creates and registers a Scenario to be verified.
     def create_scenario(double)
-      scenario = Scenario.new(self)
+      scenario = Scenario.new(self, double)
       double.register_scenario scenario
       scenario
     end
@@ -72,7 +72,12 @@ module RR
     # Verifies that the passed in ordered Scenario is being called
     # in the correct position.
     def verify_ordered_scenario(scenario)
-      raise Errors::ScenarioOrderError unless @ordered_scenarios.first == scenario
+      unless @ordered_scenarios.first == scenario
+        message = Scenario.formatted_name(scenario.method_name, scenario.expected_arguments)
+        message << "\ncalled out of order in list\n"
+        message << Scenario.list_message_part(@ordered_scenarios)
+        raise Errors::ScenarioOrderError, message
+      end
       @ordered_scenarios.shift unless scenario.attempt?
       scenario
     end

data/lib/rr/times_called_matchers/any_times_matcher.rb

@@ -0,0 +1,22 @@
+module RR
+module TimesCalledMatchers
+  class AnyTimesMatcher < TimesCalledMatcher
+    def possible_match?(times_called)
+      true
+    end
+
+    def matches?(times_called)
+      true
+    end
+
+    def attempt?(times_called)
+      true
+    end
+
+    protected
+    def expected_message_part
+      "Expected any number of times."
+    end
+  end
+end
+end

data/lib/rr/times_called_matchers/times_called_matcher.rb

@@ -24,7 +24,7 @@ module TimesCalledMatchers
     end
 
     def error_message(times_called)
-      "Called #{times_called.inspect} #{pluralized_time(times_called)}. #{expected_message_part}"
+      "Called #{times_called.inspect} #{pluralized_time(times_called)}.\n#{expected_message_part}"
     end
 
     def ==(other)

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 date: 2007-07-14 00:00:00 -07:00
 summary: RR (Double Ruby) is a double framework that features a rich selection of double techniques and a terse syntax. http://xunitpatterns.com/Test%20Double.html
 require_paths: 
@@ -40,6 +40,7 @@ files:
 - lib/rr/do_not_allow_creator.rb
 - lib/rr/mock_creator.rb
 - lib/rr/probe_creator.rb
+- lib/rr/times_called_matchers/any_times_matcher.rb
 - lib/rr/times_called_matchers/at_most_matcher.rb
 - lib/rr/times_called_matchers/times_called_matcher.rb
 - lib/rr/times_called_matchers/at_least_matcher.rb
@@ -95,6 +96,7 @@ files:
 - examples/rr/times_called_matchers/times_called_matcher_example.rb
 - examples/rr/times_called_matchers/range_matcher_example.rb
 - examples/rr/times_called_matchers/proc_matcher_example.rb
+- examples/rr/times_called_matchers/any_times_matcher_example.rb
 - examples/rr/times_called_matchers/integer_matcher_example.rb
 - examples/rr/expectations/is_a_argument_equality_expectation_example.rb
 - examples/rr/expectations/any_argument_expectation_example.rb