mocha 0.9.5 → 0.9.6

data/test/acceptance/mocha_test_result_test.rb

@@ -15,7 +15,7 @@ class MochaTestResultTest < Test::Unit::TestCase
   end
 
   def test_should_include_expectation_verification_in_assertion_count
-    test_result = run_test do
+    test_result = run_as_test do
       object = mock()
       object.expects(:message)
       object.message
@@ -24,14 +24,14 @@ class MochaTestResultTest < Test::Unit::TestCase
   end
   
   def test_should_include_assertions_in_assertion_count
-    test_result = run_test do
+    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_test do
+    test_result = run_as_test do
       object = mock()
       object.stubs(:message)
       object.message
@@ -40,7 +40,7 @@ class MochaTestResultTest < Test::Unit::TestCase
   end
   
   def test_should_include_expectation_verification_failure_in_failure_count
-    test_result = run_test do
+    test_result = run_as_test do
       object = mock()
       object.expects(:message)
     end
@@ -48,7 +48,7 @@ class MochaTestResultTest < Test::Unit::TestCase
   end
   
   def test_should_include_unexpected_verification_failure_in_failure_count
-    test_result = run_test do
+    test_result = run_as_test do
       object = mock()
       object.message
     end
@@ -56,7 +56,7 @@ class MochaTestResultTest < Test::Unit::TestCase
   end
   
   def test_should_include_assertion_failure_in_failure_count
-    test_result = run_test do
+    test_result = run_as_test do
       flunk
     end
     assert_equal 1, test_result.failure_count
@@ -64,7 +64,7 @@ class MochaTestResultTest < Test::Unit::TestCase
   
   def test_should_display_backtrace_indicating_line_number_where_unexpected_method_was_called
     execution_point = nil
-    test_result = run_test do
+    test_result = run_as_test do
       object = mock()
       execution_point = ExecutionPoint.current; object.message 
     end
@@ -74,7 +74,7 @@ class MochaTestResultTest < Test::Unit::TestCase
   
   def test_should_display_backtrace_indicating_line_number_where_failing_assertion_was_called
     execution_point = nil
-    test_result = run_test do
+    test_result = run_as_test do
       execution_point = ExecutionPoint.current; flunk
     end
     assert_equal 1, test_result.failure_count

data/test/acceptance/mock_test.rb

@@ -14,7 +14,7 @@ class MockTest < Test::Unit::TestCase
   end
   
   def test_should_build_mock_and_explicitly_add_an_expectation_which_is_satisfied
-    test_result = run_test do
+    test_result = run_as_test do
       foo = mock()
       foo.expects(:bar)
       foo.bar
@@ -23,7 +23,7 @@ class MockTest < Test::Unit::TestCase
   end
 
   def test_should_build_mock_and_explicitly_add_an_expectation_which_is_not_satisfied
-    test_result = run_test do
+    test_result = run_as_test do
       foo = mock()
       foo.expects(:bar)
     end
@@ -31,7 +31,7 @@ class MockTest < Test::Unit::TestCase
   end
 
   def test_should_build_named_mock_and_explicitly_add_an_expectation_which_is_satisfied
-    test_result = run_test do
+    test_result = run_as_test do
       foo = mock('foo')
       foo.expects(:bar)
       foo.bar
@@ -40,7 +40,7 @@ class MockTest < Test::Unit::TestCase
   end
 
   def test_should_build_named_mock_and_explicitly_add_an_expectation_which_is_not_satisfied
-    test_result = run_test do
+    test_result = run_as_test do
       foo = mock('foo')
       foo.expects(:bar)
     end
@@ -48,7 +48,7 @@ class MockTest < Test::Unit::TestCase
   end
 
   def test_should_build_mock_incorporating_two_expectations_which_are_satisifed
-    test_result = run_test do
+    test_result = run_as_test do
       foo = mock(:bar => 'bar', :baz => 'baz')
       foo.bar
       foo.baz
@@ -57,7 +57,7 @@ class MockTest < Test::Unit::TestCase
   end
 
   def test_should_build_mock_incorporating_two_expectations_the_first_of_which_is_not_satisifed
-    test_result = run_test do
+    test_result = run_as_test do
       foo = mock(:bar => 'bar', :baz => 'baz')
       foo.baz
     end
@@ -65,7 +65,7 @@ class MockTest < Test::Unit::TestCase
   end
 
   def test_should_build_mock_incorporating_two_expectations_the_second_of_which_is_not_satisifed
-    test_result = run_test do
+    test_result = run_as_test do
       foo = mock(:bar => 'bar', :baz => 'baz')
       foo.bar
     end
@@ -73,7 +73,7 @@ class MockTest < Test::Unit::TestCase
   end
 
   def test_should_build_named_mock_incorporating_two_expectations_which_are_satisifed
-    test_result = run_test do
+    test_result = run_as_test do
       foo = mock('foo', :bar => 'bar', :baz => 'baz')
       foo.bar
       foo.baz
@@ -82,7 +82,7 @@ class MockTest < Test::Unit::TestCase
   end
 
   def test_should_build_named_mock_incorporating_two_expectations_the_first_of_which_is_not_satisifed
-    test_result = run_test do
+    test_result = run_as_test do
       foo = mock('foo', :bar => 'bar', :baz => 'baz')
       foo.baz
     end
@@ -90,7 +90,7 @@ class MockTest < Test::Unit::TestCase
   end
 
   def test_should_build_named_mock_incorporating_two_expectations_the_second_of_which_is_not_satisifed
-    test_result = run_test do
+    test_result = run_as_test do
       foo = mock('foo', :bar => 'bar', :baz => 'baz')
       foo.bar
     end

data/test/acceptance/mock_with_initializer_block_test.rb

@@ -14,7 +14,7 @@ class MockWithInitializerBlockTest < Test::Unit::TestCase
   end
   
   def test_should_expect_two_method_invocations_and_receive_both_of_them
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock() do
         expects(:method_1)
         expects(:method_2)
@@ -26,7 +26,7 @@ class MockWithInitializerBlockTest < Test::Unit::TestCase
   end
 
   def test_should_expect_two_method_invocations_but_receive_only_one_of_them
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock() do
         expects(:method_1)
         expects(:method_2)
@@ -37,7 +37,7 @@ class MockWithInitializerBlockTest < Test::Unit::TestCase
   end
 
   def test_should_stub_methods
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock() do
         stubs(:method_1).returns(1)
         stubs(:method_2).returns(2)

data/test/acceptance/mocked_methods_dispatch_test.rb

@@ -14,7 +14,7 @@ class MockedMethodDispatchTest < Test::Unit::TestCase
   end
   
   def test_should_find_latest_matching_expectation
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.stubs(:method).returns(1)
       mock.stubs(:method).returns(2)
@@ -26,7 +26,7 @@ class MockedMethodDispatchTest < Test::Unit::TestCase
   end
 
   def test_should_find_latest_expectation_which_has_not_stopped_matching
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.stubs(:method).returns(1)
       mock.stubs(:method).once.returns(2)
@@ -38,7 +38,7 @@ class MockedMethodDispatchTest < Test::Unit::TestCase
   end
 
   def test_should_keep_finding_later_stub_and_so_never_satisfy_earlier_expectation
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).returns(1)
       mock.stubs(:method).returns(2)
@@ -50,7 +50,7 @@ class MockedMethodDispatchTest < Test::Unit::TestCase
   end
 
   def test_should_find_later_expectation_until_it_stops_matching_then_find_earlier_stub
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.stubs(:method).returns(1)
       mock.expects(:method).returns(2)
@@ -62,7 +62,7 @@ class MockedMethodDispatchTest < Test::Unit::TestCase
   end
 
   def test_should_find_latest_expectation_with_range_of_expected_invocation_count_which_has_not_stopped_matching
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.stubs(:method).returns(1)
       mock.stubs(:method).times(2..3).returns(2)

data/test/acceptance/optional_parameters_test.rb

@@ -14,7 +14,7 @@ class OptionalParameterMatcherTest < Test::Unit::TestCase
   end
   
   def test_should_pass_if_all_required_parameters_match_and_no_optional_parameters_are_supplied
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(1, 2, optionally(3, 4))
       mock.method(1, 2)
@@ -23,7 +23,7 @@ class OptionalParameterMatcherTest < Test::Unit::TestCase
   end
 
   def test_should_pass_if_all_required_and_optional_parameters_match_and_some_optional_parameters_are_supplied
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(1, 2, optionally(3, 4))
       mock.method(1, 2, 3)
@@ -32,7 +32,7 @@ class OptionalParameterMatcherTest < Test::Unit::TestCase
   end
 
   def test_should_pass_if_all_required_and_optional_parameters_match_and_all_optional_parameters_are_supplied
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(1, 2, optionally(3, 4))
       mock.method(1, 2, 3, 4)
@@ -41,7 +41,7 @@ class OptionalParameterMatcherTest < Test::Unit::TestCase
   end
 
   def test_should_fail_if_all_required_and_optional_parameters_match_but_too_many_optional_parameters_are_supplied
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(1, 2, optionally(3, 4))
       mock.method(1, 2, 3, 4, 5)
@@ -50,7 +50,7 @@ class OptionalParameterMatcherTest < Test::Unit::TestCase
   end
 
   def test_should_fail_if_all_required_parameters_match_but_some_optional_parameters_do_not_match
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(1, 2, optionally(3, 4))
       mock.method(1, 2, 4)
@@ -59,7 +59,7 @@ class OptionalParameterMatcherTest < Test::Unit::TestCase
   end
 
   def test_should_fail_if_all_required_parameters_match_but_no_optional_parameters_match
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(1, 2, optionally(3, 4))
       mock.method(1, 2, 4, 5)

data/test/acceptance/parameter_matcher_test.rb

@@ -14,7 +14,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
   
   def test_should_match_hash_parameter_with_specified_key
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(has_key(:key_1))
       mock.method(:key_1 => 'value_1', :key_2 => 'value_2')
@@ -23,7 +23,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
 
   def test_should_not_match_hash_parameter_with_specified_key
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(has_key(:key_1))
       mock.method(:key_2 => 'value_2')
@@ -32,7 +32,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
   
   def test_should_match_hash_parameter_with_specified_value
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(has_value('value_1'))
       mock.method(:key_1 => 'value_1', :key_2 => 'value_2')
@@ -41,7 +41,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
 
   def test_should_not_match_hash_parameter_with_specified_value
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(has_value('value_1'))
       mock.method(:key_2 => 'value_2')
@@ -50,7 +50,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
   
   def test_should_match_hash_parameter_with_specified_key_value_pair
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(has_entry(:key_1, 'value_1'))
       mock.method(:key_1 => 'value_1', :key_2 => 'value_2')
@@ -59,7 +59,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
 
   def test_should_not_match_hash_parameter_with_specified_key_value_pair
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(has_entry(:key_1, 'value_2'))
       mock.method(:key_1 => 'value_1', :key_2 => 'value_2')
@@ -68,7 +68,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
   
   def test_should_match_hash_parameter_with_specified_hash_entry
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(has_entry(:key_1 => 'value_1'))
       mock.method(:key_1 => 'value_1', :key_2 => 'value_2')
@@ -77,7 +77,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
 
   def test_should_not_match_hash_parameter_with_specified_hash_entry
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(has_entry(:key_1 => 'value_2'))
       mock.method(:key_1 => 'value_1', :key_2 => 'value_2')
@@ -86,7 +86,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
   
   def test_should_match_hash_parameter_with_specified_entries
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(has_entries(:key_1 => 'value_1', :key_2 => 'value_2'))
       mock.method(:key_1 => 'value_1', :key_2 => 'value_2', :key_3 => 'value_3')
@@ -95,7 +95,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
 
   def test_should_not_match_hash_parameter_with_specified_entries
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(has_entries(:key_1 => 'value_1', :key_2 => 'value_2'))
       mock.method(:key_1 => 'value_1', :key_2 => 'value_3')
@@ -104,7 +104,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
   
   def test_should_match_parameter_that_matches_regular_expression
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(regexp_matches(/meter/))
       mock.method('this parameter should match')
@@ -113,7 +113,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
 
   def test_should_not_match_parameter_that_does_not_match_regular_expression
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(regexp_matches(/something different/))
       mock.method('this parameter should not match')
@@ -122,7 +122,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
   
   def test_should_match_hash_parameter_with_specified_entries_using_nested_matchers
-    test_result = run_test do
+    test_result = run_as_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')
@@ -131,7 +131,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
   
   def test_should_not_match_hash_parameter_with_specified_entries_using_nested_matchers
-    test_result = run_test do
+    test_result = run_as_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')
@@ -140,7 +140,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
   
   def test_should_match_parameter_that_matches_any_value
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(any_of('value_1', 'value_2')).times(2)
       mock.method('value_1')
@@ -150,7 +150,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
   
   def test_should_not_match_parameter_that_does_not_match_any_value
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(any_of('value_1', 'value_2'))
       mock.method('value_3')
@@ -159,7 +159,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
 
   def test_should_match_parameter_that_matches_all_values
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(all_of('value_1', 'value_1'))
       mock.method('value_1')
@@ -168,7 +168,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
   end
   
   def test_should_not_match_parameter_that_does_not_match_all_values
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(all_of('value_1', 'value_2'))
       mock.method('value_1')
@@ -183,7 +183,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
       end
     end
     duck = klass.new
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(responds_with(:quack, 'quack'))
       mock.method(duck)
@@ -198,7 +198,7 @@ class ParameterMatcherTest < Test::Unit::TestCase
       end
     end
     duck = klass.new
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock()
       mock.expects(:method).with(responds_with(:quack, 'quack'))
       mock.method(duck)

data/test/acceptance/partial_mocks_test.rb

@@ -14,7 +14,7 @@ class PartialMockTest < Test::Unit::TestCase
   end
   
   def test_should_pass_if_all_expectations_are_satisfied
-    test_result = run_test do
+    test_result = run_as_test do
       partial_mock_one = "partial_mock_one"
       partial_mock_two = "partial_mock_two"
       
@@ -30,7 +30,7 @@ class PartialMockTest < Test::Unit::TestCase
   end
 
   def test_should_fail_if_all_expectations_are_not_satisfied
-    test_result = run_test do
+    test_result = run_as_test do
       partial_mock_one = "partial_mock_one"
       partial_mock_two = "partial_mock_two"