hardmock 1.3.6 → 1.3.7

data/CHANGES

@@ -1,7 +1,11 @@
+Hardmock 1.3.7
+
+* BUG FIX: expects! could not setup expectations for more than one concrete method on an object, since the method aliasing and rewriting was only taking place when the background mock instance was first created.  This logic has been updated and now you can do all the things you'd expect.
+
 Hardmock 1.3.6
 
 * BUG FIX: In Rails apps (and others) Hardmock and Fixtures battled viciously over "setup" and "teardown" and "method_added" (and any other clever test enhancement tool, namely Mocha) causing unpredictable results, notably failure to auto-verify mocks after teardown (leading to false positive tests).
-** The newly-added TestUnitBeforeAfter provides TestCase.before_setup and TestCase.after_teardown -- formal test wrapping hooks -- lets Hardmock provide its preparation and auto-verify behavior without contending for setup/teardown supremacy.  
+  * The newly-added TestUnitBeforeAfter provides TestCase.before_setup and TestCase.after_teardown -- formal test wrapping hooks -- lets Hardmock provide its preparation and auto-verify behavior without contending for setup/teardown supremacy.  
 
 Hardmock 1.3.5
 

data/README

@@ -66,5 +66,6 @@ This puts the implicit conveniences into your spec context, like "create_mocks"
 "verify_mocks" after each Example is run.
 
 == Author
+
 * David Crosby crosby at http://atomicobject.com
 * (c) 2006,2007 Atomic Object LLC 

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake'
 require 'rubygems'
 
-HARDMOCK_VERSION = "1.3.6"
+HARDMOCK_VERSION = "1.3.7"
 
 Dir["rake_tasks/*.rake"].each { |f| load f }
 

data/lib/hardmock/stubbing.rb

@@ -109,16 +109,22 @@ module Hardmock
 
       method_name = method_name.to_s
 
-      if @_my_mock.nil?
-        @_my_mock = Mock.new(_my_name, $main_mock_control)
+      @_my_mock = Mock.new(_my_name, $main_mock_control) if @_my_mock.nil?
+
+      unless Hardmock.has_replaced_method?(self, method_name)
+        # Track the method as replaced
         Hardmock::ReplacedMethod.new(self, method_name)
 
-        if methods.include?(method_name.to_s)
+        # Preserver original implementation of the method by aliasing it away
+        if methods.include?(method_name)
           hm_meta_eval do 
             alias_method "_hardmock_original_#{method_name}".to_sym, method_name.to_sym
           end
         end
 
+        # Re-define the method to utilize our patron mock instance.
+        # (This global-temp-var thing is hokey but I was having difficulty generating 
+        # code for the meta class.)
         begin
           $method_text_temp = %{
             def #{method_name}(*args,&block)
@@ -131,7 +137,6 @@ module Hardmock
         ensure
           $method_text_temp = nil
         end
-
       end
 
       return @_my_mock.expects(method_name, *args, &block)

data/lib/test_unit_before_after.rb

@@ -11,10 +11,9 @@ module Test #:nodoc:#
     # Use after_teardown to define one or more actions to be executed after teardown for ALL tests.
     #
     # COMING SOON?
-    # * Hook for running actions prior to setup
-    # * Hooks for before_teardown, after_setup, on_error
-    # * Options for positional control, eg, after_teardown :before_other_actions
-    # * Provide tagging/filtering so action execution can be controlled specifically?
+    # * (maybe?) Hooks for before_teardown, after_setup, on_error
+    # * (maybe?) Options for positional control, eg, after_teardown :before_other_actions
+    # * (maybe?) Provide tagging/filtering so action execution can be controlled specifically?
     #
     # == Usage
     #

data/test/functional/stubbing_test.rb

@@ -313,6 +313,80 @@ class StubbingTest < Test::Unit::TestCase
     reset_stubs
   end
 
+  it "can mock several different class methods at once" do
+    sim_code = lambda do |input|
+      record = Multitool.find_record(input)
+      report = Multitool.generate_report(record)
+      Multitool.format_output(report)
+    end
+
+    @identifier = "the id"
+    @record = "the record"
+    @report = "the report"
+    @output = "the output"
+
+    Multitool.expects!(:find_record).with(@identifier).returns(@record)
+    Multitool.expects!(:generate_report).with(@record).returns(@report)
+    Multitool.expects!(:format_output).with(@report).returns(@output)
+
+    result = sim_code.call(@identifier)
+    assert_equal @output, result, "Wrong output"
+  end
+
+  it "can handle a mix of different and repeat class method mock calls" do
+    prep = lambda {
+      Multitool.expects!(:find_record).with("A").returns("1")
+      Multitool.expects!(:generate_report).with("1")
+      Multitool.expects!(:find_record).with("B").returns("2")
+      Multitool.expects!(:generate_report).with("2")
+    }
+
+    prep[]
+    Multitool.generate_report(Multitool.find_record("A"))
+    Multitool.generate_report(Multitool.find_record("B"))
+
+    prep[]
+    Multitool.generate_report(Multitool.find_record("A"))
+    assert_error Hardmock::ExpectationError, /Wrong arguments/, /find_record\("B"\)/, /find_record\("C"\)/ do
+      Multitool.generate_report(Multitool.find_record("C"))
+    end
+    clear_expectations
+  end
+
+  it "can mock several concrete instance methods at once" do
+    inst = OtherMultitool.new
+    sim_code = lambda do |input|
+      record = inst.find_record(input)
+      report = inst.generate_report(record)
+      inst.format_output(report)
+    end
+
+    @identifier = "the id"
+    @record = "the record"
+    @report = "the report"
+    @output = "the output"
+
+    inst.expects!(:find_record).with(@identifier).returns(@record)
+    inst.expects!(:generate_report).with(@record).returns(@report)
+    inst.expects!(:format_output).with(@report).returns(@output)
+
+    result = sim_code.call(@identifier)
+    assert_equal @output, result, "Wrong output"
+  end
+
+  it "verifies all concrete expects! from several different expectations" do
+    Multitool.expects!(:find_record)
+    Multitool.expects!(:generate_report)
+    Multitool.expects!(:format_output)
+
+    Multitool.find_record
+    Multitool.generate_report
+
+    assert_error Hardmock::VerifyError, /unmet expectations/i, /format_output/i do
+      verify_mocks
+    end
+  end
+
   it "will not allow expects! to be used on a mock object" do
     create_mock :cow
     assert_error Hardmock::StubbingError, /expects!/, /mock/i, /something/ do
@@ -377,5 +451,29 @@ class StubbingTest < Test::Unit::TestCase
     end
   end
 
+  class Multitool
+    def self.find_record(*a)
+      raise "The real Multitool.find_record was called with #{a.inspect}"
+    end
+    def self.generate_report(*a)
+      raise "The real Multitool.generate_report was called with #{a.inspect}"
+    end
+    def self.format_output(*a)
+      raise "The real Multitool.format_output was called with #{a.inspect}"
+    end
+  end
+
+  class OtherMultitool
+    def find_record(*a)
+      raise "The real OtherMultitool#find_record was called with #{a.inspect}"
+    end
+    def generate_report(*a)
+      raise "The real OtherMultitool#generate_report was called with #{a.inspect}"
+    end
+    def format_output(*a)
+      raise "The real OtherMultitool#format_output was called with #{a.inspect}"
+    end
+  end
+
 end
 

data/test/unit/test_unit_before_after_test.rb

@@ -182,7 +182,7 @@ class TestUnitBeforeAfter < Test::Unit::TestCase
       "test_something(MyExampleTest):",
       "RuntimeError: Error in 2nd before_setup",
       "_test_file_temp.rb:10",
-      "/hardmock/lib/test_unit_before_after.rb:136:in `call'"
+      "/hardmock/lib/test_unit_before_after.rb:"
     see_results :tests => 1, :assertions => 0, :failures => 0, :errors => 1
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hardmock
 version: !ruby/object:Gem::Version 
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors: 
 - David Crosby
@@ -9,7 +9,7 @@ autorequire: hardmock
 bindir: bin
 cert_chain: []
 
-date: 2007-12-11 00:00:00 -05:00
+date: 2009-11-08 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -62,7 +62,9 @@ files:
 - CHANGES
 - LICENSE
 has_rdoc: true
-homepage: http://hardmock.rubyforge.org
+homepage: http://atomicobject.github.com/hardmock
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -88,9 +90,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hardmock
-rubygems_version: 0.9.5
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A strict, ordered, expectation-oriented mock object library.
 test_files: 
 - test/functional/assert_error_test.rb