test/ruby1.9.compatibility_tests.rb @@ -1,4 +1,4 @@ - +# This is here because OptionsParser is SO slow. def extract_path(argv) if argv[1].nil? if argv[0] =~ /-a/ @@ -22,6 +22,8 @@ def all? ARGV.join =~ /-a/ end + + def comment?(line) line =~ /^\s*#/ end countloc.rb @@ -3,7 +3,6 @@ $:.unshift(File.dirname(__FILE__)) unless # Matchy should work with either test/unit # or minitest - module Matchy def self.minitest? # This needs to be better. @@ -11,8 +10,7 @@ module Matchy # suite of MiniTest Tests? # Rails for example defines MiniTest, so only check for # defined?(MiniTest) would be malicious - defined?(MiniTest) && - defined?(MiniTest::Assertions) && + defined?(MiniTest) && defined?(MiniTest::Assertions) && (!defined?(Test::Unit::TestCase) || !(Test::Unit::TestCase < MiniTest::Assertions)) end def self.assertions_module @@ -39,14 +37,14 @@ require 'matchy/built_in/operator_expectations' require 'matchy/built_in/change_expectations' -# Evil hack. +# Hack of Evil. # Track the current testcase and # provide it to the operator matchers. Matchy.test_case_class.class_eval do - alias_method :old_run_method_aliased_by_matchy_300, :run + alias_method :old_run_method_aliased_by_matchy, :run def run(whatever, *args, &block) $current_test_case = self - old_run_method_aliased_by_matchy_300(whatever, *args, &block) + old_run_method_aliased_by_matchy(whatever, *args, &block) end end lib/matchy.rb @@ -14,7 +14,7 @@ module Matchy comparison = after != before if list = matcher.msgs comparison = case list[0].name - # todo provide meaningful messages + # todo: provide meaningful messages when :by then (after == before + list[0].args[0] || after == before - list[0].args[0]) when :by_at_least then (after >= before + list[0].args[0] || after <= before - list[0].args[0]) when :by_at_most then (after <= before + list[0].args[0] && after >= before - list[0].args[0]) lib/matchy/built_in/change_expectations.rb @@ -11,26 +11,24 @@ module Matchy # def raise_error(*obj) build_matcher(:raise_error, obj) do |receiver, matcher, args| - @receiver = receiver - expected = args[0] || StandardError + expected = args[0] || Exception raised = false error = nil begin - @receiver.call - rescue StandardError => e + receiver.call + rescue Exception => e raised = true error = e end - if expected.respond_to?(:ancestors) && expected.ancestors.include?(Exception) - matcher.positive_msg = "Expected #{@receiver.inspect} to raise #{expected.name}, " + + matcher.positive_msg = "Expected #{receiver.inspect} to raise #{expected.name}, " + (error ? "but #{error.class.name} was raised instead." : "but none was raised.") - matcher.negative_msg = "Expected #{@receiver.inspect} to not raise #{expected.name}." + matcher.negative_msg = "Expected #{receiver.inspect} to not raise #{expected.name}." comparison = (raised && error.class.ancestors.include?(expected)) else message = error ? error.message : "none" - matcher.positive_msg = "Expected #{@receiver.inspect} to raise error with message matching '#{expected}', but '#{message}' was raised." - matcher.negative_msg = "Expected #{@receiver.inspect} to raise error with message not matching '#{expected}', but '#{message}' was raised." + matcher.positive_msg = "Expected #{receiver.inspect} to raise error with message matching '#{expected}', but '#{message}' was raised." + matcher.negative_msg = "Expected #{receiver.inspect} to raise error with message not matching '#{expected}', but '#{message}' was raised." comparison = (raised && (expected.kind_of?(Regexp) ? ((error.message =~ expected) ? true : false) : expected == error.message)) end comparison lib/matchy/built_in/error_expectations.rb @@ -18,16 +18,6 @@ module Matchy end end - # Checks if the given object is kind_of? the expected class - # - # ==== Examples - # - # "hello".should be_kind_of(String) - # 3.should be_kind_of(Fixnum) - def be_kind_of(*klass) - ask_for(:kind_of, :with_arg => klass) - end - # Checks if the given object is within a given object and delta. # # ==== Examples @@ -122,7 +112,7 @@ module Matchy end alias_method :old_missing, :method_missing - # ==be_*something* + # ==be_*something(*args) # # ===This method_missing acts as a matcher builder. # If a call to be_xyz() reaches this method_missing (say: obj.should be_xyz), @@ -131,15 +121,12 @@ module Matchy # ==== Examples # # nil.should be_nil + # 17.should be_kind_of(Fixnum) # obj.something? #=> true # obj.should be_something def method_missing(name, *args, &block) if (name.to_s =~ /^be_(.+)/) - build_matcher(name, args) do |receiver, matcher, args| - matcher.positive_msg = "Expected #{receiver.inspect} to return true for #{$1}?." - matcher.negative_msg = "Expected #{receiver.inspect} to return false for #{$1}?." - receiver.send(($1 + "?").to_sym) - end + ask_for($1, :with_arg => args) else old_missing(name, *args, &block) end @@ -147,11 +134,10 @@ module Matchy private def ask_for(sym, option={}) - obj = option[:with_arg] || [] - build_matcher(sym, obj) do |receiver, matcher, args| + build_matcher(sym, (option[:with_arg] || [])) do |receiver, matcher, args| expected, meth = args[0], (sym.to_s + "?" ).to_sym - matcher.positive_msg = "Expected #{receiver.inspect} to #{sym} #{(expected && expected.inspect) || ''}." - matcher.negative_msg = "Expected #{receiver.inspect} to not #{sym} #{(expected && expected.inspect) || ''}." + matcher.positive_msg = "Expected #{receiver.inspect} to return true for #{sym}?, with '#{(expected && expected.inspect) || 'no args'}'." + matcher.negative_msg = "Expected #{receiver.inspect} to not return true for #{sym}?, with '#{(expected && expected.inspect) || 'no args'}'." expected ? receiver.send(meth, expected) : receiver.send(meth) end end lib/matchy/built_in/truth_expectations.rb @@ -1,7 +1,7 @@ module Matchy module VERSION #:nodoc: MAJOR = 0 - MINOR = 1 + MINOR = 3 TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') lib/matchy/version.rb @@ -1,5 +1,5 @@ Gem::Specification.new do |s| - s.name = "matchy300" + s.name = "matchy" s.version = "0.2.0" s.date = "2009-02-08" s.summary = "RSpec-esque matchers for use in Test::Unit" matchy.gemspec @@ -5,7 +5,20 @@ load File.dirname(__FILE__) + '/../lib/matchy.rb' MiniTest::Unit.autorun class TestAThing < MiniTest::Unit::TestCase - def test_a_thing + def test_equal_equal 1.should == 1 end + + def test_equal_equal_fails + #1.should == 2 + lambda{ 1.should == 2 }.should raise_error + end + + def test_equal_equal_negative + 1.should_not == 2 + end + + def test_equal_equal_negative_fails + lambda{ 1.should_not == 1 }.should raise_error + end end \ No newline at end of file test/test_minitest_compatibility.rb @@ -148,42 +148,42 @@ class TestTruthExpectations < Test::Unit::TestCase obj = equal(4) obj.matches?(5) - obj.failure_message.should be("Expected 5 to equal 4.") + obj.failure_message.should be("Expected 5 to return true for equal?, with '4'.") end def test_equal_negative_fail_message obj = equal(5) obj.matches?(5) - obj.negative_failure_message.should be("Expected 5 to not equal 5.") + obj.negative_failure_message.should be("Expected 5 to not return true for equal?, with '5'.") end def test_eql_fail_message obj = eql(4) obj.matches?(5) - obj.failure_message.should be("Expected 5 to eql 4.") + obj.failure_message.should be("Expected 5 to return true for eql?, with '4'.") end def test_eql_negative_fail_message_for_eql obj = eql(5) obj.matches?(5) - obj.negative_failure_message.should be("Expected 5 to not eql 5.") + obj.negative_failure_message.should be("Expected 5 to not return true for eql?, with '5'.") end def test_exist_fail_message obj = exist obj.matches?(Exister.new(false)) - obj.failure_message.should =~ /Expected #<(.*)> to exist./ + obj.failure_message.should =~ /Expected #<(.*)> to return true for exist?./ end def test_exist_negative_fail_message obj = exist obj.matches?(Exister.new(true)) - obj.negative_failure_message.should =~ /Expected #<(.*)> to not exist./ + obj.negative_failure_message.should =~ /Expected #<(.*)> to not return true for exist?./ end def test_be_close_fail_message @@ -268,6 +268,7 @@ class TestTruthExpectations < Test::Unit::TestCase }.should raise_error(Test::Unit::AssertionFailedError) end + # be_something def test_positive_be_something_method_missing_pass def @obj.something? true @@ -304,7 +305,7 @@ class TestTruthExpectations < Test::Unit::TestCase matcher_obj = be_something obj.should matcher_obj - matcher_obj.failure_message.should be("Expected \"foo\" to return true for something?.") + matcher_obj.failure_message.should be("Expected \"foo\" to return true for something?, with 'no args'.") end def test_be_something_method_missing_negative_fail_message @@ -315,7 +316,58 @@ class TestTruthExpectations < Test::Unit::TestCase matcher_obj = be_something obj.should_not matcher_obj - matcher_obj.negative_failure_message.should be("Expected \"foo\" to return false for something?.") + matcher_obj.negative_failure_message.should =~ /Expected \"foo\" to not return true for something?/ + end + + # be_something(arg) + def test_positive_be_something_with_arg_method_missing_pass + def @obj.something?(arg) + true + end + @obj.should be_something(1) + end + + def test_positive_be_something_with_arg_method_missing_fails + def @obj.something?(arg) + false + end + lambda {@obj.should be_something(1)}.should raise_error(Test::Unit::AssertionFailedError) + end + + def test_negative_be_something_method_missing_pass + def @obj.something?(arg) + false + end + @obj.should_not be_something(1) + end + + def test_negative_be_something_method_missing_fails + def @obj.something?(arg) + true + end + lambda {@obj.should_not be_something(1)}.should raise_error(Test::Unit::AssertionFailedError) + end + + def test_be_something_method_missing_fail_message + obj = "foo" + def obj.something?(arg) + true + end + matcher_obj = be_something(1) + obj.should matcher_obj + + matcher_obj.failure_message.should be("Expected \"foo\" to return true for something?, with '1'.") + end + + def test_be_something_method_missing_negative_fail_message + obj = "foo" + def obj.something?(arg) + false + end + matcher_obj = be_something(1) + obj.should_not matcher_obj + + matcher_obj.negative_failure_message.should be("Expected \"foo\" to not return true for something?, with '1'.") end end test/test_truth_expectations.rb 90a5ba0f7a4e3d9f71fd0a35bd4c2454695c05d7 Matthias Hennemeyer mhennemeyer@gmail.com http://github.com/jeremymcanally/matchy/commit/b5fbf56d9c77cc9f229b4bbbd7b97cedb4736364 b5fbf56d9c77cc9f229b4bbbd7b97cedb4736364 2009-02-11T07:48:32-08:00 2009-02-11T05:24:27-08:00 Added 1.9 compatibility suite. New Release. Signed-off-by: Jeremy McAnally <jeremymcanally@gmail.com> eb8d88ca41b0c0807f2598c839f38b2c9e985427 Jeremy McAnally jeremymcanally@gmail.com