rr 0.3.7 → 0.3.8

data/CHANGES

@@ -1,3 +1,6 @@
+* 0.3.8
+- Implemented [#13009] Better error mesage from TimesCalledMatcher
+
 * 0.3.7
 - Fixed [#12928] Reset doubles fails on Rails association proxies
 

data/Rakefile

@@ -25,7 +25,7 @@ def run_suite
 end
 
 PKG_NAME = "rr"
-PKG_VERSION = "0.3.7"
+PKG_VERSION = "0.3.8"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

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

@@ -7,7 +7,7 @@ module Expectations
     
     before do
       @at_least = TimesCalledMatchers::AnyTimesMatcher.new
-      @expectation = TimesCalledExpectation.new(@at_least)
+      @expectation = TimesCalledExpectation.new(@scenario, @at_least)
     end
   end
 

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

@@ -8,7 +8,7 @@ module Expectations
     before do
       @times = 3
       @at_least = TimesCalledMatchers::AtLeastMatcher.new(@times)
-      @expectation = TimesCalledExpectation.new(@at_least)
+      @expectation = TimesCalledExpectation.new(@scenario, @at_least)
     end
   end
 
@@ -31,7 +31,7 @@ module Expectations
         @expectation.verify!
       end.should raise_error(
         RR::Errors::TimesCalledError,
-        "Called 1 time.\nExpected at least 3 times."
+        "foobar()\nCalled 1 time.\nExpected at least 3 times."
       )
     end
   end

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

@@ -8,7 +8,7 @@ module Expectations
     before do
       @times = 3
       @at_most = TimesCalledMatchers::AtMostMatcher.new(@times)
-      @expectation = TimesCalledExpectation.new(@at_most)
+      @expectation = TimesCalledExpectation.new(@scenario, @at_most)
     end
   end
 
@@ -54,7 +54,7 @@ module Expectations
       3.times {@expectation.attempt!}
       proc do
         @expectation.attempt!
-      end.should raise_error(Errors::TimesCalledError, "Called 4 times.\nExpected at most 3 times.")
+      end.should raise_error(Errors::TimesCalledError, "foobar()\nCalled 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_example.rb

@@ -2,7 +2,51 @@ require "examples/example_helper"
 
 module RR
 module Expectations
-describe TimesCalledExpectation, ".new" do
+describe TimesCalledExpectation, :shared => true do
+  before do
+    @space = Space.new
+    @object = Object.new
+    @double = @space.double(@object, :foobar)
+    @scenario = @space.scenario(@double)
+    @scenario.with(1, 2)
+  end
+end
+
+describe TimesCalledExpectation, " with failure", :shared => true do
+  it_should_behave_like "RR::Expectations::TimesCalledExpectation"
+
+  before do
+    @times = 0
+    @matcher = TimesCalledMatchers::IntegerMatcher.new(@times)
+    @expectation = TimesCalledExpectation.new(@scenario, @matcher)
+  end
+end
+
+describe TimesCalledExpectation, "#attempt! with failure" do
+  it_should_behave_like "RR::Expectations::TimesCalledExpectation with failure"
+  
+  it "raises error that includes the scenario" do
+    proc do
+      @expectation.attempt!
+    end.should raise_error(
+      Errors::TimesCalledError,
+      "#{@scenario.formatted_name}\n#{@matcher.error_message(1)}"
+    )
+  end
+end
+
+describe TimesCalledExpectation, "#verify! with failure" do
+  it_should_behave_like "RR::Expectations::TimesCalledExpectation with failure"
+  
+  it "raises error with passed in message prepended" do
+    @expectation.instance_variable_set(:@times_called, 1)
+    proc do
+      @expectation.verify!
+    end.should raise_error(
+      Errors::TimesCalledError,
+      "#{@scenario.formatted_name}\n#{@matcher.error_message(1)}"
+    )
+  end
 end
 end
 end

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

@@ -7,7 +7,7 @@ module Expectations
 
     before do
       @matcher = TimesCalledMatchers::IntegerMatcher.new(2)
-      @expectation = TimesCalledExpectation.new(@matcher)
+      @expectation = TimesCalledExpectation.new(@scenario, @matcher)
       @expected_line = __LINE__ - 1
     end
   end
@@ -37,7 +37,7 @@ module Expectations
       @expectation.attempt!
       proc {@expectation.verify!}.should raise_error(
         Errors::TimesCalledError,
-        "Called 1 time.\nExpected 2 times."
+        "foobar()\nCalled 1 time.\nExpected 2 times."
       )
     end
 
@@ -46,7 +46,7 @@ module Expectations
       @expectation.attempt!
       proc do
         @expectation.attempt!
-      end.should raise_error(Errors::TimesCalledError, "Called 3 times.\nExpected 2 times.")
+      end.should raise_error(Errors::TimesCalledError, "foobar()\nCalled 3 times.\nExpected 2 times.")
     end
 
     it "has a backtrace to where the TimesCalledExpectation was instantiated on failure" do
@@ -63,7 +63,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.\nExpected 2 times.")
+      end.should raise_error(Errors::TimesCalledError, "foobar()\nCalled 0 times.\nExpected 2 times.")
     end
   end
 

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

@@ -7,7 +7,7 @@ module Expectations
     
     before do
       @matcher = TimesCalledMatchers::ProcMatcher.new(proc {|value| value == 2})
-      @expectation = TimesCalledExpectation.new(@matcher)
+      @expectation = TimesCalledExpectation.new(@scenario, @matcher)
       @expected_line = __LINE__ - 1
     end
   end

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

@@ -7,7 +7,7 @@ module Expectations
 
     before do
       @matcher = TimesCalledMatchers::RangeMatcher.new(1..2)
-      @expectation = TimesCalledExpectation.new(@matcher)
+      @expectation = TimesCalledExpectation.new(@scenario, @matcher)
       @expected_line = __LINE__ - 1
     end
   end
@@ -43,7 +43,7 @@ module Expectations
       @expectation.attempt!
       proc do
         @expectation.attempt!
-      end.should raise_error(Errors::TimesCalledError, "Called 3 times.\nExpected 1..2 times.")
+      end.should raise_error(Errors::TimesCalledError, "foobar()\nCalled 3 times.\nExpected 1..2 times.")
     end
   end
 

data/examples/rr/scenario_definition_example.rb

@@ -165,7 +165,7 @@ describe ScenarioDefinition, "#at_most" do
       @object.foobar
     end.should raise_error(
       Errors::TimesCalledError,
-      "Called 3 times.\nExpected at most 2 times."
+      "foobar()\nCalled 3 times.\nExpected at most 2 times."
     )
   end
 

data/examples/rr/scenario_example.rb

@@ -163,7 +163,7 @@ describe Scenario, "#at_most" do
       @scenario.call(@double)
     end.should raise_error(
       Errors::TimesCalledError,
-      "Called 3 times.\nExpected at most 2 times."
+      "foobar()\nCalled 3 times.\nExpected at most 2 times."
     )
   end
 
@@ -660,4 +660,17 @@ describe Scenario, "#expected_arguments" do
     @scenario.expected_arguments.should == []
   end
 end
+
+describe Scenario, "#formatted_name" do
+  it_should_behave_like "RR::Scenario"
+
+  it "renders the formatted name of the Scenario with no arguments" do
+    @scenario.formatted_name.should == "foobar()"
+  end
+
+  it "renders the formatted name of the Scenario with arguments" do
+    @scenario.with(1, 2)
+    @scenario.formatted_name.should == "foobar(1, 2)"
+  end
+end
 end

data/lib/rr/expectations/times_called_expectation.rb

@@ -1,10 +1,11 @@
 module RR
   module Expectations
     class TimesCalledExpectation
-      attr_reader :times_called
+      attr_reader :scenario, :times_called
       attr_accessor :matcher
-      
-      def initialize(matcher=nil)
+
+      def initialize(scenario, matcher=nil)
+        @scenario = scenario
         @matcher = matcher
         @times_called = 0
         @verify_backtrace = caller[1..-1]
@@ -47,7 +48,7 @@ module RR
       end
 
       def error_message
-        @matcher.error_message(@times_called)
+        "#{scenario.formatted_name}\n#{@matcher.error_message(@times_called)}"
       end
     end
   end

data/lib/rr/scenario.rb

@@ -23,7 +23,7 @@ module RR
       @double = double
       @definition = definition
       @times_called = 0
-      @times_called_expectation = Expectations::TimesCalledExpectation.new
+      @times_called_expectation = Expectations::TimesCalledExpectation.new(self)
     end
 
     # Scenario#with sets the expectation that the Scenario will receive
@@ -244,7 +244,7 @@ module RR
         else
           return double.object.__send__(
             :method_missing,
-            double.method_name,
+            method_name,
             *args,
             &block
           )
@@ -329,5 +329,9 @@ module RR
       definition.argument_expectation = value
     end
     protected :argument_expectation=
+
+    def formatted_name
+      self.class.formatted_name(method_name, expected_arguments)
+    end
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.3
 specification_version: 1
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
-date: 2007-08-09 00:00:00 -07:00
+  version: 0.3.8
+date: 2007-08-12 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
@@ -29,107 +29,107 @@ post_install_message:
 authors: 
 - Brian Takita
 files: 
-- README
 - Rakefile
 - CHANGES
-- lib/rr/extensions/instance_methods.rb
-- lib/rr/adapters/test_unit.rb
-- lib/rr/adapters/rspec.rb
+- README
+- lib/rr.rb
+- lib/rr/scenario_method_proxy.rb
+- lib/rr/scenario.rb
+- lib/rr/scenario_definition.rb
+- lib/rr/hash_with_object_id_key.rb
+- lib/rr/scenario_definition_builder.rb
+- lib/rr/scenario_matches.rb
+- lib/rr/space.rb
+- lib/rr/double.rb
+- lib/rr/scenario_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
+- 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
 - lib/rr/expectations/any_argument_expectation.rb
-- lib/rr/scenario.rb
-- lib/rr/double.rb
-- lib/rr/errors/times_called_error.rb
 - lib/rr/errors/scenario_not_found_error.rb
-- lib/rr/errors/scenario_order_error.rb
 - lib/rr/errors/argument_equality_error.rb
+- lib/rr/errors/scenario_order_error.rb
 - lib/rr/errors/rr_error.rb
+- lib/rr/errors/times_called_error.rb
 - lib/rr/errors/scenario_definition_error.rb
-- lib/rr/scenario_creator.rb
-- lib/rr/space.rb
-- lib/rr/scenario_definition_builder.rb
-- lib/rr/scenario_definition.rb
+- lib/rr/adapters/test_unit.rb
+- lib/rr/adapters/rspec.rb
 - lib/rr/wildcard_matchers/boolean.rb
-- lib/rr/wildcard_matchers/anything.rb
-- lib/rr/wildcard_matchers/numeric.rb
 - lib/rr/wildcard_matchers/duck_type.rb
+- lib/rr/wildcard_matchers/range.rb
 - lib/rr/wildcard_matchers/regexp.rb
+- lib/rr/wildcard_matchers/numeric.rb
 - lib/rr/wildcard_matchers/is_a.rb
-- lib/rr/wildcard_matchers/range.rb
-- lib/rr/times_called_matchers/at_least_matcher.rb
-- lib/rr/times_called_matchers/range_matcher.rb
-- lib/rr/times_called_matchers/integer_matcher.rb
-- lib/rr/times_called_matchers/non_terminal.rb
-- lib/rr/times_called_matchers/proc_matcher.rb
-- lib/rr/times_called_matchers/times_called_matcher.rb
-- lib/rr/times_called_matchers/at_most_matcher.rb
-- lib/rr/times_called_matchers/any_times_matcher.rb
-- lib/rr/times_called_matchers/terminal.rb
-- lib/rr/scenario_method_proxy.rb
-- lib/rr/scenario_matches.rb
-- lib/rr/hash_with_object_id_key.rb
-- lib/rr.rb
-- examples/rr/extensions/instance_methods_creator_example.rb
-- examples/rr/extensions/instance_methods_example_helper.rb
-- examples/rr/extensions/instance_methods_times_matcher_example.rb
-- examples/rr/extensions/instance_methods_argument_matcher_example.rb
-- examples/rr/extensions/instance_methods_space_example.rb
+- lib/rr/wildcard_matchers/anything.rb
+- lib/rr/extensions/instance_methods.rb
+- examples/environment_fixture_setup.rb
+- examples/rspec_example_suite.rb
+- examples/example_suite.rb
+- examples/example_helper.rb
+- examples/test_unit_example_suite.rb
+- examples/high_level_example.rb
+- examples/rr/scenario_definition_example.rb
+- examples/rr/scenario_method_proxy_example.rb
+- examples/rr/scenario_example.rb
+- examples/rr/scenario_creator_example.rb
+- examples/rr/rspec/rspec_backtrace_tweaking_example.rb
+- examples/rr/rspec/rspec_adapter_example.rb
+- examples/rr/rspec/rspec_usage_example.rb
+- examples/rr/times_called_matchers/at_most_matcher_example.rb
+- examples/rr/times_called_matchers/at_least_matcher_example.rb
+- 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/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/hash_with_object_id_key_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
+- examples/rr/expectations/boolean_argument_equality_expectation_example.rb
+- examples/rr/expectations/duck_type_argument_equality_expectation_example.rb
+- examples/rr/expectations/numeric_argument_equality_expectation_example.rb
+- examples/rr/expectations/range_argument_equality_expectation_example.rb
 - examples/rr/expectations/argument_equality_expectation_example.rb
 - examples/rr/expectations/anything_argument_equality_expectation_example.rb
-- examples/rr/expectations/times_called_expectation/times_called_expectation_at_least_example.rb
-- examples/rr/expectations/times_called_expectation/times_called_expectation_range_example.rb
 - examples/rr/expectations/times_called_expectation/times_called_expectation_integer_example.rb
-- examples/rr/expectations/times_called_expectation/times_called_expectation_example.rb
-- examples/rr/expectations/times_called_expectation/times_called_expectation_proc_example.rb
+- examples/rr/expectations/times_called_expectation/times_called_expectation_any_times_example.rb
 - examples/rr/expectations/times_called_expectation/times_called_expectation_helper.rb
+- examples/rr/expectations/times_called_expectation/times_called_expectation_proc_example.rb
+- examples/rr/expectations/times_called_expectation/times_called_expectation_example.rb
+- examples/rr/expectations/times_called_expectation/times_called_expectation_at_least_example.rb
 - examples/rr/expectations/times_called_expectation/times_called_expectation_at_most_example.rb
-- examples/rr/expectations/times_called_expectation/times_called_expectation_any_times_example.rb
-- examples/rr/expectations/any_argument_expectation_example.rb
-- examples/rr/expectations/is_a_argument_equality_expectation_example.rb
-- examples/rr/expectations/numeric_argument_equality_expectation_example.rb
-- examples/rr/expectations/boolean_argument_equality_expectation_example.rb
-- examples/rr/expectations/duck_type_argument_equality_expectation_example.rb
-- examples/rr/expectations/regexp_argument_equality_expectation_example.rb
-- examples/rr/expectations/range_argument_equality_expectation_example.rb
-- examples/rr/rspec/rspec_adapter_example.rb
-- examples/rr/rspec/rspec_usage_example.rb
-- examples/rr/rspec/rspec_backtrace_tweaking_example.rb
-- examples/rr/test_unit/test_helper.rb
-- examples/rr/test_unit/test_unit_integration_test.rb
-- examples/rr/test_unit/test_unit_backtrace_test.rb
-- examples/rr/scenario_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_original_method_example.rb
+- examples/rr/double/double_reset_example.rb
 - examples/rr/double/double_bind_example.rb
-- examples/rr/double/double_dispatching_example.rb
+- examples/rr/double/double_register_scenario_example.rb
 - examples/rr/double/double_example.rb
-- examples/rr/double/double_reset_example.rb
+- examples/rr/double/double_dispatching_example.rb
 - examples/rr/double/double_verify_example.rb
-- examples/rr/double/double_register_scenario_example.rb
-- examples/rr/double/double_original_method_example.rb
-- examples/rr/space/space_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_register_example.rb
-- examples/rr/space/space_verify_example.rb
-- examples/rr/space/hash_with_object_id_key_example.rb
-- examples/rr/times_called_matchers/proc_matcher_example.rb
-- examples/rr/times_called_matchers/times_called_matcher_example.rb
-- examples/rr/times_called_matchers/at_most_matcher_example.rb
-- examples/rr/times_called_matchers/any_times_matcher_example.rb
-- examples/rr/times_called_matchers/at_least_matcher_example.rb
-- examples/rr/times_called_matchers/range_matcher_example.rb
-- examples/rr/times_called_matchers/integer_matcher_example.rb
-- examples/rr/scenario_creator_example.rb
-- examples/rr/scenario_method_proxy_example.rb
-- examples/rr/scenario_definition_example.rb
-- examples/rr/errors/rr_error_example.rb
-- examples/rspec_example_suite.rb
-- examples/high_level_example.rb
-- examples/test_unit_example_suite.rb
-- examples/example_suite.rb
-- examples/environment_fixture_setup.rb
-- examples/example_helper.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
+- examples/rr/extensions/instance_methods_argument_matcher_example.rb
+- examples/rr/extensions/instance_methods_times_matcher_example.rb
+- examples/rr/extensions/instance_methods_creator_example.rb
+- examples/rr/extensions/instance_methods_space_example.rb
+- examples/rr/extensions/instance_methods_example_helper.rb
 test_files: []
 
 rdoc_options: