mocha 0.1.2 → 0.2.0

data/test/stubba/object_test.rb

@@ -1,13 +1,12 @@
 require File.join(File.dirname(__FILE__), "..", "test_helper")
-require 'stubba_replacer'
+require 'mocha/mock'
 
 require 'stubba/object'
 
 class ObjectTest < Test::Unit::TestCase
   
-  include Stubba
   include Mocha
-  
+    
   def test_should_build_mocha
     instance = Object.new
     mocha = instance.mocha
@@ -29,29 +28,23 @@ class ObjectTest < Test::Unit::TestCase
   
   def test_should_stub_instance_method
     instance = Object.new
-    stubba = Mock.new
-    stubba.expects(:stub).with(InstanceMethod.new(instance, :method1))
-    replace_stubba(stubba) do
-      instance.expects(:method1)
-    end
-    stubba.verify(:stub)
+    $stubba = Mock.new
+    $stubba.expects(:stub).with(Stubba::InstanceMethod.new(instance, :method1))
+    instance.expects(:method1)
+    $stubba.verify(:stub)
   end 
   
   def test_should_build_and_store_expectation
     instance = Object.new
-    stubba = Mock.new(:stub => nil)
-    replace_stubba(stubba) do
-      expectation = instance.expects(:method1)
-      assert_equal [expectation], instance.mocha.expectations
-    end
+    $stubba = Mock.new(:stub => nil)
+    expectation = instance.expects(:method1)
+    assert_equal [expectation], instance.mocha.expectations
   end
   
   def test_should_verify_expectations
     instance = Object.new
-    stubba = Mock.new(:stub => nil)
-    replace_stubba(stubba) do
-      instance.expects(:method1).with(:value1, :value2)
-    end
+    $stubba = Mock.new(:stub => nil)
+    instance.expects(:method1).with(:value1, :value2)
     assert_raise(Test::Unit::AssertionFailedError) { instance.verify }
   end
   
@@ -71,56 +64,48 @@ class ObjectTest < Test::Unit::TestCase
   
   def test_should_stub_class_method
     klass = Class.new
-    stubba = Mock.new
-    stubba.expects(:stub).with(ClassMethod.new(klass, :method1))
-    replace_stubba(stubba) do
-      klass.expects(:method1)
-    end
-    stubba.verify(:stub)
+    $stubba = Mock.new
+    $stubba.expects(:stub).with(Stubba::ClassMethod.new(klass, :method1))
+    klass.expects(:method1)
+    $stubba.verify(:stub)
   end 
   
   def test_should_build_and_store_class_method_expectation
     klass = Class.new
-    stubba = Mock.new(:stub => nil)
-    replace_stubba(stubba) do
-      expectation = klass.expects(:method1)
-      assert_equal [expectation], klass.mocha.expectations
-    end
+    $stubba = Mock.new(:stub => nil)
+    expectation = klass.expects(:method1)
+    assert_equal [expectation], klass.mocha.expectations
   end
   
   def test_should_stub_module_method
     mod = Module.new
-    stubba = Mock.new
-    stubba.expects(:stub).with(ClassMethod.new(mod, :method1))
-    replace_stubba(stubba) do
-      mod.expects(:method1)
-    end
-    stubba.verify(:stub)
+    $stubba = Mock.new
+    $stubba.expects(:stub).with(Stubba::ClassMethod.new(mod, :method1))
+    mod.expects(:method1)
+    $stubba.verify(:stub)
   end
   
   def test_should_build_and_store_module_method_expectation
     mod = Module.new
-    stubba = Mock.new(:stub => nil)
-    replace_stubba(stubba) do
-      expectation = mod.expects(:method1)
-      assert_equal [expectation], mod.mocha.expectations
-    end
+    $stubba = Mock.new(:stub => nil)
+    expectation = mod.expects(:method1)
+    assert_equal [expectation], mod.mocha.expectations
   end
   
   def test_should_use_stubba_instance_method_for_object
-    assert_equal InstanceMethod, Object.new.stubba_method
+    assert_equal Stubba::InstanceMethod, Object.new.stubba_method
   end
     
   def test_should_use_stubba_class_method_for_module
-    assert_equal ClassMethod, Module.new.stubba_method
+    assert_equal Stubba::ClassMethod, Module.new.stubba_method
   end
     
   def test_should_use_stubba_class_method_for_class
-    assert_equal ClassMethod, Class.new.stubba_method
+    assert_equal Stubba::ClassMethod, Class.new.stubba_method
   end
   
   def test_should_use_stubba_class_method_for_any_instance
-    assert_equal AnyInstanceMethod, Class::AnyInstance.new(nil).stubba_method
+    assert_equal Stubba::AnyInstanceMethod, Class::AnyInstance.new(nil).stubba_method
   end
   
   def test_should_stub_self_for_object

data/test/stubba/setup_and_teardown_test.rb

@@ -0,0 +1,76 @@
+require File.join(File.dirname(__FILE__), "..", "test_helper")
+require 'mocha/mock'
+
+require 'stubba/setup_and_teardown'
+
+class SetupAndTeardownTest < Test::Unit::TestCase
+  
+  include Mocha
+  
+  def test_should_add_setup_stubs_to_setup_methods
+    test_case_class = Class.new do
+      class << self
+        attr_accessor :symbol
+        define_method(:add_setup_method) { |symbol| @symbol = symbol }
+        define_method(:add_teardown_method) {}
+      end
+      include SetupAndTeardown
+    end
+    
+    assert_equal :setup_stubs, test_case_class.symbol
+  end
+  
+  def test_should_add_teardown_stubs_to_teardown_methods
+    test_case_class = Class.new do
+      class << self
+        attr_accessor :symbol
+        define_method(:add_setup_method) {}
+        define_method(:add_teardown_method) { |symbol| @symbol = symbol }
+      end
+      include SetupAndTeardown
+    end
+    
+    assert_equal :teardown_stubs, test_case_class.symbol
+  end
+  
+  def test_should_instantiate_new_stubba
+    test_case = stubbed_test_case_class.new
+    test_case.setup_stubs
+    
+    assert $stubba
+    assert $stubba.is_a?(Stubba::Central)
+  end
+
+  def test_should_unstub_all_stubbed_methods
+    test_case = stubbed_test_case_class.new
+    stubba = Mock.new(:unstub_all => nil)
+    $stubba = stubba
+    
+    test_case.teardown_stubs
+    
+    stubba.verify
+  end
+
+  def test_should_set_stubba_to_nil
+    test_case = stubbed_test_case_class.new
+    $stubba = Mock.new(:unstub_all => nil)
+
+    test_case.teardown_stubs
+    
+    assert_nil $stubba
+  end
+  
+  private
+  
+  def stubbed_test_case_class
+    Class.new do
+      class << self
+        define_method(:add_setup_method) {}
+        define_method(:add_teardown_method) {}
+      end
+      include SetupAndTeardown
+    end
+  end
+
+end
+

data/test/stubba_integration_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
-require 'stubba_replacer'
 
 require 'stubba/object'
-require 'stubba/test_case'
+require 'smart_test_case/multiple_setup_and_teardown'
+require 'stubba/setup_and_teardown'
 
 class StubbaIntegrationTest < Test::Unit::TestCase
   
@@ -14,45 +14,45 @@ class StubbaIntegrationTest < Test::Unit::TestCase
 
   def test_should_stub_class_method_within_test
     test_class = Class.new(Test::Unit::TestCase) do
-      def test_me
+      include MultipleSetupAndTeardown
+      include SetupAndTeardown
+      define_method(:test_me) do
         DontMessWithMe.expects(:method_x).returns(:new_return_value)
         assert_equal :new_return_value, DontMessWithMe.method_x
       end
     end
     test = test_class.new(:test_me)
 
-    replace_stubba(nil) do
-      test_result = Test::Unit::TestResult.new
-      test.run(test_result) {}
-      assert test_result.passed?
-    end
+    test_result = Test::Unit::TestResult.new
+    test.run(test_result) {}
+    assert test_result.passed?
   end
 
   def test_should_leave_stubbed_class_unchanged_after_test
     test_class = Class.new(Test::Unit::TestCase) do
-      def test_me
+      include MultipleSetupAndTeardown
+      include SetupAndTeardown
+      define_method(:test_me) do
         DontMessWithMe.expects(:method_x).returns(:new_return_value)
       end
     end
     test = test_class.new(:test_me)
 
-    replace_stubba(nil) do
-      test.run(Test::Unit::TestResult.new) {}
-      assert_equal :original_return_value, DontMessWithMe.method_x
-    end
+    test.run(Test::Unit::TestResult.new) {}
+    assert_equal :original_return_value, DontMessWithMe.method_x
   end
   
   def test_should_reset_expectations_after_test
     test_class = Class.new(Test::Unit::TestCase) do
-      def test_me
+      include MultipleSetupAndTeardown
+      include SetupAndTeardown
+      define_method(:test_me) do
         DontMessWithMe.expects(:method_x)
       end
     end
     test = test_class.new(:test_me)
     
-    replace_stubba(nil) do
-      test.run(Test::Unit::TestResult.new) {}
-    end
+    test.run(Test::Unit::TestResult.new) {}
     assert_equal 0, DontMessWithMe.mocha.expectations.size
   end  
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: mocha
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2006-07-16 00:00:00 +01:00
+  version: 0.2.0
+date: 2006-08-11 00:00:00 +01:00
 summary: Mocking and stubbing library
 require_paths: 
   - lib
@@ -34,9 +34,11 @@ authors:
 files: 
   - lib/auto_mocha.rb
   - lib/mocha.rb
+  - lib/smart_test_case.rb
   - lib/stubba.rb
   - lib/auto_mocha/auto_mock.rb
   - lib/auto_mocha/mock_class.rb
+  - lib/mocha/auto_verify.rb
   - lib/mocha/expectation.rb
   - lib/mocha/infinite_range.rb
   - lib/mocha/inspect.rb
@@ -44,37 +46,41 @@ files:
   - lib/mocha/mock.rb
   - lib/mocha/mock_methods.rb
   - lib/mocha/pretty_parameters.rb
+  - lib/smart_test_case/multiple_setup_and_teardown.rb
   - lib/stubba/any_instance_method.rb
+  - lib/stubba/central.rb
   - lib/stubba/class_method.rb
   - lib/stubba/instance_method.rb
   - lib/stubba/object.rb
-  - lib/stubba/stubba.rb
-  - lib/stubba/test_case.rb
+  - lib/stubba/setup_and_teardown.rb
+  - test/active_record_test_case.rb
   - test/all_tests.rb
   - test/auto_mock_acceptance_test.rb
   - test/method_definer.rb
   - test/mocha_acceptance_test.rb
   - test/stubba_acceptance_test.rb
   - test/stubba_integration_test.rb
-  - test/stubba_replacer.rb
   - test/test_helper.rb
   - test/auto_mocha/auto_mock_test.rb
   - test/auto_mocha/mock_class_test.rb
+  - test/mocha/auto_verify_test.rb
   - test/mocha/expectation_test.rb
   - test/mocha/infinite_range_test.rb
   - test/mocha/inspect_test.rb
   - test/mocha/mock_methods_test.rb
   - test/mocha/mock_test.rb
   - test/mocha/pretty_parameters_test.rb
+  - test/smart_test_case/multiple_setup_and_teardown_test.rb
   - test/stubba/any_instance_method_test.rb
+  - test/stubba/central_test.rb
   - test/stubba/class_method_test.rb
   - test/stubba/instance_method_test.rb
   - test/stubba/object_test.rb
-  - test/stubba/stubba_test.rb
-  - test/stubba/test_case_test.rb
+  - test/stubba/setup_and_teardown_test.rb
   - COPYING
   - Rakefile
   - README
+  - RELEASE
   - TODO
 test_files: 
   - test/all_tests.rb

data/lib/stubba/test_case.rb

@@ -1,65 +0,0 @@
-require 'stubba/stubba'
-
-class Test::Unit::TestCase
-    
-  def self.method_added(method)
-    # disable until we finish messing about
-  end
-  
-  def setup_with_stubba
-    $stubba = Stubba::Stubba.new
-  end
-  
-  def teardown_with_stubba
-    $stubba.unstub_all
-    $stubba = nil
-  end
-
-  if method_defined?(:setup) then
-    alias_method :setup_pre_stubba, :setup
-    define_method(:setup_post_stubba) do
-      setup_pre_stubba
-      setup_with_stubba
-    end
-  else
-    define_method(:setup_post_stubba) do
-      setup_with_stubba
-    end
-  end  
-  alias_method :setup, :setup_post_stubba
-  
-  if method_defined?(:teardown) then
-    alias_method :teardown_pre_stubba, :teardown
-    define_method(:teardown_post_stubba) do
-      teardown_with_stubba
-      teardown_pre_stubba
-    end
-  else
-    define_method(:teardown_post_stubba) do
-      teardown_with_stubba
-    end
-  end
-  alias_method :teardown, :teardown_post_stubba
-  
-  def self.method_added(method)
-    case method
-    when :setup
-      unless method_defined?(:setup_without_stubba)
-        alias_method :setup_without_stubba, :setup
-        define_method(:setup) do
-          setup_post_stubba
-          setup_without_stubba
-        end
-      end
-    when :teardown
-      unless method_defined?(:teardown_without_stubba)
-        alias_method :teardown_without_stubba, :teardown
-        define_method(:teardown) do
-          teardown_without_stubba
-          teardown_post_stubba
-        end
-      end
-    end
-  end
-
-end

data/test/stubba/test_case_test.rb

@@ -1,41 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
-require 'stubba_replacer'
-require 'mocha/mock'
-
-require 'stubba/test_case'
-
-class TestCaseTest < Test::Unit::TestCase
-  
-  include Mocha
-  
-  def test_should_instantiate_new_stubba
-    test_class = Class.new(Test::Unit::TestCase) { def test_me; end }
-    test = test_class.new(:test_me)
-    replace_stubba(nil) do
-      test.setup
-      assert $stubba.is_a?(Stubba::Stubba)
-    end
-  end
-
-  def test_should_unstub_all_stubbed_methods
-    test_class = Class.new(Test::Unit::TestCase) { def test_me; end }
-    test = test_class.new(:test_me)
-    stubba = Mock.new(:unstub_all => nil)
-    replace_stubba(stubba) do
-      test.teardown
-    end
-    stubba.verify(:unstub_all)
-  end
-
-  def test_should_set_stubba_to_nil
-    test_class = Class.new(Test::Unit::TestCase) { def test_me; end }
-    test = test_class.new(:test_me)
-    stubba = Mock.new(:unstub_all => nil)
-    replace_stubba(stubba) do
-      test.teardown
-      assert_nil $stubba
-    end
-  end
-
-end
-