rr 0.1.13 → 0.1.14

data/CHANGES

@@ -1,3 +1,10 @@
+* 0.1.14
+- Introduced concept of Terminal and NonTerminal TimesCalledMatchers
+- Doubles that can be called many times can be replaced
+- Terminal Scenarios are called before NonTerminal Scenarios
+- Error message tweaking
+- Raise error when making a Scenarios with NonDeterministic TimesMatcher Ordered
+
 * 0.1.13
 - Fixed [#12290] Scenario#returns with false causes a return value of nil
 

data/Rakefile

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

data/examples/example_helper.rb

@@ -1,6 +1,6 @@
 dir = File.dirname(__FILE__)
 require "#{dir}/environment_fixture_setup"
-require "examples/rr/space_helper"
+require "examples/rr/space/space_helper"
 require "examples/rr/expectations/times_called_expectation/times_called_expectation_helper"
 require "examples/rr/extensions/double_methods_example_helper"
 

data/examples/rr/{double_dispatching_example.rb → double/double_dispatching_example.rb}

@@ -97,52 +97,83 @@ 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)\n" <<
-      "in\n" <<
+      "No scenario for foobar(:arg1, :arg2) in\n" <<
       "- foobar(1, 2)\n" <<
       "- foobar(3)"
     )
   end
 end
 
-describe Double, " method dispatching where there are scenarios with duplicate Exact Match ArgumentExpectations" do
+describe Double, " method dispatching where there are Scenarios with NonTerminal TimesCalledMatchers" do
+  it_should_behave_like "RR::Double method dispatching"
+
+  it "dispatches to Scenario with exact match" do
+    scenario = create_scenario(1, 2) {:return_value}
+    @object.foobar(1, 2).should == :return_value
+  end
+
+  it "matches to the last Scenario that was registered with an exact match" do
+    scenario_1 = create_scenario(1, 2) {:value_1}
+    scenario_2 = create_scenario(1, 2) {:value_2}
+
+    @object.foobar(1, 2).should == :value_2
+  end
+
+  it "dispatches to Scenario with wildcard match" do
+    scenario = create_scenario(anything) {:return_value}
+    @object.foobar(:dont_care).should == :return_value
+  end
+
+  it "matches to the last Scenario that was registered with a wildcard match" do
+    scenario_1 = create_scenario(anything) {:value_1}
+    scenario_2 = create_scenario(anything) {:value_2}
+
+    @object.foobar(:dont_care).should == :value_2
+  end
+
+  it "matches to Scenario with exact match Scenario even when a Scenario with wildcard match was registered later" do
+    exact_scenario_registered_first = create_scenario(1, 2) {:exact_first}
+    wildcard_scenario_registered_last = create_scenario(anything, anything) {:wildcard_last}
+
+    @object.foobar(1, 2).should == :exact_first
+  end
+
+  def create_scenario(*arguments, &return_value)
+    scenario = @space.create_scenario(@double)
+    scenario.with(*arguments).any_number_of_times.returns(&return_value)
+    scenario.should_not be_terminal
+    scenario
+  end
+end
+
+describe Double, " method dispatching where there are Terminal Scenarios with duplicate Exact Match ArgumentExpectations" do
   it_should_behave_like "RR::Double method dispatching"
 
   it "dispatches to Scenario that have an exact match" do
-    scenario1_with_exact_match = @space.create_scenario(@double)
-    scenario1_with_exact_match.with(:exact_match).returns {:return_1}
+    scenario1_with_exact_match = create_scenario(:exact_match) {:return_1}
 
     @object.foobar(:exact_match).should == :return_1
   end
 
   it "dispatches to the first Scenario that have an exact match" do
-    scenario1_with_exact_match = @space.create_scenario(@double)
-    scenario1_with_exact_match.with(:exact_match).returns {:return_1}
-
-    scenario2_with_exact_match = @space.create_scenario(@double)
-    scenario2_with_exact_match.with(:exact_match).returns {:return_2}
+    scenario1_with_exact_match = create_scenario(:exact_match) {:return_1}
+    scenario2_with_exact_match = create_scenario(:exact_match) {:return_2}
 
     @object.foobar(:exact_match).should == :return_1
   end
 
   it "dispatches the second Scenario with an exact match
       when the first scenario's Times Called expectation is satisfied" do
-    scenario1_with_exact_match = @space.create_scenario(@double)
-    scenario1_with_exact_match.with(:exact_match).returns {:return_1}.once
-
-    scenario2_with_exact_match = @space.create_scenario(@double)
-    scenario2_with_exact_match.with(:exact_match).returns {:return_2}.once
+    scenario1_with_exact_match = create_scenario(:exact_match) {:return_1}
+    scenario2_with_exact_match = create_scenario(:exact_match) {:return_2}
 
     @object.foobar(:exact_match)
     @object.foobar(:exact_match).should == :return_2
   end
 
   it "raises TimesCalledError when all of the scenarios Times Called expectation is satisfied" do
-    scenario1_with_exact_match = @space.create_scenario(@double)
-    scenario1_with_exact_match.with(:exact_match).returns {:return_1}.once
-
-    scenario2_with_exact_match = @space.create_scenario(@double)
-    scenario2_with_exact_match.with(:exact_match).returns {:return_2}.once
+    scenario1_with_exact_match = create_scenario(:exact_match) {:return_1}
+    scenario2_with_exact_match = create_scenario(:exact_match) {:return_2}
 
     @object.foobar(:exact_match)
     @object.foobar(:exact_match)
@@ -150,46 +181,43 @@ describe Double, " method dispatching where there are scenarios with duplicate E
       @object.foobar(:exact_match)
     end.should raise_error(Errors::TimesCalledError)
   end
+
+  def create_scenario(*arguments, &return_value)
+    scenario = @space.create_scenario(@double)
+    scenario.with(*arguments).once.returns(&return_value)
+    scenario.should be_terminal
+    scenario
+  end
 end
 
 describe Double, " method dispatching where there are scenarios with duplicate Wildcard Match ArgumentExpectations" do
   it_should_behave_like "RR::Double method dispatching"
 
   it "dispatches to Scenario that have a wildcard match" do
-    scenario_1 = @space.create_scenario(@double)
-    scenario_1.with_any_args.returns {:return_1}
+    scenario_1 = create_scenario {:return_1}
 
     @object.foobar(:anything).should == :return_1
   end
 
   it "dispatches to the first Scenario that has a wildcard match" do
-    scenario_1 = @space.create_scenario(@double)
-    scenario_1.with_any_args.returns {:return_1}
-
-    scenario_2 = @space.create_scenario(@double)
-    scenario_2.with_any_args.returns {:return_2}
+    scenario_1 = create_scenario {:return_1}
+    scenario_2 = create_scenario {:return_2}
 
     @object.foobar(:anything).should == :return_1
   end
 
   it "dispatches the second Scenario with a wildcard match
       when the first scenario's Times Called expectation is satisfied" do
-    scenario_1 = @space.create_scenario(@double)
-    scenario_1.with_any_args.returns {:return_1}.once
-
-    scenario_2 = @space.create_scenario(@double)
-    scenario_2.with_any_args.returns {:return_2}.once
+    scenario_1 = create_scenario {:return_1}
+    scenario_2 = create_scenario {:return_2}
 
     @object.foobar(:anything)
     @object.foobar(:anything).should == :return_2
   end
 
   it "raises TimesCalledError when all of the scenarios Times Called expectation is satisfied" do
-    scenario_1 = @space.create_scenario(@double)
-    scenario_1.with_any_args.returns {:return_1}.once
-
-    scenario_2 = @space.create_scenario(@double)
-    scenario_2.with_any_args.returns {:return_2}.once
+    scenario_1 = create_scenario {:return_1}
+    scenario_2 = create_scenario {:return_2}
 
     @object.foobar(:anything)
     @object.foobar(:anything)
@@ -197,5 +225,12 @@ describe Double, " method dispatching where there are scenarios with duplicate W
       @object.foobar(:anything)
     end.should raise_error(Errors::TimesCalledError)
   end
+
+  def create_scenario(&return_value)
+    scenario = @space.create_scenario(@double)
+    scenario.with_any_args.once.returns(&return_value)
+    scenario.should be_terminal
+    scenario
+  end
 end
 end

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

@@ -38,5 +38,13 @@ module Expectations
       10.times {@expectation.attempt!}
     end
   end
+
+  describe TimesCalledExpectation, "#terminal? with AnyTimesMatcher" do
+    it_should_behave_like "RR::Expectations::TimesCalledExpectation with AnyTimesMatcher"
+
+    it "returns false" do
+      @expectation.should_not be_terminal
+    end
+  end
 end
 end

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

@@ -61,5 +61,13 @@ module Expectations
       @expectation.attempt!
     end
   end
+
+  describe TimesCalledExpectation, "#terminal? with AtLeastMatcher" do
+    it_should_behave_like "RR::Expectations::TimesCalledExpectation with AtLeastMatcher"
+
+    it "returns false" do
+      @expectation.should_not be_terminal
+    end
+  end
 end
 end

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

@@ -65,5 +65,13 @@ module Expectations
       @expectation.attempt!
     end
   end
+
+  describe TimesCalledExpectation, "#terminal? with AtMostMatcher" do
+    it_should_behave_like "RR::Expectations::TimesCalledExpectation with AtMostMatcher"
+
+    it "returns true" do
+      @expectation.should be_terminal
+    end
+  end
 end
 end

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

@@ -97,6 +97,14 @@ module Expectations
         @expectation.attempt!
       end.should raise_error(Errors::TimesCalledError)
     end
-  end  
+  end
+
+  describe TimesCalledExpectation, "#terminal? with IntegerMatcher" do
+    it_should_behave_like "RR::Expectations::TimesCalledExpectation with IntegerMatcher"
+
+    it "returns true" do
+      @expectation.should be_terminal
+    end
+  end
 end
 end

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

@@ -76,5 +76,13 @@ module Expectations
       @object.foobar
     end
   end
+
+  describe TimesCalledExpectation, "#terminal? with ProcMatcher" do
+    it_should_behave_like "RR::Expectations::TimesCalledExpectation with ProcMatcher"
+
+    it "returns false" do
+      @expectation.should_not be_terminal
+    end
+  end
 end
 end

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

@@ -76,6 +76,14 @@ module Expectations
       @expectation.attempt!
       raises_expectation_error {@expectation.attempt!}
     end
-  end  
+  end
+
+  describe TimesCalledExpectation, "#terminal? with RangeMatcher" do
+    it_should_behave_like "RR::Expectations::TimesCalledExpectation with RangeMatcher"
+
+    it "returns true" do
+      @expectation.should be_terminal
+    end
+  end
 end
 end

data/examples/rr/scenario_example.rb

@@ -214,7 +214,7 @@ describe Scenario, "#ordered" do
   end
 
   it "sets return value when block passed in" do
-    @scenario.with_any_args.ordered {:return_value}
+    @scenario.with_any_args.once.ordered {:return_value}
     @object.foobar.should == :return_value
   end
 end
@@ -369,15 +369,14 @@ describe Scenario, "#call implemented by a proc" do
     scenario1 = @scenario
     scenario2 = @space.create_scenario(@double)
 
-    scenario1.with(1).returns {:return_1}.ordered
-    scenario2.with(2).returns {:return_2}.ordered
+    scenario1.with(1).returns {:return_1}.ordered.once
+    scenario2.with(2).returns {:return_2}.ordered.once
 
     proc do
       @object.foobar(2)
     end.should raise_error(
       Errors::ScenarioOrderError,
-      "foobar(2)\n" <<
-      "called out of order in list\n" <<
+      "foobar(2) called out of order in list\n" <<
       "- foobar(1)\n" <<
       "- foobar(2)"
     )
@@ -553,6 +552,27 @@ describe Scenario, "#verify" do
   end
 end
 
+describe Scenario, "#terminal?" do
+  it_should_behave_like "RR::Scenario"
+
+  it "returns true when times_called_expectation's terminal? is true" do
+    @scenario.once
+    @scenario.times_called_expectation.should be_terminal
+    @scenario.should be_terminal
+  end
+
+  it "returns false when times_called_expectation's terminal? is false" do
+    @scenario.any_number_of_times
+    @scenario.times_called_expectation.should_not be_terminal
+    @scenario.should_not be_terminal
+  end
+
+  it "returns false when there is not times_called_expectation" do
+    @scenario.times_called_expectation.should be_nil
+    @scenario.should_not be_terminal
+  end
+end
+
 describe Scenario, "#method_name" do
   it_should_behave_like "RR::Scenario"
 
@@ -575,4 +595,4 @@ describe Scenario, "#expected_arguments" do
     @scenario.expected_arguments.should == []
   end
 end
-end
+end

data/examples/rr/{space_verify_example.rb → space/space_verify_example.rb}

@@ -99,6 +99,21 @@ describe Space, "#verify_ordered_scenario", :shared => true do
     @method_name = :foobar
     @double = @space.create_double(@object, @method_name)
   end
+
+  it "raises an error when Scenario is NonTerminal" do
+    scenario = @space.create_scenario(@double)
+    @space.register_ordered_scenario(scenario)
+
+    scenario.any_number_of_times
+    scenario.should_not be_terminal
+
+    proc do
+      @space.verify_ordered_scenario(scenario)
+    end.should raise_error(
+      Errors::ScenarioOrderError,
+      "Ordered Scenarios cannot have a NonTerminal TimesCalledExpectation"
+    )
+  end
 end
 
 describe Space, "#verify_ordered_scenario where the passed in scenario is at the front of the queue" do
@@ -132,20 +147,23 @@ describe Space, "#verify_ordered_scenario where the passed in scenario is not at
   it_should_behave_like "RR::Space#verify_ordered_scenario"
   
   it "raises error" do
-    first_scenario = @space.create_scenario(@double)
-    @space.register_ordered_scenario(first_scenario)
-    second_scenario = @space.create_scenario(@double)
-    @space.register_ordered_scenario(second_scenario)
+    first_scenario = create_scenario
+    second_scenario = create_scenario
 
     proc do
       @space.verify_ordered_scenario(second_scenario)
     end.should raise_error(
       Errors::ScenarioOrderError,
-      "foobar()\n" <<
-      "called out of order in list\n" <<
+      "foobar() called out of order in list\n" <<
       "- foobar()\n" <<
       "- foobar()"
     )
   end
+
+  def create_scenario
+    scenario = @space.create_scenario(@double).once
+    @space.register_ordered_scenario(scenario)
+    scenario
+  end
 end
 end

data/examples/rr/times_called_matchers/any_times_matcher_example.rb

@@ -2,6 +2,12 @@ require "examples/example_helper"
 
 module RR
 module TimesCalledMatchers
+  describe AnyTimesMatcher, :shared => true do
+    before do
+      @matcher = AnyTimesMatcher.new
+    end
+  end
+
   describe TimesCalledMatcher, ".create when passed a AnyTimesMatcher" do
     it "returns the passed in argument" do
       matcher = AnyTimesMatcher.new
@@ -10,9 +16,7 @@ module TimesCalledMatchers
   end
 
   describe AnyTimesMatcher, "#possible_match?" do
-    before do
-      @matcher = AnyTimesMatcher.new
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::AnyTimesMatcher"
 
     it "always returns true" do
       @matcher.should be_possible_match(0)
@@ -21,9 +25,7 @@ module TimesCalledMatchers
   end
 
   describe AnyTimesMatcher, "#matches?" do
-    before do
-      @matcher = AnyTimesMatcher.new
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::AnyTimesMatcher"
 
     it "always returns true" do
       @matcher.should be_matches(0)
@@ -32,20 +34,24 @@ module TimesCalledMatchers
   end
 
   describe AnyTimesMatcher, "#attempt?" do
-    before do
-      @matcher = AnyTimesMatcher.new
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::AnyTimesMatcher"
 
     it "always returns true" do
       @matcher.should be_attempt(0)
       @matcher.should be_attempt(99999)
     end
-  end  
+  end
 
-  describe AnyTimesMatcher, "#error_message" do
-    before do
-      @matcher = AnyTimesMatcher.new
+  describe AnyTimesMatcher, "#terminal?" do
+    it_should_behave_like "RR::TimesCalledMatchers::AnyTimesMatcher"
+
+    it "returns false" do
+      @matcher.should_not be_terminal
     end
+  end
+
+  describe AnyTimesMatcher, "#error_message" do
+    it_should_behave_like "RR::TimesCalledMatchers::AnyTimesMatcher"
 
     it "has an error message" do
       @matcher.error_message(2).should == (

data/examples/rr/times_called_matchers/at_least_matcher_example.rb

@@ -2,6 +2,13 @@ require "examples/example_helper"
 
 module RR
 module TimesCalledMatchers
+  describe AtLeastMatcher, :shared => true do
+    before do
+      @times = 3
+      @matcher = AtLeastMatcher.new(@times)
+    end
+  end
+
   describe TimesCalledMatcher, ".create when passed a AtLeastMatcher" do
     it "returns the passed in argument" do
       matcher = AtLeastMatcher.new(5)
@@ -10,10 +17,7 @@ module TimesCalledMatchers
   end
 
   describe AtLeastMatcher, "#possible_match?" do
-    before do
-      @times = 3
-      @matcher = AtLeastMatcher.new(@times)
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::AtLeastMatcher"
 
     it "always returns true" do
       @matcher.should be_possible_match(99999)
@@ -21,10 +25,7 @@ module TimesCalledMatchers
   end
 
   describe AtLeastMatcher, "#matches?" do
-    before do
-      @times = 3
-      @matcher = AtLeastMatcher.new(@times)
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::AtLeastMatcher"
 
     it "returns false when times_called less than times" do
       @matcher.should_not be_matches(2)
@@ -40,10 +41,7 @@ module TimesCalledMatchers
   end
 
   describe AtLeastMatcher, "#attempt?" do
-    before do
-      @times = 3
-      @matcher = AtLeastMatcher.new(@times)
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::AtLeastMatcher"
 
     it "always returns true" do
       @matcher.should be_attempt(1)
@@ -51,11 +49,16 @@ module TimesCalledMatchers
     end
   end  
 
-  describe AtLeastMatcher, "#error_message" do
-    before do
-      @times = 3
-      @matcher = AtLeastMatcher.new(@times)
+  describe AnyTimesMatcher, "#terminal?" do
+    it_should_behave_like "RR::TimesCalledMatchers::AtLeastMatcher"
+
+    it "returns false" do
+      @matcher.should_not be_terminal
     end
+  end
+  
+  describe AtLeastMatcher, "#error_message" do
+    it_should_behave_like "RR::TimesCalledMatchers::AtLeastMatcher"
 
     it "has an error message" do
       @matcher.error_message(2).should == (

data/examples/rr/times_called_matchers/at_most_matcher_example.rb

@@ -2,6 +2,13 @@ require "examples/example_helper"
 
 module RR
 module TimesCalledMatchers
+  describe AtMostMatcher, :shared => true do
+    before do
+      @times = 3
+      @matcher = AtMostMatcher.new(@times)
+    end
+  end
+
   describe TimesCalledMatcher, ".create when passed a AtMostMatcher" do
     it "returns the passed in argument" do
       matcher = AtMostMatcher.new(5)
@@ -10,10 +17,7 @@ module TimesCalledMatchers
   end
 
   describe AtMostMatcher, "#possible_match?" do
-    before do
-      @times = 3
-      @matcher = AtMostMatcher.new(@times)
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::AtMostMatcher"
 
     it "returns true when times called < times" do
       @matcher.should be_possible_match(2)
@@ -29,10 +33,7 @@ module TimesCalledMatchers
   end
 
   describe AtMostMatcher, "#matches?" do
-    before do
-      @times = 3
-      @matcher = AtMostMatcher.new(@times)
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::AtMostMatcher"
 
     it "returns true when times_called less than times" do
       @matcher.should be_matches(2)
@@ -48,10 +49,7 @@ module TimesCalledMatchers
   end
 
   describe AtMostMatcher, "#attempt?" do
-    before do
-      @times = 3
-      @matcher = AtMostMatcher.new(@times)
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::AtMostMatcher"
 
     it "returns true when less than expected times" do
       @matcher.should be_attempt(2)
@@ -66,11 +64,16 @@ module TimesCalledMatchers
     end
   end  
 
-  describe AtMostMatcher, "#error_message" do
-    before do
-      @times = 3
-      @matcher = AtMostMatcher.new(@times)
+  describe AnyTimesMatcher, "#terminal?" do
+    it_should_behave_like "RR::TimesCalledMatchers::AtMostMatcher"
+
+    it "returns true" do
+      @matcher.should be_terminal
     end
+  end
+  
+  describe AtMostMatcher, "#error_message" do
+    it_should_behave_like "RR::TimesCalledMatchers::AtMostMatcher"
 
     it "has an error message" do
       @matcher.error_message(5).should == (

data/examples/rr/times_called_matchers/integer_matcher_example.rb

@@ -2,6 +2,13 @@ require "examples/example_helper"
 
 module RR
 module TimesCalledMatchers
+  describe IntegerMatcher, :shared => true do
+    before do
+      @times = 3
+      @matcher = IntegerMatcher.new(@times)
+    end
+  end
+
   describe TimesCalledMatcher, ".create when passed a IntegerMatcher" do
     it "returns the passed in argument" do
       matcher = IntegerMatcher.new(5)
@@ -16,10 +23,7 @@ module TimesCalledMatchers
   end
 
   describe IntegerMatcher, "#possible_match?" do
-    before do
-      @times = 3
-      @matcher = IntegerMatcher.new(@times)
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::IntegerMatcher"
 
     it "returns true when times called < times" do
       @matcher.should be_possible_match(2)
@@ -35,10 +39,7 @@ module TimesCalledMatchers
   end
 
   describe IntegerMatcher, "#matches?" do
-    before do
-      @times = 3
-      @matcher = IntegerMatcher.new(@times)
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::IntegerMatcher"
 
     it "returns false when times_called less than times" do
       @matcher.should_not be_matches(2)
@@ -54,10 +55,7 @@ module TimesCalledMatchers
   end
 
   describe IntegerMatcher, "#attempt?" do
-    before do
-      @times = 3
-      @matcher = IntegerMatcher.new(@times)
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::IntegerMatcher"
 
     it "returns true when less than expected times" do
       @matcher.should be_attempt(2)
@@ -72,11 +70,16 @@ module TimesCalledMatchers
     end
   end
 
-  describe IntegerMatcher, "#error_message" do
-    before do
-      @times = 3
-      @matcher = IntegerMatcher.new(@times)
+  describe AnyTimesMatcher, "#terminal?" do
+    it_should_behave_like "RR::TimesCalledMatchers::IntegerMatcher"
+
+    it "returns true" do
+      @matcher.should be_terminal
     end
+  end
+
+  describe IntegerMatcher, "#error_message" do
+    it_should_behave_like "RR::TimesCalledMatchers::IntegerMatcher"
 
     it "has an error message" do
       @matcher.error_message(2).should == (

data/examples/rr/times_called_matchers/proc_matcher_example.rb

@@ -2,6 +2,13 @@ require "examples/example_helper"
 
 module RR
 module TimesCalledMatchers
+  describe ProcMatcher, :shared => true do
+    before do
+      @times = proc {|other| other == 3}
+      @matcher = ProcMatcher.new(@times)
+    end
+  end
+
   describe TimesCalledMatcher, ".create when passed a ProcMatcher" do
     it "returns the passed in argument" do
       matcher = ProcMatcher.new(proc {|other| other == 5})
@@ -17,10 +24,7 @@ module TimesCalledMatchers
   end
 
   describe ProcMatcher, "#possible_match?" do
-    before do
-      @times = proc {|other| other == 3}
-      @matcher = ProcMatcher.new(@times)
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::ProcMatcher"
 
     it "always returns true" do
       @matcher.should be_possible_match(2)
@@ -30,10 +34,7 @@ module TimesCalledMatchers
   end
 
   describe ProcMatcher, "#matches?" do
-    before do
-      @times = proc {|other| other == 3}
-      @matcher = ProcMatcher.new(@times)
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::ProcMatcher"
 
     it "returns false when proc returns false" do
       @times.call(2).should be_false
@@ -47,10 +48,7 @@ module TimesCalledMatchers
   end
 
   describe ProcMatcher, "#attempt?" do
-    before do
-      @times = proc {|other| other == 3}
-      @matcher = ProcMatcher.new(@times)
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::ProcMatcher"
 
     it "always returns true" do
       @matcher.should be_attempt(2)
@@ -59,11 +57,16 @@ module TimesCalledMatchers
     end
   end
 
-  describe ProcMatcher, "#error_message" do
-    before do
-      @times = proc {|other| other == 3}
-      @matcher = ProcMatcher.new(@times)
+  describe ProcMatcher, "#terminal?" do
+    it_should_behave_like "RR::TimesCalledMatchers::ProcMatcher"
+
+    it "returns false" do
+      @matcher.should_not be_terminal
     end
+  end
+
+  describe ProcMatcher, "#error_message" do
+    it_should_behave_like "RR::TimesCalledMatchers::ProcMatcher"
 
     it "has an error message" do
       @matcher.error_message(1).should =~

data/examples/rr/times_called_matchers/range_matcher_example.rb

@@ -2,6 +2,13 @@ require "examples/example_helper"
 
 module RR
 module TimesCalledMatchers
+  describe RangeMatcher, :shared => true do
+    before do
+      @times = 2..4
+      @matcher = RangeMatcher.new(@times)
+    end
+  end
+
   describe TimesCalledMatcher, ".create when passed a IntegerMatcher" do
     it "returns the passed in argument" do
       matcher = RangeMatcher.new(2..4)
@@ -16,10 +23,7 @@ module TimesCalledMatchers
   end
 
   describe RangeMatcher, "#possible_match?" do
-    before do
-      @times = 2..4
-      @matcher = RangeMatcher.new(@times)
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::RangeMatcher"
 
     it "returns true when times called < start of range" do
       @matcher.should be_possible_match(1)
@@ -37,10 +41,7 @@ module TimesCalledMatchers
   end
 
   describe RangeMatcher, "#matches?" do
-    before do
-      @times = 2..4
-      @matcher = RangeMatcher.new(@times)
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::RangeMatcher"
 
     it "returns false when times_called less than start of range" do
       @matcher.should_not be_matches(1)
@@ -58,10 +59,7 @@ module TimesCalledMatchers
   end
 
   describe RangeMatcher, "#attempt?" do
-    before do
-      @times = 2..4
-      @matcher = RangeMatcher.new(@times)
-    end
+    it_should_behave_like "RR::TimesCalledMatchers::RangeMatcher"
 
     it "returns true when less than start of range" do
       @matcher.should be_attempt(1)
@@ -78,11 +76,16 @@ module TimesCalledMatchers
     end
   end
 
-  describe RangeMatcher, "#error_message" do
-    before do
-      @times = 2..4
-      @matcher = RangeMatcher.new(@times)
+  describe RangeMatcher, "#terminal?" do
+    it_should_behave_like "RR::TimesCalledMatchers::RangeMatcher"
+
+    it "returns true" do
+      @matcher.should be_terminal
     end
+  end
+
+  describe RangeMatcher, "#error_message" do
+    it_should_behave_like "RR::TimesCalledMatchers::RangeMatcher"
 
     it "has an error message" do
       @matcher.error_message(1).should == (

data/lib/rr.rb

@@ -1,5 +1,4 @@
-dir = File.dirname(__FILE__)
-
+require "rr/space"
 require "rr/double"
 
 require "rr/creator"
@@ -9,7 +8,7 @@ require "rr/probe_creator"
 require "rr/do_not_allow_creator"
 
 require "rr/scenario"
-require "rr/space"
+require "rr/scenario_matches"
 
 require "rr/errors/rr_error"
 require "rr/errors/scenario_not_found_error"
@@ -29,6 +28,8 @@ require "rr/wildcard_matchers/duck_type"
 require "rr/wildcard_matchers/regexp"
 require "rr/wildcard_matchers/range"
 
+require "rr/times_called_matchers/terminal"
+require "rr/times_called_matchers/non_terminal"
 require "rr/times_called_matchers/times_called_matcher"
 require "rr/times_called_matchers/any_times_matcher"
 require "rr/times_called_matchers/integer_matcher"
@@ -37,4 +38,4 @@ require "rr/times_called_matchers/proc_matcher"
 require "rr/times_called_matchers/at_least_matcher"
 require "rr/times_called_matchers/at_most_matcher"
 
-require "rr/extensions/double_methods"
+require "rr/extensions/double_methods"

data/lib/rr/double.rb

@@ -63,27 +63,42 @@ module RR
     end
 
     def call_method(args, block)
-      matching_scenarios = []
-      @scenarios.each do |scenario|
-        if scenario.exact_match?(*args)
-          matching_scenarios << scenario
-          return scenario.call(*args, &block) if scenario.attempt?
-        end
-      end
-      @scenarios.each do |scenario|
-        if scenario.wildcard_match?(*args)
-          matching_scenarios << scenario
-          return scenario.call(*args, &block) if scenario.attempt?
-        end
+      if scenario = find_scenario_to_attempt(args)
+        return scenario.call(*args, &block)
       end
-      matching_scenarios.first.call(*args) unless matching_scenarios.empty?
       scenario_not_found_error(*args)
     end
 
     protected
+    def find_scenario_to_attempt(args)
+      matches = ScenarioMatches.new(@scenarios).find_all_matches!(args)
+
+      unless matches.exact_terminal_scenarios_to_attempt.empty?
+        return matches.exact_terminal_scenarios_to_attempt.first
+      end
+
+      unless matches.exact_non_terminal_scenarios_to_attempt.empty?
+        return matches.exact_non_terminal_scenarios_to_attempt.last
+      end
+
+      unless matches.wildcard_terminal_scenarios_to_attempt.empty?
+        return matches.wildcard_terminal_scenarios_to_attempt.first
+      end
+
+      unless matches.wildcard_non_terminal_scenarios_to_attempt.empty?
+        return matches.wildcard_non_terminal_scenarios_to_attempt.last
+      end
+
+      unless matches.matching_scenarios.empty?
+        # This will raise a TimesCalledError
+        return matches.matching_scenarios.first
+      end
+
+      return nil
+    end
+
     def scenario_not_found_error(*args)
-      message = "No scenario for #{Scenario.formatted_name(@method_name, args)}\n"
-      message << "in\n"
+      message = "No scenario for #{Scenario.formatted_name(@method_name, args)} in\n"
       message << Scenario.list_message_part(@scenarios)
       raise Errors::ScenarioNotFoundError, message
     end

data/lib/rr/expectations/times_called_expectation.rb

@@ -38,6 +38,10 @@ module RR
         end
       end
 
+      def terminal?
+        @matcher.terminal?
+      end
+
       protected
       def verify_input_error
         raise Errors::TimesCalledError, error_message

data/lib/rr/scenario.rb

@@ -297,6 +297,11 @@ module RR
       true
     end
 
+    def terminal?
+      return false unless @times_called_expectation
+      @times_called_expectation.terminal?
+    end
+
     # The method name that this Scenario is attatched to
     def method_name
       double.method_name

data/lib/rr/scenario_matches.rb

@@ -0,0 +1,51 @@
+module RR
+class ScenarioMatches
+  attr_reader :matching_scenarios,
+              :exact_terminal_scenarios_to_attempt,
+              :exact_non_terminal_scenarios_to_attempt,
+              :wildcard_terminal_scenarios_to_attempt,
+              :wildcard_non_terminal_scenarios_to_attempt
+  def initialize(scenarios)
+    @scenarios = scenarios
+    @matching_scenarios = []
+    @exact_terminal_scenarios_to_attempt = []
+    @exact_non_terminal_scenarios_to_attempt = []
+    @wildcard_terminal_scenarios_to_attempt = []
+    @wildcard_non_terminal_scenarios_to_attempt = []
+  end
+
+  def find_all_matches!(args)
+    @scenarios.each do |scenario|
+      if scenario.exact_match?(*args)
+        matching_scenarios << scenario
+        if scenario.attempt?
+          exact_scenario_is_terminal_or_non_terminal scenario
+        end
+      elsif scenario.wildcard_match?(*args)
+        matching_scenarios << scenario
+        if scenario.attempt?
+          wildcard_scenario_is_terminal_or_non_terminal scenario
+        end
+      end
+    end
+    self
+  end
+
+  protected
+  def exact_scenario_is_terminal_or_non_terminal(scenario)
+    if scenario.terminal?
+      exact_terminal_scenarios_to_attempt << scenario
+    else
+      exact_non_terminal_scenarios_to_attempt << scenario
+    end
+  end
+
+  def wildcard_scenario_is_terminal_or_non_terminal(scenario)
+    if scenario.terminal?
+      wildcard_terminal_scenarios_to_attempt << scenario
+    else
+      wildcard_non_terminal_scenarios_to_attempt << scenario
+    end
+  end
+end
+end

data/lib/rr/space.rb

@@ -72,9 +72,13 @@ module RR
     # Verifies that the passed in ordered Scenario is being called
     # in the correct position.
     def verify_ordered_scenario(scenario)
+      unless scenario.terminal?
+        raise Errors::ScenarioOrderError,
+              "Ordered Scenarios cannot have a NonTerminal TimesCalledExpectation"
+      end
       unless @ordered_scenarios.first == scenario
         message = Scenario.formatted_name(scenario.method_name, scenario.expected_arguments)
-        message << "\ncalled out of order in list\n"
+        message << " called out of order in list\n"
         message << Scenario.list_message_part(@ordered_scenarios)
         raise Errors::ScenarioOrderError, message
       end

data/lib/rr/times_called_matchers/any_times_matcher.rb

@@ -1,21 +1,15 @@
 module RR
 module TimesCalledMatchers
   class AnyTimesMatcher < TimesCalledMatcher
+    include NonTerminal
+    
     def initialize
     end
 
-    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."

data/lib/rr/times_called_matchers/at_least_matcher.rb

@@ -1,18 +1,12 @@
 module RR
 module TimesCalledMatchers
   class AtLeastMatcher < TimesCalledMatcher
-    def possible_match?(times_called)
-      true
-    end
-
+    include NonTerminal
+    
     def matches?(times_called)
       times_called >= @times
     end
 
-    def attempt?(times_called)
-      true
-    end
-
     protected
     def expected_message_part
       "Expected at least #{@times.inspect} times."

data/lib/rr/times_called_matchers/at_most_matcher.rb

@@ -1,6 +1,8 @@
 module RR
 module TimesCalledMatchers
   class AtMostMatcher < TimesCalledMatcher
+    include Terminal
+
     def possible_match?(times_called)
       times_called <= @times
     end

data/lib/rr/times_called_matchers/integer_matcher.rb

@@ -1,6 +1,8 @@
 module RR
 module TimesCalledMatchers
   class IntegerMatcher < TimesCalledMatcher
+    include Terminal
+    
     def possible_match?(times_called)
       times_called <= @times
     end

data/lib/rr/times_called_matchers/non_terminal.rb

@@ -0,0 +1,27 @@
+module RR
+module TimesCalledMatchers
+  # Including this module marks the TimesCalledMatcher as NonTerminal.
+  # Being NonTerminal means the Scenario will not "terminate" even when
+  # called infinite times.
+  #
+  # The Scenario that uses a NonTerminal TimesCalledMatcher will
+  # continue using the Scenario when passed the matching arguments.
+  # This is done by the attempt? always returning true.
+  #
+  # This is in opposition to Terminal TimesCalledMatchers, where
+  # attempt? will eventually return false.
+  module NonTerminal
+    def terminal?
+      false
+    end
+
+    def possible_match?(times_called)
+      true
+    end
+
+    def attempt?(times_called)
+      true
+    end
+  end
+end
+end

data/lib/rr/times_called_matchers/proc_matcher.rb

@@ -1,17 +1,11 @@
 module RR
 module TimesCalledMatchers
   class ProcMatcher < TimesCalledMatcher
-    def possible_match?(times_called)
-      return true
-    end
-
+    include NonTerminal
+    
     def matches?(times_called)
       @times.call(times_called)
     end
-
-    def attempt?(times_called)
-      possible_match?(times_called)
-    end
   end
 end
 end

data/lib/rr/times_called_matchers/range_matcher.rb

@@ -1,6 +1,8 @@
 module RR
 module TimesCalledMatchers
   class RangeMatcher < TimesCalledMatcher
+    include Terminal
+
     def possible_match?(times_called)
       return true if times_called < @times.begin
       return true if @times.include?(times_called)

data/lib/rr/times_called_matchers/terminal.rb

@@ -0,0 +1,20 @@
+module RR
+module TimesCalledMatchers
+  # Including this module marks the TimesCalledMatcher as Terminal.
+  # Being Terminal the Scenario will "terminate" when times called is
+  # finite.
+  #
+  # The Scenario that uses a Terminal TimesCalledMatcher will
+  # eventually be passed over to the next Scenario when passed
+  # the matching arguments enough times. This is done by the attempt?
+  # method returning false when executed a finite number of times.
+  #
+  # This is in opposition to NonTerminal TimesCalledMatchers, where
+  # attempt? will always return true.
+  module Terminal
+    def terminal?
+      true
+    end
+  end
+end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.1.13
-date: 2007-07-14 00:00:00 -07:00
+  version: 0.1.14
+date: 2007-07-16 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: 
 - lib
@@ -35,6 +35,7 @@ files:
 - lib/rr.rb
 - lib/rr/scenario.rb
 - lib/rr/creator.rb
+- lib/rr/scenario_matches.rb
 - lib/rr/stub_creator.rb
 - lib/rr/space.rb
 - lib/rr/double.rb
@@ -47,6 +48,8 @@ files:
 - lib/rr/times_called_matchers/at_least_matcher.rb
 - lib/rr/times_called_matchers/proc_matcher.rb
 - lib/rr/times_called_matchers/integer_matcher.rb
+- lib/rr/times_called_matchers/non_terminal.rb
+- lib/rr/times_called_matchers/terminal.rb
 - lib/rr/times_called_matchers/range_matcher.rb
 - lib/rr/expectations/argument_equality_expectation.rb
 - lib/rr/expectations/times_called_expectation.rb
@@ -72,23 +75,11 @@ files:
 - examples/example_helper.rb
 - examples/test_unit_example_suite.rb
 - examples/high_level_example.rb
-- examples/rr/space_verify_example.rb
 - examples/rr/probe_creator_example.rb
-- examples/rr/double_reset_example.rb
 - examples/rr/mock_creator_example.rb
 - examples/rr/stub_creator_example.rb
 - examples/rr/scenario_example.rb
-- examples/rr/space_reset_example.rb
-- examples/rr/double_bind_example.rb
-- examples/rr/double_register_scenario_example.rb
-- examples/rr/space_create_example.rb
 - examples/rr/do_not_allow_creator_example.rb
-- examples/rr/double_example.rb
-- examples/rr/space_helper.rb
-- examples/rr/space_example.rb
-- examples/rr/double_dispatching_example.rb
-- examples/rr/space_register_example.rb
-- examples/rr/double_verify_example.rb
 - examples/rr/rspec/rspec_backtrace_tweaking_example.rb
 - examples/rr/rspec/rspec_adapter_example.rb
 - examples/rr/rspec/rspec_usage_example.rb
@@ -99,6 +90,12 @@ files:
 - 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/space/space_verify_example.rb
+- examples/rr/space/space_reset_example.rb
+- examples/rr/space/space_create_example.rb
+- examples/rr/space/space_helper.rb
+- examples/rr/space/space_example.rb
+- examples/rr/space/space_register_example.rb
 - examples/rr/expectations/is_a_argument_equality_expectation_example.rb
 - examples/rr/expectations/any_argument_expectation_example.rb
 - examples/rr/expectations/regexp_argument_equality_expectation_example.rb
@@ -117,6 +114,12 @@ files:
 - examples/rr/expectations/times_called_expectation/times_called_expectation_at_most_example.rb
 - examples/rr/expectations/times_called_expectation/times_called_expectation_range_example.rb
 - examples/rr/errors/rr_error_example.rb
+- examples/rr/double/double_reset_example.rb
+- examples/rr/double/double_bind_example.rb
+- examples/rr/double/double_register_scenario_example.rb
+- examples/rr/double/double_example.rb
+- examples/rr/double/double_dispatching_example.rb
+- examples/rr/double/double_verify_example.rb
 - examples/rr/test_unit/test_unit_backtrace_test.rb
 - examples/rr/test_unit/test_helper.rb
 - examples/rr/test_unit/test_unit_integration_test.rb