From 8e2d696c95d8d1a44047b1472e69ead81b98d5c3 Mon Sep 17 00:00:00 2001 From: Jennifer Hodgdon Date: Mon, 1 Oct 2012 13:01:17 -0700 Subject: [PATCH] Issue #1797452 by Lars Toomre: Remove t() from system tests starting with M --- .../lib/Drupal/system/Tests/Mail/MailTest.php | 2 +- .../Drupal/system/Tests/Menu/LinksTest.php | 2 +- .../Drupal/system/Tests/Menu/MenuTestBase.php | 6 +- .../Drupal/system/Tests/Menu/RebuildTest.php | 6 +- .../Drupal/system/Tests/Menu/RouterTest.php | 128 +++++++++--------- .../Drupal/system/Tests/Menu/TrailTest.php | 8 +- .../system/Tests/Menu/TreeDataUnitTest.php | 10 +- .../system/Tests/Menu/TreeOutputTest.php | 14 +- .../system/Tests/Module/ClassLoaderTest.php | 4 +- .../system/Tests/Module/DependencyTest.php | 22 +-- .../system/Tests/Module/EnableDisableTest.php | 10 +- .../Tests/Module/HookRequirementsTest.php | 2 +- .../system/Tests/Module/InstallTest.php | 4 +- .../system/Tests/Module/ModuleApiTest.php | 76 +++++------ .../system/Tests/Module/ModuleTestBase.php | 12 +- .../system/Tests/Module/RequiredTest.php | 2 +- .../system/Tests/Module/UninstallTest.php | 2 +- 17 files changed, 155 insertions(+), 155 deletions(-) diff --git a/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php b/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php index 4eaa4c89d6..7d493d3410 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php @@ -55,7 +55,7 @@ public function testPluggableFramework() { $message = drupal_mail('simpletest', 'mail_test', 'testing@example.com', $language_interface->langcode); // Assert whether the message was sent through the send function. - $this->assertEqual(self::$sent_message['to'], 'testing@example.com', t('Pluggable mail system is extendable.')); + $this->assertEqual(self::$sent_message['to'], 'testing@example.com', 'Pluggable mail system is extendable.'); } /** diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/LinksTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/LinksTest.php index fd508db5ce..7d222465fb 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Menu/LinksTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Menu/LinksTest.php @@ -82,7 +82,7 @@ function assertMenuLinkParents($links, $expected_hierarchy) { $menu_link = menu_link_load($mlid); menu_link_save($menu_link); - $this->assertEqual($menu_link['plid'], $plid, t('Menu link %mlid has parent of %plid, expected %expected_plid.', array('%mlid' => $mlid, '%plid' => $menu_link['plid'], '%expected_plid' => $plid))); + $this->assertEqual($menu_link['plid'], $plid, format_string('Menu link %mlid has parent of %plid, expected %expected_plid.', array('%mlid' => $mlid, '%plid' => $menu_link['plid'], '%expected_plid' => $plid))); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuTestBase.php index 978ffe0a11..eb7fbafffb 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuTestBase.php +++ b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuTestBase.php @@ -45,7 +45,7 @@ protected function assertBreadcrumb($goto, array $trail, $page_title = NULL, arr // No parts must be left, or an expected "Home" will always pass. $pass = ($pass && empty($parts)); - $this->assertTrue($pass, t('Breadcrumb %parts found on @path.', array( + $this->assertTrue($pass, format_string('Breadcrumb %parts found on @path.', array( '%parts' => implode(' » ', $trail), '@path' => $this->getUrl(), ))); @@ -75,7 +75,7 @@ protected function assertBreadcrumb($goto, array $trail, $page_title = NULL, arr $i++; } $elements = $this->xpath($xpath); - $this->assertTrue(!empty($elements), t('Active trail to current page was found in menu tree.')); + $this->assertTrue(!empty($elements), 'Active trail to current page was found in menu tree.'); // Append prefix for active link asserted below. $xpath .= '/following-sibling::ul/descendant::'; @@ -92,7 +92,7 @@ protected function assertBreadcrumb($goto, array $trail, $page_title = NULL, arr ':title' => $active_link_title, ); $elements = $this->xpath($xpath, $args); - $this->assertTrue(!empty($elements), t('Active link %title was found in menu tree, including active trail links %tree.', array( + $this->assertTrue(!empty($elements), format_string('Active link %title was found in menu tree, including active trail links %tree.', array( '%title' => $active_link_title, '%tree' => implode(' » ', $tree), ))); diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/RebuildTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/RebuildTest.php index 9cf108084d..4677bb51fa 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Menu/RebuildTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Menu/RebuildTest.php @@ -27,14 +27,14 @@ public static function getInfo() { function testMenuRebuildByVariable() { // Check if 'admin' path exists. $admin_exists = db_query('SELECT path from {menu_router} WHERE path = :path', array(':path' => 'admin'))->fetchField(); - $this->assertEqual($admin_exists, 'admin', t("The path 'admin/' exists prior to deleting.")); + $this->assertEqual($admin_exists, 'admin', "The path 'admin/' exists prior to deleting."); // Delete the path item 'admin', and test that the path doesn't exist in the database. $delete = db_delete('menu_router') ->condition('path', 'admin') ->execute(); $admin_exists = db_query('SELECT path from {menu_router} WHERE path = :path', array(':path' => 'admin'))->fetchField(); - $this->assertFalse($admin_exists, t("The path 'admin/' has been deleted and doesn't exist in the database.")); + $this->assertFalse($admin_exists, "The path 'admin/' has been deleted and doesn't exist in the database."); // Now we enable the rebuild variable and send a request to rebuild the menu // item. Now 'admin' should exist. @@ -42,7 +42,7 @@ function testMenuRebuildByVariable() { // The request should trigger the rebuild. $this->drupalGet(''); $admin_exists = db_query('SELECT path from {menu_router} WHERE path = :path', array(':path' => 'admin'))->fetchField(); - $this->assertEqual($admin_exists, 'admin', t("The menu has been rebuilt, the path 'admin' now exists again.")); + $this->assertEqual($admin_exists, 'admin', "The menu has been rebuilt, the path 'admin' now exists again."); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/RouterTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/RouterTest.php index 42e81b1a38..90c0fc6839 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Menu/RouterTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Menu/RouterTest.php @@ -63,8 +63,8 @@ function setUp() { */ function testTitleCallbackFalse() { $this->drupalGet('node'); - $this->assertText('A title with @placeholder', t('Raw text found on the page')); - $this->assertNoText(t('A title with @placeholder', array('@placeholder' => 'some other text')), t('Text with placeholder substitutions not found.')); + $this->assertText('A title with @placeholder', 'Raw text found on the page'); + $this->assertNoText(t('A title with @placeholder', array('@placeholder' => 'some other text')), 'Text with placeholder substitutions not found.'); } /** @@ -95,8 +95,8 @@ function testDescriptionMenuItems() { function testThemeCallbackAdministrative() { theme_enable(array('seven')); $this->drupalGet('menu-test/theme-callback/use-admin-theme'); - $this->assertText('Custom theme: seven. Actual theme: seven.', t('The administrative theme can be correctly set in a theme callback.')); - $this->assertRaw('seven/style.css', t("The administrative theme's CSS appears on the page.")); + $this->assertText('Custom theme: seven. Actual theme: seven.', 'The administrative theme can be correctly set in a theme callback.'); + $this->assertRaw('seven/style.css', "The administrative theme's CSS appears on the page."); } /** @@ -105,8 +105,8 @@ function testThemeCallbackAdministrative() { function testThemeCallbackInheritance() { theme_enable(array('seven')); $this->drupalGet('menu-test/theme-callback/use-admin-theme/inheritance'); - $this->assertText('Custom theme: seven. Actual theme: seven. Theme callback inheritance is being tested.', t('Theme callback inheritance correctly uses the administrative theme.')); - $this->assertRaw('seven/style.css', t("The administrative theme's CSS appears on the page.")); + $this->assertText('Custom theme: seven. Actual theme: seven. Theme callback inheritance is being tested.', 'Theme callback inheritance correctly uses the administrative theme.'); + $this->assertRaw('seven/style.css', "The administrative theme's CSS appears on the page."); } /** @@ -115,7 +115,7 @@ function testThemeCallbackInheritance() { */ function testFileInheritance() { $this->drupalGet('admin/config/development/file-inheritance'); - $this->assertText('File inheritance test description', t('File inheritance works.')); + $this->assertText('File inheritance test description', 'File inheritance works.'); } /** @@ -139,14 +139,14 @@ function testThemeCallbackMaintenanceMode() { // For a regular user, the fact that the site is in maintenance mode means // we expect the theme callback system to be bypassed entirely. $this->drupalGet('menu-test/theme-callback/use-admin-theme'); - $this->assertRaw('bartik/css/style.css', t("The maintenance theme's CSS appears on the page.")); + $this->assertRaw('bartik/css/style.css', "The maintenance theme's CSS appears on the page."); // An administrator, however, should continue to see the requested theme. $admin_user = $this->drupalCreateUser(array('access site in maintenance mode')); $this->drupalLogin($admin_user); $this->drupalGet('menu-test/theme-callback/use-admin-theme'); - $this->assertText('Custom theme: seven. Actual theme: seven.', t('The theme callback system is correctly triggered for an administrator when the site is in maintenance mode.')); - $this->assertRaw('seven/style.css', t("The administrative theme's CSS appears on the page.")); + $this->assertText('Custom theme: seven. Actual theme: seven.', 'The theme callback system is correctly triggered for an administrator when the site is in maintenance mode.'); + $this->assertRaw('seven/style.css', "The administrative theme's CSS appears on the page."); config('system.maintenance')->set('enabled', 0)->save(); } @@ -163,7 +163,7 @@ function testMaintenanceModeLoginPaths() { $this->drupalGet('node'); $this->assertText($offline_message); $this->drupalGet('menu_login_callback'); - $this->assertText('This is menu_login_callback().', t('Maintenance mode can be bypassed through hook_menu_site_status_alter().')); + $this->assertText('This is menu_login_callback().', 'Maintenance mode can be bypassed through hook_menu_site_status_alter().'); config('system.maintenance')->set('enabled', 0)->save(); } @@ -178,11 +178,11 @@ function testAuthUserUserLogin() { $this->drupalGet('user/login'); // Check that we got to 'user'. - $this->assertTrue($this->url == url('user', array('absolute' => TRUE)), t("Logged-in user redirected to user on accessing user/login")); + $this->assertTrue($this->url == url('user', array('absolute' => TRUE)), "Logged-in user redirected to user on accessing user/login"); // user/register should redirect to user/UID/edit. $this->drupalGet('user/register'); - $this->assertTrue($this->url == url('user/' . $this->loggedInUser->uid . '/edit', array('absolute' => TRUE)), t("Logged-in user redirected to user/UID/edit on accessing user/register")); + $this->assertTrue($this->url == url('user/' . $this->loggedInUser->uid . '/edit', array('absolute' => TRUE)), "Logged-in user redirected to user/UID/edit on accessing user/register"); } /** @@ -191,14 +191,14 @@ function testAuthUserUserLogin() { function testThemeCallbackOptionalTheme() { // Request a theme that is not enabled. $this->drupalGet('menu-test/theme-callback/use-stark-theme'); - $this->assertText('Custom theme: NONE. Actual theme: bartik.', t('The theme callback system falls back on the default theme when a theme that is not enabled is requested.')); - $this->assertRaw('bartik/css/style.css', t("The default theme's CSS appears on the page.")); + $this->assertText('Custom theme: NONE. Actual theme: bartik.', 'The theme callback system falls back on the default theme when a theme that is not enabled is requested.'); + $this->assertRaw('bartik/css/style.css', "The default theme's CSS appears on the page."); // Now enable the theme and request it again. theme_enable(array('stark')); $this->drupalGet('menu-test/theme-callback/use-stark-theme'); - $this->assertText('Custom theme: stark. Actual theme: stark.', t('The theme callback system uses an optional theme once it has been enabled.')); - $this->assertRaw('stark/css/layout.css', t("The optional theme's CSS appears on the page.")); + $this->assertText('Custom theme: stark. Actual theme: stark.', 'The theme callback system uses an optional theme once it has been enabled.'); + $this->assertRaw('stark/css/layout.css', "The optional theme's CSS appears on the page."); } /** @@ -206,8 +206,8 @@ function testThemeCallbackOptionalTheme() { */ function testThemeCallbackFakeTheme() { $this->drupalGet('menu-test/theme-callback/use-fake-theme'); - $this->assertText('Custom theme: NONE. Actual theme: bartik.', t('The theme callback system falls back on the default theme when a theme that does not exist is requested.')); - $this->assertRaw('bartik/css/style.css', t("The default theme's CSS appears on the page.")); + $this->assertText('Custom theme: NONE. Actual theme: bartik.', 'The theme callback system falls back on the default theme when a theme that does not exist is requested.'); + $this->assertRaw('bartik/css/style.css', "The default theme's CSS appears on the page."); } /** @@ -215,8 +215,8 @@ function testThemeCallbackFakeTheme() { */ function testThemeCallbackNoThemeRequested() { $this->drupalGet('menu-test/theme-callback/no-theme-requested'); - $this->assertText('Custom theme: NONE. Actual theme: bartik.', t('The theme callback system falls back on the default theme when no theme is requested.')); - $this->assertRaw('bartik/css/style.css', t("The default theme's CSS appears on the page.")); + $this->assertText('Custom theme: NONE. Actual theme: bartik.', 'The theme callback system falls back on the default theme when no theme is requested.'); + $this->assertRaw('bartik/css/style.css', "The default theme's CSS appears on the page."); } /** @@ -231,8 +231,8 @@ function testHookCustomTheme() { // Visit a page that does not implement a theme callback. The above request // should be honored. $this->drupalGet('menu-test/no-theme-callback'); - $this->assertText('Custom theme: stark. Actual theme: stark.', t('The result of hook_custom_theme() is used as the theme for the current page.')); - $this->assertRaw('stark/css/layout.css', t("The Stark theme's CSS appears on the page.")); + $this->assertText('Custom theme: stark. Actual theme: stark.', 'The result of hook_custom_theme() is used as the theme for the current page.'); + $this->assertRaw('stark/css/layout.css', "The Stark theme's CSS appears on the page."); } /** @@ -247,8 +247,8 @@ function testThemeCallbackHookCustomTheme() { // The menu "theme callback" should take precedence over a value set in // hook_custom_theme(). $this->drupalGet('menu-test/theme-callback/use-admin-theme'); - $this->assertText('Custom theme: seven. Actual theme: seven.', t('The result of hook_custom_theme() does not override what was set in a theme callback.')); - $this->assertRaw('seven/style.css', t("The Seven theme's CSS appears on the page.")); + $this->assertText('Custom theme: seven. Actual theme: seven.', 'The result of hook_custom_theme() does not override what was set in a theme callback.'); + $this->assertRaw('seven/style.css', "The Seven theme's CSS appears on the page."); } /** @@ -306,7 +306,7 @@ function testMenuName() { $sql = "SELECT menu_name FROM {menu_links} WHERE router_path = 'menu_name_test'"; $name = db_query($sql)->fetchField(); - $this->assertEqual($name, 'original', t('Menu name is "original".')); + $this->assertEqual($name, 'original', 'Menu name is "original".'); // Change the menu_name parameter in menu_test.module, then force a menu // rebuild. @@ -315,7 +315,7 @@ function testMenuName() { $sql = "SELECT menu_name FROM {menu_links} WHERE router_path = 'menu_name_test'"; $name = db_query($sql)->fetchField(); - $this->assertEqual($name, 'changed', t('Menu name was successfully changed after rebuild.')); + $this->assertEqual($name, 'changed', 'Menu name was successfully changed after rebuild.'); } /** @@ -326,8 +326,8 @@ function testMenuHierarchy() { $child_link = db_query('SELECT * FROM {menu_links} WHERE link_path = :link_path', array(':link_path' => 'menu-test/hierarchy/parent/child'))->fetchAssoc(); $unattached_child_link = db_query('SELECT * FROM {menu_links} WHERE link_path = :link_path', array(':link_path' => 'menu-test/hierarchy/parent/child2/child'))->fetchAssoc(); - $this->assertEqual($child_link['plid'], $parent_link['mlid'], t('The parent of a directly attached child is correct.')); - $this->assertEqual($unattached_child_link['plid'], $parent_link['mlid'], t('The parent of a non-directly attached child is correct.')); + $this->assertEqual($child_link['plid'], $parent_link['mlid'], 'The parent of a directly attached child is correct.'); + $this->assertEqual($unattached_child_link['plid'], $parent_link['mlid'], 'The parent of a non-directly attached child is correct.'); } /** @@ -347,40 +347,40 @@ function testMenuHidden() { $plid = $parent['mlid']; $link = $links['menu-test/hidden/menu/list']; - $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); + $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); + $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); $link = $links['menu-test/hidden/menu/add']; - $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); + $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); + $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); $link = $links['menu-test/hidden/menu/settings']; - $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); + $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); + $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); $link = $links['menu-test/hidden/menu/manage/%']; - $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); + $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); + $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); $parent = $links['menu-test/hidden/menu/manage/%']; $depth = $parent['depth'] + 1; $plid = $parent['mlid']; $link = $links['menu-test/hidden/menu/manage/%/list']; - $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); + $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); + $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); $link = $links['menu-test/hidden/menu/manage/%/add']; - $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); + $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); + $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); $link = $links['menu-test/hidden/menu/manage/%/edit']; - $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); + $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); + $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); $link = $links['menu-test/hidden/menu/manage/%/delete']; - $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); + $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); + $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); // Verify links for two dynamic arguments. $links = db_select('menu_links', 'ml') @@ -395,28 +395,28 @@ function testMenuHidden() { $plid = $parent['mlid']; $link = $links['menu-test/hidden/block/list']; - $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); + $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); + $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); $link = $links['menu-test/hidden/block/add']; - $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); + $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); + $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); $link = $links['menu-test/hidden/block/manage/%/%']; - $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); + $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); + $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); $parent = $links['menu-test/hidden/block/manage/%/%']; $depth = $parent['depth'] + 1; $plid = $parent['mlid']; $link = $links['menu-test/hidden/block/manage/%/%/configure']; - $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); + $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); + $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); $link = $links['menu-test/hidden/block/manage/%/%/delete']; - $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); - $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); + $this->assertEqual($link['depth'], $depth, format_string('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth))); + $this->assertEqual($link['plid'], $plid, format_string('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid))); } /** @@ -433,7 +433,7 @@ function testMenuGetItemNoAncestors() { function testMenuSetItem() { $item = menu_get_item('node'); - $this->assertEqual($item['path'], 'node', t("Path from menu_get_item('node') is equal to 'node'"), 'menu'); + $this->assertEqual($item['path'], 'node', "Path from menu_get_item('node') is equal to 'node'", 'menu'); // Modify the path for the item then save it. $item['path'] = 'node_test'; @@ -441,7 +441,7 @@ function testMenuSetItem() { menu_set_item('node', $item); $compare_item = menu_get_item('node'); - $this->assertEqual($compare_item, $item, t('Modified menu item is equal to newly retrieved menu item.'), 'menu'); + $this->assertEqual($compare_item, $item, 'Modified menu item is equal to newly retrieved menu item.', 'menu'); } /** @@ -450,13 +450,13 @@ function testMenuSetItem() { function testMenuItemHooks() { // Create an item. menu_link_maintain('menu_test', 'insert', 'menu_test_maintain/4', 'Menu link #4'); - $this->assertEqual(menu_test_static_variable(), 'insert', t('hook_menu_link_insert() fired correctly')); + $this->assertEqual(menu_test_static_variable(), 'insert', 'hook_menu_link_insert() fired correctly'); // Update the item. menu_link_maintain('menu_test', 'update', 'menu_test_maintain/4', 'Menu link updated'); - $this->assertEqual(menu_test_static_variable(), 'update', t('hook_menu_link_update() fired correctly')); + $this->assertEqual(menu_test_static_variable(), 'update', 'hook_menu_link_update() fired correctly'); // Delete the item. menu_link_maintain('menu_test', 'delete', 'menu_test_maintain/4', ''); - $this->assertEqual(menu_test_static_variable(), 'delete', t('hook_menu_link_delete() fired correctly')); + $this->assertEqual(menu_test_static_variable(), 'delete', 'hook_menu_link_delete() fired correctly'); } /** @@ -481,8 +481,8 @@ function testMenuLinkOptions() { // Load front page. $this->drupalGet('node'); - $this->assertRaw('title="Test title attribute"', t('Title attribute of a menu link renders.')); - $this->assertRaw('testparam=testvalue', t('Query parameter added to menu link.')); + $this->assertRaw('title="Test title attribute"', 'Title attribute of a menu link renders.'); + $this->assertRaw('testparam=testvalue', 'Query parameter added to menu link.'); } /** @@ -515,7 +515,7 @@ private function menuItemTitlesCasesHelper($case_no, $override = FALSE) { $this->drupalGet('menu-title-test/case' . $case_no); $this->assertResponse(200); $asserted_title = $override ? 'Alternative example title - Case ' . $case_no : 'Example title - Case ' . $case_no; - $this->assertTitle($asserted_title . ' | Drupal', t('Menu title is') . ': ' . $asserted_title, 'Menu'); + $this->assertTitle($asserted_title . ' | Drupal', format_string('Menu title is: %title.', array('%title' => $asserted_title)), 'Menu'); } /** @@ -572,7 +572,7 @@ function testMenuLoadArgumentsInheritance() { foreach ($expected as $router_path => $load_functions) { $router_item = $this->menuLoadRouter($router_path); - $this->assertIdentical(unserialize($router_item['load_functions']), $load_functions, t('Expected load functions for router %router_path' , array('%router_path' => $router_path))); + $this->assertIdentical(unserialize($router_item['load_functions']), $load_functions, format_string('Expected load functions for router %router_path' , array('%router_path' => $router_path))); } } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TrailTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/TrailTest.php index cf96b861dd..eac8546238 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Menu/TrailTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Menu/TrailTest.php @@ -178,13 +178,13 @@ function testCustom403And404Pages() { // Check that the initial trail (during the Drupal bootstrap) matches // what we expect. $initial_trail = variable_get('menu_test_active_trail_initial', array()); - $this->assertEqual(count($initial_trail), count($expected_trail[$status_code]['initial']), t('The initial active trail for a @status_code page contains the expected number of items (expected: @expected, found: @found).', array( + $this->assertEqual(count($initial_trail), count($expected_trail[$status_code]['initial']), format_string('The initial active trail for a @status_code page contains the expected number of items (expected: @expected, found: @found).', array( '@status_code' => $status_code, '@expected' => count($expected_trail[$status_code]['initial']), '@found' => count($initial_trail), ))); foreach (array_keys($expected_trail[$status_code]['initial']) as $index => $path) { - $this->assertEqual($initial_trail[$index]['href'], $path, t('Element number @number of the initial active trail for a @status_code page contains the correct path (expected: @expected, found: @found)', array( + $this->assertEqual($initial_trail[$index]['href'], $path, format_string('Element number @number of the initial active trail for a @status_code page contains the correct path (expected: @expected, found: @found)', array( '@number' => $index + 1, '@status_code' => $status_code, '@expected' => $path, @@ -195,13 +195,13 @@ function testCustom403And404Pages() { // Check that the final trail (after the user has been redirected to the // custom 403/404 page) matches what we expect. $final_trail = variable_get('menu_test_active_trail_final', array()); - $this->assertEqual(count($final_trail), count($expected_trail[$status_code]['final']), t('The final active trail for a @status_code page contains the expected number of items (expected: @expected, found: @found).', array( + $this->assertEqual(count($final_trail), count($expected_trail[$status_code]['final']), format_string('The final active trail for a @status_code page contains the expected number of items (expected: @expected, found: @found).', array( '@status_code' => $status_code, '@expected' => count($expected_trail[$status_code]['final']), '@found' => count($final_trail), ))); foreach (array_keys($expected_trail[$status_code]['final']) as $index => $path) { - $this->assertEqual($final_trail[$index]['href'], $path, t('Element number @number of the final active trail for a @status_code page contains the correct path (expected: @expected, found: @found)', array( + $this->assertEqual($final_trail[$index]['href'], $path, format_string('Element number @number of the final active trail for a @status_code page contains the correct path (expected: @expected, found: @found)', array( '@number' => $index + 1, '@status_code' => $status_code, '@expected' => $path, diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeDataUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeDataUnitTest.php index 5788e95f64..fac7841a64 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeDataUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeDataUnitTest.php @@ -39,12 +39,12 @@ function testMenuTreeData() { $tree = menu_tree_data($this->links); // Validate that parent items #1, #2, and #5 exist on the root level. - $this->assertSameLink($this->links[1], $tree[1]['link'], t('Parent item #1 exists.')); - $this->assertSameLink($this->links[2], $tree[2]['link'], t('Parent item #2 exists.')); - $this->assertSameLink($this->links[5], $tree[5]['link'], t('Parent item #5 exists.')); + $this->assertSameLink($this->links[1], $tree[1]['link'], 'Parent item #1 exists.'); + $this->assertSameLink($this->links[2], $tree[2]['link'], 'Parent item #2 exists.'); + $this->assertSameLink($this->links[5], $tree[5]['link'], 'Parent item #5 exists.'); // Validate that child item #4 exists at the correct location in the hierarchy. - $this->assertSameLink($this->links[4], $tree[2]['below'][3]['below'][4]['link'], t('Child item #4 exists in the hierarchy.')); + $this->assertSameLink($this->links[4], $tree[2]['below'][3]['below'][4]['link'], 'Child item #4 exists in the hierarchy.'); } /** @@ -60,6 +60,6 @@ function testMenuTreeData() { * TRUE if the assertion succeeded, FALSE otherwise. */ protected function assertSameLink($link1, $link2, $message = '') { - return $this->assert($link1['mlid'] == $link2['mlid'], $message ? $message : t('First link is identical to second link')); + return $this->assert($link1['mlid'] == $link2['mlid'], $message ?: 'First link is identical to second link'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php index e74b82032a..e1b46adbc9 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php @@ -54,15 +54,15 @@ function testMenuTreeData() { $output = menu_tree_output($this->tree_data); // Validate that the - in main-menu is changed into an underscore - $this->assertEqual( $output['1']['#theme'], 'menu_link__main_menu', t('Hyphen is changed to a dash on menu_link')); - $this->assertEqual( $output['#theme_wrappers'][0], 'menu_tree__main_menu', t('Hyphen is changed to a dash on menu_tree wrapper')); + $this->assertEqual( $output['1']['#theme'], 'menu_link__main_menu', 'Hyphen is changed to a dash on menu_link'); + $this->assertEqual( $output['#theme_wrappers'][0], 'menu_tree__main_menu', 'Hyphen is changed to a dash on menu_tree wrapper'); // Looking for child items in the data - $this->assertEqual( $output['1']['#below']['2']['#href'], 'a/b', t('Checking the href on a child item')); - $this->assertTrue( in_array('active-trail',$output['1']['#below']['2']['#attributes']['class']) , t('Checking the active trail class')); + $this->assertEqual( $output['1']['#below']['2']['#href'], 'a/b', 'Checking the href on a child item'); + $this->assertTrue( in_array('active-trail',$output['1']['#below']['2']['#attributes']['class']) , 'Checking the active trail class'); // Validate that the hidden and no access items are missing - $this->assertFalse( isset($output['5']), t('Hidden item should be missing')); - $this->assertFalse( isset($output['6']), t('False access should be missing')); + $this->assertFalse( isset($output['5']), 'Hidden item should be missing'); + $this->assertFalse( isset($output['6']), 'False access should be missing'); // Item 7 is after a couple hidden items. Just to make sure that 5 and 6 are skipped and 7 still included - $this->assertTrue( isset($output['7']), t('Item after hidden items is present')); + $this->assertTrue( isset($output['7']), 'Item after hidden items is present'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ClassLoaderTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/ClassLoaderTest.php index aa74dcf563..df59ea08d8 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Module/ClassLoaderTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Module/ClassLoaderTest.php @@ -32,7 +32,7 @@ function testClassLoading() { // Check twice to test an unprimed and primed system_list() cache. for ($i=0; $i<2; $i++) { $this->drupalGet('module-test/class-loading'); - $this->assertText($expected, t('Autoloader loads classes from an enabled module.')); + $this->assertText($expected, 'Autoloader loads classes from an enabled module.'); } module_disable(array('module_autoload_test'), FALSE); @@ -40,7 +40,7 @@ function testClassLoading() { // Check twice to test an unprimed and primed system_list() cache. for ($i=0; $i<2; $i++) { $this->drupalGet('module-test/class-loading'); - $this->assertNoText($expected, t('Autoloader does not load classes from a disabled module.')); + $this->assertNoText($expected, 'Autoloader does not load classes from a disabled module.'); } } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php index 7e0c5e9567..88dab0da9d 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php @@ -27,7 +27,7 @@ function testEnableWithoutDependency() { $edit = array(); $edit['modules[Core][translation][enable]'] = 'translation'; $this->drupalPost('admin/modules', $edit, t('Save configuration')); - $this->assertText(t('Some required modules must be enabled'), t('Dependency required.')); + $this->assertText(t('Some required modules must be enabled'), 'Dependency required.'); $this->assertModules(array('translation', 'locale', 'language'), FALSE); @@ -35,7 +35,7 @@ function testEnableWithoutDependency() { $this->assertTableCount('language', FALSE); $this->drupalPost(NULL, NULL, t('Continue')); - $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.')); + $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.'); $this->assertModules(array('translation', 'language'), TRUE); @@ -50,9 +50,9 @@ function testMissingModules() { // Test that the system_dependencies_test module is marked // as missing a dependency. $this->drupalGet('admin/modules'); - $this->assertRaw(t('@module (missing)', array('@module' => drupal_ucfirst('_missing_dependency'))), t('A module with missing dependencies is marked as such.')); + $this->assertRaw(t('@module (missing)', array('@module' => drupal_ucfirst('_missing_dependency'))), 'A module with missing dependencies is marked as such.'); $checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[Testing][system_dependencies_test][enable]"]'); - $this->assert(count($checkbox) == 1, t('Checkbox for the module is disabled.')); + $this->assert(count($checkbox) == 1, 'Checkbox for the module is disabled.'); // Force enable the system_dependencies_test module. module_enable(array('system_dependencies_test'), FALSE); @@ -60,7 +60,7 @@ function testMissingModules() { // Verify that the module is forced to be disabled when submitting // the module page. $this->drupalPost('admin/modules', array(), t('Save configuration')); - $this->assertText(t('The @module module is missing, so the following module will be disabled: @depends.', array('@module' => '_missing_dependency', '@depends' => 'system_dependencies_test')), t('The module missing dependencies will be disabled.')); + $this->assertText(t('The @module module is missing, so the following module will be disabled: @depends.', array('@module' => '_missing_dependency', '@depends' => 'system_dependencies_test')), 'The module missing dependencies will be disabled.'); // Confirm. $this->drupalPost(NULL, NULL, t('Continue')); @@ -81,7 +81,7 @@ function testIncompatibleModuleVersionDependency() { '@version' => '1.0', )), 'A module that depends on an incompatible version of a module is marked as such.'); $checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[Testing][system_incompatible_module_version_dependencies_test][enable]"]'); - $this->assert(count($checkbox) == 1, t('Checkbox for the module is disabled.')); + $this->assert(count($checkbox) == 1, 'Checkbox for the module is disabled.'); } /** @@ -95,7 +95,7 @@ function testIncompatibleCoreVersionDependency() { '@module' => 'System incompatible core version test', )), 'A module that depends on a module with an incompatible core version is marked as such.'); $checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[Testing][system_incompatible_core_version_dependencies_test][enable]"]'); - $this->assert(count($checkbox) == 1, t('Checkbox for the module is disabled.')); + $this->assert(count($checkbox) == 1, 'Checkbox for the module is disabled.'); } /** @@ -114,7 +114,7 @@ function testEnableRequirementsFailureDependency() { $this->drupalPost('admin/modules', $edit, t('Save configuration')); // Makes sure the modules were NOT installed. - $this->assertText(t('Requirements 1 Test failed requirements'), t('Modules status has been updated.')); + $this->assertText(t('Requirements 1 Test failed requirements'), 'Modules status has been updated.'); $this->assertModules(array('requirements1_test'), FALSE); $this->assertModules(array('requirements2_test'), FALSE); @@ -180,17 +180,17 @@ function testUninstallDependents() { // Check that the taxonomy module cannot be uninstalled. $this->drupalGet('admin/modules/uninstall'); $checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="uninstall[comment]"]'); - $this->assert(count($checkbox) == 1, t('Checkbox for uninstalling the comment module is disabled.')); + $this->assert(count($checkbox) == 1, 'Checkbox for uninstalling the comment module is disabled.'); // Uninstall the forum module, and check that taxonomy now can also be // uninstalled. $edit = array('uninstall[forum]' => 'forum'); $this->drupalPost('admin/modules/uninstall', $edit, t('Uninstall')); $this->drupalPost(NULL, NULL, t('Uninstall')); - $this->assertText(t('The selected modules have been uninstalled.'), t('Modules status has been updated.')); + $this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.'); $edit = array('uninstall[comment]' => 'comment'); $this->drupalPost('admin/modules/uninstall', $edit, t('Uninstall')); $this->drupalPost(NULL, NULL, t('Uninstall')); - $this->assertText(t('The selected modules have been uninstalled.'), t('Modules status has been updated.')); + $this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/EnableDisableTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/EnableDisableTest.php index 8afe33bfee..cbd26b3de2 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Module/EnableDisableTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Module/EnableDisableTest.php @@ -47,7 +47,7 @@ function testEnableDisable() { } } - $this->assertTrue(count($modules), t('Found @count modules that can be enabled: %modules', array( + $this->assertTrue(count($modules), format_string('Found @count modules that can be enabled: %modules', array( '@count' => count($modules), '%modules' => implode(', ', array_keys($modules)), ))); @@ -95,7 +95,7 @@ function testEnableDisable() { if (count($modules_to_enable) > 1) { $this->drupalPost(NULL, array(), t('Continue')); } - $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.')); + $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.'); // Check that hook_modules_installed() and hook_modules_enabled() were // invoked with the expected list of modules, that each module's @@ -162,7 +162,7 @@ function testEnableDisable() { $edit['modules[Core][' . $name . '][enable]'] = $name; } $this->drupalPost('admin/modules', $edit, t('Save configuration')); - $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.')); + $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.'); } /** @@ -176,7 +176,7 @@ function assertSuccessfulDisableAndUninstall($module) { $edit = array(); $edit['modules[Core][' . $module . '][enable]'] = FALSE; $this->drupalPost('admin/modules', $edit, t('Save configuration')); - $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.')); + $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.'); $this->assertModules(array($module), FALSE); // Check that the appropriate hook was fired and the appropriate log @@ -194,7 +194,7 @@ function assertSuccessfulDisableAndUninstall($module) { $edit['uninstall[' . $module . ']'] = $module; $this->drupalPost('admin/modules/uninstall', $edit, t('Uninstall')); $this->drupalPost(NULL, NULL, t('Uninstall')); - $this->assertText(t('The selected modules have been uninstalled.'), t('Modules status has been updated.')); + $this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.'); $this->assertModules(array($module), FALSE); // Check that the appropriate hook was fired and the appropriate log diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/HookRequirementsTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/HookRequirementsTest.php index 6e71f1fd98..1572f5dd95 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Module/HookRequirementsTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Module/HookRequirementsTest.php @@ -31,7 +31,7 @@ function testHookRequirementsFailure() { $this->drupalPost('admin/modules', $edit, t('Save configuration')); // Makes sure the module was NOT installed. - $this->assertText(t('Requirements 1 Test failed requirements'), t('Modules status has been updated.')); + $this->assertText(t('Requirements 1 Test failed requirements'), 'Modules status has been updated.'); $this->assertModules(array('requirements1_test'), FALSE); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/InstallTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/InstallTest.php index 29e5322275..a141f00d9d 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Module/InstallTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Module/InstallTest.php @@ -45,7 +45,7 @@ function testDrupalWriteRecord() { // Check for data that was inserted using drupal_write_record() while the // 'module_test' module was being installed and enabled. $data = db_query("SELECT data FROM {module_test}")->fetchCol(); - $this->assertTrue(in_array('Data inserted in hook_install()', $data), t('Data inserted using drupal_write_record() in hook_install() is correctly saved.')); - $this->assertTrue(in_array('Data inserted in hook_enable()', $data), t('Data inserted using drupal_write_record() in hook_enable() is correctly saved.')); + $this->assertTrue(in_array('Data inserted in hook_install()', $data), 'Data inserted using drupal_write_record() in hook_install() is correctly saved.'); + $this->assertTrue(in_array('Data inserted in hook_enable()', $data), 'Data inserted using drupal_write_record() in hook_enable() is correctly saved.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php index 8468185a38..75070a976b 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php @@ -83,7 +83,7 @@ function testModuleList() { */ protected function assertModuleList(Array $expected_values, $condition) { $expected_values = array_combine($expected_values, $expected_values); - $this->assertEqual($expected_values, module_list(), t('@condition: module_list() returns correct results', array('@condition' => $condition))); + $this->assertEqual($expected_values, module_list(), format_string('@condition: module_list() returns correct results', array('@condition' => $condition))); } /** @@ -92,16 +92,16 @@ protected function assertModuleList(Array $expected_values, $condition) { function testModuleImplements() { // Clear the cache. cache('bootstrap')->delete('module_implements'); - $this->assertFalse(cache('bootstrap')->get('module_implements'), t('The module implements cache is empty.')); + $this->assertFalse(cache('bootstrap')->get('module_implements'), 'The module implements cache is empty.'); $this->drupalGet(''); - $this->assertTrue(cache('bootstrap')->get('module_implements'), t('The module implements cache is populated after requesting a page.')); + $this->assertTrue(cache('bootstrap')->get('module_implements'), 'The module implements cache is populated after requesting a page.'); // Test again with an authenticated user. $this->user = $this->drupalCreateUser(); $this->drupalLogin($this->user); cache('bootstrap')->delete('module_implements'); $this->drupalGet(''); - $this->assertTrue(cache('bootstrap')->get('module_implements'), t('The module implements cache is populated after requesting a page.')); + $this->assertTrue(cache('bootstrap')->get('module_implements'), 'The module implements cache is populated after requesting a page.'); // Make sure group include files are detected properly even when the file is // already loaded when the cache is rebuilt. @@ -122,7 +122,7 @@ function testModuleInvoke() { module_enable(array('module_test'), FALSE); $this->resetAll(); $this->drupalGet('module-test/hook-dynamic-loading-invoke'); - $this->assertText('success!', t('module_invoke() dynamically loads a hook defined in hook_hook_info().')); + $this->assertText('success!', 'module_invoke() dynamically loads a hook defined in hook_hook_info().'); } /** @@ -132,7 +132,7 @@ function testModuleInvokeAll() { module_enable(array('module_test'), FALSE); $this->resetAll(); $this->drupalGet('module-test/hook-dynamic-loading-invoke-all'); - $this->assertText('success!', t('module_invoke_all() dynamically loads a hook defined in hook_hook_info().')); + $this->assertText('success!', 'module_invoke_all() dynamically loads a hook defined in hook_hook_info().'); } /** @@ -145,7 +145,7 @@ function testModuleInvokeAllDuringLoadFunction() { module_enable(array('module_test'), FALSE); $this->resetAll(); $this->drupalGet('module-test/hook-dynamic-loading-invoke-all-during-load/module_test'); - $this->assertText('success!', t('Menu item load function invokes a hook defined in hook_hook_info().')); + $this->assertText('success!', 'Menu item load function invokes a hook defined in hook_hook_info().'); } /** @@ -156,79 +156,79 @@ function testDependencyResolution() { // are not already enabled. (If they were, the tests below would not work // correctly.) module_enable(array('module_test'), FALSE); - $this->assertTrue(module_exists('module_test'), t('Test module is enabled.')); - $this->assertFalse(module_exists('forum'), t('Forum module is disabled.')); - $this->assertFalse(module_exists('poll'), t('Poll module is disabled.')); - $this->assertFalse(module_exists('php'), t('PHP module is disabled.')); + $this->assertTrue(module_exists('module_test'), 'Test module is enabled.'); + $this->assertFalse(module_exists('forum'), 'Forum module is disabled.'); + $this->assertFalse(module_exists('poll'), 'Poll module is disabled.'); + $this->assertFalse(module_exists('php'), 'PHP module is disabled.'); // First, create a fake missing dependency. Forum depends on poll, which // depends on a made-up module, foo. Nothing should be installed. variable_set('dependency_test', 'missing dependency'); drupal_static_reset('system_rebuild_module_data'); $result = module_enable(array('forum')); - $this->assertFalse($result, t('module_enable() returns FALSE if dependencies are missing.')); - $this->assertFalse(module_exists('forum'), t('module_enable() aborts if dependencies are missing.')); + $this->assertFalse($result, 'module_enable() returns FALSE if dependencies are missing.'); + $this->assertFalse(module_exists('forum'), 'module_enable() aborts if dependencies are missing.'); // Now, fix the missing dependency. Forum module depends on poll, but poll // depends on the PHP module. module_enable() should work. variable_set('dependency_test', 'dependency'); drupal_static_reset('system_rebuild_module_data'); $result = module_enable(array('forum')); - $this->assertTrue($result, t('module_enable() returns the correct value.')); + $this->assertTrue($result, 'module_enable() returns the correct value.'); // Verify that the fake dependency chain was installed. - $this->assertTrue(module_exists('poll') && module_exists('php'), t('Dependency chain was installed by module_enable().')); + $this->assertTrue(module_exists('poll') && module_exists('php'), 'Dependency chain was installed by module_enable().'); // Verify that the original module was installed. - $this->assertTrue(module_exists('forum'), t('Module installation with unlisted dependencies succeeded.')); + $this->assertTrue(module_exists('forum'), 'Module installation with unlisted dependencies succeeded.'); // Finally, verify that the modules were enabled in the correct order. - $this->assertEqual(variable_get('test_module_enable_order', array()), array('php', 'poll', 'forum'), t('Modules were enabled in the correct order by module_enable().')); + $this->assertEqual(variable_get('test_module_enable_order', array()), array('php', 'poll', 'forum'), 'Modules were enabled in the correct order by module_enable().'); // Now, disable the PHP module. Both forum and poll should be disabled as // well, in the correct order. module_disable(array('php')); - $this->assertTrue(!module_exists('forum') && !module_exists('poll'), t('Depedency chain was disabled by module_disable().')); - $this->assertFalse(module_exists('php'), t('Disabling a module with unlisted dependents succeeded.')); - $this->assertEqual(variable_get('test_module_disable_order', array()), array('forum', 'poll', 'php'), t('Modules were disabled in the correct order by module_disable().')); + $this->assertTrue(!module_exists('forum') && !module_exists('poll'), 'Depedency chain was disabled by module_disable().'); + $this->assertFalse(module_exists('php'), 'Disabling a module with unlisted dependents succeeded.'); + $this->assertEqual(variable_get('test_module_disable_order', array()), array('forum', 'poll', 'php'), 'Modules were disabled in the correct order by module_disable().'); // Disable a module that is listed as a dependency by the install profile. // Make sure that the profile itself is not on the list of dependent // modules to be disabled. $profile = drupal_get_profile(); $info = install_profile_info($profile); - $this->assertTrue(in_array('comment', $info['dependencies']), t('Comment module is listed as a dependency of the install profile.')); - $this->assertTrue(module_exists('comment'), t('Comment module is enabled.')); + $this->assertTrue(in_array('comment', $info['dependencies']), 'Comment module is listed as a dependency of the install profile.'); + $this->assertTrue(module_exists('comment'), 'Comment module is enabled.'); module_disable(array('comment')); - $this->assertFalse(module_exists('comment'), t('Comment module was disabled.')); + $this->assertFalse(module_exists('comment'), 'Comment module was disabled.'); $disabled_modules = variable_get('test_module_disable_order', array()); - $this->assertTrue(in_array('comment', $disabled_modules), t('Comment module is in the list of disabled modules.')); - $this->assertFalse(in_array($profile, $disabled_modules), t('The installation profile is not in the list of disabled modules.')); + $this->assertTrue(in_array('comment', $disabled_modules), 'Comment module is in the list of disabled modules.'); + $this->assertFalse(in_array($profile, $disabled_modules), 'The installation profile is not in the list of disabled modules.'); // Try to uninstall the PHP module by itself. This should be rejected, // since the modules which it depends on need to be uninstalled first, and // that is too destructive to perform automatically. $result = module_uninstall(array('php')); - $this->assertFalse($result, t('Calling module_uninstall() on a module whose dependents are not uninstalled fails.')); + $this->assertFalse($result, 'Calling module_uninstall() on a module whose dependents are not uninstalled fails.'); foreach (array('forum', 'poll', 'php') as $module) { - $this->assertNotEqual(drupal_get_installed_schema_version($module), SCHEMA_UNINSTALLED, t('The @module module was not uninstalled.', array('@module' => $module))); + $this->assertNotEqual(drupal_get_installed_schema_version($module), SCHEMA_UNINSTALLED, format_string('The @module module was not uninstalled.', array('@module' => $module))); } // Now uninstall all three modules explicitly, but in the incorrect order, // and make sure that drupal_uninstal_modules() uninstalled them in the // correct sequence. $result = module_uninstall(array('poll', 'php', 'forum')); - $this->assertTrue($result, t('module_uninstall() returns the correct value.')); + $this->assertTrue($result, 'module_uninstall() returns the correct value.'); foreach (array('forum', 'poll', 'php') as $module) { - $this->assertEqual(drupal_get_installed_schema_version($module), SCHEMA_UNINSTALLED, t('The @module module was uninstalled.', array('@module' => $module))); + $this->assertEqual(drupal_get_installed_schema_version($module), SCHEMA_UNINSTALLED, format_string('The @module module was uninstalled.', array('@module' => $module))); } - $this->assertEqual(variable_get('test_module_uninstall_order', array()), array('forum', 'poll', 'php'), t('Modules were uninstalled in the correct order by module_uninstall().')); + $this->assertEqual(variable_get('test_module_uninstall_order', array()), array('forum', 'poll', 'php'), 'Modules were uninstalled in the correct order by module_uninstall().'); // Uninstall the profile module from above, and make sure that the profile // itself is not on the list of dependent modules to be uninstalled. $result = module_uninstall(array('comment')); - $this->assertTrue($result, t('module_uninstall() returns the correct value.')); - $this->assertEqual(drupal_get_installed_schema_version('comment'), SCHEMA_UNINSTALLED, t('Comment module was uninstalled.')); + $this->assertTrue($result, 'module_uninstall() returns the correct value.'); + $this->assertEqual(drupal_get_installed_schema_version('comment'), SCHEMA_UNINSTALLED, 'Comment module was uninstalled.'); $uninstalled_modules = variable_get('test_module_uninstall_order', array()); - $this->assertTrue(in_array('comment', $uninstalled_modules), t('Comment module is in the list of uninstalled modules.')); - $this->assertFalse(in_array($profile, $uninstalled_modules), t('The installation profile is not in the list of uninstalled modules.')); + $this->assertTrue(in_array('comment', $uninstalled_modules), 'Comment module is in the list of uninstalled modules.'); + $this->assertFalse(in_array($profile, $uninstalled_modules), 'The installation profile is not in the list of uninstalled modules.'); // Enable forum module again, which should enable both the poll module and // php module. But, this time do it with poll module declaring a dependency @@ -237,11 +237,11 @@ function testDependencyResolution() { variable_set('dependency_test', 'version dependency'); drupal_static_reset('system_rebuild_module_data'); $result = module_enable(array('forum')); - $this->assertTrue($result, t('module_enable() returns the correct value.')); + $this->assertTrue($result, 'module_enable() returns the correct value.'); // Verify that the fake dependency chain was installed. - $this->assertTrue(module_exists('poll') && module_exists('php'), t('Dependency chain was installed by module_enable().')); + $this->assertTrue(module_exists('poll') && module_exists('php'), 'Dependency chain was installed by module_enable().'); // Verify that the original module was installed. - $this->assertTrue(module_exists('forum'), t('Module installation with version dependencies succeeded.')); + $this->assertTrue(module_exists('forum'), 'Module installation with version dependencies succeeded.'); // Finally, verify that the modules were enabled in the correct order. $enable_order = variable_get('test_module_enable_order', array()); $php_position = array_search('php', $enable_order); @@ -249,7 +249,7 @@ function testDependencyResolution() { $forum_position = array_search('forum', $enable_order); $php_before_poll = $php_position !== FALSE && $poll_position !== FALSE && $php_position < $poll_position; $poll_before_forum = $poll_position !== FALSE && $forum_position !== FALSE && $poll_position < $forum_position; - $this->assertTrue($php_before_poll && $poll_before_forum, t('Modules were enabled in the correct order by module_enable().')); + $this->assertTrue($php_before_poll && $poll_before_forum, 'Modules were enabled in the correct order by module_enable().'); } /** diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php index 4a728f3e5c..fcfc39f99e 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php +++ b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php @@ -45,9 +45,9 @@ function assertTableCount($base_table, $count = TRUE) { $tables = db_find_tables(Database::getConnection()->prefixTables('{' . $base_table . '}') . '%'); if ($count) { - return $this->assertTrue($tables, t('Tables matching "@base_table" found.', array('@base_table' => $base_table))); + return $this->assertTrue($tables, format_string('Tables matching "@base_table" found.', array('@base_table' => $base_table))); } - return $this->assertFalse($tables, t('Tables matching "@base_table" not found.', array('@base_table' => $base_table))); + return $this->assertFalse($tables, format_string('Tables matching "@base_table" not found.', array('@base_table' => $base_table))); } /** @@ -64,7 +64,7 @@ function assertModuleTablesExist($module) { $tables_exist = FALSE; } } - return $this->assertTrue($tables_exist, t('All database tables defined by the @module module exist.', array('@module' => $module))); + return $this->assertTrue($tables_exist, format_string('All database tables defined by the @module module exist.', array('@module' => $module))); } /** @@ -81,7 +81,7 @@ function assertModuleTablesDoNotExist($module) { $tables_exist = TRUE; } } - return $this->assertFalse($tables_exist, t('None of the database tables defined by the @module module exist.', array('@module' => $module))); + return $this->assertFalse($tables_exist, format_string('None of the database tables defined by the @module module exist.', array('@module' => $module))); } /** @@ -147,7 +147,7 @@ function assertModules(array $modules, $enabled) { else { $message = 'Module "@module" is not enabled.'; } - $this->assertEqual(module_exists($module), $enabled, t($message, array('@module' => $module))); + $this->assertEqual(module_exists($module), $enabled, format_string($message, array('@module' => $module))); } } @@ -182,6 +182,6 @@ function assertLogMessage($type, $message, $variables = array(), $severity = WAT ->countQuery() ->execute() ->fetchField(); - $this->assertTrue($count > 0, t('watchdog table contains @count rows for @message', array('@count' => $count, '@message' => $message))); + $this->assertTrue($count > 0, format_string('watchdog table contains @count rows for @message', array('@count' => $count, '@message' => $message))); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/RequiredTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/RequiredTest.php index fcde5ca9fd..1de4535d0c 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Module/RequiredTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Module/RequiredTest.php @@ -31,7 +31,7 @@ function testDisableRequired() { if (!empty($info['required'])) { $field_name = "modules[{$info['package']}][$module][enable]"; if (empty($info['hidden'])) { - $this->assertFieldByXPath("//input[@name='$field_name' and @disabled='disabled' and @checked='checked']", '', t('Field @name was disabled and checked.', array('@name' => $field_name))); + $this->assertFieldByXPath("//input[@name='$field_name' and @disabled='disabled' and @checked='checked']", '', format_string('Field @name was disabled and checked.', array('@name' => $field_name))); } else { $this->assertNoFieldByName($field_name); diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/UninstallTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/UninstallTest.php index dca3bf37c3..3345d2f787 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Module/UninstallTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Module/UninstallTest.php @@ -40,6 +40,6 @@ function testUserPermsUninstalled() { // Are the perms defined by module_test removed from {role_permission}. $count = db_query("SELECT COUNT(rid) FROM {role_permission} WHERE permission = :perm", array(':perm' => 'module_test perm'))->fetchField(); - $this->assertEqual(0, $count, t('Permissions were all removed.')); + $this->assertEqual(0, $count, 'Permissions were all removed.'); } } -- GitLab