diff --git a/core/modules/entity/tests/entity_cache_test.info b/core/modules/entity/tests/modules/entity_cache_test/entity_cache_test.info similarity index 100% rename from core/modules/entity/tests/entity_cache_test.info rename to core/modules/entity/tests/modules/entity_cache_test/entity_cache_test.info diff --git a/core/modules/entity/tests/entity_cache_test.module b/core/modules/entity/tests/modules/entity_cache_test/entity_cache_test.module similarity index 100% rename from core/modules/entity/tests/entity_cache_test.module rename to core/modules/entity/tests/modules/entity_cache_test/entity_cache_test.module diff --git a/core/modules/entity/tests/entity_cache_test_dependency.info b/core/modules/entity/tests/modules/entity_cache_test_dependency/entity_cache_test_dependency.info similarity index 100% rename from core/modules/entity/tests/entity_cache_test_dependency.info rename to core/modules/entity/tests/modules/entity_cache_test_dependency/entity_cache_test_dependency.info diff --git a/core/modules/entity/tests/entity_cache_test_dependency.module b/core/modules/entity/tests/modules/entity_cache_test_dependency/entity_cache_test_dependency.module similarity index 100% rename from core/modules/entity/tests/entity_cache_test_dependency.module rename to core/modules/entity/tests/modules/entity_cache_test_dependency/entity_cache_test_dependency.module diff --git a/core/modules/entity/tests/entity_crud_hook_test.info b/core/modules/entity/tests/modules/entity_crud_hook_test/entity_crud_hook_test.info similarity index 100% rename from core/modules/entity/tests/entity_crud_hook_test.info rename to core/modules/entity/tests/modules/entity_crud_hook_test/entity_crud_hook_test.info diff --git a/core/modules/entity/tests/entity_crud_hook_test.module b/core/modules/entity/tests/modules/entity_crud_hook_test/entity_crud_hook_test.module similarity index 100% rename from core/modules/entity/tests/entity_crud_hook_test.module rename to core/modules/entity/tests/modules/entity_crud_hook_test/entity_crud_hook_test.module diff --git a/core/modules/entity/tests/entity_test.info b/core/modules/entity/tests/modules/entity_test/entity_test.info similarity index 100% rename from core/modules/entity/tests/entity_test.info rename to core/modules/entity/tests/modules/entity_test/entity_test.info diff --git a/core/modules/entity/tests/entity_test.install b/core/modules/entity/tests/modules/entity_test/entity_test.install similarity index 100% rename from core/modules/entity/tests/entity_test.install rename to core/modules/entity/tests/modules/entity_test/entity_test.install diff --git a/core/modules/entity/tests/entity_test.module b/core/modules/entity/tests/modules/entity_test/entity_test.module similarity index 100% rename from core/modules/entity/tests/entity_test.module rename to core/modules/entity/tests/modules/entity_test/entity_test.module diff --git a/core/modules/node/tests/node_access_test.info b/core/modules/node/tests/modules/node_access_test/node_access_test.info similarity index 100% rename from core/modules/node/tests/node_access_test.info rename to core/modules/node/tests/modules/node_access_test/node_access_test.info diff --git a/core/modules/node/tests/node_access_test.install b/core/modules/node/tests/modules/node_access_test/node_access_test.install similarity index 100% rename from core/modules/node/tests/node_access_test.install rename to core/modules/node/tests/modules/node_access_test/node_access_test.install diff --git a/core/modules/node/tests/node_access_test.module b/core/modules/node/tests/modules/node_access_test/node_access_test.module similarity index 100% rename from core/modules/node/tests/node_access_test.module rename to core/modules/node/tests/modules/node_access_test/node_access_test.module diff --git a/core/modules/node/tests/node_test.info b/core/modules/node/tests/modules/node_test/node_test.info similarity index 100% rename from core/modules/node/tests/node_test.info rename to core/modules/node/tests/modules/node_test/node_test.info diff --git a/core/modules/node/tests/node_test.module b/core/modules/node/tests/modules/node_test/node_test.module similarity index 100% rename from core/modules/node/tests/node_test.module rename to core/modules/node/tests/modules/node_test/node_test.module diff --git a/core/modules/node/tests/node_test_exception.info b/core/modules/node/tests/modules/node_test_exception/node_test_exception.info similarity index 100% rename from core/modules/node/tests/node_test_exception.info rename to core/modules/node/tests/modules/node_test_exception/node_test_exception.info diff --git a/core/modules/node/tests/node_test_exception.module b/core/modules/node/tests/modules/node_test_exception/node_test_exception.module similarity index 100% rename from core/modules/node/tests/node_test_exception.module rename to core/modules/node/tests/modules/node_test_exception/node_test_exception.module diff --git a/core/modules/search/tests/search_embedded_form.info b/core/modules/search/tests/modules/search_embedded_form/search_embedded_form.info similarity index 100% rename from core/modules/search/tests/search_embedded_form.info rename to core/modules/search/tests/modules/search_embedded_form/search_embedded_form.info diff --git a/core/modules/search/tests/search_embedded_form.module b/core/modules/search/tests/modules/search_embedded_form/search_embedded_form.module similarity index 100% rename from core/modules/search/tests/search_embedded_form.module rename to core/modules/search/tests/modules/search_embedded_form/search_embedded_form.module diff --git a/core/modules/search/tests/search_extra_type.info b/core/modules/search/tests/modules/search_extra_type/search_extra_type.info similarity index 100% rename from core/modules/search/tests/search_extra_type.info rename to core/modules/search/tests/modules/search_extra_type/search_extra_type.info diff --git a/core/modules/search/tests/search_extra_type.module b/core/modules/search/tests/modules/search_extra_type/search_extra_type.module similarity index 100% rename from core/modules/search/tests/search_extra_type.module rename to core/modules/search/tests/modules/search_extra_type/search_extra_type.module diff --git a/core/modules/simpletest/simpletest.info b/core/modules/simpletest/simpletest.info index cf55121..7797fc5 100644 --- a/core/modules/simpletest/simpletest.info +++ b/core/modules/simpletest/simpletest.info @@ -6,41 +6,3 @@ core = 8.x files[] = simpletest.test files[] = drupal_web_test_case.php configure = admin/config/development/testing/settings - -; Tests in tests directory. -files[] = tests/actions.test -files[] = tests/ajax.test -files[] = tests/batch.test -files[] = tests/bootstrap.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/installer.test -files[] = tests/lock.test -files[] = tests/mail.test -files[] = tests/menu.test -files[] = tests/module.test -files[] = tests/pager.test -files[] = tests/password.test -files[] = tests/path.test -files[] = tests/queue.test -files[] = tests/registry.test -files[] = tests/schema.test -files[] = tests/session.test -files[] = tests/symfony.test -files[] = tests/tablesort.test -files[] = tests/theme.test -files[] = tests/unicode.test -files[] = tests/update.test -files[] = tests/uuid.test -files[] = tests/xmlrpc.test -files[] = tests/upgrade/upgrade.test -files[] = tests/upgrade/upgrade_bare.test -files[] = tests/upgrade/upgrade_filled.test -files[] = tests/upgrade/upgrade.language.test diff --git a/core/modules/simpletest/simpletest.test b/core/modules/simpletest/simpletest.test index 55a48be..4cecbe6 100644 --- a/core/modules/simpletest/simpletest.test +++ b/core/modules/simpletest/simpletest.test @@ -86,9 +86,9 @@ class SimpleTestFunctionalTest extends DrupalWebTestCase { function testUserAgentValidation() { if (!$this->inCURL()) { global $base_url; - $simpletest_path = $base_url . '/' . drupal_get_path('module', 'simpletest'); - $HTTP_path = $simpletest_path .'/tests/http.php?q=node'; - $https_path = $simpletest_path .'/tests/https.php?q=node'; + $system_path = $base_url . '/' . drupal_get_path('module', 'system'); + $HTTP_path = $system_path .'/tests/http.php?q=node'; + $https_path = $system_path .'/tests/https.php?q=node'; // Generate a valid simpletest User-Agent to pass validation. $this->assertTrue(preg_match('/simpletest\d+/', $this->databasePrefix, $matches), t('Database prefix contains simpletest prefix.')); $test_ua = drupal_generate_test_ua($matches[0]); diff --git a/core/modules/system/system.info b/core/modules/system/system.info index afe4a81..80bbf2b 100644 --- a/core/modules/system/system.info +++ b/core/modules/system/system.info @@ -8,3 +8,41 @@ files[] = system.tar.inc files[] = system.test required = TRUE configure = admin/config/system + +; Tests in tests directory. +files[] = tests/actions.test +files[] = tests/ajax.test +files[] = tests/batch.test +files[] = tests/bootstrap.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/installer.test +files[] = tests/lock.test +files[] = tests/mail.test +files[] = tests/menu.test +files[] = tests/module.test +files[] = tests/pager.test +files[] = tests/password.test +files[] = tests/path.test +files[] = tests/queue.test +files[] = tests/registry.test +files[] = tests/schema.test +files[] = tests/session.test +files[] = tests/symfony.test +files[] = tests/tablesort.test +files[] = tests/theme.test +files[] = tests/unicode.test +files[] = tests/update.test +files[] = tests/uuid.test +files[] = tests/xmlrpc.test +files[] = tests/upgrade/upgrade.test +files[] = tests/upgrade/upgrade_bare.test +files[] = tests/upgrade/upgrade_filled.test +files[] = tests/upgrade/upgrade.language.test diff --git a/core/modules/simpletest/tests/actions.test b/core/modules/system/tests/actions.test similarity index 100% rename from core/modules/simpletest/tests/actions.test rename to core/modules/system/tests/actions.test diff --git a/core/modules/simpletest/tests/ajax.test b/core/modules/system/tests/ajax.test similarity index 100% rename from core/modules/simpletest/tests/ajax.test rename to core/modules/system/tests/ajax.test diff --git a/core/modules/simpletest/tests/batch.test b/core/modules/system/tests/batch.test similarity index 100% rename from core/modules/simpletest/tests/batch.test rename to core/modules/system/tests/batch.test diff --git a/core/modules/simpletest/tests/bootstrap.test b/core/modules/system/tests/bootstrap.test similarity index 100% rename from core/modules/simpletest/tests/bootstrap.test rename to core/modules/system/tests/bootstrap.test diff --git a/core/modules/simpletest/tests/cache.test b/core/modules/system/tests/cache.test similarity index 100% rename from core/modules/simpletest/tests/cache.test rename to core/modules/system/tests/cache.test diff --git a/core/modules/simpletest/tests/common.test b/core/modules/system/tests/common.test similarity index 99% rename from core/modules/simpletest/tests/common.test rename to core/modules/system/tests/common.test index 4f20361..abb42e9 100644 --- a/core/modules/simpletest/tests/common.test +++ b/core/modules/system/tests/common.test @@ -615,14 +615,14 @@ class CommonCascadingStylesheetsTestCase extends DrupalWebTestCase { // Verify common_test.css in a STYLE media="all" tag. $elements = $this->xpath('//style[@media=:media and contains(text(), :filename)]', array( ':media' => 'all', - ':filename' => 'tests/common_test.css', + ':filename' => 'tests/modules/common_test/common_test.css', )); $this->assertTrue(count($elements), "Stylesheet with media 'all' in module .info file found."); // Verify common_test.print.css in a STYLE media="print" tag. $elements = $this->xpath('//style[@media=:media and contains(text(), :filename)]', array( ':media' => 'print', - ':filename' => 'tests/common_test.print.css', + ':filename' => 'tests/modules/common_test/common_test.print.css', )); $this->assertTrue(count($elements), "Stylesheet with media 'print' in module .info file found."); } @@ -767,23 +767,22 @@ class CommonCascadingStylesheetsTestCase extends DrupalWebTestCase { */ function testRenderOverride() { $system = drupal_get_path('module', 'system'); - $simpletest = drupal_get_path('module', 'simpletest'); drupal_add_css($system . '/system.base.css'); - drupal_add_css($simpletest . '/tests/system.base.css'); + drupal_add_css($system . '/tests/system.base.css'); // The dummy stylesheet should be the only one included. $styles = drupal_get_css(); - $this->assert(strpos($styles, $simpletest . '/tests/system.base.css') !== FALSE, t('The overriding CSS file is output.')); + $this->assert(strpos($styles, $system . '/tests/system.base.css') !== FALSE, t('The overriding CSS file is output.')); $this->assert(strpos($styles, $system . '/system.base.css') === FALSE, t('The overridden CSS file is not output.')); - drupal_add_css($simpletest . '/tests/system.base.css'); + drupal_add_css($system . '/tests/system.base.css'); drupal_add_css($system . '/system.base.css'); // The standard stylesheet should be the only one included. $styles = drupal_get_css(); $this->assert(strpos($styles, $system . '/system.base.css') !== FALSE, t('The overriding CSS file is output.')); - $this->assert(strpos($styles, $simpletest . '/tests/system.base.css') === FALSE, t('The overridden CSS file is not output.')); + $this->assert(strpos($styles, $system . '/tests/system.base.css') === FALSE, t('The overridden CSS file is not output.')); } /** @@ -2249,7 +2248,7 @@ class CommonDrupalParseInfoFileTestCase extends DrupalUnitTestCase { * Parse an example .info file an verify the results. */ function testParseInfoFile() { - $info_values = drupal_parse_info_file(drupal_get_path('module', 'simpletest') . '/tests/common_test_info.txt'); + $info_values = drupal_parse_info_file(drupal_get_path('module', 'system') . '/tests/common_test_info.txt'); $this->assertEqual($info_values['simple_string'], 'A simple string', t('Simple string value was parsed correctly.'), t('System')); $this->assertEqual($info_values['simple_constant'], WATCHDOG_INFO, t('Constant value was parsed correctly.'), t('System')); $this->assertEqual($info_values['double_colon'], 'dummyClassName::', t('Value containing double-colon was parsed correctly.'), t('System')); @@ -2279,14 +2278,14 @@ class CommonDrupalSystemListingTestCase extends DrupalWebTestCase { // with Drupal core, the copy in the core modules directory takes // precedence. 'drupal_system_listing_incompatible_test' => array( - 'core/modules/simpletest/tests', + 'core/modules/system/tests/modules', 'profiles/testing/modules', ), // When both copies of the module are compatible with Drupal core, the // copy in the profile directory takes precedence. 'drupal_system_listing_compatible_test' => array( 'profiles/testing/modules', - 'core/modules/simpletest/tests', + 'core/modules/system/tests/modules', ), ); diff --git a/core/modules/simpletest/tests/common_test_info.txt b/core/modules/system/tests/common_test_info.txt similarity index 100% rename from core/modules/simpletest/tests/common_test_info.txt rename to core/modules/system/tests/common_test_info.txt diff --git a/core/modules/simpletest/tests/error.test b/core/modules/system/tests/error.test similarity index 90% rename from core/modules/simpletest/tests/error.test rename to core/modules/system/tests/error.test index 8c5a848..ead3526 100644 --- a/core/modules/simpletest/tests/error.test +++ b/core/modules/system/tests/error.test @@ -24,19 +24,19 @@ class DrupalErrorHandlerUnitTest extends DrupalWebTestCase { '%type' => 'Notice', '!message' => 'Undefined variable: bananas', '%function' => 'error_test_generate_warnings()', - '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'), + '%file' => drupal_get_path('module', 'error_test') . '/error_test.module', ); $error_warning = array( '%type' => 'Warning', '!message' => 'Division by zero', '%function' => 'error_test_generate_warnings()', - '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'), + '%file' => drupal_get_path('module', 'error_test') . '/error_test.module', ); $error_user_notice = array( '%type' => 'User warning', '!message' => 'Drupal is awesome', '%function' => 'error_test_generate_warnings()', - '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'), + '%file' => drupal_get_path('module', 'error_test') . '/error_test.module', ); // Set error reporting to collect notices. @@ -73,14 +73,14 @@ class DrupalErrorHandlerUnitTest extends DrupalWebTestCase { '!message' => 'Drupal is awesome', '%function' => 'error_test_trigger_exception()', '%line' => 57, - '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'), + '%file' => drupal_get_path('module', 'error_test') . '/error_test.module', ); $error_pdo_exception = array( '%type' => 'PDOException', '!message' => 'SELECT * FROM bananas_are_awesome', '%function' => 'error_test_trigger_pdo_exception()', '%line' => 65, - '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'), + '%file' => drupal_get_path('module', 'error_test') . '/error_test.module', ); $this->drupalGet('error-test/trigger-exception'); diff --git a/core/modules/simpletest/tests/file.test b/core/modules/system/tests/file.test similarity index 100% rename from core/modules/simpletest/tests/file.test rename to core/modules/system/tests/file.test diff --git a/core/modules/simpletest/tests/filetransfer.test b/core/modules/system/tests/filetransfer.test similarity index 100% rename from core/modules/simpletest/tests/filetransfer.test rename to core/modules/system/tests/filetransfer.test diff --git a/core/modules/simpletest/tests/form.test b/core/modules/system/tests/form.test similarity index 100% rename from core/modules/simpletest/tests/form.test rename to core/modules/system/tests/form.test diff --git a/core/modules/simpletest/tests/graph.test b/core/modules/system/tests/graph.test similarity index 100% rename from core/modules/simpletest/tests/graph.test rename to core/modules/system/tests/graph.test diff --git a/core/modules/simpletest/tests/http.php b/core/modules/system/tests/http.php similarity index 89% rename from core/modules/simpletest/tests/http.php rename to core/modules/system/tests/http.php index 91985a6..2481d16 100644 --- a/core/modules/simpletest/tests/http.php +++ b/core/modules/system/tests/http.php @@ -12,7 +12,7 @@ $is_http_mock = !empty($_SERVER['HTTPS']); $_SERVER['HTTPS'] = NULL; ini_set('session.cookie_secure', FALSE); foreach ($_SERVER as $key => $value) { - $_SERVER[$key] = str_replace('core/modules/simpletest/tests/http.php', 'index.php', $value); + $_SERVER[$key] = str_replace('core/modules/system/tests/http.php', 'index.php', $value); $_SERVER[$key] = str_replace('https://', 'http://', $_SERVER[$key]); } diff --git a/core/modules/simpletest/tests/https.php b/core/modules/system/tests/https.php similarity index 89% rename from core/modules/simpletest/tests/https.php rename to core/modules/system/tests/https.php index c342abc..3d07f0c 100644 --- a/core/modules/simpletest/tests/https.php +++ b/core/modules/system/tests/https.php @@ -11,7 +11,7 @@ $is_https_mock = empty($_SERVER['HTTPS']); // Change to https. $_SERVER['HTTPS'] = 'on'; foreach ($_SERVER as $key => $value) { - $_SERVER[$key] = str_replace('core/modules/simpletest/tests/https.php', 'index.php', $value); + $_SERVER[$key] = str_replace('core/modules/system/tests/https.php', 'index.php', $value); $_SERVER[$key] = str_replace('http://', 'https://', $_SERVER[$key]); } diff --git a/core/modules/simpletest/tests/image.test b/core/modules/system/tests/image.test similarity index 100% rename from core/modules/simpletest/tests/image.test rename to core/modules/system/tests/image.test diff --git a/core/modules/simpletest/tests/installer.test b/core/modules/system/tests/installer.test similarity index 100% rename from core/modules/simpletest/tests/installer.test rename to core/modules/system/tests/installer.test diff --git a/core/modules/simpletest/tests/lock.test b/core/modules/system/tests/lock.test similarity index 100% rename from core/modules/simpletest/tests/lock.test rename to core/modules/system/tests/lock.test diff --git a/core/modules/simpletest/tests/mail.test b/core/modules/system/tests/mail.test similarity index 100% rename from core/modules/simpletest/tests/mail.test rename to core/modules/system/tests/mail.test diff --git a/core/modules/simpletest/tests/menu.test b/core/modules/system/tests/menu.test similarity index 100% rename from core/modules/simpletest/tests/menu.test rename to core/modules/system/tests/menu.test diff --git a/core/modules/simpletest/tests/module.test b/core/modules/system/tests/module.test similarity index 100% rename from core/modules/simpletest/tests/module.test rename to core/modules/system/tests/module.test diff --git a/core/modules/simpletest/tests/actions_loop_test.info b/core/modules/system/tests/modules/actions_loop_test/actions_loop_test.info similarity index 100% rename from core/modules/simpletest/tests/actions_loop_test.info rename to core/modules/system/tests/modules/actions_loop_test/actions_loop_test.info diff --git a/core/modules/simpletest/tests/actions_loop_test.install b/core/modules/system/tests/modules/actions_loop_test/actions_loop_test.install similarity index 100% rename from core/modules/simpletest/tests/actions_loop_test.install rename to core/modules/system/tests/modules/actions_loop_test/actions_loop_test.install diff --git a/core/modules/simpletest/tests/actions_loop_test.module b/core/modules/system/tests/modules/actions_loop_test/actions_loop_test.module similarity index 100% rename from core/modules/simpletest/tests/actions_loop_test.module rename to core/modules/system/tests/modules/actions_loop_test/actions_loop_test.module diff --git a/core/modules/simpletest/tests/ajax_forms_test.info b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.info similarity index 100% rename from core/modules/simpletest/tests/ajax_forms_test.info rename to core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.info diff --git a/core/modules/simpletest/tests/ajax_forms_test.module b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module similarity index 100% rename from core/modules/simpletest/tests/ajax_forms_test.module rename to core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module diff --git a/core/modules/simpletest/tests/ajax_test.info b/core/modules/system/tests/modules/ajax_test/ajax_test.info similarity index 100% rename from core/modules/simpletest/tests/ajax_test.info rename to core/modules/system/tests/modules/ajax_test/ajax_test.info diff --git a/core/modules/simpletest/tests/ajax_test.module b/core/modules/system/tests/modules/ajax_test/ajax_test.module similarity index 94% rename from core/modules/simpletest/tests/ajax_test.module rename to core/modules/system/tests/modules/ajax_test/ajax_test.module index 21be019..27b3161 100644 --- a/core/modules/simpletest/tests/ajax_test.module +++ b/core/modules/system/tests/modules/ajax_test/ajax_test.module @@ -35,7 +35,7 @@ function ajax_test_menu() { * Implements hook_system_theme_info(). */ function ajax_test_system_theme_info() { - $themes['test_theme'] = drupal_get_path('module', 'ajax_test') . '/themes/test_theme/test_theme.info'; + $themes['test_theme'] = drupal_get_path('module', 'system') . '/tests/themes/test_theme/test_theme.info'; return $themes; } diff --git a/core/modules/simpletest/tests/batch_test.callbacks.inc b/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc similarity index 100% rename from core/modules/simpletest/tests/batch_test.callbacks.inc rename to core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc diff --git a/core/modules/simpletest/tests/batch_test.info b/core/modules/system/tests/modules/batch_test/batch_test.info similarity index 100% rename from core/modules/simpletest/tests/batch_test.info rename to core/modules/system/tests/modules/batch_test/batch_test.info diff --git a/core/modules/simpletest/tests/batch_test.module b/core/modules/system/tests/modules/batch_test/batch_test.module similarity index 100% rename from core/modules/simpletest/tests/batch_test.module rename to core/modules/system/tests/modules/batch_test/batch_test.module diff --git a/core/modules/simpletest/tests/common_test.css b/core/modules/system/tests/modules/common_test/common_test.css similarity index 100% rename from core/modules/simpletest/tests/common_test.css rename to core/modules/system/tests/modules/common_test/common_test.css diff --git a/core/modules/simpletest/tests/common_test.info b/core/modules/system/tests/modules/common_test/common_test.info similarity index 100% rename from core/modules/simpletest/tests/common_test.info rename to core/modules/system/tests/modules/common_test/common_test.info diff --git a/core/modules/simpletest/tests/common_test.module b/core/modules/system/tests/modules/common_test/common_test.module similarity index 100% rename from core/modules/simpletest/tests/common_test.module rename to core/modules/system/tests/modules/common_test/common_test.module diff --git a/core/modules/simpletest/tests/common_test.print.css b/core/modules/system/tests/modules/common_test/common_test.print.css similarity index 100% rename from core/modules/simpletest/tests/common_test.print.css rename to core/modules/system/tests/modules/common_test/common_test.print.css diff --git a/core/modules/simpletest/tests/common_test_cron_helper.info b/core/modules/system/tests/modules/common_test_cron_helper/common_test_cron_helper.info similarity index 100% rename from core/modules/simpletest/tests/common_test_cron_helper.info rename to core/modules/system/tests/modules/common_test_cron_helper/common_test_cron_helper.info diff --git a/core/modules/simpletest/tests/common_test_cron_helper.module b/core/modules/system/tests/modules/common_test_cron_helper/common_test_cron_helper.module similarity index 100% rename from core/modules/simpletest/tests/common_test_cron_helper.module rename to core/modules/system/tests/modules/common_test_cron_helper/common_test_cron_helper.module diff --git a/core/modules/simpletest/tests/database_test.info b/core/modules/system/tests/modules/database_test/database_test.info similarity index 100% rename from core/modules/simpletest/tests/database_test.info rename to core/modules/system/tests/modules/database_test/database_test.info diff --git a/core/modules/simpletest/tests/database_test.install b/core/modules/system/tests/modules/database_test/database_test.install similarity index 100% rename from core/modules/simpletest/tests/database_test.install rename to core/modules/system/tests/modules/database_test/database_test.install diff --git a/core/modules/simpletest/tests/database_test.module b/core/modules/system/tests/modules/database_test/database_test.module similarity index 100% rename from core/modules/simpletest/tests/database_test.module rename to core/modules/system/tests/modules/database_test/database_test.module diff --git a/core/modules/simpletest/tests/database_test.test b/core/modules/system/tests/modules/database_test/database_test.test similarity index 100% rename from core/modules/simpletest/tests/database_test.test rename to core/modules/system/tests/modules/database_test/database_test.test diff --git a/core/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info b/core/modules/system/tests/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info similarity index 100% rename from core/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info rename to core/modules/system/tests/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info diff --git a/core/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module b/core/modules/system/tests/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module similarity index 100% rename from core/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module rename to core/modules/system/tests/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module diff --git a/core/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info b/core/modules/system/tests/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info similarity index 100% rename from core/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info rename to core/modules/system/tests/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info diff --git a/core/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.module b/core/modules/system/tests/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.module similarity index 100% rename from core/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.module rename to core/modules/system/tests/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.module diff --git a/core/modules/simpletest/tests/error_test.info b/core/modules/system/tests/modules/error_test/error_test.info similarity index 100% rename from core/modules/simpletest/tests/error_test.info rename to core/modules/system/tests/modules/error_test/error_test.info diff --git a/core/modules/simpletest/tests/error_test.module b/core/modules/system/tests/modules/error_test/error_test.module similarity index 100% rename from core/modules/simpletest/tests/error_test.module rename to core/modules/system/tests/modules/error_test/error_test.module diff --git a/core/modules/simpletest/tests/file_test.info b/core/modules/system/tests/modules/file_test/file_test.info similarity index 100% rename from core/modules/simpletest/tests/file_test.info rename to core/modules/system/tests/modules/file_test/file_test.info diff --git a/core/modules/simpletest/tests/file_test.module b/core/modules/system/tests/modules/file_test/file_test.module similarity index 100% rename from core/modules/simpletest/tests/file_test.module rename to core/modules/system/tests/modules/file_test/file_test.module diff --git a/core/modules/simpletest/tests/filter_test.info b/core/modules/system/tests/modules/filter_test/filter_test.info similarity index 100% rename from core/modules/simpletest/tests/filter_test.info rename to core/modules/system/tests/modules/filter_test/filter_test.info diff --git a/core/modules/simpletest/tests/filter_test.module b/core/modules/system/tests/modules/filter_test/filter_test.module similarity index 100% rename from core/modules/simpletest/tests/filter_test.module rename to core/modules/system/tests/modules/filter_test/filter_test.module diff --git a/core/modules/simpletest/tests/form_test.file.inc b/core/modules/system/tests/modules/form_test/form_test.file.inc similarity index 100% rename from core/modules/simpletest/tests/form_test.file.inc rename to core/modules/system/tests/modules/form_test/form_test.file.inc diff --git a/core/modules/simpletest/tests/form_test.info b/core/modules/system/tests/modules/form_test/form_test.info similarity index 100% rename from core/modules/simpletest/tests/form_test.info rename to core/modules/system/tests/modules/form_test/form_test.info diff --git a/core/modules/simpletest/tests/form_test.module b/core/modules/system/tests/modules/form_test/form_test.module similarity index 99% rename from core/modules/simpletest/tests/form_test.module rename to core/modules/system/tests/modules/form_test/form_test.module index 4b0f295..92a2b57 100644 --- a/core/modules/simpletest/tests/form_test.module +++ b/core/modules/system/tests/modules/form_test/form_test.module @@ -1784,7 +1784,7 @@ function form_test_load_include_custom($form, &$form_state) { // Specify the include file and enable form caching. That way the form is // cached when it is submitted, but needs to find the specified submit handler // in the include. - // Filename is a bit weird here: modules/simpletest/tests/form_test.file.inc + // Filename is a bit weird here: modules/system/tests/form_test.file.inc form_load_include($form_state, 'inc', 'form_test', 'form_test.file'); $form_state['cache'] = TRUE; return $form; diff --git a/core/modules/simpletest/tests/image_test.info b/core/modules/system/tests/modules/image_test/image_test.info similarity index 100% rename from core/modules/simpletest/tests/image_test.info rename to core/modules/system/tests/modules/image_test/image_test.info diff --git a/core/modules/simpletest/tests/image_test.module b/core/modules/system/tests/modules/image_test/image_test.module similarity index 100% rename from core/modules/simpletest/tests/image_test.module rename to core/modules/system/tests/modules/image_test/image_test.module diff --git a/core/modules/simpletest/tests/menu_test.info b/core/modules/system/tests/modules/menu_test/menu_test.info similarity index 100% rename from core/modules/simpletest/tests/menu_test.info rename to core/modules/system/tests/modules/menu_test/menu_test.info diff --git a/core/modules/simpletest/tests/menu_test.module b/core/modules/system/tests/modules/menu_test/menu_test.module similarity index 100% rename from core/modules/simpletest/tests/menu_test.module rename to core/modules/system/tests/modules/menu_test/menu_test.module diff --git a/core/modules/simpletest/tests/module_autoload_test/lib/Drupal/module_autoload_test/SomeClass.php b/core/modules/system/tests/modules/module_autoload_test/lib/Drupal/module_autoload_test/SomeClass.php similarity index 100% rename from core/modules/simpletest/tests/module_autoload_test/lib/Drupal/module_autoload_test/SomeClass.php rename to core/modules/system/tests/modules/module_autoload_test/lib/Drupal/module_autoload_test/SomeClass.php diff --git a/core/modules/simpletest/tests/module_autoload_test/module_autoload_test.info b/core/modules/system/tests/modules/module_autoload_test/module_autoload_test.info similarity index 100% rename from core/modules/simpletest/tests/module_autoload_test/module_autoload_test.info rename to core/modules/system/tests/modules/module_autoload_test/module_autoload_test.info diff --git a/core/modules/simpletest/tests/module_autoload_test/module_autoload_test.module b/core/modules/system/tests/modules/module_autoload_test/module_autoload_test.module similarity index 100% rename from core/modules/simpletest/tests/module_autoload_test/module_autoload_test.module rename to core/modules/system/tests/modules/module_autoload_test/module_autoload_test.module diff --git a/core/modules/simpletest/tests/module_test.file.inc b/core/modules/system/tests/modules/module_test/module_test.file.inc similarity index 100% rename from core/modules/simpletest/tests/module_test.file.inc rename to core/modules/system/tests/modules/module_test/module_test.file.inc diff --git a/core/modules/simpletest/tests/module_test.info b/core/modules/system/tests/modules/module_test/module_test.info similarity index 100% rename from core/modules/simpletest/tests/module_test.info rename to core/modules/system/tests/modules/module_test/module_test.info diff --git a/core/modules/simpletest/tests/module_test.install b/core/modules/system/tests/modules/module_test/module_test.install similarity index 100% rename from core/modules/simpletest/tests/module_test.install rename to core/modules/system/tests/modules/module_test/module_test.install diff --git a/core/modules/simpletest/tests/module_test.module b/core/modules/system/tests/modules/module_test/module_test.module similarity index 100% rename from core/modules/simpletest/tests/module_test.module rename to core/modules/system/tests/modules/module_test/module_test.module diff --git a/core/modules/simpletest/tests/path_test.info b/core/modules/system/tests/modules/path_test/path_test.info similarity index 100% rename from core/modules/simpletest/tests/path_test.info rename to core/modules/system/tests/modules/path_test/path_test.info diff --git a/core/modules/simpletest/tests/path_test.module b/core/modules/system/tests/modules/path_test/path_test.module similarity index 100% rename from core/modules/simpletest/tests/path_test.module rename to core/modules/system/tests/modules/path_test/path_test.module diff --git a/core/modules/simpletest/tests/requirements1_test.info b/core/modules/system/tests/modules/requirements1_test/requirements1_test.info similarity index 100% rename from core/modules/simpletest/tests/requirements1_test.info rename to core/modules/system/tests/modules/requirements1_test/requirements1_test.info diff --git a/core/modules/simpletest/tests/requirements1_test.install b/core/modules/system/tests/modules/requirements1_test/requirements1_test.install similarity index 100% rename from core/modules/simpletest/tests/requirements1_test.install rename to core/modules/system/tests/modules/requirements1_test/requirements1_test.install diff --git a/core/modules/simpletest/tests/requirements1_test.module b/core/modules/system/tests/modules/requirements1_test/requirements1_test.module similarity index 100% rename from core/modules/simpletest/tests/requirements1_test.module rename to core/modules/system/tests/modules/requirements1_test/requirements1_test.module diff --git a/core/modules/simpletest/tests/requirements2_test.info b/core/modules/system/tests/modules/requirements2_test/requirements2_test.info similarity index 100% rename from core/modules/simpletest/tests/requirements2_test.info rename to core/modules/system/tests/modules/requirements2_test/requirements2_test.info diff --git a/core/modules/simpletest/tests/requirements2_test.module b/core/modules/system/tests/modules/requirements2_test/requirements2_test.module similarity index 100% rename from core/modules/simpletest/tests/requirements2_test.module rename to core/modules/system/tests/modules/requirements2_test/requirements2_test.module diff --git a/core/modules/simpletest/tests/session_test.info b/core/modules/system/tests/modules/session_test/session_test.info similarity index 100% rename from core/modules/simpletest/tests/session_test.info rename to core/modules/system/tests/modules/session_test/session_test.info diff --git a/core/modules/simpletest/tests/session_test.module b/core/modules/system/tests/modules/session_test/session_test.module similarity index 100% rename from core/modules/simpletest/tests/session_test.module rename to core/modules/system/tests/modules/session_test/session_test.module diff --git a/core/modules/simpletest/tests/system_dependencies_test.info b/core/modules/system/tests/modules/system_dependencies_test/system_dependencies_test.info similarity index 100% rename from core/modules/simpletest/tests/system_dependencies_test.info rename to core/modules/system/tests/modules/system_dependencies_test/system_dependencies_test.info diff --git a/core/modules/simpletest/tests/system_dependencies_test.module b/core/modules/system/tests/modules/system_dependencies_test/system_dependencies_test.module similarity index 100% rename from core/modules/simpletest/tests/system_dependencies_test.module rename to core/modules/system/tests/modules/system_dependencies_test/system_dependencies_test.module diff --git a/core/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info b/core/modules/system/tests/modules/system_incompatible_core_version_dependencies_test/system_incompatible_core_version_dependencies_test.info similarity index 100% rename from core/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info rename to core/modules/system/tests/modules/system_incompatible_core_version_dependencies_test/system_incompatible_core_version_dependencies_test.info diff --git a/core/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.module b/core/modules/system/tests/modules/system_incompatible_core_version_dependencies_test/system_incompatible_core_version_dependencies_test.module similarity index 100% rename from core/modules/simpletest/tests/system_incompatible_core_version_dependencies_test.module rename to core/modules/system/tests/modules/system_incompatible_core_version_dependencies_test/system_incompatible_core_version_dependencies_test.module diff --git a/core/modules/simpletest/tests/system_incompatible_core_version_test.info b/core/modules/system/tests/modules/system_incompatible_core_version_test/system_incompatible_core_version_test.info similarity index 100% rename from core/modules/simpletest/tests/system_incompatible_core_version_test.info rename to core/modules/system/tests/modules/system_incompatible_core_version_test/system_incompatible_core_version_test.info diff --git a/core/modules/simpletest/tests/system_incompatible_core_version_test.module b/core/modules/system/tests/modules/system_incompatible_core_version_test/system_incompatible_core_version_test.module similarity index 100% rename from core/modules/simpletest/tests/system_incompatible_core_version_test.module rename to core/modules/system/tests/modules/system_incompatible_core_version_test/system_incompatible_core_version_test.module diff --git a/core/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info b/core/modules/system/tests/modules/system_incompatible_module_version_dependencies_test/system_incompatible_module_version_dependencies_test.info similarity index 100% rename from core/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info rename to core/modules/system/tests/modules/system_incompatible_module_version_dependencies_test/system_incompatible_module_version_dependencies_test.info diff --git a/core/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.module b/core/modules/system/tests/modules/system_incompatible_module_version_dependencies_test/system_incompatible_module_version_dependencies_test.module similarity index 100% rename from core/modules/simpletest/tests/system_incompatible_module_version_dependencies_test.module rename to core/modules/system/tests/modules/system_incompatible_module_version_dependencies_test/system_incompatible_module_version_dependencies_test.module diff --git a/core/modules/simpletest/tests/system_incompatible_module_version_test.info b/core/modules/system/tests/modules/system_incompatible_module_version_test/system_incompatible_module_version_test.info similarity index 100% rename from core/modules/simpletest/tests/system_incompatible_module_version_test.info rename to core/modules/system/tests/modules/system_incompatible_module_version_test/system_incompatible_module_version_test.info diff --git a/core/modules/simpletest/tests/system_incompatible_module_version_test.module b/core/modules/system/tests/modules/system_incompatible_module_version_test/system_incompatible_module_version_test.module similarity index 100% rename from core/modules/simpletest/tests/system_incompatible_module_version_test.module rename to core/modules/system/tests/modules/system_incompatible_module_version_test/system_incompatible_module_version_test.module diff --git a/core/modules/simpletest/tests/system_test.info b/core/modules/system/tests/modules/system_test/system_test.info similarity index 100% rename from core/modules/simpletest/tests/system_test.info rename to core/modules/system/tests/modules/system_test/system_test.info diff --git a/core/modules/simpletest/tests/system_test.module b/core/modules/system/tests/modules/system_test/system_test.module similarity index 100% rename from core/modules/simpletest/tests/system_test.module rename to core/modules/system/tests/modules/system_test/system_test.module diff --git a/core/modules/simpletest/tests/taxonomy_test.info b/core/modules/system/tests/modules/taxonomy_test/taxonomy_test.info similarity index 100% rename from core/modules/simpletest/tests/taxonomy_test.info rename to core/modules/system/tests/modules/taxonomy_test/taxonomy_test.info diff --git a/core/modules/simpletest/tests/taxonomy_test.install b/core/modules/system/tests/modules/taxonomy_test/taxonomy_test.install similarity index 100% rename from core/modules/simpletest/tests/taxonomy_test.install rename to core/modules/system/tests/modules/taxonomy_test/taxonomy_test.install diff --git a/core/modules/simpletest/tests/taxonomy_test.module b/core/modules/system/tests/modules/taxonomy_test/taxonomy_test.module similarity index 100% rename from core/modules/simpletest/tests/taxonomy_test.module rename to core/modules/system/tests/modules/taxonomy_test/taxonomy_test.module diff --git a/core/modules/simpletest/tests/theme_test.inc b/core/modules/system/tests/modules/theme_test/theme_test.inc similarity index 100% rename from core/modules/simpletest/tests/theme_test.inc rename to core/modules/system/tests/modules/theme_test/theme_test.inc diff --git a/core/modules/simpletest/tests/theme_test.info b/core/modules/system/tests/modules/theme_test/theme_test.info similarity index 100% rename from core/modules/simpletest/tests/theme_test.info rename to core/modules/system/tests/modules/theme_test/theme_test.info diff --git a/core/modules/simpletest/tests/theme_test.module b/core/modules/system/tests/modules/theme_test/theme_test.module similarity index 91% rename from core/modules/simpletest/tests/theme_test.module rename to core/modules/system/tests/modules/theme_test/theme_test.module index f6065f2..f2cd4a0 100644 --- a/core/modules/simpletest/tests/theme_test.module +++ b/core/modules/system/tests/modules/theme_test/theme_test.module @@ -21,9 +21,9 @@ function theme_test_theme($existing, $type, $theme, $path) { * Implements hook_system_theme_info(). */ function theme_test_system_theme_info() { - $themes['test_theme'] = drupal_get_path('module', 'theme_test') . '/themes/test_theme/test_theme.info'; - $themes['test_basetheme'] = drupal_get_path('module', 'theme_test') . '/themes/test_basetheme/test_basetheme.info'; - $themes['test_subtheme'] = drupal_get_path('module', 'theme_test') . '/themes/test_subtheme/test_subtheme.info'; + $themes['test_theme'] = drupal_get_path('module', 'system') . '/tests/themes/test_theme/test_theme.info'; + $themes['test_basetheme'] = drupal_get_path('module', 'system') . '/tests/themes/test_basetheme/test_basetheme.info'; + $themes['test_subtheme'] = drupal_get_path('module', 'system') . '/tests/themes/test_subtheme/test_subtheme.info'; return $themes; } diff --git a/core/modules/simpletest/tests/theme_test.template_test.tpl.php b/core/modules/system/tests/modules/theme_test/theme_test.template_test.tpl.php similarity index 100% rename from core/modules/simpletest/tests/theme_test.template_test.tpl.php rename to core/modules/system/tests/modules/theme_test/theme_test.template_test.tpl.php diff --git a/core/modules/simpletest/tests/update_script_test.info b/core/modules/system/tests/modules/update_script_test/update_script_test.info similarity index 100% rename from core/modules/simpletest/tests/update_script_test.info rename to core/modules/system/tests/modules/update_script_test/update_script_test.info diff --git a/core/modules/simpletest/tests/update_script_test.install b/core/modules/system/tests/modules/update_script_test/update_script_test.install similarity index 100% rename from core/modules/simpletest/tests/update_script_test.install rename to core/modules/system/tests/modules/update_script_test/update_script_test.install diff --git a/core/modules/simpletest/tests/update_script_test.module b/core/modules/system/tests/modules/update_script_test/update_script_test.module similarity index 100% rename from core/modules/simpletest/tests/update_script_test.module rename to core/modules/system/tests/modules/update_script_test/update_script_test.module diff --git a/core/modules/simpletest/tests/update_test_1.info b/core/modules/system/tests/modules/update_test_1/update_test_1.info similarity index 100% rename from core/modules/simpletest/tests/update_test_1.info rename to core/modules/system/tests/modules/update_test_1/update_test_1.info diff --git a/core/modules/simpletest/tests/update_test_1.install b/core/modules/system/tests/modules/update_test_1/update_test_1.install similarity index 100% rename from core/modules/simpletest/tests/update_test_1.install rename to core/modules/system/tests/modules/update_test_1/update_test_1.install diff --git a/core/modules/simpletest/tests/update_test_1.module b/core/modules/system/tests/modules/update_test_1/update_test_1.module similarity index 100% rename from core/modules/simpletest/tests/update_test_1.module rename to core/modules/system/tests/modules/update_test_1/update_test_1.module diff --git a/core/modules/simpletest/tests/update_test_2.info b/core/modules/system/tests/modules/update_test_2/update_test_2.info similarity index 100% rename from core/modules/simpletest/tests/update_test_2.info rename to core/modules/system/tests/modules/update_test_2/update_test_2.info diff --git a/core/modules/simpletest/tests/update_test_2.install b/core/modules/system/tests/modules/update_test_2/update_test_2.install similarity index 100% rename from core/modules/simpletest/tests/update_test_2.install rename to core/modules/system/tests/modules/update_test_2/update_test_2.install diff --git a/core/modules/simpletest/tests/update_test_2.module b/core/modules/system/tests/modules/update_test_2/update_test_2.module similarity index 100% rename from core/modules/simpletest/tests/update_test_2.module rename to core/modules/system/tests/modules/update_test_2/update_test_2.module diff --git a/core/modules/simpletest/tests/update_test_3.info b/core/modules/system/tests/modules/update_test_3/update_test_3.info similarity index 100% rename from core/modules/simpletest/tests/update_test_3.info rename to core/modules/system/tests/modules/update_test_3/update_test_3.info diff --git a/core/modules/simpletest/tests/update_test_3.install b/core/modules/system/tests/modules/update_test_3/update_test_3.install similarity index 100% rename from core/modules/simpletest/tests/update_test_3.install rename to core/modules/system/tests/modules/update_test_3/update_test_3.install diff --git a/core/modules/simpletest/tests/update_test_3.module b/core/modules/system/tests/modules/update_test_3/update_test_3.module similarity index 100% rename from core/modules/simpletest/tests/update_test_3.module rename to core/modules/system/tests/modules/update_test_3/update_test_3.module diff --git a/core/modules/simpletest/tests/url_alter_test.info b/core/modules/system/tests/modules/url_alter_test/url_alter_test.info similarity index 100% rename from core/modules/simpletest/tests/url_alter_test.info rename to core/modules/system/tests/modules/url_alter_test/url_alter_test.info diff --git a/core/modules/simpletest/tests/url_alter_test.install b/core/modules/system/tests/modules/url_alter_test/url_alter_test.install similarity index 100% rename from core/modules/simpletest/tests/url_alter_test.install rename to core/modules/system/tests/modules/url_alter_test/url_alter_test.install diff --git a/core/modules/simpletest/tests/url_alter_test.module b/core/modules/system/tests/modules/url_alter_test/url_alter_test.module similarity index 100% rename from core/modules/simpletest/tests/url_alter_test.module rename to core/modules/system/tests/modules/url_alter_test/url_alter_test.module diff --git a/core/modules/simpletest/tests/xmlrpc_test.info b/core/modules/system/tests/modules/xmlrpc_test/xmlrpc_test.info similarity index 100% rename from core/modules/simpletest/tests/xmlrpc_test.info rename to core/modules/system/tests/modules/xmlrpc_test/xmlrpc_test.info diff --git a/core/modules/simpletest/tests/xmlrpc_test.module b/core/modules/system/tests/modules/xmlrpc_test/xmlrpc_test.module similarity index 100% rename from core/modules/simpletest/tests/xmlrpc_test.module rename to core/modules/system/tests/modules/xmlrpc_test/xmlrpc_test.module diff --git a/core/modules/simpletest/tests/password.test b/core/modules/system/tests/password.test similarity index 100% rename from core/modules/simpletest/tests/password.test rename to core/modules/system/tests/password.test diff --git a/core/modules/simpletest/tests/path.test b/core/modules/system/tests/path.test similarity index 100% rename from core/modules/simpletest/tests/path.test rename to core/modules/system/tests/path.test diff --git a/core/modules/simpletest/tests/queue.test b/core/modules/system/tests/queue.test similarity index 100% rename from core/modules/simpletest/tests/queue.test rename to core/modules/system/tests/queue.test diff --git a/core/modules/simpletest/tests/registry.test b/core/modules/system/tests/registry.test similarity index 100% rename from core/modules/simpletest/tests/registry.test rename to core/modules/system/tests/registry.test diff --git a/core/modules/simpletest/tests/schema.test b/core/modules/system/tests/schema.test similarity index 100% rename from core/modules/simpletest/tests/schema.test rename to core/modules/system/tests/schema.test diff --git a/core/modules/simpletest/tests/session.test b/core/modules/system/tests/session.test similarity index 99% rename from core/modules/simpletest/tests/session.test rename to core/modules/system/tests/session.test index 6303ca5..017a8ba 100644 --- a/core/modules/simpletest/tests/session.test +++ b/core/modules/system/tests/session.test @@ -513,7 +513,7 @@ class SessionHttpsTestCase extends DrupalWebTestCase { */ protected function httpsUrl($url) { global $base_url; - return $base_url . '/core/modules/simpletest/tests/https.php?q=' . $url; + return $base_url . '/core/modules/system/tests/https.php?q=' . $url; } /** @@ -527,7 +527,7 @@ class SessionHttpsTestCase extends DrupalWebTestCase { */ protected function httpUrl($url) { global $base_url; - return $base_url . '/core/modules/simpletest/tests/http.php?q=' . $url; + return $base_url . '/core/modules/system/tests/http.php?q=' . $url; } } diff --git a/core/modules/simpletest/tests/symfony.test b/core/modules/system/tests/symfony.test similarity index 100% rename from core/modules/simpletest/tests/symfony.test rename to core/modules/system/tests/symfony.test diff --git a/core/modules/simpletest/tests/system.base.css b/core/modules/system/tests/system.base.css similarity index 100% rename from core/modules/simpletest/tests/system.base.css rename to core/modules/system/tests/system.base.css diff --git a/core/modules/simpletest/tests/tablesort.test b/core/modules/system/tests/tablesort.test similarity index 100% rename from core/modules/simpletest/tests/tablesort.test rename to core/modules/system/tests/tablesort.test diff --git a/core/modules/simpletest/tests/theme.test b/core/modules/system/tests/theme.test similarity index 100% rename from core/modules/simpletest/tests/theme.test rename to core/modules/system/tests/theme.test diff --git a/core/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info b/core/modules/system/tests/themes/test_basetheme/test_basetheme.info similarity index 100% rename from core/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info rename to core/modules/system/tests/themes/test_basetheme/test_basetheme.info diff --git a/core/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info b/core/modules/system/tests/themes/test_subtheme/test_subtheme.info similarity index 100% rename from core/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info rename to core/modules/system/tests/themes/test_subtheme/test_subtheme.info diff --git a/core/modules/simpletest/tests/themes/test_theme/template.php b/core/modules/system/tests/themes/test_theme/template.php similarity index 100% rename from core/modules/simpletest/tests/themes/test_theme/template.php rename to core/modules/system/tests/themes/test_theme/template.php diff --git a/core/modules/simpletest/tests/themes/test_theme/test_theme.info b/core/modules/system/tests/themes/test_theme/test_theme.info similarity index 100% rename from core/modules/simpletest/tests/themes/test_theme/test_theme.info rename to core/modules/system/tests/themes/test_theme/test_theme.info diff --git a/core/modules/simpletest/tests/themes/test_theme/theme_test.template_test.tpl.php b/core/modules/system/tests/themes/test_theme/theme_test.template_test.tpl.php similarity index 100% rename from core/modules/simpletest/tests/themes/test_theme/theme_test.template_test.tpl.php rename to core/modules/system/tests/themes/test_theme/theme_test.template_test.tpl.php diff --git a/core/modules/simpletest/tests/unicode.test b/core/modules/system/tests/unicode.test similarity index 100% rename from core/modules/simpletest/tests/unicode.test rename to core/modules/system/tests/unicode.test diff --git a/core/modules/simpletest/tests/update.test b/core/modules/system/tests/update.test similarity index 100% rename from core/modules/simpletest/tests/update.test rename to core/modules/system/tests/update.test diff --git a/core/modules/simpletest/tests/upgrade/drupal-7.bare.database.php.gz b/core/modules/system/tests/upgrade/drupal-7.bare.database.php.gz similarity index 100% rename from core/modules/simpletest/tests/upgrade/drupal-7.bare.database.php.gz rename to core/modules/system/tests/upgrade/drupal-7.bare.database.php.gz diff --git a/core/modules/simpletest/tests/upgrade/drupal-7.filled.database.php.gz b/core/modules/system/tests/upgrade/drupal-7.filled.database.php.gz similarity index 100% rename from core/modules/simpletest/tests/upgrade/drupal-7.filled.database.php.gz rename to core/modules/system/tests/upgrade/drupal-7.filled.database.php.gz diff --git a/core/modules/simpletest/tests/upgrade/drupal-7.language.database.php b/core/modules/system/tests/upgrade/drupal-7.language.database.php similarity index 100% rename from core/modules/simpletest/tests/upgrade/drupal-7.language.database.php rename to core/modules/system/tests/upgrade/drupal-7.language.database.php diff --git a/core/modules/simpletest/tests/upgrade/upgrade.language.test b/core/modules/system/tests/upgrade/upgrade.language.test similarity index 97% rename from core/modules/simpletest/tests/upgrade/upgrade.language.test rename to core/modules/system/tests/upgrade/upgrade.language.test index ecbbd12..a4b5e73 100644 --- a/core/modules/simpletest/tests/upgrade/upgrade.language.test +++ b/core/modules/system/tests/upgrade/upgrade.language.test @@ -22,8 +22,8 @@ class LanguageUpgradePathTestCase extends UpgradePathTestCase { public function setUp() { // Path to the database dump files. $this->databaseDumpFiles = array( - drupal_get_path('module', 'simpletest') . '/tests/upgrade/drupal-7.filled.database.php.gz', - drupal_get_path('module', 'simpletest') . '/tests/upgrade/drupal-7.language.database.php', + drupal_get_path('module', 'system') . '/tests/upgrade/drupal-7.filled.database.php.gz', + drupal_get_path('module', 'system') . '/tests/upgrade/drupal-7.language.database.php', ); parent::setUp(); } diff --git a/core/modules/simpletest/tests/upgrade/upgrade.test b/core/modules/system/tests/upgrade/upgrade.test similarity index 100% rename from core/modules/simpletest/tests/upgrade/upgrade.test rename to core/modules/system/tests/upgrade/upgrade.test diff --git a/core/modules/simpletest/tests/upgrade/upgrade_bare.test b/core/modules/system/tests/upgrade/upgrade_bare.test similarity index 89% rename from core/modules/simpletest/tests/upgrade/upgrade_bare.test rename to core/modules/system/tests/upgrade/upgrade_bare.test index f507aea..71553d3 100644 --- a/core/modules/simpletest/tests/upgrade/upgrade_bare.test +++ b/core/modules/system/tests/upgrade/upgrade_bare.test @@ -17,7 +17,7 @@ class BareUpgradePathTestCase extends UpgradePathTestCase { public function setUp() { // Path to the database dump. $this->databaseDumpFiles = array( - drupal_get_path('module', 'simpletest') . '/tests/upgrade/drupal-7.bare.database.php.gz', + drupal_get_path('module', 'system') . '/tests/upgrade/drupal-7.bare.database.php.gz', ); parent::setUp(); } diff --git a/core/modules/simpletest/tests/upgrade/upgrade_filled.test b/core/modules/system/tests/upgrade/upgrade_filled.test similarity index 87% rename from core/modules/simpletest/tests/upgrade/upgrade_filled.test rename to core/modules/system/tests/upgrade/upgrade_filled.test index 9b17bda..947d830 100644 --- a/core/modules/simpletest/tests/upgrade/upgrade_filled.test +++ b/core/modules/system/tests/upgrade/upgrade_filled.test @@ -17,7 +17,7 @@ class FilledUpgradePathTestCase extends UpgradePathTestCase { public function setUp() { // Path to the database dump. $this->databaseDumpFiles = array( - drupal_get_path('module', 'simpletest') . '/tests/upgrade/drupal-7.filled.database.php.gz', + drupal_get_path('module', 'system') . '/tests/upgrade/drupal-7.filled.database.php.gz', ); parent::setUp(); } diff --git a/core/modules/simpletest/tests/uuid.test b/core/modules/system/tests/uuid.test similarity index 100% rename from core/modules/simpletest/tests/uuid.test rename to core/modules/system/tests/uuid.test diff --git a/core/modules/simpletest/tests/xmlrpc.test b/core/modules/system/tests/xmlrpc.test similarity index 100% rename from core/modules/simpletest/tests/xmlrpc.test rename to core/modules/system/tests/xmlrpc.test diff --git a/core/modules/update/tests/aaa_update_test.info b/core/modules/update/tests/modules/aaa_update_test/aaa_update_test.info similarity index 100% rename from core/modules/update/tests/aaa_update_test.info rename to core/modules/update/tests/modules/aaa_update_test/aaa_update_test.info diff --git a/core/modules/update/tests/aaa_update_test.module b/core/modules/update/tests/modules/aaa_update_test/aaa_update_test.module similarity index 100% rename from core/modules/update/tests/aaa_update_test.module rename to core/modules/update/tests/modules/aaa_update_test/aaa_update_test.module diff --git a/core/modules/update/tests/bbb_update_test.info b/core/modules/update/tests/modules/bbb_update_test/bbb_update_test.info similarity index 100% rename from core/modules/update/tests/bbb_update_test.info rename to core/modules/update/tests/modules/bbb_update_test/bbb_update_test.info diff --git a/core/modules/update/tests/bbb_update_test.module b/core/modules/update/tests/modules/bbb_update_test/bbb_update_test.module similarity index 100% rename from core/modules/update/tests/bbb_update_test.module rename to core/modules/update/tests/modules/bbb_update_test/bbb_update_test.module diff --git a/core/modules/update/tests/ccc_update_test.info b/core/modules/update/tests/modules/ccc_update_test/ccc_update_test.info similarity index 100% rename from core/modules/update/tests/ccc_update_test.info rename to core/modules/update/tests/modules/ccc_update_test/ccc_update_test.info diff --git a/core/modules/update/tests/ccc_update_test.module b/core/modules/update/tests/modules/ccc_update_test/ccc_update_test.module similarity index 100% rename from core/modules/update/tests/ccc_update_test.module rename to core/modules/update/tests/modules/ccc_update_test/ccc_update_test.module diff --git a/core/modules/update/tests/aaa_update_test.1_0.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.1_0.xml similarity index 100% rename from core/modules/update/tests/aaa_update_test.1_0.xml rename to core/modules/update/tests/modules/update_test/aaa_update_test.1_0.xml diff --git a/core/modules/update/tests/aaa_update_test.no-releases.xml b/core/modules/update/tests/modules/update_test/aaa_update_test.no-releases.xml similarity index 100% rename from core/modules/update/tests/aaa_update_test.no-releases.xml rename to core/modules/update/tests/modules/update_test/aaa_update_test.no-releases.xml diff --git a/core/modules/update/tests/bbb_update_test.1_0.xml b/core/modules/update/tests/modules/update_test/bbb_update_test.1_0.xml similarity index 100% rename from core/modules/update/tests/bbb_update_test.1_0.xml rename to core/modules/update/tests/modules/update_test/bbb_update_test.1_0.xml diff --git a/core/modules/update/tests/ccc_update_test.1_0.xml b/core/modules/update/tests/modules/update_test/ccc_update_test.1_0.xml similarity index 100% rename from core/modules/update/tests/ccc_update_test.1_0.xml rename to core/modules/update/tests/modules/update_test/ccc_update_test.1_0.xml diff --git a/core/modules/update/tests/drupal.0.xml b/core/modules/update/tests/modules/update_test/drupal.0.xml similarity index 100% rename from core/modules/update/tests/drupal.0.xml rename to core/modules/update/tests/modules/update_test/drupal.0.xml diff --git a/core/modules/update/tests/drupal.1.xml b/core/modules/update/tests/modules/update_test/drupal.1.xml similarity index 100% rename from core/modules/update/tests/drupal.1.xml rename to core/modules/update/tests/modules/update_test/drupal.1.xml diff --git a/core/modules/update/tests/drupal.2-sec.xml b/core/modules/update/tests/modules/update_test/drupal.2-sec.xml similarity index 100% rename from core/modules/update/tests/drupal.2-sec.xml rename to core/modules/update/tests/modules/update_test/drupal.2-sec.xml diff --git a/core/modules/update/tests/drupal.dev.xml b/core/modules/update/tests/modules/update_test/drupal.dev.xml similarity index 100% rename from core/modules/update/tests/drupal.dev.xml rename to core/modules/update/tests/modules/update_test/drupal.dev.xml diff --git a/core/modules/update/tests/update_test.info b/core/modules/update/tests/modules/update_test/update_test.info similarity index 100% rename from core/modules/update/tests/update_test.info rename to core/modules/update/tests/modules/update_test/update_test.info diff --git a/core/modules/update/tests/update_test.module b/core/modules/update/tests/modules/update_test/update_test.module similarity index 97% rename from core/modules/update/tests/update_test.module rename to core/modules/update/tests/modules/update_test/update_test.module index e7ee43e..a3a5a47 100644 --- a/core/modules/update/tests/update_test.module +++ b/core/modules/update/tests/modules/update_test/update_test.module @@ -4,8 +4,8 @@ * Implements hook_system_theme_info(). */ function update_test_system_theme_info() { - $themes['update_test_basetheme'] = drupal_get_path('module', 'update_test') . '/themes/update_test_basetheme/update_test_basetheme.info'; - $themes['update_test_subtheme'] = drupal_get_path('module', 'update_test') . '/themes/update_test_subtheme/update_test_subtheme.info'; + $themes['update_test_basetheme'] = drupal_get_path('module', 'update') . '/tests/themes/update_test_basetheme/update_test_basetheme.info'; + $themes['update_test_subtheme'] = drupal_get_path('module', 'update') . '/tests/themes/update_test_subtheme/update_test_subtheme.info'; return $themes; } diff --git a/core/modules/update/tests/update_test_basetheme.1_1-sec.xml b/core/modules/update/tests/modules/update_test/update_test_basetheme.1_1-sec.xml similarity index 100% rename from core/modules/update/tests/update_test_basetheme.1_1-sec.xml rename to core/modules/update/tests/modules/update_test/update_test_basetheme.1_1-sec.xml diff --git a/core/modules/update/tests/update_test_subtheme.1_0.xml b/core/modules/update/tests/modules/update_test/update_test_subtheme.1_0.xml similarity index 100% rename from core/modules/update/tests/update_test_subtheme.1_0.xml rename to core/modules/update/tests/modules/update_test/update_test_subtheme.1_0.xml