mocha 0.5.6 → 0.9.0

data/test/acceptance/mock_test.rb

@@ -0,0 +1,100 @@
+require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require 'mocha'
+
+class MockTest < Test::Unit::TestCase
+  
+  include AcceptanceTest
+  
+  def setup
+    setup_acceptance_test
+  end
+  
+  def teardown
+    teardown_acceptance_test
+  end
+  
+  def test_should_build_mock_and_explicitly_add_an_expectation_which_is_satisfied
+    test_result = run_test do
+      foo = mock()
+      foo.expects(:bar)
+      foo.bar
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_build_mock_and_explicitly_add_an_expectation_which_is_not_satisfied
+    test_result = run_test do
+      foo = mock()
+      foo.expects(:bar)
+    end
+    assert_failed(test_result)
+  end
+
+  def test_should_build_named_mock_and_explicitly_add_an_expectation_which_is_satisfied
+    test_result = run_test do
+      foo = mock('foo')
+      foo.expects(:bar)
+      foo.bar
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_build_named_mock_and_explicitly_add_an_expectation_which_is_not_satisfied
+    test_result = run_test do
+      foo = mock('foo')
+      foo.expects(:bar)
+    end
+    assert_failed(test_result)
+  end
+
+  def test_should_build_mock_incorporating_two_expectations_which_are_satisifed
+    test_result = run_test do
+      foo = mock(:bar => 'bar', :baz => 'baz')
+      foo.bar
+      foo.baz
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_build_mock_incorporating_two_expectations_the_first_of_which_is_not_satisifed
+    test_result = run_test do
+      foo = mock(:bar => 'bar', :baz => 'baz')
+      foo.baz
+    end
+    assert_failed(test_result)
+  end
+
+  def test_should_build_mock_incorporating_two_expectations_the_second_of_which_is_not_satisifed
+    test_result = run_test do
+      foo = mock(:bar => 'bar', :baz => 'baz')
+      foo.bar
+    end
+    assert_failed(test_result)
+  end
+
+  def test_should_build_named_mock_incorporating_two_expectations_which_are_satisifed
+    test_result = run_test do
+      foo = mock('foo', :bar => 'bar', :baz => 'baz')
+      foo.bar
+      foo.baz
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_build_named_mock_incorporating_two_expectations_the_first_of_which_is_not_satisifed
+    test_result = run_test do
+      foo = mock('foo', :bar => 'bar', :baz => 'baz')
+      foo.baz
+    end
+    assert_failed(test_result)
+  end
+
+  def test_should_build_named_mock_incorporating_two_expectations_the_second_of_which_is_not_satisifed
+    test_result = run_test do
+      foo = mock('foo', :bar => 'bar', :baz => 'baz')
+      foo.bar
+    end
+    assert_failed(test_result)
+  end
+
+end

data/test/acceptance/{mock_with_initializer_block_acceptance_test.rb → mock_with_initializer_block_test.rb}

@@ -1,11 +1,18 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
+require File.join(File.dirname(__FILE__), "acceptance_test_helper")
 require 'mocha'
-require 'test_runner'
 
-class MockWithInitializerBlockAcceptanceTest < Test::Unit::TestCase
+class MockWithInitializerBlockTest < Test::Unit::TestCase
+  
+  include AcceptanceTest
+  
+  def setup
+    setup_acceptance_test
+  end
+  
+  def teardown
+    teardown_acceptance_test
+  end
   
-  include TestRunner
-
   def test_should_expect_two_method_invocations_and_receive_both_of_them
     test_result = run_test do
       mock = mock() do

data/test/acceptance/{mocked_methods_dispatch_acceptance_test.rb → mocked_methods_dispatch_test.rb}

@@ -1,11 +1,18 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
+require File.join(File.dirname(__FILE__), "acceptance_test_helper")
 require 'mocha'
-require 'test_runner'
 
-class MockedMethodDispatchAcceptanceTest < Test::Unit::TestCase
-
-  include TestRunner
+class MockedMethodDispatchTest < Test::Unit::TestCase
 
+  include AcceptanceTest
+  
+  def setup
+    setup_acceptance_test
+  end
+  
+  def teardown
+    teardown_acceptance_test
+  end
+  
   def test_should_find_latest_matching_expectation
     test_result = run_test do
       mock = mock()

data/test/acceptance/{optional_parameters_acceptance_test.rb → optional_parameters_test.rb}

@@ -1,10 +1,17 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
+require File.join(File.dirname(__FILE__), "acceptance_test_helper")
 require 'mocha'
-require 'test_runner'
 
-class OptionalParameterMatcherAcceptanceTest < Test::Unit::TestCase
+class OptionalParameterMatcherTest < Test::Unit::TestCase
   
-  include TestRunner
+  include AcceptanceTest
+  
+  def setup
+    setup_acceptance_test
+  end
+  
+  def teardown
+    teardown_acceptance_test
+  end
   
   def test_should_pass_if_all_required_parameters_match_and_no_optional_parameters_are_supplied
     test_result = run_test do

data/test/acceptance/{parameter_matcher_acceptance_test.rb → parameter_matcher_test.rb}

@@ -1,11 +1,18 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
+require File.join(File.dirname(__FILE__), "acceptance_test_helper")
 require 'mocha'
-require 'test_runner'
 
-class ParameterMatcherAcceptanceTest < Test::Unit::TestCase
+class ParameterMatcherTest < Test::Unit::TestCase
+  
+  include AcceptanceTest
+  
+  def setup
+    setup_acceptance_test
+  end
+  
+  def teardown
+    teardown_acceptance_test
+  end
   
-  include TestRunner
-
   def test_should_match_hash_parameter_with_specified_key
     test_result = run_test do
       mock = mock()
@@ -114,4 +121,59 @@ class ParameterMatcherAcceptanceTest < Test::Unit::TestCase
     assert_failed(test_result)
   end
   
+  def test_should_match_hash_parameter_with_specified_entries_using_nested_matchers
+    test_result = run_test do
+      mock = mock()
+      mock.expects(:method).with(has_entries(:key_1 => regexp_matches(/value_1/), kind_of(Symbol) => 'value_2'))
+      mock.method(:key_1 => 'value_1', :key_2 => 'value_2', :key_3 => 'value_3')
+    end
+    assert_passed(test_result)
+  end
+  
+  def test_should_not_match_hash_parameter_with_specified_entries_using_nested_matchers
+    test_result = run_test do
+      mock = mock()
+      mock.expects(:method).with(has_entries(:key_1 => regexp_matches(/value_1/), kind_of(String) => 'value_2'))
+      mock.method(:key_1 => 'value_2', :key_2 => 'value_3')
+    end
+    assert_failed(test_result)
+  end
+  
+  def test_should_match_parameter_that_matches_any_value
+    test_result = run_test do
+      mock = mock()
+      mock.expects(:method).with(any_of('value_1', 'value_2')).times(2)
+      mock.method('value_1')
+      mock.method('value_2')
+    end
+    assert_passed(test_result)
+  end
+  
+  def test_should_not_match_parameter_that_does_not_match_any_value
+    test_result = run_test do
+      mock = mock()
+      mock.expects(:method).with(any_of('value_1', 'value_2'))
+      mock.method('value_3')
+    end
+    assert_failed(test_result)
+  end
+
+  def test_should_match_parameter_that_matches_all_values
+    test_result = run_test do
+      mock = mock()
+      mock.expects(:method).with(all_of('value_1', 'value_1'))
+      mock.method('value_1')
+    end
+    assert_passed(test_result)
+  end
+  
+  def test_should_not_match_parameter_that_does_not_match_all_values
+    test_result = run_test do
+      mock = mock()
+      mock.expects(:method).with(all_of('value_1', 'value_2'))
+      mock.method('value_1')
+    end
+    assert_failed(test_result)
+  end
+
 end

data/test/acceptance/{partial_mocks_acceptance_test.rb → partial_mocks_test.rb}

@@ -1,11 +1,18 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
+require File.join(File.dirname(__FILE__), "acceptance_test_helper")
 require 'mocha'
-require 'test_runner'
 
-class PartialMockAcceptanceTest < Test::Unit::TestCase
+class PartialMockTest < Test::Unit::TestCase
+  
+  include AcceptanceTest
+  
+  def setup
+    setup_acceptance_test
+  end
+  
+  def teardown
+    teardown_acceptance_test
+  end
   
-  include TestRunner
-
   def test_should_pass_if_all_expectations_are_satisfied
     test_result = run_test do
       partial_mock_one = "partial_mock_one"

data/test/acceptance/return_value_test.rb

@@ -0,0 +1,52 @@
+require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require 'mocha'
+
+class ReturnValueTest < Test::Unit::TestCase
+  
+  include AcceptanceTest
+  
+  def setup
+    setup_acceptance_test
+  end
+  
+  def teardown
+    teardown_acceptance_test
+  end
+  
+  def test_should_build_mock_and_explicitly_add_an_expectation_with_a_return_value
+    test_result = run_test do
+      foo = mock('foo')
+      foo.expects(:bar).returns('bar')
+      assert_equal 'bar', foo.bar
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_build_mock_incorporating_two_expectations_with_return_values
+    test_result = run_test do
+      foo = mock('foo', :bar => 'bar', :baz => 'baz')
+      assert_equal 'bar', foo.bar
+      assert_equal 'baz', foo.baz
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_build_stub_and_explicitly_add_an_expectation_with_a_return_value
+    test_result = run_test do
+      foo = stub('foo')
+      foo.stubs(:bar).returns('bar')
+      assert_equal 'bar', foo.bar
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_build_stub_incorporating_two_expectations_with_return_values
+    test_result = run_test do
+      foo = stub('foo', :bar => 'bar', :baz => 'baz')
+      assert_equal 'bar', foo.bar
+      assert_equal 'baz', foo.baz
+    end
+    assert_passed(test_result)
+  end
+
+end

data/test/acceptance/{sequence_acceptance_test.rb → sequence_test.rb}

@@ -1,11 +1,18 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
+require File.join(File.dirname(__FILE__), "acceptance_test_helper")
 require 'mocha'
-require 'test_runner'
 
-class SequenceAcceptanceTest < Test::Unit::TestCase
+class SequenceTest < Test::Unit::TestCase
+  
+  include AcceptanceTest
+  
+  def setup
+    setup_acceptance_test
+  end
+  
+  def teardown
+    teardown_acceptance_test
+  end
   
-  include TestRunner
-
   def test_should_constrain_invocations_to_occur_in_expected_order
     test_result = run_test do
       mock = mock()
@@ -97,7 +104,7 @@ class SequenceAcceptanceTest < Test::Unit::TestCase
       sequence = sequence('one')
       
       mock.expects(:first).in_sequence(sequence)
-      s = mock.stubs(:second).in_sequence(sequence)
+      mock.stubs(:second).in_sequence(sequence)
       mock.expects(:third).in_sequence(sequence)
       
       mock.first

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

@@ -1,5 +1,6 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
+require File.join(File.dirname(__FILE__), "acceptance_test_helper")
 require 'mocha_standalone'
+require 'simple_counter'
 
 class NotATestUnitAssertionFailedError < StandardError
 end
@@ -8,10 +9,10 @@ class NotATestUnitTestCase
   
   include Mocha::Standalone
   
-  attr_reader :assertion_count
+  attr_reader :assertion_counter
   
   def initialize
-    @assertion_count = 0
+    @assertion_counter = SimpleCounter.new
   end
   
   def run(test_method)
@@ -20,7 +21,7 @@ class NotATestUnitTestCase
       prepare
       begin
         send(test_method)
-        mocha_verify { @assertion_count += 1 }
+        mocha_verify(@assertion_counter)
       rescue Mocha::ExpectationError => e
         new_error = NotATestUnitAssertionFailedError.new(e.message)
         new_error.set_backtrace(e.backtrace)
@@ -86,42 +87,49 @@ end
 
 require 'test/unit'
 
-class StandaloneAcceptanceTest < Test::Unit::TestCase
+class StandaloneTest < Test::Unit::TestCase
   
   attr_reader :sample_test
 
+  include AcceptanceTest
+  
   def setup
     @sample_test = SampleTest.new
+    setup_acceptance_test
+  end
+  
+  def teardown
+    teardown_acceptance_test
   end
   
   def test_should_pass_mocha_test
     assert_nothing_raised { sample_test.run(:mocha_with_fulfilled_expectation) }
-    assert_equal 1, sample_test.assertion_count
+    assert_equal 1, sample_test.assertion_counter.count
   end
 
   def test_should_fail_mocha_test_due_to_unfulfilled_exception
     assert_raises(NotATestUnitAssertionFailedError) { sample_test.run(:mocha_with_unfulfilled_expectation) }
-    assert_equal 1, sample_test.assertion_count
+    assert_equal 1, sample_test.assertion_counter.count
   end
 
   def test_should_fail_mocha_test_due_to_unexpected_invocation
     assert_raises(NotATestUnitAssertionFailedError) { sample_test.run(:mocha_with_unexpected_invocation) }
-    assert_equal 0, sample_test.assertion_count
+    assert_equal 0, sample_test.assertion_counter.count
   end
 
   def test_should_pass_stubba_test
     assert_nothing_raised { sample_test.run(:stubba_with_fulfilled_expectation) }
-    assert_equal 1, sample_test.assertion_count
+    assert_equal 1, sample_test.assertion_counter.count
   end
 
   def test_should_fail_stubba_test
     assert_raises(NotATestUnitAssertionFailedError) { sample_test.run(:stubba_with_unfulfilled_expectation) }
-    assert_equal 1, sample_test.assertion_count
+    assert_equal 1, sample_test.assertion_counter.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
+    assert_equal 1, sample_test.assertion_counter.count
   end
 
   def test_should_fail_mocha_test_with_non_matching_parameter