mocha-macruby 0.9.8.20100129120100 → 0.9.9.20101102121900

data/test/acceptance/minitest_test.rb

@@ -1,153 +1,157 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 
-begin
-  require 'rubygems'
-  gem 'minitest'
-rescue Gem::LoadError
-  # MiniTest gem not available
-end
+if defined?(MiniTest)
+  $stderr.puts "TODO: Running suite with MiniTest, running the MiniTestAdapterTest results in an error so skipping it for now."
+else
+  begin
+    require 'rubygems'
+    gem 'minitest'
+  rescue Gem::LoadError
+    # MiniTest gem not available
+  end
 
-begin
-  require 'minitest/unit'
-rescue LoadError
-  # MiniTest not available
-end
+  begin
+    require 'minitest/unit'
+  rescue LoadError
+    # MiniTest not available
+  end
 
-if defined?(MiniTest)
+  if defined?(MiniTest)
   
-  # monkey-patch MiniTest now that it has hopefully been loaded
-  require 'mocha/integration/mini_test'
+    # 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
+    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
   
-    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
+    class MiniTestTest < Test::Unit::TestCase
   
-    def setup
-      @output = StringIO.new
-      MiniTest::Unit.output = @output
-      @runner = MiniTest::Unit.new
-    end
+      def setup
+        @output = StringIO.new
+        MiniTest::Unit.output = @output
+        @runner = MiniTest::Unit.new
+      end
   
-    attr_reader :runner
+      attr_reader :runner
   
-    def test_should_pass_mocha_test
-      runner.run(%w(-n test_mocha_with_fulfilled_expectation))
+      def test_should_pass_mocha_test
+        runner.run(%w(-n test_mocha_with_fulfilled_expectation))
     
-      assert_equal 0, runner.failures
-      assert_equal 0, runner.errors
-      assert_equal 1, runner.assertion_count
-    end
+        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
-      runner.run(%w(-n test_mocha_with_unfulfilled_expectation))
+      def test_should_fail_mocha_test_due_to_unfulfilled_expectation
+        runner.run(%w(-n 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
-      runner.run(%w(-n test_mocha_with_unexpected_invocation))
+        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
+        runner.run(%w(-n 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
-      runner.run(%w(-n test_stubba_with_fulfilled_expectation))
+        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
+        runner.run(%w(-n test_stubba_with_fulfilled_expectation))
     
-      assert_equal 0, runner.failures
-      assert_equal 0, runner.errors
-      assert_equal 1, runner.assertion_count
-    end
+        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
-      runner.run(%w(-n test_stubba_with_unfulfilled_expectation))
+      def test_should_fail_stubba_test_due_to_unfulfilled_expectation
+        runner.run(%w(-n 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
-      runner.run(%w(-n test_mocha_with_matching_parameter))
+        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
+        runner.run(%w(-n test_mocha_with_matching_parameter))
     
-      assert_equal 0, runner.failures
-      assert_equal 0, runner.errors
-      assert_equal 1, runner.assertion_count
-    end
+        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
-      runner.run(%w(-n test_mocha_with_non_matching_parameter))
+      def test_should_fail_mocha_test_with_non_matching_parameter
+        runner.run(%w(-n 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
+        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
+      private
   
-    def output
-      @output.rewind
-      @output.read
-    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_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
   
-    def assert_not_all_expectation_were_satisfied
-      assert_match Regexp.new('not all expectations were satisfied'), output, "MiniTest output:\n#{output}"
     end
   
+  else
+    $stderr.puts "MiniTest is not available, so MiniTestAdapterTest has not been run."
   end
-  
-else
-  warn "MiniTest is not available, so MiniTestAdapterTest has not been run."
 end

data/test/acceptance/mocha_example_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
+require File.expand_path('../../test_helper', __FILE__)
 require 'mocha'
 
 class MochaExampleTest < Test::Unit::TestCase

data/test/acceptance/mocha_test_result_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 require 'execution_point'
 

data/test/acceptance/mock_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class MockTest < Test::Unit::TestCase

data/test/acceptance/mock_with_initializer_block_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class MockWithInitializerBlockTest < Test::Unit::TestCase

data/test/acceptance/mocked_methods_dispatch_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class MockedMethodDispatchTest < Test::Unit::TestCase

data/test/acceptance/optional_parameters_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class OptionalParameterMatcherTest < Test::Unit::TestCase

data/test/acceptance/parameter_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class ParameterMatcherTest < Test::Unit::TestCase
@@ -157,6 +157,25 @@ class ParameterMatcherTest < Test::Unit::TestCase
     end
     assert_failed(test_result)
   end
+  
+  def test_should_match_parameter_that_matches_any_of_the_given_matchers
+    test_result = run_as_test do
+      mock = mock()
+      mock.expects(:method).with(has_key(:foo) | has_key(:bar)).times(2)
+      mock.method(:foo => 'fooval')
+      mock.method(:bar => 'barval')
+    end
+    assert_passed(test_result)
+  end
+  
+  def test_should_not_match_parameter_that_does_not_match_any_of_the_given_matchers
+    test_result = run_as_test do
+      mock = mock()
+      mock.expects(:method).with(has_key(:foo) | has_key(:bar))
+      mock.method(:baz => 'bazval')
+    end
+    assert_failed(test_result)
+  end
 
   def test_should_match_parameter_that_matches_all_values
     test_result = run_as_test do
@@ -175,6 +194,24 @@ class ParameterMatcherTest < Test::Unit::TestCase
     end
     assert_failed(test_result)
   end
+  
+  def test_should_match_parameter_that_matches_all_matchers
+    test_result = run_as_test do
+      mock = mock()
+      mock.expects(:method).with(has_key(:foo) & has_key(:bar))
+      mock.method(:foo => 'fooval', :bar => 'barval')
+    end
+    assert_passed(test_result)
+  end
+  
+  def test_should_not_match_parameter_that_does_not_match_all_matchers
+    test_result = run_as_test do
+      mock = mock()
+      mock.expects(:method).with(has_key(:foo) & has_key(:bar))
+      mock.method(:foo => 'fooval', :baz => 'bazval')
+    end
+    assert_failed(test_result)
+  end
 
   def test_should_match_parameter_that_responds_with_specified_value
     klass = Class.new do

data/test/acceptance/partial_mocks_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class PartialMockTest < Test::Unit::TestCase

data/test/acceptance/return_value_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class ReturnValueTest < Test::Unit::TestCase

data/test/acceptance/sequence_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class SequenceTest < Test::Unit::TestCase

data/test/acceptance/states_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class StatesTest < Test::Unit::TestCase

data/test/acceptance/stub_any_instance_method_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class StubAnyInstanceMethodTest < Test::Unit::TestCase
@@ -47,13 +47,16 @@ class StubAnyInstanceMethodTest < Test::Unit::TestCase
         :original_return_value
       end
       protected :my_instance_method
+      def my_unprotected_instance_method
+        my_instance_method
+      end
     end
     instance = klass.new
     run_as_test do
       klass.any_instance.stubs(:my_instance_method).returns(:new_return_value)
     end
     assert instance.protected_methods(false).any? { |m| m.to_s == 'my_instance_method' }
-    assert_equal :original_return_value, instance.send(:my_instance_method)
+    assert_equal :original_return_value, instance.my_unprotected_instance_method
   end
   
   def test_should_leave_stubbed_private_method_unchanged_after_test

data/test/acceptance/stub_class_method_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class StubClassMethodTest < Test::Unit::TestCase
@@ -50,13 +50,16 @@ class StubClassMethodTest < Test::Unit::TestCase
           :original_return_value
         end
         protected :my_class_method
+        def my_unprotected_class_method
+          my_class_method
+        end
       end
     end
     run_as_test do
       klass.stubs(:my_class_method).returns(:new_return_value)
     end
     assert klass.protected_methods(false).any? { |m| m.to_s == 'my_class_method' }
-    assert_equal :original_return_value, klass.send(:my_class_method)
+    assert_equal :original_return_value, klass.my_unprotected_class_method
   end
   
   def test_should_leave_stubbed_private_method_unchanged_after_test