mocha 0.10.5 → 0.11.0

data/test/acceptance/minitest_test.rb

@@ -17,146 +17,146 @@ else
   end
 
   if defined?(MiniTest)
-  
+
     # monkey-patch MiniTest now that it has hopefully been loaded
     require 'mocha/integration/mini_test'
 
     class MiniTestSampleTest < MiniTest::Unit::TestCase
-  
+
       def test_mocha_with_fulfilled_expectation
         mockee = mock()
         mockee.expects(:blah)
         mockee.blah
       end
-  
+
       def test_mocha_with_unfulfilled_expectation
         mockee = mock()
         mockee.expects(:blah)
       end
-  
+
       def test_mocha_with_unexpected_invocation
         mockee = mock()
         mockee.blah
       end
-  
+
       def test_stubba_with_fulfilled_expectation
         stubbee = Class.new { define_method(:blah) {} }.new
         stubbee.expects(:blah)
         stubbee.blah
       end
-  
+
       def test_stubba_with_unfulfilled_expectation
         stubbee = Class.new { define_method(:blah) {} }.new
         stubbee.expects(:blah)
       end
-  
+
       def test_mocha_with_matching_parameter
         mockee = mock()
         mockee.expects(:blah).with(has_key(:wibble))
         mockee.blah(:wibble => 1)
       end
-  
+
       def test_mocha_with_non_matching_parameter
         mockee = mock()
         mockee.expects(:blah).with(has_key(:wibble))
         mockee.blah(:wobble => 2)
       end
-  
+
     end
 
     class MiniTestTest < Test::Unit::TestCase
-  
+
       def setup
         @output = StringIO.new
         MiniTest::Unit.output = @output
         @runner = MiniTest::Unit.new
       end
-  
+
       attr_reader :runner
-  
+
       def test_should_pass_mocha_test
-        run_test :test_mocha_with_fulfilled_expectation
-    
+        run_test_method :test_mocha_with_fulfilled_expectation
+
         assert_equal 0, runner.failures
         assert_equal 0, runner.errors
         assert_equal 1, runner.assertion_count
       end
 
       def test_should_fail_mocha_test_due_to_unfulfilled_expectation
-        run_test :test_mocha_with_unfulfilled_expectation
-      
+        run_test_method :test_mocha_with_unfulfilled_expectation
+
         assert_equal 1, runner.failures
         assert_equal 0, runner.errors
         assert_equal 1, runner.assertion_count
         assert_not_all_expectation_were_satisfied
       end
-  
+
       def test_should_fail_mocha_test_due_to_unexpected_invocation
-        run_test :test_mocha_with_unexpected_invocation
-    
+        run_test_method :test_mocha_with_unexpected_invocation
+
         assert_equal 1, runner.failures
         assert_equal 0, runner.errors
         assert_equal 0, runner.assertion_count
         assert_unexpected_invocation
       end
-  
+
       def test_should_pass_stubba_test
-        run_test :test_stubba_with_fulfilled_expectation
-    
+        run_test_method :test_stubba_with_fulfilled_expectation
+
         assert_equal 0, runner.failures
         assert_equal 0, runner.errors
         assert_equal 1, runner.assertion_count
       end
-  
+
       def test_should_fail_stubba_test_due_to_unfulfilled_expectation
-        run_test :test_stubba_with_unfulfilled_expectation
-    
+        run_test_method :test_stubba_with_unfulfilled_expectation
+
         assert_equal 1, runner.failures
         assert_equal 0, runner.errors
         assert_equal 1, runner.assertion_count
         assert_not_all_expectation_were_satisfied
       end
-  
+
       def test_should_pass_mocha_test_with_matching_parameter
-        run_test :test_mocha_with_matching_parameter
-    
+        run_test_method :test_mocha_with_matching_parameter
+
         assert_equal 0, runner.failures
         assert_equal 0, runner.errors
         assert_equal 1, runner.assertion_count
       end
-  
+
       def test_should_fail_mocha_test_with_non_matching_parameter
-        run_test :test_mocha_with_non_matching_parameter
-      
+        run_test_method :test_mocha_with_non_matching_parameter
+
         assert_equal 1, runner.failures
         assert_equal 0, runner.errors
         assert_equal 0, runner.assertion_count # unexpected invocation occurs before expectation is verified
         assert_unexpected_invocation
       end
-  
+
       private
 
-      def run_test(method_name)
+      def run_test_method(method_name)
         run_method = (MiniTest::Unit::VERSION >= "2.1.0") ? :_run : :run
         runner.send(run_method, ["-n", method_name.to_s])
       end
-  
+
       def output
         @output.rewind
         @output.read
       end
-  
+
       def assert_unexpected_invocation
         assert_match Regexp.new('unexpected invocation'), output, "MiniTest output:\n#{output}"
       end
-  
+
       def assert_not_all_expectation_were_satisfied
         assert_match Regexp.new('not all expectations were satisfied'), output, "MiniTest output:\n#{output}"
       end
-  
+
     end
-  
+
   else
     $stderr.puts "MiniTest is not available, so MiniTestAdapterTest has not been run."
   end
-end
+end

data/test/acceptance/mocha_example_test.rb

@@ -2,97 +2,97 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha'
 
 class MochaExampleTest < Test::Unit::TestCase
-  
+
   class Rover
-    
+
     def initialize(left_track, right_track, steps_per_metre, steps_per_degree)
       @left_track, @right_track, @steps_per_metre, @steps_per_degree = left_track, right_track, steps_per_metre, steps_per_degree
     end
-    
+
     def forward(metres)
       @left_track.step(metres * @steps_per_metre)
       @right_track.step(metres * @steps_per_metre)
       wait
     end
-    
+
     def backward(metres)
       forward(-metres)
     end
-    
+
     def left(degrees)
       @left_track.step(-degrees * @steps_per_degree)
       @right_track.step(+degrees * @steps_per_degree)
       wait
     end
-    
+
     def right(degrees)
       left(-degrees)
     end
-    
+
     def wait
       while (@left_track.moving? or @right_track.moving?); end
     end
-    
+
   end
-  
+
   def test_should_step_both_tracks_forward_ten_steps
     left_track = mock('left_track')
     right_track = mock('right_track')
     steps_per_metre = 5
     rover = Rover.new(left_track, right_track, steps_per_metre, nil)
-    
+
     left_track.expects(:step).with(10)
     right_track.expects(:step).with(10)
-    
+
     left_track.stubs(:moving?).returns(false)
     right_track.stubs(:moving?).returns(false)
-    
+
     rover.forward(2)
   end
-  
+
   def test_should_step_both_tracks_backward_ten_steps
     left_track = mock('left_track')
     right_track = mock('right_track')
     steps_per_metre = 5
     rover = Rover.new(left_track, right_track, steps_per_metre, nil)
-    
+
     left_track.expects(:step).with(-10)
     right_track.expects(:step).with(-10)
-    
+
     left_track.stubs(:moving?).returns(false)
     right_track.stubs(:moving?).returns(false)
-    
+
     rover.backward(2)
   end
-  
+
   def test_should_step_left_track_forwards_five_steps_and_right_track_backwards_five_steps
     left_track = mock('left_track')
     right_track = mock('right_track')
     steps_per_degree = 5.0 / 90.0
     rover = Rover.new(left_track, right_track, nil, steps_per_degree)
-    
+
     left_track.expects(:step).with(+5)
     right_track.expects(:step).with(-5)
-    
+
     left_track.stubs(:moving?).returns(false)
     right_track.stubs(:moving?).returns(false)
-    
+
     rover.right(90)
   end
-  
+
   def test_should_step_left_track_backwards_five_steps_and_right_track_forwards_five_steps
     left_track = mock('left_track')
     right_track = mock('right_track')
     steps_per_degree = 5.0 / 90.0
     rover = Rover.new(left_track, right_track, nil, steps_per_degree)
-    
+
     left_track.expects(:step).with(-5)
     right_track.expects(:step).with(+5)
-    
+
     left_track.stubs(:moving?).returns(false)
     right_track.stubs(:moving?).returns(false)
-    
+
     rover.left(90)
   end
-  
-end
+
+end

data/test/acceptance/mocha_test_result_test.rb

@@ -3,13 +3,13 @@ require 'mocha'
 require 'execution_point'
 
 class MochaTestResultTest < Test::Unit::TestCase
-  
+
   include AcceptanceTest
-  
+
   def setup
     setup_acceptance_test
   end
-  
+
   def teardown
     teardown_acceptance_test
   end
@@ -22,14 +22,14 @@ class MochaTestResultTest < Test::Unit::TestCase
     end
     assert_equal 1, test_result.assertion_count
   end
-  
+
   def test_should_include_assertions_in_assertion_count
     test_result = run_as_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_as_test do
       object = mock()
@@ -38,7 +38,7 @@ class MochaTestResultTest < Test::Unit::TestCase
     end
     assert_equal 0, test_result.assertion_count
   end
-  
+
   def test_should_include_expectation_verification_failure_in_failure_count
     test_result = run_as_test do
       object = mock()
@@ -46,7 +46,7 @@ class MochaTestResultTest < Test::Unit::TestCase
     end
     assert_equal 1, test_result.failure_count
   end
-  
+
   def test_should_include_unexpected_verification_failure_in_failure_count
     test_result = run_as_test do
       object = mock()
@@ -54,24 +54,24 @@ class MochaTestResultTest < Test::Unit::TestCase
     end
     assert_equal 1, test_result.failure_count
   end
-  
+
   def test_should_include_assertion_failure_in_failure_count
     test_result = run_as_test do
       flunk
     end
     assert_equal 1, test_result.failure_count
   end
-  
+
   def test_should_display_backtrace_indicating_line_number_where_unexpected_method_was_called
     execution_point = nil
     test_result = run_as_test do
       object = mock()
-      execution_point = ExecutionPoint.current; object.message 
+      execution_point = ExecutionPoint.current; object.message
     end
     assert_equal 1, test_result.failure_count
     assert_equal execution_point, ExecutionPoint.new(test_result.failures[0].location)
   end
-  
+
   def test_should_display_backtrace_indicating_line_number_where_failing_assertion_was_called
     execution_point = nil
     test_result = run_as_test do
@@ -80,5 +80,5 @@ class MochaTestResultTest < Test::Unit::TestCase
     assert_equal 1, test_result.failure_count
     assert_equal execution_point, ExecutionPoint.new(test_result.failures[0].location)
   end
-  
-end
+
+end

data/test/acceptance/mock_test.rb

@@ -2,17 +2,17 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 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_as_test do
       foo = mock()
@@ -97,4 +97,4 @@ class MockTest < Test::Unit::TestCase
     assert_failed(test_result)
   end
 
-end
+end

data/test/acceptance/mock_with_initializer_block_test.rb

@@ -2,17 +2,17 @@ require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class MockWithInitializerBlockTest < Test::Unit::TestCase
-  
+
   include AcceptanceTest
-  
+
   def setup
     setup_acceptance_test
   end
-  
+
   def teardown
     teardown_acceptance_test
   end
-  
+
   def test_should_expect_two_method_invocations_and_receive_both_of_them
     test_result = run_as_test do
       mock = mock() do
@@ -48,4 +48,4 @@ class MockWithInitializerBlockTest < Test::Unit::TestCase
     assert_passed(test_result)
   end
 
-end
+end