flexmock 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,5 +1,11 @@
 = Changes for FlexMock
 
+== Version 0.1.3
+
+* Improved the definition of ordered so that it takes group names
+  instead of explicit order numbers.  This make the code easier to
+  write and the API easier to understand.
+
 == Version 0.1.2
 
 * Fixed homepage in gem spec.

data/README

@@ -3,7 +3,7 @@
 FlexMock is a simple mock object for unit testing.  The interface is
 simple, but still provides a good bit of flexibility.
 
-Version :: 0.1.2
+Version :: 0.1.3
 
 = Links
 

data/Rakefile

@@ -8,7 +8,7 @@ require 'rake/testtask'
 
 CLOBBER.include("html", 'pkg')
 
-PKG_VERSION = '0.1.2'
+PKG_VERSION = '0.1.3'
 
 PKG_FILES = FileList[
   '[A-Z]*',

data/lib/flexmock.rb

@@ -33,7 +33,7 @@ require 'test/unit'
 class FlexMock
   include Test::Unit::Assertions
 
-  attr_reader :mock_name
+  attr_reader :mock_name, :mock_groups
   attr_accessor :mock_current_order
 
   # Create a FlexMock object with the given name.  The name is used in
@@ -43,6 +43,7 @@ class FlexMock
     @expectations = Hash.new
     @allocated_order = 0
     @mock_current_order = 0
+    @mock_groups = {}
   end
   
   # Handle all messages denoted by +sym+ by calling the given block
@@ -70,19 +71,6 @@ class FlexMock
     @allocated_order += 1
   end
 
-  # Allocation a new order number from the mock.
-  def mock_reallocate(n)
-    if @auto_allocate && n <= @allocated_order
-      FlexMock.failure "explicit order number #{n} must be greater than " +
-	@allocated_order.to_s
-    elsif (n < @allocated_order)
-      FlexMock.failure "explicit order number #{n} must be greater than or equal to " +
-	@allocated_order.to_s
-    end
-    @auto_allocate = false
-    @allocated_order = n
-  end
-
   # Ignore all undefined (missing) method calls.
   def should_ignore_missing
     @ignore_missing = true
@@ -460,24 +448,30 @@ class FlexMock
     # If the user needs more fine control over ordering
     # (e.g. specifying that a group of messages may be received in any
     # order as long as they all come after another group of messages),
-    # a _order_ _number_ may be specified in the +ordered+ calls
+    # a _group_ _name__ may be specified in the +ordered+ calls.  All
+    # messages within the same group may be recieved in any order.
     #
     # For example, in the following, messages +flip+ and +flop+ may be
-    # received in any order (because they have the same order number),
-    # but must occur strictly after +start+ but before +end+.
+    # received in any order (because they are in the same group), but
+    # must occur strictly after +start+ but before +end+.  The message
+    # +any_time+ may be received at any time because it is not
+    # ordered.
     #
     #    m = FlexMock.new
+    #    m.should_receive(:any_time)
     #    m.should_receive(:start).ordered
-    #    m.should_receive(:flip).ordered(10)
-    #    m.should_receive(:flop).ordered(10)
+    #    m.should_receive(:flip).ordered(:flip_flop_group)
+    #    m.should_receive(:flop).ordered(:flip_flop_group)
     #    m.should_receive(:end).ordered
     #
-    def ordered(order=nil)
-      if order.nil?
+    def ordered(group_name=nil)
+      if group_name.nil?
 	@order_number = @mock.mock_allocate_order
+      elsif (num = @mock.mock_groups[group_name])
+	@order_number = num
       else
-	@order_number = order
-	@mock.mock_reallocate order
+	@order_number = @mock.mock_allocate_order
+	@mock.mock_groups[group_name] = @order_number
       end
       self
     end

data/test/test_should_receive.rb

@@ -375,11 +375,26 @@ class TestFlexMock < Test::Unit::TestCase
     end
   end
 
-  def test_explicit_ordering
+  def test_grouped_ordering
     FlexMock.use 'm' do |m|
-      m.should_receive(:start).ordered(2)
-      m.should_receive(:flip).ordered(10)
-      m.should_receive(:flop).ordered(10)
+      m.should_receive(:start).ordered(:start_group)
+      m.should_receive(:flip).ordered(:flip_flop_group)
+      m.should_receive(:flop).ordered(:flip_flop_group)
+      m.should_receive(:final).ordered
+      
+      m.start
+      m.flop
+      m.flip
+      m.flop
+      m.final
+    end
+  end
+
+  def test_grouped_ordering_with_symbols
+    FlexMock.use 'm' do |m|
+      m.should_receive(:start).ordered(:group_one)
+      m.should_receive(:flip).ordered(:group_two)
+      m.should_receive(:flop).ordered(:group_two)
       m.should_receive(:final).ordered
       
       m.start
@@ -393,27 +408,18 @@ class TestFlexMock < Test::Unit::TestCase
   def test_explicit_ordering_mixed_with_implicit_ordering_should_not_overlap
     FlexMock.use 'm' do |m|
       xstart = m.should_receive(:start).ordered
-      xmid = m.should_receive(:mid).ordered(2)
+      xmid = m.should_receive(:mid).ordered(:group_name)
       xend = m.should_receive(:end).ordered
       assert xstart.order_number < xmid.order_number
       assert xmid.order_number < xend.order_number
     end
   end
 
-  def test_explicit_ordering_with_overlap_with_start
-    ex = assert_failure do
-      FlexMock.use 'm' do |m|
-	xstart = m.should_receive(:start).ordered
-	xmid = m.should_receive(:mid).ordered(1)
-      end
-    end
-  end
-
   def test_explicit_ordering_with_explicit_misorders
     assert_failure do 
       FlexMock.use 'm' do |m|
-	m.should_receive(:hi).ordered(2)
-	m.should_receive(:lo).ordered(10)
+	m.should_receive(:hi).ordered(:first_group)
+	m.should_receive(:lo).ordered(:second_group)
 	
 	m.lo
 	m.hi
@@ -421,15 +427,6 @@ class TestFlexMock < Test::Unit::TestCase
     end
   end
 
-  def test_explicit_ordering_with_out_of_order_explicitness
-    assert_failure do
-      FlexMock.use 'm' do |m|
-	m.should_receive(:lo).ordered(10)
-	m.should_receive(:hi).ordered(2)
-      end
-    end
-  end
-
   def test_expectation_formating
     m = FlexMock.new("m")
     exp = m.should_receive(:f).with(1,"two", /^3$/).and_return(0).at_least.once

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11.3
+rubygems_version: 0.8.10.100
 specification_version: 1
 name: flexmock
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2005-10-25 00:00:00 -04:00
+  version: 0.1.3
+date: 2005-10-27 00:00:00 -04:00
 summary: Simple and Flexible Mock Objects for Testing
 require_paths: 
   - lib