flexmock 0.3.1 → 0.3.2

data/CHANGELOG

@@ -1,5 +1,10 @@
 = Changes for FlexMock
 
+== Version 0.3.2
+
+* Fixed bug when mock is used as a replacement class in class
+  interception.
+
 == Version 0.3.1
 
 * Fixed some warnings regarding uniniitalized variables.

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.3.1
+Version :: 0.3.2
 
 = Links
 

data/Rakefile

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

data/lib/flexmock.rb

@@ -49,6 +49,8 @@ require 'test/unit'
 class FlexMock
   include Test::Unit::Assertions
 
+  class BadInterceptionError < RuntimeError; end
+
   attr_reader :mock_name, :mock_groups
   attr_accessor :mock_current_order
 
@@ -774,6 +776,7 @@ class FlexMock
       @intercepted = nil
       @target  = nil
       @replacement = nil
+      @proxy = nil
       intercept(intercepted_class)
       update
     end
@@ -823,15 +826,15 @@ class FlexMock
 
     # Implement interception on the classes defined.
     def do_interception
-      @target_class = coerce_class(@target)
-      @replacement_class = coerce_class(@replacement)
+      @target_class = coerce_class(@target, "target")
+      @replacement_class = coerce_class(@replacement, "replacement")
       case @intercepted
       when String, Symbol
         @intercepted_name = @intercepted.to_s
       when Class
         @intercepted_name = @intercepted.name
       end
-      @intercepted_class = coerce_class(@intercepted)
+      @intercepted_class = coerce_class(@intercepted, "intercepted")
       current_class = @target_class.const_get(@intercepted_name)
       if ClassProxy === current_class
         @proxy = current_class
@@ -845,14 +848,22 @@ class FlexMock
     end
 
     # Coerce a class object, string to symbol to be the class object.
-    def coerce_class(klass)
+    def coerce_class(klass, where)
       case klass
       when String, Symbol
-        Object.const_get(klass.to_s)
-      when Class
+        lookup_const(klass.to_s, where)
+      else
         klass
       end
     end
+
+    def lookup_const(name, where, target=Object)
+      begin
+        target.const_get(name)
+      rescue NameError
+        raise BadInterceptionError, "in #{where} class #{name}"
+      end
+    end
   end
 
   ####################################################################

data/test/test_class_interception.rb

@@ -3,14 +3,6 @@
 require 'test/unit'
 require 'flexmock'
 
-module A
-  class B
-    def sample
-      :ab
-    end
-  end
-end
-
 class Bark
   def listen
     :woof
@@ -30,9 +22,6 @@ class Dog
   def bark
     Bark.new
   end
-  def wag
-    A::B.new
-  end
   def bark_id
     Bark.identify
   end
@@ -44,7 +33,6 @@ class TestClassInterception < Test::Unit::TestCase
   def test_original_functionality
     dog = Dog.new
     assert_equal :woof, dog.bark.listen
-    assert_equal :ab, dog.wag.sample
   end
 
   def test_interception
@@ -97,6 +85,41 @@ class TestClassInterception < Test::Unit::TestCase
     assert_equal :barking, d.bark_id
   end
 
+  def test_interceptions_fails_with_bad_class_names
+    ex = assert_raises(FlexMock::BadInterceptionError) {
+      intercept("BADNAME").in("Dog").with("Meow")
+    }
+    assert_match(/intercepted/, ex.message)
+    assert_match(/BADNAME/, ex.message)
+
+    ex = assert_raises(FlexMock::BadInterceptionError) {
+      intercept(Bark).in("BADNAME").with("Meow")
+    }
+    assert_match(/target/, ex.message)
+    assert_match(/BADNAME/, ex.message)
+
+    ex = assert_raises(FlexMock::BadInterceptionError) {
+      intercept(Bark).in("Dog").with("BADNAME")
+    }
+    assert_match(/replacement/, ex.message)
+    assert_match(/BADNAME/, ex.message)
+  end
+
+end
+
+class TestClassInterceptionExample < Test::Unit::TestCase
+  include FlexMock::TestCase
+  
+  def setup
+    @dog = Dog.new
+    @mock = flexmock('bark')
+    intercept(Bark).in(Dog).with(@mock)
+  end
+    
+  def test_interception
+    @mock.should_receive(:new).with_no_args.once.and_return(:purr)
+    assert_equal :purr, @dog.bark
+  end
 end
 
 class TestMockFactory < Test::Unit::TestCase

metadata

@@ -1,9 +1,9 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.8.99.1
 specification_version: 1
 name: flexmock
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 date: 2006-06-17 00:00:00 -04:00
 summary: Simple and Flexible Mock Objects for Testing
 require_paths: 
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Jim Weirich
 files: