rr 0.1.4 → 0.1.5

data/CHANGES

@@ -1,3 +1,6 @@
+* 0.1.5
+- TimesCalledExpectation says how many times were called and how many times called were expected on error
+
 * 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

data/Rakefile

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

data/examples/rr/expectations/times_called_expectation_example.rb

@@ -77,7 +77,10 @@ describe TimesCalledExpectation, "#verify! when passed an Integer (2)" do
 
   it "fails after verify_input called 1 time" do
     @expectation.verify_input
-    proc {@expectation.verify!}.should raise_error(Errors::TimesCalledError)
+    proc {@expectation.verify!}.should raise_error(
+      Errors::TimesCalledError,
+      "Called 1 time. Expected 2."
+    )
   end
 
   it "can't be called when verify_input is called 3 times" do
@@ -85,7 +88,7 @@ describe TimesCalledExpectation, "#verify! when passed an Integer (2)" do
     @expectation.verify_input
     proc do
       @expectation.verify_input
-    end.should raise_error(Errors::TimesCalledError)
+    end.should raise_error(Errors::TimesCalledError, "Called 3 times. Expected 2.")
   end
 
   it "has a backtrace to where the TimesCalledExpectation was instantiated on failure" do
@@ -98,6 +101,12 @@ describe TimesCalledExpectation, "#verify! when passed an Integer (2)" do
     e.backtrace.first.should include(__FILE__)
     e.backtrace.first.should include(":#{@expected_line}")
   end
+
+  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.")
+  end
 end
 
 describe TimesCalledExpectation, "#verify! when passed a Range (1..2)" do
@@ -123,7 +132,7 @@ describe TimesCalledExpectation, "#verify! when passed a Range (1..2)" do
     @expectation.verify_input
     proc do
       @expectation.verify_input
-    end.should raise_error(Errors::TimesCalledError)
+    end.should raise_error(Errors::TimesCalledError, "Called 3 times. Expected 1..2.")
   end
 end
 

data/lib/rr/expectations/times_called_expectation.rb

@@ -27,18 +27,23 @@ module RR
       def verify!
         unless verify
           if @verify_backtrace
-            error = Errors::TimesCalledError.new
+            error = Errors::TimesCalledError.new(error_message)
             error.backtrace = @verify_backtrace
             raise error
           else
-            raise Errors::TimesCalledError
+            raise Errors::TimesCalledError, error_message
           end
         end
       end
 
       protected
       def verify_input_error
-        raise Errors::TimesCalledError, "Called #{@times_called.inspect} times. Expected #{@times.inspect}"
+        raise Errors::TimesCalledError, error_message
+      end
+
+      def error_message
+        time_casing = (@times_called == 1) ? "time" : "times"
+        "Called #{@times_called.inspect} #{time_casing}. Expected #{@times.inspect}."
       end
     end
   end

metadata

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