From 3158b75b0bf9c259ca6668cc4383de3836ad8f07 Mon Sep 17 00:00:00 2001
From: ntalbott <ntalbott@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 6 Aug 2003 14:03:21 +0000
Subject: [PATCH]   * lib/test/unit/testcase.rb: Added equality checking.   *
 lib/test/unit/testsuite.rb: Added equality checking.   *
 lib/test/unit/assertions.rb: Fixed a warning.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4341 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                   | 6 ++++++
 lib/test/unit/assertions.rb | 8 +++++++-
 lib/test/unit/testcase.rb   | 9 ++++++++-
 lib/test/unit/testsuite.rb  | 9 ++++++++-
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fab09cf0b6..cb443556ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 0af3468b9b..b0df0ea2db 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 2ccf192906..369c944349 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 e3a164cb6e..589ad7151e 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