Index: drupal_web_test_case.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/drupal_web_test_case.php,v
retrieving revision 1.2.2.3.2.45
diff -u -p -r1.2.2.3.2.45 drupal_web_test_case.php
--- drupal_web_test_case.php	25 Sep 2009 20:01:27 -0000	1.2.2.3.2.45
+++ drupal_web_test_case.php	5 Oct 2009 17:02:21 -0000
@@ -1173,7 +1173,7 @@ class DrupalWebTestCase extends DrupalTe
 
     // Use the test mail class instead of the default mail handler class.
 //    variable_set('mail_sending_system', array('default-system' => 'TestingMailSystem'));
-    variable_set('smtp_library', drupal_get_path('module', 'simpletest') . '/simpletest.test');
+    variable_set('smtp_library', drupal_get_path('module', 'simpletest') . '/simpletest.mail.inc');
 
     // Use temporary files directory with the same prefix as the database.
 //    $public_files_directory  = $this->originalFileDirectory . '/' . $db_prefix;
@@ -2561,8 +2563,11 @@ class DrupalWebTestCase extends DrupalTe
   protected function assertMail($name, $value = '', $message = '') {
     $captured_emails = variable_get('drupal_test_email_collector', array());
     $email = end($captured_emails);
-//    return $this->assertTrue($email && isset($email[$name]) && $email[$name] == $value, $message, t('E-mail'));
-    return $this->assertTrue($email && isset($email['params'][$name]) && $email['params'][$name] == $value, $message, t('E-mail'));
+    return $this->assertTrue(
+      ($email && isset($email[$name]) && $email[$name] == $value) ||
+      ($email && isset($email['params'][$name]) && $email['params'][$name] == $value),
+      $message,
+      t('E-mail'));
   }
 
   /**
Index: simpletest.mail.inc
===================================================================
RCS file: simpletest.mail.inc
diff -N simpletest.mail.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ simpletest.mail.inc	5 Oct 2009 17:02:21 -0000
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @file
+ * smtp_library implementation for simpletest.
+ */
+
+/**
+ * Capture e-mail message during testing.
+ *
+ * Code copied from TestingMailSystem in mail.sending.inc (Drupal 7). Placed in
+ * this file to ensure not loaded until in testing mode, to ensure no conflicts
+ * with other implementations like devel.
+ *
+ * @param $message
+ *   An e-mail message.
+ */
+function drupal_mail_wrapper(array $message) {
+  $captured_emails = variable_get('drupal_test_email_collector', array());
+  $captured_emails[] = $message;
+  variable_set('drupal_test_email_collector', $captured_emails);
+  return TRUE;
+}
Index: simpletest.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/Attic/simpletest.test,v
retrieving revision 1.1.2.16
diff -u -p -r1.1.2.16 simpletest.test
--- simpletest.test	14 Sep 2009 23:22:56 -0000	1.1.2.16
+++ simpletest.test	5 Oct 2009 17:02:21 -0000
@@ -361,19 +361,3 @@ class SimpleTestMailCaptureTestCase exte
   }
 }
 
-/**
- * Capture e-mail message during testing.
- *
- * Code copied from TestingMailSystem in mail.sending.inc (Drupal 7). Placed in
- * this file to ensure no loaded until in testing mode, to ensure no conflicts
- * with other implementations like devel.
- *
- * @param $message
- *   An e-mail message.
- */
-function drupal_mail_wrapper(array $message) {
-  $captured_emails = variable_get('drupal_test_email_collector', array());
-  $captured_emails[] = $message;
-  variable_set('drupal_test_email_collector', $captured_emails);
-  return TRUE;
-}