bourne 1.1.1 → 1.1.2

data/test/unit/mock_test.rb

@@ -5,24 +5,24 @@ require 'set'
 require 'simple_counter'
 
 class MockTest < Test::Unit::TestCase
-  
+
   include Mocha
-  
+
   def test_should_set_single_expectation
    mock = build_mock
    mock.expects(:method1).returns(1)
    assert_nothing_raised(ExpectationError) do
      assert_equal 1, mock.method1
    end
-  end 
+  end
 
   def test_should_build_and_store_expectations
    mock = build_mock
    expectation = mock.expects(:method1)
    assert_not_nil expectation
-   assert_equal [expectation], mock.expectations.to_a
+   assert_equal [expectation], mock.__expectations__.to_a
   end
-  
+
   def test_should_not_stub_everything_by_default
     mock = build_mock
     assert_equal false, mock.everything_stubbed
@@ -33,71 +33,71 @@ class MockTest < Test::Unit::TestCase
     mock.stub_everything
     assert_equal true, mock.everything_stubbed
   end
-  
+
   def test_should_be_able_to_extend_mock_object_with_module
     mock = build_mock
     assert_nothing_raised(ExpectationError) { mock.extend(Module.new) }
   end
-  
+
   def test_should_be_equal
     mock = build_mock
     assert_equal true, mock.eql?(mock)
   end
-  
+
   if RUBY_VERSION < '1.9'
     OBJECT_METHODS = STANDARD_OBJECT_PUBLIC_INSTANCE_METHODS.reject { |m| m =~ /^__.*__$/ }
   else
     OBJECT_METHODS = STANDARD_OBJECT_PUBLIC_INSTANCE_METHODS.reject { |m| m =~ /^__.*__$/ || m == :object_id }
   end
-  
+
   def test_should_be_able_to_mock_standard_object_methods
     mock = build_mock
     OBJECT_METHODS.each { |method| mock.__expects__(method.to_sym).returns(method) }
     OBJECT_METHODS.each { |method| assert_equal method, mock.__send__(method.to_sym) }
     assert mock.__verified__?
   end
-  
+
   def test_should_be_able_to_stub_standard_object_methods
     mock = build_mock
     OBJECT_METHODS.each { |method| mock.__stubs__(method.to_sym).returns(method) }
     OBJECT_METHODS.each { |method| assert_equal method, mock.__send__(method.to_sym) }
   end
-  
+
   def test_should_create_and_add_expectations
     mock = build_mock
     expectation1 = mock.expects(:method1)
     expectation2 = mock.expects(:method2)
-    assert_equal [expectation1, expectation2].to_set, mock.expectations.to_set
+    assert_equal [expectation1, expectation2].to_set, mock.__expectations__.to_set
   end
-  
+
   def test_should_pass_backtrace_into_expectation
     mock = build_mock
     backtrace = Object.new
     expectation = mock.expects(:method1, backtrace)
     assert_equal backtrace, expectation.backtrace
   end
-  
+
   def test_should_pass_backtrace_into_stub
     mock = build_mock
     backtrace = Object.new
     stub = mock.stubs(:method1, backtrace)
     assert_equal backtrace, stub.backtrace
   end
-  
+
   def test_should_create_and_add_stubs
     mock = build_mock
     stub1 = mock.stubs(:method1)
     stub2 = mock.stubs(:method2)
-    assert_equal [stub1, stub2].to_set, mock.expectations.to_set
+    assert_equal [stub1, stub2].to_set, mock.__expectations__.to_set
   end
-  
+
   def test_should_invoke_expectation_and_return_result
     mock = build_mock
     mock.expects(:my_method).returns(:result)
     result = mock.my_method
     assert_equal :result, result
   end
-  
+
   def test_should_not_raise_error_if_stubbing_everything
     mock = build_mock
     mock.stub_everything
@@ -107,7 +107,7 @@ class MockTest < Test::Unit::TestCase
     end
     assert_nil result
   end
-  
+
   def test_should_raise_assertion_error_for_unexpected_method_call
     mock = build_mock
     error = assert_raise(ExpectationError) do
@@ -118,7 +118,7 @@ class MockTest < Test::Unit::TestCase
     assert_match(/argument1/, error.message)
     assert_match(/argument2/, error.message)
   end
-  
+
   def test_should_not_verify_successfully_because_not_all_expectations_have_been_satisfied
     mock = build_mock
     mock.expects(:method1)
@@ -126,23 +126,23 @@ class MockTest < Test::Unit::TestCase
     mock.method1
     assert !mock.__verified__?
   end
-  
+
   def test_should_increment_assertion_counter_for_every_verified_expectation
     mock = build_mock
-    
+
     mock.expects(:method1)
     mock.method1
-    
+
     mock.expects(:method2)
     mock.method2
-    
+
     assertion_counter = SimpleCounter.new
-    
+
     mock.__verified__?(assertion_counter)
-    
+
     assert_equal 2, assertion_counter.count
   end
-  
+
   def test_should_yield_supplied_parameters_to_block
     mock = build_mock
     parameters_for_yield = [1, 2, 3]
@@ -151,35 +151,35 @@ class MockTest < Test::Unit::TestCase
     mock.method1() { |*parameters| yielded_parameters = parameters }
     assert_equal parameters_for_yield, yielded_parameters
   end
-  
+
   def test_should_set_up_multiple_expectations_with_return_values
     mock = build_mock
     mock.expects(:method1 => :result1, :method2 => :result2)
     assert_equal :result1, mock.method1
     assert_equal :result2, mock.method2
   end
-  
+
   def test_should_set_up_multiple_stubs_with_return_values
     mock = build_mock
     mock.stubs(:method1 => :result1, :method2 => :result2)
     assert_equal :result1, mock.method1
     assert_equal :result2, mock.method2
   end
-  
+
   def test_should_keep_returning_specified_value_for_stubs
     mock = build_mock
     mock.stubs(:method1).returns(1)
     assert_equal 1, mock.method1
     assert_equal 1, mock.method1
   end
-  
+
   def test_should_keep_returning_specified_value_for_expects
     mock = build_mock
     mock.expects(:method1).times(2).returns(1)
     assert_equal 1, mock.method1
     assert_equal 1, mock.method1
   end
-  
+
   def test_should_match_most_recent_call_to_expects
     mock = build_mock
     mock.expects(:method1).returns(0)
@@ -207,18 +207,18 @@ class MockTest < Test::Unit::TestCase
     mock.stubs(:method1).returns(1)
     assert_equal 1, mock.method1
   end
-  
+
   def test_should_respond_to_expected_method
     mock = build_mock
     mock.expects(:method1)
     assert_equal true, mock.respond_to?(:method1)
   end
-  
+
   def test_should_not_respond_to_unexpected_method
     mock = build_mock
     assert_equal false, mock.respond_to?(:method1)
   end
-  
+
   def test_should_respond_to_methods_which_the_responder_does_responds_to
     instance = Class.new do
       define_method(:respond_to?) { |symbol| true }
@@ -227,7 +227,7 @@ class MockTest < Test::Unit::TestCase
     mock.responds_like(instance)
     assert_equal true, mock.respond_to?(:invoked_method)
   end
-  
+
   def test_should_not_respond_to_methods_which_the_responder_does_not_responds_to
     instance = Class.new do
       define_method(:respond_to?) { |symbol| false }
@@ -236,18 +236,18 @@ class MockTest < Test::Unit::TestCase
     mock.responds_like(instance)
     assert_equal false, mock.respond_to?(:invoked_method)
   end
-  
+
   def test_should_return_itself_to_allow_method_chaining
     mock = build_mock
     assert_same mock.responds_like(Object.new), mock
   end
-  
+
   def test_should_not_raise_no_method_error_if_mock_is_not_restricted_to_respond_like_a_responder
     mock = build_mock
     mock.stubs(:invoked_method)
     assert_nothing_raised(NoMethodError) { mock.invoked_method }
   end
-  
+
   def test_should_not_raise_no_method_error_if_responder_does_respond_to_invoked_method
     instance = Class.new do
       define_method(:respond_to?) { |symbol| true }
@@ -257,7 +257,7 @@ class MockTest < Test::Unit::TestCase
     mock.stubs(:invoked_method)
     assert_nothing_raised(NoMethodError) { mock.invoked_method }
   end
-  
+
   def test_should_raise_no_method_error_if_responder_does_not_respond_to_invoked_method
     instance = Class.new do
       define_method(:respond_to?) { |symbol| false }
@@ -268,7 +268,7 @@ class MockTest < Test::Unit::TestCase
     mock.stubs(:invoked_method)
     assert_raises(NoMethodError) { mock.invoked_method }
   end
-  
+
   def test_should_raise_no_method_error_with_message_indicating_that_mock_is_constrained_to_respond_like_responder
     instance = Class.new do
       define_method(:respond_to?) { |symbol| false }
@@ -283,12 +283,12 @@ class MockTest < Test::Unit::TestCase
       assert_match(/which responds like mocha_inspect/, e.message)
     end
   end
-  
+
   def test_should_handle_respond_to_with_private_methods_param_without_error
     mock = build_mock
     assert_nothing_raised{ mock.respond_to?(:object_id, false) }
   end
-  
+
   def test_should_respond_to_any_method_if_stubbing_everything
     mock = build_mock
     mock.stub_everything
@@ -325,7 +325,7 @@ class MockTest < Test::Unit::TestCase
     args   = [1, 2]
     mock = Mock.new(method)
     expectation = FakeExpectation.new
-    mock.expectations.add expectation
+    mock.__expectations__.add expectation
     mock.send(method, *args)
     assert_equal args, expectation.args
   end

data/test/unit/mockery_test.rb

@@ -4,28 +4,28 @@ require 'mocha/state_machine'
 require 'bourne/invocation'
 
 class MockeryTest < Test::Unit::TestCase
-  
+
   include Mocha
-  
+
   def test_should_build_instance_of_mockery
     mockery = Mockery.instance
     assert_not_nil mockery
     assert_kind_of Mockery, mockery
   end
-  
+
   def test_should_cache_instance_of_mockery
     mockery_1 = Mockery.instance
     mockery_2 = Mockery.instance
     assert_same mockery_1, mockery_2
   end
-  
+
   def test_should_expire_mockery_instance_cache
     mockery_1 = Mockery.instance
     Mockery.reset_instance
     mockery_2 = Mockery.instance
     assert_not_same mockery_1, mockery_2
   end
-  
+
   def test_should_raise_expectation_error_because_not_all_expectations_are_satisfied
     mockery = Mockery.new
     mock_1 = mockery.named_mock('mock-1') { expects(:method_1) }
@@ -34,20 +34,20 @@ class MockeryTest < Test::Unit::TestCase
     0.times { mock_2.method_2 }
     assert_raises(ExpectationError) { mockery.verify }
   end
-  
+
   def test_should_reset_list_of_mocks_on_teardown
     mockery = Mockery.new
     mock = mockery.unnamed_mock { expects(:my_method) }
     mockery.teardown
     assert_nothing_raised(ExpectationError) { mockery.verify }
   end
-  
+
   def test_should_build_instance_of_stubba_on_instantiation
     mockery = Mockery.new
     assert_not_nil mockery.stubba
     assert_kind_of Central, mockery.stubba
   end
-  
+
   def test_should_build_new_instance_of_stubba_on_teardown
     mockery = Mockery.new
     stubba_1 = mockery.stubba
@@ -55,27 +55,27 @@ class MockeryTest < Test::Unit::TestCase
     stubba_2 = mockery.stubba
     assert_not_same stubba_1, stubba_2
   end
-  
+
   def test_should_build_and_store_new_state_machine
     mockery = Mockery.new
     mockery.new_state_machine('state-machine-name')
     assert_equal 1, mockery.state_machines.length
     assert_kind_of StateMachine, mockery.state_machines[0]
   end
-  
+
   def test_should_reset_list_of_state_machines_on_teardown
     mockery = Mockery.new
     mockery.new_state_machine('state-machine-name')
     mockery.teardown
     assert_equal 0, mockery.state_machines.length
   end
-  
+
   class FakeMethod
     def stub; end
     def unstub; end
     def matches?(other); true; end
   end
-  
+
   def test_should_unstub_all_methods_on_teardown
     mockery = Mockery.new
     stubba = mockery.stubba
@@ -83,65 +83,65 @@ class MockeryTest < Test::Unit::TestCase
     mockery.teardown
     assert stubba.stubba_methods.empty?
   end
-  
+
   def test_should_display_object_id_for_mocha_inspect_if_mock_has_no_name
     mockery = Mockery.new
     mock = mockery.unnamed_mock
     assert_match Regexp.new("^#<Mock:0x[0-9A-Fa-f]{1,12}>$"), mock.mocha_inspect
   end
-  
+
   def test_should_display_object_id_for_inspect_if_mock_has_no_name
     mockery = Mockery.new
     mock = mockery.unnamed_mock
     assert_match Regexp.new("^#<Mock:0x[0-9A-Fa-f]{1,12}>$"), mock.inspect
   end
-  
+
   def test_should_display_name_for_mocha_inspect_if_mock_has_string_name
     mockery = Mockery.new
     mock = mockery.named_mock('named_mock')
     assert_equal "#<Mock:named_mock>", mock.mocha_inspect
   end
-  
+
   def test_should_display_name_for_mocha_inspect_if_mock_has_symbol_name
     mockery = Mockery.new
     mock = mockery.named_mock(:named_mock)
     assert_equal "#<Mock:named_mock>", mock.mocha_inspect
   end
-  
+
   def test_should_display_name_for_inspect_if_mock_has_string_name
     mockery = Mockery.new
     mock = mockery.named_mock('named_mock')
     assert_equal "#<Mock:named_mock>", mock.inspect
   end
-  
+
   def test_should_display_name_for_inspect_if_mock_has_symbol_name
     mockery = Mockery.new
     mock = mockery.named_mock(:named_mock)
     assert_equal "#<Mock:named_mock>", mock.inspect
   end
-  
+
   def test_should_display_impersonated_object_for_mocha_inspect
     mockery = Mockery.new
     instance = Object.new
     mock = mockery.mock_impersonating(instance)
     assert_equal "#{instance.mocha_inspect}", mock.mocha_inspect
   end
-  
+
   def test_should_display_impersonated_object_for_inspect
     mockery = Mockery.new
     instance = Object.new
     mock = mockery.mock_impersonating(instance)
     assert_equal "#{instance.mocha_inspect}", mock.inspect
   end
-  
+
   class FakeClass; end
-  
+
   def test_should_display_any_instance_prefix_followed_by_class_whose_instances_are_being_impersonated_for_mocha_inspect
     mockery = Mockery.new
     mock = mockery.mock_impersonating_any_instance_of(FakeClass)
     assert_equal "#<AnyInstance:MockeryTest::FakeClass>", mock.mocha_inspect
   end
-  
+
   def test_should_display_any_instance_prefix_followed_by_class_whose_instances_are_being_impersonated_for_inspect
     mockery = Mockery.new
     mock = mockery.mock_impersonating_any_instance_of(FakeClass)
@@ -160,5 +160,5 @@ class MockeryTest < Test::Unit::TestCase
     assert_equal method, invocation.method_name
     assert_equal args, invocation.arguments
   end
-  
+
 end