diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/test/unit/assertions.rb | 8 | ||||
| -rw-r--r-- | lib/test/unit/testcase.rb | 9 | ||||
| -rw-r--r-- | lib/test/unit/testsuite.rb | 9 |
4 files changed, 29 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Wed Aug 6 22:58:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org> + + * lib/test/unit/testcase.rb: Added equality checking. + * lib/test/unit/testsuite.rb: Added equality checking. + * lib/test/unit/assertions.rb: Fixed a warning. + Wed Aug 6 17:28:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/extmk.rb (extmake): pass LIBPATH to make ruby. [ruby-dev:21137] diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb index 0af3468b9..b0df0ea2d 100644 --- a/lib/test/unit/assertions.rb +++ b/lib/test/unit/assertions.rb @@ -1,7 +1,7 @@ # :nodoc: # # Author:: Nathaniel Talbott. -# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved. +# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved. # License:: Ruby license. require 'test/unit/assertionfailederror' @@ -138,6 +138,12 @@ module Test # :nodoc: "<#{arg1}> expected to be =~\n" + "<#{arg2}>" end + pattern = case(pattern) + when String + Regexp.new(pattern) + else + pattern + end assert_block(full_message) { string =~ pattern } end end diff --git a/lib/test/unit/testcase.rb b/lib/test/unit/testcase.rb index 2ccf19290..369c94434 100644 --- a/lib/test/unit/testcase.rb +++ b/lib/test/unit/testcase.rb @@ -1,7 +1,7 @@ # :nodoc: # # Author:: Nathaniel Talbott. -# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved. +# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved. # License:: Ruby license. require 'test/unit/assertions' @@ -147,6 +147,13 @@ module Test def to_s name end + + # It's handy to be able to compare TestCase instances. + def ==(other) + return false unless(other.kind_of?(self.class)) + return false unless(@method_name == other.method_name) + self.class == other.class + end end end end diff --git a/lib/test/unit/testsuite.rb b/lib/test/unit/testsuite.rb index e3a164cb6..589ad7151 100644 --- a/lib/test/unit/testsuite.rb +++ b/lib/test/unit/testsuite.rb @@ -1,7 +1,7 @@ # :nodoc: # # Author:: Nathaniel Talbott. -# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved. +# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved. # License:: Ruby license. module Test @@ -59,6 +59,13 @@ module Test def to_s @name end + + # It's handy to be able to compare TestSuite instances. + def ==(other) + return false unless(other.kind_of?(self.class)) + return false unless(@name == other.name) + @tests == other.tests + end end end end |