';
++ }
++ }
++}
++
++/**
++ * Validate the HMAC and timestamp of a user agent header from simpletest.
++ */
++function drupal_valid_test_ua($user_agent) {
++ global $drupal_hash_salt;
++
++ list($prefix, $time, $salt, $hmac) = explode(';', $user_agent);
++ $check_string = $prefix . ';' . $time . ';' . $salt;
++ // We use the salt from settings.php to make the HMAC key, since
++ // the database is not yet initialized and we can't access any Drupal variables.
++ // The file properties add more entropy not easily accessible to others.
++ $filepath = './includes/bootstrap.inc';
++ $key = /*$drupal_hash_salt .*/ filectime($filepath) . fileinode($filepath);
++ $time_diff = time() - $time;
++ // Since we are making a local request a 5 second time window is allowed,
++ // and the HMAC must match.
++ return ($time_diff >= 0) && ($time_diff <= 5) && ($hmac == drupal_hmac_base64($check_string, $key));
++}
++
++/**
++ * Generate a user agent string with a HMAC and timestamp for simpletest.
++ */
++function drupal_generate_test_ua($prefix) {
++ global $drupal_hash_salt;
++ static $key;
++
++ if (!isset($key)) {
++ // We use the salt from settings.php to make the HMAC key, since
++ // the database is not yet initialized and we can't access any Drupal variables.
++ // The file properties add more entropy not easily accessible to others.
++ $filepath = './includes/bootstrap.inc';
++ $key = /*$drupal_hash_salt .*/ filectime($filepath) . fileinode($filepath);
++ }
++ // Generate a moderately secure HMAC based on the database credentials.
++ $salt = uniqid('', TRUE);
++ $check_string = $prefix . ';' . time() . ';' . $salt;
++ return $check_string . ';' . drupal_hmac_base64($check_string, $key);
++}
++
++/**
++ * @ingroup schemaapi
++ * @{
++ */
++
++/**
++ * Get the schema definition of a table, or the whole database schema.
++ *
++ * The returned schema will include any modifications made by any
++ * module that implements hook_schema_alter().
++ *
++ * @param $table
++ * The name of the table. If not given, the schema of all tables is returned.
++ * @param $rebuild
++ * If true, the schema will be rebuilt instead of retrieved from the cache.
++ */
++function drupal_get_schema($table = NULL, $rebuild = FALSE) {
++ static $schema = array();
++
++ if (empty($schema) || $rebuild) {
++ // Try to load the schema from cache.
++ if (!$rebuild && $cached = cache_get('schema')) {
++ $schema = $cached->data;
++ }
++ // Otherwise, rebuild the schema cache.
++ else {
++ $schema = array();
++ // Load the .install files to get hook_schema.
++ // On some databases this function may be called before bootstrap has
++ // been completed, so we force the functions we need to load just in case.
++ if (function_exists('module_load_all_includes')) {
++
++ // There is currently a bug in module_list() where it caches what it
++ // was last called with, which is not always what you want.
++ // module_load_all_includes() calls module_list(), but if this function
++ // is called very early in the bootstrap process then it will be
++ // uninitialized and therefore return no modules. Instead, we have to
++ // "prime" module_list() here to to values we want, specifically
++ // "yes rebuild the list and don't limit to bootstrap".
++ // TODO: Remove this call after http://drupal.org/node/222109 is fixed.
++ module_list(TRUE, FALSE);
++ module_load_all_includes('install');
++ }
++
++ // Invoke hook_schema for all modules.
++ foreach (module_implements('schema') as $module) {
++ // Cast the result of hook_schema() to an array, as a NULL return value
++ // would cause array_merge() to set the $schema variable to NULL as well.
++ // That would break modules which use $schema further down the line.
++ $current = (array) module_invoke($module, 'schema');
++ _drupal_initialize_schema($module, $current);
++ $schema = array_merge($schema, $current);
++ }
++
++ drupal_alter('schema', $schema);
++ // If the schema is empty, avoid saving it: some database engines require
++ // the schema to perform queries, and this could lead to infinite loops.
++ if (!empty($schema) && (drupal_get_bootstrap_phase() == DRUPAL_BOOTSTRAP_FULL)) {
++ cache_set('schema', $schema);
++ }
++ }
++ }
++
++ if (!isset($table)) {
++ return $schema;
++ }
++ elseif (isset($schema[$table])) {
++ return $schema[$table];
++ }
++ else {
++ return FALSE;
++ }
++}
++
++/**
++ * @} End of "ingroup schemaapi".
++ */
++
++/**
++ * Central static variable storage.
++ *
++ * All functions requiring a static variable to persist or cache data within
++ * a single page request are encouraged to use this function unless it is
++ * absolutely certain that the static variable will not need to be reset during
++ * the page request. By centralizing static variable storage through this
++ * function, other functions can rely on a consistent API for resetting any
++ * other function's static variables.
++ *
++ * Example:
++ * @code
++ * function language_list($field = 'language') {
++ * $languages = &drupal_static(__FUNCTION__);
++ * if (!isset($languages)) {
++ * // If this function is being called for the first time after a reset,
++ * // query the database and execute any other code needed to retrieve
++ * // information about the supported languages.
++ * ...
++ * }
++ * if (!isset($languages[$field])) {
++ * // If this function is being called for the first time for a particular
++ * // index field, then execute code needed to index the information already
++ * // available in $languages by the desired field.
++ * ...
++ * }
++ * // Subsequent invocations of this function for a particular index field
++ * // skip the above two code blocks and quickly return the already indexed
++ * // information.
++ * return $languages[$field];
++ * }
++ * function locale_translate_overview_screen() {
++ * // When building the content for the translations overview page, make
++ * // sure to get completely fresh information about the supported languages.
++ * drupal_static_reset('language_list');
++ * ...
++ * }
++ * @endcode
++ *
++ * In a few cases, a function can have certainty that there is no legitimate
++ * use-case for resetting that function's static variable. This is rare,
++ * because when writing a function, it's hard to forecast all the situations in
++ * which it will be used. A guideline is that if a function's static variable
++ * does not depend on any information outside of the function that might change
++ * during a single page request, then it's ok to use the "static" keyword
++ * instead of the drupal_static() function.
++ *
++ * Example:
++ * @code
++ * function actions_do(...) {
++ * // $stack tracks the number of recursive calls.
++ * static $stack;
++ * $stack++;
++ * if ($stack > variable_get('actions_max_stack', 35)) {
++ * ...
++ * return;
++ * }
++ * ...
++ * $stack--;
++ * }
++ * @endcode
++ *
++ * In a few cases, a function needs a resettable static variable, but the
++ * function is called many times (100+) during a single page request, so
++ * every microsecond of execution time that can be removed from the function
++ * counts. These functions can use a more cumbersome, but faster variant of
++ * calling drupal_static(). It works by storing the reference returned by
++ * drupal_static() in the calling function's own static variable, thereby
++ * removing the need to call drupal_static() for each iteration of the function.
++ * Conceptually, it replaces:
++ * @code
++ * $foo = &drupal_static(__FUNCTION__);
++ * @endcode
++ * with:
++ * @code
++ * // Unfortunately, this does not work.
++ * static $foo = &drupal_static(__FUNCTION__);
++ * @endcode
++ * However, the above line of code does not work, because PHP only allows static
++ * variables to be initializied by literal values, and does not allow static
++ * variables to be assigned to references.
++ * - http://php.net/manual/en/language.variables.scope.php#language.variables.scope.static
++ * - http://php.net/manual/en/language.variables.scope.php#language.variables.scope.references
++ * The example below shows the syntax needed to work around both limitations.
++ * For benchmarks and more information, see http://drupal.org/node/619666.
++ *
++ * Example:
++ * @code
++ * function user_access($string, $account = NULL) {
++ * // Use the advanced drupal_static() pattern, since this is called very often.
++ * static $drupal_static_fast;
++ * if (!isset($drupal_static_fast)) {
++ * $drupal_static_fast['perm'] = &drupal_static(__FUNCTION__);
++ * }
++ * $perm = &$drupal_static_fast['perm'];
++ * ...
++ * }
++ * @endcode
++ *
++ * @param $name
++ * Globally unique name for the variable. For a function with only one static,
++ * variable, the function name (e.g. via the PHP magic __FUNCTION__ constant)
++ * is recommended. For a function with multiple static variables add a
++ * distinguishing suffix to the function name for each one.
++ * @param $default_value
++ * Optional default value.
++ * @param $reset
++ * TRUE to reset a specific named variable, or all variables if $name is NULL.
++ * Resetting every variable should only be used, for example, for running
++ * unit tests with a clean environment. Should be used only though via
++ * function drupal_static_reset() and the return value should not be used in
++ * this case.
++ *
++ * @return
++ * Returns a variable by reference.
++ *
++ * @see drupal_static_reset()
++ */
++function &drupal_static($name, $default_value = NULL, $reset = FALSE) {
++ static $data = array(), $default = array();
++ // First check if dealing with a previously defined static variable.
++ if (isset($data[$name]) || array_key_exists($name, $data)) {
++ // Non-NULL $name and both $data[$name] and $default[$name] statics exist.
++ if ($reset) {
++ // Reset pre-existing static variable to its default value.
++ $data[$name] = $default[$name];
++ }
++ return $data[$name];
++ }
++ // Neither $data[$name] nor $default[$name] static variables exist.
++ if (isset($name)) {
++ if ($reset) {
++ // Reset was called before a default is set and yet a variable must be
++ // returned.
++ return $data;
++ }
++ // First call with new non-NULL $name. Initialize a new static variable.
++ $default[$name] = $data[$name] = $default_value;
++ return $data[$name];
++ }
++ // Reset all: ($name == NULL). This needs to be done one at a time so that
++ // references returned by earlier invocations of drupal_static() also get
++ // reset.
++ foreach ($default as $name => $value) {
++ $data[$name] = $value;
++ }
++ // As the function returns a reference, the return should always be a
++ // variable.
++ return $data;
++}
++
++/**
++ * Reset one or all centrally stored static variable(s).
++ *
++ * @param $name
++ * Name of the static variable to reset. Omit to reset all variables.
++ */
++function drupal_static_reset($name = NULL) {
++ drupal_static($name, NULL, TRUE);
++}
++
++/**
++ * Detect whether the current script is running in a command-line environment.
++ */
++function drupal_is_cli() {
++ return (!isset($_SERVER['SERVER_SOFTWARE']) && (php_sapi_name() == 'cli' || (is_numeric($_SERVER['argc']) && $_SERVER['argc'] > 0)));
++}
+
+/**
+ * Debug function used for outputting debug information.
@@ -388,25 +1107,106 @@ diff -u -r1.756.2.75 common.inc
+ $string = $print_r ? print_r($data, TRUE) : var_export($data, TRUE);
+ trigger_error(trim($label ? "$label: $string" : $string));
+}
-Index: install.php
-===================================================================
-RCS file: /cvs/drupal/drupal/install.php,v
-retrieving revision 1.113.2.9
-diff -u -r1.113.2.9 install.php
---- install.php 27 Apr 2009 10:50:35 -0000 1.113.2.9
-+++ install.php 27 Jan 2010 01:32:00 -0000
-@@ -20,6 +20,14 @@
- require_once './includes/bootstrap.inc';
- drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION);
-
-+ // The user agent header is used to pass a database prefix in the request when
-+ // running tests. However, for security reasons, it is imperative that no
-+ // installation be permitted using such a prefix.
-+ if (isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'], "simpletest") !== FALSE) {
-+ header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
-+ exit;
++
++/**
++ * Finds all tables that are like the specified base table name.
++ *
++ * @param $table_expression
++ * An SQL expression, for example "simpletest%%" (without the quotes).
++ * BEWARE: this is not prefixed, the caller should take care of that.
++ *
++ * @return
++ * Array, both the keys and the values are the matching tables.
++ */
++function db_find_tables($table_expression) {
++ global $db_url;
++
++ // Get the database name.
++ $url = parse_url(is_array($db_url) ? $db_url['default'] : $db_url);
++ $database = substr($url['path'], 1);
++
++ switch ($GLOBALS['db_type']) {
++ default:
++ $query = db_query("SELECT table_name FROM information_schema.tables WHERE (table_schema = '%s' OR table_catalog = '%s') AND table_name LIKE '%s'", array(
++ ':table_schema' => $database,
++ ':table_catelog' => $database,
++ ':table_name' => $table_expression,
++ ));
++ break;
+ }
+
- // This must go after drupal_bootstrap(), which unsets globals!
- global $profile, $install_locale, $conf;
++ $tables = array();
++ if (isset($query)) {
++ while ($table = db_result($query)) {
++ $tables[] = $table;
++ }
++ }
++ return $tables;
++}
++
++/**
++ * Recursively delete all files and directories in the specified filepath.
++ *
++ * If the specified path is a directory then the function will call itself
++ * recursively to process the contents. Once the contents have been removed the
++ * directory will also be removed.
++ *
++ * If the specified path is a file then it will be passed to
++ * file_unmanaged_delete().
++ *
++ * Note that this only deletes visible files with write permission.
++ *
++ * @param $path
++ * A string containing either an URI or a file or directory path.
++ *
++ * @return
++ * TRUE for success or if path does not exist, FALSE in the event of an
++ * error.
++ *
++ * @see file_unmanaged_delete()
++ */
++function file_unmanaged_delete_recursive($path) {
++ if (is_dir($path)) {
++ $dir = dir($path);
++ while (($entry = $dir->read()) !== FALSE) {
++ if ($entry == '.' || $entry == '..') {
++ continue;
++ }
++ $entry_path = $path . '/' . $entry;
++ file_unmanaged_delete_recursive($entry_path);
++ }
++ $dir->close();
++ return rmdir($path);
++ }
++ elseif (is_file($path)) {
++ return unlink($path);
++ }
++}
+Index: misc/drupal.js
+===================================================================
+RCS file: /cvs/drupal/drupal/misc/drupal.js,v
+retrieving revision 1.41.2.4
+diff -u -p -r1.41.2.4 drupal.js
+--- misc/drupal.js 21 Jul 2009 08:59:10 -0000 1.41.2.4
++++ misc/drupal.js 22 Aug 2010 23:34:37 -0000
+@@ -253,17 +253,17 @@ Drupal.getSelection = function (element)
+ */
+ Drupal.ahahError = function(xmlhttp, uri) {
+ if (xmlhttp.status == 200) {
+- if (jQuery.trim($(xmlhttp.responseText).text())) {
++ if (jQuery.trim(xmlhttp.responseText)) {
+ var message = Drupal.t("An error occurred. \n@uri\n@text", {'@uri': uri, '@text': xmlhttp.responseText });
+ }
+ else {
+- var message = Drupal.t("An error occurred. \n@uri\n(no information available).", {'@uri': uri, '@text': xmlhttp.responseText });
++ var message = Drupal.t("An error occurred. \n@uri\n(no information available).", {'@uri': uri });
+ }
+ }
+ else {
+ var message = Drupal.t("An HTTP error @status occurred. \n@uri", {'@uri': uri, '@status': xmlhttp.status });
+ }
+- return message;
++ return message.replace(/\n/g, ' ');
+ }
+ // Global Killswitch on the element
Index: INSTALL.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/Attic/INSTALL.txt,v
retrieving revision 1.6.4.18
diff -u -p -r1.6.4.18 INSTALL.txt
--- INSTALL.txt 5 Jan 2010 19:44:22 -0000 1.6.4.18
+++ INSTALL.txt 22 Aug 2010 23:46:58 -0000
@@ -14,17 +14,11 @@ INSTALLATION
1. Apply the D6-core-simpletest.patch file to the Drupal 6 core.
2. (Optional)
- Apply the "Show fatal errors in tests" patch 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
+3. 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
+4. Go to Administer >> Site building >> Testing (admin/build/testing) to
begin using the module.
Index: drupal_web_test_case.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/Attic/drupal_web_test_case.php,v
retrieving revision 1.2.2.3.2.47
diff -u -p -r1.2.2.3.2.47 drupal_web_test_case.php
--- drupal_web_test_case.php 27 Jan 2010 01:55:29 -0000 1.2.2.3.2.47
+++ drupal_web_test_case.php 22 Aug 2010 23:46:59 -0000
@@ -1,16 +1,17 @@
TRUE);
/**
- * Constructor for DrupalWebTestCase.
+ * Constructor for DrupalTestCase.
*
* @param $test_id
* Tests with the same id are reported together.
@@ -101,8 +109,6 @@ abstract class DrupalTestCase {
* 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';
@@ -116,10 +122,6 @@ abstract class DrupalTestCase {
$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,
@@ -133,15 +135,13 @@ abstract class DrupalTestCase {
);
// Store assertion for display after the test has completed.
-// db_insert('simpletest')
-// ->fields($assertion)
-// ->execute();
+ $current_db_prefix = $GLOBALS['db_prefix'];
+ $GLOBALS['db_prefix'] = $this->originalPrefix;
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));
+ $GLOBALS['db_prefix'] = $current_db_prefix;
- // 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') {
@@ -162,7 +162,11 @@ abstract class DrupalTestCase {
* the method behaves just like DrupalTestCase::assert() in terms of storing
* the assertion.
*
+ * @return
+ * Message ID of the stored assertion.
+ *
* @see DrupalTestCase::assert()
+ * @see DrupalTestCase::deleteAssert()
*/
public static function insertAssert($test_id, $test_class, $status, $message = '', $group = 'Other', array $caller = array()) {
// Convert boolean status to string status.
@@ -187,12 +191,26 @@ abstract class DrupalTestCase {
'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));
+ $message_id = db_last_insert_id('simpletest', 'message_id');
+ return $message_id;
+ }
+
+ /**
+ * Delete an assertion record by message ID.
+ *
+ * @param $message_id
+ * Message ID of the assertion to delete.
+ * @return
+ * TRUE if the assertion was deleted, FALSE otherwise.
+ *
+ * @see DrupalTestCase::insertAssert()
+ */
+ public static function deleteAssert($message_id) {
+ db_query("DELETE FROM {simpletest} WHERE message_id = %d", $message_id);
+ return (bool) db_affected_rows();
}
/**
@@ -230,7 +248,7 @@ abstract class DrupalTestCase {
* 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);
+ return $this->assert((bool) $value, $message ? $message : t('Value @value is TRUE.', array('@value' => var_export($value, TRUE))), $group);
}
/**
@@ -246,7 +264,7 @@ abstract class DrupalTestCase {
* 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);
+ return $this->assert(!$value, $message ? $message : t('Value @value is FALSE.', array('@value' => var_export($value, TRUE))), $group);
}
/**
@@ -262,7 +280,7 @@ abstract class DrupalTestCase {
* 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);
+ return $this->assert(!isset($value), $message ? $message : t('Value @value is NULL.', array('@value' => var_export($value, TRUE))), $group);
}
/**
@@ -278,7 +296,7 @@ abstract class DrupalTestCase {
* 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);
+ return $this->assert(isset($value), $message ? $message : t('Value @value is not NULL.', array('@value' => var_export($value, TRUE))), $group);
}
/**
@@ -296,7 +314,7 @@ abstract class DrupalTestCase {
* 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);
+ return $this->assert($first == $second, $message ? $message : t('Value @first is equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
}
/**
@@ -314,7 +332,7 @@ abstract class DrupalTestCase {
* 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);
+ return $this->assert($first != $second, $message ? $message : t('Value @first is not equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
}
/**
@@ -332,7 +350,7 @@ abstract class DrupalTestCase {
* 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);
+ return $this->assert($first === $second, $message ? $message : t('Value @first is identical to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
}
/**
@@ -350,7 +368,7 @@ abstract class DrupalTestCase {
* 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);
+ return $this->assert($first !== $second, $message ? $message : t('Value @first is not identical to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
}
/**
@@ -412,18 +430,28 @@ abstract class DrupalTestCase {
// HTTP auth settings (:) for the simpletest browser
// when sending requests to the test site.
- $username = variable_get('simpletest_username', NULL);
- $password = variable_get('simpletest_password', NULL);
+ $this->httpauth_method = variable_get('simpletest_httpauth_method', CURLAUTH_BASIC);
+ $username = variable_get('simpletest_httpauth_username', NULL);
+ $password = variable_get('simpletest_httpauth_password', NULL);
if ($username && $password) {
$this->httpauth_credentials = $username . ':' . $password;
}
set_error_handler(array($this, 'errorHandler'));
- $methods = array();
+ $class = get_class($this);
// Iterate through all the methods in this class.
- foreach (get_class_methods(get_class($this)) as $method) {
+ foreach (get_class_methods($class) as $method) {
// If the current method starts with "test", run it - it's a test.
if (strtolower(substr($method, 0, 4)) == 'test') {
+ // Insert a fail record. This will be deleted on completion to ensure
+ // that testing completed.
+ $method_info = new ReflectionMethod($class, $method);
+ $caller = array(
+ 'file' => $method_info->getFileName(),
+ 'line' => $method_info->getStartLine(),
+ 'function' => $class . '->' . $method . '()',
+ );
+ $completion_check_id = DrupalTestCase::insertAssert($this->testId, $class, FALSE, t('The test did not complete due to a fatal error.'), 'Completion check', $caller);
$this->setUp();
try {
$this->$method();
@@ -433,6 +461,8 @@ abstract class DrupalTestCase {
$this->exceptionHandler($e);
}
$this->tearDown();
+ // Remove the completion check record.
+ DrupalTestCase::deleteAssert($completion_check_id);
}
}
// Clear out the error messages and restore error handler.
@@ -441,11 +471,10 @@ abstract class DrupalTestCase {
}
/**
- * Handle errors.
+ * Handle errors during test runs.
*
* 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()) {
@@ -479,7 +508,8 @@ abstract class DrupalTestCase {
'line' => $exception->getLine(),
'file' => $exception->getFile(),
));
- $this->error($exception->getMessage(), 'Uncaught exception', _drupal_get_last_caller($backtrace));
+ require_once './includes/errors.inc';
+ $this->error(t('%type: %message in %function (line %line of %file).', _drupal_decode_exception($exception)), 'Uncaught exception', _drupal_get_last_caller($backtrace));
}
/**
@@ -490,45 +520,41 @@ abstract class DrupalTestCase {
* is not restricted.
*
* @param $length
- * Length of random string to generate which will be appended to $db_prefix.
+ * Length of random string to generate.
* @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;
+ return $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.
+ * The string will always start with a letter. 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 (i.e. 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.
+ * Length of random string to generate.
* @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(mt_rand(97, 122));
+ for ($i = 1; $i < $length; $i++) {
$str .= chr($values[mt_rand(0, $max)]);
}
- return str_replace('simpletest', 's', $db_prefix) . $str;
+ return $str;
}
-
}
/**
@@ -536,8 +562,7 @@ abstract class DrupalTestCase {
*
* 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.
+ * watchdog(), module_implements(), module_invoke_all() etc.
*/
class DrupalUnitTestCase extends DrupalTestCase {
@@ -549,18 +574,22 @@ class DrupalUnitTestCase extends DrupalT
$this->skipClasses[__CLASS__] = TRUE;
}
- function setUp() {
- global $db_prefix, $conf;
+ protected function setUp() {
+ global $conf;
- // Store necessary current values before switching to prefixed database.
- $this->originalPrefix = $db_prefix;
+ // Store necessary current values before switching to the test environment.
+ $this->originalPrefix = $GLOBALS['db_prefix'];
$this->originalFileDirectory = file_directory_path();
+ // Reset all statics so that test is performed with a clean environment.
+ drupal_static_reset();
+
// Generate temporary prefixed database to ensure that tests have a clean starting point.
-// $db_prefix = Database::getConnection()->prefixTables('{simpletest' . mt_rand(1000, 1000000) . '}');
- $db_prefix = $db_prefix . 'simpletest' . mt_rand(1000, 1000000);
-// $conf['file_public_path'] = $this->originalFileDirectory . '/' . $db_prefix;
- $conf['file_directory_path'] = $this->originalFileDirectory . '/simpletest/' . substr($db_prefix, 10);
+ $this->databasePrefix = db_prefix_tables('{simpletest' . mt_rand(1000, 1000000) . '}');
+ $conf['file_directory_path'] = $this->originalFileDirectory . '/' . $this->databasePrefix;
+
+ // Set user agent to be consistent with web test case.
+ $_SERVER['HTTP_USER_AGENT'] = $this->databasePrefix;
// If locale is enabled then t() will try to access the database and
// subsequently will fail as the database is not accessible.
@@ -572,17 +601,16 @@ class DrupalUnitTestCase extends DrupalT
}
}
- function tearDown() {
- global $db_prefix, $conf;
- if (preg_match('/simpletest\d+/', $db_prefix)) {
-// $conf['file_public_path'] = $this->originalFileDirectory;
- $conf['file_directory_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);
- }
+ protected function tearDown() {
+ global $conf;
+
+ // Get back to the original connection.
+ $GLOBALS['db_prefix'] = $this->originalPrefix;
+
+ $conf['file_directory_path'] = $this->originalFileDirectory;
+ // Restore modules if necessary.
+ if (isset($this->originalModuleList)) {
+ module_list(TRUE, FALSE, FALSE, $this->originalModuleList);
}
}
}
@@ -663,6 +691,18 @@ class DrupalWebTestCase extends DrupalTe
protected $originalUser = NULL;
/**
+ * The original shutdown handlers array, before it was cleaned for testing purposes.
+ *
+ * @var array
+ */
+ protected $originalShutdownCallbacks = array();
+
+ /**
+ * HTTP authentication method
+ */
+ protected $httpauth_method = CURLAUTH_BASIC;
+
+ /**
* HTTP authentication credentials (:).
*/
protected $httpauth_credentials = NULL;
@@ -678,6 +718,16 @@ class DrupalWebTestCase extends DrupalTe
protected $session_id = NULL;
/**
+ * Whether the files were copied to the test files directory.
+ */
+ protected $generatedTestFiles = FALSE;
+
+ /**
+ * The number of redirects followed during the handling of a request.
+ */
+ protected $redirect_count;
+
+ /**
* Constructor for DrupalWebTestCase.
*/
function __construct($test_id = NULL) {
@@ -695,10 +745,6 @@ class DrupalWebTestCase extends DrupalTe
* 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));
}
@@ -714,13 +760,11 @@ class DrupalWebTestCase extends DrupalTe
protected function drupalCreateNode($settings = array()) {
// Populate defaults array.
$settings += array(
-// 'body' => array(FIELD_LANGUAGE_NONE => array(array())),
'body' => $this->randomName(32),
+ 'format' => FILTER_FORMAT_DEFAULT,
'title' => $this->randomName(8),
'comment' => 2,
-// 'changed' => REQUEST_TIME,
'changed' => time(),
- 'format' => FILTER_FORMAT_DEFAULT,
'moderate' => 0,
'promote' => 0,
'revision' => 1,
@@ -729,7 +773,8 @@ class DrupalWebTestCase extends DrupalTe
'sticky' => 0,
'type' => 'page',
'revisions' => NULL,
- 'taxonomy' => NULL,
+ 'language' => '',
+ //'taxonomy' => NULL,
);
// Use the original node's created time for existing nodes.
@@ -749,21 +794,10 @@ class DrupalWebTestCase extends DrupalTe
}
}
-// // 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;
}
@@ -780,9 +814,7 @@ class DrupalWebTestCase extends DrupalTe
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_'));
+ $name = strtolower($this->randomName(8));
} while (node_get_types('type', $name));
// Populate defaults array.
@@ -807,11 +839,11 @@ class DrupalWebTestCase extends DrupalTe
'locked' => 0,
);
$type = $forced + $settings + $defaults;
- $type = (object)$type;
+ $type = (object) $type;
$saved_type = node_type_save($type);
node_types_rebuild();
- menu_rebuild(); // Drupal 6.
+ menu_rebuild();
$this->assertEqual($saved_type, SAVED_NEW, t('Created content type %type.', array('%type' => $type->type)));
@@ -832,22 +864,42 @@ class DrupalWebTestCase extends DrupalTe
* List of files that match filter.
*/
protected function drupalGetTestFiles($type, $size = NULL) {
- $files = array();
+ if (empty($this->generatedTestFiles)) {
+ // Generate binary test files.
+ $lines = array(64, 1024);
+ $count = 0;
+ foreach ($lines as $line) {
+ simpletest_generate_file('binary-' . $count++, 64, $line, 'binary');
+ }
+
+ // Generate text test files.
+ $lines = array(16, 256, 1024, 2048, 20480);
+ $count = 0;
+ foreach ($lines as $line) {
+ simpletest_generate_file('text-' . $count++, 64, $line);
+ }
+
+ // Copy other test files from simpletest.
+ $original = drupal_get_path('module', 'simpletest') . '/files';
+ $files = file_scan_directory($original, '/(html|image|javascript|php|sql)-.*/');
+ $destination_path = file_directory_path();
+ foreach ($files as $file) {
+ file_copy($file->filename, $destination_path);
+ }
+
+ $this->generatedTestFiles = TRUE;
+ }
+ $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 . '\-.*');
+ $files = file_scan_directory(file_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]);
}
}
@@ -861,7 +913,6 @@ class DrupalWebTestCase extends DrupalTe
* 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.
@@ -931,22 +982,14 @@ class DrupalWebTestCase extends DrupalTe
}
// 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'));
+ $count = explode(', ', db_result(db_query("SELECT perm FROM {permission} WHERE rid = %d", $role->rid)));
+ $this->assertTrue($count == count($permissions), t('Created permissions: @perms', array('@perms' => implode(', ', $permissions))), t('Role'));
return $role->rid;
}
else {
@@ -965,11 +1008,9 @@ class DrupalWebTestCase extends DrupalTe
* TRUE or FALSE depending on whether the permissions are valid.
*/
protected function checkPermissions(array $permissions, $reset = FALSE) {
-// $available = &drupal_static(__FUNCTION__);
- static $available;
+ $available = &drupal_static(__FUNCTION__);
if (!isset($available) || $reset) {
-// $available = array_keys(module_invoke_all('permission'));
$available = module_invoke_all('perm');
}
@@ -993,7 +1034,7 @@ class DrupalWebTestCase extends DrupalTe
* 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.
+ * e.g. to log in the same user again, then it must be re-assigned manually.
* For example:
* @code
* // Create a user.
@@ -1006,7 +1047,7 @@ class DrupalWebTestCase extends DrupalTe
* @endcode
*
* @param $user
- * User object representing the user to login.
+ * User object representing the user to log in.
*
* @see drupalCreateUser()
*/
@@ -1045,8 +1086,8 @@ class DrupalWebTestCase extends DrupalTe
// 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'));
+ $this->drupalGet('logout');
+ $this->drupalGet('user');
$pass = $this->assertField('name', t('Username field found.'), t('Logout'));
$pass = $pass && $this->assertField('pass', t('Password field found.'), t('Logout'));
@@ -1063,103 +1104,106 @@ class DrupalWebTestCase extends DrupalTe
* is created with the same name as the database prefix.
*
* @param ...
- * List of modules to enable for the duration of the test.
+ * 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.
*/
protected function setUp() {
- global $db_prefix, $user, $language;
+ global $user, $language, $conf;
+
+ // Generate a temporary prefixed database to ensure that tests have a clean starting point.
+ $this->databasePrefix = 'simpletest' . mt_rand(1000, 1000000);
+ db_query("UPDATE {simpletest_test_id} SET last_prefix = '%s' WHERE test_id = %d", $this->databasePrefix, $this->testId);
+
+ // Replace the current prefix.
+ $this->originalPrefix = $GLOBALS['db_prefix'];
+ $GLOBALS['db_prefix'] = $this->databasePrefix;
// Store necessary current values before switching to prefixed database.
$this->originalLanguage = $language;
-// $this->originalLanguageDefault = variable_get('language_default');
- $this->originalPrefix = $db_prefix;
+ $this->originalLanguageDefault = variable_get('language_default', NULL);
$this->originalFileDirectory = file_directory_path();
-// $this->originalProfile = drupal_get_profile();
+ $this->originalProfile = variable_get('install_profile', 'standard');
$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);
+ // Use temporary files directory with the same prefix as the database.
+ $public_files_directory = $this->originalFileDirectory . '/simpletest/' . substr($this->databasePrefix, 10);
+ $temp_files_directory = $public_files_directory . '/temp';
+
+ // Create the directories
+ file_check_directory($public_files_directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
+ file_check_directory($temp_files_directory, FILE_CREATE_DIRECTORY);
+ $this->generatedTestFiles = FALSE;
// Log fatal errors.
ini_set('log_errors', 1);
- ini_set('error_log', $directory . '/error.log');
+ ini_set('error_log', $public_files_directory . '/error.log');
+
+ // 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' => $this->databasePrefix)), 'System');
+
+ // Reset all statics and variables to perform tests in a clean environment.
+ $conf = array();
+ drupal_static_reset();
+
+ // 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;
-// include_once DRUPAL_ROOT . '/includes/install.inc';
include_once './includes/install.inc';
drupal_install_system();
-// $this->preloadRegistry();
+ // Set path variables.
+ variable_set('file_directory_path', $public_files_directory);
+ variable_set('file_directory_temp', $temp_files_directory);
-// // Include the default profile
-// variable_set('install_profile', 'default');
-// $profile_details = install_profile_info('default', 'en');
+ // Include the default profile.
+ variable_set('install_profile', 'default');
+ $modules = drupal_verify_profile('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();
+ drupal_install_modules($modules);
- // Install additional modules one at a time in order to make sure that the
- // list of modules is updated between each module's installation.
+ // Install modules needed for this test. This could have been passed in as
+ // either a single array argument or a variable number of string arguments.
+ // @todo Remove this compatibility layer in Drupal 8, and only accept
+ // $modules as a single array argument.
$modules = func_get_args();
- foreach ($modules as $module) {
-// drupal_install_modules(array($module), TRUE);
- drupal_install_modules(array($module));
+ if (isset($modules[0]) && is_array($modules[0])) {
+ $modules = $modules[0];
+ }
+ if ($modules) {
+ drupal_install_modules($modules);
}
-
- // 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();
+ drupal_static_reset();
+ drupal_flush_all_caches();
+
+ // Drupal 6 specific cache clears.
+ user_access(NULL, NULL, TRUE);
+
+ // Register actions declared by any modules.
actions_synchronize();
- _drupal_flush_css_js();
+
+ // Reload global $conf array and permissions.
$this->refreshVariables();
$this->checkPermissions(array(), TRUE);
- user_access(NULL, NULL, TRUE); // Drupal 6.
+
+ // Reset statically cached schema for new database prefix.
+ drupal_get_schema(NULL, TRUE);
// 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));
+ $user = user_load(1);
// Restore necessary variables.
variable_set('install_profile', 'default');
@@ -1167,43 +1211,15 @@ class DrupalWebTestCase extends DrupalTe
variable_set('install_task', 'profile-finished');
variable_set('clean_url', $clean_url_original);
variable_set('site_mail', 'simpletest@example.com');
-// // Set up English language.
-// unset($GLOBALS['conf']['language_default']);
-// $language = language_default();
+ // Set up English language.
+ unset($GLOBALS['conf']['language_default']);
+ $language = language_default();
// Use the test mail class instead of the default mail handler class.
-// variable_set('mail_sending_system', array('default-system' => 'TestingMailSystem'));
variable_set('smtp_library', drupal_get_path('module', 'simpletest') . '/simpletest.mail.inc');
- // Use temporary files directory with the same prefix as the database.
-// $public_files_directory = $this->originalFileDirectory . '/' . $db_prefix;
-// $private_files_directory = $public_files_directory . '/private';
- $directory = $this->originalFileDirectory . '/' . $db_prefix;
-
- // Set path variables
-// variable_set('file_public_path', $public_files_directory);
-// variable_set('file_private_path', $private_files_directory);
- variable_set('file_directory_path', $directory);
-
- // Create the directories
-// $directory = file_directory_path('public');
-// file_prepare_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
-// file_prepare_directory($private_files_directory, FILE_CREATE_DIRECTORY);
- file_check_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
-
-// drupal_set_time_limit($this->timeLimit);
- set_time_limit($this->timeLimit);
- }
-
-// /**
-// * This method is called by DrupalWebTestCase::setUp, and preloads the
-// * registry from the testing site to cut down on the time it takes to
-// * setup a clean environment for the current test run.
-// */
-// protected function preloadRegistry() {
-// db_query('INSERT INTO {registry} SELECT * FROM ' . $this->originalPrefix . 'registry');
-// db_query('INSERT INTO {registry_file} SELECT * FROM ' . $this->originalPrefix . 'registry_file');
-// }
+ @set_time_limit($this->timeLimit);
+ }
/**
* Refresh the in-memory set of variables. Useful after a page request is made
@@ -1220,7 +1236,6 @@ class DrupalWebTestCase extends DrupalTe
protected function refreshVariables() {
global $conf;
cache_clear_all('variables', 'cache');
-// $conf = variable_initialize();
$conf = variable_init();
}
@@ -1233,68 +1248,52 @@ class DrupalWebTestCase extends DrupalTe
// 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;
+ simpletest_log_read($this->testId, $this->databasePrefix, get_class($this), TRUE);
$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));
+ $message = format_plural($emailCount, '1 e-mail was sent during this test.', '@count e-mails were sent during this test.');
$this->pass($message, t('E-mail'));
}
- if (preg_match('/simpletest\d+/', $db_prefix)) {
- // Delete temporary files directory.
-// file_unmanaged_delete_recursive(file_directory_path());
- 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;
+ // Delete temporary files directory.
+ file_unmanaged_delete_recursive($this->originalFileDirectory . '/simpletest/' . substr($this->databasePrefix, 10));
- // Return the user to the original one.
- $user = $this->originalUser;
-// drupal_save_session(TRUE);
- session_save_session(TRUE);
+ // 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);
+ }
- // Bring back default language. (Drupal 6)
- if (module_exists('locale')) {
- drupal_init_language();
- locale(NULL, NULL, TRUE);
- }
+ // Get back to the original connection.
+ $db_prefix = $this->originalPrefix;
+ $this->databasePrefix = NULL;
- // Ensure that internal logged in variable and cURL options are reset.
- $this->loggedInUser = FALSE;
- $this->additionalCurlOptions = array();
+ // Return the user to the original one.
+ $user = $this->originalUser;
+ session_save_session(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);
- // Reload module list and implementations to ensure that test module hooks
- // aren't called after tests.
- module_list(TRUE);
-// module_implements('', FALSE, TRUE);
- module_implements('', '', TRUE);
-
- // Reset the Field API.
-// field_cache_clear();
-
- // Rebuild caches.
- $this->refreshVariables();
-
-// // Reset language.
-// $language = $this->originalLanguage;
-// if ($this->originalLanguageDefault) {
-// $GLOBALS['conf']['language_default'] = $this->originalLanguageDefault;
-// }
+ // Rebuild caches.
+ $this->refreshVariables();
- // Close the CURL handler.
- $this->curlClose();
+ // Reset language.
+ $language = $this->originalLanguage;
+ if ($this->originalLanguageDefault) {
+ $GLOBALS['conf']['language_default'] = $this->originalLanguageDefault;
}
+
+ // Close the CURL handler.
+ $this->curlClose();
}
/**
@@ -1306,21 +1305,22 @@ class DrupalWebTestCase extends DrupalTe
* See the description of $curl_options for other options.
*/
protected function curlInitialize() {
- global $base_url, $db_prefix;
+ global $base_url;
if (!isset($this->curlHandle)) {
$this->curlHandle = curl_init();
- $curl_options = $this->additionalCurlOptions + array(
+ $curl_options = array(
CURLOPT_COOKIEJAR => $this->cookieFile,
CURLOPT_URL => $base_url,
- CURLOPT_FOLLOWLOCATION => TRUE,
- CURLOPT_MAXREDIRS => 5,
+ CURLOPT_FOLLOWLOCATION => FALSE,
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'),
+ CURLOPT_USERAGENT => $this->databasePrefix,
);
if (isset($this->httpauth_credentials)) {
+ $curl_options[CURLOPT_HTTPAUTH] = $this->httpauth_method;
$curl_options[CURLOPT_USERPWD] = $this->httpauth_credentials;
}
curl_setopt_array($this->curlHandle, $this->additionalCurlOptions + $curl_options);
@@ -1330,22 +1330,42 @@ class DrupalWebTestCase extends DrupalTe
}
// 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)) {
+ if (preg_match('/simpletest\d+/', $this->databasePrefix, $matches)) {
curl_setopt($this->curlHandle, CURLOPT_USERAGENT, drupal_generate_test_ua($matches[0]));
}
}
/**
- * Performs a cURL exec with the specified options after calling curlConnect().
+ * Initializes and executes a cURL request.
*
* @param $curl_options
- * Custom cURL options.
+ * An associative array of cURL options to set, where the keys are constants
+ * defined by the cURL library. For a list of valid options, see
+ * http://www.php.net/manual/function.curl-setopt.php
+ * @param $redirect
+ * FALSE if this is an initial request, TRUE if this request is the result
+ * of a redirect.
+ *
* @return
- * Content returned from the exec.
+ * The content returned from the call to curl_exec().
+ *
+ * @see curlInitialize()
*/
- protected function curlExec($curl_options) {
+ protected function curlExec($curl_options, $redirect = FALSE) {
$this->curlInitialize();
+
+ // cURL incorrectly handles URLs with a fragment by including the
+ // fragment in the request to the server, causing some web servers
+ // to reject the request citing "400 - Bad Request". To prevent
+ // this, we strip the fragment from the request.
+ // TODO: Remove this for Drupal 8, since fixed in curl 7.20.0.
+ if (!empty($curl_options[CURLOPT_URL]) && strpos($curl_options[CURLOPT_URL], '#')) {
+ $original_url = $curl_options[CURLOPT_URL];
+ $curl_options[CURLOPT_URL] = strtok($curl_options[CURLOPT_URL], '#');
+ }
+
$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
@@ -1356,19 +1376,40 @@ class DrupalWebTestCase extends DrupalTe
}
curl_setopt_array($this->curlHandle, $this->additionalCurlOptions + $curl_options);
- // Reset headers and the session ID.
- $this->session_id = NULL;
- $this->headers = array();
+ if (!$redirect) {
+ // Reset headers, the session ID and the redirect counter.
+ $this->session_id = NULL;
+ $this->headers = array();
+ $this->redirect_count = 0;
+ }
+
+ $content = curl_exec($this->curlHandle);
+ $status = curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE);
+
+ // cURL incorrectly handles URLs with fragments, so instead of
+ // letting cURL handle redirects we take of them ourselves to
+ // to prevent fragments being sent to the web server as part
+ // of the request.
+ // TODO: Remove this for Drupal 8, since fixed in curl 7.20.0.
+ if (in_array($status, array(300, 301, 302, 303, 305, 307)) && $this->redirect_count < variable_get('simpletest_maximum_redirects', 5)) {
+ if ($this->drupalGetHeader('location')) {
+ $this->redirect_count++;
+ $curl_options = array();
+ $curl_options[CURLOPT_URL] = $this->drupalGetHeader('location');
+ $curl_options[CURLOPT_HTTPGET] = TRUE;
+ return $this->curlExec($curl_options, TRUE);
+ }
+ }
- $this->drupalSetContent(curl_exec($this->curlHandle), curl_getinfo($this->curlHandle, CURLINFO_EFFECTIVE_URL));
+ $this->drupalSetContent($content, isset($original_url) ? $original_url : 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))
+ '@url' => isset($original_url) ? $original_url : $url,
+ '@status' => $status,
+ '!length' => format_size(strlen($this->drupalGetContent()))
);
$message = t('!method @url returned @status (!length).', $message_vars);
- $this->assertTrue($this->content !== FALSE, $message, t('Browser'));
+ $this->assertTrue($this->drupalGetContent() !== FALSE, $message, t('Browser'));
return $this->drupalGetContent();
}
@@ -1393,7 +1434,7 @@ class DrupalWebTestCase extends DrupalTe
call_user_func_array(array(&$this, 'error'), unserialize(urldecode($matches[1])));
}
- // Save the session cookie, if set.
+ // Save cookies.
if (preg_match('/^Set-Cookie: ' . preg_quote($this->session_name) . '=([a-z90-9]+)/', $header, $matches)) {
if ($matches[1] != 'deleted') {
$this->session_id = $matches[1];
@@ -1427,7 +1468,7 @@ class DrupalWebTestCase extends DrupalTe
if (!$this->elements) {
// DOM can load HTML soup. But, HTML soup can throw warnings, suppress
// them.
- @$htmlDom = DOMDocument::loadHTML($this->content);
+ @$htmlDom = DOMDocument::loadHTML($this->drupalGetContent());
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
@@ -1465,7 +1506,7 @@ class DrupalWebTestCase extends DrupalTe
$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())) {
+ if ($new = $this->checkForMetaRefresh()) {
$out = $new;
}
$this->verbose('GET request to: ' . $path .
@@ -1483,6 +1524,7 @@ class DrupalWebTestCase extends DrupalTe
* 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:
*
+ * @code
* // First step in form.
* $edit = array(...);
* $this->drupalPost('some_url', $edit, t('Save'));
@@ -1490,6 +1532,7 @@ class DrupalWebTestCase extends DrupalTe
* // Second step in form.
* $edit = array(...);
* $this->drupalPost(NULL, $edit, t('Save'));
+ * @endcode
* @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
@@ -1499,43 +1542,60 @@ class DrupalWebTestCase extends DrupalTe
*
* Multiple select fields can be set using name[] and setting each of the
* possible values. Example:
+ * @code
* $edit = array();
* $edit['name[]'] = array('value1', 'value2');
+ * @endcode
* @param $submit
- * Value of the submit button.
+ * Value of the submit button whose click is to be emulated. For example,
+ * t('Save'). The processing of the request depends on this value. For
+ * example, a form may have one button with the value t('Save') and another
+ * button with the value t('Delete'), and execute different code depending
+ * on which one is clicked.
* @param $options
* Options to be forwarded to url().
* @param $headers
* An array containing additional HTTP request headers, each formatted as
* "name: value".
+ * @param $form_html_id
+ * (optional) HTML ID of the form to be submitted. On some pages
+ * there are many identical forms, so just using the value of the submit
+ * button is not enough. For example: 'trigger-node-presave-assign-form'.
+ * Note that this is not the Drupal $form_id, but rather the HTML ID of the
+ * form, which is typically the same thing but with hyphens replacing the
+ * underscores.
*/
- protected function drupalPost($path, $edit, $submit, array $options = array(), array $headers = array()) {
+ protected function drupalPost($path, $edit, $submit, array $options = array(), array $headers = array(), $form_html_id = NULL) {
$submit_matches = FALSE;
+ $ajax = FALSE;
if (isset($path)) {
- $html = $this->drupalGet($path, $options);
+ $this->drupalGet($path, $options);
}
if ($this->parse()) {
$edit_save = $edit;
// Let's iterate over all the forms.
- $forms = $this->xpath('//form');
+ $xpath = "//form";
+ if (!empty($form_html_id)) {
+ $xpath .= "[@id='" . $form_html_id . "']";
+ }
+ $forms = $this->xpath($xpath);
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);
+ $submit_matches = $this->handleForm($post, $edit, $upload, $ajax ? NULL : $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) {
+ if (!$edit && ($submit_matches || !isset($submit))) {
$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 = drupal_realpath($file);
$file = realpath($file);
if ($file && is_file($file)) {
$post[$key] = '@' . $file;
@@ -1556,7 +1616,7 @@ class DrupalWebTestCase extends DrupalTe
$this->refreshVariables();
// Replace original page output with new output from redirected page(s).
- if (($new = $this->checkForMetaRefresh())) {
+ if ($new = $this->checkForMetaRefresh()) {
$out = $new;
}
$this->verbose('POST request to: ' . $path .
@@ -1570,12 +1630,21 @@ class DrupalWebTestCase extends DrupalTe
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)));
+ if (!$ajax && isset($submit)) {
+ $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)));
}
}
/**
+ * Runs cron in the Drupal installed by Simpletest.
+ */
+ protected function cronRun() {
+ $this->drupalGet($GLOBALS['base_url'] . '/cron.php', array('external' => TRUE));
+ }
+
+ /**
* 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.
@@ -1584,7 +1653,7 @@ class DrupalWebTestCase extends DrupalTe
* Either the new page content or FALSE.
*/
protected function checkForMetaRefresh() {
- if ($this->drupalGetContent() != '' && $this->parse()) {
+ if (strpos($this->drupalGetContent(), 'parse()) {
$refresh = $this->xpath('//meta[@http-equiv="Refresh"]');
if (!empty($refresh)) {
// Parse the content attribute of the meta tag for the format:
@@ -1635,15 +1704,15 @@ class DrupalWebTestCase extends DrupalTe
*/
protected function handleForm(&$post, &$edit, &$upload, $submit, $form) {
// Retrieve the form elements.
- $elements = $form->xpath('.//input|.//textarea|.//select');
+ $elements = $form->xpath('.//input[not(@disabled)]|.//textarea[not(@disabled)]|.//select[not(@disabled)]');
$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 or the name of the tag itself
// for