flexmock 0.8.11 → 0.9.0

data/test/{test_examples_from_readme.rb → examples_from_readme_test.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -9,8 +9,7 @@
 # above copyright notice is included.
 #+++
 
-require 'test/unit'
-require 'flexmock'
+require 'test/test_setup'
 
 class TemperatureSampler
   def initialize(sensor)
@@ -49,7 +48,7 @@ class TestExamplesFromReadme < Test::Unit::TestCase
     m.should_receive(:foo).and_return_undefined
     m.foo.bar.baz
   end
-  
+
   def test_db
     db = flexmock('db')
     db.should_receive(:query).and_return([1,2,3])
@@ -85,7 +84,7 @@ class TestExamplesFromReadme < Test::Unit::TestCase
     assert_equal 12.3, db.query("GOOG")
     db.finish
   end
-  
+
   def test_ordered_queries_in_record_mode
     db = flexmock('db')
     db.should_expect do |rec|
@@ -146,7 +145,7 @@ class TestExamplesFromReadme < Test::Unit::TestCase
       QuoteService.new.quote
     end
   end
-  
+
   def test_portfolio_value
     flexmock(QuoteService).new_instances do |m|
       m.should_receive(:quote).and_return(100)

data/test/{test_extended_should_receive.rb → extended_should_receive_test.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -9,8 +9,7 @@
 # above copyright notice is included.
 #+++
 
-require "test/unit"
-require "flexmock"
+require "test/test_setup"
 
 module ExtendedShouldReceiveTests
   def test_accepts_expectation_hash
@@ -18,27 +17,27 @@ module ExtendedShouldReceiveTests
     assert_equal :bar, @obj.foo
     assert_equal :froz, @obj.baz
   end
-  
+
   def test_accepts_list_of_methods
     @mock.should_receive(:foo, :bar, "baz")
     assert_nil @obj.foo
     assert_nil @obj.bar
     assert_nil @obj.baz
   end
-  
+
   def test_contraints_apply_to_all_expectations
     @mock.should_receive(:foo, :bar => :baz).with(1)
-    ex = assert_raise(Test::Unit::AssertionFailedError) { @obj.foo(2) }
-    ex = assert_raise(Test::Unit::AssertionFailedError) { @obj.bar(2) }
+    ex = assert_raise(assertion_failed_error) { @obj.foo(2) }
+    ex = assert_raise(assertion_failed_error) { @obj.bar(2) }
     assert_equal :baz, @obj.bar(1)
   end
-  
+
   def test_count_contraints_apply_to_all_expectations
     @mock.should_receive(:foo, :bar => :baz).once
     @obj.foo
-    assert_raise(Test::Unit::AssertionFailedError) { @mock.flexmock_verify }
+    assert_raise(assertion_failed_error) { @mock.flexmock_verify }
   end
-  
+
   def test_multiple_should_receives_are_allowed
     @mock.should_receive(:hi).and_return(:bye).
       should_receive(:hello => :goodbye)
@@ -50,7 +49,7 @@ end
 class TestExtendedShouldReceiveOnFullMocks < Test::Unit::TestCase
   include FlexMock::TestCase
   include ExtendedShouldReceiveTests
-  
+
   def setup
     @mock = flexmock("mock")
     @obj = @mock
@@ -61,7 +60,7 @@ end
 class TestExtendedShouldReceiveOnPartialMockProxies < Test::Unit::TestCase
   include FlexMock::TestCase
   include ExtendedShouldReceiveTests
-  
+
   def setup
     @obj = Object.new
     @mock = flexmock(@obj, "mock")

data/test/{test_flexmodel.rb → flexmodel_test.rb}

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
-require 'flexmock'
+require 'test/test_setup'
 
 class DummyModel
 end

data/test/{test_naming.rb → naming_test.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -9,12 +9,11 @@
 # above copyright notice is included.
 #+++
 
-require 'test/unit'
-require 'flexmock'
+require 'test/test_setup'
 
 class TestNaming < Test::Unit::TestCase
   include FlexMock::TestCase
-  
+
   def test_name
     m = flexmock("m")
     assert_equal "m", m.flexmock_name
@@ -22,7 +21,7 @@ class TestNaming < Test::Unit::TestCase
 
   def test_name_in_no_handler_found_error
     m = flexmock("mmm")
-    ex = assert_raises(Test::Unit::AssertionFailedError) {
+    ex = assert_raises(assertion_failed_error) {
       m.should_receive(:xx).with(1)
       m.xx(2)
     }
@@ -31,7 +30,7 @@ class TestNaming < Test::Unit::TestCase
 
   def test_name_in_received_count_error
     m = flexmock("mmm")
-    ex = assert_raises(Test::Unit::AssertionFailedError) {
+    ex = assert_raises(assertion_failed_error) {
       m.should_receive(:xx).once
       m.flexmock_verify
     }

data/test/{test_new_instances.rb → new_instances_test.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -9,14 +9,12 @@
 # above copyright notice is included.
 #+++
 
-require 'test/unit'
-require 'flexmock'
-require 'test/redirect_error'
+require 'test/test_setup'
 
 class TestNewInstances < Test::Unit::TestCase
   include FlexMock::TestCase
   include FlexMock::RedirectError
-  
+
   class Dog
     def bark
       :woof
@@ -36,7 +34,7 @@ class TestNewInstances < Test::Unit::TestCase
       block.call(self) if block_given?
     end
   end
-  
+
   class Connection
     def initialize(*args)
       yield(self) if block_given?
@@ -56,7 +54,7 @@ class TestNewInstances < Test::Unit::TestCase
     m = Dog.new
     assert_equal :whimper,  m.bark
   end
-  
+
   def test_new_instances_stubs_still_have_existing_methods
     flexstub(Dog).new_instances do |obj|
       obj.should_receive(:bark).and_return(:whimper)
@@ -84,7 +82,7 @@ class TestNewInstances < Test::Unit::TestCase
     m = Cat.new("Fido") { x = :called }
     assert_equal :called, x
     flexmock_teardown
-    
+
     flexstub(Cat).new_instances { }
     x = :not_called
     m = Cat.new("Fido") { x = :called }
@@ -95,14 +93,14 @@ class TestNewInstances < Test::Unit::TestCase
     flexstub(Dog).new_instances do |obj|
       obj.should_receive(:bark).once.and_return(nil)
     end
-    
-    fido = Dog.new    
-    ex = assert_raise(Test::Unit::AssertionFailedError) { flexmock_teardown }
+
+    Dog.new
+    ex = assert_raise(assertion_failed_error) { flexmock_teardown }
     assert_match(/method 'bark\(.*\)' called incorrect number of times/, ex.message)
   end
 
   def test_new_instances_reports_error_on_non_classes
-    ex = assert_raise(ArgumentError) { 
+    ex = assert_raise(ArgumentError) {
       flexstub(Dog.new).new_instances do |obj|
         obj.should_receive(:hi)
       end
@@ -110,7 +108,7 @@ class TestNewInstances < Test::Unit::TestCase
     assert_match(/Class/, ex.message)
     assert_match(/new_instances/, ex.message)
   end
-  
+
   def test_does_not_by_default_stub_objects_created_with_allocate
     flexstub(Dog).new_instances do |obj|
       obj.should_receive(:bark).and_return(:whimper)
@@ -118,22 +116,32 @@ class TestNewInstances < Test::Unit::TestCase
     m = Dog.allocate
     assert_equal :woof,  m.bark
   end
-  
-  def test_can_explicitly_stub_objects_created_with_allocate
-    flexstub(Dog).new_instances(:allocate) do |obj|
-      obj.should_receive(:bark).and_return(:whimper)
+
+  if RUBY_VERSION >= "1.9"
+    def test_explicitly_mocking_allocation_in_new_instances_fails_in_ruby_19
+      assert_raise FlexMock::UsageError do
+        flexstub(Dog).new_instances(:allocate) do |obj|
+          obj.should_receive(:bark).and_return(:whimper)
+        end
+      end
+    end
+  else
+    def test_can_explicitly_stub_objects_created_with_allocate
+      flexstub(Dog).new_instances(:allocate) do |obj|
+        obj.should_receive(:bark).and_return(:whimper)
+      end
+      m = Dog.allocate
+      assert_equal :whimper,  m.bark
     end
-    m = Dog.allocate
-    assert_equal :whimper,  m.bark
   end
-  
+
   def test_can_stub_objects_created_with_arbitrary_class_methods
     flexstub(Dog).new_instances(:make) do |obj|
       obj.should_receive(:bark).and_return(:whimper)
     end
     assert_equal :whimper,  Dog.make.bark
   end
-  
+
   def test_stubbing_arbitrary_class_methods_leaves_new_alone
     flexstub(Dog).new_instances(:make) do |obj|
       obj.should_receive(:bark).and_return(:whimper)
@@ -150,9 +158,9 @@ class TestNewInstances < Test::Unit::TestCase
     assert_equal 1, counter
   end
 
-  # Current behavior does not install stubs into the block passed to new. 
+  # Current behavior does not install stubs into the block passed to new.
   # This is rather difficult to achieve, although it would be nice.  For the
-  # moment, we assure that they are not stubbed, but I am willing to change 
+  # moment, we assure that they are not stubbed, but I am willing to change
   # this in the future.
   def test_blocks_on_new_do_not_have_stubs_installed
     flexstub(Connection).new_instances do |new_con|
@@ -167,7 +175,7 @@ class TestNewInstances < Test::Unit::TestCase
     end
     assert block_run
   end
-  
+
   def test_new_instances_accept_chained_expectations
     flexmock(Dog).new_instances.
       should_receive(:growl).and_return(:grr).
@@ -175,18 +183,18 @@ class TestNewInstances < Test::Unit::TestCase
     assert_equal :grr, Dog.new.growl
     assert_equal :flip, Dog.new.roll_over
   end
-  
+
   def test_fancy_use_of_chained_should_received
     flexmock(Dog).new_instances.should_receive(:woof => :grrr)
     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
@@ -194,7 +202,7 @@ class TestNewInstances < Test::Unit::TestCase
     dog.bark
     dog.bite
   end
-  
+
   def test_ordering_can_be_specified_in_groups
     dog = Dog.new
     flexmock(dog).should_receive(:wag).once.ordered(:safe)

data/test/{test_partial_mock.rb → partial_mock_test.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003, 2004, 2005, 2006, 2007 by Jim Weirich (jim@weirichhouse.org).
+# Copyright 2003-2011 by Jim Weirich (jim@weirichhouse.org).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -9,13 +9,11 @@
 # above copyright notice is included.
 #+++
 
-require 'test/unit'
-require 'fileutils'
-require 'flexmock'
+require 'test/test_setup'
 
 class TestStubbing < Test::Unit::TestCase
   include FlexMock::TestCase
-  
+
   class Dog
     def bark
       :woof
@@ -42,7 +40,7 @@ class TestStubbing < Test::Unit::TestCase
     flexmock(obj).should_receive(:hi).once.and_return(:stub_hi)
     assert_equal :stub_hi, obj.hi
   end
-  
+
   def test_stub_command_can_configure_via_block
     obj = Object.new
     flexmock(obj) do |m|
@@ -50,19 +48,19 @@ class TestStubbing < Test::Unit::TestCase
     end
     assert_equal :stub_hi, obj.hi
   end
-  
+
   def test_stubbed_methods_can_take_blocks
     obj = Object.new
     flexmock(obj).should_receive(:with_block).once.with(Proc).
       and_return { |block| block.call }
     assert_equal :block, obj.with_block { :block }
   end
-  
+
   def test_multiple_stubs_on_the_same_object_reuse_the_same_partial_mock
     obj = Object.new
     assert_equal flexmock(obj), flexmock(obj)
   end
-  
+
   def test_multiple_methods_can_be_stubbed
     dog = Dog.new
     flexmock(dog).should_receive(:bark).and_return(:grrrr)
@@ -70,7 +68,7 @@ class TestStubbing < Test::Unit::TestCase
     assert_equal :grrrr, dog.bark
     assert_equal :happy, dog.wag
   end
-  
+
   def test_original_behavior_can_be_restored
     dog = Dog.new
     partial_mock = flexmock(dog)
@@ -80,7 +78,7 @@ class TestStubbing < Test::Unit::TestCase
     assert_equal :woof, dog.bark
     assert_equal nil, dog.instance_variable_get("@flexmock_proxy")
   end
-  
+
   def test_original_missing_behavior_can_be_restored
     obj = Object.new
     partial_mock = flexmock(obj)
@@ -100,7 +98,7 @@ class TestStubbing < Test::Unit::TestCase
     partial_mock.flexmock_teardown
     assert_raise(NoMethodError) { obj.hi }
   end
-  
+
   def test_original_behavior_is_restored_when_multiple_methods_are_mocked
     dog = Dog.new
     flexmock(dog).should_receive(:bark).and_return(:grrrr)
@@ -114,7 +112,7 @@ class TestStubbing < Test::Unit::TestCase
     flexmock(Dog).should_receive(:create).once.and_return(:new_stub)
     assert_equal :new_stub, Dog.create
     flexmock(Dog).flexmock_teardown
-    assert_equal :new_dog, Dog.create    
+    assert_equal :new_dog, Dog.create
   end
 
   def test_original_behavior_is_restored_on_singleton_methods
@@ -173,7 +171,11 @@ class TestStubbing < Test::Unit::TestCase
 
   def test_original_behavior_is_restored_even_when_errors
     flexmock(Dog).should_receive(:create).once.and_return(:mock)
-    flexmock_teardown rescue nil
+    begin
+      flexmock_teardown
+    rescue assertion_failed_error => _
+      nil
+    end
     assert_equal :new_dog, Dog.create
 
     # Now disable the mock so that it doesn't cause errors on normal
@@ -185,7 +187,7 @@ class TestStubbing < Test::Unit::TestCase
   def test_not_calling_stubbed_method_is_an_error
     dog = Dog.new
     flexmock(dog).should_receive(:bark).once
-    assert_raise(Test::Unit::AssertionFailedError) { 
+    assert_raise(assertion_failed_error) {
       flexmock(dog).flexmock_verify
     }
     dog.bark
@@ -195,11 +197,11 @@ class TestStubbing < Test::Unit::TestCase
     obj = Object.new
     partial_mock = flexmock(obj)
     partial_mock.should_receive(:hi).once.and_return(:ok)
-    assert_raise(Test::Unit::AssertionFailedError) { 
+    assert_raise(assertion_failed_error) {
       partial_mock.flexmock_verify
     }
   end
-  
+
   def test_stub_can_have_explicit_name
     obj = Object.new
     partial_mock = flexmock(obj, "Charlie")
@@ -293,7 +295,7 @@ class TestStubbing < Test::Unit::TestCase
 
   def test_safe_partial_mocks_require_block
     dog = Dog.new
-    ex = assert_raise(FlexMock::UsageError) { flexmock(:safe, dog) }
+    assert_raise(FlexMock::UsageError) { flexmock(:safe, dog) }
   end
 
   def test_safe_partial_mocks_are_actually_mocked