rr 0.1.3 → 0.1.4

data/CHANGES

@@ -1,3 +1,7 @@
+* 0.1.4
+- TimesCalledError prints the backtrace to where the Scenario was defined when being verified
+- Error message includes method name when Scenario is not found
+
 * 0.1.3
 - Fixed issue where Double#placeholder_name issues when Double method name has a ! or ?
 

data/Rakefile

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

data/examples/rr/double_dispatching_example.rb

@@ -96,9 +96,9 @@ describe Double, " method dispatching where there are scenarios" do
     scenario_2 = @space.create_scenario(@double)
     scenario_2.with(3)
 
-    proc {@object.foobar(:no_matching_args)}.should raise_error(
+    proc {@object.foobar(:arg1, :arg2)}.should raise_error(
       Errors::ScenarioNotFoundError,
-      "No scenario for arguments [:no_matching_args]"
+      "No scenario for foobar(:arg1, :arg2)"
     )
   end
 end

data/examples/rr/errors/rr_error_example.rb

@@ -42,6 +42,25 @@ module Errors
 
       backtrace.should include("lib/rr")
     end
+
+    it "returns custom backtrace when backtrace is set" do
+      error = RRError.new
+      custom_backtrace = caller
+      error.backtrace = custom_backtrace
+      error.backtrace.should == custom_backtrace
+    end
+
+    it "returns normal backtrace when backtrace is not set" do
+      error = nil
+      expected_line = __LINE__ + 2
+      begin
+        raise RRError
+      rescue RRError => e
+        error = e
+      end
+      error.backtrace.first.should include(__FILE__)
+      error.backtrace.first.should include(expected_line.to_s)
+    end
   end
 end
 end

data/examples/rr/expectations/times_called_expectation_example.rb

@@ -66,6 +66,7 @@ describe TimesCalledExpectation, "#verify! when passed an Integer (2)" do
 
   before do
     @expectation = TimesCalledExpectation.new(2)
+    @expected_line = __LINE__ - 1
   end
 
   it "passes after verify_input called 2 times" do
@@ -86,6 +87,17 @@ describe TimesCalledExpectation, "#verify! when passed an Integer (2)" do
       @expectation.verify_input
     end.should raise_error(Errors::TimesCalledError)
   end
+
+  it "has a backtrace to where the TimesCalledExpectation was instantiated on failure" do
+    error = nil
+    begin
+      @expectation.verify!
+    rescue Errors::TimesCalledError => e
+      error = e
+    end
+    e.backtrace.first.should include(__FILE__)
+    e.backtrace.first.should include(":#{@expected_line}")
+  end
 end
 
 describe TimesCalledExpectation, "#verify! when passed a Range (1..2)" do

data/lib/rr/double.rb

@@ -77,7 +77,9 @@ module RR
         end
       end
       matching_scenarios.first.call(*args) unless matching_scenarios.empty?
-      raise Errors::ScenarioNotFoundError, "No scenario for arguments #{args.inspect}"
+
+      formatted_errors = args.collect {|arg| arg.inspect}.join(', ')
+      raise Errors::ScenarioNotFoundError, "No scenario for #{@method_name}(#{formatted_errors})"
     end
     
     def placeholder_name

data/lib/rr/errors/rr_error.rb

@@ -3,8 +3,9 @@ module Errors
   BACKTRACE_IDENTIFIER = /lib\/rr/
 
   class RRError < RuntimeError
+    attr_writer :backtrace
     def backtrace
-      original_backtrace = super
+      original_backtrace = (@backtrace) ? @backtrace : super
       return original_backtrace unless RR::Space.trim_backtrace
 
       return original_backtrace unless original_backtrace.respond_to?(:each)

data/lib/rr/expectations/times_called_expectation.rb

@@ -7,6 +7,7 @@ module RR
         raise ArgumentError, "Cannot pass in both an argument and a block" if times && time_condition_block
         @times = times || time_condition_block
         @times_called = 0
+        @verify_backtrace = caller[1..-1]
       end
 
       def verify_input
@@ -24,7 +25,15 @@ module RR
       end
 
       def verify!
-        raise Errors::TimesCalledError unless verify
+        unless verify
+          if @verify_backtrace
+            error = Errors::TimesCalledError.new
+            error.backtrace = @verify_backtrace
+            raise error
+          else
+            raise Errors::TimesCalledError
+          end
+        end
       end
 
       protected

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 date: 2007-07-09 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: