Merge lp:pressflow/6.x-hiphop into lp:pressflow

[David Strauss]

[lp:pressflow/6.x-hiphop]

75. By Josh Koenig on 2010-02-21

simpletest causes the hiphop build to crash as per https://bugs.edge.launchpad.net/pressflow/+bug/525101

Cutting it lets us get through a build!

76. By Josh Koenig on 2010-02-21

merging in David's changes

77. By Josh Koenig on 2010-02-21

remove foreach which produced fatal errors calling other unincluded datbases' _is_available functions

Unmerged revisions

77. By Josh Koenig on 2010-02-21

remove foreach which produced fatal errors calling other unincluded datbases' _is_available functions

76. By Josh Koenig on 2010-02-21

merging in David's changes

75. By Josh Koenig on 2010-02-21

simpletest causes the hiphop build to crash as per https://bugs.edge.launchpad.net/pressflow/+bug/525101

Cutting it lets us get through a build!

=== modified file 'includes/bootstrap.inc'
--- includes/bootstrap.inc	2010-01-16 02:38:40 +0000
+++ includes/bootstrap.inc	2010-02-21 05:03:16 +0000
@@ -248,26 +248,7 @@
  *   The path of the matching directory.
  */
 function conf_path($require_settings = TRUE, $reset = FALSE) {
-  static $conf = '';
-
-  if ($conf && !$reset) {
-    return $conf;
-  }
-
-  $confdir = 'sites';
-  $uri = explode('/', $_SERVER['SCRIPT_NAME'] ? $_SERVER['SCRIPT_NAME'] : $_SERVER['SCRIPT_FILENAME']);
-  $server = explode('.', implode('.', array_reverse(explode(':', rtrim($_SERVER['HTTP_HOST'], '.')))));
-  for ($i = count($uri) - 1; $i > 0; $i--) {
-    for ($j = count($server); $j > 0; $j--) {
-      $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i));
-      if (file_exists("$confdir/$dir/settings.php") || (!$require_settings && file_exists("$confdir/$dir"))) {
-        $conf = "$confdir/$dir";
-        return $conf;
-      }
-    }
-  }
-  $conf = "$confdir/default";
-  return $conf;
+  return 'sites/default';
 }
 
 /**
@@ -326,8 +307,8 @@
     $_SERVER['HTTP_HOST'] = '';
   }
 
-  if (file_exists('./'. conf_path() .'/settings.php')) {
-    include_once './'. conf_path() .'/settings.php';
+  if (file_exists('./sites/default/settings.php')) {
+    include_once './sites/default/settings.php';
   }
 
   // Ignore the placeholder url from default.settings.php.

=== modified file 'includes/common.inc'
--- includes/common.inc	2009-12-17 00:30:08 +0000
+++ includes/common.inc	2010-02-21 05:03:16 +0000
@@ -2753,8 +2753,8 @@
   // themes as organized by a distribution.  It is pristine in the same way
   // that /modules is pristine for core; users should avoid changing anything
   // there in favor of sites/all or sites/<domain> directories.
-  if (file_exists("profiles/$profile/$directory")) {
-    $searchdir[] = "profiles/$profile/$directory";
+  if (file_exists("profiles/default/$directory")) {
+    $searchdir[] = "profiles/default/$directory";
   }
 
   // Always search sites/all/* as well as the global directories

=== modified file 'includes/install.inc'
--- includes/install.inc	2009-02-25 22:34:15 +0000
+++ includes/install.inc	2010-02-21 05:03:16 +0000
@@ -152,13 +152,11 @@
 function drupal_detect_database_types() {
   $databases = array();
 
-  foreach (array('mysql', 'mysqli', 'pgsql') as $type) {
-    if (file_exists('./includes/install.'. $type .'.inc')) {
-      include_once './includes/install.'. $type .'.inc';
-      $function = $type .'_is_available';
-      if ($function()) {
-        $databases[$type] = $type;
-      }
+  if (file_exists('./includes/install.mysqli.inc')) {
+    include_once './includes/install.mysqli.inc';
+    $function = $type .'_is_available';
+    if ($function()) {
+      $databases[$type] = $type;
     }
   }
 
@@ -271,7 +269,7 @@
   include_once './includes/file.inc';
   include_once './includes/common.inc';
 
-  $profile_file = "./profiles/$profile/$profile.profile";
+  $profile_file = "./profiles/default/default.profile";
 
   if (!isset($profile) || !file_exists($profile_file)) {
     install_no_profile_error();
@@ -356,7 +354,7 @@
  */
 function drupal_install_system() {
   $system_path = dirname(drupal_get_filename('module', 'system', NULL));
-  require_once './'. $system_path .'/system.install';
+  require_once './modules/system/system.install';
   module_invoke('system', 'install');
   $system_versions = drupal_get_schema_versions('system');
   $system_version = $system_versions ? max($system_versions) : SCHEMA_INSTALLED;
@@ -669,7 +667,7 @@
 function drupal_check_profile($profile) {
   include_once './includes/file.inc';
 
-  $profile_file = "./profiles/$profile/$profile.profile";
+  $profile_file = './profiles/default/default.profile';
 
   if (!isset($profile) || !file_exists($profile_file)) {
     install_no_profile_error();

=== modified file 'install.php'
--- install.php	2009-09-15 16:10:36 +0000
+++ install.php	2010-02-21 05:03:16 +0000
@@ -94,7 +94,7 @@
   }
 
   // Load the profile.
-  require_once "./profiles/$profile/$profile.profile";
+  require_once "./profiles/default/default.profile";
 
   // Locale selection
   if (!empty($_GET['locale'])) {

=== removed directory 'modules/simpletest'
=== removed file 'modules/simpletest/BACKPORT.txt'
--- modules/simpletest/BACKPORT.txt	2009-09-15 16:10:36 +0000
+++ modules/simpletest/BACKPORT.txt	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-$Id: BACKPORT.txt,v 1.1.2.7 2009/09/14 23:03:27 boombatower Exp $
-
-AUTHOR
-------
-Jimmy Berry ("boombatower", http://drupal.org/user/214218)
-
-PURPOSE
--------
-This document describes the changes necessary to backport Drupal 7 core
-SimpleTest for Drupal 6. This record is useful when trying to backport new
-features from Drupal 7.
-
-CHANGES
--------
-All changes are placed bellow the line they are changing and the original line
-is then commented out. This makes it easy to see what was done when merging
-later changes.
-
-The last backported core CVS ID for the file is listed just bellow the actual
-CVS ID with the prefix "Core: ".
-
-DrupalWebTestCase
------------------
-Document as described above.
-
-SimpleTest module (simpletest.module)
--------------------------------------
-  * simpletest_get_all_tests()
-  * simpletest_run_tests()
-  * _simpletest_batch_finished()
-  * simpletest_clean_database
-    - Added simpletest_get_like_tables()
-  * simpletest_clean_temporary_directory()
-  * simpletest_test_form()
-  * _drupal_decode_exception()
-  * Added hook_form_system_modules_alter()
-
-SimpleTest installer (simpletest.install)
------------------------------------------
-  * Added update hook.
-  * Added requirements check for configuration file modifications.
-
-JavaScript (simpletest.js)
---------------------------
-  * Changed function attach syntax in both behaviors.
-
-CLI script (run-tests.sh)
--------------------------
-  * Backported database calls.

=== removed file 'modules/simpletest/CHANGELOG.txt'
--- modules/simpletest/CHANGELOG.txt	2009-09-15 16:10:36 +0000
+++ modules/simpletest/CHANGELOG.txt	1970-01-01 00:00:00 +0000
@@ -1,135 +0,0 @@
-// $Id: CHANGELOG.txt,v 1.1.2.97 2009/09/14 23:22:56 boombatower Exp $
-
-SimpleTest 6.x-2.9, 2009-09-14
-------------------------------
-- Changes:
-   * #576256: Theme laying needs to be initialized during setUp().
-   * Correct comment on previous workaround.
-   * #400296 by neilnz: Make simpletest_get_like_tables() work in MySQL and PostgreSQL.
-   * #573822: Update SimpleTestMailCaptureTestCase from simpletest.test.
-   * #577324 by Dave Reid: Module tests with extending submodule tests not included correctly.
-- Bugs:
-   * #442890: HEAD info left in simpletest.info.
-   * #474394 by RockyRoad: block.test should treat delta as string.
-- Backports:
-   * #335756: SimpleTest: $this->originalFileDirectory should be set before
-              installation to ensure non-standard directories are picked up.
-   * #567422: Fresh backport of Drupal 7 SimpleTest.
-   * #545228: Missing D7 constants.
-   * Remove simpletest.function.inc.
-   * Correct file_scan_directory() $mask parameter API change.
-   * Correct another 'class' atrribute as array().
-   * Update files.
-   * Changes to install.php included in D6 core patch.
-   * #577496: drupal_mail_wrapper() conflicts.
-
-SimpleTest 6.x-2.8, 2009-04-23
-------------------------------
-- Bugs:
-   * #382334: drupalGetNodeByTitle uses node_load_multiple in 6.x.
-   * #385152: Clear user_access() cache.
-   * Change file in drupalGetTestFiles() to use ereg() format used in Drupal 6.
-   * #430512 by soxofaan: Drupal 7 style database code in run-tests.sh.
-   * #430682: backport: run-tests.sh does not work with non-default server port.
-- Changes:
-   * #346844: Clear language statics to remove locale module errors.
-   * #400296 by carlos8f: Use "SHOW TABLES" in simpletest_get_like_tables().
-   * #390232: Update 313902-2.patch to D6.10 misc/drupal.js
-   * #409372 by Dave Reid: Hide modules that have hidden = TRUE on admin/build/modules.
-   * #415864: Backport sample files.
-   * #400296: Revert: Use "SHOW TABLES" in simpletest_get_like_tables().
-   * #409294 by wlp1979: Add extra condition to getAssertionCall() for DrupalWebTestCaseCore.
-   * Merge DrupalWebTestCase change into DrupalWebTestCaseCore.
-   * Move "core" directory files into root.
-   * #442436: Full backport of Drupal 7 SimpleTest and common.inc functions.
-
-SimpleTest 6.x-2.7, 2009-02-16
-------------------------------
-- Bugs:
-   * #372697: Content type created but not  "appearing".
-   * #373722: Table {node_revision} doesn't exist
-- Changes:
-   * #370966: Ignore 1.x style tests.
-   * Format fix.
-   * #373172: Add curl requirement to documentation.
-
-SimpleTest 6.x-2.6, 2009-02-07
-------------------------------
-- Complete backport of Drupal 7.x SimpleTest module. (voids all backports).
-   * Added header to all relevant files.
-   * Updated INSTALL.txt.
-   * #369952: Clarify INSTALL.txt.
-   * Add drupalLogout() override.
-   * Add equivilent auto-clear user code.
-   * #359577: Add run-tests.sh to 6--2 branch.
-- Backports:
-   * #305150: Keep running tests checked.
-   * #313902: DX: Show fatal errors in tests. (Added to INSTALL.txt)
-   * #304940: SimpleTest shouldn't try to upload non files.
-   * #308186: cURL 7.18.2 and SimpleTest module bitterly despise one another. (again?)
-   * #330582: Retrieve HTTP response headers.
-   * #336043: Simpletest speedup: skip call to curlExec() in curlConnect().
-- Changes:
-   * #334679 by hass: improve update path from 5.x and 6.x-1.x to 6.x-2.x.
-
-SimpleTest 6.x-2.5, 2008-10-22
-------------------------------
-- Backports:
-   * #308668: Make test selection page work with non-JS.
-   * #316344: Add meta refresh support to SimpleTest.
-   * #320127: error in drupal_web_test_case.php.
-   * #320161: drupalGetTestFiles does not sort files correctly.
-   * #320374: Simpletest now fails with max_allowed_packet = 1M.
-   * #322779: Simpletest calls file_check_directory incorrectly.
-- Changes:
-   * #319682: Install.txt refers to non-existent admin page.
-   * #323405: Remove bogus version = VERSION line from .info file.
-
-SimpleTest 6.x-2.4, 2008-09-22
-------------------------------
-- Bugs:
-   * #310427: settings.php check doesn't work properly.
-- Backports:
-   * #305077: Rework simpletest backend.
-   * #308399: The simpletest error handler is broken for PHP functions.
-   * #308262: Clean-up and documentation of simpletest.js.
-   * #308186: cURL 7.18.2 and SimpleTest module bitterly despise one another.
-   * #295697: update cURL requirement.
-   * #299186: assertFieldByXPath does not work for selects or textareas with value.
-   * #308272: Improve test selection page.
-   * #255613: Update clickLink() to use drupalGet() and clean-up code.
-- Changes:
-   * #310783: Fix up requirements check for settings.php.
-
-SimpleTest 6.x-2.3, 2008-09-15
-------------------------------
-- Backports:
-    * #297869: Add xpath method to SimpleTest.
-    * #297894: Add assertLink and assertNoLink to SimpleTest.
-    * #298137: drupalCreateContentType() should reset node permissions.
-    * #268148: Don't verify SSL certificates.
-    * #293099: Clarify form documentation and error handling.
-    * #296027: {simpletest} indexes come with wrong array expression.
-    * #299461: assertEqual() does not work with arrays.
-    * #246261: Simpletest-light doesn't handle selects with <optgroup>'s correctly.
-- Changes:
-    * #297890: Add notice to INSTALL.txt instructing users on Windows to
-               encode settings file with the UNIX standard.
-    * #302606: Usability: improve installation error message.
-
-SimpleTest 6.x-2.2, 2008-08-15
-------------------------------
-- Bugs:
-    * #292062: fixed role creation permission check for 6.x style.
-- Backports:
-    * #290316: test_id field name corrected.
-    * #293500: change message field to type text.
-    * #268063: added instruction in INSTALL.txt about hidden property.
-    * #291750: remove results after displayed.
-- Changes:
-    * #295001: clarified INSTALL.txt and installation requirements message.
-    * Updated README.txt with issue information.
-
-SimpleTest 6.x-2.1, 2008-08-05
-------------------------------
-- Complete backport of Drupal 7.x SimpleTest module.

=== removed file 'modules/simpletest/INSTALL.txt'
--- modules/simpletest/INSTALL.txt	2009-09-11 00:40:07 +0000
+++ modules/simpletest/INSTALL.txt	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-$Id: INSTALL.txt,v 1.6.4.16 2009/09/05 13:34:10 boombatower Exp $
-
-AUTHOR
-------
-Jimmy Berry ("boombatower", http://drupal.org/user/214218)
-
-REQUIREMENTS
-------------
-The php-curl library is required for SimpleTest to function.
-
-INSTALLATION
-------------
-1. Apply the D6-core-simpletest.patch file to the Drupal 6 core.
-
-2. (Optional)
-   Apply the "Show fatal errors in tests" batch to misc/drupal.js if you want
-   the reason for test failure to be displayed on the batch API screen. The
-   patch can be found at:
-   http://drupal.org/files/issues/simpletest_drupal.js_.patch.
-
-3. (Optional)
-   Move/Copy the run-tests.sh file into the Drupal scripts folder. The script
-   allows the tests to be run from the command line.
-
-4. Go to Administer >> Site building >> Modules (admin/build/modules) and
-   enable the SimpleTest module.
-
-5. Go to Administer >> Site building >> Testing (admin/build/testing) to
-   begin using the module.
-
-6. (Optional)
-   Go to Administer >> Help >> SimpleTest (admin/help/simpletest)
-   for more information on how to use the SimpleTest module.

=== removed file 'modules/simpletest/LICENSE.txt'
--- modules/simpletest/LICENSE.txt	2009-02-26 00:33:44 +0000
+++ modules/simpletest/LICENSE.txt	1970-01-01 00:00:00 +0000
@@ -1,274 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-
-              Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
-Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute
-verbatim copies of this license document, but changing it is not allowed.
-
-                  Preamble
-
-The licenses for most software are designed to take away your freedom to
-share and change it. By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free software--to
-make sure the software is free for all its users. This General Public License
-applies to most of the Free Software Foundation's software and to any other
-program whose authors commit to using it. (Some other Free Software
-Foundation software is covered by the GNU Library General Public License
-instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our
-General Public Licenses are designed to make sure that you have the
-freedom to distribute copies of free software (and charge for this service if
-you wish), that you receive source code or can get it if you want it, that you
-can change the software or use pieces of it in new free programs; and that
-you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to
-deny you these rights or to ask you to surrender the rights. These restrictions
-translate to certain responsibilities for you if you distribute copies of the
-software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for
-a fee, you must give the recipients all the rights that you have. You must make
-sure that they, too, receive or can get the source code. And you must show
-them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2)
-offer you this license which gives you legal permission to copy, distribute
-and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that
-everyone understands that there is no warranty for this free software. If the
-software is modified by someone else and passed on, we want its recipients
-to know that what they have is not the original, so that any problems
-introduced by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We
-wish to avoid the danger that redistributors of a free program will individually
-obtain patent licenses, in effect making the program proprietary. To prevent
-this, we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification
-follow.
-
-           GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
-               MODIFICATION
-
-0. This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the terms
-of this General Public License. The "Program", below, refers to any such
-program or work, and a "work based on the Program" means either the
-Program or any derivative work under copyright law: that is to say, a work
-containing the Program or a portion of it, either verbatim or with
-modifications and/or translated into another language. (Hereinafter, translation
-is included without limitation in the term "modification".) Each licensee is
-addressed as "you".
-
-Activities other than copying, distribution and modification are not covered
-by this License; they are outside its scope. The act of running the Program is
-not restricted, and the output from the Program is covered only if its contents
-constitute a work based on the Program (independent of having been made
-by running the Program). Whether that is true depends on what the Program
-does.
-
-1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this License
-and to the absence of any warranty; and give any other recipients of the
-Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you
-may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it,
-thus forming a work based on the Program, and copy and distribute such
-modifications or work under the terms of Section 1 above, provided that you
-also meet all of these conditions:
-
-a) You must cause the modified files to carry prominent notices stating that
-you changed the files and the date of any change.
-
-b) You must cause any work that you distribute or publish, that in whole or in
-part contains or is derived from the Program or any part thereof, to be
-licensed as a whole at no charge to all third parties under the terms of this
-License.
-
-c) If the modified program normally reads commands interactively when run,
-you must cause it, when started running for such interactive use in the most
-ordinary way, to print or display an announcement including an appropriate
-copyright notice and a notice that there is no warranty (or else, saying that
-you provide a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this License.
-(Exception: if the Program itself is interactive but does not normally print such
-an announcement, your work based on the Program is not required to print
-an announcement.)
-
-These requirements apply to the modified work as a whole. If identifiable
-sections of that work are not derived from the Program, and can be
-reasonably considered independent and separate works in themselves, then
-this License, and its terms, do not apply to those sections when you distribute
-them as separate works. But when you distribute the same sections as part
-of a whole which is a work based on the Program, the distribution of the
-whole must be on the terms of this License, whose permissions for other
-licensees extend to the entire whole, and thus to each and every part
-regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to
-work written entirely by you; rather, the intent is to exercise the right to
-control the distribution of derivative or collective works based on the
-Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of a
-storage or distribution medium does not bring the other work under the scope
-of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under
-Section 2) in object code or executable form under the terms of Sections 1
-and 2 above provided that you also do one of the following:
-
-a) Accompany it with the complete corresponding machine-readable source
-code, which must be distributed under the terms of Sections 1 and 2 above
-on a medium customarily used for software interchange; or,
-
-b) Accompany it with a written offer, valid for at least three years, to give
-any third party, for a charge no more than your cost of physically performing
-source distribution, a complete machine-readable copy of the corresponding
-source code, to be distributed under the terms of Sections 1 and 2 above on
-a medium customarily used for software interchange; or,
-
-c) Accompany it with the information you received as to the offer to distribute
-corresponding source code. (This alternative is allowed only for
-noncommercial distribution and only if you received the program in object
-code or executable form with such an offer, in accord with Subsection b
-above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source code
-means all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation and
-installation of the executable. However, as a special exception, the source
-code distributed need not include anything that is normally distributed (in
-either source or binary form) with the major components (compiler, kernel,
-and so on) of the operating system on which the executable runs, unless that
-component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to
-copy from a designated place, then offering equivalent access to copy the
-source code from the same place counts as distribution of the source code,
-even though third parties are not compelled to copy the source along with the
-object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as
-expressly provided under this License. Any attempt otherwise to copy,
-modify, sublicense or distribute the Program is void, and will automatically
-terminate your rights under this License. However, parties who have received
-copies, or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it.
-However, nothing else grants you permission to modify or distribute the
-Program or its derivative works. These actions are prohibited by law if you
-do not accept this License. Therefore, by modifying or distributing the
-Program (or any work based on the Program), you indicate your acceptance
-of this License to do so, and all its terms and conditions for copying,
-distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the original
-licensor to copy, distribute or modify the Program subject to these terms and
-conditions. You may not impose any further restrictions on the recipients'
-exercise of the rights granted herein. You are not responsible for enforcing
-compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues), conditions
-are imposed on you (whether by court order, agreement or otherwise) that
-contradict the conditions of this License, they do not excuse you from the
-conditions of this License. If you cannot distribute so as to satisfy
-simultaneously your obligations under this License and any other pertinent
-obligations, then as a consequence you may not distribute the Program at all.
-For example, if a patent license would not permit royalty-free redistribution
-of the Program by all those who receive copies directly or indirectly through
-you, then the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply and
-the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or
-other property right claims or to contest validity of any such claims; this
-section has the sole purpose of protecting the integrity of the free software
-distribution system, which is implemented by public license practices. Many
-people have made generous contributions to the wide range of software
-distributed through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing to
-distribute software through any other system and a licensee cannot impose
-that choice.
-
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain
-countries either by patents or by copyrighted interfaces, the original copyright
-holder who places the Program under this License may add an explicit
-geographical distribution limitation excluding those countries, so that
-distribution is permitted only in or among countries not thus excluded. In such
-case, this License incorporates the limitation as if written in the body of this
-License.
-
-9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will be
-similar in spirit to the present version, but may differ in detail to address new
-problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies
-a version number of this License which applies to it and "any later version",
-you have the option of following the terms and conditions either of that
-version or of any later version published by the Free Software Foundation. If
-the Program does not specify a version number of this License, you may
-choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs
-whose distribution conditions are different, write to the author to ask for
-permission. For software which is copyrighted by the Free Software
-Foundation, write to the Free Software Foundation; we sometimes make
-exceptions for this. Our decision will be guided by the two goals of
-preserving the free status of all derivatives of our free software and of
-promoting the sharing and reuse of software generally.
-
-               NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
-PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
-STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
-WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR
-AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
-ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
-LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
-SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OR INABILITY TO USE THE
-PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
-OR DATA BEING RENDERED INACCURATE OR LOSSES
-SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
-PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN
-IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.
-
-          END OF TERMS AND CONDITIONS

=== removed file 'modules/simpletest/README.txt'
--- modules/simpletest/README.txt	2009-04-27 17:27:02 +0000
+++ modules/simpletest/README.txt	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-$Id: README.txt,v 1.12.4.4 2009/03/28 03:35:17 boombatower Exp $
-
-AUTHOR
-------
-Jimmy Berry ("boombatower", http://drupal.org/user/214218)
-
-PROJECT PAGE
-------------
-If you need more information, have an issue, or feature request please
-visit the project page at: http://drupal.org/project/simpletest.
-
-DESCRIPTION
------------
-SimpleTest 6.x-2.x is a backport of Drupal 7 core SimpleTest and has the same
-requirements as Drupal 7 SimpleTest.
-
-STATUS
-------
-Drupal 7 core SimpleTest developement is backported regularly. To find out when
-the code was last backport check the CHANGELOG.txt or version release date.
-
-ISSUES
-------
-If you encounter issues please try and confirm they are Drupal 6 specifc. This
-module has only required changes made in order for it to function in Drupal 6.
-Any issues that are related to the Drupal 6 backport may be posted to:
-http://drupal.org/project/issues/simpletest, but any issues with API or general
-concerns should be posted to the SimpleTest core issue queue:
-http://tinyurl.com/simpletest-core.

=== removed file 'modules/simpletest/drupal_web_test_case.php'
--- modules/simpletest/drupal_web_test_case.php	2009-09-24 16:31:42 +0000
+++ modules/simpletest/drupal_web_test_case.php	1970-01-01 00:00:00 +0000
@@ -1,2581 +0,0 @@
-<?php
-// $Id: drupal_web_test_case.php,v 1.2.2.3.2.43 2009/09/14 23:22:56 boombatower Exp $
-// Core: Id: drupal_web_test_case.php,v 1.146 2009/08/31 18:30:26 webchick Exp $
-
-/**
- * @file
- * Provide required modifications to Drupal 7 core DrupalWebTestCase in order
- * for it to function properly in Drupal 6.
- *
- * Copyright 2008-2009 by Jimmy Berry ("boombatower", http://drupal.org/user/214218)
- */
-
-module_load_include('function.inc', 'simpletest');
-
-/**
- * Base class for Drupal tests.
- *
- * Do not extend this class, use one of the subclasses in this file.
- */
-abstract class DrupalTestCase {
-  /**
-   * The test run ID.
-   *
-   * @var string
-   */
-  protected $testId;
-
-  /**
-   * The original database prefix, before it was changed for testing purposes.
-   *
-   * @var string
-   */
-  protected $originalPrefix = NULL;
-
-  /**
-   * The original file directory, before it was changed for testing purposes.
-   *
-   * @var string
-   */
-  protected $originalFileDirectory = NULL;
-
-  /**
-   * Time limit for the test.
-   */
-  protected $timeLimit = 180;
-
-  /**
-   * Current results of this test case.
-   *
-   * @var Array
-   */
-  public $results = array(
-    '#pass' => 0,
-    '#fail' => 0,
-    '#exception' => 0,
-    '#debug' => 0,
-  );
-
-  /**
-   * Assertions thrown in that test case.
-   *
-   * @var Array
-   */
-  protected $assertions = array();
-
-  /**
-   * This class is skipped when looking for the source of an assertion.
-   *
-   * When displaying which function an assert comes from, it's not too useful
-   * to see "drupalWebTestCase->drupalLogin()', we would like to see the test
-   * that called it. So we need to skip the classes defining these helper
-   * methods.
-   */
-  protected $skipClasses = array(__CLASS__ => TRUE);
-
-  /**
-   * Constructor for DrupalWebTestCase.
-   *
-   * @param $test_id
-   *   Tests with the same id are reported together.
-   */
-  public function __construct($test_id = NULL) {
-    $this->testId = $test_id;
-  }
-
-  /**
-   * Internal helper: stores the assert.
-   *
-   * @param $status
-   *   Can be 'pass', 'fail', 'exception'.
-   *   TRUE is a synonym for 'pass', FALSE for 'fail'.
-   * @param $message
-   *   The message string.
-   * @param $group
-   *   Which group this assert belongs to.
-   * @param $caller
-   *   By default, the assert comes from a function whose name starts with
-   *   'test'. Instead, you can specify where this assert originates from
-   *   by passing in an associative array as $caller. Key 'file' is
-   *   the name of the source file, 'line' is the line number and 'function'
-   *   is the caller function itself.
-   */
-  protected function assert($status, $message = '', $group = 'Other', array $caller = NULL) {
-    global $db_prefix;
-
-    // Convert boolean status to string status.
-    if (is_bool($status)) {
-      $status = $status ? 'pass' : 'fail';
-    }
-
-    // Increment summary result counter.
-    $this->results['#' . $status]++;
-
-    // Get the function information about the call to the assertion method.
-    if (!$caller) {
-      $caller = $this->getAssertionCall();
-    }
-
-    // Switch to non-testing database to store results in.
-    $current_db_prefix = $db_prefix;
-    $db_prefix = $this->originalPrefix;
-
-    // Creation assertion array that can be displayed while tests are running.
-    $this->assertions[] = $assertion = array(
-      'test_id' => $this->testId,
-      'test_class' => get_class($this),
-      'status' => $status,
-      'message' => $message,
-      'message_group' => $group,
-      'function' => $caller['function'],
-      'line' => $caller['line'],
-      'file' => $caller['file'],
-    );
-
-    // Store assertion for display after the test has completed.
-//    db_insert('simpletest')
-//      ->fields($assertion)
-//      ->execute();
-    db_query("INSERT INTO {simpletest}
-              (test_id, test_class, status, message, message_group, function, line, file)
-              VALUES (%d, '%s', '%s', '%s', '%s', '%s', %d, '%s')", array_values($assertion));
-
-    // Return to testing prefix.
-    $db_prefix = $current_db_prefix;
-    // We do not use a ternary operator here to allow a breakpoint on
-    // test failure.
-    if ($status == 'pass') {
-      return TRUE;
-    }
-    else {
-      return FALSE;
-    }
-  }
-
-  /**
-   * Store an assertion from outside the testing context.
-   *
-   * This is useful for inserting assertions that can only be recorded after
-   * the test case has been destroyed, such as PHP fatal errors. The caller
-   * information is not automatically gathered since the caller is most likely
-   * inserting the assertion on behalf of other code. In all other respects
-   * the method behaves just like DrupalTestCase::assert() in terms of storing
-   * the assertion.
-   *
-   * @see DrupalTestCase::assert()
-   */
-  public static function insertAssert($test_id, $test_class, $status, $message = '', $group = 'Other', array $caller = array()) {
-    // Convert boolean status to string status.
-    if (is_bool($status)) {
-      $status = $status ? 'pass' : 'fail';
-    }
-
-    $caller += array(
-      'function' => t('Unknown'),
-      'line' => 0,
-      'file' => t('Unknown'),
-    );
-
-    $assertion = array(
-      'test_id' => $test_id,
-      'test_class' => $test_class,
-      'status' => $status,
-      'message' => $message,
-      'message_group' => $group,
-      'function' => $caller['function'],
-      'line' => $caller['line'],
-      'file' => $caller['file'],
-    );
-
-//    db_insert('simpletest')
-//      ->fields($assertion)
-//      ->execute();
-    db_query("INSERT INTO {simpletest}
-              (test_id, test_class, status, message, message_group, function, line, file)
-              VALUES (%d, '%s', '%s', '%s', '%s', '%s', %d, '%s')", array_values($assertion));
-  }
-
-  /**
-   * Cycles through backtrace until the first non-assertion method is found.
-   *
-   * @return
-   *   Array representing the true caller.
-   */
-  protected function getAssertionCall() {
-    $backtrace = debug_backtrace();
-
-    // The first element is the call. The second element is the caller.
-    // We skip calls that occurred in one of the methods of our base classes
-    // or in an assertion function.
-   while (($caller = $backtrace[1]) &&
-         ((isset($caller['class']) && isset($this->skipClasses[$caller['class']])) ||
-           substr($caller['function'], 0, 6) == 'assert')) {
-      // We remove that call.
-      array_shift($backtrace);
-    }
-
-    return _drupal_get_last_caller($backtrace);
-  }
-
-  /**
-   * Check to see if a value is not false (not an empty string, 0, NULL, or FALSE).
-   *
-   * @param $value
-   *   The value on which the assertion is to be done.
-   * @param $message
-   *   The message to display along with the assertion.
-   * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
-   * @return
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertTrue($value, $message = '', $group = 'Other') {
-    return $this->assert((bool) $value, $message ? $message : t('Value is TRUE'), $group);
-  }
-
-  /**
-   * Check to see if a value is false (an empty string, 0, NULL, or FALSE).
-   *
-   * @param $value
-   *   The value on which the assertion is to be done.
-   * @param $message
-   *   The message to display along with the assertion.
-   * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
-   * @return
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertFalse($value, $message = '', $group = 'Other') {
-    return $this->assert(!$value, $message ? $message : t('Value is FALSE'), $group);
-  }
-
-  /**
-   * Check to see if a value is NULL.
-   *
-   * @param $value
-   *   The value on which the assertion is to be done.
-   * @param $message
-   *   The message to display along with the assertion.
-   * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
-   * @return
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertNull($value, $message = '', $group = 'Other') {
-    return $this->assert(!isset($value), $message ? $message : t('Value is NULL'), $group);
-  }
-
-  /**
-   * Check to see if a value is not NULL.
-   *
-   * @param $value
-   *   The value on which the assertion is to be done.
-   * @param $message
-   *   The message to display along with the assertion.
-   * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
-   * @return
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertNotNull($value, $message = '', $group = 'Other') {
-    return $this->assert(isset($value), $message ? $message : t('Value is not NULL'), $group);
-  }
-
-  /**
-   * Check to see if two values are equal.
-   *
-   * @param $first
-   *   The first value to check.
-   * @param $second
-   *   The second value to check.
-   * @param $message
-   *   The message to display along with the assertion.
-   * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
-   * @return
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertEqual($first, $second, $message = '', $group = 'Other') {
-    return $this->assert($first == $second, $message ? $message : t('First value is equal to second value'), $group);
-  }
-
-  /**
-   * Check to see if two values are not equal.
-   *
-   * @param $first
-   *   The first value to check.
-   * @param $second
-   *   The second value to check.
-   * @param $message
-   *   The message to display along with the assertion.
-   * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
-   * @return
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertNotEqual($first, $second, $message = '', $group = 'Other') {
-    return $this->assert($first != $second, $message ? $message : t('First value is not equal to second value'), $group);
-  }
-
-  /**
-   * Check to see if two values are identical.
-   *
-   * @param $first
-   *   The first value to check.
-   * @param $second
-   *   The second value to check.
-   * @param $message
-   *   The message to display along with the assertion.
-   * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
-   * @return
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertIdentical($first, $second, $message = '', $group = 'Other') {
-    return $this->assert($first === $second, $message ? $message : t('First value is identical to second value'), $group);
-  }
-
-  /**
-   * Check to see if two values are not identical.
-   *
-   * @param $first
-   *   The first value to check.
-   * @param $second
-   *   The second value to check.
-   * @param $message
-   *   The message to display along with the assertion.
-   * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
-   * @return
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertNotIdentical($first, $second, $message = '', $group = 'Other') {
-    return $this->assert($first !== $second, $message ? $message : t('First value is not identical to second value'), $group);
-  }
-
-  /**
-   * Fire an assertion that is always positive.
-   *
-   * @param $message
-   *   The message to display along with the assertion.
-   * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
-   * @return
-   *   TRUE.
-   */
-  protected function pass($message = NULL, $group = 'Other') {
-    return $this->assert(TRUE, $message, $group);
-  }
-
-  /**
-   * Fire an assertion that is always negative.
-   *
-   * @param $message
-   *   The message to display along with the assertion.
-   * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
-   * @return
-   *   FALSE.
-   */
-  protected function fail($message = NULL, $group = 'Other') {
-    return $this->assert(FALSE, $message, $group);
-  }
-
-  /**
-   * Fire an error assertion.
-   *
-   * @param $message
-   *   The message to display along with the assertion.
-   * @param $group
-   *   The type of assertion - examples are "Browser", "PHP".
-   * @param $caller
-   *   The caller of the error.
-   * @return
-   *   FALSE.
-   */
-  protected function error($message = '', $group = 'Other', array $caller = NULL) {
-    if ($group == 'User notice') {
-      // Since 'User notice' is set by trigger_error() which is used for debug
-      // set the message to a status of 'debug'.
-      return $this->assert('debug', $message, 'Debug', $caller);
-    }
-
-    return $this->assert('exception', $message, $group, $caller);
-  }
-
-  /**
-   * Run all tests in this class.
-   */
-  public function run() {
-    // Initialize verbose debugging.
-    simpletest_verbose(NULL, file_directory_path(), get_class($this));
-
-    // HTTP auth settings (<username>:<password>) for the simpletest browser
-    // when sending requests to the test site.
-    $username = variable_get('simpletest_username', NULL);
-    $password = variable_get('simpletest_password', NULL);
-    if ($username && $password) {
-      $this->httpauth_credentials = $username . ':' . $password;
-    }
-
-    set_error_handler(array($this, 'errorHandler'));
-    $methods = array();
-    // Iterate through all the methods in this class.
-    foreach (get_class_methods(get_class($this)) as $method) {
-      // If the current method starts with "test", run it - it's a test.
-      if (strtolower(substr($method, 0, 4)) == 'test') {
-        $this->setUp();
-        try {
-          $this->$method();
-          // Finish up.
-        }
-        catch (Exception $e) {
-          $this->exceptionHandler($e);
-        }
-        $this->tearDown();
-      }
-    }
-    // Clear out the error messages and restore error handler.
-    drupal_get_messages();
-    restore_error_handler();
-  }
-
-  /**
-   * Handle errors.
-   *
-   * Because this is registered in set_error_handler(), it has to be public.
-   * @see set_error_handler
-   *
-   */
-  public function errorHandler($severity, $message, $file = NULL, $line = NULL) {
-    if ($severity & error_reporting()) {
-      $error_map = array(
-        E_STRICT => 'Run-time notice',
-        E_WARNING => 'Warning',
-        E_NOTICE => 'Notice',
-        E_CORE_ERROR => 'Core error',
-        E_CORE_WARNING => 'Core warning',
-        E_USER_ERROR => 'User error',
-        E_USER_WARNING => 'User warning',
-        E_USER_NOTICE => 'User notice',
-        E_RECOVERABLE_ERROR => 'Recoverable error',
-      );
-
-      $backtrace = debug_backtrace();
-      $this->error($message, $error_map[$severity], _drupal_get_last_caller($backtrace));
-    }
-    return TRUE;
-  }
-
-  /**
-   * Handle exceptions.
-   *
-   * @see set_exception_handler
-   */
-  protected function exceptionHandler($exception) {
-    $backtrace = $exception->getTrace();
-    // Push on top of the backtrace the call that generated the exception.
-    array_unshift($backtrace, array(
-      'line' => $exception->getLine(),
-      'file' => $exception->getFile(),
-    ));
-    $this->error($exception->getMessage(), 'Uncaught exception', _drupal_get_last_caller($backtrace));
-  }
-
-  /**
-   * Generates a random string of ASCII characters of codes 32 to 126.
-   *
-   * The generated string includes alpha-numeric characters and common misc
-   * characters. Use this method when testing general input where the content
-   * is not restricted.
-   *
-   * @param $length
-   *   Length of random string to generate which will be appended to $db_prefix.
-   * @return
-   *   Randomly generated string.
-   */
-  public static function randomString($length = 8) {
-    global $db_prefix;
-
-    $str = '';
-    for ($i = 0; $i < $length; $i++) {
-      $str .= chr(mt_rand(32, 126));
-    }
-    return str_replace('simpletest', 's', $db_prefix) . $str;
-  }
-
-  /**
-   * Generates a random string containing letters and numbers.
-   *
-   * The letters may be upper or lower case. This method is better for
-   * restricted inputs that do not accept certain characters. For example,
-   * when testing input fields that require machine readable values (ie without
-   * spaces and non-standard characters) this method is best.
-   *
-   * @param $length
-   *   Length of random string to generate which will be appended to $db_prefix.
-   * @return
-   *   Randomly generated string.
-   */
-  public static function randomName($length = 8) {
-    global $db_prefix;
-
-    $values = array_merge(range(65, 90), range(97, 122), range(48, 57));
-    $max = count($values) - 1;
-    $str = '';
-    for ($i = 0; $i < $length; $i++) {
-      $str .= chr($values[mt_rand(0, $max)]);
-    }
-    return str_replace('simpletest', 's', $db_prefix) . $str;
-  }
-
-}
-
-/**
- * Test case for Drupal unit tests.
- *
- * These tests can not access the database nor files. Calling any Drupal
- * function that needs the database will throw exceptions. These include
- * watchdog(), function_exists(), module_implements(),
- * module_invoke_all() etc.
- */
-class DrupalUnitTestCase extends DrupalTestCase {
-
-  /**
-   * Constructor for DrupalUnitTestCase.
-   */
-  function __construct($test_id = NULL) {
-    parent::__construct($test_id);
-    $this->skipClasses[__CLASS__] = TRUE;
-  }
-
-  function setUp() {
-    global $db_prefix, $conf;
-
-    // Store necessary current values before switching to prefixed database.
-    $this->originalPrefix = $db_prefix;
-    $this->originalFileDirectory = file_directory_path();
-
-    // Generate temporary prefixed database to ensure that tests have a clean starting point.
-    $db_prefix = Database::getConnection()->prefixTables('{simpletest' . mt_rand(1000, 1000000) . '}');
-    $conf['file_public_path'] = $this->originalFileDirectory . '/' . $db_prefix;
-
-    // If locale is enabled then t() will try to access the database and
-    // subsequently will fail as the database is not accessible.
-    $module_list = module_list();
-    if (isset($module_list['locale'])) {
-      $this->originalModuleList = $module_list;
-      unset($module_list['locale']);
-      module_list(TRUE, FALSE, FALSE, $module_list);
-    }
-  }
-
-  function tearDown() {
-    global $db_prefix, $conf;
-    if (preg_match('/simpletest\d+/', $db_prefix)) {
-      $conf['file_public_path'] = $this->originalFileDirectory;
-      // Return the database prefix to the original.
-      $db_prefix = $this->originalPrefix;
-      // Restore modules if necessary.
-      if (isset($this->originalModuleList)) {
-        module_list(TRUE, FALSE, FALSE, $this->originalModuleList);
-      }
-    }
-  }
-}
-
-/**
- * Test case for typical Drupal tests.
- */
-class DrupalWebTestCase extends DrupalTestCase {
-  /**
-   * The URL currently loaded in the internal browser.
-   *
-   * @var string
-   */
-  protected $url;
-
-  /**
-   * The handle of the current cURL connection.
-   *
-   * @var resource
-   */
-  protected $curlHandle;
-
-  /**
-   * The headers of the page currently loaded in the internal browser.
-   *
-   * @var Array
-   */
-  protected $headers;
-
-  /**
-   * The content of the page currently loaded in the internal browser.
-   *
-   * @var string
-   */
-  protected $content;
-
-  /**
-   * The content of the page currently loaded in the internal browser (plain text version).
-   *
-   * @var string
-   */
-  protected $plainTextContent;
-
-  /**
-   * The parsed version of the page.
-   *
-   * @var SimpleXMLElement
-   */
-  protected $elements = NULL;
-
-  /**
-   * The current user logged in using the internal browser.
-   *
-   * @var bool
-   */
-  protected $loggedInUser = FALSE;
-
-  /**
-   * The current cookie file used by cURL.
-   *
-   * We do not reuse the cookies in further runs, so we do not need a file
-   * but we still need cookie handling, so we set the jar to NULL.
-   */
-  protected $cookieFile = NULL;
-
-  /**
-   * Additional cURL options.
-   *
-   * DrupalWebTestCase itself never sets this but always obeys what is set.
-   */
-  protected $additionalCurlOptions = array();
-
-  /**
-   * The original user, before it was changed to a clean uid = 1 for testing purposes.
-   *
-   * @var object
-   */
-  protected $originalUser = NULL;
-
-  /**
-   * HTTP authentication credentials (<username>:<password>).
-   */
-  protected $httpauth_credentials = NULL;
-
-  /**
-   * The current session name, if available.
-   */
-  protected $session_name = NULL;
-
-  /**
-   * The current session ID, if available.
-   */
-  protected $session_id = NULL;
-
-  /**
-   * Constructor for DrupalWebTestCase.
-   */
-  function __construct($test_id = NULL) {
-    parent::__construct($test_id);
-    $this->skipClasses[__CLASS__] = TRUE;
-  }
-
-  /**
-   * Get a node from the database based on its title.
-   *
-   * @param title
-   *   A node title, usually generated by $this->randomName().
-   *
-   * @return
-   *   A node object matching $title.
-   */
-  function drupalGetNodeByTitle($title) {
-//    $nodes = node_load_multiple(array(), array('title' => $title));
-//    // Load the first node returned from the database.
-//    $returned_node = reset($nodes);
-//    return $returned_node;
-    return node_load(array('title' => $title));
-  }
-
-  /**
-   * Creates a node based on default settings.
-   *
-   * @param $settings
-   *   An associative array of settings to change from the defaults, keys are
-   *   node properties, for example 'title' => 'Hello, world!'.
-   * @return
-   *   Created node object.
-   */
-  protected function drupalCreateNode($settings = array()) {
-    // Populate defaults array.
-    $settings += array(
-      'body'      => $this->randomName(32),
-      'title'     => $this->randomName(8),
-      'comment'   => 2,
-      'changed'   => time(),
-      'format'    => FILTER_FORMAT_DEFAULT,
-      'moderate'  => 0,
-      'promote'   => 0,
-      'revision'  => 1,
-      'log'       => '',
-      'status'    => 1,
-      'sticky'    => 0,
-      'type'      => 'page',
-      'revisions' => NULL,
-      'taxonomy'  => NULL,
-    );
-
-    // Use the original node's created time for existing nodes.
-    if (isset($settings['created']) && !isset($settings['date'])) {
-      $settings['date'] = format_date($settings['created'], 'custom', 'Y-m-d H:i:s O');
-    }
-
-    // If the node's user uid is not specified manually, use the currently
-    // logged in user if available, or else the user running the test.
-    if (!isset($settings['uid'])) {
-      if ($this->loggedInUser) {
-        $settings['uid'] = $this->loggedInUser->uid;
-      }
-      else {
-        global $user;
-        $settings['uid'] = $user->uid;
-      }
-    }
-
-//    // Merge body field value and format separately.
-//    $body = array(
-//      'value' => $this->randomName(32),
-//      'format' => FILTER_FORMAT_DEFAULT
-//    );
-//    $settings['body'][FIELD_LANGUAGE_NONE][0] += $body;
-
-    $node = (object) $settings;
-    node_save($node);
-
-    // Small hack to link revisions to our test user.
-//    db_update('node_revision')
-//      ->fields(array('uid' => $node->uid))
-//      ->condition('vid', $node->vid)
-//      ->execute();
-    db_query('UPDATE {node_revisions} SET uid = %d WHERE vid = %d', $node->uid, $node->vid);
-    return $node;
-  }
-
-  /**
-   * Creates a custom content type based on default settings.
-   *
-   * @param $settings
-   *   An array of settings to change from the defaults.
-   *   Example: 'type' => 'foo'.
-   * @return
-   *   Created content type.
-   */
-  protected function drupalCreateContentType($settings = array()) {
-    // Find a non-existent random type name.
-    do {
-//      $name = strtolower($this->randomName(8));
-//    } while (node_type_get_type($name));
-      $name = strtolower($this->randomName(3, 'type_'));
-    } while (node_get_types('type', $name));
-
-    // Populate defaults array.
-    $defaults = array(
-      'type' => $name,
-      'name' => $name,
-      'description' => '',
-      'help' => '',
-      'min_word_count' => 0, // Drupal 6.
-      'title_label' => 'Title',
-      'body_label' => 'Body',
-      'has_title' => 1,
-      'has_body' => 1,
-    );
-    // Imposed values for a custom type.
-    $forced = array(
-      'orig_type' => '',
-      'old_type' => '',
-      'module' => 'node',
-      'custom' => 1,
-      'modified' => 1,
-      'locked' => 0,
-    );
-    $type = $forced + $settings + $defaults;
-    $type = (object)$type;
-
-    $saved_type = node_type_save($type);
-    node_types_rebuild();
-    menu_rebuild(); // Drupal 6.
-
-    $this->assertEqual($saved_type, SAVED_NEW, t('Created content type %type.', array('%type' => $type->type)));
-
-    // Reset permissions so that permissions for this content type are available.
-    $this->checkPermissions(array(), TRUE);
-
-    return $type;
-  }
-
-  /**
-   * Get a list files that can be used in tests.
-   *
-   * @param $type
-   *   File type, possible values: 'binary', 'html', 'image', 'javascript', 'php', 'sql', 'text'.
-   * @param $size
-   *   File size in bytes to match. Please check the tests/files folder.
-   * @return
-   *   List of files that match filter.
-   */
-  protected function drupalGetTestFiles($type, $size = NULL) {
-    $files = array();
-
-    // Make sure type is valid.
-    if (in_array($type, array('binary', 'html', 'image', 'javascript', 'php', 'sql', 'text'))) {
-      // Use original file directory instead of one created during setUp().
-      $path = $this->originalFileDirectory . '/simpletest';
-//      $files = file_scan_directory($path, '/' . $type . '\-.*/');
-      $files = file_scan_directory($path, '' . $type . '\-.*');
-
-      // If size is set then remove any files that are not of that size.
-      if ($size !== NULL) {
-        foreach ($files as $file) {
-//          $stats = stat($file->uri);
-          $stats = stat($file->filename);
-          if ($stats['size'] != $size) {
-//            unset($files[$file->uri]);
-            unset($files[$file->filename]);
-          }
-        }
-      }
-    }
-    usort($files, array($this, 'drupalCompareFiles'));
-    return $files;
-  }
-
-  /**
-   * Compare two files based on size and file name.
-   */
-  protected function drupalCompareFiles($file1, $file2) {
-//    $compare_size = filesize($file1->uri) - filesize($file2->uri);
-    $compare_size = filesize($file1->filename) - filesize($file2->filename);
-    if ($compare_size) {
-      // Sort by file size.
-      return $compare_size;
-    }
-    else {
-      // The files were the same size, so sort alphabetically.
-      return strnatcmp($file1->name, $file2->name);
-    }
-  }
-
-  /**
-   * Create a user with a given set of permissions. The permissions correspond to the
-   * names given on the privileges page.
-   *
-   * @param $permissions
-   *   Array of permission names to assign to user.
-   * @return
-   *   A fully loaded user object with pass_raw property, or FALSE if account
-   *   creation fails.
-   */
-  protected function drupalCreateUser($permissions = array('access comments', 'access content', 'post comments', 'post comments without approval')) {
-    // Create a role with the given permission set.
-    if (!($rid = $this->drupalCreateRole($permissions))) {
-      return FALSE;
-    }
-
-    // Create a user assigned to that role.
-    $edit = array();
-    $edit['name']   = $this->randomName();
-    $edit['mail']   = $edit['name'] . '@example.com';
-    $edit['roles']  = array($rid => $rid);
-    $edit['pass']   = user_password();
-    $edit['status'] = 1;
-
-    $account = user_save('', $edit);
-
-    $this->assertTrue(!empty($account->uid), t('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), t('User login'));
-    if (empty($account->uid)) {
-      return FALSE;
-    }
-
-    // Add the raw password so that we can log in as this user.
-    $account->pass_raw = $edit['pass'];
-    return $account;
-  }
-
-  /**
-   * Internal helper function; Create a role with specified permissions.
-   *
-   * @param $permissions
-   *   Array of permission names to assign to role.
-   * @param $name
-   *   (optional) String for the name of the role.  Defaults to a random string.
-   * @return
-   *   Role ID of newly created role, or FALSE if role creation failed.
-   */
-  protected function drupalCreateRole(array $permissions, $name = NULL) {
-    // Generate random name if it was not passed.
-    if (!$name) {
-      $name = $this->randomName();
-    }
-
-    // Check the all the permissions strings are valid.
-    if (!$this->checkPermissions($permissions)) {
-      return FALSE;
-    }
-
-    // Create new role.
-//    $role = new stdClass();
-//    $role->name = $name;
-//    user_role_save($role);
-//    user_role_set_permissions($role->name, $permissions);
-    db_query("INSERT INTO {role} (name) VALUES ('%s')", $name);
-    $role = db_fetch_object(db_query("SELECT * FROM {role} WHERE name = '%s'", $name));
-
-    $this->assertTrue(isset($role->rid), t('Created role of name: @name, id: @rid', array('@name' => $name, '@rid' => (isset($role->rid) ? $role->rid : t('-n/a-')))), t('Role'));
-    if ($role && !empty($role->rid)) {
-//      $count = db_query('SELECT COUNT(*) FROM {role_permission} WHERE rid = :rid', array(':rid' => $role->rid))->fetchField();
-//      $this->assertTrue($count == count($permissions), t('Created permissions: @perms', array('@perms' => implode(', ', $permissions))), t('Role'));
-
-      // Assign permissions to role and mark it for clean-up.
-      db_query("INSERT INTO {permission} (rid, perm) VALUES (%d, '%s')", $role->rid, implode(', ', $permissions));
-      $perm = db_result(db_query("SELECT perm FROM {permission} WHERE rid = %d", $role->rid));
-      $this->assertTrue(count(explode(', ', $perm)) == count($permissions), t('Created permissions: @perms', array('@perms' => implode(', ', $permissions))), t('Role'));
-      return $role->rid;
-    }
-    else {
-      return FALSE;
-    }
-  }
-
-  /**
-   * Check to make sure that the array of permissions are valid.
-   *
-   * @param $permissions
-   *   Permissions to check.
-   * @param $reset
-   *   Reset cached available permissions.
-   * @return
-   *   TRUE or FALSE depending on whether the permissions are valid.
-   */
-  protected function checkPermissions(array $permissions, $reset = FALSE) {
-//    $available = &drupal_static(__FUNCTION__);
-    static $available;
-
-    if (!isset($available) || $reset) {
-//      $available = array_keys(module_invoke_all('permission'));
-      $available = module_invoke_all('perm');
-    }
-
-    $valid = TRUE;
-    foreach ($permissions as $permission) {
-      if (!in_array($permission, $available)) {
-        $this->fail(t('Invalid permission %permission.', array('%permission' => $permission)), t('Role'));
-        $valid = FALSE;
-      }
-    }
-    return $valid;
-  }
-
-  /**
-   * Log in a user with the internal browser.
-   *
-   * If a user is already logged in, then the current user is logged out before
-   * logging in the specified user.
-   *
-   * Please note that neither the global $user nor the passed in user object is
-   * populated with data of the logged in user. If you need full access to the
-   * user object after logging in, it must be updated manually. If you also need
-   * access to the plain-text password of the user (set by drupalCreateUser()),
-   * e.g. to login the same user again, then it must be re-assigned manually.
-   * For example:
-   * @code
-   *   // Create a user.
-   *   $account = $this->drupalCreateUser(array());
-   *   $this->drupalLogin($account);
-   *   // Load real user object.
-   *   $pass_raw = $account->pass_raw;
-   *   $account = user_load($account->uid);
-   *   $account->pass_raw = $pass_raw;
-   * @endcode
-   *
-   * @param $user
-   *   User object representing the user to login.
-   *
-   * @see drupalCreateUser()
-   */
-  protected function drupalLogin(stdClass $user) {
-    if ($this->loggedInUser) {
-      $this->drupalLogout();
-    }
-
-    $edit = array(
-      'name' => $user->name,
-      'pass' => $user->pass_raw
-    );
-    $this->drupalPost('user', $edit, t('Log in'));
-
-    // If a "log out" link appears on the page, it is almost certainly because
-    // the login was successful.
-    $pass = $this->assertLink(t('Log out'), 0, t('User %name successfully logged in.', array('%name' => $user->name)), t('User login'));
-
-    if ($pass) {
-      $this->loggedInUser = $user;
-    }
-  }
-
-  /**
-   * Generate a token for the currently logged in user.
-   */
-  protected function drupalGetToken($value = '') {
-    $private_key = drupal_get_private_key();
-    return md5($this->session_id . $value . $private_key);
-  }
-
-  /*
-   * Logs a user out of the internal browser, then check the login page to confirm logout.
-   */
-  protected function drupalLogout() {
-    // Make a request to the logout page, and redirect to the user page, the
-    // idea being if you were properly logged out you should be seeing a login
-    // screen.
-//    $this->drupalGet('user/logout', array('query' => 'destination=user'));
-    $this->drupalGet('logout', array('query' => 'destination=user'));
-    $pass = $this->assertField('name', t('Username field found.'), t('Logout'));
-    $pass = $pass && $this->assertField('pass', t('Password field found.'), t('Logout'));
-
-    if ($pass) {
-      $this->loggedInUser = FALSE;
-    }
-  }
-
-  /**
-   * Generates a random database prefix, runs the install scripts on the
-   * prefixed database and enable the specified modules. After installation
-   * many caches are flushed and the internal browser is setup so that the
-   * page requests will run on the new prefix. A temporary files directory
-   * is created with the same name as the database prefix.
-   *
-   * @param ...
-   *   List of modules to enable for the duration of the test.
-   */
-  protected function setUp() {
-    global $db_prefix, $user, $language;
-
-    // Store necessary current values before switching to prefixed database.
-    $this->originalLanguage = $language;
-//    $this->originalLanguageDefault = variable_get('language_default');
-    $this->originalPrefix = $db_prefix;
-    $this->originalFileDirectory = file_directory_path();
-//    $this->originalProfile = drupal_get_profile();
-    $clean_url_original = variable_get('clean_url', 0);
-
-    // Must reset locale here, since schema calls t(). (Drupal 6)
-    if (module_exists('locale')) {
-      $language = (object) array('language' => 'en', 'name' => 'English', 'native' => 'English', 'direction' => 0, 'enabled' => 1, 'plurals' => 0, 'formula' => '', 'domain' => '', 'prefix' => '', 'weight' => 0, 'javascript' => '');
-      locale(NULL, NULL, TRUE);
-    }
-
-    // Generate temporary prefixed database to ensure that tests have a clean starting point.
-//    $db_prefix_new = Database::getConnection()->prefixTables('{simpletest' . mt_rand(1000, 1000000) . '}');
-    $db_prefix_new = $db_prefix . 'simpletest' . mt_rand(1000, 1000000);
-
-    // Workaround to insure we init the theme layer before going into prefixed
-    // environment. (Drupal 6)
-    $this->pass(t('Starting run with db_prefix %prefix', array('%prefix' => $db_prefix_new)), 'System');
-
-//    db_update('simpletest_test_id')
-//      ->fields(array('last_prefix' => $db_prefix_new))
-//      ->condition('test_id', $this->testId)
-//      ->execute();
-    db_query("UPDATE {simpletest_test_id}
-              SET last_prefix = '%s'
-              WHERE test_id = %d", $db_prefix_new, $this->testId);
-    $db_prefix = $db_prefix_new;
-
-    // Create test directory ahead of installation so fatal errors and debug
-    // information can be logged during installation process.
-    $directory = $this->originalFileDirectory . '/simpletest/' . substr($db_prefix, 10);
-//    file_prepare_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
-    file_check_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
-
-    // Log fatal errors.
-    ini_set('log_errors', 1);
-    ini_set('error_log', $directory . '/error.log');
-
-//    include_once DRUPAL_ROOT . '/includes/install.inc';
-    include_once './includes/install.inc';
-    drupal_install_system();
-
-//    $this->preloadRegistry();
-
-//    // Include the default profile
-//    variable_set('install_profile', 'default');
-//    $profile_details = install_profile_info('default', 'en');
-
-    // Add the specified modules to the list of modules in the default profile.
-    // Install the modules specified by the default profile.
-//    drupal_install_modules($profile_details['dependencies'], TRUE);
-    drupal_install_modules(drupal_verify_profile('default', 'en'));
-
-//    node_type_clear();
-
-    // Install additional modules one at a time in order to make sure that the
-    // list of modules is updated between each module's installation.
-    $modules = func_get_args();
-    foreach ($modules as $module) {
-//      drupal_install_modules(array($module), TRUE);
-      drupal_install_modules(array($module));
-    }
-
-    // Because the schema is static cached, we need to flush
-    // it between each run. If we don't, then it will contain
-    // stale data for the previous run's database prefix and all
-    // calls to it will fail.
-    drupal_get_schema(NULL, TRUE);
-
-    // Run default profile tasks.
-//    $install_state = array();
-//    drupal_install_modules(array('default'), TRUE);
-    $task = 'profile';
-    default_profile_tasks($task, '');
-
-    // Rebuild caches.
-//    node_types_rebuild();
-    actions_synchronize();
-    _drupal_flush_css_js();
-    $this->refreshVariables();
-    $this->checkPermissions(array(), TRUE);
-    user_access(NULL, NULL, TRUE); // Drupal 6.
-
-    // Log in with a clean $user.
-    $this->originalUser = $user;
-//    drupal_save_session(FALSE);
-//    $user = user_load(1);
-    session_save_session(FALSE);
-    $user = user_load(array('uid' => 1));
-
-    // Restore necessary variables.
-    variable_set('install_profile', 'default');
-    variable_set('install_task', 'profile-finished');
-    variable_set('clean_url', $clean_url_original);
-    variable_set('site_mail', '[e-mail]');
-    variable_set('smtp_library', drupal_get_path('module', 'simpletest') . '/simpletest.test');
-
-    // Use temporary files directory with the same prefix as the database.
-    $directory = $this->originalFileDirectory . '/' . $db_prefix;
-
-    // Set path variables
-    variable_set('file_directory_path', $directory);
-
-    // Create the directories
-    file_check_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
-
-    set_time_limit($this->timeLimit);
-  }
-
-  /**
-   * Refresh the in-memory set of variables. Useful after a page request is made
-   * that changes a variable in a different thread.
-   *
-   * In other words calling a settings page with $this->drupalPost() with a changed
-   * value would update a variable to reflect that change, but in the thread that
-   * made the call (thread running the test) the changed variable would not be
-   * picked up.
-   *
-   * This method clears the variables cache and loads a fresh copy from the database
-   * to ensure that the most up-to-date set of variables is loaded.
-   */
-  protected function refreshVariables() {
-    global $conf;
-    cache_clear_all('variables', 'cache');
-    $conf = variable_init();
-  }
-
-  /**
-   * Delete created files and temporary files directory, delete the tables created by setUp(),
-   * and reset the database prefix.
-   */
-  protected function tearDown() {
-    global $db_prefix, $user, $language;
-
-    // In case a fatal error occured that was not in the test process read the
-    // log to pick up any fatal errors.
-    $db_prefix_temp = $db_prefix;
-    $db_prefix = $this->originalPrefix;
-    simpletest_log_read($this->testId, $db_prefix, get_class($this), TRUE);
-    $db_prefix = $db_prefix_temp;
-
-    $emailCount = count(variable_get('drupal_test_email_collector', array()));
-    if ($emailCount) {
-      $message = format_plural($emailCount, t('!count e-mail was sent during this test.'), t('!count e-mails were sent during this test.'), array('!count' => $emailCount));
-      $this->pass($message, t('E-mail'));
-    }
-
-    if (preg_match('/simpletest\d+/', $db_prefix)) {
-      // Delete temporary files directory.
-      simpletest_clean_temporary_directory(file_directory_path());
-
-      // Remove all prefixed tables (all the tables in the schema).
-      $schema = drupal_get_schema(NULL, TRUE);
-      $ret = array();
-      foreach ($schema as $name => $table) {
-        db_drop_table($ret, $name);
-      }
-
-      // Return the database prefix to the original.
-      $db_prefix = $this->originalPrefix;
-
-      // Return the user to the original one.
-      $user = $this->originalUser;
-      session_save_session(TRUE);
-
-      // Bring back default language. (Drupal 6)
-      if (module_exists('locale')) {
-        drupal_init_language();
-        locale(NULL, NULL, TRUE);
-      }
-
-      // Ensure that internal logged in variable and cURL options are reset.
-      $this->loggedInUser = FALSE;
-      $this->additionalCurlOptions = array();
-
-      // Reload module list and implementations to ensure that test module hooks
-      // aren't called after tests.
-      module_list(TRUE);
-      module_implements('', '', TRUE);
-
-      // Rebuild caches.
-      $this->refreshVariables();
-
-      // Close the CURL handler.
-      $this->curlClose();
-    }
-  }
-
-  /**
-   * Initializes the cURL connection.
-   *
-   * If the simpletest_httpauth_credentials variable is set, this function will
-   * add HTTP authentication headers. This is necessary for testing sites that
-   * are protected by login credentials from public access.
-   * See the description of $curl_options for other options.
-   */
-  protected function curlInitialize() {
-    global $base_url, $db_prefix;
-
-    if (!isset($this->curlHandle)) {
-      $this->curlHandle = curl_init();
-      $curl_options = $this->additionalCurlOptions + array(
-        CURLOPT_COOKIEJAR => $this->cookieFile,
-        CURLOPT_URL => $base_url,
-        CURLOPT_FOLLOWLOCATION => TRUE,
-        CURLOPT_MAXREDIRS => 5,
-        CURLOPT_RETURNTRANSFER => TRUE,
-        CURLOPT_SSL_VERIFYPEER => FALSE, // Required to make the tests run on https.
-        CURLOPT_SSL_VERIFYHOST => FALSE, // Required to make the tests run on https.
-        CURLOPT_HEADERFUNCTION => array(&$this, 'curlHeaderCallback'),
-      );
-      if (isset($this->httpauth_credentials)) {
-        $curl_options[CURLOPT_USERPWD] = $this->httpauth_credentials;
-      }
-      curl_setopt_array($this->curlHandle, $this->additionalCurlOptions + $curl_options);
-
-      // By default, the child session name should be the same as the parent.
-      $this->session_name = session_name();
-    }
-    // We set the user agent header on each request so as to use the current
-    // time and a new uniqid.
-    if (preg_match('/simpletest\d+/', $db_prefix, $matches)) {
-      curl_setopt($this->curlHandle, CURLOPT_USERAGENT, drupal_generate_test_ua($matches[0]));
-    }
-  }
-
-  /**
-   * Performs a cURL exec with the specified options after calling curlConnect().
-   *
-   * @param $curl_options
-   *   Custom cURL options.
-   * @return
-   *   Content returned from the exec.
-   */
-  protected function curlExec($curl_options) {
-    $this->curlInitialize();
-    $url = empty($curl_options[CURLOPT_URL]) ? curl_getinfo($this->curlHandle, CURLINFO_EFFECTIVE_URL) : $curl_options[CURLOPT_URL];
-    if (!empty($curl_options[CURLOPT_POST])) {
-      // This is a fix for the Curl library to prevent Expect: 100-continue
-      // headers in POST requests, that may cause unexpected HTTP response
-      // codes from some webservers (like lighttpd that returns a 417 error
-      // code). It is done by setting an empty "Expect" header field that is
-      // not overwritten by Curl.
-      $curl_options[CURLOPT_HTTPHEADER][] = 'Expect:';
-    }
-    curl_setopt_array($this->curlHandle, $this->additionalCurlOptions + $curl_options);
-
-    // Reset headers and the session ID.
-    $this->session_id = NULL;
-    $this->headers = array();
-
-    $this->drupalSetContent(curl_exec($this->curlHandle), curl_getinfo($this->curlHandle, CURLINFO_EFFECTIVE_URL));
-    $message_vars = array(
-      '!method' => !empty($curl_options[CURLOPT_NOBODY]) ? 'HEAD' : (empty($curl_options[CURLOPT_POSTFIELDS]) ? 'GET' : 'POST'),
-      '@url' => $url,
-      '@status' => curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE),
-      '!length' => format_size(strlen($this->content))
-    );
-    $message = t('!method @url returned @status (!length).', $message_vars);
-    $this->assertTrue($this->content !== FALSE, $message, t('Browser'));
-    return $this->drupalGetContent();
-  }
-
-  /**
-   * Reads headers and registers errors received from the tested site.
-   *
-   * @see _drupal_log_error().
-   *
-   * @param $curlHandler
-   *   The cURL handler.
-   * @param $header
-   *   An header.
-   */
-  protected function curlHeaderCallback($curlHandler, $header) {
-    $this->headers[] = $header;
-
-    // Errors are being sent via X-Drupal-Assertion-* headers,
-    // generated by _drupal_log_error() in the exact form required
-    // by DrupalWebTestCase::error().
-    if (preg_match('/^X-Drupal-Assertion-[0-9]+: (.*)$/', $header, $matches)) {
-      // Call DrupalWebTestCase::error() with the parameters from the header.
-      call_user_func_array(array(&$this, 'error'), unserialize(urldecode($matches[1])));
-    }
-
-    // Save the session cookie, if set.
-    if (preg_match('/^Set-Cookie: ' . preg_quote($this->session_name) . '=([a-z90-9]+)/', $header, $matches)) {
-      if ($matches[1] != 'deleted') {
-        $this->session_id = $matches[1];
-      }
-      else {
-        $this->session_id = NULL;
-      }
-    }
-
-    // This is required by cURL.
-    return strlen($header);
-  }
-
-  /**
-   * Close the cURL handler and unset the handler.
-   */
-  protected function curlClose() {
-    if (isset($this->curlHandle)) {
-      curl_close($this->curlHandle);
-      unset($this->curlHandle);
-    }
-  }
-
-  /**
-   * Parse content returned from curlExec using DOM and SimpleXML.
-   *
-   * @return
-   *   A SimpleXMLElement or FALSE on failure.
-   */
-  protected function parse() {
-    if (!$this->elements) {
-      // DOM can load HTML soup. But, HTML soup can throw warnings, suppress
-      // them.
-      @$htmlDom = DOMDocument::loadHTML($this->content);
-      if ($htmlDom) {
-        $this->pass(t('Valid HTML found on "@path"', array('@path' => $this->getUrl())), t('Browser'));
-        // It's much easier to work with simplexml than DOM, luckily enough
-        // we can just simply import our DOM tree.
-        $this->elements = simplexml_import_dom($htmlDom);
-      }
-    }
-    if (!$this->elements) {
-      $this->fail(t('Parsed page successfully.'), t('Browser'));
-    }
-
-    return $this->elements;
-  }
-
-  /**
-   * Retrieves a Drupal path or an absolute path.
-   *
-   * @param $path
-   *   Drupal path or URL to load into internal browser
-   * @param $options
-   *   Options to be forwarded to url().
-   * @param $headers
-   *   An array containing additional HTTP request headers, each formatted as
-   *   "name: value".
-   * @return
-   *   The retrieved HTML string, also available as $this->drupalGetContent()
-   */
-  protected function drupalGet($path, array $options = array(), array $headers = array()) {
-    $options['absolute'] = TRUE;
-
-    // We re-using a CURL connection here. If that connection still has certain
-    // options set, it might change the GET into a POST. Make sure we clear out
-    // previous options.
-    $out = $this->curlExec(array(CURLOPT_HTTPGET => TRUE, CURLOPT_URL => url($path, $options), CURLOPT_NOBODY => FALSE, CURLOPT_HTTPHEADER => $headers));
-    $this->refreshVariables(); // Ensure that any changes to variables in the other thread are picked up.
-
-    // Replace original page output with new output from redirected page(s).
-    if (($new = $this->checkForMetaRefresh())) {
-      $out = $new;
-    }
-    $this->verbose('GET request to: ' . $path .
-                   '<hr />Ending URL: ' . $this->getUrl() .
-                   '<hr />' . $out);
-    return $out;
-  }
-
-  /**
-   * Execute a POST request on a Drupal page.
-   * It will be done as usual POST request with SimpleBrowser.
-   *
-   * @param $path
-   *   Location of the post form. Either a Drupal path or an absolute path or
-   *   NULL to post to the current page. For multi-stage forms you can set the
-   *   path to NULL and have it post to the last received page. Example:
-   *
-   *   // First step in form.
-   *   $edit = array(...);
-   *   $this->drupalPost('some_url', $edit, t('Save'));
-   *
-   *   // Second step in form.
-   *   $edit = array(...);
-   *   $this->drupalPost(NULL, $edit, t('Save'));
-   * @param  $edit
-   *   Field data in an associative array. Changes the current input fields
-   *   (where possible) to the values indicated. A checkbox can be set to
-   *   TRUE to be checked and FALSE to be unchecked. Note that when a form
-   *   contains file upload fields, other fields cannot start with the '@'
-   *   character.
-   *
-   *   Multiple select fields can be set using name[] and setting each of the
-   *   possible values. Example:
-   *   $edit = array();
-   *   $edit['name[]'] = array('value1', 'value2');
-   * @param $submit
-   *   Value of the submit button.
-   * @param $options
-   *   Options to be forwarded to url().
-   * @param $headers
-   *   An array containing additional HTTP request headers, each formatted as
-   *   "name: value".
-   */
-  protected function drupalPost($path, $edit, $submit, array $options = array(), array $headers = array()) {
-    $submit_matches = FALSE;
-    if (isset($path)) {
-      $html = $this->drupalGet($path, $options);
-    }
-    if ($this->parse()) {
-      $edit_save = $edit;
-      // Let's iterate over all the forms.
-      $forms = $this->xpath('//form');
-      foreach ($forms as $form) {
-        // We try to set the fields of this form as specified in $edit.
-        $edit = $edit_save;
-        $post = array();
-        $upload = array();
-        $submit_matches = $this->handleForm($post, $edit, $upload, $submit, $form);
-        $action = isset($form['action']) ? $this->getAbsoluteUrl($form['action']) : $this->getUrl();
-
-        // We post only if we managed to handle every field in edit and the
-        // submit button matches.
-        if (!$edit && $submit_matches) {
-          $post_array = $post;
-          if ($upload) {
-            // TODO: cURL handles file uploads for us, but the implementation
-            // is broken. This is a less than elegant workaround. Alternatives
-            // are being explored at #253506.
-            foreach ($upload as $key => $file) {
-              $file = realpath($file);
-              if ($file && is_file($file)) {
-                $post[$key] = '@' . $file;
-              }
-            }
-          }
-          else {
-            foreach ($post as $key => $value) {
-              // Encode according to application/x-www-form-urlencoded
-              // Both names and values needs to be urlencoded, according to
-              // http://www.w3.org/TR/html4/interact/forms.html#h-17.13.4.1
-              $post[$key] = urlencode($key) . '=' . urlencode($value);
-            }
-            $post = implode('&', $post);
-          }
-          $out = $this->curlExec(array(CURLOPT_URL => $action, CURLOPT_POST => TRUE, CURLOPT_POSTFIELDS => $post, CURLOPT_HTTPHEADER => $headers));
-          // Ensure that any changes to variables in the other thread are picked up.
-          $this->refreshVariables();
-
-          // Replace original page output with new output from redirected page(s).
-          if (($new = $this->checkForMetaRefresh())) {
-            $out = $new;
-          }
-          $this->verbose('POST request to: ' . $path .
-                         '<hr />Ending URL: ' . $this->getUrl() .
-                         '<hr />Fields: ' . highlight_string('<?php ' . var_export($post_array, TRUE), TRUE) .
-                         '<hr />' . $out);
-          return $out;
-        }
-      }
-      // We have not found a form which contained all fields of $edit.
-      foreach ($edit as $name => $value) {
-        $this->fail(t('Failed to set field @name to @value', array('@name' => $name, '@value' => $value)));
-      }
-      $this->assertTrue($submit_matches, t('Found the @submit button', array('@submit' => $submit)));
-      $this->fail(t('Found the requested form fields at @path', array('@path' => $path)));
-    }
-  }
-
-  /**
-   * Check for meta refresh tag and if found call drupalGet() recursively. This
-   * function looks for the http-equiv attribute to be set to "Refresh"
-   * and is case-sensitive.
-   *
-   * @return
-   *   Either the new page content or FALSE.
-   */
-  protected function checkForMetaRefresh() {
-    if ($this->drupalGetContent() != '' && $this->parse()) {
-      $refresh = $this->xpath('//meta[@http-equiv="Refresh"]');
-      if (!empty($refresh)) {
-        // Parse the content attribute of the meta tag for the format:
-        // "[delay]: URL=[page_to_redirect_to]".
-        if (preg_match('/\d+;\s*URL=(?P<url>.*)/i', $refresh[0]['content'], $match)) {
-          return $this->drupalGet($this->getAbsoluteUrl(decode_entities($match['url'])));
-        }
-      }
-    }
-    return FALSE;
-  }
-
-  /**
-   * Retrieves only the headers for a Drupal path or an absolute path.
-   *
-   * @param $path
-   *   Drupal path or URL to load into internal browser
-   * @param $options
-   *   Options to be forwarded to url().
-   * @param $headers
-   *   An array containing additional HTTP request headers, each formatted as
-   *   "name: value".
-   * @return
-   *   The retrieved headers, also available as $this->drupalGetContent()
-   */
-  protected function drupalHead($path, array $options = array(), array $headers = array()) {
-    $options['absolute'] = TRUE;
-    $out = $this->curlExec(array(CURLOPT_NOBODY => TRUE, CURLOPT_URL => url($path, $options), CURLOPT_HTTPHEADER => $headers));
-    $this->refreshVariables(); // Ensure that any changes to variables in the other thread are picked up.
-    return $out;
-  }
-
-  /**
-   * Handle form input related to drupalPost(). Ensure that the specified fields
-   * exist and attempt to create POST data in the correct manner for the particular
-   * field type.
-   *
-   * @param $post
-   *   Reference to array of post values.
-   * @param $edit
-   *   Reference to array of edit values to be checked against the form.
-   * @param $submit
-   *   Form submit button value.
-   * @param $form
-   *   Array of form elements.
-   * @return
-   *   Submit value matches a valid submit input in the form.
-   */
-  protected function handleForm(&$post, &$edit, &$upload, $submit, $form) {
-    // Retrieve the form elements.
-    $elements = $form->xpath('.//input|.//textarea|.//select');
-    $submit_matches = FALSE;
-    foreach ($elements as $element) {
-      // SimpleXML objects need string casting all the time.
-      $name = (string) $element['name'];
-      // This can either be the type of <input> or the name of the tag itself
-      // for <select> or <textarea>.
-      $type = isset($element['type']) ? (string)$element['type'] : $element->getName();
-      $value = isset($element['value']) ? (string)$element['value'] : '';
-      $done = FALSE;
-      if (isset($edit[$name])) {
-        switch ($type) {
-          case 'text':
-          case 'textarea':
-          case 'password':
-            $post[$name] = $edit[$name];
-            unset($edit[$name]);
-            break;
-          case 'radio':
-            if ($edit[$name] == $value) {
-              $post[$name] = $edit[$name];
-              unset($edit[$name]);
-            }
-            break;
-          case 'checkbox':
-            // To prevent checkbox from being checked.pass in a FALSE,
-            // otherwise the checkbox will be set to its value regardless
-            // of $edit.
-            if ($edit[$name] === FALSE) {
-              unset($edit[$name]);
-              continue 2;
-            }
-            else {
-              unset($edit[$name]);
-              $post[$name] = $value;
-            }
-            break;
-          case 'select':
-            $new_value = $edit[$name];
-            $index = 0;
-            $key = preg_replace('/\[\]$/', '', $name);
-            $options = $this->getAllOptions($element);
-            foreach ($options as $option) {
-              if (is_array($new_value)) {
-                $option_value= (string)$option['value'];
-                if (in_array($option_value, $new_value)) {
-                  $post[$key . '[' . $index++ . ']'] = $option_value;
-                  $done = TRUE;
-                  unset($edit[$name]);
-                }
-              }
-              elseif ($new_value == $option['value']) {
-                $post[$name] = $new_value;
-                unset($edit[$name]);
-                $done = TRUE;
-              }
-            }
-            break;
-          case 'file':
-            $upload[$name] = $edit[$name];
-            unset($edit[$name]);
-            break;
-        }
-      }
-      if (!isset($post[$name]) && !$done) {
-        switch ($type) {
-          case 'textarea':
-            $post[$name] = (string)$element;
-            break;
-          case 'select':
-            $single = empty($element['multiple']);
-            $first = TRUE;
-            $index = 0;
-            $key = preg_replace('/\[\]$/', '', $name);
-            $options = $this->getAllOptions($element);
-            foreach ($options as $option) {
-              // For single select, we load the first option, if there is a
-              // selected option that will overwrite it later.
-              if ($option['selected'] || ($first && $single)) {
-                $first = FALSE;
-                if ($single) {
-                  $post[$name] = (string)$option['value'];
-                }
-                else {
-                  $post[$key . '[' . $index++ . ']'] = (string)$option['value'];
-                }
-              }
-            }
-            break;
-          case 'file':
-            break;
-          case 'submit':
-          case 'image':
-            if ($submit == $value) {
-              $post[$name] = $value;
-              $submit_matches = TRUE;
-            }
-            break;
-          case 'radio':
-          case 'checkbox':
-            if (!isset($element['checked'])) {
-              break;
-            }
-            // Deliberate no break.
-          default:
-            $post[$name] = $value;
-        }
-      }
-    }
-    return $submit_matches;
-  }
-
-  /**
-   * Perform an xpath search on the contents of the internal browser. The search
-   * is relative to the root element (HTML tag normally) of the page.
-   *
-   * @param $xpath
-   *   The xpath string to use in the search.
-   * @return
-   *   The return value of the xpath search. For details on the xpath string
-   *   format and return values see the SimpleXML documentation,
-   *   http://us.php.net/manual/function.simplexml-element-xpath.php.
-   */
-  protected function xpath($xpath) {
-    if ($this->parse()) {
-      return $this->elements->xpath($xpath);
-    }
-    return FALSE;
-  }
-
-  /**
-   * Get all option elements, including nested options, in a select.
-   *
-   * @param $element
-   *   The element for which to get the options.
-   * @return
-   *   Option elements in select.
-   */
-  protected function getAllOptions(SimpleXMLElement $element) {
-    $options = array();
-    // Add all options items.
-    foreach ($element->option as $option) {
-      $options[] = $option;
-    }
-
-    // Search option group children.
-    if (isset($element->optgroup)) {
-      foreach ($element->optgroup as $group) {
-        $options = array_merge($options, $this->getAllOptions($group));
-      }
-    }
-    return $options;
-  }
-
-  /**
-   * Pass if a link with the specified label is found, and optional with the
-   * specified index.
-   *
-   * @param $label
-   *   Text between the anchor tags.
-   * @param $index
-   *   Link position counting from zero.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
-   * @return
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertLink($label, $index = 0, $message = '', $group = 'Other') {
-    $links = $this->xpath('//a[text()="' . $label . '"]');
-    $message = ($message ?  $message : t('Link with label "!label" found.', array('!label' => $label)));
-    return $this->assert(isset($links[$index]), $message, $group);
-  }
-
-  /**
-   * Pass if a link with the specified label is not found.
-   *
-   * @param $label
-   *   Text between the anchor tags.
-   * @param $index
-   *   Link position counting from zero.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
-   * @return
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertNoLink($label, $message = '', $group = 'Other') {
-    $links = $this->xpath('//a[text()="' . $label . '"]');
-    $message = ($message ?  $message : t('Link with label "!label" not found.', array('!label' => $label)));
-    return $this->assert(empty($links), $message, $group);
-  }
-
-  /**
-   * Follows a link by name.
-   *
-   * Will click the first link found with this link text by default, or a
-   * later one if an index is given. Match is case insensitive with
-   * normalized space. The label is translated label. There is an assert
-   * for successful click.
-   *
-   * @param $label
-   *   Text between the anchor tags.
-   * @param $index
-   *   Link position counting from zero.
-   * @return
-   *   Page on success, or FALSE on failure.
-   */
-  protected function clickLink($label, $index = 0) {
-    $url_before = $this->getUrl();
-    $urls = $this->xpath('//a[text()="' . $label . '"]');
-
-    if (isset($urls[$index])) {
-      $url_target = $this->getAbsoluteUrl($urls[$index]['href']);
-    }
-
-    $this->assertTrue(isset($urls[$index]), t('Clicked link "!label" (!url_target) from !url_before', array('!label' => $label, '!url_target' => $url_target, '!url_before' => $url_before)), t('Browser'));
-
-    if (isset($urls[$index])) {
-      return $this->drupalGet($url_target);
-    }
-    return FALSE;
-  }
-
-  /**
-   * Takes a path and returns an absolute path.
-   *
-   * @param $path
-   *   The path, can be a Drupal path or a site-relative path. It might have a
-   *   query, too. Can even be an absolute path which is just passed through.
-   * @return
-   *   An absolute path.
-   */
-  protected function getAbsoluteUrl($path) {
-    $options = array('absolute' => TRUE);
-    $parts = parse_url($path);
-    // This is more crude than the menu_is_external but enough here.
-    if (empty($parts['host'])) {
-      $path = $parts['path'];
-      $base_path = base_path();
-      $n = strlen($base_path);
-      if (substr($path, 0, $n) == $base_path) {
-        $path = substr($path, $n);
-      }
-      if (isset($parts['query'])) {
-        $options['query'] = $parts['query'];
-      }
-      $path = url($path, $options);
-    }
-    return $path;
-  }
-
-  /**
-   * Get the current url from the cURL handler.
-   *
-   * @return
-   *   The current url.
-   */
-  protected function getUrl() {
-    return $this->url;
-  }
-
-  /**
-   * Gets the HTTP response headers of the requested page. Normally we are only
-   * interested in the headers returned by the last request. However, if a page
-   * is redirected or HTTP authentication is in use, multiple requests will be
-   * required to retrieve the page. Headers from all requests may be requested
-   * by passing TRUE to this function.
-   *
-   * @param $all_requests
-   *   Boolean value specifying whether to return headers from all requests
-   *   instead of just the last request. Defaults to FALSE.
-   * @return
-   *   A name/value array if headers from only the last request are requested.
-   *   If headers from all requests are requested, an array of name/value
-   *   arrays, one for each request.
-   *
-   *   The pseudonym ":status" is used for the HTTP status line.
-   *
-   *   Values for duplicate headers are stored as a single comma-separated list.
-   */
-  protected function drupalGetHeaders($all_requests = FALSE) {
-    $request = 0;
-    $headers = array($request => array());
-    foreach ($this->headers as $header) {
-      $header = trim($header);
-      if ($header === '') {
-        $request++;
-      }
-      else {
-        if (strpos($header, 'HTTP/') === 0) {
-          $name = ':status';
-          $value = $header;
-        }
-        else {
-          list($name, $value) = explode(':', $header, 2);
-          $name = strtolower($name);
-        }
-        if (isset($headers[$request][$name])) {
-          $headers[$request][$name] .= ',' . trim($value);
-        }
-        else {
-          $headers[$request][$name] = trim($value);
-        }
-      }
-    }
-    if (!$all_requests) {
-      $headers = array_pop($headers);
-    }
-    return $headers;
-  }
-
-  /**
-   * Gets the value of an HTTP response header. If multiple requests were
-   * required to retrieve the page, only the headers from the last request will
-   * be checked by default. However, if TRUE is passed as the second argument,
-   * all requests will be processed from last to first until the header is
-   * found.
-   *
-   * @param $name
-   *   The name of the header to retrieve. Names are case-insensitive (see RFC
-   *   2616 section 4.2).
-   * @param $all_requests
-   *   Boolean value specifying whether to check all requests if the header is
-   *   not found in the last request. Defaults to FALSE.
-   * @return
-   *   The HTTP header value or FALSE if not found.
-   */
-  protected function drupalGetHeader($name, $all_requests = FALSE) {
-    $name = strtolower($name);
-    $header = FALSE;
-    if ($all_requests) {
-      foreach (array_reverse($this->drupalGetHeaders(TRUE)) as $headers) {
-        if (isset($headers[$name])) {
-          $header = $headers[$name];
-          break;
-        }
-      }
-    }
-    else {
-      $headers = $this->drupalGetHeaders();
-      if (isset($headers[$name])) {
-        $header = $headers[$name];
-      }
-    }
-    return $header;
-  }
-
-  /**
-   * Gets the current raw HTML of requested page.
-   */
-  protected function drupalGetContent() {
-    return $this->content;
-  }
-
-  /**
-   * Gets an array containing all e-mails sent during this test case.
-   *
-   * @param $filter
-   *   An array containing key/value pairs used to filter the e-mails that are returned.
-   * @return
-   *   An array containing e-mail messages captured during the current test.
-   */
-  protected function drupalGetMails($filter = array()) {
-    $captured_emails = variable_get('drupal_test_email_collector', array());
-    $filtered_emails = array();
-
-    foreach ($captured_emails as $message) {
-      foreach ($filter as $key => $value) {
-        if (!isset($message['params'][$key]) || $message['params'][$key] != $value) {
-          continue 2;
-        }
-      }
-      $filtered_emails[] = $message;
-    }
-
-    return $filtered_emails;
-  }
-
-  /**
-   * Sets the raw HTML content. This can be useful when a page has been fetched
-   * outside of the internal browser and assertions need to be made on the
-   * returned page.
-   *
-   * A good example would be when testing drupal_http_request(). After fetching
-   * the page the content can be set and page elements can be checked to ensure
-   * that the function worked properly.
-   */
-  protected function drupalSetContent($content, $url = 'internal:') {
-    $this->content = $content;
-    $this->url = $url;
-    $this->plainTextContent = FALSE;
-    $this->elements = FALSE;
-  }
-
-  /**
-   * Pass if the raw text IS found on the loaded page, fail otherwise. Raw text
-   * refers to the raw HTML that the page generated.
-   *
-   * @param $raw
-   *   Raw (HTML) string to look for.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertRaw($raw, $message = '', $group = 'Other') {
-    if (!$message) {
-      $message = t('Raw "@raw" found', array('@raw' => check_plain($raw)));
-    }
-    return $this->assert(strpos($this->content, $raw) !== FALSE, $message, $group);
-  }
-
-  /**
-   * Pass if the raw text is NOT found on the loaded page, fail otherwise. Raw text
-   * refers to the raw HTML that the page generated.
-   *
-   * @param $raw
-   *   Raw (HTML) string to look for.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertNoRaw($raw, $message = '', $group = 'Other') {
-    if (!$message) {
-      $message = t('Raw "@raw" not found', array('@raw' => check_plain($raw)));
-    }
-    return $this->assert(strpos($this->content, $raw) === FALSE, $message, $group);
-  }
-
-  /**
-   * Pass if the text IS found on the text version of the page. The text version
-   * is the equivalent of what a user would see when viewing through a web browser.
-   * In other words the HTML has been filtered out of the contents.
-   *
-   * @param $text
-   *   Plain text to look for.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertText($text, $message = '', $group = 'Other') {
-    return $this->assertTextHelper($text, $message, $group, FALSE);
-  }
-
-  /**
-   * Pass if the text is NOT found on the text version of the page. The text version
-   * is the equivalent of what a user would see when viewing through a web browser.
-   * In other words the HTML has been filtered out of the contents.
-   *
-   * @param $text
-   *   Plain text to look for.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertNoText($text, $message = '', $group = 'Other') {
-    return $this->assertTextHelper($text, $message, $group, TRUE);
-  }
-
-  /**
-   * Helper for assertText and assertNoText.
-   *
-   * It is not recommended to call this function directly.
-   *
-   * @param $text
-   *   Plain text to look for.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to.
-   * @param $not_exists
-   *   TRUE if this text should not exist, FALSE if it should.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertTextHelper($text, $message, $group, $not_exists) {
-    if ($this->plainTextContent === FALSE) {
-      $this->plainTextContent = filter_xss($this->content, array());
-    }
-    if (!$message) {
-      $message = !$not_exists ? t('"@text" found', array('@text' => $text)) : t('"@text" not found', array('@text' => $text));
-    }
-    return $this->assert($not_exists == (strpos($this->plainTextContent, $text) === FALSE), $message, $group);
-  }
-
-  /**
-   * Pass if the text is found ONLY ONCE on the text version of the page.
-   *
-   * The text version is the equivalent of what a user would see when viewing
-   * through a web browser. In other words the HTML has been filtered out of
-   * the contents.
-   *
-   * @param $text
-   *   Plain text to look for.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertUniqueText($text, $message = '', $group = 'Other') {
-    return $this->assertUniqueTextHelper($text, $message, $group, TRUE);
-  }
-
-  /**
-   * Pass if the text is found MORE THAN ONCE on the text version of the page.
-   *
-   * The text version is the equivalent of what a user would see when viewing
-   * through a web browser. In other words the HTML has been filtered out of
-   * the contents.
-   *
-   * @param $text
-   *   Plain text to look for.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to, defaults to 'Other'.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertNoUniqueText($text, $message = '', $group = 'Other') {
-    return $this->assertUniqueTextHelper($text, $message, $group, FALSE);
-  }
-
-  /**
-   * Helper for assertUniqueText and assertNoUniqueText.
-   *
-   * It is not recommended to call this function directly.
-   *
-   * @param $text
-   *   Plain text to look for.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to.
-   * @param $be_unique
-   *   TRUE if this text should be found only once, FALSE if it should be found more than once.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertUniqueTextHelper($text, $message, $group, $be_unique) {
-    if ($this->plainTextContent === FALSE) {
-      $this->plainTextContent = filter_xss($this->content, array());
-    }
-    if (!$message) {
-      $message = '"' . $text . '"' . ($be_unique ? ' found only once' : ' found more than once');
-    }
-    $first_occurance = strpos($this->plainTextContent, $text);
-    if ($first_occurance === FALSE) {
-      return $this->assert(FALSE, $message, $group);
-    }
-    $offset = $first_occurance + strlen($text);
-    $second_occurance = strpos($this->plainTextContent, $text, $offset);
-    return $this->assert($be_unique == ($second_occurance === FALSE), $message, $group);
-  }
-
-  /**
-   * Will trigger a pass if the Perl regex pattern is found in the raw content.
-   *
-   * @param $pattern
-   *   Perl regex to look for including the regex delimiters.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertPattern($pattern, $message = '', $group = 'Other') {
-    if (!$message) {
-      $message = t('Pattern "@pattern" found', array('@pattern' => $pattern));
-    }
-    return $this->assert((bool) preg_match($pattern, $this->drupalGetContent()), $message, $group);
-  }
-
-  /**
-   * Will trigger a pass if the perl regex pattern is not present in raw content.
-   *
-   * @param $pattern
-   *   Perl regex to look for including the regex delimiters.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertNoPattern($pattern, $message = '', $group = 'Other') {
-    if (!$message) {
-      $message = t('Pattern "@pattern" not found', array('@pattern' => $pattern));
-    }
-    return $this->assert(!preg_match($pattern, $this->drupalGetContent()), $message, $group);
-  }
-
-  /**
-   * Pass if the page title is the given string.
-   *
-   * @param $title
-   *   The string the title should be.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertTitle($title, $message, $group = 'Other') {
-    return $this->assertEqual(current($this->xpath('//title')), $title, $message, $group);
-  }
-
-  /**
-   * Pass if the page title is not the given string.
-   *
-   * @param $title
-   *   The string the title should not be.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertNoTitle($title, $message, $group = 'Other') {
-    return $this->assertNotEqual(current($this->xpath('//title')), $title, $message, $group);
-  }
-
-  /**
-   * Assert that a field exists in the current page by the given XPath.
-   *
-   * @param $xpath
-   *   XPath used to find the field.
-   * @param $value
-   *   Value of the field to assert.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertFieldByXPath($xpath, $value, $message, $group = 'Other') {
-    $fields = $this->xpath($xpath);
-
-    // If value specified then check array for match.
-    $found = TRUE;
-    if ($value) {
-      $found = FALSE;
-      if ($fields) {
-        foreach ($fields as $field) {
-          if (isset($field['value']) && $field['value'] == $value) {
-            // Input element with correct value.
-            $found = TRUE;
-          }
-          elseif (isset($field->option)) {
-            // Select element found.
-            if ($this->getSelectedItem($field) == $value) {
-              $found = TRUE;
-            }
-            else {
-              // No item selected so use first item.
-              $items = $this->getAllOptions($field);
-              if (!empty($items) && $items[0]['value'] == $value) {
-                $found = TRUE;
-              }
-            }
-          }
-          elseif ((string) $field == $value) {
-            // Text area with correct text.
-            $found = TRUE;
-          }
-        }
-      }
-    }
-    return $this->assertTrue($fields && $found, $message, $group);
-  }
-
-  /**
-   * Get the selected value from a select field.
-   *
-   * @param $element
-   *   SimpleXMLElement select element.
-   * @return
-   *   The selected value or FALSE.
-   */
-  protected function getSelectedItem(SimpleXMLElement $element) {
-    foreach ($element->children() as $item) {
-      if (isset($item['selected'])) {
-        return $item['value'];
-      }
-      elseif ($item->getName() == 'optgroup') {
-        if ($value = $this->getSelectedItem($item)) {
-          return $value;
-        }
-      }
-    }
-    return FALSE;
-  }
-
-  /**
-   * Assert that a field does not exist in the current page by the given XPath.
-   *
-   * @param $xpath
-   *   XPath used to find the field.
-   * @param $value
-   *   Value of the field to assert.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertNoFieldByXPath($xpath, $value, $message, $group = 'Other') {
-    $fields = $this->xpath($xpath);
-
-    // If value specified then check array for match.
-    $found = TRUE;
-    if ($value) {
-      $found = FALSE;
-      if ($fields) {
-        foreach ($fields as $field) {
-          if ($field['value'] == $value) {
-            $found = TRUE;
-          }
-        }
-      }
-    }
-    return $this->assertFalse($fields && $found, $message, $group);
-  }
-
-  /**
-   * Assert that a field exists in the current page with the given name and value.
-   *
-   * @param $name
-   *   Name of field to assert.
-   * @param $value
-   *   Value of the field to assert.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertFieldByName($name, $value = '', $message = '') {
-    return $this->assertFieldByXPath($this->constructFieldXpath('name', $name), $value, $message ? $message : t('Found field by name @name', array('@name' => $name)), t('Browser'));
-  }
-
-  /**
-   * Assert that a field does not exist with the given name and value.
-   *
-   * @param $name
-   *   Name of field to assert.
-   * @param $value
-   *   Value of the field to assert.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertNoFieldByName($name, $value = '', $message = '') {
-    return $this->assertNoFieldByXPath($this->constructFieldXpath('name', $name), $value, $message ? $message : t('Did not find field by name @name', array('@name' => $name)), t('Browser'));
-  }
-
-  /**
-   * Assert that a field exists in the current page with the given id and value.
-   *
-   * @param $id
-   *   Id of field to assert.
-   * @param $value
-   *   Value of the field to assert.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertFieldById($id, $value = '', $message = '') {
-    return $this->assertFieldByXPath($this->constructFieldXpath('id', $id), $value, $message ? $message : t('Found field by id @id', array('@id' => $id)), t('Browser'));
-  }
-
-  /**
-   * Assert that a field does not exist with the given id and value.
-   *
-   * @param $id
-   *   Id of field to assert.
-   * @param $value
-   *   Value of the field to assert.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertNoFieldById($id, $value = '', $message = '') {
-    return $this->assertNoFieldByXPath($this->constructFieldXpath('id', $id), $value, $message ? $message : t('Did not find field by id @id', array('@id' => $id)), t('Browser'));
-  }
-
-  /**
-   * Assert that a checkbox field in the current page is checked.
-   *
-   * @param $id
-   *   Id of field to assert.
-   * @param $message
-   *   Message to display.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertFieldChecked($id, $message = '') {
-    $elements = $this->xpath('//input[@id="' . $id . '"]');
-    return $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), $message ? $message : t('Checkbox field @id is checked.', array('@id' => $id)), t('Browser'));
-  }
-
-  /**
-   * Assert that a checkbox field in the current page is not checked.
-   *
-   * @param $id
-   *   Id of field to assert.
-   * @param $message
-   *   Message to display.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertNoFieldChecked($id, $message = '') {
-    $elements = $this->xpath('//input[@id="' . $id . '"]');
-    return $this->assertTrue(isset($elements[0]) && empty($elements[0]['checked']), $message ? $message : t('Checkbox field @id is not checked.', array('@id' => $id)), t('Browser'));
-  }
-
-  /**
-   * Assert that a field exists with the given name or id.
-   *
-   * @param $field
-   *   Name or id of field to assert.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertField($field, $message = '', $group = 'Other') {
-    return $this->assertFieldByXPath($this->constructFieldXpath('name', $field) . '|' . $this->constructFieldXpath('id', $field), '', $message, $group);
-  }
-
-  /**
-   * Assert that a field does not exist with the given name or id.
-   *
-   * @param $field
-   *   Name or id of field to assert.
-   * @param $message
-   *   Message to display.
-   * @param $group
-   *   The group this message belongs to.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  protected function assertNoField($field, $message = '', $group = 'Other') {
-    return $this->assertNoFieldByXPath($this->constructFieldXpath('name', $field) . '|' . $this->constructFieldXpath('id', $field), '', $message, $group);
-  }
-
-  /**
-   * Helper function: construct an XPath for the given set of attributes and value.
-   *
-   * @param $attribute
-   *   Field attributes.
-   * @param $value
-   *   Value of field.
-   * @return
-   *   XPath for specified values.
-   */
-  protected function constructFieldXpath($attribute, $value) {
-    return '//textarea[@' . $attribute . '="' . $value . '"]|//input[@' . $attribute . '="' . $value . '"]|//select[@' . $attribute . '="' . $value . '"]';
-  }
-
-  /**
-   * Assert the page responds with the specified response code.
-   *
-   * @param $code
-   *   Response code. For example 200 is a successful page request. For a list
-   *   of all codes see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html.
-   * @param $message
-   *   Message to display.
-   * @return
-   *   Assertion result.
-   */
-  protected function assertResponse($code, $message = '') {
-    $curl_code = curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE);
-    $match = is_array($code) ? in_array($curl_code, $code) : $curl_code == $code;
-    return $this->assertTrue($match, $message ? $message : t('HTTP response expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), t('Browser'));
-  }
-
-  /**
-   * Assert that the most recently sent e-mail message has a field with the given value.
-   *
-   * @param $name
-   *   Name of field or message property to assert. Examples: subject, body, id, ...
-   * @param $value
-   *   Value of the field to assert.
-   * @param $message
-   *   Message to display.
-   * @return
-   *   TRUE on pass, FALSE on fail.
-   */
-  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['params'][$name]) && $email['params'][$name] == $value, $message, t('E-mail'));
-  }
-
-  /**
-   * Log verbose message in a text file.
-   *
-   * The a link to the vebose message will be placed in the test results via
-   * as a passing assertion with the text '[verbose message]'.
-   *
-   * @param $message
-   *   The verbose message to be stored.
-   * @see simpletest_verbose()
-   */
-  protected function verbose($message) {
-    if ($id = simpletest_verbose($message)) {
-      $this->pass(l(t('Verbose message'), $this->originalFileDirectory . '/simpletest/verbose/' . get_class($this) . '-' . $id . '.html', array('attributes' => array('target' => '_blank'))), 'Debug');
-    }
-  }
-
-}
-
-/**
- * Log verbose message in a text file.
- *
- * If verbose mode is enabled then page requests will be dumped to a file and
- * presented on the test result screen. The messages will be placed in a file
- * located in the simpletest directory in the original file system.
- *
- * @param $message
- *   The verbose message to be stored.
- * @param $original_file_directory
- *   The original file directory, before it was changed for testing purposes.
- * @param $test_class
- *   The active test case class.
- * @return
- *   The ID of the message to be placed in related assertion messages.
- * @see DrupalTestCase->originalFileDirectory
- * @see DrupalWebTestCase->verbose()
- */
-function simpletest_verbose($message, $original_file_directory = NULL, $test_class = NULL) {
-  static $file_directory = NULL, $class = NULL, $id = 1;
-  static $verbose;
-
-  // Will pass first time during setup phase, and when verbose is TRUE.
-  if (!isset($original_file_directory) && !$verbose) {
-    return FALSE;
-  }
-
-  if ($message && $file_directory) {
-    $message = '<hr />ID #' . $id . ' (<a href="' . $class . '-' . ($id - 1) . '.html">Previous</a> | <a href="' . $class . '-' . ($id + 1) . '.html">Next</a>)<hr />' . $message;
-    file_put_contents($file_directory . "/simpletest/verbose/$class-$id.html", $message, FILE_APPEND);
-    return $id++;
-  }
-
-  if ($original_file_directory) {
-    $file_directory = $original_file_directory;
-    $class = $test_class;
-    $verbose = variable_get('simpletest_verbose', FALSE);
-    $directory = $file_directory . '/simpletest/verbose';
-    return file_check_directory($directory, FILE_CREATE_DIRECTORY);
-  }
-  return FALSE;
-}

=== removed directory 'modules/simpletest/files'
=== removed file 'modules/simpletest/files/README.txt'
--- modules/simpletest/files/README.txt	2009-09-15 16:10:36 +0000
+++ modules/simpletest/files/README.txt	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-$Id: README.txt,v 1.1.2.3 2009/09/14 23:05:19 boombatower Exp $
-Core: Id: README.txt,v 1.1 2008/04/20 18:23:30 dries Exp
-
-These files are use in some tests that upload files or other operations were
-a file is useful. These files are copied to the files directory as specified
-in the site settings. Other tests files are generated in order to save space.
\ No newline at end of file

=== removed file 'modules/simpletest/files/html-1.txt'
--- modules/simpletest/files/html-1.txt	2009-04-27 17:27:02 +0000
+++ modules/simpletest/files/html-1.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-<h1>SimpleTest HTML</h1>
\ No newline at end of file

=== removed file 'modules/simpletest/files/html-2.html'
--- modules/simpletest/files/html-2.html	2009-04-27 17:27:02 +0000
+++ modules/simpletest/files/html-2.html	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-<h1>SimpleTest HTML</h1>
\ No newline at end of file

=== removed file 'modules/simpletest/files/image-1.png'
Binary files modules/simpletest/files/image-1.png	2009-04-27 17:27:02 +0000 and modules/simpletest/files/image-1.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'modules/simpletest/files/image-2.jpg'
Binary files modules/simpletest/files/image-2.jpg	2009-04-27 17:27:02 +0000 and modules/simpletest/files/image-2.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'modules/simpletest/files/image-test.gif'
Binary files modules/simpletest/files/image-test.gif	2009-04-27 17:27:02 +0000 and modules/simpletest/files/image-test.gif	1970-01-01 00:00:00 +0000 differ
=== removed file 'modules/simpletest/files/image-test.jpg'
Binary files modules/simpletest/files/image-test.jpg	2009-04-27 17:27:02 +0000 and modules/simpletest/files/image-test.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'modules/simpletest/files/image-test.png'
Binary files modules/simpletest/files/image-test.png	2009-04-27 17:27:02 +0000 and modules/simpletest/files/image-test.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'modules/simpletest/files/javascript-1.txt'
--- modules/simpletest/files/javascript-1.txt	2009-04-27 17:27:02 +0000
+++ modules/simpletest/files/javascript-1.txt	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-<script>
-alert('SimpleTest PHP was executed!');
-</script>
\ No newline at end of file

=== removed file 'modules/simpletest/files/javascript-2.script'
--- modules/simpletest/files/javascript-2.script	2009-04-27 17:27:02 +0000
+++ modules/simpletest/files/javascript-2.script	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-<script>
-alert('SimpleTest PHP was executed!');
-</script>
\ No newline at end of file

=== removed file 'modules/simpletest/files/php-1.txt'
--- modules/simpletest/files/php-1.txt	2009-04-27 17:27:02 +0000
+++ modules/simpletest/files/php-1.txt	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-<?php
-print 'SimpleTest PHP was executed!';
-?>
\ No newline at end of file

=== removed file 'modules/simpletest/files/php-2.php'
--- modules/simpletest/files/php-2.php	2009-09-15 16:10:36 +0000
+++ modules/simpletest/files/php-2.php	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-<?php
-print 'SimpleTest PHP was executed!';

=== removed file 'modules/simpletest/files/sql-1.txt'
--- modules/simpletest/files/sql-1.txt	2009-04-27 17:27:02 +0000
+++ modules/simpletest/files/sql-1.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-SELECT invalid_field FROM {invalid_table}
\ No newline at end of file

=== removed file 'modules/simpletest/files/sql-2.sql'
--- modules/simpletest/files/sql-2.sql	2009-04-27 17:27:02 +0000
+++ modules/simpletest/files/sql-2.sql	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-SELECT invalid_field FROM {invalid_table}
\ No newline at end of file

=== removed file 'modules/simpletest/run-tests.sh'
--- modules/simpletest/run-tests.sh	2009-09-11 00:40:07 +0000
+++ modules/simpletest/run-tests.sh	1970-01-01 00:00:00 +0000
@@ -1,590 +0,0 @@
-<?php
-// $Id: run-tests.sh,v 1.1.2.5 2009/09/05 13:34:10 boombatower Exp $
-// Core: Id: run-tests.sh,v 1.35 2009/08/17 19:14:41 webchick Exp
-
-/**
- * @file
- * Backport of Drupal 7 run-tests.sh with modifications, see BACKPORT.txt.
- * This file must be placed in the Drupal scripts folder in order for it to
- * work properly.
- *
- * Copyright 2008-2009 by Jimmy Berry ("boombatower", http://drupal.org/user/214218)
- */
-
-define('SIMPLETEST_SCRIPT_COLOR_PASS', 32); // Green.
-define('SIMPLETEST_SCRIPT_COLOR_FAIL', 31); // Red.
-define('SIMPLETEST_SCRIPT_COLOR_EXCEPTION', 33); // Brown.
-
-// Set defaults and get overrides.
-list($args, $count) = simpletest_script_parse_args();
-
-if ($args['help'] || $count == 0) {
-  simpletest_script_help();
-  exit;
-}
-
-if ($args['execute-batch']) {
-  // Masquerade as Apache for running tests.
-  simpletest_script_init("Apache");
-  simpletest_script_execute_batch();
-}
-else {
-  // Run administrative functions as CLI.
-  simpletest_script_init("PHP CLI");
-}
-
-// Bootstrap to perform initial validation or other operations.
-drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-if (!module_exists('simpletest')) {
-  simpletest_script_print_error("The simpletest module must be enabled before this script can run.");
-  exit;
-}
-
-if ($args['clean']) {
-  // Clean up left-over times and directories.
-  simpletest_clean_environment();
-  echo "\nEnvironment cleaned.\n";
-
-  // Get the status messages and print them.
-  $messages = array_pop(drupal_get_messages('status'));
-  foreach($messages as $text) {
-    echo " - " . $text . "\n";
-  }
-  exit;
-}
-
-// Load SimpleTest files.
-$groups = simpletest_test_get_all();
-$all_tests = array();
-foreach ($groups as $group => $tests) {
-  $all_tests = array_merge($all_tests, array_keys($tests));
-}
-$test_list = array();
-
-if ($args['list']) {
-  // Display all available tests.
-  echo "\nAvailable test groups & classes\n";
-  echo   "-------------------------------\n\n";
-  foreach ($groups as $group => $tests) {
-    echo $group . "\n";
-    foreach ($tests as $class => $info) {
-      echo " - " . $info['name'] . ' (' . $class . ')' . "\n";
-    }
-  }
-  exit;
-}
-
-$test_list = simpletest_script_get_test_list();
-
-// Try to allocate unlimited time to run the tests.
-//drupal_set_time_limit(0);
-if (!ini_get('safe_mode')) {
-  set_time_limit(0);
-}
-
-simpletest_script_reporter_init();
-
-// Setup database for test results.
-//$test_id = db_insert('simpletest_test_id')->useDefaults(array('test_id'))->execute();
-db_query('INSERT INTO {simpletest_test_id} VALUES (default)');
-$test_id = db_last_insert_id('simpletest_test_id', 'test_id');
-
-// Execute tests.
-simpletest_script_command($args['concurrency'], $test_id, implode(",", $test_list));
-
-// Retrieve the last database prefix used for testing and the last test class
-// that was run from. Use the information to read the lgo file in case any
-// fatal errors caused the test to crash.
-list($last_prefix, $last_test_class) = simpletest_last_test_get($test_id);
-simpletest_log_read($test_id, $last_prefix, $last_test_class);
-
-// Display results before database is cleared.
-simpletest_script_reporter_display_results();
-
-// Cleanup our test results.
-simpletest_clean_results_table($test_id);
-
-/**
- * Print help text.
- */
-function simpletest_script_help() {
-  global $args;
-
-  echo <<<EOF
-
-Run Drupal tests from the shell.
-
-Usage:        {$args['script']} [OPTIONS] <tests>
-Example:      {$args['script']} Profile
-
-All arguments are long options.
-
-  --help      Print this page.
-
-  --list      Display all available test groups.
-
-  --clean     Cleans up database tables or directories from previous, failed,
-              tests and then exits (no tests are run).
-
-  --url       Immediately preceeds a URL to set the host and path. You will
-              need this parameter if Drupal is in a subdirectory on your
-              localhost and you have not set \$base_url in settings.php.
-
-  --php       The absolute path to the PHP executable. Usually not needed.
-
-  --concurrency [num]
-
-              Run tests in parallel, up to [num] tests at a time. This requires
-              the Process Control Extension (PCNTL) to be compiled in PHP, not
-              supported under Windows.
-
-  --all       Run all available tests.
-
-  --class     Run tests identified by specific class names, instead of group names.
-
-  --file      Run tests identified by specific file names, instead of group names.
-              Specify the path and the extension (i.e. 'modules/user/user.test').
-
-  --color     Output the results with color highlighting.
-
-  --verbose   Output detailed assertion messages in addition to summary.
-
-  <test1>[,<test2>[,<test3> ...]]
-
-              One or more tests to be run. By default, these are interpreted
-              as the names of test groups as shown at 
-              ?q=admin/build/testing.
-              These group names typically correspond to module names like "User"
-              or "Profile" or "System", but there is also a group "XML-RPC".
-              If --class is specified then these are interpreted as the names of
-              specific test classes whose test methods will be run. Tests must
-              be separated by commas. Ignored if --all is specified.
-
-To run this script you will normally invoke it from the root directory of your
-Drupal installation as the webserver user (differs per configuration), or root:
-
-sudo -u [wwwrun|www-data|etc] php ./scripts/{$args['script']}
-  --url http://example.com/ --all
-sudo -u [wwwrun|www-data|etc] php ./scripts/{$args['script']}
-  --url http://example.com/ --class UploadTestCase
-\n
-EOF;
-}
-
-/**
- * Parse execution argument and ensure that all are valid.
- *
- * @return The list of arguments.
- */
-function simpletest_script_parse_args() {
-  // Set default values.
-  $args = array(
-    'script' => '',
-    'help' => FALSE,
-    'list' => FALSE,
-    'clean' => FALSE,
-    'url' => '',
-    'php' => '',
-    'concurrency' => 1,
-    'all' => FALSE,
-    'class' => FALSE,
-    'file' => FALSE,
-    'color' => FALSE,
-    'verbose' => FALSE,
-    'test_names' => array(),
-    // Used internally.
-    'test-id' => NULL,
-    'execute-batch' => FALSE
-  );
-
-  // Override with set values.
-  $args['script'] = basename(array_shift($_SERVER['argv']));
-
-  $count = 0;
-  while ($arg = array_shift($_SERVER['argv'])) {
-    if (preg_match('/--(\S+)/', $arg, $matches)) {
-      // Argument found.
-      if (array_key_exists($matches[1], $args)) {
-        // Argument found in list.
-        $previous_arg = $matches[1];
-        if (is_bool($args[$previous_arg])) {
-          $args[$matches[1]] = TRUE;
-        }
-        else {
-          $args[$matches[1]] = array_shift($_SERVER['argv']);
-        }
-        // Clear extraneous values.
-        $args['test_names'] = array();
-        $count++;
-      }
-      else {
-        // Argument not found in list.
-        simpletest_script_print_error("Unknown argument '$arg'.");
-        exit;
-      }
-    }
-    else {
-      // Values found without an argument should be test names.
-      $args['test_names'] += explode(',', $arg);
-      $count++;
-    }
-  }
-
-  // Validate the concurrency argument
-  if (!is_numeric($args['concurrency']) || $args['concurrency'] <= 0) {
-    simpletest_script_print_error("--concurrency must be a strictly positive integer.");
-    exit;
-  }
-  elseif ($args['concurrency'] > 1 && !function_exists('pcntl_fork')) {
-    simpletest_script_print_error("Parallel test execution requires the Process Control extension to be compiled in PHP. Please see http://php.net/manual/en/intro.pcntl.php for more information.");
-    exit;
-  }
-
-  return array($args, $count);
-}
-
-/**
- * Initialize script variables and perform general setup requirements.
- */
-function simpletest_script_init($server_software) {
-  global $args, $php;
-
-  $host = 'localhost';
-  $path = '';
-  // Determine location of php command automatically, unless a command line argument is supplied.
-  if (!empty($args['php'])) {
-    $php = $args['php'];
-  }
-  elseif (!empty($_ENV['_'])) {
-    // '_' is an environment variable set by the shell. It contains the command that was executed.
-    $php = $_ENV['_'];
-  }
-  elseif (!empty($_ENV['SUDO_COMMAND'])) {
-    // 'SUDO_COMMAND' is an environment variable set by the sudo program.
-    // Extract only the PHP interpreter, not the rest of the command.
-    list($php, ) = explode(' ', $_ENV['SUDO_COMMAND'], 2);
-  }
-  else {
-    simpletest_script_print_error('Unable to automatically determine the path to the PHP interpreter. Please supply the --php command line argument.');
-    simpletest_script_help();
-    exit();
-  }
-
-  // Get url from arguments.
-  if (!empty($args['url'])) {
-    $parsed_url = parse_url($args['url']);
-    $host = $parsed_url['host'] . (isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '');
-    $path = $parsed_url['path'];
-  }
-
-  $_SERVER['HTTP_HOST'] = $host;
-  $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
-  $_SERVER['SERVER_ADDR'] = '127.0.0.1';
-  $_SERVER['SERVER_SOFTWARE'] = $server_software;
-  $_SERVER['SERVER_NAME'] = 'localhost';
-  $_SERVER['REQUEST_URI'] = $path .'/';
-  $_SERVER['REQUEST_METHOD'] = 'GET';
-  $_SERVER['SCRIPT_NAME'] = $path .'/index.php';
-  $_SERVER['PHP_SELF'] = $path .'/index.php';
-  $_SERVER['HTTP_USER_AGENT'] = 'Drupal command line';
-
-  chdir(realpath(dirname(__FILE__) . '/..'));
-  define('DRUPAL_ROOT', getcwd());
-  require_once DRUPAL_ROOT . '/includes/bootstrap.inc';
-}
-
-/**
- * Execute a batch of tests.
- */
-function simpletest_script_execute_batch() {
-  global $args;
-
-  if (is_null($args['test-id'])) {
-    simpletest_script_print_error("--execute-batch should not be called interactively.");
-    exit;
-  }
-  if ($args['concurrency'] == 1) {
-    // Fallback to mono-threaded execution.
-    if (count($args['test_names']) > 1) {
-      foreach ($args['test_names'] as $test_class) {
-        // Execute each test in its separate Drupal environment.
-        simpletest_script_command(1, $args['test-id'], $test_class);
-      }
-      exit;
-    }
-    else {
-      // Execute an individual test.
-      $test_class = array_shift($args['test_names']);
-      drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-      simpletest_script_run_one_test($args['test-id'], $test_class);
-      exit;
-    }
-  }
-  else {
-    // Multi-threaded execution.
-    $children = array();
-    while (!empty($args['test_names']) || !empty($children)) {
-      // Fork children safely since Drupal is not bootstrapped yet.
-      while (count($children) < $args['concurrency']) {
-        if (empty($args['test_names'])) break;
-
-        $child = array();
-        $child['test_class'] = $test_class = array_shift($args['test_names']);
-        $child['pid'] = pcntl_fork();
-        if (!$child['pid']) {
-          // This is the child process, bootstrap and execute the test.
-          drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
-          simpletest_script_run_one_test($args['test-id'], $test_class);
-          exit;
-        }
-        else {
-          // Register our new child.
-          $children[] = $child;
-        }
-      }
-
-      // Wait for children every 200ms.
-      usleep(200000);
-
-      // Check if some children finished.
-      foreach ($children as $cid => $child) {
-        if (pcntl_waitpid($child['pid'], $status, WUNTRACED | WNOHANG)) {
-          // This particular child exited.
-          unset($children[$cid]);
-        }
-      }
-    }
-    exit;
-  }
-}
-
-/**
- * Run a single test (assume a Drupal bootstrapped environment).
- */
-function simpletest_script_run_one_test($test_id, $test_class) {
-  // Drupal 6.
-  require_once drupal_get_path('module', 'simpletest') . '/drupal_web_test_case.php';
-  $classes = simpletest_test_get_all_classes();
-  require_once $classes[$test_class]['file'];
-  
-  $test = new $test_class($test_id);
-  $test->run();
-  $info = $test->getInfo();
-
-  $status = ((isset($test->results['#fail']) && $test->results['#fail'] > 0)
-           || (isset($test->results['#exception']) && $test->results['#exception'] > 0) ? 'fail' : 'pass');
-  simpletest_script_print($info['name'] . ' ' . _simpletest_format_summary_line($test->results) . "\n", simpletest_script_color_code($status));
-}
-
-/**
- * Execute a command to run batch of tests in separate process.
- */
-function simpletest_script_command($concurrency, $test_id, $tests) {
-  global $args, $php;
-
-  $command = "$php ./scripts/{$args['script']} --url {$args['url']}";
-  if ($args['color']) {
-    $command .= ' --color';
-  }
-  $command .= " --php " . escapeshellarg($php) . " --concurrency $concurrency --test-id $test_id --execute-batch $tests";
-  passthru($command);
-}
-
-/**
- * Get list of tests based on arguments. If --all specified then
- * returns all available tests, otherwise reads list of tests.
- *
- * Will print error and exit if no valid tests were found.
- *
- * @return List of tests.
- */
-function simpletest_script_get_test_list() {
-  global $args, $all_tests, $groups;
-
-  $test_list = array();
-  if ($args['all']) {
-    $test_list = $all_tests;
-  }
-  else {
-    if ($args['class']) {
-      // Check for valid class names.
-      foreach ($args['test_names'] as $class_name) {
-        if (in_array($class_name, $all_tests)) {
-          $test_list[] = $class_name;
-        }
-      }
-    }
-    elseif ($args['file']) {
-      $files = array();
-      foreach ($args['test_names'] as $file) {
-//        $files[drupal_realpath($file)] = 1;
-        $files[realpath($file)] = 1;
-      }
-
-      // Check for valid class names.
-      foreach ($all_tests as $class_name) {
-        $refclass = new ReflectionClass($class_name);
-        $file = $refclass->getFileName();
-        if (isset($files[$file])) {
-          $test_list[] = $class_name;
-        }
-      }
-    }
-    else {
-      // Check for valid group names and get all valid classes in group.
-      foreach ($args['test_names'] as $group_name) {
-        if (isset($groups[$group_name])) {
-          foreach($groups[$group_name] as $class_name => $info) {
-            $test_list[] = $class_name;
-          }
-        }
-      }
-    }
-  }
-
-  if (empty($test_list)) {
-    simpletest_script_print_error('No valid tests were specified.');
-    exit;
-  }
-  return $test_list;
-}
-
-/**
- * Initialize the reporter.
- */
-function simpletest_script_reporter_init() {
-  global $args, $all_tests, $test_list;
-
-  echo "\n";
-  echo "Drupal test run\n";
-  echo "---------------\n";
-  echo "\n";
-
-  // Tell the user about what tests are to be run.
-  if ($args['all']) {
-    echo "All tests will run.\n\n";
-  }
-  else {
-    echo "Tests to be run:\n";
-    foreach ($test_list as $class_name) {
-      $info = call_user_func(array($class_name, 'getInfo'));
-      echo " - " . $info['name'] . ' (' . $class_name . ')' . "\n";
-    }
-    echo "\n";
-  }
-
-  echo "Test run started: " . format_date($_SERVER['REQUEST_TIME'], 'long') . "\n";
-  timer_start('run-tests');
-  echo "\n";
-
-  echo "Test summary:\n";
-  echo "-------------\n";
-  echo "\n";
-}
-
-/**
- * Display test results.
- */
-function simpletest_script_reporter_display_results() {
-  global $args, $test_id, $results_map;
-
-  echo "\n";
-  $end = timer_stop('run-tests');
-  echo "Test run duration: " . format_interval($end['time'] / 1000);
-  echo "\n";
-
-  if ($args['verbose']) {
-    // Report results.
-    echo "Detailed test results:\n";
-    echo "----------------------\n";
-    echo "\n";
-
-    $results_map = array(
-      'pass' => 'Pass',
-      'fail' => 'Fail',
-      'exception' => 'Exception'
-    );
-
-//    $results = db_query("SELECT * FROM {simpletest} WHERE test_id = :test_id ORDER BY test_class, message_id", array(':test_id' => $test_id));
-    $results = db_query("SELECT * FROM {simpletest} WHERE test_id = %d ORDER BY test_class, message_id", $test_id);
-
-    $test_class = '';
-//    foreach ($results as $result) {
-    while ($result = db_fetch_object($results)) {
-      if (isset($results_map[$result->status])) {
-        if ($result->test_class != $test_class) {
-          // Display test class every time results are for new test class.
-          echo "\n\n---- $result->test_class ----\n\n\n";
-          $test_class = $result->test_class;
-        }
-
-        simpletest_script_format_result($result);
-      }
-    }
-  }
-}
-
-/**
- * Format the result so that it fits within the default 80 character
- * terminal size.
- *
- * @param $result The result object to format.
- */
-function simpletest_script_format_result($result) {
-  global $results_map, $color;
-
-  $summary = sprintf("%-10.10s %-10.10s %-30.30s %-5.5s %-20.20s\n",
-    $results_map[$result->status], $result->message_group, basename($result->file), $result->line, $result->caller);
-
-  simpletest_script_print($summary, simpletest_script_color_code($result->status));
-
-  $lines = explode("\n", wordwrap(trim(strip_tags($result->message)), 76));
-  foreach ($lines as $line) {
-    echo "    $line\n";
-  }
-}
-
-/**
- * Print error message prefixed with "  ERROR: " and displayed in fail color
- * if color output is enabled.
- *
- * @param $message The message to print.
- */
-function simpletest_script_print_error($message) {
-  simpletest_script_print("  ERROR: $message\n", SIMPLETEST_SCRIPT_COLOR_FAIL);
-}
-
-/**
- * Print a message to the console, if color is enabled then the specified
- * color code will be used.
- *
- * @param $message The message to print.
- * @param $color_code The color code to use for coloring.
- */
-function simpletest_script_print($message, $color_code) {
-  global $args;
-  if ($args['color']) {
-    echo "\033[" . $color_code . "m" . $message . "\033[0m";
-  }
-  else {
-    echo $message;
-  }
-}
-
-/**
- * Get the color code associated with the specified status.
- *
- * @param $status The status string to get code for.
- * @return Color code.
- */
-function simpletest_script_color_code($status) {
-  switch ($status) {
-    case 'pass':
-      return SIMPLETEST_SCRIPT_COLOR_PASS;
-    case 'fail':
-      return SIMPLETEST_SCRIPT_COLOR_FAIL;
-    case 'exception':
-      return SIMPLETEST_SCRIPT_COLOR_EXCEPTION;
-  }
-  return 0; // Default formatting.
-}

=== removed file 'modules/simpletest/simpletest.css'
--- modules/simpletest/simpletest.css	2009-09-11 00:40:07 +0000
+++ modules/simpletest/simpletest.css	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-/* $Id: simpletest.css,v 1.1.6.4 2009/09/05 13:34:10 boombatower Exp $
-/* Core: Id: simpletest.css,v 1.6 2009/08/04 06:47:00 webchick Exp */
-
-/* Addon for the simpletest module */
-#simpletest {
-}
-
-/* Test Table */
-#simpletest-form-table th.select-all {
-  width: 25px;
-}
-
-th.simpletest_test {
-  width: 160px;
-}
-
-table#simpletest-form-table tr td {
-  background-color: white;
-  color: #494949;
-}
-
-table#simpletest-form-table tr.simpletest-group td {
-  background-color: #EDF5FA;
-  color: #494949;
-}
-
-div.message > div.item-list {
-  font-weight: normal;
-}
-
-div.simpletest-pass {
-  color: #33a333;
-}
-
-.simpletest-fail {
-  color: #981010;
-}
-
-tr.simpletest-pass.odd {
-  background: #b6ffb6;
-}
-
-tr.simpletest-pass.even {
-  background: #9bff9b;
-}
-
-tr.simpletest-fail.odd {
-  background: #ffc9c9;
-}
-
-tr.simpletest-fail.even {
-  background: #ffacac;
-}
-
-tr.simpletest-exception.odd {
-  background: #f4ea71;
-}
-
-tr.simpletest-exception.even {
-  background: #f5e742;
-}
-
-tr.simpletest-debug.odd {
-  background: #eeeeee;
-}
-
-tr.simpletest-debug.even {
-  background: #ffffff;
-}
-
-div.simpletest-image {
-  display: inline;
-  cursor: pointer;
-}

=== removed file 'modules/simpletest/simpletest.info'
--- modules/simpletest/simpletest.info	2009-09-15 16:10:36 +0000
+++ modules/simpletest/simpletest.info	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-; $Id: simpletest.info,v 1.4.2.2.2.7 2009/09/05 13:34:10 boombatower Exp $
-; Core: Id: simpletest.info,v 1.10 2009/08/31 18:30:26 webchick Exp
-name = "SimpleTest"
-description = "Provides a framework for unit and functional testing."
-; package = Core
-package = Development
-; version = VERSION
-; core = 7.x
-core = 6.x
-php = 5 ; Drupal 6
-files[] = simpletest.module
-files[] = simpletest.pages.inc
-files[] = simpletest.install
-files[] = simpletest.test
-files[] = drupal_web_test_case.php
-
-; Drupal 6
-files[] = tests/block.test
-
-; Tests in tests directory.
-; files[] = tests/actions.test
-; files[] = tests/batch.test
-; files[] = tests/bootstrap.test
-; files[] = tests/browser.test
-; files[] = tests/cache.test
-; files[] = tests/common.test
-; files[] = tests/database_test.test
-; files[] = tests/error.test
-; files[] = tests/file.test
-; files[] = tests/filetransfer.test
-; files[] = tests/form.test
-; files[] = tests/graph.test
-; files[] = tests/image.test
-; files[] = tests/lock.test
-; files[] = tests/mail.test
-; files[] = tests/menu.test
-; files[] = tests/module.test
-; files[] = tests/registry.test
-; files[] = tests/schema.test
-; files[] = tests/session.test
-; files[] = tests/theme.test
-; files[] = tests/unicode.test
-; files[] = tests/xmlrpc.test
-
-; Information added by drupal.org packaging script on 2009-09-14
-version = "6.x-2.9"
-core = "6.x"
-project = "simpletest"
-datestamp = "1252971974"
-

=== removed file 'modules/simpletest/simpletest.install'
--- modules/simpletest/simpletest.install	2009-09-16 00:11:48 +0000
+++ modules/simpletest/simpletest.install	1970-01-01 00:00:00 +0000
@@ -1,301 +0,0 @@
-<?php
-// $Id: simpletest.install,v 1.4.2.3.2.19 2009/09/14 22:32:11 boombatower Exp $
-// Core: Id: simpletest.install,v 1.26 2009/08/17 19:14:41 webchick Exp
-
-/**
- * @file
- * Backport of Drupal 7 simpletest.install with modifications, see BACKPORT.txt.
- *
- * Copyright 2008-2009 by Jimmy Berry ("boombatower", http://drupal.org/user/214218)
- */
-
-/**
- * Implementation of hook_install().
- */
-function simpletest_install() {
-  drupal_install_schema('simpletest');
-  // Check for files directory.
-  $path = file_directory_path() . '/simpletest';
-  if (file_check_directory($path, FILE_CREATE_DIRECTORY)) {
-    // Generate binary and text test files.
-    $generated = FALSE;
-    if (simpletest_get_file_count($path, 'binary') == 0) {
-      $lines = array(64, 1024);
-      foreach ($lines as $line) {
-        simpletest_generate_file('binary', 64, $line, 'binary');
-      }
-      $generated = TRUE;
-    }
-
-    if (simpletest_get_file_count($path, 'text') == 0) {
-      $lines = array(16, 256, 1024, 2048, 20480);
-      foreach ($lines as $line) {
-        simpletest_generate_file('text', 64, $line);
-      }
-      $generated = TRUE;
-    }
-
-    // Copy other test files for consistency.
-    $original = drupal_get_path('module', 'simpletest') . '/files';
-    $files = file_scan_directory($original, '(html|image|javascript|php|sql)-.*');
-
-    // If there are more files in SimpleTest's files directory than the site's
-    // files directory, restore all the files. This situation might occur when
-    // an errant test deletes one or more files from the site's files
-    // directory. It serves a convenience to developers so that they can get
-    // the test files back easily.
-    if (count($files) > count(file_scan_directory($path, '(html|image|javascript|php|sql)-.*'))) {
-      foreach ($files as $file) {
-        copy($file->filename, $path . '/' . $file->basename);
-      }
-      $generated = TRUE;
-    }
-
-    if ($generated) {
-      drupal_set_message('Extra test files generated/copied.');
-    }
-  }
-}
-
-/**
- * Generate test file.
- */
-function simpletest_generate_file($filename, $width, $lines, $type = 'binary-text') {
-  $size = $width * $lines - $lines;
-
-  // Generate random text
-  $text = '';
-  for ($i = 0; $i < $size; $i++) {
-    switch ($type) {
-      case 'text':
-        $text .= chr(rand(32, 126));
-        break;
-      case 'binary':
-        $text .= chr(rand(0, 31));
-        break;
-      case 'binary-text':
-      default:
-        $text .= rand(0, 1);
-        break;
-    }
-  }
-  $text = wordwrap($text, $width - 1, "\n", TRUE) . "\n"; // Add \n for symetrical file.
-
-  // Create filename.
-  $path = file_directory_path() . '/simpletest/';
-  $count = simpletest_get_file_count($path, $filename);
-  file_put_contents($path . $filename . '-' . ($count + 1) . '.txt', $text);
-}
-
-/**
- * Get the number of files that have the specified filename base.
- */
-function simpletest_get_file_count($directory, $filename) {
-  $files = scandir($directory);
-  $count = 0;
-  foreach ($files as $file) {
-    if (preg_match('/' . $filename . '.*?/', $file)) {
-      $count++;
-    }
-  }
-  return $count;
-}
-
-/**
- * Implementation of hook_uninstall().
- */
-function simpletest_uninstall() {
-  simpletest_clean_environment();
-
-  // Remove settings variables.
-  variable_del('simpletest_username');
-  variable_del('simpletest_password');
-  variable_del('simpletest_clear_results');
-  variable_del('simpletest_verbose');
-
-  // Uninstall schema.
-  drupal_uninstall_schema('simpletest');
-
-  // Remove generated files.
-  $path = file_directory_path() . '/simpletest';
-  $files = file_scan_directory($path, '.*');
-  foreach ($files as $file) {
-    unlink($file->filename);
-  }
-  rmdir($path);
-}
-
-/**
- * Check that the cURL extension exists for PHP.
- */
-function simpletest_requirements($phase) {
-  $requirements = array();
-  $t = get_t();
-
-  $has_curl = function_exists('curl_init');
-  $has_hash = function_exists('hash_hmac');
-  $has_domdocument = class_exists('DOMDocument');
-
-  $requirements['curl'] = array(
-    'title' => $t('cURL'),
-    'value' => $has_curl ? $t('Enabled') : $t('Not found'),
-  );
-  if (!$has_curl) {
-    $requirements['curl']['severity'] = REQUIREMENT_ERROR;
-    $requirements['curl']['description'] = $t('Simpletest could not be installed because the PHP <a href="@curl_url">cURL</a> library is not available.', array('@curl_url' => 'http://php.net/manual/en/curl.setup.php'));
-  }
-  $requirements['hash'] = array(
-    'title' => $t('hash'),
-    'value' => $has_hash ? $t('Enabled') : $t('Not found'),
-  );
-  if (!$has_hash) {
-    $requirements['hash']['severity'] = REQUIREMENT_ERROR;
-    $requirements['hash']['description'] = $t('Simpletest could not be installed because the PHP <a href="@hash_url">hash</a> extension is disabled.', array('@hash_url' => 'http://php.net/manual/en/book.hash.php'));
-  }
-
-  $requirements['php_domdocument'] = array(
-    'title' => $t('PHP DOMDocument class'),
-    'value' => $has_domdocument ? $t('Enabled') : $t('Not found'),
-  );
-  if (!$has_domdocument) {
-    $requirements['php_domdocument']['severity'] = REQUIREMENT_ERROR;
-    $requirements['php_domdocument']['description'] =t('SimpleTest requires the DOMDocument class to be available. Please check the configure command at the <a href="@link-phpinfo">PHP info page</a>.', array('@link-phpinfo' => url('admin/reports/status/php')));
-  }
-
-  // Drupal 6.
-  // Check that the global variable is defined signifying that the code was inserted correctly.
-  if (isset($GLOBALS['simpletest_installed'])) {
-     $requirements['simpletest_settings'] = array(
-      'title' => $t('SimpleTest code addition'),
-      'value' => t('Found'),
-      'severity' => REQUIREMENT_OK
-    );
-  }
-  else {
-    $requirements['simpletest_settings'] = array(
-      'title' => $t('SimpleTest code addition'),
-      'value' => t('Not-found'),
-      'severity' => REQUIREMENT_ERROR,
-      'description' => $t('SimpleTest could not be installed. Must apply core patch, please see
-                           <a href="@install">INSTALL.txt</a>.',
-                           array('%settings' => realpath(conf_path() . '/settings.php'),
-                                 '@install' => drupal_get_path('module', 'simpletest') . '/INSTALL.txt')),
-    );
-  }
-
-  return $requirements;
-}
-
-function simpletest_schema() {
-  $schema['simpletest'] = array(
-    'description' => 'Stores simpletest messages',
-    'fields' => array(
-      'message_id'  => array(
-        'type' => 'serial',
-        'not null' => TRUE,
-        'description' => 'Primary Key: Unique simpletest message ID.',
-      ),
-      'test_id' => array(
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-        'description' => 'Test ID, messages belonging to the same ID are reported together',
-      ),
-      'test_class' => array(
-        'type' => 'varchar',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => '',
-        'description' => 'The name of the class that created this message.',
-      ),
-      'status' => array(
-        'type' => 'varchar',
-        'length' => 9,
-        'not null' => TRUE,
-        'default' => '',
-        'description' => 'Message status. Core understands pass, fail, exception.',
-      ),
-      'message' => array(
-        'type' => 'text',
-        'not null' => TRUE,
-        'description' => 'The message itself.',
-      ),
-      'message_group' => array(
-        'type' => 'varchar',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => '',
-        'description' => 'The message group this message belongs to. For example: warning, browser, user.',
-      ),
-      'function' => array(
-        'type' => 'varchar',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => '',
-        'description' => 'Name of the assertion function or method that created this message.',
-      ),
-      'line' => array(
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-        'description' => 'Line number on which the function is called.',
-      ),
-      'file' => array(
-        'type' => 'varchar',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => '',
-        'description' => 'Name of the file where the function is called.',
-      ),
-    ),
-    'primary key' => array('message_id'),
-    'indexes' => array(
-      'reporter' => array('test_class', 'message_id'),
-    ),
-  );
-  $schema['simpletest_test_id'] = array(
-    'description' => 'Stores simpletest test IDs, used to auto-incrament the test ID so that a fresh test ID is used.',
-    'fields' => array(
-      'test_id'  => array(
-        'type' => 'serial',
-        'not null' => TRUE,
-        'description' => 'Primary Key: Unique simpletest ID used to group test results together. Each time a set of tests
-                            are run a new test ID is used.',
-      ),
-      'last_prefix' => array(
-        'type' => 'varchar',
-        'length' => 60,
-        'not null' => FALSE,
-        'default' => '',
-        'description' => 'The last database prefix used during testing.',
-      ),
-    ),
-    'primary key' => array('test_id'),
-  );
-  return $schema;
-}
-
-/**
- * Upgrade simpletest 5.x-1.x and 6.x-1.x to 6.x-2.1 release.
- *
- * Provides a basic upgrade path for initial switch to 2.x branch. The update
- * path will not be continued as there is no data that needs to be updated and
- * any further releases should simply un-install and install just like Drupal
- * HEAD development.
- */
-function simpletest_update_6200() {
-  $ret = array();
-
-  // Drop any existing SimpleTest tables.
-  if (db_table_exists('simpletest')) {
-    db_drop_table($ret, 'simpletest');
-  }
-  if (db_table_exists('simpletest_test_id')) {
-    db_drop_table($ret, 'simpletest_test_id');
-  }
-
-  // Install most recent schema and files.
-  simpletest_install();
-
-  return $ret;
-}

=== removed file 'modules/simpletest/simpletest.js'
--- modules/simpletest/simpletest.js	2009-09-11 00:40:07 +0000
+++ modules/simpletest/simpletest.js	1970-01-01 00:00:00 +0000
@@ -1,114 +0,0 @@
-// $Id: simpletest.js,v 1.2.4.5 2009/09/05 13:34:10 boombatower Exp $
-// Core: Id: simpletest.js,v 1.11 2009/04/27 20:19:37 webchick Exp
-//(function ($) {
-
-/**
- * Add the cool table collapsing on the testing overview page.
- */
-//Drupal.behaviors.simpleTestMenuCollapse = {
-//  attach: function (context, settings) {
-Drupal.behaviors.simpleTestMenuCollapse = function() {
-    var timeout = null;
-    // Adds expand-collapse functionality.
-    $('div.simpletest-image').each(function () {
-//      direction = settings.simpleTest[$(this).attr('id')].imageDirection;
-//      $(this).html(settings.simpleTest.images[direction]);
-      direction = Drupal.settings.simpleTest[$(this).attr('id')].imageDirection;
-      $(this).html(Drupal.settings.simpleTest.images[direction]);
-    });
-
-    // Adds group toggling functionality to arrow images.
-    $('div.simpletest-image').click(function () {
-//      var trs = $(this).parents('tbody').children('.' + settings.simpleTest[this.id].testClass);
-//      var direction = settings.simpleTest[this.id].imageDirection;
-      var trs = $(this).parents('tbody').children('.' + Drupal.settings.simpleTest[this.id].testClass);
-      var direction = Drupal.settings.simpleTest[this.id].imageDirection;
-      var row = direction ? trs.size() - 1 : 0;
-
-      // If clicked in the middle of expanding a group, stop so we can switch directions.
-      if (timeout) {
-        clearTimeout(timeout);
-      }
-
-      // Function to toggle an individual row according to the current direction.
-      // We set a timeout of 20 ms until the next row will be shown/hidden to
-      // create a sliding effect.
-      function rowToggle() {
-        if (direction) {
-          if (row >= 0) {
-            $(trs[row]).hide();
-            row--;
-            timeout = setTimeout(rowToggle, 20);
-          }
-        }
-        else {
-          if (row < trs.size()) {
-            $(trs[row]).removeClass('js-hide').show();
-            row++;
-            timeout = setTimeout(rowToggle, 20);
-          }
-        }
-      }
-
-      // Kick-off the toggling upon a new click.
-      rowToggle();
-
-      // Toggle the arrow image next to the test group title.
-//      $(this).html(settings.simpleTest.images[(direction ? 0 : 1)]);
-//      settings.simpleTest[this.id].imageDirection = !direction;
-      $(this).html(Drupal.settings.simpleTest.images[(direction ? 0 : 1)]);
-      Drupal.settings.simpleTest[this.id].imageDirection = !direction;
-
-    });
-//  }
-};
-
-/**
- * Select/deselect all the inner checkboxes when the outer checkboxes are
- * selected/deselected.
- */
-//Drupal.behaviors.simpleTestSelectAll = {
-//  attach: function (context, settings) {
-Drupal.behaviors.simpleTestSelectAll = function() {
-    $('td.simpletest-select-all').each(function () {
-//      var testCheckboxes = settings.simpleTest['simpletest-test-group-' + $(this).attr('id')].testNames;
-      var testCheckboxes = Drupal.settings.simpleTest['simpletest-test-group-' + $(this).attr('id')].testNames;
-      var groupCheckbox = $('<input type="checkbox" class="form-checkbox" id="' + $(this).attr('id') + '-select-all" />');
-
-      // Each time a single-test checkbox is checked or unchecked, make sure
-      // that the associated group checkbox gets the right state too.
-      var updateGroupCheckbox = function () {
-        var checkedTests = 0;
-        for (var i = 0; i < testCheckboxes.length; i++) {
-          $('#' + testCheckboxes[i]).each(function () {
-            if (($(this).attr('checked'))) {
-              checkedTests++;
-            }
-          });
-        }
-        $(groupCheckbox).attr('checked', (checkedTests == testCheckboxes.length));
-      };
-
-      // Have the single-test checkboxes follow the group checkbox.
-      groupCheckbox.change(function () {
-        var checked = !!($(this).attr('checked'));
-        for (var i = 0; i < testCheckboxes.length; i++) {
-          $('#' + testCheckboxes[i]).attr('checked', checked);
-        }
-      });
-
-      // Have the group checkbox follow the single-test checkboxes.
-      for (var i = 0; i < testCheckboxes.length; i++) {
-        $('#' + testCheckboxes[i]).change(function () {
-          updateGroupCheckbox();
-        });
-      }
-
-      // Initialize status for the group checkbox correctly.
-      updateGroupCheckbox();
-      $(this).append(groupCheckbox);
-    });
-//  }
-};
-
-//})(jQuery);

=== removed file 'modules/simpletest/simpletest.module'
--- modules/simpletest/simpletest.module	2009-09-16 00:11:48 +0000
+++ modules/simpletest/simpletest.module	1970-01-01 00:00:00 +0000
@@ -1,533 +0,0 @@
-<?php
-// $Id: simpletest.module,v 1.33.2.4.2.20 2009/09/14 20:34:30 boombatower Exp $
-// Core: Id: simpletest.module,v 1.71 2009/08/24 00:14:21 webchick Exp
-
-/**
- * @file
- * Backport of Drupal 7 simpletest.module with modifications, see BACKPORT.txt.
- *
- * Copyright 2008-2009 by Jimmy Berry ("boombatower", http://drupal.org/user/214218)
- */
-
-/**
- * Implementation of hook_help().
- */
-function simpletest_help($path, $arg) {
-  switch ($path) {
-    case 'admin/help#simpletest':
-      $output  = '<p>' . t('The SimpleTest module is a framework for running automated unit tests in Drupal. It can be used to verify a working state of Drupal before and after any code changes, or as a means for developers to write and execute tests for their modules.') . '</p>';
-      $output .= '<p>' . t('Visit <a href="@admin-simpletest">Administer >> Structure >> SimpleTest</a> to display a list of available tests. For comprehensive testing, select <em>all</em> tests, or individually select tests for more targeted testing. Note that it might take several minutes for all tests to complete.)', array('@admin-simpletest' => url('admin/build/testing'))) . '</p>';
-      $output .= '<p>' . t('After the tests have run, a message will be displayed next to each test group indicating whether tests within it passed, failed, or had exceptions. A pass means that a test returned the expected results, while fail means that it did not. An exception normally indicates an error outside of the test, such as a PHP warning or notice. If there were fails or exceptions, the results are expanded, and the tests that had issues will be indicated in red or pink rows. Use these results to refine your code and tests until all tests return a pass.') . '</p>';
-      $output .= '<p>' . t('For more information on creating and modifying your own tests, see the <a href="@simpletest-api">SimpleTest API Documentation</a> in the Drupal handbook.', array('@simpletest-api' => 'http://drupal.org/simpletest')) . '</p>';
-      $output .= '<p>' . t('For more information, see the online handbook entry for <a href="@simpletest">SimpleTest module</a>.', array('@simpletest' => 'http://drupal.org/handbook/modules/simpletest')) . '</p>';
-      return $output;
-  }
-}
-
-/**
- * Implementation of hook_menu().
- */
-function simpletest_menu() {
-  $items['admin/build/testing'] = array(
-    'title' => 'Testing',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('simpletest_test_form'),
-    'description' => 'Run tests against Drupal core and your active modules. These tests help assure that your site code is working as designed.',
-    'access arguments' => array('administer unit tests'),
-    'file' => 'simpletest.pages.inc',
-  );
-  $items['admin/build/testing/list'] = array(
-    'title' => 'List',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-  );
-  $items['admin/build/testing/settings'] = array(
-    'title' => 'Settings',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('simpletest_settings_form'),
-    'access arguments' => array('administer unit tests'),
-    'type' => MENU_LOCAL_TASK,
-    'file' => 'simpletest.pages.inc',
-  );
-  $items['admin/build/testing/results/%'] = array(
-    'title' => 'Test result',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('simpletest_result_form', 4),
-    'description' => 'View result of tests.',
-    'access arguments' => array('administer unit tests'),
-    'type' => MENU_CALLBACK,
-    'file' => 'simpletest.pages.inc',
-  );
-  return $items;
-}
-
-/**
- * Implementation of hook_perm().
- */
-function simpletest_perm() {
-  return array('administer unit tests');
-}
-
-/**
- * Implementation of hook_theme().
- */
-function simpletest_theme() {
-  return array(
-    'simpletest_test_table' => array(
-      'arguments' => array('table' => NULL),
-      'file' => 'simpletest.pages.inc',
-    ),
-    'simpletest_result_summary' => array(
-      'arguments' => array('form' => NULL),
-      'file' => 'simpletest.pages.inc',
-    ),
-  );
-}
-
-function _simpletest_format_summary_line($summary) {
-  $args = array(
-    '@pass' => format_plural(isset($summary['#pass']) ? $summary['#pass'] : 0, '1 pass', '@count passes'),
-    '@fail' => format_plural(isset($summary['#fail']) ? $summary['#fail'] : 0, '1 fail', '@count fails'),
-    '@exception' => format_plural(isset($summary['#exception']) ? $summary['#exception'] : 0, '1 exception', '@count exceptions'),
-  );
-  if (!$summary['#debug']) {
-    return t('@pass, @fail, and @exception', $args);
-  }
-  $args['@debug'] = format_plural(isset($summary['#debug']) ? $summary['#debug'] : 0, '1 debug message', '@count debug messages');
-  return t('@pass, @fail, @exception, and @debug', $args);
-}
-
-/**
- * Actually runs tests.
- *
- * @param $test_list
- *   List of tests to run.
- * @param $reporter
- *   Which reporter to use. Allowed values are: text, xml, html and drupal,
- *   drupal being the default.
- */
-function simpletest_run_tests($test_list, $reporter = 'drupal') {
-  cache_clear_all();
-  db_query('INSERT INTO {simpletest_test_id} (test_id) VALUES (default)');
-  $test_id = db_last_insert_id('simpletest_test_id', 'test_id');
-
-  // Clear out the previous verbose files.
-  simpletest_clean_temporary_directory(file_directory_path() . '/simpletest/verbose');
-
-  // Get the info for the first test being run.
-  $first_test = array_shift($test_list);
-  $first_instance = new $first_test();
-  array_unshift($test_list, $first_test);
-  $info = $first_instance->getInfo();
-
-  $batch = array(
-    'title' => t('Running SimpleTests'),
-    'operations' => array(
-      array('_simpletest_batch_operation', array($test_list, $test_id)),
-    ),
-    'finished' => '_simpletest_batch_finished',
-    'progress_message' => '',
-    'css' => array(drupal_get_path('module', 'simpletest') . '/simpletest.css'),
-    'init_message' => t('Processing test @num of @max - %test.', array('%test' => $info['name'], '@num' => '1', '@max' => count($test_list))),
-  );
-  batch_set($batch);
-
-  module_invoke_all('test_group_started');
-
-  // Normally, the forms portion of the batch API takes care of calling
-  // batch_process(), but in the process it saves the whole $form into the
-  // database (which is huge for the test selection form).
-  // By calling batch_process() directly, we skip that behavior and ensure
-  // that we don't exceed the size of data that can be sent to the database
-  // (max_allowed_packet on MySQL).
-  batch_process('admin/build/testing/results/' . $test_id);
-}
-
-/**
- * Batch operation callback.
- */
-function _simpletest_batch_operation($test_list_init, $test_id, &$context) {
-  // Get working values.
-  if (!isset($context['sandbox']['max'])) {
-    // First iteration: initialize working values.
-    $test_list = $test_list_init;
-    $context['sandbox']['max'] = count($test_list);
-    $test_results = array('#pass' => 0, '#fail' => 0, '#exception' => 0, '#debug' => 0);
-  }
-  else {
-    // Nth iteration: get the current values where we last stored them.
-    $test_list = $context['sandbox']['tests'];
-    $test_results = $context['sandbox']['test_results'];
-  }
-  $max = $context['sandbox']['max'];
-
-  // Perform the next test.
-  $test_class = array_shift($test_list);
-
-  // Drupal 6.
-  require_once drupal_get_path('module', 'simpletest') . '/drupal_web_test_case.php';
-  $classes = simpletest_test_get_all_classes();
-  require_once $classes[$test_class]['file'];
-
-  $test = new $test_class($test_id);
-  $test->run();
-  $size = count($test_list);
-  $info = $test->getInfo();
-
-  module_invoke_all('test_finished', $test->results);
-
-  // Gather results and compose the report.
-  $test_results[$test_class] = $test->results;
-  foreach ($test_results[$test_class] as $key => $value) {
-    $test_results[$key] += $value;
-  }
-  $test_results[$test_class]['#name'] = $info['name'];
-  $items = array();
-  foreach (element_children($test_results) as $class) {
-    array_unshift($items, '<div class="simpletest-' . ($test_results[$class]['#fail'] + $test_results[$class]['#exception'] ? 'fail' : 'pass') . '">' . t('@name: @summary', array('@name' => $test_results[$class]['#name'], '@summary' => _simpletest_format_summary_line($test_results[$class]))) . '</div>');
-  }
-  $context['message'] = t('Processed test @num of @max - %test.', array('%test' => $info['name'], '@num' => $max - $size, '@max' => $max));
-  $context['message'] .= '<div class="simpletest-' . ($test_results['#fail'] + $test_results['#exception'] ? 'fail' : 'pass') . '">Overall results: ' . _simpletest_format_summary_line($test_results) . '</div>';
-  $context['message'] .= theme('item_list', $items);
-
-  // Save working values for the next iteration.
-  $context['sandbox']['tests'] = $test_list;
-  $context['sandbox']['test_results'] = $test_results;
-  // The test_id is the only thing we need to save for the report page.
-  $context['results']['test_id'] = $test_id;
-
-  // Multistep processing: report progress.
-  $context['finished'] = 1 - $size / $max;
-}
-
-//function _simpletest_batch_finished($success, $results, $operations, $elapsed) {
-function _simpletest_batch_finished($success, $results, $operations) {
-  if ($success) {
-    drupal_set_message(t('The test run finished.'));
-  }
-  else {
-    // Use the test_id passed as a parameter to _simpletest_batch_operation().
-    $test_id = $operations[0][1][1];
-
-    // Retrieve the last database prefix used for testing and the last test
-    // class that was run from. Use the information to read the lgo file
-    // in case any fatal errors caused the test to crash.
-    list($last_prefix, $last_test_class) = simpletest_last_test_get($test_id);
-    simpletest_log_read($test_id, $last_prefix, $last_test_class);
-
-    drupal_set_message(t('The test run did not successfully finish.'), 'error');
-    drupal_set_message(t('Please use the <em>Clean environment</em> button to clean-up temporary files and tables.'), 'warning');
-  }
-  module_invoke_all('test_group_finished');
-}
-
-/*
- * Get information about the last test that ran given a test ID.
- *
- * @param $test_id
- *   The test ID to get the last test from.
- * @return
- *   Array containing the last database prefix used and the last test class
- *   that ran.
- */
-function simpletest_last_test_get($test_id) {
-//  $last_prefix = db_result(db_query_range('SELECT last_prefix FROM {simpletest_test_id} WHERE test_id = :test_id', array(':test_id' => $test_id), 0, 1));
-  $last_prefix = db_result(db_query_range('SELECT last_prefix FROM {simpletest_test_id} WHERE test_id = ' . $test_id, 0, 1));
-//  $last_test_class = db_result(db_query_range('SELECT test_class FROM {simpletest} WHERE test_id = :test_id ORDER BY message_id DESC', array(':test_id' => $test_id), 0, 1));
-  $last_test_class = db_result(db_query_range('SELECT test_class FROM {simpletest} WHERE test_id = ' . $test_id . ' ORDER BY message_id DESC', 0, 1));
-  return array($last_prefix, $last_test_class);
-}
-
-/**
- * Read the error log and report any errors as assertion failures.
- *
- * The errors in the log should only be fatal errors since any other errors
- * will have been recorded by the error handler.
- *
- * @param $test_id
- *   The test ID to which the log relates.
- * @param $prefix
- *   The database prefix to which the log relates.
- * @param $test_class
- *   The test class to which the log relates.
- * @param $during_test
- *   Indicates that the current file directory path is a temporary file
- *   file directory used during testing.
- * @return
- *   Found any entries in log.
- */
-function simpletest_log_read($test_id, $prefix, $test_class, $during_test = FALSE) {
-  require_once drupal_get_path('module', 'simpletest') . '/drupal_web_test_case.php';
-  $log = file_directory_path() . ($during_test ? '' : '/simpletest/' . substr($prefix, 10)) . '/error.log';
-  $found = FALSE;
-  if (file_exists($log)) {
-    foreach (file($log) as $line) {
-      if (preg_match('/\[.*?\] (.*?): (.*?) in (.*) on line (\d+)/', $line, $match)) {
-        // Parse PHP fatal errors for example: PHP Fatal error: Call to
-        // undefined function break_me() in /path/to/file.php on line 17
-        $caller = array(
-          'line' => $match[4],
-          'file' => $match[3],
-        );
-        DrupalTestCase::insertAssert($test_id, $test_class, FALSE, $match[2], $match[1], $caller);
-      }
-      else {
-        // Unkown format, place the entire message in the log.
-        DrupalTestCase::insertAssert($test_id, $test_class, FALSE, $line, 'Fatal error');
-      }
-      $found = TRUE;
-    }
-  }
-  return $found;
-}
-
-/**
- * Get a list of all of the tests provided by the system.
- *
- * The list of test classes is loaded from the registry where it looks for
- * files ending in ".test". Once loaded the test list is cached and stored in
- * a static variable. In order to list tests provided by disabled modules
- * hook_registry_files_alter() is used to forcefully add them to the registry.
- *
- * @return
- *   An array of tests keyed with the groups specified in each of the tests
- *   getInfo() method and then keyed by the test class. An example of the array
- *   structure is provided below.
- *
- *   @code
- *     $groups['Blog'] => array(
- *       'BlogTestCase' => array(
- *         'name' => 'Blog functionality',
- *         'description' => 'Create, view, edit, delete, ...',
- *         'group' => 'Blog',
- *       ),
- *     );
- *   @endcode
- * @see simpletest_registry_files_alter()
- */
-function simpletest_test_get_all() {
-  static $groups;
-
-  if (!$groups) {
-    // Load test information from cache if available, otherwise retrieve the
-    // information from each tests getInfo() method.
-    if ($cache = cache_get('simpletest', 'cache')) {
-      $groups = $cache->data;
-    }
-    else {
-      // Select all clases in files ending with .test.
-      $classes = simpletest_test_get_all_classes();
-
-      $groups = array();
-
-      // Check that each class has a getInfo() method and store the information
-      // in an array keyed with the group specified in the test information.
-      foreach ($classes as $class) {
-        $class = $class['class'];
-
-        if (class_exists($class) && method_exists($class, 'getInfo')) {
-          // Valid test class, retrieve test information.
-          $info = call_user_func(array($class, 'getInfo'));
-
-          // Initialize test groups.
-          if (!isset($groups[$info['group']])) {
-            $groups[$info['group']] = array();
-          }
-          $groups[$info['group']][$class] = $info;
-        }
-      }
-      // Sort the groups and tests within the groups by name.
-      uksort($groups, 'strnatcasecmp');
-      foreach ($groups as $group => &$tests) {
-        uksort($tests, 'strnatcasecmp');
-      }
-
-      cache_set('simpletest', $groups);
-    }
-  }
-  return $groups;
-}
-
-function simpletest_test_get_all_classes() {
-  // Must load DrupalWebTestCase before loading any other test classes which
-  // will extend it.
-  require_once 'drupal_web_test_case.php';
-
-  $classes = array();
-  $files = module_rebuild_cache();
-  foreach ($files as $file) {
-    $directory = dirname($file->filename);
-    $test_files = file_scan_directory($directory, '\.test$', array('.', '..', 'CVS', '.svn'), FALSE, FALSE);
-    $test_files += file_scan_directory($directory . '/tests', '\.test$');
-
-    foreach ($test_files as $test_file) {
-      $pre = get_declared_classes();
-      require_once $test_file->filename;
-      $post = get_declared_classes();
-
-      $classes_new = array_values(array_diff($post, $pre));
-      foreach ($classes_new as $class) {
-        $classes[$class] = array('file' => $test_file->filename, 'class' => $class);
-      }
-    }
-  }
-
-  return $classes;
-}
-
-
-/**
- * Remove all temporary database tables and directories.
- */
-function simpletest_clean_environment() {
-  simpletest_clean_database();
-  simpletest_clean_temporary_directories();
-  if (variable_get('simpletest_clear_results', TRUE)) {
-    $count = simpletest_clean_results_table();
-    drupal_set_message(format_plural($count, 'Removed 1 test result.', 'Removed @count test results.'));
-  }
-  else {
-    drupal_set_message(t('Clear results is disabled and the test results table will not be cleared.'), 'warning');
-  }
-}
-
-/**
- * Removed prefixed tables from the database that are left over from crashed tests.
- */
-function simpletest_clean_database() {
-  $tables = simpletest_get_like_tables();
-  $schema = drupal_get_schema_unprocessed('simpletest');
-  $ret = array();
-  foreach (array_diff_key($tables, $schema) as $table) {
-    // Strip the prefix and skip tables without digits following "simpletest",
-    // e.g. {simpletest_test_id}.
-    if (preg_match('/simpletest\d+.*/', $table, $matches)) {
-      db_drop_table($ret, $matches[0]);
-    }
-  }
-
-  if (count($ret) > 0) {
-    drupal_set_message(format_plural(count($ret), 'Removed 1 leftover table.', 'Removed @count leftover tables.'));
-  }
-  else {
-    drupal_set_message(t('No leftover tables to remove.'));
-  }
-}
-
-/**
- * Find all tables that are like the specified base table name. (Drupal 6)
- *
- * @param string $base_table Base table name.
- * @param boolean $count Return the table count instead of list of tables.
- * @return mixed Array of matching tables or count of tables.
- */
-function simpletest_get_like_tables($base_table = 'simpletest', $count = FALSE) {
-  global $db_url, $db_prefix;
-  $url = parse_url(is_array($db_url) ? $db_url['default'] : $db_url);
-  $database = substr($url['path'], 1);
-  $result = db_query("SELECT table_name FROM information_schema.tables WHERE (table_schema = '$database' OR table_catalog = '$database') AND table_name LIKE '$db_prefix$base_table%'");
-  $schema = drupal_get_schema_unprocessed('simpletest');
-
-  $tables = array();
-  while ($table = db_result($result)) {
-    if (!isset($schema[$table])) {
-      $tables[] = $table;
-    }
-  }
-  return ($count) ? count($tables) : $tables;
-}
-
-/**
- * Find all leftover temporary directories and remove them.
- */
-function simpletest_clean_temporary_directories() {
-  $files = scandir(file_directory_path());
-  $count = 0;
-  foreach ($files as $file) {
-    $path = file_directory_path() . $file;
-    if (is_dir($path) && preg_match('/^simpletest\d+/', $file)) {
-      simpletest_clean_temporary_directory($path);
-      $count++;
-    }
-  }
-
-  if ($count > 0) {
-    drupal_set_message(format_plural($count, 'Removed 1 temporary directory.', 'Removed @count temporary directories.'));
-  }
-  else {
-    drupal_set_message(t('No temporary directories to remove.'));
-  }
-}
-
-/**
- * Remove all files from specified directory and then remove directory. (Drupal 6)
- *
- * @param string $path Directory path.
- */
-function simpletest_clean_temporary_directory($path) {
-  // Drupal 6.
-  if (!is_dir($path)) {
-    return;
-  }
-
-  $files = scandir($path);
-  foreach ($files as $file) {
-    if ($file != '.' && $file != '..') {
-      $file_path = "$path/$file";
-      if (is_dir($file_path)) {
-        simpletest_clean_temporary_directory($file_path);
-      }
-      else {
-//        file_unmanaged_delete($file_path);
-        unlink($file_path);
-      }
-    }
-  }
-  rmdir($path);
-}
-
-/**
- * Clear the test result tables.
- *
- * @param $test_id
- *   Test ID to remove results for, or NULL to remove all results.
- * @return
- *   The number of results removed.
- */
-function simpletest_clean_results_table($test_id = NULL) {
-  if (variable_get('simpletest_clear_results', TRUE)) {
-    if ($test_id) {
-      $count = db_result(db_query('SELECT COUNT(test_id) FROM {simpletest_test_id} WHERE test_id = %d', $test_id));
-
-      db_query("DELETE FROM {simpletest} WHERE test_id = %d", $test_id);
-      db_query("DELETE FROM {simpletest_test_id} WHERE test_id = %d", $test_id);
-    }
-    else {