flexmock 0.6.0 → 0.6.1

data/CHANGELOG

@@ -2,6 +2,11 @@
 
 = Changes for FlexMock
 
+== Version 0.6.1
+
+* Fixed bug that prevented mocks from mocking field assignment operators.
+* Fixed bug that prevented partial mocks from being ordered.
+
 == Version 0.6.0
 
 * Dropped class interception.

data/README

@@ -3,7 +3,7 @@
 FlexMock is a simple, but flexible, mock object library for Ruby unit
 testing.
 
-Version :: 0.6.0
+Version :: 0.6.1
 
 = Links
 
@@ -155,7 +155,7 @@ expectation and adds constraints to that.
 
 For example, the following code:
 
-    mock.should_recieve(:average).and_return(12)
+    mock.should_receive(:average).and_return(12)
 
 Means that the mock will now accept method calls to an +average+ method. The
 expectation will accept any arguments and may be called any number of times
@@ -545,7 +545,7 @@ All the query message must occur before any of the update messages.
    def test_query_and_update
      db = flexmock('db')
      db.should_receive(:query).and_return([1,2,3]).ordered
-     db.should_recieve(:update).and_return(nil).ordered
+     db.should_receive(:update).and_return(nil).ordered
      # test code here
    end
 
@@ -637,7 +637,7 @@ ignoring.
 
    def test_an_important_message
      m = flexmock('m')
-     m.should_recieve(:an_important_message).and_return(1).once
+     m.should_receive(:an_important_message).and_return(1).once
      m.should_ignore_missing
      # test code here
    end

data/Rakefile

@@ -19,7 +19,7 @@ require 'rake/contrib/rubyforgepublisher'
 CLEAN.include('*.tmp')
 CLOBBER.include("html", 'pkg')
 
-PKG_VERSION = '0.6.0'
+PKG_VERSION = '0.6.1'
 
 PKG_FILES = FileList[
   '[A-Z]*',

data/doc/releases/flexmock-0.6.0.rdoc

@@ -32,7 +32,7 @@ FlexMock is a flexible mocking library for use in unit testing and behavior spec
     flexmock.should_receive(:read, :write).at_least.once
 
 
-* +should_recieve+ now will allow expectation hashes as arguments. This is
+* +should_receive+ now will allow expectation hashes as arguments. This is
   similar to the list of methods, but allows each defined method to have its
   own return value.
 

data/doc/releases/flexmock-0.6.1.rdoc

@@ -0,0 +1,91 @@
+= FlexMock 0.6.1 Released
+
+FlexMock is a flexible mocking library for use in unit testing and behavior
+specification in Ruby. Version 0.6.1 introduces a number minor bug fixes.
+
+== New in 0.6.1
+
+* Fixed several bugs related to partial mocks and ordering and mocking field
+  assignments.
+
+== What is FlexMock?
+
+FlexMock is a flexible framework for creating mock object for testing. When
+running unit tests, it is often desirable to use isolate the objects being
+tested from the "real world" by having them interact with simplified test
+objects. Sometimes these test objects simply return values when called, other
+times they verify that certain methods were called with particular arguments
+in a particular order.
+
+FlexMock makes creating these test objects easy.
+
+=== Features
+
+* Easy integration with both Test::Unit and RSpec. Mocks created with the
+  flexmock method are automatically verified at the end of the test or
+  example.
+
+* A fluent interface that allows mock behavior to be specified very
+  easily.
+
+* A "record mode" where an existing implementation can record its
+  interaction with a mock for later validation against a new
+  implementation.
+
+* Easy mocking of individual methods in existing, non-mock objects.
+
+* The ability to cause classes to instantiate test instances (instead of real
+  instances) for the duration of a test.
+
+=== Example
+
+Suppose you had a Dog object that wagged a tail when it was happy.
+Something like this:
+
+  class Dog
+    def initialize(a_tail)
+      @tail = a_tail
+    end
+    def happy
+      @tail.wag
+    end
+  end
+
+To test the +Dog+ class without a real +Tail+ object (perhaps because
+real +Tail+ objects activate servos in some robotic equipment), you
+can do something like this:
+
+require 'test/unit'
+require 'flexmock/test_unit'
+
+  class TestDog < Test::Unit::TestCase
+    def test_dog_wags_tail_when_happy
+      tail = flexmock("tail")
+      tail.should_receive(:wag).once
+      dog = Dog.new(tail)
+      dog.happy
+    end
+  end
+
+FlexMock will automatically verify that the mocked tail object received the
+message +wag+ exactly one time. If it doesn't, the test will not pass.
+
+See the FlexMock documentation at http://flexmock.rubyforge.org for details on
+specifying arguments and return values on mocked methods, as well as a simple
+technique for mocking tail objects when the Dog class creates the tail objects
+directly.
+
+== Availability
+
+You can make sure you have the latest version with a quick RubyGems command:
+
+  gem install flexmock    (you may need root/admin privileges)
+
+Otherwise, you can get it from the more traditional places:
+
+Download::  http://rubyforge.org/project/showfiles.php?group_id=170
+
+You will find documentation at: http://flexmock.rubyforge.org.
+
+-- Jim Weirich
+

data/lib/flexmock/core.rb

@@ -85,7 +85,6 @@ class FlexMock
 
   # Allocation a new order number from the mock.
   def mock_allocate_order
-    @auto_allocate = true
     @allocated_order += 1
   end
 

data/lib/flexmock/partial_mock.rb

@@ -13,19 +13,18 @@ require 'flexmock/noop'
 
 class FlexMock
   
-  ####################################################################
-  # PartialMock is used to mate the mock framework to an existing
-  # object.  The object is "enhanced" with a reference to a mock
-  # object (stored in <tt>@flexmock_mock</tt>).  When the
-  # +should_receive+ method is sent to the proxy, it overrides the
-  # existing object's method by creating  singleton method that
-  # forwards to the mock.  When testing is complete, PartialMock
-  # will erase the mocking infrastructure from the object being
-  # mocked (e.g. remove instance variables and mock singleton
-  # methods).
+  # #########################################################################
+  # PartialMock is used to mate the mock framework to an existing object.  The
+  # object is "enhanced" with a reference to a mock object (stored in
+  # <tt>@flexmock_mock</tt>).  When the +should_receive+ method is sent to the
+  # proxy, it overrides the existing object's method by creating  singleton
+  # method that forwards to the mock.  When testing is complete, PartialMock
+  # will erase the mocking infrastructure from the object being mocked (e.g.
+  # remove instance variables and mock singleton methods).
   #
   class PartialMock
-    attr_reader :mock
+    attr_reader :mock, :mock_groups
+    attr_accessor :mock_current_order, :mock_container
 
     # Initialize a PartialMock object.
     def initialize(obj, mock)
@@ -33,6 +32,9 @@ class FlexMock
       @mock = mock
       @method_definitions = {}
       @methods_proxied = []
+      @allocated_order = 0
+      @mock_current_order = 0
+      @mock_groups = {}
     end
 
     # :call-seq:
@@ -132,16 +134,9 @@ class FlexMock
       end
     end
 
-    # Return the container for this mocking object.  Returns nil if the
-    # mock is not in a container.  Mock containers make sure that mock objects
-    # inside the container are torn down at the end of a test
-    def mock_container
-      @mock.mock_container
-    end
-
-    # Set the container for this mock object.
-    def mock_container=(container)
-      @mock.mock_container = container
+    # Allocation a new order number from the mock.
+    def mock_allocate_order
+      @allocated_order += 1
     end
 
     private
@@ -189,9 +184,19 @@ class FlexMock
     # proxy method is defined as a singleton method on the object
     # being mocked.
     def define_proxy_method(method_name)
-      sclass.class_eval %{
-        def #{method_name}(*args, &block)  @flexmock_proxy.mock.#{method_name}(*args, &block)  end
-      }
+      if method_name.to_s =~ /=$/
+        sclass.class_eval %{
+          def #{method_name}(*args, &block)
+            @flexmock_proxy.mock.__send__(:#{method_name}, *args, &block) 
+          end
+        }
+      else
+        sclass.class_eval %{
+          def #{method_name}(*args, &block)
+            @flexmock_proxy.mock.#{method_name}(*args, &block) 
+          end
+        }
+      end
     end
 
     # Restore the original singleton defintion for method_name that

data/test/test_new_instances.rb

@@ -191,6 +191,30 @@ class TestNewInstances < Test::Unit::TestCase
     assert_equal :grrr, Dog.new.woof
   end
   
+  def test_writable_accessors
+    flexmock(Dog).new_instances.should_receive(:name=).with("fido")
+    dog = Dog.new
+    dog.name = 'fido'
+  end
+  
+  def test_ordering_can_be_specified
+    dog = Dog.new
+    flexmock(dog).should_receive(:bark).once.ordered
+    flexmock(dog).should_receive(:bite).once.ordered
+    dog.bark
+    dog.bite
+  end
+  
+  def test_ordering_can_be_specified_in_groups
+    dog = Dog.new
+    flexmock(dog).should_receive(:wag).once.ordered(:safe)
+    flexmock(dog).should_receive(:bark).once.ordered(:danger)
+    flexmock(dog).should_receive(:bite).once.ordered(:danger)
+    dog.wag
+    dog.bite
+    dog.bark
+  end
+  
   def redirect_error
     require 'stringio'
     old_err = $stderr

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: flexmock
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2007-04-14 00:00:00 -04:00
+  version: 0.6.1
+date: 2007-05-08 00:00:00 -04:00
 summary: Simple and Flexible Mock Objects for Testing
 require_paths: 
 - lib
@@ -74,6 +74,7 @@ files:
 - doc/releases/flexmock-0.5.0.rdoc
 - doc/releases/flexmock-0.5.1.rdoc
 - doc/releases/flexmock-0.6.0.rdoc
+- doc/releases/flexmock-0.6.1.rdoc
 test_files: []
 
 rdoc_options: 
@@ -93,6 +94,7 @@ extra_rdoc_files:
 - doc/releases/flexmock-0.5.0.rdoc
 - doc/releases/flexmock-0.5.1.rdoc
 - doc/releases/flexmock-0.6.0.rdoc
+- doc/releases/flexmock-0.6.1.rdoc
 executables: []
 
 extensions: []