From 7c64b3ca624bbd03f891fdba833c71324d5a3f03 Mon Sep 17 00:00:00 2001 From: Lars Toomre Date: Fri, 28 Sep 2012 11:53:47 -0400 Subject: [PATCH] Issue 1797914 by Lars Toomre: Remove t() from assert messages in P-S sub-systems tests. --- .../lib/Drupal/system/Tests/Pager/PagerTest.php | 24 +++--- .../lib/Drupal/system/Tests/Path/LookupTest.php | 22 +++--- .../lib/Drupal/system/Tests/Path/MatchPathTest.php | 2 +- .../lib/Drupal/system/Tests/Path/SaveTest.php | 4 +- .../system/Tests/Path/UrlAlterFunctionalTest.php | 10 +- .../lib/Drupal/system/Tests/Queue/QueueTest.php | 14 ++-- .../Drupal/system/Tests/Session/SessionTest.php | 92 ++++++++++---------- 7 files changed, 84 insertions(+), 84 deletions(-) diff --git a/core/modules/system/lib/Drupal/system/Tests/Pager/PagerTest.php b/core/modules/system/lib/Drupal/system/Tests/Pager/PagerTest.php index 0804339..190cccd 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Pager/PagerTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Pager/PagerTest.php @@ -114,24 +114,24 @@ class PagerTest extends WebTestBase { // Verify first/previous and next/last items and links. if (isset($first)) { - $this->assertClass($first, 'pager-first', "Item for first page has .pager-first class."); - $this->assertTrue($first->a, "Link to first page found."); - $this->assertNoClass($first->a, 'active', "Link to first page is not active."); + $this->assertClass($first, 'pager-first', 'Item for first page has .pager-first class.'); + $this->assertTrue($first->a, 'Link to first page found.'); + $this->assertNoClass($first->a, 'active', 'Link to first page is not active.'); } if (isset($previous)) { - $this->assertClass($previous, 'pager-previous', "Item for first page has .pager-previous class."); - $this->assertTrue($previous->a, "Link to previous page found."); - $this->assertNoClass($previous->a, 'active', "Link to previous page is not active."); + $this->assertClass($previous, 'pager-previous', 'Item for first page has .pager-previous class.'); + $this->assertTrue($previous->a, 'Link to previous page found.'); + $this->assertNoClass($previous->a, 'active', 'Link to previous page is not active.'); } if (isset($next)) { - $this->assertClass($next, 'pager-next', "Item for next page has .pager-next class."); - $this->assertTrue($next->a, "Link to next page found."); - $this->assertNoClass($next->a, 'active', "Link to next page is not active."); + $this->assertClass($next, 'pager-next', 'Item for next page has .pager-next class.'); + $this->assertTrue($next->a, 'Link to next page found.'); + $this->assertNoClass($next->a, 'active', 'Link to next page is not active.'); } if (isset($last)) { - $this->assertClass($last, 'pager-last', "Item for last page has .pager-last class."); - $this->assertTrue($last->a, "Link to last page found."); - $this->assertNoClass($last->a, 'active', "Link to last page is not active."); + $this->assertClass($last, 'pager-last', 'Item for last page has .pager-last class.'); + $this->assertTrue($last->a, 'Link to last page found.'); + $this->assertNoClass($last->a, 'active', 'Link to last page is not active.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/LookupTest.php b/core/modules/system/lib/Drupal/system/Tests/Path/LookupTest.php index a90b5f4..e319b94 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Path/LookupTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Path/LookupTest.php @@ -36,8 +36,8 @@ class LookupTest extends WebTestBase { 'alias' => 'foo', ); path_save($path); - $this->assertEqual(drupal_lookup_path('alias', $path['source']), $path['alias'], t('Basic alias lookup works.')); - $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], t('Basic source lookup works.')); + $this->assertEqual(drupal_lookup_path('alias', $path['source']), $path['alias'], 'Basic alias lookup works.'); + $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], 'Basic source lookup works.'); // Create a language specific alias for the default language (English). $path = array( @@ -46,8 +46,8 @@ class LookupTest extends WebTestBase { 'langcode' => 'en', ); path_save($path); - $this->assertEqual(drupal_lookup_path('alias', $path['source']), $path['alias'], t('English alias overrides language-neutral alias.')); - $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], t('English source overrides language-neutral source.')); + $this->assertEqual(drupal_lookup_path('alias', $path['source']), $path['alias'], 'English alias overrides language-neutral alias.'); + $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], 'English source overrides language-neutral source.'); // Create a language-neutral alias for the same path, again. $path = array( @@ -55,7 +55,7 @@ class LookupTest extends WebTestBase { 'alias' => 'bar', ); path_save($path); - $this->assertEqual(drupal_lookup_path('alias', $path['source']), "users/$name", t('English alias still returned after entering a language-neutral alias.')); + $this->assertEqual(drupal_lookup_path('alias', $path['source']), "users/$name", 'English alias still returned after entering a language-neutral alias.'); // Create a language-specific (xx-lolspeak) alias for the same path. $path = array( @@ -64,9 +64,9 @@ class LookupTest extends WebTestBase { 'langcode' => 'xx-lolspeak', ); path_save($path); - $this->assertEqual(drupal_lookup_path('alias', $path['source']), "users/$name", t('English alias still returned after entering a LOLspeak alias.')); + $this->assertEqual(drupal_lookup_path('alias', $path['source']), "users/$name", 'English alias still returned after entering a LOLspeak alias.'); // The LOLspeak alias should be returned if we really want LOLspeak. - $this->assertEqual(drupal_lookup_path('alias', $path['source'], 'xx-lolspeak'), 'LOL', t('LOLspeak alias returned if we specify xx-lolspeak to drupal_lookup_path().')); + $this->assertEqual(drupal_lookup_path('alias', $path['source'], 'xx-lolspeak'), 'LOL', 'LOLspeak alias returned if we specify xx-lolspeak to drupal_lookup_path().'); // Create a new alias for this path in English, which should override the // previous alias for "user/$uid". @@ -76,8 +76,8 @@ class LookupTest extends WebTestBase { 'langcode' => 'en', ); path_save($path); - $this->assertEqual(drupal_lookup_path('alias', $path['source']), $path['alias'], t('Recently created English alias returned.')); - $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], t('Recently created English source returned.')); + $this->assertEqual(drupal_lookup_path('alias', $path['source']), $path['alias'], 'Recently created English alias returned.'); + $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], 'Recently created English source returned.'); // Remove the English aliases, which should cause a fallback to the most // recently created language-neutral alias, 'bar'. @@ -85,7 +85,7 @@ class LookupTest extends WebTestBase { ->condition('langcode', 'en') ->execute(); drupal_clear_path_cache(); - $this->assertEqual(drupal_lookup_path('alias', $path['source']), 'bar', t('Path lookup falls back to recently created language-neutral alias.')); + $this->assertEqual(drupal_lookup_path('alias', $path['source']), 'bar', 'Path lookup falls back to recently created language-neutral alias.'); // Test the situation where the alias and language are the same, but // the source differs. The newer alias record should be returned. @@ -95,6 +95,6 @@ class LookupTest extends WebTestBase { 'alias' => 'bar', ); path_save($path); - $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], t('Newer alias record is returned when comparing two LANGUAGE_NOT_SPECIFIED paths with the same alias.')); + $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], 'Newer alias record is returned when comparing two LANGUAGE_NOT_SPECIFIED paths with the same alias.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/MatchPathTest.php b/core/modules/system/lib/Drupal/system/Tests/Path/MatchPathTest.php index a5cbfee..15af3b6 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Path/MatchPathTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Path/MatchPathTest.php @@ -45,7 +45,7 @@ class MatchPathTest extends WebTestBase { foreach ($tests as $patterns => $cases) { foreach ($cases as $path => $expected_result) { $actual_result = drupal_match_path($path, $patterns); - $this->assertIdentical($actual_result, $expected_result, t('Tried matching the path @path to the pattern 
@patterns
- expected @expected, got @actual.', array('@path' => $path, '@patterns' => $patterns, '@expected' => var_export($expected_result, TRUE), '@actual' => var_export($actual_result, TRUE)))); + $this->assertIdentical($actual_result, $expected_result, format_string('Tried matching the path @path to the pattern 
@patterns
- expected @expected, got @actual.', array('@path' => $path, '@patterns' => $patterns, '@expected' => var_export($expected_result, TRUE), '@actual' => var_export($actual_result, TRUE)))); } } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/SaveTest.php b/core/modules/system/lib/Drupal/system/Tests/Path/SaveTest.php index f017230..b95893a 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Path/SaveTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Path/SaveTest.php @@ -57,7 +57,7 @@ class SaveTest extends WebTestBase { // Test to see if the original alias is available to modules during // hook_path_update(). $results = variable_get('path_test_results', array()); - $this->assertIdentical($results['hook_path_update']['original']['alias'], $path_original['alias'], t('Old path alias available to modules during hook_path_update.')); - $this->assertIdentical($results['hook_path_update']['original']['source'], $path_original['source'], t('Old path alias available to modules during hook_path_update.')); + $this->assertIdentical($results['hook_path_update']['original']['alias'], $path_original['alias'], 'Old path alias available to modules during hook_path_update.'); + $this->assertIdentical($results['hook_path_update']['original']['source'], $path_original['source'], 'Old path alias available to modules during hook_path_update.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php b/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php index 6bcbca8..72091e5 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php @@ -83,8 +83,8 @@ class UrlAlterFunctionalTest extends WebTestBase { */ function testCurrentUrlRequestedPath() { $this->drupalGet('url-alter-test/bar'); - $this->assertRaw('request_path=url-alter-test/bar', t('request_path() returns the requested path.')); - $this->assertRaw('current_path=url-alter-test/foo', t('current_path() returns the internal path.')); + $this->assertRaw('request_path=url-alter-test/bar', 'request_path() returns the requested path.'); + $this->assertRaw('current_path=url-alter-test/foo', 'current_path() returns the internal path.'); } /** @@ -92,7 +92,7 @@ class UrlAlterFunctionalTest extends WebTestBase { */ function testGetQInitialized() { $this->drupalGet(''); - $this->assertText("current_path() is non-empty with an empty request path.", "current_path() is initialized with an empty request path."); + $this->assertText("current_path() is non-empty with an empty request path.", 'current_path() is initialized with an empty request path.'); } /** @@ -110,7 +110,7 @@ class UrlAlterFunctionalTest extends WebTestBase { $result = url($original); $base_path = base_path() . $GLOBALS['script_path']; $result = substr($result, strlen($base_path)); - $this->assertIdentical($result, $final, t('Altered outbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result))); + $this->assertIdentical($result, $final, format_string('Altered outbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result))); } /** @@ -127,6 +127,6 @@ class UrlAlterFunctionalTest extends WebTestBase { protected function assertUrlInboundAlter($original, $final) { // Test inbound altering. $result = drupal_get_normal_path($original); - $this->assertIdentical($result, $final, t('Altered inbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result))); + $this->assertIdentical($result, $final, format_string('Altered inbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result))); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Queue/QueueTest.php b/core/modules/system/lib/Drupal/system/Tests/Queue/QueueTest.php index 9e824dc..5767587 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Queue/QueueTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Queue/QueueTest.php @@ -79,14 +79,14 @@ class QueueTest extends WebTestBase { $new_items[] = $item->data; // First two dequeued items should match the first two items we queued. - $this->assertEqual($this->queueScore($data, $new_items), 2, t('Two items matched')); + $this->assertEqual($this->queueScore($data, $new_items), 2, 'Two items matched'); // Add two more items. $queue1->createItem($data[2]); $queue1->createItem($data[3]); - $this->assertTrue($queue1->numberOfItems(), t('Queue 1 is not empty after adding items.')); - $this->assertFalse($queue2->numberOfItems(), t('Queue 2 is empty while Queue 1 has items')); + $this->assertTrue($queue1->numberOfItems(), 'Queue 1 is not empty after adding items.'); + $this->assertFalse($queue2->numberOfItems(), 'Queue 2 is empty while Queue 1 has items'); $items[] = $item = $queue1->claimItem(); $new_items[] = $item->data; @@ -96,10 +96,10 @@ class QueueTest extends WebTestBase { // All dequeued items should match the items we queued exactly once, // therefore the score must be exactly 4. - $this->assertEqual($this->queueScore($data, $new_items), 4, t('Four items matched')); + $this->assertEqual($this->queueScore($data, $new_items), 4, 'Four items matched'); // There should be no duplicate items. - $this->assertEqual($this->queueScore($new_items, $new_items), 4, t('Four items matched')); + $this->assertEqual($this->queueScore($new_items, $new_items), 4, 'Four items matched'); // Delete all items from queue1. foreach ($items as $item) { @@ -107,8 +107,8 @@ class QueueTest extends WebTestBase { } // Check that both queues are empty. - $this->assertFalse($queue1->numberOfItems(), t('Queue 1 is empty')); - $this->assertFalse($queue2->numberOfItems(), t('Queue 2 is empty')); + $this->assertFalse($queue1->numberOfItems(), 'Queue 1 is empty'); + $this->assertFalse($queue2->numberOfItems(), 'Queue 2 is empty'); } /** diff --git a/core/modules/system/lib/Drupal/system/Tests/Session/SessionTest.php b/core/modules/system/lib/Drupal/system/Tests/Session/SessionTest.php index 0abefb5..02503f7 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Session/SessionTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Session/SessionTest.php @@ -30,11 +30,11 @@ class SessionTest extends WebTestBase { * Tests for drupal_save_session() and drupal_session_regenerate(). */ function testSessionSaveRegenerate() { - $this->assertFalse(drupal_save_session(), t('drupal_save_session() correctly returns FALSE (inside of testing framework) when initially called with no arguments.'), t('Session')); - $this->assertFalse(drupal_save_session(FALSE), t('drupal_save_session() correctly returns FALSE when called with FALSE.'), t('Session')); - $this->assertFalse(drupal_save_session(), t('drupal_save_session() correctly returns FALSE when saving has been disabled.'), t('Session')); - $this->assertTrue(drupal_save_session(TRUE), t('drupal_save_session() correctly returns TRUE when called with TRUE.'), t('Session')); - $this->assertTrue(drupal_save_session(), t('drupal_save_session() correctly returns TRUE when saving has been enabled.'), t('Session')); + $this->assertFalse(drupal_save_session(),'drupal_save_session() correctly returns FALSE (inside of testing framework) when initially called with no arguments.', t('Session')); + $this->assertFalse(drupal_save_session(FALSE), 'drupal_save_session() correctly returns FALSE when called with FALSE.', t('Session')); + $this->assertFalse(drupal_save_session(), 'drupal_save_session() correctly returns FALSE when saving has been disabled.', t('Session')); + $this->assertTrue(drupal_save_session(TRUE), 'drupal_save_session() correctly returns TRUE when called with TRUE.', t('Session')); + $this->assertTrue(drupal_save_session(), 'drupal_save_session() correctly returns TRUE when saving has been enabled.', t('Session')); // Test session hardening code from SA-2008-044. $user = $this->drupalCreateUser(array('access content')); @@ -44,7 +44,7 @@ class SessionTest extends WebTestBase { // Make sure the session cookie is set as HttpOnly. $this->drupalLogin($user); - $this->assertTrue(preg_match('/HttpOnly/i', $this->drupalGetHeader('Set-Cookie', TRUE)), t('Session cookie is set as HttpOnly.')); + $this->assertTrue(preg_match('/HttpOnly/i', $this->drupalGetHeader('Set-Cookie', TRUE)), 'Session cookie is set as HttpOnly.'); $this->drupalLogout(); // Verify that the session is regenerated if a module calls exit @@ -54,7 +54,7 @@ class SessionTest extends WebTestBase { $this->drupalGet('session-test/id'); $matches = array(); preg_match('/\s*session_id:(.*)\n/', $this->drupalGetContent(), $matches); - $this->assertTrue(!empty($matches[1]) , t('Found session ID before logging in.')); + $this->assertTrue(!empty($matches[1]) , 'Found session ID before logging in.'); $original_session = $matches[1]; // We cannot use $this->drupalLogin($user); because we exit in @@ -65,14 +65,14 @@ class SessionTest extends WebTestBase { ); $this->drupalPost('user', $edit, t('Log in')); $this->drupalGet('user'); - $pass = $this->assertText($user->name, t('Found name: %name', array('%name' => $user->name)), t('User login')); + $pass = $this->assertText($user->name, format_string('Found name: %name', array('%name' => $user->name)), t('User login')); $this->_logged_in = $pass; $this->drupalGet('session-test/id'); $matches = array(); preg_match('/\s*session_id:(.*)\n/', $this->drupalGetContent(), $matches); - $this->assertTrue(!empty($matches[1]) , t('Found session ID after logging in.')); - $this->assertTrue($matches[1] != $original_session, t('Session ID changed after login.')); + $this->assertTrue(!empty($matches[1]) , 'Found session ID after logging in.'); + $this->assertTrue($matches[1] != $original_session, 'Session ID changed after login.'); } /** @@ -88,48 +88,48 @@ class SessionTest extends WebTestBase { $value_1 = $this->randomName(); $this->drupalGet('session-test/set/' . $value_1); - $this->assertText($value_1, t('The session value was stored.'), t('Session')); + $this->assertText($value_1, 'The session value was stored.', t('Session')); $this->drupalGet('session-test/get'); - $this->assertText($value_1, t('Session correctly returned the stored data for an authenticated user.'), t('Session')); + $this->assertText($value_1, 'Session correctly returned the stored data for an authenticated user.', t('Session')); // Attempt to write over val_1. If drupal_save_session(FALSE) is working. // properly, val_1 will still be set. $value_2 = $this->randomName(); $this->drupalGet('session-test/no-set/' . $value_2); - $this->assertText($value_2, t('The session value was correctly passed to session-test/no-set.'), t('Session')); + $this->assertText($value_2, 'The session value was correctly passed to session-test/no-set.', t('Session')); $this->drupalGet('session-test/get'); - $this->assertText($value_1, t('Session data is not saved for drupal_save_session(FALSE).'), t('Session')); + $this->assertText($value_1, 'Session data is not saved for drupal_save_session(FALSE).', t('Session')); // Switch browser cookie to anonymous user, then back to user 1. $this->sessionReset(); $this->sessionReset($user->uid); - $this->assertText($value_1, t('Session data persists through browser close.'), t('Session')); + $this->assertText($value_1, 'Session data persists through browser close.', t('Session')); // Logout the user and make sure the stored value no longer persists. $this->drupalLogout(); $this->sessionReset(); $this->drupalGet('session-test/get'); - $this->assertNoText($value_1, t("After logout, previous user's session data is not available."), t('Session')); + $this->assertNoText($value_1, "After logout, previous user's session data is not available.", t('Session')); // Now try to store some data as an anonymous user. $value_3 = $this->randomName(); $this->drupalGet('session-test/set/' . $value_3); - $this->assertText($value_3, t('Session data stored for anonymous user.'), t('Session')); + $this->assertText($value_3, 'Session data stored for anonymous user.', t('Session')); $this->drupalGet('session-test/get'); - $this->assertText($value_3, t('Session correctly returned the stored data for an anonymous user.'), t('Session')); + $this->assertText($value_3, 'Session correctly returned the stored data for an anonymous user.', t('Session')); // Try to store data when drupal_save_session(FALSE). $value_4 = $this->randomName(); $this->drupalGet('session-test/no-set/' . $value_4); - $this->assertText($value_4, t('The session value was correctly passed to session-test/no-set.'), t('Session')); + $this->assertText($value_4, 'The session value was correctly passed to session-test/no-set.', t('Session')); $this->drupalGet('session-test/get'); - $this->assertText($value_3, t('Session data is not saved for drupal_save_session(FALSE).'), t('Session')); + $this->assertText($value_3, 'Session data is not saved for drupal_save_session(FALSE).', t('Session')); // Login, the data should persist. $this->drupalLogin($user); $this->sessionReset($user->uid); $this->drupalGet('session-test/get'); - $this->assertNoText($value_1, t('Session has persisted for an authenticated user after logging out and then back in.'), t('Session')); + $this->assertNoText($value_1, 'Session has persisted for an authenticated user after logging out and then back in.', t('Session')); // Change session and create another user. $user2 = $this->drupalCreateUser(array('access content')); @@ -153,29 +153,29 @@ class SessionTest extends WebTestBase { $this->drupalGet(''); $this->assertSessionCookie(FALSE); $this->assertSessionEmpty(TRUE); - $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', t('Page was not cached.')); + $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', 'Page was not cached.'); // Start a new session by setting a message. $this->drupalGet('session-test/set-message'); $this->assertSessionCookie(TRUE); - $this->assertTrue($this->drupalGetHeader('Set-Cookie'), t('New session was started.')); + $this->assertTrue($this->drupalGetHeader('Set-Cookie'), 'New session was started.'); // Display the message, during the same request the session is destroyed // and the session cookie is unset. $this->drupalGet(''); $this->assertSessionCookie(FALSE); $this->assertSessionEmpty(FALSE); - $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), t('Caching was bypassed.')); - $this->assertText(t('This is a dummy message.'), t('Message was displayed.')); - $this->assertTrue(preg_match('/SESS\w+=deleted/', $this->drupalGetHeader('Set-Cookie')), t('Session cookie was deleted.')); + $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), 'Caching was bypassed.'); + $this->assertText(t('This is a dummy message.'), 'Message was displayed.'); + $this->assertTrue(preg_match('/SESS\w+=deleted/', $this->drupalGetHeader('Set-Cookie')), 'Session cookie was deleted.'); // Verify that session was destroyed. $this->drupalGet(''); $this->assertSessionCookie(FALSE); $this->assertSessionEmpty(TRUE); - $this->assertNoText(t('This is a dummy message.'), t('Message was not cached.')); - $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', t('Page was cached.')); - $this->assertFalse($this->drupalGetHeader('Set-Cookie'), t('New session was not started.')); + $this->assertNoText(t('This is a dummy message.'), 'Message was not cached.'); + $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.'); + $this->assertFalse($this->drupalGetHeader('Set-Cookie'), 'New session was not started.'); // Verify that no session is created if drupal_save_session(FALSE) is called. $this->drupalGet('session-test/set-message-but-dont-save'); @@ -186,7 +186,7 @@ class SessionTest extends WebTestBase { $this->drupalGet(''); $this->assertSessionCookie(FALSE); $this->assertSessionEmpty(TRUE); - $this->assertNoText(t('This is a dummy message.'), t('The message was not saved.')); + $this->assertNoText(t('This is a dummy message.'), 'The message was not saved.'); } /** @@ -206,29 +206,29 @@ class SessionTest extends WebTestBase { sleep(1); $this->drupalGet('session-test/set/foo'); $times2 = db_query($sql, array(':uid' => $user->uid))->fetchObject(); - $this->assertEqual($times2->access, $times1->access, t('Users table was not updated.')); - $this->assertNotEqual($times2->timestamp, $times1->timestamp, t('Sessions table was updated.')); + $this->assertEqual($times2->access, $times1->access, 'Users table was not updated.'); + $this->assertNotEqual($times2->timestamp, $times1->timestamp, 'Sessions table was updated.'); // Write the same value again, i.e. do not modify the session. sleep(1); $this->drupalGet('session-test/set/foo'); $times3 = db_query($sql, array(':uid' => $user->uid))->fetchObject(); - $this->assertEqual($times3->access, $times1->access, t('Users table was not updated.')); - $this->assertEqual($times3->timestamp, $times2->timestamp, t('Sessions table was not updated.')); + $this->assertEqual($times3->access, $times1->access, 'Users table was not updated.'); + $this->assertEqual($times3->timestamp, $times2->timestamp, 'Sessions table was not updated.'); // Do not change the session. sleep(1); $this->drupalGet(''); $times4 = db_query($sql, array(':uid' => $user->uid))->fetchObject(); - $this->assertEqual($times4->access, $times3->access, t('Users table was not updated.')); - $this->assertEqual($times4->timestamp, $times3->timestamp, t('Sessions table was not updated.')); + $this->assertEqual($times4->access, $times3->access, 'Users table was not updated.'); + $this->assertEqual($times4->timestamp, $times3->timestamp, 'Sessions table was not updated.'); // Force updating of users and sessions table once per second. variable_set('session_write_interval', 0); $this->drupalGet(''); $times5 = db_query($sql, array(':uid' => $user->uid))->fetchObject(); - $this->assertNotEqual($times5->access, $times4->access, t('Users table was updated.')); - $this->assertNotEqual($times5->timestamp, $times4->timestamp, t('Sessions table was updated.')); + $this->assertNotEqual($times5->access, $times4->access, 'Users table was updated.'); + $this->assertNotEqual($times5->timestamp, $times4->timestamp, 'Sessions table was updated.'); } /** @@ -238,7 +238,7 @@ class SessionTest extends WebTestBase { $user = $this->drupalCreateUser(array('access content')); $this->drupalLogin($user); $this->drupalGet('session-test/is-logged-in'); - $this->assertResponse(200, t('User is logged in.')); + $this->assertResponse(200, 'User is logged in.'); // Reset the sid in {sessions} to a blank string. This may exist in the // wild in some cases, although we normally prevent it from happening. @@ -249,10 +249,10 @@ class SessionTest extends WebTestBase { $this->curlClose(); $this->additionalCurlOptions[CURLOPT_COOKIE] = rawurlencode($this->session_name) . '=;'; $this->drupalGet('session-test/id-from-cookie'); - $this->assertRaw("session_id:\n", t('Session ID is blank as sent from cookie header.')); + $this->assertRaw("session_id:\n", 'Session ID is blank as sent from cookie header.'); // Assert that we have an anonymous session now. $this->drupalGet('session-test/is-logged-in'); - $this->assertResponse(403, t('An empty session ID is not allowed.')); + $this->assertResponse(403, 'An empty session ID is not allowed.'); } /** @@ -270,7 +270,7 @@ class SessionTest extends WebTestBase { $this->additionalCurlOptions[CURLOPT_COOKIEFILE] = $this->cookieFile; $this->additionalCurlOptions[CURLOPT_COOKIESESSION] = TRUE; $this->drupalGet('session-test/get'); - $this->assertResponse(200, t('Session test module is correctly enabled.'), t('Session')); + $this->assertResponse(200, 'Session test module is correctly enabled.', t('Session')); } /** @@ -278,10 +278,10 @@ class SessionTest extends WebTestBase { */ function assertSessionCookie($sent) { if ($sent) { - $this->assertNotNull($this->session_id, t('Session cookie was sent.')); + $this->assertNotNull($this->session_id, 'Session cookie was sent.'); } else { - $this->assertNull($this->session_id, t('Session cookie was not sent.')); + $this->assertNull($this->session_id, 'Session cookie was not sent.'); } } @@ -290,10 +290,10 @@ class SessionTest extends WebTestBase { */ function assertSessionEmpty($empty) { if ($empty) { - $this->assertIdentical($this->drupalGetHeader('X-Session-Empty'), '1', t('Session was empty.')); + $this->assertIdentical($this->drupalGetHeader('X-Session-Empty'), '1', 'Session was empty.'); } else { - $this->assertIdentical($this->drupalGetHeader('X-Session-Empty'), '0', t('Session was not empty.')); + $this->assertIdentical($this->drupalGetHeader('X-Session-Empty'), '0', 'Session was not empty.'); } } } -- 1.7.6.msysgit.0