mocha 0.12.8 → 0.13.0

data/test/acceptance/optional_parameters_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class OptionalParameterMatcherTest < Test::Unit::TestCase
 

data/test/acceptance/parameter_matcher_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class ParameterMatcherTest < Test::Unit::TestCase
 

data/test/acceptance/partial_mocks_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class PartialMockTest < Test::Unit::TestCase
 

data/test/acceptance/raise_exception_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class RaiseExceptionTest < Test::Unit::TestCase
 

data/test/acceptance/return_value_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class ReturnValueTest < Test::Unit::TestCase
 

data/test/acceptance/sequence_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class SequenceTest < Test::Unit::TestCase
 

data/test/acceptance/states_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StatesTest < Test::Unit::TestCase
 

data/test/acceptance/stub_any_instance_method_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubAnyInstanceMethodTest < Test::Unit::TestCase
 

data/test/acceptance/stub_class_method_defined_on_active_record_association_proxy_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubClassMethodDefinedOnActiveRecordAssociationProxyTest < Test::Unit::TestCase
 

data/test/acceptance/stub_class_method_defined_on_class_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubClassMethodDefinedOnClassTest < Test::Unit::TestCase
 

data/test/acceptance/stub_class_method_defined_on_module_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubClassMethodDefinedOnModuleTest < Test::Unit::TestCase
 

data/test/acceptance/stub_class_method_defined_on_superclass_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubClassMethodDefinedOnSuperclassTest < Test::Unit::TestCase
 

data/test/acceptance/stub_everything_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubEverythingTest < Test::Unit::TestCase
 

data/test/acceptance/stub_instance_method_defined_on_active_record_association_proxy_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubInstanceMethodDefinedOnActiveRecordAssociationProxyTest < Test::Unit::TestCase
 

data/test/acceptance/stub_instance_method_defined_on_class_and_aliased_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubInstanceMethodDefinedOnClassAndAliasedTest < Test::Unit::TestCase
 

data/test/acceptance/stub_instance_method_defined_on_class_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubInstanceMethodDefinedOnClassTest < Test::Unit::TestCase
 

data/test/acceptance/stub_instance_method_defined_on_kernel_module_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubInstanceMethodDefinedOnKernelModuleTest < Test::Unit::TestCase
 

data/test/acceptance/stub_instance_method_defined_on_module_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubInstanceMethodDefinedOnModuleTest < Test::Unit::TestCase
 

data/test/acceptance/stub_instance_method_defined_on_object_class_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubInstanceMethodDefinedOnObjectClassTest < Test::Unit::TestCase
 

data/test/acceptance/stub_instance_method_defined_on_singleton_class_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubInstanceMethodDefinedOnSingletonClassTest < Test::Unit::TestCase
 

data/test/acceptance/stub_instance_method_defined_on_superclass_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubInstanceMethodDefinedOnSuperclassTest < Test::Unit::TestCase
 

data/test/acceptance/stub_module_method_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubModuleMethodTest < Test::Unit::TestCase
 

data/test/acceptance/stub_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubTest < Test::Unit::TestCase
 

data/test/acceptance/stubba_example_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../../test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class Widget
 

data/test/acceptance/stubba_test_result_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 require 'execution_point'
 
 class StubbaTestResultTest < Test::Unit::TestCase

data/test/acceptance/stubbing_error_backtrace_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 require 'execution_point'
 
 class StubbingErrorBacktraceTest < Test::Unit::TestCase

data/test/acceptance/stubbing_frozen_object_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 require 'execution_point'
 
 class StubbingFrozenObjectTest < Test::Unit::TestCase

data/test/acceptance/stubbing_method_accepting_block_parameter_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubbingMethodAcceptingBlockParameterTest < Test::Unit::TestCase
 

data/test/acceptance/stubbing_method_unnecessarily_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubbingMethodUnnecessarilyTest < Test::Unit::TestCase
 

data/test/acceptance/stubbing_nil_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubbingNilTest < Test::Unit::TestCase
 

data/test/acceptance/stubbing_non_existent_any_instance_method_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubbingNonExistentAnyInstanceMethodTest < Test::Unit::TestCase
 

data/test/acceptance/stubbing_non_existent_class_method_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubbingNonExistentClassMethodTest < Test::Unit::TestCase
 

data/test/acceptance/stubbing_non_existent_instance_method_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubbingNonExistentInstanceMethodTest < Test::Unit::TestCase
 

data/test/acceptance/stubbing_non_public_any_instance_method_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubbingNonPublicAnyInstanceMethodTest < Test::Unit::TestCase
 

data/test/acceptance/stubbing_non_public_class_method_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
 

data/test/acceptance/stubbing_non_public_instance_method_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
 

data/test/acceptance/stubbing_on_non_mock_object_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubbingOnNonMockObjectTest < Test::Unit::TestCase
 

data/test/acceptance/stubbing_same_class_method_on_parent_and_child_classes_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class StubbingSameClassMethodOnParentAndChildClassTest < Test::Unit::TestCase
 
@@ -21,11 +21,11 @@ class StubbingSameClassMethodOnParentAndChildClassTest < Test::Unit::TestCase
     end
     child_class = Class.new(parent_class)
     test_result = run_as_tests(
-      lambda {
+      :test_1 => lambda {
         parent_class.stubs(:foo).returns("stubbed Parent.foo")
         child_class.stubs(:foo).returns("stubbed Child.foo")
       },
-      lambda {
+      :test_2 => lambda {
         parent_class.foo
         child_class.foo
       }

data/test/acceptance/throw_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class ThrowTest < Test::Unit::TestCase
 

data/test/acceptance/unstubbing_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class UnstubbingTest < Test::Unit::TestCase
 

data/test/integration/mini_test_test.rb

@@ -0,0 +1,9 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+require "minitest/unit"
+require "mocha/setup"
+require "integration/shared_tests"
+
+class MiniTestTest < Test::Unit::TestCase
+  include SharedTests
+end

data/test/integration/shared_tests.rb

@@ -0,0 +1,174 @@
+require 'test_runner'
+require 'execution_point'
+
+module SharedTests
+  include TestRunner
+
+  def test_assertion_satisfied
+    test_result = run_as_test do
+      assert true
+    end
+    assert_passed(test_result)
+  end
+
+  def test_assertion_unsatisfied
+    execution_point = nil
+    test_result = run_as_test do
+      execution_point = ExecutionPoint.current; flunk
+    end
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+  end
+
+  def test_mock_object_unexpected_invocation
+    execution_point = nil
+    test_result = run_as_test do
+      mock = mock("not expecting invocation")
+      execution_point = ExecutionPoint.current; mock.unexpected
+    end
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+    assert_equal ["unexpected invocation: #<Mock:not expecting invocation>.unexpected()"], test_result.failure_message_lines
+  end
+
+  def test_mock_object_explicitly_unexpected_invocation
+    execution_point = nil
+    test_result = run_as_test do
+      mock = mock("not expecting invocation")
+      mock.expects(:unexpected).never
+      execution_point = ExecutionPoint.current; mock.unexpected
+    end
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+    assert_equal [
+      "unexpected invocation: #<Mock:not expecting invocation>.unexpected()",
+      "unsatisfied expectations:",
+      "- expected never, invoked once: #<Mock:not expecting invocation>.unexpected(any_parameters)"
+    ], test_result.failure_message_lines
+  end
+
+  def test_mock_object_unsatisfied_expectation
+    execution_point = nil
+    test_result = run_as_test do
+      mock = mock("expecting invocation")
+      execution_point = ExecutionPoint.current; mock.expects(:expected)
+    end
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+    assert_equal [
+      "not all expectations were satisfied",
+      "unsatisfied expectations:",
+      "- expected exactly once, not yet invoked: #<Mock:expecting invocation>.expected(any_parameters)"
+    ], test_result.failure_message_lines
+  end
+
+  def test_mock_object_unexpected_invocation_in_setup
+    execution_point = nil
+    test_result = run_as_tests(
+      :setup => lambda {
+        mock = mock("not expecting invocation")
+        execution_point = ExecutionPoint.current; mock.unexpected
+      },
+      :test_me => lambda {
+        assert true
+      }
+    )
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+    assert_equal ["unexpected invocation: #<Mock:not expecting invocation>.unexpected()"], test_result.failure_message_lines
+  end
+
+  def test_mock_object_unsatisfied_expectation_in_setup
+    execution_point = nil
+    test_result = run_as_tests(
+      :setup => lambda {
+        mock = mock("expecting invocation")
+        execution_point = ExecutionPoint.current; mock.expects(:expected)
+      },
+      :test_me => lambda {
+        assert true
+      }
+    )
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+    assert_equal [
+      "not all expectations were satisfied",
+      "unsatisfied expectations:",
+      "- expected exactly once, not yet invoked: #<Mock:expecting invocation>.expected(any_parameters)"
+    ], test_result.failure_message_lines
+  end
+
+  def test_mock_object_unexpected_invocation_in_teardown
+    execution_point = nil
+    test_result = run_as_tests(
+      :test_me => lambda {
+        assert true
+      },
+      :teardown => lambda {
+        mock = mock("not expecting invocation")
+        execution_point = ExecutionPoint.current; mock.unexpected
+      }
+    )
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+    assert_equal ["unexpected invocation: #<Mock:not expecting invocation>.unexpected()"], test_result.failure_message_lines
+  end
+
+  def test_real_object_explicitly_unexpected_invocation
+    execution_point = nil
+    object = Object.new
+    test_result = run_as_test do
+      object.expects(:unexpected).never
+      execution_point = ExecutionPoint.current; object.unexpected
+    end
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+    assert_equal [
+      "unexpected invocation: #{object.mocha_inspect}.unexpected()",
+      "unsatisfied expectations:",
+      "- expected never, invoked once: #{object.mocha_inspect}.unexpected(any_parameters)"
+    ], test_result.failure_message_lines
+  end
+
+  def test_real_object_unsatisfied_expectation
+    execution_point = nil
+    object = Object.new
+    test_result = run_as_test do
+      execution_point = ExecutionPoint.current; object.expects(:expected)
+    end
+    assert_failed(test_result)
+    failure = test_result.failures.first
+    assert_equal execution_point, ExecutionPoint.new(failure.location)
+    assert_equal [
+      "not all expectations were satisfied",
+      "unsatisfied expectations:",
+      "- expected exactly once, not yet invoked: #{object.mocha_inspect}.expected(any_parameters)"
+    ], test_result.failure_message_lines
+  end
+
+  def test_real_object_expectation_does_not_leak_into_subsequent_test
+    execution_point = nil
+    klass = Class.new
+    test_result = run_as_tests(
+      :test_1 => lambda {
+        klass.expects(:foo)
+        klass.foo
+      },
+      :test_2 => lambda {
+        execution_point = ExecutionPoint.current; klass.foo
+      }
+    )
+    assert_failed(test_result)
+    exception = test_result.errors.first.exception
+    assert_equal execution_point, ExecutionPoint.new(exception.backtrace)
+    assert_match %r{undefined method `foo'}, exception.message
+  end
+end

data/test/integration/test_unit_test.rb

@@ -0,0 +1,9 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+require "test/unit"
+require "mocha/setup"
+require "integration/shared_tests"
+
+class TestUnitTest < Test::Unit::TestCase
+  include SharedTests
+end

data/test/mini_test_result.rb

@@ -1,5 +1,4 @@
 require 'stringio'
-require 'test/unit/testcase'
 require 'minitest/unit'
 
 class MiniTestResult

data/test/test_runner.rb

@@ -1,7 +1,6 @@
 require 'test/unit/testcase'
 
 if defined?(MiniTest)
-  require 'mocha/integration/mini_test'
   require File.expand_path('../mini_test_result', __FILE__)
 else
   require File.expand_path('../test_unit_result', __FILE__)
@@ -9,28 +8,29 @@ end
 
 module TestRunner
   def run_as_test(&block)
-    run_as_tests(block)
+    run_as_tests(:test_me => block)
   end
 
-  def run_as_tests(*procs)
-    tests = procs.map do |proc|
-      test_class = Class.new(Test::Unit::TestCase) do
-        define_method(:test_me, proc)
+  def run_as_tests(methods = {})
+    base_class = defined?(MiniTest) ? MiniTest::Unit::TestCase : Test::Unit::TestCase
+    test_class = Class.new(base_class) do
+      methods.each do |(method_name, proc)|
+        define_method(method_name, proc)
       end
-      test_class.new(:test_me)
     end
+    tests = methods.keys.select { |m| m.to_s[/^test/] }.map { |m| test_class.new(m) }
 
-    if defined?(Test::Unit::TestResult)
-      test_result = TestUnitResult.build_test_result
-      tests.each do |test|
-        test.run(test_result) {}
-      end
-    else
+    if defined?(MiniTest)
       runner = MiniTest::Unit.new
       tests.each do |test|
         test.run(runner)
       end
       test_result = MiniTestResult.new(runner, tests)
+    else
+      test_result = TestUnitResult.build_test_result
+      tests.each do |test|
+        test.run(test_result) {}
+      end
     end
 
     test_result
@@ -42,7 +42,7 @@ module TestRunner
   end
 
   def assert_failed(test_result)
-    flunk "Test passed unexpectedly" if test_result.passed?
+    flunk "Test passed unexpectedly" unless test_result.failure_count + test_result.error_count > 0
   end
 
 end

data/test/unit/class_methods_test.rb

@@ -0,0 +1,40 @@
+require File.expand_path('../../test_helper', __FILE__)
+require 'mocha/class_methods'
+require 'mocha/object_methods'
+
+class ClassMethodsTest < Test::Unit::TestCase
+
+  def setup
+    @klass = Class.new.extend(Mocha::ClassMethods, Mocha::ObjectMethods)
+  end
+
+  def test_should_build_any_instance_object
+    any_instance = @klass.any_instance
+    assert_not_nil any_instance
+    assert any_instance.is_a?(Mocha::ClassMethods::AnyInstance)
+  end
+
+  def test_should_return_same_any_instance_object
+    any_instance_1 = @klass.any_instance
+    any_instance_2 = @klass.any_instance
+    assert_equal any_instance_1, any_instance_2
+  end
+
+  def test_should_use_stubba_class_method_for_class
+    assert_equal Mocha::ClassMethod, @klass.stubba_method
+  end
+
+  def test_should_use_stubba_class_method_for_any_instance
+    assert_equal Mocha::AnyInstanceMethod, @klass.any_instance.stubba_method
+  end
+
+  def test_should_stub_self_for_class
+    assert_equal @klass, @klass.stubba_object
+  end
+
+  def test_should_stub_relevant_class_for_any_instance
+    any_instance = @klass.any_instance
+    assert_equal @klass, any_instance.stubba_object
+  end
+
+end

data/test/unit/method_matcher_test.rb

@@ -10,6 +10,11 @@ class MethodMatcherTest < Test::Unit::TestCase
     assert method_matcher.match?(:method_name)
   end
 
+  def test_should_match_if_actual_method_name_is_expected_method_name_as_string
+    method_matcher = MethodMatcher.new(:method_name)
+    assert method_matcher.match?('method_name')
+  end
+
   def test_should_not_match_if_actual_method_name_is_not_same_as_expected_method_name
     method_matcher = MethodMatcher.new(:method_name)
     assert !method_matcher.match?(:different_method_name)