mocha 0.5.6 → 0.9.0

data/test/execution_point.rb

@@ -11,10 +11,12 @@ class ExecutionPoint
   end
   
   def file_name
+    return "unknown" unless @backtrace && @backtrace.first
     /\A(.*?):\d+/.match(@backtrace.first)[1]
   end
   
   def line_number
+    return "unknown" unless @backtrace && @backtrace.first
     Integer(/\A.*?:(\d+)/.match(@backtrace.first)[1])
   end
 
@@ -24,7 +26,7 @@ class ExecutionPoint
   end
   
   def to_s
-    "file: #{file_name} line: #{line_number}"
+    "file: #{file_name}; line: #{line_number}"
   end
   
   def inspect

data/test/simple_counter.rb

@@ -0,0 +1,13 @@
+class SimpleCounter
+  
+  attr_reader :count
+  
+  def initialize
+    @count = 0
+  end
+  
+  def increment
+    @count += 1
+  end
+  
+end

data/test/test_helper.rb

@@ -6,7 +6,6 @@ $:.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__)))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'unit'))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'unit', 'parameter_matchers'))
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'integration'))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'acceptance'))
 
 require 'test/unit'

data/test/test_runner.rb

@@ -1,20 +1,22 @@
 require 'test/unit/testresult'
 require 'test/unit/testcase'
-require 'mocha/standalone'
-require 'mocha/test_case_adapter'
 
 module TestRunner
   
   def run_test(test_result = Test::Unit::TestResult.new, &block)
     test_class = Class.new(Test::Unit::TestCase) do
-      include Mocha::Standalone
-      include Mocha::TestCaseAdapter
       define_method(:test_me, &block)
     end
     test = test_class.new(:test_me)
     test.run(test_result) {}
     class << test_result
       attr_reader :failures, :errors
+      def failure_messages
+        failures.map { |failure| failure.message }
+      end
+      def error_messages
+        errors.map { |error| error.message }
+      end
     end
     test_result
   end

data/test/unit/any_instance_method_test.rb

@@ -43,7 +43,7 @@ class AnyInstanceMethodTest < Test::Unit::TestCase
     result = instance.method_x(:param1, :param2)
         
     assert_equal :result, result
-    mocha.verify
+    assert mocha.verified?
   end
 
   def test_should_restore_original_method

data/test/unit/array_inspect_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), "..", "test_helper")
 require 'mocha/inspect'
 
-class ArrayInstanceTest < Test::Unit::TestCase
+class ArrayInspectTest < Test::Unit::TestCase
   
   def test_should_use_inspect
     array = [1, 2]

data/test/unit/backtrace_filter_test.rb

@@ -0,0 +1,19 @@
+require File.join(File.dirname(__FILE__), "..", "test_helper")
+require 'mocha/backtrace_filter'
+
+class BacktraceFilterTest < Test::Unit::TestCase
+  
+  include Mocha
+  
+  def test_should_exclude_mocha_locations_from_backtrace
+    mocha_lib = "/username/workspace/mocha_wibble/lib/"
+    backtrace = [ mocha_lib + 'exclude/me/1', mocha_lib + 'exclude/me/2', '/keep/me', mocha_lib + 'exclude/me/3']
+    filter = BacktraceFilter.new(mocha_lib)
+    assert_equal ['/keep/me'], filter.filtered(backtrace)
+  end
+
+  def test_should_determine_path_for_mocha_lib_directory
+    assert_match Regexp.new("/lib/$"), BacktraceFilter::LIB_DIRECTORY
+  end
+  
+end

data/test/unit/cardinality_test.rb

@@ -0,0 +1,56 @@
+require File.join(File.dirname(__FILE__), "..", "test_helper")
+require 'mocha/cardinality'
+
+class CardinalityTest < Test::Unit::TestCase
+  
+  include Mocha
+  
+  def test_should_allow_invocations_if_invocation_count_has_not_yet_reached_maximum
+    cardinality = Cardinality.new(2, 3)
+    assert cardinality.invocations_allowed?(0)
+    assert cardinality.invocations_allowed?(1)
+    assert cardinality.invocations_allowed?(2)
+    assert !cardinality.invocations_allowed?(3)
+  end
+  
+  def test_should_be_satisfied_if_invocations_so_far_have_reached_required_threshold
+    cardinality = Cardinality.new(2, 3)
+    assert !cardinality.satisfied?(0)
+    assert !cardinality.satisfied?(1)
+    assert cardinality.satisfied?(2)
+    assert cardinality.satisfied?(3)
+  end
+  
+  def test_should_describe_cardinality
+    assert_equal 'allowed any number of times', Cardinality.at_least(0).mocha_inspect
+    
+    assert_equal 'expected at most once', Cardinality.at_most(1).mocha_inspect
+    assert_equal 'expected at most 2 times', Cardinality.at_most(2).mocha_inspect
+    assert_equal 'expected at most 3 times', Cardinality.at_most(3).mocha_inspect
+    
+    assert_equal 'expected at least once', Cardinality.at_least(1).mocha_inspect
+    assert_equal 'expected at least 2 times', Cardinality.at_least(2).mocha_inspect
+    assert_equal 'expected at least 3 times', Cardinality.at_least(3).mocha_inspect
+    
+    assert_equal 'expected never', Cardinality.exactly(0).mocha_inspect
+    assert_equal 'expected exactly once', Cardinality.exactly(1).mocha_inspect
+    assert_equal 'expected exactly 2 times', Cardinality.exactly(2).mocha_inspect
+    assert_equal 'expected exactly 3 times', Cardinality.times(3).mocha_inspect
+    
+    assert_equal 'expected between 2 and 4 times', Cardinality.times(2..4).mocha_inspect
+    assert_equal 'expected between 1 and 3 times', Cardinality.times(1..3).mocha_inspect
+  end
+  
+  def test_should_need_verifying
+    assert Cardinality.exactly(2).needs_verifying?
+    assert Cardinality.at_least(3).needs_verifying?
+    assert Cardinality.at_most(2).needs_verifying?
+    assert Cardinality.times(4).needs_verifying?
+    assert Cardinality.times(2..4).needs_verifying?
+  end
+  
+  def test_should_not_need_verifying
+    assert_equal false, Cardinality.at_least(0).needs_verifying?
+  end
+  
+end

data/test/unit/central_test.rb

@@ -21,7 +21,7 @@ class CentralTest < Test::Unit::TestCase
     
     stubba.stub(method)
     
-    method.verify
+    assert method.verified?
   end
   
   def test_should_not_stub_method_if_already_stubbed
@@ -34,7 +34,7 @@ class CentralTest < Test::Unit::TestCase
     
     stubba.stub(method)
     
-    method.verify
+    assert method.verified?
   end
   
   def test_should_record_method
@@ -58,67 +58,8 @@ class CentralTest < Test::Unit::TestCase
     stubba.unstub_all
     
     assert_equal [], stubba.stubba_methods
-    method_1.verify
-    method_2.verify
+    assert method_1.verified?
+    assert method_2.verified?
   end
   
-  def test_should_collect_mocks_from_all_methods
-    method_1 = Mock.new
-    method_1.stubs(:mock).returns(:mock_1)
-
-    method_2 = Mock.new
-    method_2.stubs(:mock).returns(:mock_2)
-
-    stubba = Central.new
-    stubba.stubba_methods = [method_1, method_2]
-    
-    assert_equal 2, stubba.unique_mocks.length
-    assert stubba.unique_mocks.include?(:mock_1)
-    assert stubba.unique_mocks.include?(:mock_2)
-  end
-
-  def test_should_return_unique_mochas
-    method_1 = Mock.new
-    method_1.stubs(:mock).returns(:mock_1)
-
-    method_2 = Mock.new
-    method_2.stubs(:mock).returns(:mock_1)
-
-    stubba = Central.new
-    stubba.stubba_methods = [method_1, method_2]
-    
-    assert_equal [:mock_1], stubba.unique_mocks
-  end
-  
-  def test_should_call_verify_on_all_unique_mocks
-    mock_class = Class.new do
-      attr_accessor :verify_called
-      def verify
-        self.verify_called = true
-      end
-    end
-    mocks = [mock_class.new, mock_class.new]
-    stubba = Central.new
-    stubba.replace_instance_method(:unique_mocks) { mocks }
-    
-    stubba.verify_all
-    
-    assert mocks.all? { |mock| mock.verify_called }
-  end
-
-  def test_should_call_verify_on_all_unique_mochas
-    mock_class = Class.new do
-      def verify(&block)
-        yield if block_given?
-      end
-    end
-    stubba = Central.new
-    stubba.replace_instance_method(:unique_mocks) { [mock_class.new] }
-    yielded = false
-    
-    stubba.verify_all { yielded = true }
-    
-    assert yielded
-  end
-
 end

data/test/unit/change_state_side_effect_test.rb

@@ -0,0 +1,41 @@
+require File.join(File.dirname(__FILE__), "..", "test_helper")
+
+require 'mocha/change_state_side_effect'
+
+class ChangeStateSideEffectTest < Test::Unit::TestCase
+  
+  include Mocha
+  
+  class FakeState
+    
+    attr_reader :active
+    attr_writer :description
+    
+    def activate
+      @active = true
+    end
+    
+    def mocha_inspect
+      @description
+    end
+    
+  end
+  
+  def test_should_activate_the_given_state
+    state = FakeState.new
+    side_effect = ChangeStateSideEffect.new(state)
+    
+    side_effect.perform
+    
+    assert state.active
+  end
+  
+  def test_should_describe_itself_in_terms_of_the_activated_state
+    state = FakeState.new
+    state.description = 'the-new-state'
+    side_effect = ChangeStateSideEffect.new(state)
+    
+    assert_equal 'then the-new-state', side_effect.mocha_inspect
+  end
+  
+end

data/test/unit/class_method_test.rb

@@ -95,7 +95,7 @@ class ClassMethodTest < Test::Unit::TestCase
     result = klass.method_x(:param1, :param2)
     
     assert_equal :result, result
-    mocha.verify
+    assert mocha.verified?
   end
   
   def test_should_remove_new_method
@@ -196,5 +196,42 @@ class ClassMethodTest < Test::Unit::TestCase
     method = ClassMethod.new(stubbee, :method_name)
     assert_equal stubbee.mocha, method.mock
   end
+  
+  def test_should_not_be_equal_if_other_object_has_a_different_class
+    class_method = ClassMethod.new(Object.new, :method)
+    other_object = Object.new
+    assert class_method != other_object
+  end
 
+  def test_should_not_be_equal_if_other_class_method_has_different_stubbee
+    stubbee_1 = Object.new
+    stubbee_2 = Object.new
+    class_method_1 = ClassMethod.new(stubbee_1, :method)
+    class_method_2 = ClassMethod.new(stubbee_2, :method)
+    assert class_method_1 != class_method_2
+  end
+  
+  def test_should_not_be_equal_if_other_class_method_has_different_method
+    stubbee = Object.new
+    class_method_1 = ClassMethod.new(stubbee, :method_1)
+    class_method_2 = ClassMethod.new(stubbee, :method_2)
+    assert class_method_1 != class_method_2
+  end
+  
+  def test_should_be_equal_if_other_class_method_has_same_stubbee_and_same_method_so_no_attempt_is_made_to_stub_a_method_twice
+    stubbee = Object.new
+    class_method_1 = ClassMethod.new(stubbee, :method)
+    class_method_2 = ClassMethod.new(stubbee, :method)
+    assert class_method_1 == class_method_2
+  end
+  
+  def test_should_be_equal_if_other_class_method_has_same_stubbee_and_same_method_but_stubbee_equal_method_lies_like_active_record_association_proxy
+    stubbee = Class.new do
+      def equal?(other); false; end
+    end.new
+    class_method_1 = ClassMethod.new(stubbee, :method)
+    class_method_2 = ClassMethod.new(stubbee, :method)
+    assert class_method_1 == class_method_2
+  end
+  
 end

data/test/unit/date_time_inspect_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), "..", "test_helper")
 require 'mocha/inspect'
 
-class TimeDateInspectTest < Test::Unit::TestCase
+class DateTimeInspectTest < Test::Unit::TestCase
   
   def test_should_use_include_date_in_seconds
     time = Time.now

data/test/unit/{expectation_raiser_test.rb → exception_raiser_test.rb}

@@ -1,6 +1,7 @@
 require File.join(File.dirname(__FILE__), "..", "test_helper")
 
 require 'mocha/exception_raiser'
+require 'timeout'
 
 class ExceptionRaiserTest < Test::Unit::TestCase
   
@@ -20,9 +21,22 @@ class ExceptionRaiserTest < Test::Unit::TestCase
     assert_equal 'message', exception.message
   end
   
+  def test_should_raise_exception_instance
+    exception_class = Class.new(StandardError)
+    raiser = ExceptionRaiser.new(exception_class.new('message'), nil)
+    exception = assert_raises(exception_class) { raiser.evaluate }
+    assert_equal 'message', exception.message
+  end
+  
   def test_should_raise_interrupt_exception_with_default_message_so_it_works_in_ruby_1_8_6
     raiser = ExceptionRaiser.new(Interrupt, nil)
     assert_raises(Interrupt) { raiser.evaluate }
   end
 
+  def test_should_raise_subclass_of_interrupt_exception_with_default_message_so_it_works_in_ruby_1_8_6
+    exception_class = Class.new(Interrupt)
+    raiser = ExceptionRaiser.new(exception_class, nil)
+    assert_raises(exception_class) { raiser.evaluate }
+  end
+
 end

data/test/unit/expectation_list_test.rb

@@ -13,7 +13,7 @@ class ExpectationListTest < Test::Unit::TestCase
     expectation = Expectation.new(nil, :my_method)
     assert_same expectation, expectation_list.add(expectation)
   end
-
+  
   def test_should_find_matching_expectation
     expectation_list = ExpectationList.new
     expectation1 = Expectation.new(nil, :my_method).with(:argument1, :argument2)
@@ -22,7 +22,7 @@ class ExpectationListTest < Test::Unit::TestCase
     expectation_list.add(expectation2)
     assert_same expectation2, expectation_list.detect(:my_method, :argument3, :argument4)
   end
-
+  
   def test_should_find_most_recent_matching_expectation
     expectation_list = ExpectationList.new
     expectation1 = Expectation.new(nil, :my_method).with(:argument1, :argument2)
@@ -31,7 +31,7 @@ class ExpectationListTest < Test::Unit::TestCase
     expectation_list.add(expectation2)
     assert_same expectation2, expectation_list.detect(:my_method, :argument1, :argument2)
   end
-
+  
   def test_should_find_most_recent_matching_expectation_but_give_preference_to_those_allowing_invocations
     expectation_list = ExpectationList.new
     expectation1 = Expectation.new(nil, :my_method)
@@ -42,7 +42,7 @@ class ExpectationListTest < Test::Unit::TestCase
     expectation_list.add(expectation2)
     assert_same expectation1, expectation_list.detect(:my_method)
   end
-
+  
   def test_should_find_most_recent_matching_expectation_if_no_matching_expectations_allow_invocations
     expectation_list = ExpectationList.new
     expectation1 = Expectation.new(nil, :my_method)
@@ -54,22 +54,4 @@ class ExpectationListTest < Test::Unit::TestCase
     assert_same expectation2, expectation_list.detect(:my_method)
   end
 
-  def test_should_find_expectations_for_the_same_method_no_matter_what_the_arguments
-    expectation_list = ExpectationList.new
-    expectation1 = Expectation.new(nil, :my_method).with(:argument1, :argument2)
-    expectation_list.add(expectation1)
-    expectation2 = Expectation.new(nil, :my_method).with(:argument3, :argument4)
-    expectation_list.add(expectation2)
-    assert_equal [expectation1, expectation2].to_set, expectation_list.similar(:my_method).to_set
-  end
-  
-  def test_should_ignore_expectations_for_different_methods
-    expectation_list = ExpectationList.new
-    expectation1 = Expectation.new(nil, :method1).with(:argument1, :argument2)
-    expectation_list.add(expectation1)
-    expectation2 = Expectation.new(nil, :method2).with(:argument1, :argument2)
-    expectation_list.add(expectation2)
-    assert_equal [expectation2], expectation_list.similar(:method2)
-  end
-  
 end