rr 0.1.0 → 0.1.1

data/CHANGES

@@ -1 +1,6 @@
+* 0.1.1
+- Trim the backtrace for Rspec and Test::Unit
+- Rspec and Test::Unit integration fixes
+
 * 0.1.0
+- Initial Release

data/Rakefile

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

data/examples/high_level_example.rb

@@ -18,7 +18,7 @@ describe "RR mock:" do
   it "mocks via inline call" do
     mock(@obj).to_s {"a value"}
     @obj.to_s.should == "a value"
-    proc {@obj.to_s}.should raise_error(RR::Expectations::TimesCalledExpectationError)
+    proc {@obj.to_s}.should raise_error(RR::Errors::TimesCalledError)
   end
 
   it "allows ordering" do
@@ -27,7 +27,7 @@ describe "RR mock:" do
     @obj.to_s.should == "value 1"
     @obj.to_s.should == "value 2"
     @obj.to_s.should == "value 2"
-    proc {@obj.to_s}.should raise_error(RR::Expectations::TimesCalledExpectationError)
+    proc {@obj.to_s}.should raise_error(RR::Errors::TimesCalledError)
   end
 
   it "mocks via block" do
@@ -56,7 +56,9 @@ describe "RR mock:" do
       "My String",
       "Tabcola"
     ).should == "value 1"
-    proc {@obj.foobar(:failure)}.should raise_error( RR::ScenarioNotFoundError )
+    proc do
+      @obj.foobar(:failure)
+    end.should raise_error( RR::Errors::ScenarioNotFoundError )
   end
 end
 
@@ -80,7 +82,7 @@ describe "RR probe:" do
     @obj.to_s(:foo).should == "Original to_s with arg foo"
     @obj.to_s(:bar).should == "Original to_s with arg bar"
     @obj.to_s(:bar).should == "Original to_s with arg bar"
-    proc {@obj.to_s(:bar)}.should raise_error(RR::Expectations::TimesCalledExpectationError)
+    proc {@obj.to_s(:bar)}.should raise_error(RR::Errors::TimesCalledError)
   end
 
   it "probes via block" do

data/examples/rr/do_not_allow_creator_example.rb

@@ -35,28 +35,28 @@ describe DoNotAllowCreator, ".new with block" do
     end
   end
 
-  it "raises TimesCalledExpectationError when any_args is called with no arguments" do
-    proc {@subject.any_args}.should raise_error(Expectations::TimesCalledExpectationError)
+  it "raises TimesCalledError when any_args is called with no arguments" do
+    proc {@subject.any_args}.should raise_error(Errors::TimesCalledError)
   end
 
-  it "raises TimesCalledExpectationError when any_args is called with arguments" do
-    proc {@subject.any_args(1, 2)}.should raise_error(Expectations::TimesCalledExpectationError)
+  it "raises TimesCalledError when any_args is called with arguments" do
+    proc {@subject.any_args(1, 2)}.should raise_error(Errors::TimesCalledError)
   end
 
-  it "raises TimesCalledExpectationError when no_args is called with no arguments" do
-    proc {@subject.no_args}.should raise_error(Expectations::TimesCalledExpectationError)
+  it "raises TimesCalledError when no_args is called with no arguments" do
+    proc {@subject.no_args}.should raise_error(Errors::TimesCalledError)
   end
 
-  it "does not raise TimesCalledExpectationError when no_args is called with arguments" do
-    proc {@subject.no_args(1, 2)}.should raise_error(ScenarioNotFoundError)
+  it "does not raise TimesCalledError when no_args is called with arguments" do
+    proc {@subject.no_args(1, 2)}.should raise_error(Errors::ScenarioNotFoundError)
   end
 
-  it "raises TimesCalledExpectationError when any_args is called with no arguments" do
-    proc {@subject.with_args}.should raise_error(ScenarioNotFoundError)
+  it "raises TimesCalledError when any_args is called with no arguments" do
+    proc {@subject.with_args}.should raise_error(Errors::ScenarioNotFoundError)
   end
 
-  it "raises TimesCalledExpectationError when any_args is called with arguments" do
-    proc {@subject.any_args(1, 2)}.should raise_error(Expectations::TimesCalledExpectationError)
+  it "raises TimesCalledError when any_args is called with arguments" do
+    proc {@subject.any_args(1, 2)}.should raise_error(Errors::TimesCalledError)
   end
 end
 
@@ -70,20 +70,20 @@ describe DoNotAllowCreator, "#method_missing" do
 
   it "sets expectation for method to never be called with any arguments when on arguments passed in" do
     @creator.foobar
-    proc {@subject.foobar}.should raise_error(Expectations::TimesCalledExpectationError)
-    proc {@subject.foobar(1, 2)}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@subject.foobar}.should raise_error(Errors::TimesCalledError)
+    proc {@subject.foobar(1, 2)}.should raise_error(Errors::TimesCalledError)
   end
 
   it "sets expectation for method to never be called with passed in arguments" do
     @creator.foobar(1, 2)
-    proc {@subject.foobar}.should raise_error(ScenarioNotFoundError)
-    proc {@subject.foobar(1, 2)}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@subject.foobar}.should raise_error(Errors::ScenarioNotFoundError)
+    proc {@subject.foobar(1, 2)}.should raise_error(Errors::TimesCalledError)
   end
 
   it "sets expectation for method to never be called with no arguments when with_no_args is set" do
     @creator.foobar.with_no_args
-    proc {@subject.foobar}.should raise_error(Expectations::TimesCalledExpectationError)
-    proc {@subject.foobar(1, 2)}.should raise_error(ScenarioNotFoundError)
+    proc {@subject.foobar}.should raise_error(Errors::TimesCalledError)
+    proc {@subject.foobar(1, 2)}.should raise_error(Errors::ScenarioNotFoundError)
   end
 end
 

data/examples/rr/double_dispatching_example.rb

@@ -65,7 +65,7 @@ describe Double, " method dispatching where there are scenarios" do
     scenario_2.with(3)
 
     proc {@object.foobar(:no_matching_args)}.should raise_error(
-      ScenarioNotFoundError,
+      Errors::ScenarioNotFoundError,
       "No scenario for arguments [:no_matching_args]"
     )
   end
@@ -103,7 +103,7 @@ describe Double, " method dispatching where there are scenarios with duplicate E
     @object.foobar(:exact_match).should == :return_2
   end
 
-  it "raises TimesCalledExpectationError when all of the scenarios Times Called expectation is satisfied" do
+  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
 
@@ -114,7 +114,7 @@ describe Double, " method dispatching where there are scenarios with duplicate E
     @object.foobar(:exact_match)
     proc do
       @object.foobar(:exact_match)
-    end.should raise_error(Expectations::TimesCalledExpectationError)
+    end.should raise_error(Errors::TimesCalledError)
   end
 end
 
@@ -150,7 +150,7 @@ describe Double, " method dispatching where there are scenarios with duplicate W
     @object.foobar(:anything).should == :return_2
   end
 
-  it "raises TimesCalledExpectationError when all of the scenarios Times Called expectation is satisfied" do
+  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
 
@@ -161,7 +161,7 @@ describe Double, " method dispatching where there are scenarios with duplicate W
     @object.foobar(:anything)
     proc do
       @object.foobar(:anything)
-    end.should raise_error(Expectations::TimesCalledExpectationError)
+    end.should raise_error(Errors::TimesCalledError)
   end
 end
 end

data/examples/rr/double_verify_example.rb

@@ -16,7 +16,7 @@ describe Double, "#verify" do
     @double.register_scenario scenario
     
     scenario.with(1).once.returns {nil}
-    proc {@double.verify}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@double.verify}.should raise_error(Errors::TimesCalledError)
     @object.foobar(1)
     proc {@double.verify}.should_not raise_error
   end

data/examples/rr/errors/rr_error_example.rb

@@ -0,0 +1,47 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/../../example_helper"
+
+module RR
+module Errors
+  describe RRError, "#backtrace" do
+    before do
+      @original_trim_backtrace = RR::Space.trim_backtrace
+    end
+    after do
+      RR::Space.trim_backtrace = @original_trim_backtrace
+    end
+
+    it "does not include the rr library files when trim_backtrace is true" do
+      RR::Space.trim_backtrace = true
+
+      error = nil
+      begin
+        obj = Object.new
+        mock(obj).foobar
+        RR::Space.verify_double(obj, :foobar)
+      rescue RRError=> e
+        error = e
+      end
+      backtrace = error.backtrace.join("\n")
+
+      backtrace.should_not include("lib/rr")
+    end
+
+    it "includes the rr library files when trim_backtrace is false" do
+      RR::Space.trim_backtrace = false
+
+      error = nil
+      begin
+        obj = Object.new
+        mock(obj).foobar
+        RR::Space.verify_double(obj, :foobar)
+      rescue RRError=> e
+        error = e
+      end
+      backtrace = error.backtrace.join("\n")
+
+      backtrace.should include("lib/rr")
+    end
+  end
+end
+end

data/examples/rr/expectations/any_argument_expectation_example.rb

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

data/examples/rr/expectations/anything_argument_equality_expectation_example.rb

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

data/examples/rr/expectations/argument_equality_expectation_example.rb

@@ -3,26 +3,26 @@ require "#{dir}/../../example_helper"
 
 module RR
 module Expectations
-  describe ArgumentEqualityExpectation, "==" do
+  describe ArgumentEqualityError, "==" do
     before do
-      @expectation = ArgumentEqualityExpectation.new(1, 2, 3)
+      @expectation = ArgumentEqualityError.new(1, 2, 3)
     end
     
     it "returns true when passed in expected_arguments are equal" do
-      @expectation.should == ArgumentEqualityExpectation.new(1, 2, 3)
+      @expectation.should == ArgumentEqualityError.new(1, 2, 3)
     end
 
     it "returns false when passed in expected_arguments are not equal" do
-      @expectation.should_not == ArgumentEqualityExpectation.new(1, 2)
-      @expectation.should_not == ArgumentEqualityExpectation.new(1)
-      @expectation.should_not == ArgumentEqualityExpectation.new(:something)
-      @expectation.should_not == ArgumentEqualityExpectation.new()
+      @expectation.should_not == ArgumentEqualityError.new(1, 2)
+      @expectation.should_not == ArgumentEqualityError.new(1)
+      @expectation.should_not == ArgumentEqualityError.new(:something)
+      @expectation.should_not == ArgumentEqualityError.new()
     end
   end
 
-  describe ArgumentEqualityExpectation, "#exact_match?" do
+  describe ArgumentEqualityError, "#exact_match?" do
     before do
-      @expectation = ArgumentEqualityExpectation.new(1, 2, 3)
+      @expectation = ArgumentEqualityError.new(1, 2, 3)
     end
 
     it "returns true when all arguments exactly match" do
@@ -34,16 +34,16 @@ module Expectations
     end
   end
 
-  describe ArgumentEqualityExpectation, "#wildcard_match?" do
+  describe ArgumentEqualityError, "#wildcard_match?" do
     it "returns false when not exact match" do
-      @expectation = ArgumentEqualityExpectation.new(1)
+      @expectation = ArgumentEqualityError.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 = ArgumentEqualityExpectation.new(1, 2)
+      @expectation = ArgumentEqualityError.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

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

data/examples/rr/expectations/duck_type_argument_equality_expectation_example.rb

@@ -3,9 +3,9 @@ require "#{dir}/../../example_helper"
 
 module RR
 module Expectations
-  describe ArgumentEqualityExpectation, "#exact_match? with duck_type argument" do
+  describe ArgumentEqualityError, "#exact_match? with duck_type argument" do
     before do
-      @expectation = ArgumentEqualityExpectation.new(duck_type(:to_s))
+      @expectation = ArgumentEqualityError.new(duck_type(:to_s))
     end
     
     it "returns true when passed in an DuckType matcher with the same argument list" do
@@ -26,7 +26,7 @@ module Expectations
     end
   end
 
-  describe ArgumentEqualityExpectation, "#wildcard_match? with DuckType argument" do
+  describe ArgumentEqualityError, "#wildcard_match? with DuckType argument" do
     before do
       @matching_object = Object.new
       def @matching_object.quack
@@ -40,7 +40,7 @@ module Expectations
 
       @not_match_object = Object.new
 
-      @expectation = ArgumentEqualityExpectation.new(duck_type(:quack, :waddle))
+      @expectation = ArgumentEqualityError.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

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

data/examples/rr/expectations/numeric_argument_equality_expectation_example.rb

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

data/examples/rr/expectations/range_argument_equality_expectation_example.rb

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

data/examples/rr/expectations/regexp_argument_equality_expectation_example.rb

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

data/examples/rr/expectations/times_called_expectation_example.rb

@@ -14,7 +14,7 @@ describe TimesCalledExpectation, :shared => true do
   end
 
   def raises_expectation_error(&block)
-    proc {block.call}.should raise_error(TimesCalledExpectationError)
+    proc {block.call}.should raise_error(Errors::TimesCalledError)
   end
 end
 
@@ -76,7 +76,7 @@ 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(TimesCalledExpectationError)
+    proc {@expectation.verify!}.should raise_error(Errors::TimesCalledError)
   end
 
   it "can't be called when verify_input is called 3 times" do
@@ -84,7 +84,7 @@ describe TimesCalledExpectation, "#verify! when passed an Integer (2)" do
     @expectation.verify_input
     proc do
       @expectation.verify_input
-    end.should raise_error(TimesCalledExpectationError)
+    end.should raise_error(Errors::TimesCalledError)
   end
 end
 
@@ -111,7 +111,7 @@ describe TimesCalledExpectation, "#verify! when passed a Range (1..2)" do
     @expectation.verify_input
     proc do
       @expectation.verify_input
-    end.should raise_error(TimesCalledExpectationError)
+    end.should raise_error(Errors::TimesCalledError)
   end
 end
 
@@ -130,14 +130,14 @@ describe TimesCalledExpectation, "#verify! when passed a block (== 2 times)" do
 
   it "fails after verify_input called 1 time" do
     @expectation.verify_input
-    proc {@expectation.verify!}.should raise_error(TimesCalledExpectationError)
+    proc {@expectation.verify!}.should raise_error(Errors::TimesCalledError)
   end
 
   it "fails after verify_input called 3 times" do
     @expectation.verify_input
     @expectation.verify_input
     @expectation.verify_input
-    proc {@expectation.verify!}.should raise_error(TimesCalledExpectationError)
+    proc {@expectation.verify!}.should raise_error(Errors::TimesCalledError)
   end
 end
 

data/examples/rr/extensions/double_methods_example.rb

@@ -26,7 +26,7 @@ module Extensions
 
       scenario = creator.foobar(1, 2) {:baz}
       scenario.times_called_expectation.times.should == 1
-      scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityExpectation
+      scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityError
       scenario.argument_expectation.expected_arguments.should == [1, 2]
 
       @subject.foobar(1, 2).should == :baz
@@ -56,7 +56,7 @@ module Extensions
 
       scenario = creator.foobar(1, 2) {:baz}
       scenario.times_called_expectation.should == nil
-      scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityExpectation
+      scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityError
       @subject.foobar(1, 2).should == :baz
     end
   end
@@ -84,7 +84,7 @@ module Extensions
 
       scenario = creator.foobar(1, 2)
       scenario.times_called_expectation.times.should == 1
-      scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityExpectation
+      scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityError
       scenario.argument_expectation.expected_arguments.should == [1, 2]
 
       @subject.foobar(1, 2).should == :original_value
@@ -122,7 +122,7 @@ module Extensions
 
       scenario = creator.foobar(1, 2)
       scenario.times_called_expectation.times.should == 0
-      scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityExpectation
+      scenario.argument_expectation.class.should == RR::Expectations::ArgumentEqualityError
       scenario.argument_expectation.expected_arguments.should == [1, 2]
     end
   end

data/examples/rr/mock_creator_example.rb

@@ -58,7 +58,7 @@ describe MockCreator, "#method_missing" do
 
     @subject.foobar(1, 2).should == :baz
     @subject.foobar(1, 2).should == :baz
-    proc {@subject.foobar(1, 2)}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@subject.foobar(1, 2)}.should raise_error(Errors::TimesCalledError)
   end
 end
 

data/examples/rr/probe_creator_example.rb

@@ -76,7 +76,7 @@ describe ProbeCreator, "#method_missing" do
     @creator.foobar(1, 2).twice
     @subject.foobar(1, 2).should == :baz
     @subject.foobar(1, 2).should == :baz
-    proc {@subject.foobar(1, 2)}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@subject.foobar(1, 2)}.should raise_error(Errors::TimesCalledError)
   end
 end
 

data/examples/rr/rspec/rspec_adapter_example.rb

@@ -38,7 +38,7 @@ module Adapters
 
       proc do
         @fixture.verify_mocks_for_rspec
-      end.should raise_error(::RR::Expectations::TimesCalledExpectationError)
+      end.should raise_error(::RR::Errors::TimesCalledError)
       RR::Space.instance.doubles.should be_empty
     end
   end

data/examples/rr/rspec/rspec_backtrace_tweaking_example.rb

@@ -0,0 +1,25 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/../../example_helper"
+
+describe RR, " backtrace tweaking" do
+  it "hides rr library from the backtrace by default" do
+    output = StringIO.new("")
+    backtrace_tweaker = ::Spec::Runner::QuietBacktraceTweaker.new
+    formatter = ::Spec::Runner::Formatter::BaseTextFormatter.new(output)
+    reporter = ::Spec::Runner::Reporter.new([formatter], backtrace_tweaker)
+
+    behaviour = ::Spec::DSL::Behaviour.new("example") {}
+    subject = @subject
+    behaviour.it("hides RR framework in backtrace") do
+      mock(subject).foobar()
+      RR::Space::instance.verify_double(subject, :foobar)
+    end
+
+    reporter.add_behaviour(behaviour)
+
+    behaviour.run(reporter)
+    reporter.dump
+
+    output.string.should_not include("lib/rr")
+  end
+end

data/examples/rr/scenario_example.rb

@@ -15,7 +15,7 @@ end
 describe Scenario, "#with" do
   it_should_behave_like "RR::Scenario"
 
-  it "sets an ArgumentEqualityExpectation" do
+  it "sets an ArgumentEqualityError" do
     @scenario.with(1).should === @scenario
     @scenario.should be_exact_match(1)
     @scenario.should_not be_exact_match(2)
@@ -59,8 +59,8 @@ describe Scenario, "#with_no_args" do
     @scenario.with_no_args.should === @scenario
   end
 
-  it "sets an ArgumentEqualityExpectation with no arguments" do
-    @scenario.argument_expectation.should == Expectations::ArgumentEqualityExpectation.new()
+  it "sets an ArgumentEqualityError with no arguments" do
+    @scenario.argument_expectation.should == Expectations::ArgumentEqualityError.new()
   end
 
   it "sets return value when block passed in" do
@@ -77,12 +77,12 @@ describe Scenario, "#never" do
 
   it "sets up a Times Called Expectation with 0" do
     @scenario.never
-    proc {@scenario.call}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@scenario.call}.should raise_error(Errors::TimesCalledError)
   end
 
   it "sets return value when block passed in" do
     @scenario.with_any_args.never
-    proc {@scenario.call}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@scenario.call}.should raise_error(Errors::TimesCalledError)
   end
 end
 
@@ -92,7 +92,7 @@ describe Scenario, "#once" do
   it "sets up a Times Called Expectation with 1" do
     @scenario.once.should === @scenario
     @scenario.call
-    proc {@scenario.call}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@scenario.call}.should raise_error(Errors::TimesCalledError)
   end
 
   it "sets return value when block passed in" do
@@ -108,7 +108,7 @@ describe Scenario, "#twice" do
     @scenario.twice.should === @scenario
     @scenario.call
     @scenario.call
-    proc {@scenario.call}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@scenario.call}.should raise_error(Errors::TimesCalledError)
   end
 
   it "sets return value when block passed in" do
@@ -125,7 +125,7 @@ describe Scenario, "#times" do
     @scenario.call
     @scenario.call
     @scenario.call
-    proc {@scenario.call}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@scenario.call}.should raise_error(Errors::TimesCalledError)
   end
 
   it "sets return value when block passed in" do
@@ -219,7 +219,7 @@ describe Scenario, "#call implemented by a proc" do
 
     @scenario.call(:foobar)
     @scenario.call(:foobar)
-    proc {@scenario.call(:foobar)}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@scenario.call(:foobar)}.should raise_error(Errors::TimesCalledError)
   end
 
   it "raises ScenarioOrderError when ordered and called out of order" do
@@ -231,7 +231,7 @@ describe Scenario, "#call implemented by a proc" do
 
     proc do
       @object.foobar(2)
-    end.should raise_error(::RR::ScenarioOrderError)
+    end.should raise_error(Errors::ScenarioOrderError)
   end
 
   it "dispatches to Space#verify_ordered_scenario when ordered" do
@@ -380,9 +380,9 @@ describe Scenario, "#verify" do
   it "verifies that times called expectation was met" do
     @scenario.twice.returns {:return_value}
 
-    proc {@scenario.verify}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@scenario.verify}.should raise_error(Errors::TimesCalledError)
     @scenario.call
-    proc {@scenario.verify}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@scenario.verify}.should raise_error(Errors::TimesCalledError)
     @scenario.call
     
     proc {@scenario.verify}.should_not raise_error

data/examples/rr/space_create_example.rb

@@ -14,7 +14,7 @@ describe Space, "#create_mock_creator" do
     creator = @space.create_mock_creator(@object)
     creator.foobar(1) {:baz}
     @object.foobar(1).should == :baz
-    proc {@object.foobar(1)}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@object.foobar(1)}.should raise_error(Errors::TimesCalledError)
   end
 
   it "uses block definition when passed a block" do
@@ -22,7 +22,7 @@ describe Space, "#create_mock_creator" do
       c.foobar(1) {:baz}
     end
     @object.foobar(1).should == :baz
-    proc {@object.foobar(1)}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@object.foobar(1)}.should raise_error(Errors::TimesCalledError)
   end
 end
 
@@ -70,7 +70,7 @@ describe Space, "#create_probe_creator" do
     creator = @space.create_probe_creator(@object)
     creator.foobar(1)
     @object.foobar(1).should == :original_foobar
-    proc {@object.foobar(1)}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@object.foobar(1)}.should raise_error(Errors::TimesCalledError)
   end
 
   it "uses block definition when passed a block" do
@@ -78,7 +78,7 @@ describe Space, "#create_probe_creator" do
       c.foobar(1)
     end
     @object.foobar(1).should == :original_foobar
-    proc {@object.foobar(1)}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@object.foobar(1)}.should raise_error(Errors::TimesCalledError)
   end
 end
 
@@ -93,14 +93,14 @@ describe Space, "#create_do_not_allow_creator" do
   it "creates a MockCreator" do
     creator = @space.create_do_not_allow_creator(@object)
     creator.foobar(1)
-    proc {@object.foobar(1)}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@object.foobar(1)}.should raise_error(Errors::TimesCalledError)
   end
 
   it "uses block definition when passed a block" do
     creator = @space.create_do_not_allow_creator(@object) do |c|
       c.foobar(1)
     end
-    proc {@object.foobar(1)}.should raise_error(Expectations::TimesCalledExpectationError)
+    proc {@object.foobar(1)}.should raise_error(Errors::TimesCalledError)
   end
 end
 

data/examples/rr/space_verify_example.rb

@@ -140,7 +140,7 @@ 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(RR::ScenarioOrderError)
+    end.should raise_error(Errors::ScenarioOrderError)
   end
 end
 end

data/examples/rr/test_unit/test_unit_backtrace_test.rb

@@ -0,0 +1,32 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/test_helper"
+
+class TestUnitBacktraceTest < Test::Unit::TestCase
+  def setup
+    super
+    @subject = Object.new
+  end
+
+  def teardown
+    super
+  end
+
+  def test_backtrace_tweaking
+    old_result = @_result
+    result = Test::Unit::TestResult.new
+
+    error_display = nil
+    result.add_listener(Test::Unit::TestResult::FAULT) do |f|
+      error_display = f.long_display
+    end
+    test_case = self.class.new(:backtrace_tweaking)
+    test_case.run(result) {}
+
+    assert !error_display.include?("lib/rr")
+  end
+
+  def backtrace_tweaking
+    mock(@subject).foobar
+    RR::Space::instance.verify_double(@subject, :foobar)
+  end
+end

data/examples/rr/test_unit/test_unit_integration_test.rb

@@ -32,7 +32,7 @@ class TestUnitIntegrationTest < Test::Unit::TestCase
 
   def test_times_called_verification
     mock(@subject).foobar(1, 2) {:baz}
-    assert_raise RR::Expectations::TimesCalledExpectationError do
+    assert_raise RR::Errors::TimesCalledError do
       teardown
     end
   end

data/lib/rr/adapters/rspec.rb

@@ -1,5 +1,5 @@
-require "spec/mocks"
-require "rr"
+patterns = ::Spec::Runner::QuietBacktraceTweaker::IGNORE_PATTERNS
+patterns.push(RR::Errors::BACKTRACE_IDENTIFIER)
 
 module RR
   module Adapters

data/lib/rr/adapters/test_unit.rb

@@ -1,5 +1,4 @@
-require "spec/mocks"
-require "rr"
+RR::Space.trim_backtrace = true
 
 module RR
   module Adapters

data/lib/rr/double.rb

@@ -77,7 +77,7 @@ module RR
         end
       end
       matching_scenarios.first.call(*args) unless matching_scenarios.empty?
-      raise ScenarioNotFoundError, "No scenario for arguments #{args.inspect}"
+      raise Errors::ScenarioNotFoundError, "No scenario for arguments #{args.inspect}"
     end
     
     def placeholder_name

data/lib/rr/errors/argument_equality_error.rb

@@ -0,0 +1,6 @@
+module RR
+module Errors
+  class ArgumentEqualityError < RRError
+  end
+end
+end

data/lib/rr/errors/rr_error.rb

@@ -0,0 +1,19 @@
+module RR
+module Errors
+  BACKTRACE_IDENTIFIER = /lib\/rr/
+
+  class RRError < RuntimeError
+    def backtrace
+      original_backtrace = super
+      return original_backtrace unless RR::Space.trim_backtrace
+
+      return original_backtrace unless original_backtrace.respond_to?(:each)
+      new_backtrace = []
+      original_backtrace.each do |line|
+        new_backtrace << line unless line =~ BACKTRACE_IDENTIFIER
+      end
+      new_backtrace
+    end
+  end
+end
+end

data/lib/rr/errors/scenario_not_found_error.rb

@@ -0,0 +1,6 @@
+module RR
+module Errors
+  class ScenarioNotFoundError < RRError
+  end
+end
+end

data/lib/rr/errors/scenario_order_error.rb

@@ -0,0 +1,6 @@
+module RR
+module Errors
+  class ScenarioOrderError < RRError
+  end
+end
+end

data/lib/rr/errors/times_called_error.rb

@@ -0,0 +1,6 @@
+module RR
+module Errors
+  class TimesCalledError < RRError
+  end
+end
+end

data/lib/rr/expectations/argument_equality_expectation.rb

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

data/lib/rr/expectations/times_called_expectation.rb

@@ -1,8 +1,5 @@
 module RR
   module Expectations
-    class TimesCalledExpectationError < RuntimeError
-    end
-    
     class TimesCalledExpectation
       attr_reader :times, :times_called
       
@@ -27,12 +24,12 @@ module RR
       end
 
       def verify!
-        raise TimesCalledExpectationError unless verify
+        raise Errors::TimesCalledError unless verify
       end
 
       protected
       def verify_input_error
-        raise TimesCalledExpectationError, "Called #{@times_called.inspect} times. Expected #{@times.inspect}"
+        raise Errors::TimesCalledError, "Called #{@times_called.inspect} times. Expected #{@times.inspect}"
       end
     end
   end

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 ArgumentEqualityExpectation
+    # Sets up an Anything wildcard ArgumentEqualityError
     # 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::Expectations::WildcardMatchers::Anything.new
     end
 
-    # Sets up an IsA wildcard ArgumentEqualityExpectation
+    # Sets up an IsA wildcard ArgumentEqualityError
     # 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::Expectations::WildcardMatchers::IsA.new(klass)
     end
 
-    # Sets up an Numeric wildcard ArgumentEqualityExpectation
+    # Sets up an Numeric wildcard ArgumentEqualityError
     # 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::Expectations::WildcardMatchers::Numeric.new
     end
 
-    # Sets up an Boolean wildcard ArgumentEqualityExpectation
+    # Sets up an Boolean wildcard ArgumentEqualityError
     # 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::Expectations::WildcardMatchers::Boolean.new
     end
 
-    # Sets up a DuckType wildcard ArgumentEqualityExpectation
+    # Sets up a DuckType wildcard ArgumentEqualityError
     # that succeeds when passed the argument implements the methods.
     #   arg = Object.new
     #   def arg.foo; end

data/lib/rr/scenario.rb

@@ -1,6 +1,6 @@
 module RR
   # RR::Scenario is the use case for a method call.
-  # It has the ArgumentEqualityExpectation, TimesCalledExpectation,
+  # It has the ArgumentEqualityError, TimesCalledExpectation,
   # and the implementation.
   class Scenario
     attr_reader :times_called, :argument_expectation, :times_called_expectation
@@ -13,19 +13,19 @@ module RR
       @times_called = 0
     end
 
-    # Scenario#with creates an ArgumentEqualityExpectation for the
+    # Scenario#with creates an ArgumentEqualityError 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::ArgumentEqualityExpectation.new(*args)
+      @argument_expectation = Expectations::ArgumentEqualityError.new(*args)
       returns(&returns) if returns
       self
     end
 
-    # Scenario#with_any_args creates an AnyArgumentEqualityExpectation
+    # Scenario#with_any_args creates an AnyArgumentEqualityError
     # for the Scenario.
     #
     # Passing in a block sets the return value.
@@ -37,14 +37,14 @@ module RR
       self
     end
 
-    # Scenario#with_no_args creates an ArgumentEqualityExpectation with
+    # Scenario#with_no_args creates an ArgumentEqualityError 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::ArgumentEqualityExpectation.new()
+      @argument_expectation = Expectations::ArgumentEqualityError.new()
       returns(&returns) if returns
       self
     end
@@ -136,7 +136,7 @@ module RR
     # Scenario#call calls the Scenario's implementation. The return
     # value of the implementation is returned.
     #
-    # A TimesCalledExpectationError is raised when the times called
+    # A TimesCalledError is raised when the times called
     # exceeds the expected TimesCalledExpectation.
     def call(*args, &block)
       @times_called_expectation.verify_input if @times_called_expectation
@@ -152,14 +152,14 @@ module RR
     end
 
     # Scenario#exact_match? returns true when the passed in arguments
-    # exactly match the ArgumentEqualityExpectation arguments.
+    # exactly match the ArgumentEqualityError 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 ArgumentEqualityExpectation arguments.
+    # wildcard match the ArgumentEqualityError arguments.
     def wildcard_match?(*arguments)
       return false unless @argument_expectation
       @argument_expectation.wildcard_match?(*arguments)
@@ -173,7 +173,7 @@ module RR
     end
 
     # Scenario#verify verifies the the TimesCalledExpectation
-    # is satisfied for this scenario. A TimesCalledExpectationError
+    # is satisfied for this scenario. A TimesCalledError
     # is raised if the TimesCalledExpectation is not met.
     def verify
       return true unless @times_called_expectation

data/lib/rr/space.rb

@@ -16,9 +16,11 @@ module RR
     end
 
     attr_reader :doubles, :ordered_scenarios
+    attr_accessor :trim_backtrace
     def initialize
       @doubles = Hash.new {|hash, subject_object| hash[subject_object] = Hash.new}
       @ordered_scenarios = []
+      @trim_backtrace = false
     end
 
     # Creates a MockCreator.
@@ -70,7 +72,7 @@ module RR
     # Verifies that the passed in ordered Scenario is being called
     # in the correct position.
     def verify_ordered_scenario(scenario)
-      raise ::RR::ScenarioOrderError unless @ordered_scenarios.first == scenario
+      raise Errors::ScenarioOrderError unless @ordered_scenarios.first == scenario
       @ordered_scenarios.shift if scenario.times_called_verified?
       scenario
     end

data/lib/rr.rb

@@ -10,8 +10,11 @@ require "rr/do_not_allow_creator"
 require "rr/scenario"
 require "rr/space"
 
-require "rr/scenario_not_found_error"
-require "rr/scenario_order_error"
+require "rr/errors/rr_error"
+require "rr/errors/scenario_not_found_error"
+require "rr/errors/scenario_order_error"
+require "rr/errors/argument_equality_error"
+require "rr/errors/times_called_error"
 
 require "rr/expectations/argument_equality_expectation"
 require "rr/expectations/any_argument_expectation"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-07-07 00:00:00 -07:00
+  version: 0.1.1
+date: 2007-07-08 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
@@ -34,8 +34,6 @@ files:
 - README
 - lib/rr.rb
 - lib/rr/scenario.rb
-- lib/rr/scenario_not_found_error.rb
-- lib/rr/scenario_order_error.rb
 - lib/rr/stub_creator.rb
 - lib/rr/space.rb
 - lib/rr/double.rb
@@ -52,6 +50,11 @@ files:
 - lib/rr/expectations/wildcard_matchers/numeric.rb
 - lib/rr/expectations/wildcard_matchers/is_a.rb
 - lib/rr/expectations/wildcard_matchers/anything.rb
+- lib/rr/errors/scenario_not_found_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/adapters/test_unit.rb
 - lib/rr/adapters/rspec.rb
 - lib/rr/extensions/double_methods.rb
@@ -78,6 +81,7 @@ files:
 - 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
 - examples/rr/expectations/is_a_argument_equality_expectation_example.rb
@@ -90,6 +94,8 @@ files:
 - 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/errors/rr_error_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
 - examples/rr/extensions/double_methods_example.rb

data/lib/rr/scenario_not_found_error.rb

@@ -1,4 +0,0 @@
-module RR
-  class ScenarioNotFoundError < RuntimeError
-  end  
-end

data/lib/rr/scenario_order_error.rb

@@ -1,4 +0,0 @@
-module RR
-class ScenarioOrderError < RuntimeError
-end
-end