diff --git a/core/modules/simpletest/tests/common.test b/core/modules/simpletest/tests/common.test index 353ab1c..2f19f56 100644 --- a/core/modules/simpletest/tests/common.test +++ b/core/modules/simpletest/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."); } @@ -2279,14 +2279,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/simpletest/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/simpletest/tests/modules', ), ); diff --git a/core/modules/simpletest/tests/error.test b/core/modules/simpletest/tests/error.test index 8c5a848..ead3526 100644 --- a/core/modules/simpletest/tests/error.test +++ b/core/modules/simpletest/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/actions_loop_test.info b/core/modules/simpletest/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/simpletest/tests/modules/actions_loop_test/actions_loop_test.info diff --git a/core/modules/simpletest/tests/actions_loop_test.install b/core/modules/simpletest/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/simpletest/tests/modules/actions_loop_test/actions_loop_test.install diff --git a/core/modules/simpletest/tests/actions_loop_test.module b/core/modules/simpletest/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/simpletest/tests/modules/actions_loop_test/actions_loop_test.module diff --git a/core/modules/simpletest/tests/ajax_forms_test.info b/core/modules/simpletest/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/simpletest/tests/modules/ajax_forms_test/ajax_forms_test.info diff --git a/core/modules/simpletest/tests/ajax_forms_test.module b/core/modules/simpletest/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/simpletest/tests/modules/ajax_forms_test/ajax_forms_test.module diff --git a/core/modules/simpletest/tests/ajax_test.info b/core/modules/simpletest/tests/modules/ajax_test/ajax_test.info similarity index 100% rename from core/modules/simpletest/tests/ajax_test.info rename to core/modules/simpletest/tests/modules/ajax_test/ajax_test.info diff --git a/core/modules/simpletest/tests/ajax_test.module b/core/modules/simpletest/tests/modules/ajax_test/ajax_test.module similarity index 94% rename from core/modules/simpletest/tests/ajax_test.module rename to core/modules/simpletest/tests/modules/ajax_test/ajax_test.module index 21be019..07b518af 100644 --- a/core/modules/simpletest/tests/ajax_test.module +++ b/core/modules/simpletest/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', 'simpletest') . '/tests/themes/test_theme/test_theme.info'; return $themes; } diff --git a/core/modules/simpletest/tests/batch_test.callbacks.inc b/core/modules/simpletest/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/simpletest/tests/modules/batch_test/batch_test.callbacks.inc diff --git a/core/modules/simpletest/tests/batch_test.info b/core/modules/simpletest/tests/modules/batch_test/batch_test.info similarity index 100% rename from core/modules/simpletest/tests/batch_test.info rename to core/modules/simpletest/tests/modules/batch_test/batch_test.info diff --git a/core/modules/simpletest/tests/batch_test.module b/core/modules/simpletest/tests/modules/batch_test/batch_test.module similarity index 100% rename from core/modules/simpletest/tests/batch_test.module rename to core/modules/simpletest/tests/modules/batch_test/batch_test.module diff --git a/core/modules/simpletest/tests/common_test.css b/core/modules/simpletest/tests/modules/common_test/common_test.css similarity index 100% rename from core/modules/simpletest/tests/common_test.css rename to core/modules/simpletest/tests/modules/common_test/common_test.css diff --git a/core/modules/simpletest/tests/common_test.info b/core/modules/simpletest/tests/modules/common_test/common_test.info similarity index 100% rename from core/modules/simpletest/tests/common_test.info rename to core/modules/simpletest/tests/modules/common_test/common_test.info diff --git a/core/modules/simpletest/tests/common_test.module b/core/modules/simpletest/tests/modules/common_test/common_test.module similarity index 100% rename from core/modules/simpletest/tests/common_test.module rename to core/modules/simpletest/tests/modules/common_test/common_test.module diff --git a/core/modules/simpletest/tests/common_test.print.css b/core/modules/simpletest/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/simpletest/tests/modules/common_test/common_test.print.css diff --git a/core/modules/simpletest/tests/common_test_cron_helper.info b/core/modules/simpletest/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/simpletest/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/simpletest/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/simpletest/tests/modules/common_test_cron_helper/common_test_cron_helper.module diff --git a/core/modules/simpletest/tests/database_test.info b/core/modules/simpletest/tests/modules/database_test/database_test.info similarity index 100% rename from core/modules/simpletest/tests/database_test.info rename to core/modules/simpletest/tests/modules/database_test/database_test.info diff --git a/core/modules/simpletest/tests/database_test.install b/core/modules/simpletest/tests/modules/database_test/database_test.install similarity index 100% rename from core/modules/simpletest/tests/database_test.install rename to core/modules/simpletest/tests/modules/database_test/database_test.install diff --git a/core/modules/simpletest/tests/database_test.module b/core/modules/simpletest/tests/modules/database_test/database_test.module similarity index 100% rename from core/modules/simpletest/tests/database_test.module rename to core/modules/simpletest/tests/modules/database_test/database_test.module diff --git a/core/modules/simpletest/tests/database_test.test b/core/modules/simpletest/tests/modules/database_test/database_test.test similarity index 100% rename from core/modules/simpletest/tests/database_test.test rename to core/modules/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/tests/modules/error_test/error_test.info similarity index 100% rename from core/modules/simpletest/tests/error_test.info rename to core/modules/simpletest/tests/modules/error_test/error_test.info diff --git a/core/modules/simpletest/tests/error_test.module b/core/modules/simpletest/tests/modules/error_test/error_test.module similarity index 100% rename from core/modules/simpletest/tests/error_test.module rename to core/modules/simpletest/tests/modules/error_test/error_test.module diff --git a/core/modules/simpletest/tests/file_test.info b/core/modules/simpletest/tests/modules/file_test/file_test.info similarity index 100% rename from core/modules/simpletest/tests/file_test.info rename to core/modules/simpletest/tests/modules/file_test/file_test.info diff --git a/core/modules/simpletest/tests/file_test.module b/core/modules/simpletest/tests/modules/file_test/file_test.module similarity index 100% rename from core/modules/simpletest/tests/file_test.module rename to core/modules/simpletest/tests/modules/file_test/file_test.module diff --git a/core/modules/simpletest/tests/filter_test.info b/core/modules/simpletest/tests/modules/filter_test/filter_test.info similarity index 100% rename from core/modules/simpletest/tests/filter_test.info rename to core/modules/simpletest/tests/modules/filter_test/filter_test.info diff --git a/core/modules/simpletest/tests/filter_test.module b/core/modules/simpletest/tests/modules/filter_test/filter_test.module similarity index 100% rename from core/modules/simpletest/tests/filter_test.module rename to core/modules/simpletest/tests/modules/filter_test/filter_test.module diff --git a/core/modules/simpletest/tests/form_test.file.inc b/core/modules/simpletest/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/simpletest/tests/modules/form_test/form_test.file.inc diff --git a/core/modules/simpletest/tests/form_test.info b/core/modules/simpletest/tests/modules/form_test/form_test.info similarity index 100% rename from core/modules/simpletest/tests/form_test.info rename to core/modules/simpletest/tests/modules/form_test/form_test.info diff --git a/core/modules/simpletest/tests/form_test.module b/core/modules/simpletest/tests/modules/form_test/form_test.module similarity index 100% rename from core/modules/simpletest/tests/form_test.module rename to core/modules/simpletest/tests/modules/form_test/form_test.module diff --git a/core/modules/simpletest/tests/image_test.info b/core/modules/simpletest/tests/modules/image_test/image_test.info similarity index 100% rename from core/modules/simpletest/tests/image_test.info rename to core/modules/simpletest/tests/modules/image_test/image_test.info diff --git a/core/modules/simpletest/tests/image_test.module b/core/modules/simpletest/tests/modules/image_test/image_test.module similarity index 100% rename from core/modules/simpletest/tests/image_test.module rename to core/modules/simpletest/tests/modules/image_test/image_test.module diff --git a/core/modules/simpletest/tests/menu_test.info b/core/modules/simpletest/tests/modules/menu_test/menu_test.info similarity index 100% rename from core/modules/simpletest/tests/menu_test.info rename to core/modules/simpletest/tests/modules/menu_test/menu_test.info diff --git a/core/modules/simpletest/tests/menu_test.module b/core/modules/simpletest/tests/modules/menu_test/menu_test.module similarity index 100% rename from core/modules/simpletest/tests/menu_test.module rename to core/modules/simpletest/tests/modules/menu_test/menu_test.module diff --git a/core/modules/simpletest/tests/module_test.file.inc b/core/modules/simpletest/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/simpletest/tests/modules/module_test/module_test.file.inc diff --git a/core/modules/simpletest/tests/module_test.info b/core/modules/simpletest/tests/modules/module_test/module_test.info similarity index 100% rename from core/modules/simpletest/tests/module_test.info rename to core/modules/simpletest/tests/modules/module_test/module_test.info diff --git a/core/modules/simpletest/tests/module_test.install b/core/modules/simpletest/tests/modules/module_test/module_test.install similarity index 100% rename from core/modules/simpletest/tests/module_test.install rename to core/modules/simpletest/tests/modules/module_test/module_test.install diff --git a/core/modules/simpletest/tests/module_test.module b/core/modules/simpletest/tests/modules/module_test/module_test.module similarity index 100% rename from core/modules/simpletest/tests/module_test.module rename to core/modules/simpletest/tests/modules/module_test/module_test.module diff --git a/core/modules/simpletest/tests/path_test.info b/core/modules/simpletest/tests/modules/path_test/path_test.info similarity index 100% rename from core/modules/simpletest/tests/path_test.info rename to core/modules/simpletest/tests/modules/path_test/path_test.info diff --git a/core/modules/simpletest/tests/path_test.module b/core/modules/simpletest/tests/modules/path_test/path_test.module similarity index 100% rename from core/modules/simpletest/tests/path_test.module rename to core/modules/simpletest/tests/modules/path_test/path_test.module diff --git a/core/modules/simpletest/tests/requirements1_test.info b/core/modules/simpletest/tests/modules/requirements1_test/requirements1_test.info similarity index 100% rename from core/modules/simpletest/tests/requirements1_test.info rename to core/modules/simpletest/tests/modules/requirements1_test/requirements1_test.info diff --git a/core/modules/simpletest/tests/requirements1_test.install b/core/modules/simpletest/tests/modules/requirements1_test/requirements1_test.install similarity index 100% rename from core/modules/simpletest/tests/requirements1_test.install rename to core/modules/simpletest/tests/modules/requirements1_test/requirements1_test.install diff --git a/core/modules/simpletest/tests/requirements1_test.module b/core/modules/simpletest/tests/modules/requirements1_test/requirements1_test.module similarity index 100% rename from core/modules/simpletest/tests/requirements1_test.module rename to core/modules/simpletest/tests/modules/requirements1_test/requirements1_test.module diff --git a/core/modules/simpletest/tests/requirements2_test.info b/core/modules/simpletest/tests/modules/requirements2_test/requirements2_test.info similarity index 100% rename from core/modules/simpletest/tests/requirements2_test.info rename to core/modules/simpletest/tests/modules/requirements2_test/requirements2_test.info diff --git a/core/modules/simpletest/tests/requirements2_test.module b/core/modules/simpletest/tests/modules/requirements2_test/requirements2_test.module similarity index 100% rename from core/modules/simpletest/tests/requirements2_test.module rename to core/modules/simpletest/tests/modules/requirements2_test/requirements2_test.module diff --git a/core/modules/simpletest/tests/session_test.info b/core/modules/simpletest/tests/modules/session_test/session_test.info similarity index 100% rename from core/modules/simpletest/tests/session_test.info rename to core/modules/simpletest/tests/modules/session_test/session_test.info diff --git a/core/modules/simpletest/tests/session_test.module b/core/modules/simpletest/tests/modules/session_test/session_test.module similarity index 100% rename from core/modules/simpletest/tests/session_test.module rename to core/modules/simpletest/tests/modules/session_test/session_test.module diff --git a/core/modules/simpletest/tests/system_dependencies_test.info b/core/modules/simpletest/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/simpletest/tests/modules/system_dependencies_test/system_dependencies_test.info diff --git a/core/modules/simpletest/tests/system_dependencies_test.module b/core/modules/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/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/simpletest/tests/modules/system_test/system_test.info similarity index 100% rename from core/modules/simpletest/tests/system_test.info rename to core/modules/simpletest/tests/modules/system_test/system_test.info diff --git a/core/modules/simpletest/tests/system_test.module b/core/modules/simpletest/tests/modules/system_test/system_test.module similarity index 100% rename from core/modules/simpletest/tests/system_test.module rename to core/modules/simpletest/tests/modules/system_test/system_test.module diff --git a/core/modules/simpletest/tests/taxonomy_test.info b/core/modules/simpletest/tests/modules/taxonomy_test/taxonomy_test.info similarity index 100% rename from core/modules/simpletest/tests/taxonomy_test.info rename to core/modules/simpletest/tests/modules/taxonomy_test/taxonomy_test.info diff --git a/core/modules/simpletest/tests/taxonomy_test.install b/core/modules/simpletest/tests/modules/taxonomy_test/taxonomy_test.install similarity index 100% rename from core/modules/simpletest/tests/taxonomy_test.install rename to core/modules/simpletest/tests/modules/taxonomy_test/taxonomy_test.install diff --git a/core/modules/simpletest/tests/taxonomy_test.module b/core/modules/simpletest/tests/modules/taxonomy_test/taxonomy_test.module similarity index 100% rename from core/modules/simpletest/tests/taxonomy_test.module rename to core/modules/simpletest/tests/modules/taxonomy_test/taxonomy_test.module diff --git a/core/modules/simpletest/tests/theme_test.inc b/core/modules/simpletest/tests/modules/theme_test/theme_test.inc similarity index 100% rename from core/modules/simpletest/tests/theme_test.inc rename to core/modules/simpletest/tests/modules/theme_test/theme_test.inc diff --git a/core/modules/simpletest/tests/theme_test.info b/core/modules/simpletest/tests/modules/theme_test/theme_test.info similarity index 100% rename from core/modules/simpletest/tests/theme_test.info rename to core/modules/simpletest/tests/modules/theme_test/theme_test.info diff --git a/core/modules/simpletest/tests/theme_test.module b/core/modules/simpletest/tests/modules/theme_test/theme_test.module similarity index 91% rename from core/modules/simpletest/tests/theme_test.module rename to core/modules/simpletest/tests/modules/theme_test/theme_test.module index f6065f2..5ad4382 100644 --- a/core/modules/simpletest/tests/theme_test.module +++ b/core/modules/simpletest/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', 'simpletest') . '/tests/themes/test_theme/test_theme.info'; + $themes['test_basetheme'] = drupal_get_path('module', 'simpletest') . '/tests/themes/test_basetheme/test_basetheme.info'; + $themes['test_subtheme'] = drupal_get_path('module', 'simpletest') . '/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/simpletest/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/simpletest/tests/modules/theme_test/theme_test.template_test.tpl.php diff --git a/core/modules/simpletest/tests/update_script_test.info b/core/modules/simpletest/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/simpletest/tests/modules/update_script_test/update_script_test.info diff --git a/core/modules/simpletest/tests/update_script_test.install b/core/modules/simpletest/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/simpletest/tests/modules/update_script_test/update_script_test.install diff --git a/core/modules/simpletest/tests/update_script_test.module b/core/modules/simpletest/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/simpletest/tests/modules/update_script_test/update_script_test.module diff --git a/core/modules/simpletest/tests/update_test_1.info b/core/modules/simpletest/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/simpletest/tests/modules/update_test_1/update_test_1.info diff --git a/core/modules/simpletest/tests/update_test_1.install b/core/modules/simpletest/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/simpletest/tests/modules/update_test_1/update_test_1.install diff --git a/core/modules/simpletest/tests/update_test_1.module b/core/modules/simpletest/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/simpletest/tests/modules/update_test_1/update_test_1.module diff --git a/core/modules/simpletest/tests/update_test_2.info b/core/modules/simpletest/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/simpletest/tests/modules/update_test_2/update_test_2.info diff --git a/core/modules/simpletest/tests/update_test_2.install b/core/modules/simpletest/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/simpletest/tests/modules/update_test_2/update_test_2.install diff --git a/core/modules/simpletest/tests/update_test_2.module b/core/modules/simpletest/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/simpletest/tests/modules/update_test_2/update_test_2.module diff --git a/core/modules/simpletest/tests/update_test_3.info b/core/modules/simpletest/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/simpletest/tests/modules/update_test_3/update_test_3.info diff --git a/core/modules/simpletest/tests/update_test_3.install b/core/modules/simpletest/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/simpletest/tests/modules/update_test_3/update_test_3.install diff --git a/core/modules/simpletest/tests/update_test_3.module b/core/modules/simpletest/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/simpletest/tests/modules/update_test_3/update_test_3.module diff --git a/core/modules/simpletest/tests/url_alter_test.info b/core/modules/simpletest/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/simpletest/tests/modules/url_alter_test/url_alter_test.info diff --git a/core/modules/simpletest/tests/url_alter_test.install b/core/modules/simpletest/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/simpletest/tests/modules/url_alter_test/url_alter_test.install diff --git a/core/modules/simpletest/tests/url_alter_test.module b/core/modules/simpletest/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/simpletest/tests/modules/url_alter_test/url_alter_test.module diff --git a/core/modules/simpletest/tests/xmlrpc_test.info b/core/modules/simpletest/tests/modules/xmlrpc_test/xmlrpc_test.info similarity index 100% rename from core/modules/simpletest/tests/xmlrpc_test.info rename to core/modules/simpletest/tests/modules/xmlrpc_test/xmlrpc_test.info diff --git a/core/modules/simpletest/tests/xmlrpc_test.module b/core/modules/simpletest/tests/modules/xmlrpc_test/xmlrpc_test.module similarity index 100% rename from core/modules/simpletest/tests/xmlrpc_test.module rename to core/modules/simpletest/tests/modules/xmlrpc_test/xmlrpc_test.module