Revert "Issue #1541958 by sun: Split setUp() into specific sub-methods."

This reverts commit 4079eb2d78.

core/modules/simpletest/drupal_web_test_case.php

@@ -1277,40 +1277,30 @@ class DrupalWebTestCase extends DrupalTestCase {
   }
 
   /**
-   * Generates a database prefix for running tests.
+   * 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.
    *
-   * The generated database table prefix is used for the Drupal installation
+   * @param ...
-   * being performed for the test. It is also used as user agent HTTP header
+   *   List of modules to enable for the duration of the test. This can be
-   * value by the cURL-based browser of DrupalWebTestCase, which is sent to the
+   *   either a single array or a variable number of string arguments.
-   * Drupal installation of the test. During early Drupal bootstrap, the user
-   * agent HTTP header is parsed, and if it matches, all database queries use
-   * the database table prefix that has been generated here.
-   *
-   * @see DrupalWebTestCase::curlInitialize()
-   * @see drupal_valid_test_ua()
-   * @see DrupalWebTestCase::setUp()
    */
-  protected function prepareDatabasePrefix() {
+  protected function setUp() {
-    $this->databasePrefix = 'simpletest' . mt_rand(1000, 1000000);
+    global $user, $language_interface, $conf;
 
-    // As soon as the database prefix is set, the test might start to execute.
+    // Generate a temporary prefixed database to ensure that tests have a clean starting point.
-    // All assertions as well as the SimpleTest batch operations are associated
+    $this->databasePrefix = 'simpletest' . mt_rand(1000, 1000000);
-    // with the testId, so the database prefix has to be associated with it.
     db_update('simpletest_test_id')
       ->fields(array('last_prefix' => $this->databasePrefix))
       ->condition('test_id', $this->testId)
       ->execute();
-  }
 
-  /**
+    // Reset all statics and variables to perform tests in a clean environment.
-   * Changes the database connection to the prefixed one.
+    $conf = array();
-   *
+    drupal_static_reset();
-   * @see DrupalWebTestCase::setUp()
+
-   */
-  protected function changeDatabasePrefix() {
-    if (empty($this->databasePrefix)) {
-      $this->prepareDatabasePrefix();
-    }
     // Clone the current connection and replace the current prefix.
     $connection_info = Database::getConnectionInfo('default');
     Database::renameConnection('default', 'simpletest_original_default');
@@ -1320,23 +1310,6 @@ class DrupalWebTestCase extends DrupalTestCase {
       );
     }
     Database::addConnectionInfo('default', 'default', $connection_info['default']);
-  }
-
-  /**
-   * Prepares the current environment for running the test.
-   *
-   * Backups various current environment variables and resets them, so they do
-   * not interfere with the Drupal site installation in which tests are executed
-   * and can be restored in tearDown().
-   *
-   * Also sets up new resources for the testing environment, such as the public
-   * filesystem and configuration directories.
-   *
-   * @see DrupalWebTestCase::setUp()
-   * @see DrupalWebTestCase::tearDown()
-   */
-  protected function prepareEnvironment() {
-    global $user, $language_interface, $conf;
 
     // Store necessary current values before switching to prefixed database.
     $this->originalLanguage = $language_interface;
@@ -1345,13 +1318,23 @@ class DrupalWebTestCase extends DrupalTestCase {
     $this->originalConfigSignatureKey = $GLOBALS['config_signature_key'];
     $this->originalFileDirectory = variable_get('file_public_path', conf_path() . '/files');
     $this->originalProfile = drupal_get_profile();
-    $this->originalCleanUrl = variable_get('clean_url', 0);
+    $clean_url_original = variable_get('clean_url', 0);
-    $this->originalUser = $user;
 
-    // Save and clean the shutdown callbacks array because it is static cached
+    // Set to English to prevent exceptions from utf8_truncate() from t()
-    // and will be changed by the test run. Otherwise it will contain callbacks
+    // during install if the current language is not 'en'.
-    // from both environments and the testing environment will try to call the
+    // The following array/object conversion is copied from language_default().
-    // handlers defined by the original one.
+    $language = (object) array(
+      'langcode' => 'en',
+      'name' => 'English',
+      'direction' => 0,
+      'enabled' => 1,
+      'weight' => 0,
+    );
+
+    // Save and clean shutdown callbacks array because it static cached and
+    // will be changed by the test run. If we don't, then it will contain
+    // callbacks from both environments. So testing environment will try
+    // to call handlers from original environment.
     $callbacks = &drupal_register_shutdown_function();
     $this->originalShutdownCallbacks = $callbacks;
     $callbacks = array();
@@ -1359,14 +1342,14 @@ class DrupalWebTestCase extends DrupalTestCase {
     // Create test directory ahead of installation so fatal errors and debug
     // information can be logged during installation process.
     // Use temporary files directory with the same prefix as the database.
-    $this->public_files_directory = $this->originalFileDirectory . '/simpletest/' . substr($this->databasePrefix, 10);
+    $public_files_directory  = $this->originalFileDirectory . '/simpletest/' . substr($this->databasePrefix, 10);
-    $this->private_files_directory = $this->public_files_directory . '/private';
+    $private_files_directory = $public_files_directory . '/private';
-    $this->temp_files_directory = $this->private_files_directory . '/temp';
+    $temp_files_directory    = $private_files_directory . '/temp';
 
     // Create the directories
-    file_prepare_directory($this->public_files_directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
+    file_prepare_directory($public_files_directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
-    file_prepare_directory($this->private_files_directory, FILE_CREATE_DIRECTORY);
+    file_prepare_directory($private_files_directory, FILE_CREATE_DIRECTORY);
-    file_prepare_directory($this->temp_files_directory, FILE_CREATE_DIRECTORY);
+    file_prepare_directory($temp_files_directory, FILE_CREATE_DIRECTORY);
     $this->generatedTestFiles = FALSE;
 
     // Create and set a new configuration directory and signature key.
@@ -1380,48 +1363,12 @@ class DrupalWebTestCase extends DrupalTestCase {
 
     // Log fatal errors.
     ini_set('log_errors', 1);
-    ini_set('error_log', $this->public_files_directory . '/error.log');
+    ini_set('error_log', $public_files_directory . '/error.log');
 
     // Set the test information for use in other parts of Drupal.
     $test_info = &$GLOBALS['drupal_test_info'];
     $test_info['test_run_id'] = $this->databasePrefix;
     $test_info['in_child_site'] = FALSE;
-  }
-
-  /**
-   * Sets up a Drupal site for running functional and integration tests.
-   *
-   * Generates a random database prefix and installs Drupal with the specified
-   * installation profile in DrupalWebTestCase::$profile into the prefixed
-   * database. Afterwards, installs any additional modules specified by the
-   * test.
-   *
-   * After installation all caches are flushed and several configuration values
-   * are reset to the values of the parent site executing the test, since the
-   * default values may be incompatible with the environment in which tests are
-   * being executed.
-   *
-   * @param ...
-   *   List of modules to enable for the duration of the test. This can be
-   *   either a single array or a variable number of string arguments.
-   *
-   * @see DrupalWebTestCase::prepareDatabasePrefix()
-   * @see DrupalWebTestCase::changeDatabasePrefix()
-   * @see DrupalWebTestCase::prepareEnvironment()
-   */
-  protected function setUp() {
-    global $user, $language_interface, $conf;
-
-    // Create and change the database prefix.
-    $this->prepareDatabasePrefix();
-    $this->changeDatabasePrefix();
-
-    // Reset all statics and variables to perform tests in a clean environment.
-    $conf = array();
-    drupal_static_reset();
-
-    // Prepare the environment for running tests.
-    $this->prepareEnvironment();
 
     // Preset the 'install_profile' system variable, so the first call into
     // system_rebuild_module_data() (in drupal_install_system()) will register
@@ -1430,16 +1377,15 @@ class DrupalWebTestCase extends DrupalTestCase {
     // profile's hook_install() and other hook implementations are never invoked.
     $conf['install_profile'] = $this->profile;
 
-    // Perform the actual Drupal installation.
     include_once DRUPAL_ROOT . '/core/includes/install.inc';
     drupal_install_system();
 
     $this->preloadRegistry();
 
     // Set path variables.
-    variable_set('file_public_path', $this->public_files_directory);
+    variable_set('file_public_path', $public_files_directory);
-    variable_set('file_private_path', $this->private_files_directory);
+    variable_set('file_private_path', $private_files_directory);
-    variable_set('file_temporary_path', $this->temp_files_directory);
+    variable_set('file_temporary_path', $temp_files_directory);
 
     // Set the 'simpletest_parent_profile' variable to add the parent profile's
     // search path to the child site's search paths.
@@ -1482,19 +1428,18 @@ class DrupalWebTestCase extends DrupalTestCase {
     // the installation process.
     drupal_cron_run();
 
-    // Ensure that the session is not written to the new environment and replace
+    // Log in with a clean $user.
-    // the global $user session with uid 1 from the new test site.
+    $this->originalUser = $user;
     drupal_save_session(FALSE);
     $user = user_load(1);
 
     // Restore necessary variables.
     variable_set('install_task', 'done');
-    variable_set('clean_url', $this->originalCleanUrl);
+    variable_set('clean_url', $clean_url_original);
     variable_set('site_mail', 'simpletest@example.com');
     variable_set('date_default_timezone', date_default_timezone_get());
-
     // Set up English language.
-    unset($conf['language_default']);
+    unset($GLOBALS['conf']['language_default']);
     $language_interface = language_default();
 
     // Use the test mail class instead of the default mail handler class.