mocha 0.3.1 → 0.3.2

data/test/all_tests.rb

@@ -8,9 +8,6 @@ require 'mocha/mock_methods_test'
 require 'mocha/mock_test'
 require 'mocha/auto_verify_test'
 
-require 'auto_mocha/mock_class_test'
-require 'auto_mocha/auto_mock_test'
-
 require 'stubba/central_test'
 require 'stubba/class_method_test'
 require 'stubba/instance_method_test'
@@ -31,8 +28,6 @@ class UnitTests
     suite << MockMethodsTest.suite
     suite << MockTest.suite
     suite << AutoVerifyTest.suite
-    suite << MockClassTest.suite
-    suite << AutoMockTest.suite
     suite << CentralTest.suite
     suite << ClassMethodTest.suite
     suite << InstanceMethodTest.suite
@@ -65,7 +60,6 @@ end
 Test::Unit::UI::Console::TestRunner.run(IntegrationTests)
 
 require 'mocha_acceptance_test'
-require 'auto_mock_acceptance_test'
 require 'stubba_acceptance_test'
 
 class AcceptanceTests
@@ -73,7 +67,6 @@ class AcceptanceTests
   def self.suite
     suite = Test::Unit::TestSuite.new('AcceptanceTests')
     suite << MochaAcceptanceTest.suite
-    suite << AutoMockAcceptanceTest.suite
     suite << StubbaAcceptanceTest.suite
     suite
   end

data/test/mocha/auto_verify_test.rb

@@ -10,7 +10,7 @@ class AutoVerifyTest < Test::Unit::TestCase
     @test_case = Object.new
     class << test_case
       def self.add_teardown_method(symbol); end
-      include AutoVerify
+      include Mocha::AutoVerify
     end
   end
   
@@ -146,4 +146,19 @@ class AutoVerifyTest < Test::Unit::TestCase
     assert_equal [greedy_stub], test_case.mocks
   end
   
+  def test_should_create_mock_with_name
+    mock = test_case.mock('named_mock')
+    assert_equal 'named_mock', mock.__mock_name
+  end
+  
+  def test_should_create_stub_with_name
+    stub = test_case.stub('named_stub')
+    assert_equal 'named_stub', stub.__mock_name
+  end
+  
+  def test_should_create_greedy_stub_with_name
+    greedy_stub = test_case.stub_everything('named_greedy_stub')
+    assert_equal 'named_greedy_stub', greedy_stub.__mock_name
+  end
+  
 end

data/test/mocha/expectation_test.rb

@@ -252,28 +252,30 @@ class ExpectationSimilarExpectationsTest < Test::Unit::TestCase
   attr_reader :expectation
   def setup
     @expectation = Expectation.new(:meth).with(2)
+    @mock = Object.new
   end
   
   def test_should_find_expectations_to_the_same_method
-    failed_expectation = MissingExpectation.new(:meth, [expectation]).with(1)
+    failed_expectation = MissingExpectation.new(:meth, @mock, [expectation]).with(1)
     assert_equal [expectation], failed_expectation.similar_expectations
   end
   
   def test_should_report_similar_expectations
-    missing_expectation = MissingExpectation.new(:meth, [expectation]).with(1)
+    missing_expectation = MissingExpectation.new(:meth, @mock, [expectation]).with(1)
     exception = assert_raise(Test::Unit::AssertionFailedError) { missing_expectation.verify }
-    assert_equal "Unexpected message :meth(1)\nSimilar expectations :meth(2)", exception.message
+    assert_equal "Unexpected message :meth(1) sent to #{@mock.mocha_inspect}\nSimilar expectations :meth(2)", exception.message
   end
   
   def test_should_ignore_expectations_to_different_methods
-    failed_expectation = MissingExpectation.new(:other_meth, [expectation]).with(1)
+    failed_expectation = MissingExpectation.new(:other_meth, @mock, [expectation]).with(1)
     assert failed_expectation.similar_expectations.empty?
   end
   
   def test_should_not_report_similar_expectations
-    missing_expectation = MissingExpectation.new(:other_meth, [expectation]).with(1)
+    missing_expectation = MissingExpectation.new(:other_meth, @mock, [expectation]).with(1)
     exception = assert_raise(Test::Unit::AssertionFailedError) { missing_expectation.verify }
-    assert_equal "Unexpected message :other_meth(1)", exception.message
+    assert_equal "Unexpected message :other_meth(1) sent to #{@mock.mocha_inspect}", exception.message
+    p exception.message
   end
   
 end

data/test/mocha/mock_methods_test.rb

@@ -138,7 +138,7 @@ class MockMethodsTest < Test::Unit::TestCase
     mock = Object.new.extend(MockMethods)
     mock.expects(:meth).with(1)
     exception = assert_raise(Test::Unit::AssertionFailedError) { mock.meth(2) }
-    assert_equal "Unexpected message :meth(2)\nSimilar expectations :meth(1)", exception.message
+    assert_equal "Unexpected message :meth(2) sent to #{mock.mocha_inspect}\nSimilar expectations :meth(1)", exception.message
   end
   
   def test_should_pass_block_through_to_expectations_verify_method

data/test/mocha/mock_test.rb

@@ -34,4 +34,14 @@ class MockTest < Test::Unit::TestCase
     assert_equal true, mock.stub_everything
   end
   
+  def test_should_use_default_inspect_message
+    mock = Mock.new
+    assert_equal mock.mocha_inspect_before_hijacked_by_named_mocks, mock.mocha_inspect
+  end
+  
+  def test_should_give_name_in_inspect_message
+    mock = Mock.new(false, 'named_mock')
+    assert_equal "#<Mock: 'named_mock'>", mock.mocha_inspect
+  end
+  
 end

data/test/mocha_test_result_integration_test.rb

@@ -94,8 +94,8 @@ class MochaTestResultIntegrationTest < Test::Unit::TestCase
   
   def run_test(test_result = Test::Unit::TestResult.new, &block)
     test_class = Class.new(Test::Unit::TestCase) do
-      include MultipleSetupAndTeardown
-      include AutoVerify
+      include SmartTestCase::MultipleSetupAndTeardown
+      include Mocha::AutoVerify
       define_method(:test_me, &block)
     end
     test = test_class.new(:test_me)

data/test/smart_test_case/multiple_setup_and_teardown_test.rb

@@ -7,7 +7,7 @@ class MultipleSetupAndTeardownTest < Test::Unit::TestCase
   def test_should_call_added_setup
     test_case = Class.new(Test::Unit::TestCase) do
       define_method(:methods_called) { @methods_called ||= [] }
-      include MultipleSetupAndTeardown
+      include SmartTestCase::MultipleSetupAndTeardown
       add_setup_method(:added_setup)
       define_method(:added_setup) { methods_called << :added_setup }
       define_method(:test_method) { methods_called << :test_method }
@@ -22,7 +22,7 @@ class MultipleSetupAndTeardownTest < Test::Unit::TestCase
   def test_should_call_added_teardown
     test_case = Class.new(Test::Unit::TestCase) do
       define_method(:methods_called) { @methods_called ||= [] }
-      include MultipleSetupAndTeardown
+      include SmartTestCase::MultipleSetupAndTeardown
       add_teardown_method(:added_teardown)
       define_method(:added_teardown) { methods_called << :added_teardown }
       define_method(:test_method) { methods_called << :test_method }
@@ -37,7 +37,7 @@ class MultipleSetupAndTeardownTest < Test::Unit::TestCase
   def test_should_call_both_added_teardowns_even_if_one_raises_exception
     test_case = Class.new(Test::Unit::TestCase) do
       define_method(:methods_called) { @methods_called ||= [] }
-      include MultipleSetupAndTeardown
+      include SmartTestCase::MultipleSetupAndTeardown
       add_teardown_method(:added_teardown_1)
       add_teardown_method(:added_teardown_2)
       define_method(:added_teardown_1) { methods_called << :added_teardown_1 }
@@ -55,7 +55,7 @@ class MultipleSetupAndTeardownTest < Test::Unit::TestCase
     test_case = Class.new(Test::Unit::TestCase) do
       define_method(:methods_called) { @methods_called ||= [] }
       define_method(:setup) { methods_called << :setup }
-      include MultipleSetupAndTeardown
+      include SmartTestCase::MultipleSetupAndTeardown
       add_setup_method(:added_setup)
       define_method(:added_setup) { methods_called << :added_setup }
       define_method(:test_method) { methods_called << :test_method }
@@ -71,7 +71,7 @@ class MultipleSetupAndTeardownTest < Test::Unit::TestCase
     test_case = Class.new(Test::Unit::TestCase) do
       define_method(:methods_called) { @methods_called ||= [] }
       define_method(:teardown) { methods_called << :teardown }
-      include MultipleSetupAndTeardown
+      include SmartTestCase::MultipleSetupAndTeardown
       add_teardown_method(:added_teardown)
       define_method(:added_teardown) { methods_called << :added_teardown }
       define_method(:test_method) { methods_called << :test_method }
@@ -86,7 +86,7 @@ class MultipleSetupAndTeardownTest < Test::Unit::TestCase
   def test_should_call_added_setup_and_setup_defined_after_module_included
     test_case = Class.new(Test::Unit::TestCase) do
       define_method(:methods_called) { @methods_called ||= [] }
-      include MultipleSetupAndTeardown
+      include SmartTestCase::MultipleSetupAndTeardown
       define_method(:setup) { methods_called << :setup }
       add_setup_method(:added_setup)
       define_method(:added_setup) { methods_called << :added_setup }
@@ -102,7 +102,7 @@ class MultipleSetupAndTeardownTest < Test::Unit::TestCase
   def test_should_call_added_teardown_and_teardown_defined_after_module_included
     test_case = Class.new(Test::Unit::TestCase) do
       define_method(:methods_called) { @methods_called ||= [] }
-      include MultipleSetupAndTeardown
+      include SmartTestCase::MultipleSetupAndTeardown
       define_method(:teardown) { methods_called << :teardown }
       add_teardown_method(:added_teardown)
       define_method(:added_teardown) { methods_called << :added_teardown }
@@ -118,7 +118,7 @@ class MultipleSetupAndTeardownTest < Test::Unit::TestCase
   def test_should_call_added_setup_and_setup_defined_in_derived_test_case
     test_case = Class.new(Test::Unit::TestCase) do
       define_method(:methods_called) { @methods_called ||= [] }
-      include MultipleSetupAndTeardown
+      include SmartTestCase::MultipleSetupAndTeardown
       add_setup_method(:added_setup)
       define_method(:added_setup) { methods_called << :added_setup }
     end
@@ -136,7 +136,7 @@ class MultipleSetupAndTeardownTest < Test::Unit::TestCase
   def test_should_call_added_teardown_and_teardown_defined_in_derived_test_case
     test_case = Class.new(Test::Unit::TestCase) do
       define_method(:methods_called) { @methods_called ||= [] }
-      include MultipleSetupAndTeardown
+      include SmartTestCase::MultipleSetupAndTeardown
       add_teardown_method(:added_teardown)
       define_method(:added_teardown) { methods_called << :added_teardown }
     end
@@ -155,7 +155,7 @@ class MultipleSetupAndTeardownTest < Test::Unit::TestCase
     test_case = Class.new(Test::Unit::TestCase) do
       define_method(:methods_called) { @methods_called ||= [] }
       include ActiveRecordTestCase
-      include MultipleSetupAndTeardown
+      include SmartTestCase::MultipleSetupAndTeardown
       add_setup_method(:added_setup)
       define_method(:added_setup) { methods_called << :added_setup }
     end
@@ -174,7 +174,7 @@ class MultipleSetupAndTeardownTest < Test::Unit::TestCase
     test_case = Class.new(Test::Unit::TestCase) do
       define_method(:methods_called) { @methods_called ||= [] }
       include ActiveRecordTestCase
-      include MultipleSetupAndTeardown
+      include SmartTestCase::MultipleSetupAndTeardown
       add_teardown_method(:added_teardown)
       define_method(:added_teardown) { methods_called << :added_teardown }
     end

data/test/stubba/setup_and_teardown_test.rb

@@ -14,7 +14,7 @@ class SetupAndTeardownTest < Test::Unit::TestCase
         define_method(:add_setup_method) { |symbol| @symbol = symbol }
         define_method(:add_teardown_method) {}
       end
-      include SetupAndTeardown
+      include Stubba::SetupAndTeardown
     end
     
     assert_equal :setup_stubs, test_case_class.symbol
@@ -27,7 +27,7 @@ class SetupAndTeardownTest < Test::Unit::TestCase
         define_method(:add_setup_method) {}
         define_method(:add_teardown_method) { |symbol| @symbol = symbol }
       end
-      include SetupAndTeardown
+      include Stubba::SetupAndTeardown
     end
     
     assert_equal :teardown_stubs, test_case_class.symbol
@@ -126,7 +126,7 @@ class SetupAndTeardownTest < Test::Unit::TestCase
       end
       attr_accessor :add_assertion_called
       define_method(:add_assertion) { self.add_assertion_called = true }
-      include SetupAndTeardown
+      include Stubba::SetupAndTeardown
     end
   end
 

data/test/stubba_integration_test.rb

@@ -11,11 +11,11 @@ class StubbaIntegrationTest < Test::Unit::TestCase
       :original_return_value
     end
   end
-
+  
   def test_should_stub_class_method_within_test
     test_class = Class.new(Test::Unit::TestCase) do
-      include MultipleSetupAndTeardown
-      include SetupAndTeardown
+      include SmartTestCase::MultipleSetupAndTeardown
+      include Stubba::SetupAndTeardown
       define_method(:test_me) do
         DontMessWithMe.expects(:method_x).returns(:new_return_value)
         assert_equal :new_return_value, DontMessWithMe.method_x
@@ -30,8 +30,8 @@ class StubbaIntegrationTest < Test::Unit::TestCase
 
   def test_should_leave_stubbed_class_unchanged_after_test
     test_class = Class.new(Test::Unit::TestCase) do
-      include MultipleSetupAndTeardown
-      include SetupAndTeardown
+      include SmartTestCase::MultipleSetupAndTeardown
+      include Stubba::SetupAndTeardown
       define_method(:test_me) do
         DontMessWithMe.expects(:method_x).returns(:new_return_value)
       end
@@ -44,8 +44,8 @@ class StubbaIntegrationTest < Test::Unit::TestCase
   
   def test_should_reset_expectations_after_test
     test_class = Class.new(Test::Unit::TestCase) do
-      include MultipleSetupAndTeardown
-      include SetupAndTeardown
+      include SmartTestCase::MultipleSetupAndTeardown
+      include Stubba::SetupAndTeardown
       define_method(:test_me) do
         DontMessWithMe.expects(:method_x)
       end

data/test/stubba_test_result_integration_test.rb

@@ -74,8 +74,8 @@ class StubbaTestResultIntegrationTest < Test::Unit::TestCase
   
   def run_test(test_result = Test::Unit::TestResult.new, &block)
     test_class = Class.new(Test::Unit::TestCase) do
-      include MultipleSetupAndTeardown
-      include SetupAndTeardown
+      include SmartTestCase::MultipleSetupAndTeardown
+      include Stubba::SetupAndTeardown
       define_method(:test_me, &block)
     end
     test = test_class.new(:test_me)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: mocha
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2006-08-30 00:00:00 +01:00
+  version: 0.3.2
+date: 2006-09-06 00:00:00 +01:00
 summary: Mocking and stubbing library
 require_paths: 
   - lib
@@ -12,9 +12,7 @@ email: mocha-developer@rubyforge.org
 homepage: http://mocha.rubyforge.org
 rubyforge_project: mocha
 description: "Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and
-  stubbing of methods on real (non-mock) classes. Includes auto-mocking which
-  magically provides mocks for undefined classes, facilitating unit tests with no
-  external dependencies."
+  stubbing of methods on real (non-mock) classes."
 autorequire: mocha
 default_executable: 
 bindir: bin
@@ -32,12 +30,9 @@ cert_chain:
 authors: 
   - James Mead
 files: 
-  - lib/auto_mocha.rb
   - lib/mocha.rb
   - lib/smart_test_case.rb
   - lib/stubba.rb
-  - lib/auto_mocha/auto_mock.rb
-  - lib/auto_mocha/mock_class.rb
   - lib/mocha/auto_verify.rb
   - lib/mocha/expectation.rb
   - lib/mocha/infinite_range.rb
@@ -56,7 +51,6 @@ files:
   - lib/stubba/setup_and_teardown.rb
   - test/active_record_test_case.rb
   - test/all_tests.rb
-  - test/auto_mock_acceptance_test.rb
   - test/execution_point.rb
   - test/method_definer.rb
   - test/mocha_acceptance_test.rb
@@ -65,8 +59,6 @@ files:
   - test/stubba_integration_test.rb
   - test/stubba_test_result_integration_test.rb
   - test/test_helper.rb
-  - test/auto_mocha/auto_mock_test.rb
-  - test/auto_mocha/mock_class_test.rb
   - test/mocha/auto_verify_test.rb
   - test/mocha/expectation_test.rb
   - test/mocha/infinite_range_test.rb
@@ -86,7 +78,6 @@ files:
   - Rakefile
   - README
   - RELEASE
-  - TODO
 test_files: 
   - test/all_tests.rb
 rdoc_options: 

data/TODO

@@ -1,14 +0,0 @@
-- think about behaviour when more than one expectation/stubbed method match
-- make verify method private (makes this unnecessary - fail if attempt to verify stub)
-- allow hash parameter for stubs and expects methods particularly for stubba
-- write rdoc for most important methods/classes e.g. expectation
-- test for setting expectations on class methods (and instance methods?) from within TestCase#setup
-- use Object#inspect(:mocha) instead of Object#mocha_inspect?
-- allow stubbing of private/protected methods?
-- should all instances share expectations for any_instance or should each instance have their own - in which case how do we provide access to the instances
-- detect existing or added definition of mocha methods e.g. expects and alias to __expects?
-- allow switch off of auto-verify?
-- maybe use blank_slate as mocha parent class to allow mocking of standard object methods?
-- more jmock style stuff - e.g. return values on consecutive calls, labels/required order, more sophisticated param matching?
-- stubs should only return a fixed value - no blocks allowed for return values and no parameter expectations allowed?
-- maybe allow unstubbing of a specific method from within a test...?

data/lib/auto_mocha.rb

@@ -1,2 +0,0 @@
-require 'mocha'
-require 'auto_mocha/auto_mock'

data/lib/auto_mocha/auto_mock.rb

@@ -1,54 +0,0 @@
-require 'auto_mocha/mock_class'
-
-class Module
-  
-  def mochas
-    @@mochas ||= {}
-  end
-  
-  def reset_mochas
-    @@mochas = nil
-  end
-
-  def const_missing(symbol)
-    mochas[symbol] ||= Mocha::MockClass.dup
-  end
-  
-  def verify_all
-    mochas.each_value { |mocha| mocha.verify_all }
-  end
-  
-end
-
-Mocha::MockClass.class_eval do
-  
-  class << self
-    
-    def mochas
-      @mochas ||= {}
-    end
-
-    def const_missing(symbol)
-      mochas[symbol] ||= Mocha::MockClass.dup
-    end
-    
-    def verify_all
-      mochas.each_value { |mocha| mocha.verify }
-      verify
-    end
-    
-  end
-
-end
-
-class Test::Unit::TestCase
-  
-  def reset_mochas
-    Object.reset_mochas
-  end
-   
-  def verify_all
-    Object.verify_all
-  end
-  
-end

data/lib/auto_mocha/mock_class.rb

@@ -1,38 +0,0 @@
-require 'mocha/mock_methods'
-
-module Mocha
-
-  class MockClass
-  
-    include MockMethods
-
-    class << self
-    
-      include MockMethods
-    
-      def super_method_missing(symbol, *arguments, &block)
-        superclass.method_missing(symbol, *arguments, &block)
-      end
-        
-      alias_method :__new__, :new
-  
-      def new(*arguments, &block)
-        method_missing(:new, *arguments, &block)
-      end
-        
-      def inherited(subclass)
-        subclass.class_eval do
-
-          def self.new(*arguments, &block)
-            __new__(*arguments, &block)
-          end
-        
-        end
-      
-      end
-    
-    end  
-  
-  end
-
-end