rr 0.4.4 → 0.4.5

data/CHANGES

@@ -1,3 +1,6 @@
+* 0.4.5
+- Fixed doubles for == and #eql? methods
+
 * 0.4.4
 - Doc improvements
 - Methods that are not alphabetic, such as ==, can be doubles

data/Rakefile

@@ -26,7 +26,7 @@ def run_suite
 end
 
 PKG_NAME = "rr"
-PKG_VERSION = "0.4.4"
+PKG_VERSION = "0.4.5"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

data/lib/rr/double_injection.rb

@@ -67,7 +67,7 @@ module RR
     protected
     def define_implementation_placeholder
       me = self
-      meta.send(:define_method, placeholder_name) do |arguments|
+      meta.__send__(:define_method, placeholder_name) do |arguments|
         me.__send__(:call_method, arguments.arguments, arguments.block)
       end
     end

data/lib/rr/expectations/argument_equality_expectation.rb

@@ -8,7 +8,10 @@ module RR
       end
 
       def exact_match?(*arguments)
-        @expected_arguments == arguments
+        return false unless arguments.length == @expected_arguments.length
+        arguments.each_with_index do |arg, index|
+          return false unless equality_match(@expected_arguments[index], arg)
+        end
       end
 
       def wildcard_match?(*arguments)
@@ -18,7 +21,7 @@ module RR
           if expected_argument.respond_to?(:wildcard_match?)
             return false unless expected_argument.wildcard_match?(arg)
           else
-            return false unless expected_argument == arg
+            return false unless equality_match(expected_argument, arg)
           end
         end
         return true
@@ -27,6 +30,11 @@ module RR
       def ==(other)
         @expected_arguments == other.expected_arguments
       end
+
+      protected
+      def equality_match(arg1, arg2)
+        arg1.respond_to?(:__rr__eql?) ? arg1 == arg2 : arg1.eql?(arg2)
+      end
     end
   end
 end

data/lib/rr/wildcard_matchers/anything.rb

@@ -8,6 +8,7 @@ module RR
       def ==(other)
         other.is_a?(self.class)
       end
+      alias_method :eql?, :==
 
       def inspect
         'anything'

data/lib/rr/wildcard_matchers/boolean.rb

@@ -8,6 +8,7 @@ module RR
       def ==(other)
         other.is_a?(self.class)
       end
+      alias_method :eql?, :==
 
       def inspect
         'boolean'

data/lib/rr/wildcard_matchers/duck_type.rb

@@ -26,6 +26,7 @@ module RR
         return false unless other.is_a?(self.class)
         self.required_methods == other.required_methods
       end
+      alias_method :eql?, :==
     end
   end
 end

data/lib/rr/wildcard_matchers/is_a.rb

@@ -19,6 +19,7 @@ module RR
         return false unless other.is_a?(self.class)
         self.klass == other.klass
       end
+      alias_method :eql?, :==
     end
   end
 end

data/spec/rr/expectations/argument_equality_expectation_spec.rb

@@ -1,58 +1,103 @@
 require "spec/spec_helper"
 
 module RR
-module Expectations
-  describe ArgumentEqualityExpectation do
-    attr_reader :expectation
-    before do
-      @expectation = ArgumentEqualityExpectation.new(1, 2, 3)
-    end
-    
-    describe "#expected_arguments" do
-      it "returns the passed in expected_arguments" do
-        expectation.expected_arguments.should == [1, 2, 3]
+  module Expectations
+    describe ArgumentEqualityExpectation do
+      attr_reader :expectation
+      before do
+        @expectation = ArgumentEqualityExpectation.new(1, 2, 3)
       end
-    end
 
-    describe "==" do
-      it "returns true when passed in expected_arguments are equal" do
-        expectation.should == ArgumentEqualityExpectation.new(1, 2, 3)
+      describe "#expected_arguments" do
+        it "returns the passed in expected_arguments" do
+          expectation.expected_arguments.should == [1, 2, 3]
+        end
       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()
+      describe "==" do
+        it "returns true when passed in expected_arguments are equal" do
+          expectation.should == ArgumentEqualityExpectation.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()
+        end
       end
-    end
 
-    describe "#exact_match?" do
-      it "returns true when all arguments exactly match" do
-        expectation.should be_exact_match(1, 2, 3)
-        expectation.should_not be_exact_match(1, 2)
-        expectation.should_not be_exact_match(1)
-        expectation.should_not be_exact_match()
-        expectation.should_not be_exact_match("does not match")
+      describe "#exact_match?" do
+        it "returns true when all arguments exactly match" do
+          expectation.should be_exact_match(1, 2, 3)
+          expectation.should_not be_exact_match(1, 2)
+          expectation.should_not be_exact_match(1)
+          expectation.should_not be_exact_match()
+          expectation.should_not be_exact_match("does not match")
+        end
       end
-    end
 
-    describe "#wildcard_match?" do
-      it "returns false when not exact match" do
-        expectation = ArgumentEqualityExpectation.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")
+      describe "#wildcard_match?" do
+        it "returns false when not exact match" do
+          expectation = ArgumentEqualityExpectation.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.should be_wildcard_match(1, 2)
+          expectation.should_not be_wildcard_match(1)
+          expectation.should_not be_wildcard_match("whatever", "else")
+        end
       end
 
-      it "returns true when exact match" do
-        expectation = ArgumentEqualityExpectation.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")
+      describe "Functional spec" do
+        class ArgumentEqualityFunctionalFixture
+          attr_reader :arg1, :arg2
+          def initialize(arg1, arg2)
+            @arg1, @arg2 = arg1, arg2
+          end
+
+          def ==(other)
+            arg1 == (other.arg1) &&
+            arg2 == (other.arg2)
+          end
+
+          def eql?(other)
+            arg1.eql?(other.arg1) &&
+            arg2.eql?(other.arg2)
+          end
+        end
+
+        before(:each) do
+          @predicate1 = 'first' # these should be mocks, waiting on rr bug fix
+          @predicate2 = 'second'
+          @predicate3 = 'third'
+        end
+
+        it "when mock.proxy ==, does not have infinite recursion" do
+          mock.proxy(@predicate1) == @predicate1
+          mock.proxy(@predicate2) == @predicate2
+          ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2).should == ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2)
+
+          mock.proxy(@predicate1) == @predicate1
+          mock.proxy(@predicate2) == @predicate3
+          ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2).should_not == ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate3)
+        end
+
+        it "when mock.proxy .eql?, does not have infinite recursion" do
+          mock.proxy(@predicate1).eql? @predicate1
+          mock.proxy(@predicate2).eql? @predicate2
+          ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2).should be_eql(ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2))
+
+          mock.proxy(@predicate1).eql? @predicate1
+          mock.proxy(@predicate2).eql? @predicate3
+          ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate2).should_not be_eql(ArgumentEqualityFunctionalFixture.new(@predicate1, @predicate3))
+        end
       end
     end
-  end
 
-end
+  end
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 date: 2008-01-15 00:00:00 -08: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: