floehopper-mocha 0.9.5.20090201123802 → 0.9.6.20090629164857

data/test/acceptance/stubbing_non_existent_instance_method_test.rb

@@ -16,7 +16,7 @@ class StubbingNonExistentInstanceMethodTest < Test::Unit::TestCase
   def test_should_allow_stubbing_non_existent_instance_method
     Mocha::Configuration.allow(:stubbing_non_existent_method)
     instance = Class.new.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:non_existent_method)
     end
     assert !@logger.warnings.include?("stubbing non-existent method: #{instance}.non_existent_method")
@@ -26,7 +26,7 @@ class StubbingNonExistentInstanceMethodTest < Test::Unit::TestCase
   def test_should_warn_when_stubbing_non_existent_instance_method
     Mocha::Configuration.warn_when(:stubbing_non_existent_method)
     instance = Class.new.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:non_existent_method)
     end
     assert_passed(test_result)
@@ -36,7 +36,7 @@ class StubbingNonExistentInstanceMethodTest < Test::Unit::TestCase
   def test_should_prevent_stubbing_non_existent_instance_method
     Mocha::Configuration.prevent(:stubbing_non_existent_method)
     instance = Class.new.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:non_existent_method)
     end
     assert_failed(test_result)
@@ -45,7 +45,7 @@ class StubbingNonExistentInstanceMethodTest < Test::Unit::TestCase
   
   def test_should_default_to_allow_stubbing_non_existent_instance_method
     instance = Class.new.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:non_existent_method)
     end
     assert !@logger.warnings.include?("stubbing non-existent method: #{instance}.non_existent_method")
@@ -59,7 +59,7 @@ class StubbingNonExistentInstanceMethodTest < Test::Unit::TestCase
       public :existing_public_method
     end
     instance = klass.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:existing_public_method)
     end
     assert_passed(test_result)
@@ -73,7 +73,7 @@ class StubbingNonExistentInstanceMethodTest < Test::Unit::TestCase
       end
     end
     instance = klass.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:method_to_which_instance_responds)
     end
     assert_passed(test_result)
@@ -86,7 +86,7 @@ class StubbingNonExistentInstanceMethodTest < Test::Unit::TestCase
       protected :existing_protected_method
     end
     instance = klass.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:existing_protected_method)
     end
     assert_passed(test_result)
@@ -99,7 +99,7 @@ class StubbingNonExistentInstanceMethodTest < Test::Unit::TestCase
       private :existing_private_method
     end
     instance = klass.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:existing_private_method)
     end
     assert_passed(test_result)
@@ -112,7 +112,7 @@ class StubbingNonExistentInstanceMethodTest < Test::Unit::TestCase
       public :existing_public_method
     end
     instance = Class.new(superklass).new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:existing_public_method)
     end
     assert_passed(test_result)
@@ -125,7 +125,7 @@ class StubbingNonExistentInstanceMethodTest < Test::Unit::TestCase
       protected :existing_protected_method
     end
     instance = Class.new(superklass).new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:existing_protected_method)
     end
     assert_passed(test_result)
@@ -138,7 +138,7 @@ class StubbingNonExistentInstanceMethodTest < Test::Unit::TestCase
       private :existing_private_method
     end
     instance = Class.new(superklass).new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:existing_private_method)
     end
     assert_passed(test_result)

data/test/acceptance/stubbing_non_public_any_instance_method_test.rb

@@ -19,7 +19,7 @@ class StubbingNonPublicAnyInstanceMethodTest < Test::Unit::TestCase
       def private_method; end
       private :private_method
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.any_instance.stubs(:private_method)
     end
     assert_passed(test_result)
@@ -32,7 +32,7 @@ class StubbingNonPublicAnyInstanceMethodTest < Test::Unit::TestCase
       def protected_method; end
       protected :protected_method
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.any_instance.stubs(:protected_method)
     end
     assert_passed(test_result)
@@ -45,7 +45,7 @@ class StubbingNonPublicAnyInstanceMethodTest < Test::Unit::TestCase
       def private_method; end
       private :private_method
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.any_instance.stubs(:private_method)
     end
     assert_passed(test_result)
@@ -58,7 +58,7 @@ class StubbingNonPublicAnyInstanceMethodTest < Test::Unit::TestCase
       def protected_method; end
       protected :protected_method
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.any_instance.stubs(:protected_method)
     end
     assert_passed(test_result)
@@ -71,7 +71,7 @@ class StubbingNonPublicAnyInstanceMethodTest < Test::Unit::TestCase
       def private_method; end
       private :private_method
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.any_instance.stubs(:private_method)
     end
     assert_failed(test_result)
@@ -84,7 +84,7 @@ class StubbingNonPublicAnyInstanceMethodTest < Test::Unit::TestCase
       def protected_method; end
       protected :protected_method
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.any_instance.stubs(:protected_method)
     end
     assert_failed(test_result)
@@ -96,7 +96,7 @@ class StubbingNonPublicAnyInstanceMethodTest < Test::Unit::TestCase
       def private_method; end
       private :private_method
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.any_instance.stubs(:private_method)
     end
     assert_passed(test_result)
@@ -108,7 +108,7 @@ class StubbingNonPublicAnyInstanceMethodTest < Test::Unit::TestCase
       def protected_method; end
       protected :protected_method
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.any_instance.stubs(:protected_method)
     end
     assert_passed(test_result)
@@ -121,7 +121,7 @@ class StubbingNonPublicAnyInstanceMethodTest < Test::Unit::TestCase
       def public_method; end
       public :public_method
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.any_instance.stubs(:public_method)
     end
     assert_passed(test_result)

data/test/acceptance/stubbing_non_public_class_method_test.rb

@@ -21,7 +21,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
         private :private_method
       end
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.stubs(:private_method)
     end
     assert_passed(test_result)
@@ -36,7 +36,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
         protected :protected_method
       end
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.stubs(:protected_method)
     end
     assert_passed(test_result)
@@ -51,7 +51,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
         private :private_method
       end
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.stubs(:private_method)
     end
     assert_passed(test_result)
@@ -66,7 +66,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
         protected :protected_method
       end
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.stubs(:protected_method)
     end
     assert_passed(test_result)
@@ -81,7 +81,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
         private :private_method
       end
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.stubs(:private_method)
     end
     assert_failed(test_result)
@@ -96,7 +96,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
         protected :protected_method
       end
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.stubs(:protected_method)
     end
     assert_failed(test_result)
@@ -110,7 +110,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
         private :private_method
       end
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.stubs(:private_method)
     end
     assert_passed(test_result)
@@ -124,7 +124,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
         protected :protected_method
       end
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.stubs(:protected_method)
     end
     assert_passed(test_result)
@@ -139,7 +139,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
         public :public_method
       end
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.stubs(:public_method)
     end
     assert_passed(test_result)
@@ -154,7 +154,7 @@ class StubbingNonPublicClassMethodTest < Test::Unit::TestCase
         end
       end
     end
-    test_result = run_test do
+    test_result = run_as_test do
       klass.stubs(:method_to_which_class_responds)
     end
     assert_passed(test_result)

data/test/acceptance/stubbing_non_public_instance_method_test.rb

@@ -19,7 +19,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       def private_method; end
       private :private_method
     end.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:private_method)
     end
     assert_passed(test_result)
@@ -32,7 +32,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       def protected_method; end
       protected :protected_method
     end.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:protected_method)
     end
     assert_passed(test_result)
@@ -45,7 +45,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       def private_method; end
       private :private_method
     end.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:private_method)
     end
     assert_passed(test_result)
@@ -58,7 +58,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       def protected_method; end
       protected :protected_method
     end.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:protected_method)
     end
     assert_passed(test_result)
@@ -71,7 +71,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       def private_method; end
       private :private_method
     end.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:private_method)
     end
     assert_failed(test_result)
@@ -84,7 +84,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       def protected_method; end
       protected :protected_method
     end.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:protected_method)
     end
     assert_failed(test_result)
@@ -96,7 +96,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       def private_method; end
       private :private_method
     end.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:private_method)
     end
     assert_passed(test_result)
@@ -108,7 +108,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       def protected_method; end
       protected :protected_method
     end.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:protected_method)
     end
     assert_passed(test_result)
@@ -121,7 +121,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
       def public_method; end
       public :public_method
     end.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:public_method)
     end
     assert_passed(test_result)
@@ -134,7 +134,7 @@ class StubbingNonPublicInstanceMethodTest < Test::Unit::TestCase
         (method == :method_to_which_instance_responds)
       end
     end.new
-    test_result = run_test do
+    test_result = run_as_test do
       instance.stubs(:method_to_which_instance_responds)
     end
     assert_passed(test_result)

data/test/acceptance/stubbing_on_non_mock_object_test.rb

@@ -16,7 +16,7 @@ class StubbingOnNonMockObjectTest < Test::Unit::TestCase
   def test_should_allow_stubbing_method_on_non_mock_object
     Mocha::Configuration.allow(:stubbing_method_on_non_mock_object)
     non_mock_object = Class.new { def existing_method; end }
-    test_result = run_test do
+    test_result = run_as_test do
       non_mock_object.stubs(:existing_method)
     end
     assert_passed(test_result)
@@ -26,7 +26,7 @@ class StubbingOnNonMockObjectTest < Test::Unit::TestCase
   def test_should_warn_on_stubbing_method_on_non_mock_object
     Mocha::Configuration.warn_when(:stubbing_method_on_non_mock_object)
     non_mock_object = Class.new { def existing_method; end }
-    test_result = run_test do
+    test_result = run_as_test do
       non_mock_object.stubs(:existing_method)
     end
     assert_passed(test_result)
@@ -36,7 +36,7 @@ class StubbingOnNonMockObjectTest < Test::Unit::TestCase
   def test_should_prevent_stubbing_method_on_non_mock_object
     Mocha::Configuration.prevent(:stubbing_method_on_non_mock_object)
     non_mock_object = Class.new { def existing_method; end }
-    test_result = run_test do
+    test_result = run_as_test do
       non_mock_object.stubs(:existing_method)
     end
     assert_failed(test_result)
@@ -45,7 +45,7 @@ class StubbingOnNonMockObjectTest < Test::Unit::TestCase
   
   def test_should_default_to_allow_stubbing_method_on_non_mock_object
     non_mock_object = Class.new { def existing_method; end }
-    test_result = run_test do
+    test_result = run_as_test do
       non_mock_object.stubs(:existing_method)
     end
     assert_passed(test_result)
@@ -54,7 +54,7 @@ class StubbingOnNonMockObjectTest < Test::Unit::TestCase
   
   def test_should_allow_stubbing_method_on_mock_object
     Mocha::Configuration.prevent(:stubbing_method_on_non_mock_object)
-    test_result = run_test do
+    test_result = run_as_test do
       mock = mock('mock')
       mock.stubs(:any_method)
     end

data/test/test_helper.rb

@@ -8,4 +8,8 @@ $:.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__), 'acceptance'))
 
+if ENV['MOCHA_OPTIONS'] == 'use_test_unit_gem'
+  gem 'test-unit'
+end
+
 require 'test/unit'

data/test/test_runner.rb

@@ -3,7 +3,7 @@ require 'test/unit/testcase'
 
 module TestRunner
   
-  def run_test(test_result = Test::Unit::TestResult.new, &block)
+  def run_as_test(test_result = Test::Unit::TestResult.new, &block)
     test_class = Class.new(Test::Unit::TestCase) do
       define_method(:test_me, &block)
     end

data/test/unit/parameter_matchers/has_entry_test.rb

@@ -59,4 +59,24 @@ class HasEntryTest < Test::Unit::TestCase
     assert !matcher.matches?([{ :key_1 => 'value_1', :key_2 => 'value_2' }])
   end
   
+  def test_should_not_match_object_that_doesnt_respond_to_keys
+    matcher = has_entry(:key_1 => equals('value_2'))
+    object = Class.new do
+      def [](key)
+        'value_2'
+      end
+    end.new
+    assert !matcher.matches?([object])
+  end
+  
+  def test_should_not_match_object_that_doesnt_respond_to_square_bracket
+    matcher = has_entry(:key_1 => equals('value_2'))
+    object = Class.new do
+      def keys
+        [:key_1]
+      end
+    end.new
+    assert !matcher.matches?([object])
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: floehopper-mocha
 version: !ruby/object:Gem::Version 
-  version: 0.9.5.20090201123802
+  version: 0.9.6.20090629164857
 platform: ruby
 authors: 
 - James Mead
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-01 00:00:00 -08:00
+date: 2009-06-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +33,7 @@ extra_rdoc_files:
 - COPYING
 files: 
 - lib/mocha/any_instance_method.rb
+- lib/mocha/api.rb
 - lib/mocha/argument_iterator.rb
 - lib/mocha/backtrace_filter.rb
 - lib/mocha/cardinality.rb
@@ -47,11 +49,20 @@ files:
 - lib/mocha/in_state_ordering_constraint.rb
 - lib/mocha/inspect.rb
 - lib/mocha/instance_method.rb
+- lib/mocha/integration/mini_test/assertion_counter.rb
+- lib/mocha/integration/mini_test/version_131_and_above.rb
+- lib/mocha/integration/mini_test.rb
+- lib/mocha/integration/test_unit/assertion_counter.rb
+- lib/mocha/integration/test_unit/gem_version_200.rb
+- lib/mocha/integration/test_unit/gem_version_201_and_above.rb
+- lib/mocha/integration/test_unit/ruby_version_185_and_below.rb
+- lib/mocha/integration/test_unit/ruby_version_186_and_above.rb
+- lib/mocha/integration/test_unit.rb
+- lib/mocha/integration.rb
 - lib/mocha/is_a.rb
 - lib/mocha/logger.rb
 - lib/mocha/metaclass.rb
 - lib/mocha/method_matcher.rb
-- lib/mocha/mini_test_adapter.rb
 - lib/mocha/mock.rb
 - lib/mocha/mockery.rb
 - lib/mocha/module_method.rb
@@ -86,16 +97,15 @@ files:
 - lib/mocha/sequence.rb
 - lib/mocha/single_return_value.rb
 - lib/mocha/single_yield.rb
-- lib/mocha/standalone.rb
 - lib/mocha/state_machine.rb
 - lib/mocha/stubbing_error.rb
-- lib/mocha/test_case_adapter.rb
 - lib/mocha/unexpected_invocation.rb
 - lib/mocha/yield_parameters.rb
 - lib/mocha.rb
 - lib/mocha_standalone.rb
 - lib/stubba.rb
 - test/acceptance/acceptance_test_helper.rb
+- test/acceptance/api_test.rb
 - test/acceptance/bug_18914_test.rb
 - test/acceptance/bug_21465_test.rb
 - test/acceptance/bug_21563_test.rb
@@ -112,7 +122,6 @@ files:
 - test/acceptance/partial_mocks_test.rb
 - test/acceptance/return_value_test.rb
 - test/acceptance/sequence_test.rb
-- test/acceptance/standalone_test.rb
 - test/acceptance/states_test.rb
 - test/acceptance/stub_any_instance_method_test.rb
 - test/acceptance/stub_class_method_test.rb