mocha 0.2.1 → 0.3.0

data/test/stubba/object_test.rb

@@ -1,5 +1,6 @@
 require File.join(File.dirname(__FILE__), "..", "test_helper")
 require 'mocha/mock'
+require 'method_definer'
 
 require 'stubba/object'
 
@@ -31,23 +32,53 @@ class ObjectTest < Test::Unit::TestCase
     $stubba = Mock.new
     $stubba.expects(:stub).with(Stubba::InstanceMethod.new(instance, :method1))
     instance.expects(:method1)
-    $stubba.verify(:stub)
+    $stubba.verify
   end 
   
   def test_should_build_and_store_expectation
     instance = Object.new
-    $stubba = Mock.new(:stub => nil)
+    $stubba = Mock.new
+    $stubba.stubs(:stub)
     expectation = instance.expects(:method1)
     assert_equal [expectation], instance.mocha.expectations
   end
   
   def test_should_verify_expectations
     instance = Object.new
-    $stubba = Mock.new(:stub => nil)
+    $stubba = Mock.new
+    $stubba.stubs(:stub)
     instance.expects(:method1).with(:value1, :value2)
     assert_raise(Test::Unit::AssertionFailedError) { instance.verify }
   end
   
+  def test_should_pass_backtrace_into_expects
+    instance = Object.new
+    $stubba = Mock.new
+    $stubba.stubs(:stub)
+    mocha = Object.new
+    mocha.define_instance_accessor(:expects_parameters)
+    mocha.define_instance_method(:expects) { |*parameters| self.expects_parameters = parameters }
+    backtrace = Object.new
+    instance.define_instance_method(:mocha) { mocha }
+    instance.define_instance_method(:caller) { backtrace }
+    instance.expects(:method1)
+    assert_equal [:method1, backtrace], mocha.expects_parameters
+  end
+      
+  def test_should_pass_backtrace_into_stubs
+    instance = Object.new
+    $stubba = Mock.new
+    $stubba.stubs(:stub)
+    mocha = Object.new
+    mocha.define_instance_accessor(:stubs_parameters)
+    mocha.define_instance_method(:stubs) { |*parameters| self.stubs_parameters = parameters }
+    backtrace = Object.new
+    instance.define_instance_method(:mocha) { mocha }
+    instance.define_instance_method(:caller) { backtrace }
+    instance.stubs(:method1)
+    assert_equal [:method1, backtrace], mocha.stubs_parameters
+  end
+      
   def test_should_build_any_instance_object
     klass = Class.new
     any_instance = klass.any_instance
@@ -67,12 +98,13 @@ class ObjectTest < Test::Unit::TestCase
     $stubba = Mock.new
     $stubba.expects(:stub).with(Stubba::ClassMethod.new(klass, :method1))
     klass.expects(:method1)
-    $stubba.verify(:stub)
+    $stubba.verify
   end 
   
   def test_should_build_and_store_class_method_expectation
     klass = Class.new
-    $stubba = Mock.new(:stub => nil)
+    $stubba = Mock.new
+    $stubba.stubs(:stub)
     expectation = klass.expects(:method1)
     assert_equal [expectation], klass.mocha.expectations
   end
@@ -82,12 +114,13 @@ class ObjectTest < Test::Unit::TestCase
     $stubba = Mock.new
     $stubba.expects(:stub).with(Stubba::ClassMethod.new(mod, :method1))
     mod.expects(:method1)
-    $stubba.verify(:stub)
+    $stubba.verify
   end
   
   def test_should_build_and_store_module_method_expectation
     mod = Module.new
-    $stubba = Mock.new(:stub => nil)
+    $stubba = Mock.new
+    $stubba.stubs(:stub)
     expectation = mod.expects(:method1)
     assert_equal [expectation], mod.mocha.expectations
   end
@@ -128,5 +161,5 @@ class ObjectTest < Test::Unit::TestCase
     any_instance = Class::AnyInstance.new(klass)
     assert_equal klass, any_instance.stubba_object
   end
-      
+  
 end

data/test/stubba/setup_and_teardown_test.rb

@@ -41,9 +41,34 @@ class SetupAndTeardownTest < Test::Unit::TestCase
     assert $stubba.is_a?(Stubba::Central)
   end
 
+  def test_should_verify_all_expectations
+    test_case = stubbed_test_case_class.new
+    stubba = Mock.new
+    stubba.expects(:verify_all)
+    stubba.stubs(:unstub_all)
+    $stubba = stubba
+    
+    test_case.teardown_stubs
+    
+    stubba.verify
+  end
+
+  def test_should_pass_block_to_add_assertion_to_test_case
+    test_case = stubbed_test_case_class.new
+    $stubba = Mock.new
+    $stubba.stubs(:verify_all).yields
+    $stubba.stubs(:unstub_all)
+    
+    test_case.teardown_stubs
+    
+    assert_equal true, test_case.add_assertion_called 
+  end
+
   def test_should_unstub_all_stubbed_methods
     test_case = stubbed_test_case_class.new
-    stubba = Mock.new(:unstub_all => nil)
+    stubba = Mock.new
+    stubba.stubs(:verify_all)
+    stubba.expects(:unstub_all)
     $stubba = stubba
     
     test_case.teardown_stubs
@@ -51,15 +76,46 @@ class SetupAndTeardownTest < Test::Unit::TestCase
     stubba.verify
   end
 
+  def test_should_unstub_all_stubbed_methods_even_if_verify_all_raises_exception
+    test_case = stubbed_test_case_class.new
+    stubba = Mock.new
+    stubba.stubs(:verify_all).raises(Exception)
+    stubba.expects(:unstub_all)
+    $stubba = stubba
+    
+    assert_raises(Exception) { 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)
+    $stubba = Mock.new
+    $stubba.stubs(:verify_all)
+    $stubba.stubs(:unstub_all)
 
     test_case.teardown_stubs
     
     assert_nil $stubba
   end
   
+  def test_should_set_stubba_to_nil_even_if_verify_all_raises_exception
+    test_case = stubbed_test_case_class.new
+    $stubba = Mock.new
+    $stubba.stubs(:verify_all).raises(Exception)
+    $stubba.stubs(:unstub_all)
+
+    assert_raises(Exception) { test_case.teardown_stubs }
+    
+    assert_nil $stubba
+  end
+  
+  def test_should_not_raise_exception_if_no_stubba_central_available
+    test_case = stubbed_test_case_class.new
+    $stubba = nil
+    assert_nothing_raised { test_case.teardown_stubs }
+  end
+  
   private
   
   def stubbed_test_case_class
@@ -68,6 +124,8 @@ class SetupAndTeardownTest < Test::Unit::TestCase
         define_method(:add_setup_method) {}
         define_method(:add_teardown_method) {}
       end
+      attr_accessor :add_assertion_called
+      define_method(:add_assertion) { self.add_assertion_called = true }
       include SetupAndTeardown
     end
   end

data/test/stubba_acceptance_test.rb

@@ -35,7 +35,6 @@ class StubbaAcceptanceTest < Test::Unit::TestCase
     widget = Widget.new
     widget.expects(:model).returns('different_model')
     assert_equal 'different_model', widget.model
-    widget.verify
   end
   
   def test_should_stub_module_method
@@ -75,14 +74,12 @@ class StubbaAcceptanceTest < Test::Unit::TestCase
   def should_stub_module_method
     Thingy.expects(:wotsit).returns(:dooda)
     assert_equal :dooda, Thingy.wotsit
-    Thingy.verify
   end
   
   def should_stub_class_method
     widgets = [Widget.new]
     Widget.expects(:find).with(:all).returns(widgets)
     assert_equal widgets, Widget.find(:all)
-    Widget.verify
   end 
   
   def should_stub_two_different_class_methods
@@ -92,7 +89,6 @@ class StubbaAcceptanceTest < Test::Unit::TestCase
     Widget.expects(:create).with(:model => 'wombat').returns(created_widget)
     assert_equal found_widgets, Widget.find(:all)
     assert_equal created_widget, Widget.create(:model => 'wombat')
-    Widget.verify
   end
   
   def should_stub_instance_method_on_any_instance_of_a_class
@@ -101,7 +97,6 @@ class StubbaAcceptanceTest < Test::Unit::TestCase
     widget_2 = Widget.new
     assert_equal 'another_model', widget_1.model
     assert_equal 'another_model', widget_2.model
-    Widget.any_instance.verify
   end
 
 end

data/test/stubba_test_result_integration_test.rb

@@ -0,0 +1,86 @@
+require 'test_helper'
+require 'stubba/object'
+require 'smart_test_case/multiple_setup_and_teardown'
+require 'stubba/setup_and_teardown'
+require 'shared/backtracefilter'
+require 'execution_point'
+
+class StubbaTestResultIntegrationTest < Test::Unit::TestCase
+
+  def test_should_include_expectation_verification_in_assertion_count
+    test_result = run_test do
+      object = Class.new { def message; end }.new
+      object.expects(:message)
+      object.message
+    end
+    assert_equal 1, test_result.assertion_count
+  end
+  
+  def test_should_include_assertions_in_assertion_count
+    test_result = run_test do
+      assert true
+    end
+    assert_equal 1, test_result.assertion_count
+  end
+  
+  def test_should_not_include_stubbing_expectation_verification_in_assertion_count
+    test_result = run_test do
+      object = Class.new { def message; end }.new
+      object.stubs(:message)
+      object.message
+    end
+    assert_equal 0, test_result.assertion_count
+  end
+  
+  def test_should_include_expectation_verification_failure_in_failure_count
+    test_result = run_test do
+      object = Class.new { def message; end }.new
+      object.expects(:message)
+    end
+    assert_equal 1, test_result.failure_count
+  end
+  
+  def test_should_include_assertion_failure_in_failure_count
+    test_result = run_test do
+      flunk
+    end
+    assert_equal 1, test_result.failure_count
+  end
+  
+  def test_should_display_backtrace_indicating_line_number_where_expects_was_called
+    test_result = Test::Unit::TestResult.new
+    faults = []
+    test_result.add_listener(Test::Unit::TestResult::FAULT, &lambda { |fault| faults << fault })
+    execution_point = nil
+    run_test(test_result) do
+      object = Class.new { def message; end }.new
+      execution_point = ExecutionPoint.current; object.expects(:message)
+    end
+    assert_equal 1, faults.size
+    assert_equal execution_point, ExecutionPoint.new(faults.first.location)
+  end
+  
+  def test_should_display_backtrace_indicating_line_number_where_failing_assertion_was_called
+    test_result = Test::Unit::TestResult.new
+    faults = []
+    test_result.add_listener(Test::Unit::TestResult::FAULT, &lambda { |fault| faults << fault })
+    execution_point = nil
+    run_test(test_result) do
+      execution_point = ExecutionPoint.current; flunk
+    end
+    assert_equal 1, faults.size
+    assert_equal execution_point, ExecutionPoint.new(faults.first.location)
+  end
+  
+  def run_test(test_result = Test::Unit::TestResult.new, &block)
+    test_class = Class.new(Test::Unit::TestCase) do
+      include MultipleSetupAndTeardown
+      include SetupAndTeardown
+      define_method(:test_me, &block)
+    end
+    test = test_class.new(:test_me)
+    test.run(test_result) {}
+    test_result
+  end
+  
+end

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-$:.unshift File.join(File.dirname(__FILE__))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__)))
 
 require 'test/unit'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: mocha
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2006-08-14 00:00:00 +01:00
+  version: 0.3.0
+date: 2006-08-24 00:00:00 +01:00
 summary: Mocking and stubbing library
 require_paths: 
   - lib
@@ -46,6 +46,7 @@ files:
   - lib/mocha/mock.rb
   - lib/mocha/mock_methods.rb
   - lib/mocha/pretty_parameters.rb
+  - lib/shared/backtracefilter.rb
   - lib/smart_test_case/multiple_setup_and_teardown.rb
   - lib/stubba/any_instance_method.rb
   - lib/stubba/central.rb
@@ -56,10 +57,13 @@ files:
   - test/active_record_test_case.rb
   - test/all_tests.rb
   - test/auto_mock_acceptance_test.rb
+  - test/execution_point.rb
   - test/method_definer.rb
   - test/mocha_acceptance_test.rb
+  - test/mocha_test_result_integration_test.rb
   - test/stubba_acceptance_test.rb
   - test/stubba_integration_test.rb
+  - test/stubba_test_result_integration_test.rb
   - test/test_helper.rb
   - test/auto_mocha/auto_mock_test.rb
   - test/auto_mocha/mock_class_test.rb