mocha 0.4.0 → 0.5.0

data/test/{standalone_acceptance_test.rb → acceptance/standalone_acceptance_test.rb}

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.join(File.dirname(__FILE__), "..", "test_helper")
 require 'mocha_standalone'
 
 class NotATestUnitAssertionFailedError < StandardError
@@ -70,6 +70,18 @@ class SampleTest < NotATestUnitTestCase
     stubbee.expects(:blah)
   end
   
+  def mocha_with_matching_parameter
+    mockee = mock()
+    mockee.expects(:blah).with(has_key(:wibble))
+    mockee.blah(:wibble => 1)
+  end
+  
+  def mocha_with_non_matching_parameter
+    mockee = mock()
+    mockee.expects(:blah).with(has_key(:wibble))
+    mockee.blah(:wobble => 2)
+  end
+  
 end
 
 require 'test/unit'
@@ -107,4 +119,13 @@ class StandaloneAcceptanceTest < Test::Unit::TestCase
     assert_equal 1, sample_test.assertion_count
   end
 
+  def test_should_pass_mocha_test_with_matching_parameter
+    assert_nothing_raised { sample_test.run(:mocha_with_matching_parameter) }
+    assert_equal 1, sample_test.assertion_count
+  end
+
+  def test_should_fail_mocha_test_with_non_matching_parameter
+    assert_raises(NotATestUnitAssertionFailedError) { sample_test.run(:mocha_with_non_matching_parameter) }
+  end
+
 end

data/test/{stubba_acceptance_test.rb → acceptance/stubba_acceptance_test.rb}

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.join(File.dirname(__FILE__), "..", "test_helper")
 require 'mocha'
 
 class Widget

data/test/deprecation_disabler.rb

@@ -0,0 +1,15 @@
+require 'mocha/deprecation'
+
+module DeprecationDisabler
+
+  def disable_deprecations
+    original_mode = Mocha::Deprecation.mode
+    Mocha::Deprecation.mode = :disabled
+    begin
+      yield
+    ensure
+      Mocha::Deprecation.mode = original_mode
+    end
+  end
+
+end

data/test/{mocha_test_result_integration_test.rb → integration/mocha_test_result_integration_test.rb}

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.join(File.dirname(__FILE__), "..", "test_helper")
 require 'mocha/standalone'
 require 'mocha/test_case_adapter'
 require 'execution_point'

data/test/{stubba_integration_test.rb → integration/stubba_integration_test.rb}

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.join(File.dirname(__FILE__), "..", "test_helper")
 
 require 'mocha/object'
 require 'mocha/test_case_adapter'

data/test/{stubba_test_result_integration_test.rb → integration/stubba_test_result_integration_test.rb}

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.join(File.dirname(__FILE__), "..", "test_helper")
 require 'mocha/object'
 require 'mocha/standalone'
 require 'mocha/test_case_adapter'

data/test/test_helper.rb

@@ -1,4 +1,12 @@
+unless defined?(STANDARD_OBJECT_PUBLIC_INSTANCE_METHODS)
+  STANDARD_OBJECT_PUBLIC_INSTANCE_METHODS = Object.public_instance_methods
+end
+
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__)))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'unit'))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'unit', 'parameter_matchers'))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'integration'))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'acceptance'))
 
 require 'test/unit'

data/test/test_runner.rb

@@ -0,0 +1,31 @@
+require 'test/unit/testresult'
+require 'test/unit/testcase'
+require 'mocha/standalone'
+require 'mocha/test_case_adapter'
+
+module TestRunner
+  
+  def run_test(test_result = Test::Unit::TestResult.new, &block)
+    test_class = Class.new(Test::Unit::TestCase) do
+      include Mocha::Standalone
+      include Mocha::TestCaseAdapter
+      define_method(:test_me, &block)
+    end
+    test = test_class.new(:test_me)
+    test.run(test_result) {}
+    class << test_result
+      attr_reader :failures, :errors
+    end
+    test_result
+  end
+  
+  def assert_passed(test_result)
+    flunk "Test failed unexpectedly with message: #{test_result.failures.first.message}" if test_result.failure_count > 0
+    flunk "Test failed unexpectedly with message: #{test_result.errors.first.message}" if test_result.error_count > 0
+  end
+
+  def assert_failed(test_result)
+    flunk "Test passed unexpectedly" if test_result.passed?
+  end
+
+end

data/test/unit/array_inspect_test.rb

@@ -0,0 +1,16 @@
+require File.join(File.dirname(__FILE__), "..", "test_helper")
+require 'mocha/inspect'
+
+class ArrayInstanceTest < Test::Unit::TestCase
+  
+  def test_should_use_inspect
+    array = [1, 2]
+    assert_equal array.inspect, array.mocha_inspect
+  end
+  
+  def test_should_use_mocha_inspect_on_each_item
+    array = [1, 2, "chris"]
+    assert_equal "[1, 2, 'chris']", array.mocha_inspect
+  end
+  
+end

data/test/unit/date_time_inspect_test.rb

@@ -0,0 +1,21 @@
+require File.join(File.dirname(__FILE__), "..", "test_helper")
+require 'mocha/inspect'
+
+class TimeDateInspectTest < Test::Unit::TestCase
+  
+  def test_should_use_include_date_in_seconds
+    time = Time.now
+    assert_equal "#{time.inspect} (#{time.to_f} secs)", time.mocha_inspect
+  end
+  
+  def test_should_use_to_s_for_date
+    date = Date.new(2006, 1, 1)
+    assert_equal date.to_s, date.mocha_inspect
+  end
+  
+  def test_should_use_to_s_for_datetime
+    datetime = DateTime.new(2006, 1, 1)
+    assert_equal datetime.to_s, datetime.mocha_inspect
+  end
+  
+end

data/test/unit/expectation_raiser_test.rb

@@ -0,0 +1,28 @@
+require File.join(File.dirname(__FILE__), "..", "test_helper")
+
+require 'mocha/exception_raiser'
+
+class ExceptionRaiserTest < Test::Unit::TestCase
+  
+  include Mocha
+  
+  def test_should_raise_exception_with_specified_class_and_default_message
+    exception_class = Class.new(StandardError)
+    raiser = ExceptionRaiser.new(exception_class, nil)
+    exception = assert_raises(exception_class) { raiser.evaluate }
+    assert_equal exception_class.to_s, exception.message
+  end
+
+  def test_should_raise_exception_with_specified_class_and_message
+    exception_class = Class.new(StandardError)
+    raiser = ExceptionRaiser.new(exception_class, 'message')
+    exception = assert_raises(exception_class) { raiser.evaluate }
+    assert_equal 'message', exception.message
+  end
+  
+  def test_should_raise_interrupt_exception_with_default_message_so_it_works_in_ruby_1_8_6
+    raiser = ExceptionRaiser.new(Interrupt, nil)
+    assert_raises(Interrupt) { raiser.evaluate }
+  end
+
+end

data/test/{mocha → unit}/expectation_test.rb

@@ -2,10 +2,12 @@ require File.join(File.dirname(__FILE__), "..", "test_helper")
 require 'method_definer'
 require 'mocha/expectation'
 require 'execution_point'
+require 'deprecation_disabler'
 
 class ExpectationTest < Test::Unit::TestCase
   
   include Mocha
+  include DeprecationDisabler
   
   def new_expectation
     Expectation.new(nil, :expected_method)
@@ -35,6 +37,11 @@ class ExpectationTest < Test::Unit::TestCase
     assert expectation.match?(:expected_method, 1, 2, 3)
   end
   
+  def test_should_not_match_calls_to_different_method_with_parameters_constrained_as_expected
+    expectation = new_expectation.with() {|x, y, z| x + y == z}
+    assert !expectation.match?(:different_method, 1, 2, 3)
+  end
+  
   def test_should_not_match_calls_to_different_methods_with_no_parameters
     assert !new_expectation.match?(:unexpected_method)
   end
@@ -59,6 +66,33 @@ class ExpectationTest < Test::Unit::TestCase
     assert !expectation.match?(:expected_method, 1, 0, 3)
   end
   
+  def test_should_match_until_expected_invocation_count_is_one_and_actual_invocation_count_would_be_two
+    expectation = new_expectation.times(1)
+    assert expectation.match?(:expected_method)
+    expectation.invoke
+    assert !expectation.match?(:expected_method)
+  end
+  
+  def test_should_match_until_expected_invocation_count_is_two_and_actual_invocation_count_would_be_three
+    expectation = new_expectation.times(2)
+    assert expectation.match?(:expected_method)
+    expectation.invoke
+    assert expectation.match?(:expected_method)
+    expectation.invoke
+    assert !expectation.match?(:expected_method)
+  end
+  
+  def test_should_match_until_expected_invocation_count_is_a_range_from_two_to_three_and_actual_invocation_count_would_be_four
+    expectation = new_expectation.times(2..3)
+    assert expectation.match?(:expected_method)
+    expectation.invoke
+    assert expectation.match?(:expected_method)
+    expectation.invoke
+    assert expectation.match?(:expected_method)
+    expectation.invoke
+    assert !expectation.match?(:expected_method)
+  end
+  
   def test_should_store_provided_backtrace
     backtrace = Object.new
     expectation = Expectation.new(nil, :expected_method, backtrace)
@@ -77,18 +111,40 @@ class ExpectationTest < Test::Unit::TestCase
   end
 
   def test_should_yield_no_parameters
-    expectation = new_expectation.yields
+    expectation = new_expectation().yields()
     yielded_parameters = nil
-    expectation.invoke() { |*parameters| yielded_parameters  = parameters }
+    expectation.invoke() { |*parameters| yielded_parameters = parameters }
     assert_equal Array.new, yielded_parameters
   end
 
   def test_should_yield_with_specified_parameters
-    parameters_for_yield = [1, 2, 3]
-    expectation = new_expectation.yields(*parameters_for_yield)
+    expectation = new_expectation().yields(1, 2, 3)
     yielded_parameters = nil
-    expectation.invoke() { |*parameters| yielded_parameters  = parameters }
-    assert_equal parameters_for_yield, yielded_parameters
+    expectation.invoke() { |*parameters| yielded_parameters = parameters }
+    assert_equal [1, 2, 3], yielded_parameters
+  end
+
+  def test_should_yield_different_parameters_on_consecutive_invocations
+    expectation = new_expectation().yields(1, 2, 3).yields(4, 5)
+    yielded_parameters = []
+    expectation.invoke() { |*parameters| yielded_parameters << parameters }
+    expectation.invoke() { |*parameters| yielded_parameters << parameters }
+    assert_equal [[1, 2, 3], [4, 5]], yielded_parameters
+  end
+  
+  def test_should_yield_multiple_times_for_single_invocation
+    expectation = new_expectation().multiple_yields([1, 2, 3], [4, 5])
+    yielded_parameters = []
+    expectation.invoke() { |*parameters| yielded_parameters << parameters }
+    assert_equal [[1, 2, 3], [4, 5]], yielded_parameters
+  end
+
+  def test_should_yield_multiple_times_for_first_invocation_and_once_for_second_invocation
+    expectation = new_expectation().multiple_yields([1, 2, 3], [4, 5]).then.yields(6, 7)
+    yielded_parameters = []
+    expectation.invoke() { |*parameters| yielded_parameters << parameters }
+    expectation.invoke() { |*parameters| yielded_parameters << parameters }
+    assert_equal [[1, 2, 3], [4, 5], [6, 7]], yielded_parameters
   end
 
   def test_should_return_specified_value
@@ -130,7 +186,9 @@ class ExpectationTest < Test::Unit::TestCase
   def test_should_return_evaluated_proc
     proc = lambda { 99 }
     expectation = new_expectation.returns(proc)
-    assert_equal 99, expectation.invoke
+    result = nil
+    disable_deprecations { result = expectation.invoke }
+    assert_equal 99, result
   end
   
   def test_should_return_evaluated_proc_without_using_is_a_method
@@ -139,7 +197,7 @@ class ExpectationTest < Test::Unit::TestCase
     proc.called = false
     proc.replace_instance_method(:is_a?) { self.called = true; true}
     expectation = new_expectation.returns(proc)
-    expectation.invoke
+    disable_deprecations { expectation.invoke }
     assert_equal false, proc.called
   end
   
@@ -175,6 +233,20 @@ class ExpectationTest < Test::Unit::TestCase
     assert_equal exception_msg, exception.message
   end
   
+  def test_should_return_values_then_raise_exception
+    expectation = new_expectation.returns(1, 2).then.raises()
+    assert_equal 1, expectation.invoke
+    assert_equal 2, expectation.invoke
+    assert_raise(RuntimeError) { expectation.invoke }
+  end
+  
+  def test_should_raise_exception_then_return_values
+    expectation = new_expectation.raises().then.returns(1, 2)
+    assert_raise(RuntimeError) { expectation.invoke }
+    assert_equal 1, expectation.invoke
+    assert_equal 2, expectation.invoke
+  end
+  
   def test_should_not_raise_error_on_verify_if_expected_call_was_made
     expectation = new_expectation
     expectation.invoke
@@ -183,6 +255,30 @@ class ExpectationTest < Test::Unit::TestCase
     }
   end
   
+  def test_should_raise_error_on_verify_if_call_expected_once_but_invoked_twice
+    expectation = new_expectation.once
+    expectation.invoke
+    expectation.invoke
+    assert_raises(ExpectationError) {
+      expectation.verify
+    }
+  end
+
+  def test_should_raise_error_on_verify_if_call_expected_once_but_not_invoked
+    expectation = new_expectation.once
+    assert_raises(ExpectationError) {
+      expectation.verify
+    }
+  end
+
+  def test_should_not_raise_error_on_verify_if_call_expected_once_and_invoked_once
+    expectation = new_expectation.once
+    expectation.invoke
+    assert_nothing_raised(ExpectationError) {
+      expectation.verify
+    }
+  end
+
   def test_should_not_raise_error_on_verify_if_expected_call_was_made_at_least_once
     expectation = new_expectation.at_least_once
     3.times {expectation.invoke}
@@ -280,13 +376,6 @@ class ExpectationTest < Test::Unit::TestCase
     assert_equal "expected_method", new_expectation.method_signature
   end
   
-  def test_should_always_verify_successfully
-    stub = Stub.new(nil, :expected_method)
-    assert stub.verify
-    stub.invoke
-    assert stub.verify
-  end
-  
   def test_should_raise_error_with_message_indicating_which_method_was_expected_to_be_called_on_which_mock_object
     mock = Class.new { def mocha_inspect; 'mock'; end }.new
     expectation = Expectation.new(mock, :expected_method)
@@ -294,53 +383,6 @@ class ExpectationTest < Test::Unit::TestCase
     assert_match "mock.expected_method", e.message
   end
   
-end
-
-class ExpectationSimilarExpectationsTest < Test::Unit::TestCase
-  
-  include Mocha
-  
-  def new_expectation
-    Expectation.new(nil, :expected_method)
-  end
-    
-  def test_should_find_expectations_to_the_same_method
-    expectation = new_expectation.with(1)
-    mock = Object.new
-    mock.define_instance_method(:expectations) { [expectation] }
-    failed_expectation = MissingExpectation.new(mock, :expected_method).with(2)
-    assert_equal [expectation], failed_expectation.similar_expectations
-  end
-  
-  def test_should_report_similar_expectations
-    mock = Object.new
-    expectation_1 = new_expectation.with(1)
-    expectation_2 = new_expectation.with(2)
-    mock = Object.new
-    mock.define_instance_method(:expectations) { [expectation_1, expectation_2] }
-    missing_expectation = MissingExpectation.new(mock, :expected_method).with(3)
-    exception = assert_raise(ExpectationError) { missing_expectation.verify }
-    assert_equal "#{mock.mocha_inspect}.expected_method(3) - expected calls: 0, actual calls: 1\nSimilar expectations:\nexpected_method(1)\nexpected_method(2)", exception.message
-  end
-  
-  def test_should_ignore_expectations_to_different_methods
-    expectation = new_expectation.with(1)
-    mock = Object.new
-    mock.define_instance_method(:expectations) { [expectation] }
-    failed_expectation = MissingExpectation.new(mock, :other_method).with(1)
-    assert failed_expectation.similar_expectations.empty?
-  end
-  
-  def test_should_not_report_similar_expectations
-    expectation = new_expectation.with(1)
-    mock = Object.new
-    mock.define_instance_method(:expectations) { [expectation] }
-    mock.define_instance_method(:mocha_inspect) { 'mocha_inspect' }
-    missing_expectation = MissingExpectation.new(mock, :unexpected_method).with(1)
-    exception = assert_raise(ExpectationError) { missing_expectation.verify }
-    assert_equal "mocha_inspect.unexpected_method(1) - expected calls: 0, actual calls: 1", exception.message
-  end
-  
   def test_should_exclude_mocha_locations_from_backtrace
     mocha_lib = "/username/workspace/mocha_wibble/lib/"
     backtrace = [ mocha_lib + 'exclude/me/1', mocha_lib + 'exclude/me/2', '/keep/me', mocha_lib + 'exclude/me/3']
@@ -354,4 +396,4 @@ class ExpectationSimilarExpectationsTest < Test::Unit::TestCase
     assert_match Regexp.new("/lib/$"), expectation.mocha_lib_directory
   end
   
-end
+end