Index: modules/comment/comment.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v
retrieving revision 1.35
diff -u -r1.35 comment.test
--- modules/comment/comment.test	1 Jul 2009 12:06:21 -0000	1.35
+++ modules/comment/comment.test	9 Jul 2009 02:46:29 -0000
@@ -40,7 +40,7 @@
     }
 
     if ($preview) {
-      $this->assertNoFieldByName('op', t('Save'), t('Save button not found.')); // Preview required so no save button should be found.
+      $this->assertNoFieldByName('op','Save','Save button not found.'); // Preview required so no save button should be found.
       $this->drupalPost(NULL, $edit, t('Preview'));
     }
     $this->drupalPost(NULL, $edit, t('Save'));
@@ -54,7 +54,7 @@
         $this->assertText($subject, 'Comment subject posted.');
       }
       $this->assertText($comment, 'Comment body posted.');
-      $this->assertTrue((!empty($match) && !empty($match[1])), t('Comment id found.'));
+      $this->assertTrue((!empty($match) && !empty($match[1])),'Comment id found.');
     }
 
     if (isset($match[1])) {
@@ -93,7 +93,7 @@
    */
   function deleteComment($comment) {
     $this->drupalPost('comment/delete/' . $comment->id, array(), t('Delete'));
-    $this->assertText(t('The comment and all its replies have been deleted.'), t('Comment deleted.'));
+    $this->assertText(t('The comment and all its replies have been deleted.'),'Comment deleted.');
   }
 
   /**
@@ -177,7 +177,7 @@
     $edit['1[post comments]'] = $post_comments;
     $edit['1[post comments without approval]'] = $without_approval;
     $this->drupalPost('admin/user/permissions', $edit, t('Save permissions'));
-    $this->assertText(t('The changes have been saved.'), t('Anonymous user comments ' . ($access_comments ? 'access comments' : 'not access comments'). '.'));
+    $this->assertText(t('The changes have been saved.'),'Anonymous user comments ' . ($access_comments ? 'access comments' : 'not access comments'. '.'));
   }
 
   /**
@@ -207,10 +207,10 @@
 
     if ($operation == 'delete') {
       $this->drupalPost(NULL, array(), t('Delete comments'));
-      $this->assertText(t('The comments have been deleted.'), t('Operation "' . $operation . '" was performed on comment.'));
+      $this->assertText(t('The comments have been deleted.'),'Operation "' . $operation . '" was performed on comment.');
     }
     else {
-      $this->assertText(t('The update has been performed.'), t('Operation "' . $operation . '" was performed on comment.'));
+      $this->assertText(t('The update has been performed.'),'Operation "' . $operation . '" was performed on comment.');
     }
   }
 
@@ -233,9 +233,9 @@
 class CommentInterfaceTest extends CommentHelperCase {
   public static function getInfo() {
     return array(
-      'name' => t('Comment interface'),
-      'description' => t('Test comment user interfaces.'),
-      'group' => t('Comment'),
+      'name' => 'Comment interface',
+      'description' => 'Test comment user interfaces.',
+      'group' => 'Comment',
     );
   }
 
@@ -254,7 +254,7 @@
     // Post comment without subject.
     $this->drupalLogin($this->web_user);
     $this->drupalGet('comment/reply/' . $this->node->nid);
-    $this->assertNoFieldByName('subject', '', t('Subject field not found.'));
+    $this->assertNoFieldByName('subject', '','Subject field not found.');
 
     // Set comments to have subject and preview to required.
     $this->drupalLogout();
@@ -269,69 +269,69 @@
     $comment_text = $this->randomName();
     $comment = $this->postComment($this->node, $subject_text, $comment_text, TRUE);
     $comment_loaded = comment_load($comment->id);
-    $this->assertTrue($this->commentExists($comment), t('Comment found.'));
+    $this->assertTrue($this->commentExists($comment),'Comment found.');
 
     // Check comment display.
     $this->drupalGet('node/' . $this->node->nid . '/' . $comment->id);
-    $this->assertText($subject_text, t('Individual comment subject found.'));
-    $this->assertText($comment_text, t('Individual comment body found.'));
+    $this->assertText($subject_text,'Individual comment subject found.');
+    $this->assertText($comment_text,'Individual comment body found.');
 
     // Reply to comment without a subject.
     $this->drupalGet('comment/reply/' . $this->node->nid . '/' . $comment->id);
-    $this->assertText($subject_text, t('Individual comment-reply subject found.'));
-    $this->assertText($comment_text, t('Individual comment-reply body found.'));
+    $this->assertText($subject_text,'Individual comment-reply subject found.');
+    $this->assertText($comment_text,'Individual comment-reply body found.');
     $reply = $this->postComment(NULL, '', $this->randomName(), TRUE);
     $reply_loaded = comment_load($reply->id);
-    $this->assertTrue($this->commentExists($reply, TRUE), t('Reply found.'));
-    $this->assertEqual($comment->id, $reply_loaded->pid, t('Pid of a reply to a comment is set correctly.'));
-    $this->assertEqual(rtrim($comment_loaded->thread, '/') . '.00/', $reply_loaded->thread, t('Thread of reply grows correctly.'));
+    $this->assertTrue($this->commentExists($reply, TRUE),'Reply found.');
+    $this->assertEqual($comment->id, $reply_loaded->pid,'Pid of a reply to a comment is set correctly.');
+    $this->assertEqual(rtrim($comment_loaded->thread, '/') . '.00/', $reply_loaded->thread,'Thread of reply grows correctly.');
 
     // Second reply to comment
     $this->drupalGet('comment/reply/' . $this->node->nid . '/' . $comment->id);
-    $this->assertText($subject_text, t('Individual comment-reply subject found.'));
-    $this->assertText($comment_text, t('Individual comment-reply body found.'));
+    $this->assertText($subject_text,'Individual comment-reply subject found.');
+    $this->assertText($comment_text,'Individual comment-reply body found.');
     $reply = $this->postComment(NULL, $this->randomName(), $this->randomName(), TRUE);
     $reply_loaded = comment_load($reply->id);
-    $this->assertTrue($this->commentExists($reply, TRUE), t('Second reply found.'));
-    $this->assertEqual(rtrim($comment_loaded->thread, '/') . '.01/', $reply_loaded->thread, t('Thread of second reply grows correctly.'));
+    $this->assertTrue($this->commentExists($reply, TRUE),'Second reply found.');
+    $this->assertEqual(rtrim($comment_loaded->thread, '/') . '.01/', $reply_loaded->thread,'Thread of second reply grows correctly.');
 
     // Edit reply.
     $this->drupalGet('comment/edit/' . $reply->id);
     $reply = $this->postComment(NULL, $this->randomName(), $this->randomName(), TRUE);
-    $this->assertTrue($this->commentExists($reply, TRUE), t('Modified reply found.'));
+    $this->assertTrue($this->commentExists($reply, TRUE),'Modified reply found.');
 
     // Correct link count
     $this->drupalGet('node');
-    $this->assertRaw('3 comments', t('Link to the 3 comments exist.'));
+    $this->assertRaw('3 comments','Link to the 3 comments exist.');
 
     // Confirm a new comment is posted to the correct page.
     $this->setCommentsPerPage(2);
     $comment_new_page = $this->postComment($this->node, $this->randomName(), $this->randomName(), TRUE);
-    $this->assertTrue($this->commentExists($comment_new_page), t('Page one exists. %s'));
+    $this->assertTrue($this->commentExists($comment_new_page),'Page one exists. %s');
     $this->drupalGet('node/' . $this->node->nid, array('query' => 'page=1'));
-    $this->assertTrue($this->commentExists($reply, TRUE), t('Page two exists. %s'));
+    $this->assertTrue($this->commentExists($reply, TRUE),'Page two exists. %s');
     $this->setCommentsPerPage(50);
 
     // Attempt to post to node with comments disabled.
     $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'comment' => COMMENT_NODE_HIDDEN));
-    $this->assertTrue($this->node, t('Article node created.'));
+    $this->assertTrue($this->node,'Article node created.');
     $this->drupalGet('comment/reply/' . $this->node->nid);
-    $this->assertText('This discussion is closed', t('Posting to node with comments disabled'));
-    $this->assertNoField('edit-comment', t('Comment body field found.'));
+    $this->assertText('This discussion is closed','Posting to node with comments disabled');
+    $this->assertNoField('edit-comment','Comment body field found.');
 
     // Attempt to post to node with read-only comments.
     $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'comment' => COMMENT_NODE_CLOSED));
-    $this->assertTrue($this->node, t('Article node created.'));
+    $this->assertTrue($this->node,'Article node created.');
     $this->drupalGet('comment/reply/' . $this->node->nid);
-    $this->assertText('This discussion is closed', t('Posting to node with comments read-only'));
-    $this->assertNoField('edit-comment', t('Comment body field found.'));
+    $this->assertText('This discussion is closed','Posting to node with comments read-only');
+    $this->assertNoField('edit-comment','Comment body field found.');
 
     // Attempt to post to node with comments enabled (check field names etc).
     $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'comment' => COMMENT_NODE_OPEN));
-    $this->assertTrue($this->node, t('Article node created.'));
+    $this->assertTrue($this->node,'Article node created.');
     $this->drupalGet('comment/reply/' . $this->node->nid);
-    $this->assertNoText('This discussion is closed', t('Posting to node with comments enabled'));
-    $this->assertField('edit-comment', t('Comment body field found.'));
+    $this->assertNoText('This discussion is closed','Posting to node with comments enabled');
+    $this->assertField('edit-comment','Comment body field found.');
 
     // Delete comment and make sure that reply is also removed.
     $this->drupalLogout();
@@ -340,8 +340,8 @@
     $this->deleteComment($comment_new_page);
 
     $this->drupalGet('node/' . $this->node->nid);
-    $this->assertFalse($this->commentExists($comment), t('Comment not found.'));
-    $this->assertFalse($this->commentExists($reply, TRUE), t('Reply not found.'));
+    $this->assertFalse($this->commentExists($comment),'Comment not found.');
+    $this->assertFalse($this->commentExists($reply, TRUE),'Reply not found.');
 
     // Enabled comment form on node page.
     $this->drupalLogin($this->admin_user);
@@ -352,7 +352,7 @@
     $this->drupalLogin($this->web_user);
     $this->drupalGet('node/' . $this->node->nid);
     $form_comment = $this->postComment(NULL, $this->randomName(), $this->randomName(), TRUE);
-    $this->assertTrue($this->commentExists($form_comment), t('Form comment found.'));
+    $this->assertTrue($this->commentExists($form_comment),'Form comment found.');
 
     // Disable comment form on node page.
     $this->drupalLogout();
@@ -364,9 +364,9 @@
 class CommentAnonymous extends CommentHelperCase {
   public static function getInfo() {
     return array(
-      'name' => t('Anonymous comments'),
-      'description' => t('Test anonymous comments.'),
-      'group' => t('Comment'),
+      'name' => 'Anonymous comments',
+      'description' => 'Test anonymous comments.',
+      'group' => 'Comment',
     );
   }
 
@@ -382,7 +382,7 @@
 
     // Post anonymous comment without contact info.
     $anonymous_comment1 = $this->postComment($this->node, $this->randomName(), $this->randomName());
-    $this->assertTrue($this->commentExists($anonymous_comment1), t('Anonymous comment without contact info found.'));
+    $this->assertTrue($this->commentExists($anonymous_comment1),'Anonymous comment without contact info found.');
 
     // Allow contact info.
     $this->drupalLogin($this->admin_user);
@@ -391,15 +391,15 @@
     // Attempt to edit anonymous comment.
     $this->drupalGet('comment/edit/' . $anonymous_comment1->id);
     $edited_comment = $this->postComment(NULL, $this->randomName(), $this->randomName());
-    $this->assertTrue($this->commentExists($edited_comment, FALSE), t('Modified reply found.'));
+    $this->assertTrue($this->commentExists($edited_comment, FALSE),'Modified reply found.');
     $this->drupalLogout();
 
     // Post anonymous comment with contact info (optional).
     $this->drupalGet('comment/reply/' . $this->node->nid);
-    $this->assertTrue($this->commentContactInfoAvailable(), t('Contact information available.'));
+    $this->assertTrue($this->commentContactInfoAvailable(),'Contact information available.');
 
     $anonymous_comment2 = $this->postComment($this->node, $this->randomName(), $this->randomName());
-    $this->assertTrue($this->commentExists($anonymous_comment2), t('Anonymous comment with contact info (optional) found.'));
+    $this->assertTrue($this->commentExists($anonymous_comment2),'Anonymous comment with contact info (optional) found.');
 
     // Require contact info.
     $this->drupalLogin($this->admin_user);
@@ -408,34 +408,34 @@
 
     // Try to post comment with contact info (required).
     $this->drupalGet('comment/reply/' . $this->node->nid);
-    $this->assertTrue($this->commentContactInfoAvailable(), t('Contact information available.'));
+    $this->assertTrue($this->commentContactInfoAvailable(),'Contact information available.');
 
     $anonymous_comment3 = $this->postComment($this->node, $this->randomName(), $this->randomName(), FALSE, TRUE);
-    $this->assertText(t('E-mail field is required.'), t('E-mail required.')); // Name should have 'Anonymous' for value by default.
-    $this->assertFalse($this->commentExists($anonymous_comment3), t('Anonymous comment with contact info (required) not found.'));
+    $this->assertText(t('E-mail field is required.'),'E-mail required.'); // Name should have 'Anonymous' for value by default.
+    $this->assertFalse($this->commentExists($anonymous_comment3),'Anonymous comment with contact info (required) not found.');
 
     // Post comment with contact info (required).
     $anonymous_comment3 = $this->postComment($this->node, $this->randomName(), $this->randomName(), FALSE, array('mail' => 'tester@simpletest.org'));
-    $this->assertTrue($this->commentExists($anonymous_comment3), t('Anonymous comment with contact info (required) found.'));
+    $this->assertTrue($this->commentExists($anonymous_comment3),'Anonymous comment with contact info (required) found.');
 
     // Unpublish comment.
     $this->drupalLogin($this->admin_user);
     $this->performCommentOperation($anonymous_comment3, 'unpublish');
 
     $this->drupalGet('admin/content/content/comment/approval');
-    $this->assertRaw('comments[' . $anonymous_comment3->id . ']', t('Comment was unpublished.'));
+    $this->assertRaw('comments[' . $anonymous_comment3->id . ']','Comment was unpublished.');
 
     // Publish comment.
     $this->performCommentOperation($anonymous_comment3, 'publish', TRUE);
 
     $this->drupalGet('admin/content/content/comment');
-    $this->assertRaw('comments[' . $anonymous_comment3->id . ']', t('Comment was published.'));
+    $this->assertRaw('comments[' . $anonymous_comment3->id . ']','Comment was published.');
 
     // Delete comment.
     $this->performCommentOperation($anonymous_comment3, 'delete');
 
     $this->drupalGet('admin/content/content/comment');
-    $this->assertNoRaw('comments[' . $anonymous_comment3->id . ']', t('Comment was deleted.'));
+    $this->assertNoRaw('comments[' . $anonymous_comment3->id . ']','Comment was deleted.');
 
     // Reset.
     $this->drupalLogin($this->admin_user);
@@ -446,22 +446,22 @@
     // "Login or register to post comments" type link may be shown.
     $this->drupalLogout();
     $this->drupalGet('node/' . $this->node->nid);
-    $this->assertNoRaw('<div id="comments">', t('Comments were not displayed.'));
-    $this->assertNoLink('Add new comment', t('Link to add comment was found.'));
+    $this->assertNoRaw('<div id="comments">','Comments were not displayed.');
+    $this->assertNoLink('Add new comment','Link to add comment was found.');
 
     // Attempt to view node-comment form while disallowed.
     $this->drupalGet('comment/reply/' . $this->node->nid);
-    $this->assertText('You are not authorized to view comments', t('Error attempting to post comment.'));
-    $this->assertNoFieldByName('subject', '', t('Subject field not found.'));
-    $this->assertNoFieldByName('comment', '', t('Comment field not found.'));
+    $this->assertText('You are not authorized to view comments','Error attempting to post comment.');
+    $this->assertNoFieldByName('subject', '','Subject field not found.');
+    $this->assertNoFieldByName('comment', '','Comment field not found.');
 
     $this->drupalLogin($this->admin_user);
     $this->setAnonymousUserComment(TRUE, FALSE, FALSE);
     $this->drupalLogout();
     $this->drupalGet('node/' . $this->node->nid);
-    $this->assertRaw('<div id="comments">', t('Comments were displayed.'));
-    $this->assertLink('Login', 1, t('Link to login was found.'));
-    $this->assertLink('register', 1, t('Link to register was found.'));
+    $this->assertRaw('<div id="comments">','Comments were displayed.');
+    $this->assertLink('Login', 1,'Link to login was found.');
+    $this->assertLink('register', 1,'Link to register was found.');
   }
 }
 
@@ -472,9 +472,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Comment paging settings'),
-      'description' => t('Test paging of comments and their settings.'),
-      'group' => t('Comment'),
+      'name' => 'Comment paging settings',
+      'description' => 'Test paging of comments and their settings.',
+      'group' => 'Comment',
     );
   }
 
@@ -505,22 +505,22 @@
     // Check the first page of the node, and confirm the correct comments are
     // shown.
     $this->drupalGet('node/' . $node->nid);
-    $this->assertRaw(t('next'), t('Paging links found.'));
-    $this->assertTrue($this->commentExists($comments[0]), t('Comment 1 appears on page 1.'));
-    $this->assertFalse($this->commentExists($comments[1]), t('Comment 2 does not appear on page 1.'));
-    $this->assertFalse($this->commentExists($comments[2]), t('Comment 3 does not appear on page 1.'));
+    $this->assertRaw(t('next'),'Paging links found.');
+    $this->assertTrue($this->commentExists($comments[0]),'Comment 1 appears on page 1.');
+    $this->assertFalse($this->commentExists($comments[1]),'Comment 2 does not appear on page 1.');
+    $this->assertFalse($this->commentExists($comments[2]),'Comment 3 does not appear on page 1.');
 
     // Check the second page.
     $this->drupalGet('node/' . $node->nid, array('query' => 'page=1'));
-    $this->assertTrue($this->commentExists($comments[1]), t('Comment 2 appears on page 2.'));
-    $this->assertFalse($this->commentExists($comments[0]), t('Comment 1 does not appear on page 2.'));
-    $this->assertFalse($this->commentExists($comments[2]), t('Comment 3 does not appear on page 2.'));
+    $this->assertTrue($this->commentExists($comments[1]),'Comment 2 appears on page 2.');
+    $this->assertFalse($this->commentExists($comments[0]),'Comment 1 does not appear on page 2.');
+    $this->assertFalse($this->commentExists($comments[2]),'Comment 3 does not appear on page 2.');
 
     // Check the third page.
     $this->drupalGet('node/' . $node->nid, array('query' => 'page=2'));
-    $this->assertTrue($this->commentExists($comments[2]), t('Comment 3 appears on page 3.'));
-    $this->assertFalse($this->commentExists($comments[0]), t('Comment 1 does not appear on page 3.'));
-    $this->assertFalse($this->commentExists($comments[1]), t('Comment 2 does not appear on page 3.'));
+    $this->assertTrue($this->commentExists($comments[2]),'Comment 3 appears on page 3.');
+    $this->assertFalse($this->commentExists($comments[0]),'Comment 1 does not appear on page 3.');
+    $this->assertFalse($this->commentExists($comments[1]),'Comment 2 does not appear on page 3.');
 
     // Post a reply to the oldest comment and test again.
     $replies = array();
@@ -532,21 +532,21 @@
     // We are still in flat view - the replies should not be on the first page,
     // even though they are replies to the oldest comment.
     $this->drupalGet('node/' . $node->nid, array('query' => 'page=0'));
-    $this->assertFalse($this->commentExists($reply, TRUE), t('In flat mode, reply does not appear on page 1.'));
+    $this->assertFalse($this->commentExists($reply, TRUE),'In flat mode, reply does not appear on page 1.');
 
     // If we switch to threaded mode, the replies on the oldest comment
     // should be bumped to the first page and comment 6 should be bumped
     // to the second page.
     $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, t('Switched to threaded mode.'));
     $this->drupalGet('node/' . $node->nid, array('query' => 'page=0'));
-    $this->assertTrue($this->commentExists($reply, TRUE), t('In threaded mode, reply appears on page 1.'));
-    $this->assertFalse($this->commentExists($comments[1]), t('In threaded mode, comment 2 has been bumped off of page 1.'));
+    $this->assertTrue($this->commentExists($reply, TRUE),'In threaded mode, reply appears on page 1.');
+    $this->assertFalse($this->commentExists($comments[1]),'In threaded mode, comment 2 has been bumped off of page 1.');
 
     // If (# replies > # comments per page) in threaded expanded view,
     // the overage should be bumped.
     $reply2 = $this->postComment(NULL, $this->randomName(), $this->randomName(), FALSE, TRUE);
     $this->drupalGet('node/' . $node->nid, array('query' => 'page=0'));
-    $this->assertFalse($this->commentExists($reply2, TRUE), t('In threaded mode where # replies > # comments per page, the newest reply does not appear on page 1.'));
+    $this->assertFalse($this->commentExists($reply2, TRUE),'In threaded mode where # replies > # comments per page, the newest reply does not appear on page 1.');
 
     $this->drupalLogout();
   }
@@ -555,9 +555,9 @@
 class CommentApprovalTest extends CommentHelperCase {
   public static function getInfo() {
     return array(
-      'name' => t('Comment approval'),
-      'description' => t('Test comment approval functionality.'),
-      'group' => t('Comment'),
+      'name' => 'Comment approval',
+      'description' => 'Test comment approval functionality.',
+      'group' => 'Comment',
     );
   }
 
@@ -576,7 +576,7 @@
     $subject = $this->randomName();
     $body = $this->randomName();
     $this->postComment($this->node, $subject, $body, FALSE, TRUE); // Set $contact to true so that it won't check for id and message.
-    $this->assertText(t('Your comment has been queued for review by site administrators and will be published after approval.'), t('Comment requires approval.'));
+    $this->assertText(t('Your comment has been queued for review by site administrators and will be published after approval.'),'Comment requires approval.');
 
     // Get unapproved comment id.
     $this->drupalLogin($this->admin_user);
@@ -584,7 +584,7 @@
     $anonymous_comment4 = (object) array('id' => $anonymous_comment4, 'subject' => $subject, 'comment' => $body);
     $this->drupalLogout();
 
-    $this->assertFalse($this->commentExists($anonymous_comment4), t('Anonymous comment was not published.'));
+    $this->assertFalse($this->commentExists($anonymous_comment4),'Anonymous comment was not published.');
 
     // Approve comment.
     $this->drupalLogin($this->admin_user);
@@ -592,7 +592,7 @@
     $this->drupalLogout();
 
     $this->drupalGet('node/' . $this->node->nid);
-    $this->assertTrue($this->commentExists($anonymous_comment4), t('Anonymous comment visible.'));
+    $this->assertTrue($this->commentExists($anonymous_comment4),'Anonymous comment visible.');
   }
 
   /**
@@ -610,7 +610,7 @@
     $subject = $this->randomName();
     $body = $this->randomName();
     $this->postComment($this->node, $subject, $body, FALSE, TRUE); // Set $contact to true so that it won't check for id and message.
-    $this->assertText(t('Your comment has been queued for review by site administrators and will be published after approval.'), t('Comment requires approval.'));
+    $this->assertText(t('Your comment has been queued for review by site administrators and will be published after approval.'),'Comment requires approval.');
 
     // Get unapproved comment id.
     $this->drupalLogin($this->admin_user);
@@ -618,7 +618,7 @@
     $anonymous_comment4 = (object) array('id' => $anonymous_comment4, 'subject' => $subject, 'comment' => $body);
     $this->drupalLogout();
 
-    $this->assertFalse($this->commentExists($anonymous_comment4), t('Anonymous comment was not published.'));
+    $this->assertFalse($this->commentExists($anonymous_comment4),'Anonymous comment was not published.');
 
     // Approve comment.
     $this->drupalLogin($this->admin_user);
@@ -627,7 +627,7 @@
     $this->drupalLogout();
 
     $this->drupalGet('node/' . $this->node->nid);
-    $this->assertTrue($this->commentExists($anonymous_comment4), t('Anonymous comment visible.'));
+    $this->assertTrue($this->commentExists($anonymous_comment4),'Anonymous comment visible.');
   }
 }
 
@@ -637,9 +637,9 @@
 class CommentBlockFunctionalTest extends CommentHelperCase {
   public static function getInfo() {
     return array(
-      'name' => t('Comment blocks'),
-      'description' => t('Test comment block functionality.'),
-      'group' => t('Comment'),
+      'name' => 'Comment blocks',
+      'description' => 'Test comment block functionality.',
+      'group' => 'Comment',
     );
   }
 
@@ -654,7 +654,7 @@
       'comment_recent[region]' => 'left',
     );
     $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
-    $this->assertText(t('The block settings have been updated.'), t('Block saved to left region.'));
+    $this->assertText(t('The block settings have been updated.'),'Block saved to left region.');
 
     // Set block title and variables.
     $block = array(
@@ -662,7 +662,7 @@
       'comment_block_count' => 2,
     );
     $this->drupalPost('admin/build/block/configure/comment/recent', $block, t('Save block'));
-    $this->assertText(t('The block configuration has been saved.'), t('Block saved.'));
+    $this->assertText(t('The block configuration has been saved.'),'Block saved.');
 
     // Add some test comments, one without a subject.
     $comment1 = $this->postComment($this->node, $this->randomName(), $this->randomName());
@@ -672,17 +672,17 @@
     // Test that a user without the 'access comments' permission can not see the block.
     $this->drupalLogout();
     $this->drupalGet('');
-    $this->assertNoText($block['title'], t('Block was not found.'));
+    $this->assertNoText($block['title'],'Block was not found.');
 
     $this->drupalLogin($this->web_user);
     $this->drupalGet('');
-    $this->assertText($block['title'], t('Block was found.'));
+    $this->assertText($block['title'],'Block was found.');
 
     // Test the only the 2 latest comments are shown and in the proper order.
-    $this->assertNoText($comment1->subject, t('Comment not found in block.'));
-    $this->assertText($comment2->subject, t('Comment found in block.'));
-    $this->assertText($comment3->comment, t('Comment found in block.'));
-    $this->assertTrue(strpos($this->drupalGetContent(), $comment3->comment) < strpos($this->drupalGetContent(), $comment2->subject), t('Comments were ordered correctly in block.'));
+    $this->assertNoText($comment1->subject,'Comment not found in block.');
+    $this->assertText($comment2->subject,'Comment found in block.');
+    $this->assertText($comment3->comment,'Comment found in block.');
+    $this->assertTrue(strpos($this->drupalGetContent(), $comment3->comment) < strpos($this->drupalGetContent(), $comment2->subject),'Comments were ordered correctly in block.');
 
     // Set the number of recent comments to show to 10.
     $this->drupalLogout();
@@ -691,30 +691,30 @@
       'comment_block_count' => 10,
     );
     $this->drupalPost('admin/build/block/configure/comment/recent', $block, t('Save block'));
-    $this->assertText(t('The block configuration has been saved.'), t('Block saved.'));
+    $this->assertText(t('The block configuration has been saved.'),'Block saved.');
 
     // Post an additional comment.
     $comment4 = $this->postComment($this->node, $this->randomName(), $this->randomName());
 
     // Test that all four comments are shown.
-    $this->assertText($comment1->subject, t('Comment found in block.'));
-    $this->assertText($comment2->subject, t('Comment found in block.'));
-    $this->assertText($comment3->comment, t('Comment found in block.'));
-    $this->assertText($comment4->subject, t('Comment found in block.'));
+    $this->assertText($comment1->subject,'Comment found in block.');
+    $this->assertText($comment2->subject,'Comment found in block.');
+    $this->assertText($comment3->comment,'Comment found in block.');
+    $this->assertText($comment4->subject,'Comment found in block.');
 
     // Test that links to comments work when comments are across pages.
     $this->setCommentsPerPage(1);
     $this->drupalGet('');
     $this->clickLink($comment1->subject);
-    $this->assertText($comment1->subject, t('Comment link goes to correct page.'));
+    $this->assertText($comment1->subject,'Comment link goes to correct page.');
     $this->drupalGet('');
     $this->clickLink($comment2->subject);
-    $this->assertText($comment2->subject, t('Comment link goes to correct page.'));
+    $this->assertText($comment2->subject,'Comment link goes to correct page.');
     $this->clickLink($comment4->subject);
-    $this->assertText($comment4->subject, t('Comment link goes to correct page.'));
+    $this->assertText($comment4->subject,'Comment link goes to correct page.');
     // Check that when viewing a comment page from a link to the comment, that
     // rel="canonical" is added to the head of the document.
-    $this->assertRaw('<link rel="canonical"', t('Canonical URL was found in the HTML head'));
+    $this->assertRaw('<link rel="canonical"','Canonical URL was found in the HTML head');
   }
 }
 
@@ -724,9 +724,9 @@
 class CommentRSSUnitTest extends CommentHelperCase {
   public static function getInfo() {
     return array(
-      'name' => t('Comment RSS'),
-      'description' => t('Test comments as part of an RSS feed.'),
-      'group' => t('Comment'),
+      'name' => 'Comment RSS',
+      'description' => 'Test comments as part of an RSS feed.',
+      'group' => 'Comment',
     );
   }
 
@@ -739,12 +739,12 @@
     $comment = $this->postComment($this->node, $this->randomName(), $this->randomName());
     $this->drupalGet('rss.xml');
     $raw = '<comments>' . url('node/' . $this->node->nid, array('fragment' => 'comments', 'absolute' => TRUE)) . '</comments>';
-    $this->assertRaw($raw, t('Comments as part of RSS feed.'));
+    $this->assertRaw($raw,'Comments as part of RSS feed.');
 
     // Hide comments from RSS feed and check presence.
     $this->node->comment = COMMENT_NODE_HIDDEN;
     node_save($this->node);
     $this->drupalGet('rss.xml');
-    $this->assertNoRaw($raw, t('Hidden comments is not a part of RSS feed.'));
+    $this->assertNoRaw($raw,'Hidden comments is not a part of RSS feed.');
   }
 }
Index: modules/help/help.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/help/help.test,v
retrieving revision 1.7
diff -u -r1.7 help.test
--- modules/help/help.test	12 Jun 2009 08:39:37 -0000	1.7
+++ modules/help/help.test	9 Jul 2009 02:46:29 -0000
@@ -7,9 +7,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Help functionality'),
-      'description' => t('Verify help display and user access to help based on persmissions.'),
-      'group' => t('Help'),
+      'name' => 'Help functionality',
+      'description' => 'Verify help display and user access to help based on persmissions.',
+      'group' => 'Help',
     );
   }
 
@@ -63,9 +63,9 @@
 //          if ($module == 'blog' || $module == 'poll') {
 //            continue;
 //          }
-          $this->assertTitle($name . ' | Drupal', t('[' . $module . '] Title was displayed'));
-          $this->assertRaw('<h2>' . t($name) . '</h2>', t('[' . $module . '] Heading was displayed'));
-          $this->assertText(t('Home ' . $crumb . ' Administer ' . $crumb . ' Help'), t('[' . $module . '] Breadcrumbs were displayed'));
+          $this->assertTitle($name . ' | Drupal','[' . $module . '] Title was displayed');
+          $this->assertRaw('<h2>' . t($name) . '</h2>','[' . $module . '] Heading was displayed');
+          $this->assertText(t('Home ' . $crumb . ' Administer ' . $crumb . ' Help'),'[' . $module . '] Breadcrumbs were displayed');
         }
       }
     }
Index: modules/simpletest/tests/filetransfer.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/filetransfer.test,v
retrieving revision 1.1
diff -u -r1.1 filetransfer.test
--- modules/simpletest/tests/filetransfer.test	1 Jul 2009 13:44:53 -0000	1.1
+++ modules/simpletest/tests/filetransfer.test	9 Jul 2009 02:46:29 -0000
@@ -10,9 +10,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('FileTransfer unit tests'),
-      'description' => t('Test that the jail is respected and that protocols using recursive file move operations work.'),
-      'group' => t('System')
+      'name' => 'FileTransfer unit tests',
+      'description' => 'Test that the jail is respected and that protocols using recursive file move operations work.',
+      'group' => 'System'
     );
   }
 
Index: modules/simpletest/tests/graph.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/graph.test,v
retrieving revision 1.5
diff -u -r1.5 graph.test
--- modules/simpletest/tests/graph.test	8 Jun 2009 09:23:53 -0000	1.5
+++ modules/simpletest/tests/graph.test	9 Jul 2009 02:46:29 -0000
@@ -12,9 +12,9 @@
 class GraphUnitTest extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Graph'),
-      'description' => t('Graph handling unit tests.'),
-      'group' => t('System'),
+      'name' => 'Graph',
+      'description' => 'Graph handling unit tests.',
+      'group' => 'System',
     );
   }
 
@@ -68,7 +68,7 @@
     $this->assertReversePaths($graph, $expected_reverse_paths);
 
     // Assert that DFS didn't created "missing" vertexes automatically.
-    $this->assertFALSE(isset($graph[6]), t('Vertex 6 has not been created'));
+    $this->assertFALSE(isset($graph[6]),'Vertex 6 has not been created');
 
     $expected_components = array(
       array(1, 2, 3, 4, 5, 7),
Index: modules/simpletest/tests/common.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/common.test,v
retrieving revision 1.52
diff -u -r1.52 common.test
--- modules/simpletest/tests/common.test	7 Jul 2009 13:51:58 -0000	1.52
+++ modules/simpletest/tests/common.test	9 Jul 2009 02:46:29 -0000
@@ -8,9 +8,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('URL generation tests'),
-      'description' => t('Confirm that url(), drupal_query_string_encode(), and l() work correctly with various input.'),
-      'group' => t('System'),
+      'name' => 'URL generation tests',
+      'description' => 'Confirm that url(), drupal_query_string_encode(), and l() work correctly with various input.',
+      'group' => 'System',
     );
   }
 
@@ -29,10 +29,10 @@
     * Test drupal_query_string_encode().
     */
    function testDrupalQueryStringEncode() {
-     $this->assertEqual(drupal_query_string_encode(array('a' => ' &#//+%20@۞')), 'a=%20%26%23%2F%2F%2B%2520%40%DB%9E', t('Value was properly encoded.'));
-     $this->assertEqual(drupal_query_string_encode(array(' &#//+%20@۞' => 'a')), '%20%26%23%2F%2F%2B%2520%40%DB%9E=a', t('Key was properly encoded.'));
-     $this->assertEqual(drupal_query_string_encode(array('a' => '1', 'b' => '2', 'c' => '3'), array('b')), 'a=1&c=3', t('Value was properly excluded.'));
-     $this->assertEqual(drupal_query_string_encode(array('a' => array('b' => '2', 'c' => '3')), array('b', 'a[c]')), 'a[b]=2', t('Nested array was properly encoded.'));
+     $this->assertEqual(drupal_query_string_encode(array('a' => ' &#//+%20@۞')), 'a=%20%26%23%2F%2F%2B%2520%40%DB%9E','Value was properly encoded.');
+     $this->assertEqual(drupal_query_string_encode(array(' &#//+%20@۞' => 'a')), '%20%26%23%2F%2F%2B%2520%40%DB%9E=a','Key was properly encoded.');
+     $this->assertEqual(drupal_query_string_encode(array('a' => '1', 'b' => '2', 'c' => '3'), array('b')), 'a=1&c=3','Value was properly excluded.');
+     $this->assertEqual(drupal_query_string_encode(array('a' => array('b' => '2', 'c' => '3')), array('b', 'a[c]')), 'a[b]=2','Nested array was properly encoded.');
    }
 }
 
@@ -42,9 +42,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Size parsing test'),
-      'description' => t('Parse a predefined amount of bytes and compare the output with the expected value.'),
-      'group' => t('System')
+      'name' => 'Size parsing test',
+      'description' => 'Parse a predefined amount of bytes and compare the output with the expected value.',
+      'group' => 'System'
     );
   }
 
@@ -146,9 +146,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Drupal tags handling'),
-      'description' => t("Performs tests on Drupal's handling of tags, both explosion and implosion tactics used."),
-      'group' => t('System')
+      'name' => 'Drupal tags handling',
+      'description' => "Performs tests on Drupal's handling of tags, both explosion and implosion tactics used.",
+      'group' => 'System'
     );
   }
 
@@ -196,9 +196,9 @@
 class CascadingStylesheetsTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Cascading stylesheets'),
-      'description' => t('Tests adding various cascading stylesheets to the page.'),
-      'group' => t('System'),
+      'name' => 'Cascading stylesheets',
+      'description' => 'Tests adding various cascading stylesheets to the page.',
+      'group' => 'System',
     );
   }
 
@@ -212,7 +212,7 @@
    * Check default stylesheets as empty.
    */
   function testDefault() {
-    $this->assertEqual(array(), drupal_add_css(), t('Default CSS is empty.'));
+    $this->assertEqual(array(), drupal_add_css(),'Default CSS is empty.');
   }
 
   /**
@@ -221,7 +221,7 @@
   function testAddFile() {
     $path = drupal_get_path('module', 'simpletest') . '/simpletest.css';
     $css = drupal_add_css($path);
-    $this->assertEqual($css['all']['module'][$path], TRUE, t('Adding a CSS file caches it properly.'));
+    $this->assertEqual($css['all']['module'][$path], TRUE,'Adding a CSS file caches it properly.');
   }
 
   /**
@@ -229,7 +229,7 @@
    */
   function testReset() {
     drupal_static_reset('drupal_add_css');
-    $this->assertEqual(array(), drupal_add_css(), t('Resetting the CSS empties the cache.'));
+    $this->assertEqual(array(), drupal_add_css(),'Resetting the CSS empties the cache.');
   }
 
   /**
@@ -238,7 +238,7 @@
   function testRenderFile() {
     $css = drupal_get_path('module', 'simpletest') . '/simpletest.css';
     drupal_add_css($css);
-    $this->assertTrue(strpos(drupal_get_css(), $css) > 0, t('Rendered CSS includes the added stylesheet.'));
+    $this->assertTrue(strpos(drupal_get_css(), $css) > 0,'Rendered CSS includes the added stylesheet.');
   }
 
   /**
@@ -249,7 +249,7 @@
     $css_preprocessed = '<style type="text/css">' . drupal_load_stylesheet_content($css, TRUE) . '</style>';
     drupal_add_css($css, 'inline');
     $css = drupal_get_css();
-    $this->assertEqual($css, $css_preprocessed, t('Rendering preprocessed inline CSS adds it to the page.'));
+    $this->assertEqual($css, $css_preprocessed,'Rendering preprocessed inline CSS adds it to the page.');
   }
 
   /**
@@ -258,7 +258,7 @@
   function testRenderInlineNoPreprocess() {
     $css = 'body { padding: 0px; }';
     drupal_add_css($css, array('type' => 'inline', 'preprocess' => FALSE));
-    $this->assertTrue(strpos(drupal_get_css(), $css) > 0, t('Rendering non-preprocessed inline CSS adds it to the page.'));
+    $this->assertTrue(strpos(drupal_get_css(), $css) > 0,'Rendering non-preprocessed inline CSS adds it to the page.');
   }
 
   /**
@@ -278,7 +278,7 @@
 
     // Fetch the page.
     $this->drupalGet('node/' . $node->nid);
-    $this->assertRaw($compressed_css, t('Inline stylesheets appear in the full page rendering.'));
+    $this->assertRaw($compressed_css,'Inline stylesheets appear in the full page rendering.');
   }
 }
 
@@ -288,9 +288,9 @@
 class DrupalHTTPRequestTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Drupal HTTP request'),
-      'description' => t("Performs tests on Drupal's HTTP request mechanism."),
-      'group' => t('System')
+      'name' => 'Drupal HTTP request',
+      'description' => "Performs tests on Drupal's HTTP request mechanism.",
+      'group' => 'System'
     );
   }
 
@@ -301,22 +301,22 @@
   function testDrupalHTTPRequest() {
     // Parse URL schema.
     $missing_scheme = drupal_http_request('example.com/path');
-    $this->assertEqual($missing_scheme->error, 'missing schema', t('Returned with "missing schema" error.'));
+    $this->assertEqual($missing_scheme->error, 'missing schema','Returned with "missing schema" error.');
 
     $unable_to_parse = drupal_http_request('http:///path');
-    $this->assertEqual($unable_to_parse->error, 'unable to parse URL', t('Returned with "unable to parse URL" error.'));
+    $this->assertEqual($unable_to_parse->error, 'unable to parse URL','Returned with "unable to parse URL" error.');
 
     // Fetch page.
     $result = drupal_http_request(url('node', array('absolute' => TRUE)));
-    $this->assertEqual($result->code, 200, t('Fetched page successfully.'));
+    $this->assertEqual($result->code, 200,'Fetched page successfully.');
     $this->drupalSetContent($result->data);
-    $this->assertTitle(t('Welcome to @site-name | @site-name', array('@site-name' => variable_get('site_name', 'Drupal'))), t('Site title matches.'));
+    $this->assertTitle(t('Welcome to @site-name | @site-name', array('@site-name' => variable_get('site_name', 'Drupal'))),'Site title matches.');
 
     // Test that code and status message is returned.
     $result = drupal_http_request(url('pagedoesnotexist', array('absolute' => TRUE)));
-    $this->assertTrue(!empty($result->protocol),  t('Result protocol is returned.'));
-    $this->assertEqual($result->code, '404', t('Result code is 404'));
-    $this->assertEqual($result->status_message, 'Not Found', t('Result status message is "Not Found"'));
+    $this->assertTrue(!empty($result->protocol), 'Result protocol is returned.');
+    $this->assertEqual($result->code, '404','Result code is 404');
+    $this->assertEqual($result->status_message, 'Not Found','Result status message is "Not Found"');
 
     // Test that timeout is respected. The test machine is expected to be able
     // to make the connection (i.e. complete the fsockopen()) in 2 seconds and
@@ -328,8 +328,8 @@
     $result = drupal_http_request(url('system-test/sleep/10', array('absolute' => TRUE)), array('timeout' => 2));
     $time = timer_read(__METHOD__) / 1000;
     $this->assertTrue(1.8 < $time && $time < 5, t('Request timed out (%time seconds).', array('%time' => $time)));
-    $this->assertTrue($result->error, t('An error message was returned.'));
-    $this->assertEqual($result->code, HTTP_REQUEST_TIMEOUT, t('Proper error code was returned.'));
+    $this->assertTrue($result->error,'An error message was returned.');
+    $this->assertEqual($result->code, HTTP_REQUEST_TIMEOUT,'Proper error code was returned.');
   }
 
   function testDrupalHTTPRequestBasicAuth() {
@@ -341,16 +341,16 @@
     $result = drupal_http_request($auth);
 
     $this->drupalSetContent($result->data);
-    $this->assertRaw($username, t('$_SERVER["PHP_AUTH_USER"] is passed correctly.'));
-    $this->assertRaw($password, t('$_SERVER["PHP_AUTH_PW"] is passed correctly.'));
+    $this->assertRaw($username,'$_SERVER["PHP_AUTH_USER"] is passed correctly.');
+    $this->assertRaw($password,'$_SERVER["PHP_AUTH_PW"] is passed correctly.');
   }
 
   function testDrupalHTTPRequestRedirect() {
     $redirect_301 = drupal_http_request(url('system-test/redirect/301', array('absolute' => TRUE)), array('max_redirects' => 1));
-    $this->assertEqual($redirect_301->redirect_code, 301, t('drupal_http_request follows the 301 redirect.'));
+    $this->assertEqual($redirect_301->redirect_code, 301,'drupal_http_request follows the 301 redirect.');
 
     $redirect_301 = drupal_http_request(url('system-test/redirect/301', array('absolute' => TRUE)), array('max_redirects' => 0));
-    $this->assertFalse(isset($redirect_301->redirect_code), t('drupal_http_request does not follow 301 redirect if max_redirects = 0.'));
+    $this->assertFalse(isset($redirect_301->redirect_code),'drupal_http_request does not follow 301 redirect if max_redirects = 0.');
 
     $redirect_invalid = drupal_http_request(url('system-test/redirect-noscheme', array('absolute' => TRUE)), array('max_redirects' => 1));
     $this->assertEqual($redirect_invalid->error, 'missing schema', t('301 redirect to invalid URL returned with error "!error".', array('!error' => $redirect_invalid->error)));
@@ -362,23 +362,23 @@
     $this->assertEqual($redirect_invalid->error, 'invalid schema ftp', t('301 redirect to invalid URL returned with error "!error".', array('!error' => $redirect_invalid->error)));
 
     $redirect_302 = drupal_http_request(url('system-test/redirect/302', array('absolute' => TRUE)), array('max_redirects' => 1));
-    $this->assertEqual($redirect_302->redirect_code, 302, t('drupal_http_request follows the 302 redirect.'));
+    $this->assertEqual($redirect_302->redirect_code, 302,'drupal_http_request follows the 302 redirect.');
 
     $redirect_302 = drupal_http_request(url('system-test/redirect/302', array('absolute' => TRUE)), array('max_redirects' => 0));
-    $this->assertFalse(isset($redirect_302->redirect_code), t('drupal_http_request does not follow 302 redirect if $retry = 0.'));
+    $this->assertFalse(isset($redirect_302->redirect_code),'drupal_http_request does not follow 302 redirect if $retry = 0.');
 
     $redirect_307 = drupal_http_request(url('system-test/redirect/307', array('absolute' => TRUE)), array('max_redirects' => 1));
-    $this->assertEqual($redirect_307->redirect_code, 307, t('drupal_http_request follows the 307 redirect.'));
+    $this->assertEqual($redirect_307->redirect_code, 307,'drupal_http_request follows the 307 redirect.');
 
     $redirect_307 = drupal_http_request(url('system-test/redirect/307', array('absolute' => TRUE)), array('max_redirects' => 0));
-    $this->assertFalse(isset($redirect_307->redirect_code), t('drupal_http_request does not follow 307 redirect if max_redirects = 0.'));
+    $this->assertFalse(isset($redirect_307->redirect_code),'drupal_http_request does not follow 307 redirect if max_redirects = 0.');
   }
 
   function testDrupalGetDestination() {
     $query = $this->randomName(10);
     $url = url('system-test/destination', array('absolute' => TRUE, 'query' => $query));
     $this->drupalGet($url);
-    $this->assertText($query, t('The query passed to the page is correctly represented by drupal_get_detination().'));
+    $this->assertText($query,'The query passed to the page is correctly represented by drupal_get_detination().');
   }
 }
 
@@ -388,9 +388,9 @@
 class DrupalSetContentTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Drupal set/get regions'),
-      'description' => t('Performs tests on setting and retrieiving content from theme regions.'),
-      'group' => t('System')
+      'name' => 'Drupal set/get regions',
+      'description' => 'Performs tests on setting and retrieiving content from theme regions.',
+      'group' => 'System'
     );
   }
 
@@ -439,9 +439,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('JavaScript'),
-      'description' => t('Tests the JavaScript system.'),
-      'group' => t('System')
+      'name' => 'JavaScript',
+      'description' => 'Tests the JavaScript system.',
+      'group' => 'System'
     );
   }
 
@@ -468,7 +468,7 @@
    * Test default JavaScript is empty.
    */
   function testDefault() {
-    $this->assertEqual(array(), drupal_add_js(), t('Default JavaScript is empty.'));
+    $this->assertEqual(array(), drupal_add_js(),'Default JavaScript is empty.');
   }
 
   /**
@@ -476,10 +476,10 @@
    */
   function testAddFile() {
     $javascript = drupal_add_js('misc/collapse.js');
-    $this->assertTrue(array_key_exists('misc/jquery.js', $javascript), t('jQuery is added when a file is added.'));
-    $this->assertTrue(array_key_exists('misc/drupal.js', $javascript), t('Drupal.js is added when file is added.'));
-    $this->assertTrue(array_key_exists('misc/collapse.js', $javascript), t('JavaScript files are correctly added.'));
-    $this->assertEqual(base_path(), $javascript['settings']['data'][0]['basePath'], t('Base path JavaScript setting is correctly set.'));
+    $this->assertTrue(array_key_exists('misc/jquery.js', $javascript),'jQuery is added when a file is added.');
+    $this->assertTrue(array_key_exists('misc/drupal.js', $javascript),'Drupal.js is added when file is added.');
+    $this->assertTrue(array_key_exists('misc/collapse.js', $javascript),'JavaScript files are correctly added.');
+    $this->assertEqual(base_path(), $javascript['settings']['data'][0]['basePath'],'Base path JavaScript setting is correctly set.');
   }
 
   /**
@@ -487,8 +487,8 @@
    */
   function testAddSetting() {
     $javascript = drupal_add_js(array('drupal' => 'rocks', 'dries' => 280342800), 'setting');
-    $this->assertEqual(280342800, $javascript['settings']['data'][1]['dries'], t('JavaScript setting is set correctly.'));
-    $this->assertEqual('rocks', $javascript['settings']['data'][1]['drupal'], t('The other JavaScript setting is set correctly.'));
+    $this->assertEqual(280342800, $javascript['settings']['data'][1]['dries'],'JavaScript setting is set correctly.');
+    $this->assertEqual('rocks', $javascript['settings']['data'][1]['drupal'],'The other JavaScript setting is set correctly.');
   }
 
   /**
@@ -497,9 +497,9 @@
   function testHeaderSetting() {
     drupal_add_js(array('testSetting' => 'testValue'), 'setting');
     $javascript = drupal_get_js('header');
-    $this->assertTrue(strpos($javascript, 'basePath') > 0, t('Rendered JavaScript header returns basePath setting.'));
-    $this->assertTrue(strpos($javascript, 'testSetting') > 0, t('Rendered JavaScript header returns custom setting.'));
-    $this->assertTrue(strpos($javascript, 'misc/jquery.js') > 0, t('Rendered JavaScript header includes jQuery.'));
+    $this->assertTrue(strpos($javascript, 'basePath') > 0,'Rendered JavaScript header returns basePath setting.');
+    $this->assertTrue(strpos($javascript, 'testSetting') > 0,'Rendered JavaScript header returns custom setting.');
+    $this->assertTrue(strpos($javascript, 'misc/jquery.js') > 0,'Rendered JavaScript header includes jQuery.');
   }
 
   /**
@@ -508,7 +508,7 @@
   function testReset() {
     drupal_add_js('misc/collapse.js');
     drupal_static_reset('drupal_add_js');
-    $this->assertEqual(array(), drupal_add_js(), t('Resetting the JavaScript correctly empties the cache.'));
+    $this->assertEqual(array(), drupal_add_js(),'Resetting the JavaScript correctly empties the cache.');
   }
 
   /**
@@ -517,9 +517,9 @@
   function testAddInline() {
     $inline = 'jQuery(function () { });';
     $javascript = drupal_add_js($inline, array('type' => 'inline', 'scope' => 'footer'));
-    $this->assertTrue(array_key_exists('misc/jquery.js', $javascript), t('jQuery is added when inline scripts are added.'));
+    $this->assertTrue(array_key_exists('misc/jquery.js', $javascript),'jQuery is added when inline scripts are added.');
     $data = end($javascript);
-    $this->assertEqual($inline, $data['data'], t('Inline JavaScript is correctly added to the footer.'));
+    $this->assertEqual($inline, $data['data'],'Inline JavaScript is correctly added to the footer.');
   }
 
   /**
@@ -530,7 +530,7 @@
     drupal_add_js($external, 'external');
     $javascript = drupal_get_js();
     // Local files have a base_path() prefix, external files should not.
-    $this->assertTrue(strpos($javascript, 'src="' . $external) > 0, t('Rendering an external JavaScript file.'));
+    $this->assertTrue(strpos($javascript, 'src="' . $external) > 0,'Rendering an external JavaScript file.');
   }
 
   /**
@@ -540,7 +540,7 @@
     $inline = 'jQuery(function () { });';
     drupal_add_js($inline, array('type' => 'inline', 'scope' => 'footer'));
     $javascript = drupal_get_js('footer');
-    $this->assertTrue(strpos($javascript, $inline) > 0, t('Rendered JavaScript footer returns the inline code.'));
+    $this->assertTrue(strpos($javascript, $inline) > 0,'Rendered JavaScript footer returns the inline code.');
   }
 
   /**
@@ -548,7 +548,7 @@
    */
   function testNoCache() {
     $javascript = drupal_add_js('misc/collapse.js', array('cache' => FALSE));
-    $this->assertFalse($javascript['misc/collapse.js']['preprocess'], t('Setting cache to FALSE sets proprocess to FALSE when adding JavaScript.'));
+    $this->assertFalse($javascript['misc/collapse.js']['preprocess'],'Setting cache to FALSE sets proprocess to FALSE when adding JavaScript.');
   }
 
   /**
@@ -556,7 +556,7 @@
    */
   function testDifferentWeight() {
     $javascript = drupal_add_js('misc/collapse.js', array('weight' => JS_THEME));
-    $this->assertEqual($javascript['misc/collapse.js']['weight'], JS_THEME, t('Adding a JavaScript file with a different weight caches the given weight.'));
+    $this->assertEqual($javascript['misc/collapse.js']['weight'], JS_THEME,'Adding a JavaScript file with a different weight caches the given weight.');
   }
 
   /**
@@ -565,7 +565,7 @@
   function testRenderDifferentWeight() {
     drupal_add_js('misc/collapse.js', array('weight' => JS_LIBRARY - 21));
     $javascript = drupal_get_js();
-    $this->assertTrue(strpos($javascript, 'misc/collapse.js') < strpos($javascript, 'misc/jquery.js'), t('Rendering a JavaScript file above jQuery.'));
+    $this->assertTrue(strpos($javascript, 'misc/collapse.js') < strpos($javascript, 'misc/jquery.js'),'Rendering a JavaScript file above jQuery.');
   }
 
   /**
@@ -582,7 +582,7 @@
     // tableselect.js. See simpletest_js_alter() to see where this alteration
     // takes place.
     $javascript = drupal_get_js();
-    $this->assertTrue(strpos($javascript, 'simpletest.js') < strpos($javascript, 'misc/tableselect.js'), t('Altering JavaScript weight through the alter hook.'));
+    $this->assertTrue(strpos($javascript, 'simpletest.js') < strpos($javascript, 'misc/tableselect.js'),'Altering JavaScript weight through the alter hook.');
   }
 
   /**
@@ -590,11 +590,11 @@
    */
   function testLibraryRender() {
     $result = drupal_add_library('system', 'farbtastic');
-    $this->assertTrue($result !== FALSE, t('Library was added without errors.'));
+    $this->assertTrue($result !== FALSE,'Library was added without errors.');
     $scripts = drupal_get_js();
     $styles = drupal_get_css();
-    $this->assertTrue(strpos($scripts, 'misc/farbtastic/farbtastic.js'), t('JavaScript of library was added to the page.'));
-    $this->assertTrue(strpos($styles, 'misc/farbtastic/farbtastic.css'), t('Stylesheet of library was added to the page.'));
+    $this->assertTrue(strpos($scripts, 'misc/farbtastic/farbtastic.js'),'JavaScript of library was added to the page.');
+    $this->assertTrue(strpos($styles, 'misc/farbtastic/farbtastic.css'),'Stylesheet of library was added to the page.');
   }
 
   /**
@@ -605,12 +605,12 @@
   function testLibraryAlter() {
     // Verify that common_test altered the title of Farbtastic.
     $library = drupal_get_library('system', 'farbtastic');
-    $this->assertEqual($library['title'], 'Farbtastic: Altered Library', t('Registered libraries were altered.'));
+    $this->assertEqual($library['title'], 'Farbtastic: Altered Library','Registered libraries were altered.');
 
     // common_test_library_alter() also added a dependency on jQuery Form.
     drupal_add_library('system', 'farbtastic');
     $scripts = drupal_get_js();
-    $this->assertTrue(strpos($scripts, 'misc/jquery.form.js'), t('Altered library dependencies are added to the page.'));
+    $this->assertTrue(strpos($scripts, 'misc/jquery.form.js'),'Altered library dependencies are added to the page.');
   }
 
   /**
@@ -620,7 +620,7 @@
    */
   function testLibraryNameConflicts() {
     $farbtastic = drupal_get_library('common_test', 'farbtastic');
-    $this->assertEqual($farbtastic['title'], 'Custom Farbtastic Library', t('Alternative libraries can be added to the page.'));
+    $this->assertEqual($farbtastic['title'], 'Custom Farbtastic Library','Alternative libraries can be added to the page.');
   }
 
   /**
@@ -628,13 +628,13 @@
    */
   function testLibraryUnknown() {
     $result = drupal_get_library('unknown', 'unknown');
-    $this->assertFalse($result, t('Unknown library returned FALSE.'));
+    $this->assertFalse($result,'Unknown library returned FALSE.');
     drupal_static_reset('drupal_get_library');
 
     $result = drupal_add_library('unknown', 'unknown');
-    $this->assertFalse($result, t('Unknown library returned FALSE.'));
+    $this->assertFalse($result,'Unknown library returned FALSE.');
     $scripts = drupal_get_js();
-    $this->assertTrue(strpos($scripts, 'unknown') === FALSE, t('Unknown library was not added to the page.'));
+    $this->assertTrue(strpos($scripts, 'unknown') === FALSE,'Unknown library was not added to the page.');
   }
 }
 
@@ -644,9 +644,9 @@
 class DrupalRenderUnitTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Drupal render'),
-      'description' => t('Performs unit tests on drupal_render().'),
-      'group' => t('System'),
+      'name' => 'Drupal render',
+      'description' => 'Performs unit tests on drupal_render().',
+      'group' => 'System',
     );
   }
 
@@ -674,17 +674,17 @@
     $output = drupal_render($elements);
 
     // The lowest weight element should appear last in $output.
-    $this->assertTrue(strpos($output, $second) > strpos($output, $first), t('Elements were sorted correctly by weight.'));
+    $this->assertTrue(strpos($output, $second) > strpos($output, $first),'Elements were sorted correctly by weight.');
 
     // Confirm that the $elements array has '#sorted' set to TRUE.
-    $this->assertTrue($elements['#sorted'], t("'#sorted' => TRUE was added to the array"));
+    $this->assertTrue($elements['#sorted'],"'#sorted' => TRUE was added to the array");
 
     // Pass $elements through element_children() and ensure it remains
     // sorted in the correct order. drupal_render() will return an empty string
     // if used on the same array in the same request.
     $children = element_children($elements);
-    $this->assertTrue(array_shift($children) == 'first', t('Child found in the correct order.'));
-    $this->assertTrue(array_shift($children) == 'second', t('Child found in the correct order.'));
+    $this->assertTrue(array_shift($children) == 'first','Child found in the correct order.');
+    $this->assertTrue(array_shift($children) == 'second','Child found in the correct order.');
 
 
     // The same array structure again, but with #sorted set to TRUE.
@@ -702,7 +702,7 @@
     $output = drupal_render($elements);
 
     // The elements should appear in output in the same order as the array.
-    $this->assertTrue(strpos($output, $second) < strpos($output, $first), t('Elements were not sorted.'));
+    $this->assertTrue(strpos($output, $second) < strpos($output, $first),'Elements were not sorted.');
   }
 
   /**
@@ -730,9 +730,9 @@
 class ValidUrlTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Valid Url'),
-      'description' => t("Performs tests on Drupal's valid url function."),
-      'group' => t('System')
+      'name' => 'Valid Url',
+      'description' => "Performs tests on Drupal's valid url function.",
+      'group' => 'System'
     );
   }
 
@@ -838,9 +838,9 @@
 class DrupalDataApiTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Data API functions'),
-      'description' => t('Tests the performance of CRUD APIs.'),
-      'group' => t('System'),
+      'name' => 'Data API functions',
+      'description' => 'Tests the performance of CRUD APIs.',
+      'group' => 'System',
     );
   }
 
@@ -856,24 +856,24 @@
     $vocabulary = new stdClass();
     $vocabulary->name = 'test';
     $insert_result = drupal_write_record('taxonomy_vocabulary', $vocabulary);
-    $this->assertTrue($insert_result == SAVED_NEW, t('Correct value returned when a record is inserted with drupal_write_record() for a table with a single-field primary key.'));
-    $this->assertTrue(isset($vocabulary->vid), t('Primary key is set on record created with drupal_write_record().'));
+    $this->assertTrue($insert_result == SAVED_NEW,'Correct value returned when a record is inserted with drupal_write_record() for a table with a single-field primary key.');
+    $this->assertTrue(isset($vocabulary->vid),'Primary key is set on record created with drupal_write_record().');
 
     // Update the initial record after changing a property.
     $vocabulary->name = 'testing';
     $update_result = drupal_write_record('taxonomy_vocabulary', $vocabulary, array('vid'));
-    $this->assertTrue($update_result == SAVED_UPDATED, t('Correct value returned when a record updated with drupal_write_record() for table with single-field primary key.'));
+    $this->assertTrue($update_result == SAVED_UPDATED,'Correct value returned when a record updated with drupal_write_record() for table with single-field primary key.');
 
     // Insert an object record for a table with a multi-field primary key.
     $vocabulary_node_type = new stdClass();
     $vocabulary_node_type->vid = $vocabulary->vid;
     $vocabulary_node_type->type = 'page';
     $insert_result = drupal_write_record('taxonomy_vocabulary_node_type', $vocabulary_node_type);
-    $this->assertTrue($insert_result == SAVED_NEW, t('Correct value returned when a record is inserted with drupal_write_record() for a table with a multi-field primary key.'));
+    $this->assertTrue($insert_result == SAVED_NEW,'Correct value returned when a record is inserted with drupal_write_record() for a table with a multi-field primary key.');
 
     // Update the record.
     $update_result = drupal_write_record('taxonomy_vocabulary_node_type', $vocabulary_node_type, array('vid', 'type'));
-    $this->assertTrue($update_result == SAVED_UPDATED, t('Correct value returned when a record is updated with drupal_write_record() for a table with a multi-field primary key.'));
+    $this->assertTrue($update_result == SAVED_UPDATED,'Correct value returned when a record is updated with drupal_write_record() for a table with a multi-field primary key.');
   }
 
 }
@@ -895,9 +895,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('SimpleTest error collecter'),
-      'description' => t('Performs tests on the Simpletest error and exception collecter.'),
-      'group' => t('SimpleTest'),
+      'name' => 'SimpleTest error collecter',
+      'description' => 'Performs tests on the Simpletest error and exception collecter.',
+      'group' => 'SimpleTest',
     );
   }
 
@@ -911,7 +911,7 @@
   function testErrorCollect() {
     $this->collectedErrors = array();
     $this->drupalGet('error-test/generate-warnings-with-report');
-    $this->assertEqual(count($this->collectedErrors), 3, t('Three errors were collected'));
+    $this->assertEqual(count($this->collectedErrors), 3,'Three errors were collected');
 
     if (count($this->collectedErrors) == 3) {
       $this->assertError($this->collectedErrors[0], 'Notice', 'error_test_generate_warnings()', 'error_test.module', 'Undefined variable: bananas');
@@ -961,9 +961,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Format date'),
-      'description' => t('Test the format_date() function.'),
-      'group' => t('System'),
+      'name' => 'Format date',
+      'description' => 'Test the format_date() function.',
+      'group' => 'System',
     );
   }
 
@@ -987,12 +987,12 @@
     global $user, $language;
 
     $timestamp = strtotime('2007-03-26T00:00:00+00:00');
-    $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', 'en'), 'Sunday, 25-Mar-07 17:00:00 PDT', t('Test all parameters.'));
-    $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), 'domingo, 25-Mar-07 17:00:00 PDT', t('Test translated format.'));
-    $this->assertIdentical(format_date($timestamp, 'custom', '\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), 'l, 25-Mar-07 17:00:00 PDT', t('Test an escaped format string.'));
-    $this->assertIdentical(format_date($timestamp, 'custom', '\\\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), '\\domingo, 25-Mar-07 17:00:00 PDT', t('Test format containing backslash character.'));
-    $this->assertIdentical(format_date($timestamp, 'custom', '\\\\\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), '\\l, 25-Mar-07 17:00:00 PDT', t('Test format containing backslash followed by escaped format string.'));
-    $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'Europe/London', 'en'), 'Monday, 26-Mar-07 01:00:00 BST', t('Test a different time zone.'));
+    $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', 'en'), 'Sunday, 25-Mar-07 17:00:00 PDT','Test all parameters.');
+    $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), 'domingo, 25-Mar-07 17:00:00 PDT','Test translated format.');
+    $this->assertIdentical(format_date($timestamp, 'custom', '\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), 'l, 25-Mar-07 17:00:00 PDT','Test an escaped format string.');
+    $this->assertIdentical(format_date($timestamp, 'custom', '\\\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), '\\domingo, 25-Mar-07 17:00:00 PDT','Test format containing backslash character.');
+    $this->assertIdentical(format_date($timestamp, 'custom', '\\\\\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), '\\l, 25-Mar-07 17:00:00 PDT','Test format containing backslash followed by escaped format string.');
+    $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'Europe/London', 'en'), 'Monday, 26-Mar-07 01:00:00 BST','Test a different time zone.');
 
     // Create an admin user and add Spanish language.
     $admin_user = $this->drupalCreateUser(array('administer languages'));
@@ -1020,13 +1020,13 @@
     $real_language = $language->language;
     $language->language = $user->language;
 
-    $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', 'en'), 'Sunday, 25-Mar-07 17:00:00 PDT', t('Test a different language.'));
-    $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'Europe/London'), 'Monday, 26-Mar-07 01:00:00 BST', t('Test a different time zone.'));
-    $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T'), 'domingo, 25-Mar-07 17:00:00 PDT', t('Test custom date format.'));
-    $this->assertIdentical(format_date($timestamp, 'large'), 'domingo, 25. marzo 2007 - 17:00', t('Test long date format.'));
-    $this->assertIdentical(format_date($timestamp, 'medium'), '25. marzo 2007 - 17:00', t('Test medium date format.'));
-    $this->assertIdentical(format_date($timestamp, 'small'), '2007 Mar 25 - 5:00pm', t('Test short date format.'));
-    $this->assertIdentical(format_date($timestamp), '25. marzo 2007 - 17:00', t('Test default date format.'));
+    $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', 'en'), 'Sunday, 25-Mar-07 17:00:00 PDT','Test a different language.');
+    $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'Europe/London'), 'Monday, 26-Mar-07 01:00:00 BST','Test a different time zone.');
+    $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T'), 'domingo, 25-Mar-07 17:00:00 PDT','Test custom date format.');
+    $this->assertIdentical(format_date($timestamp, 'large'), 'domingo, 25. marzo 2007 - 17:00','Test long date format.');
+    $this->assertIdentical(format_date($timestamp, 'medium'), '25. marzo 2007 - 17:00','Test medium date format.');
+    $this->assertIdentical(format_date($timestamp, 'small'), '2007 Mar 25 - 5:00pm','Test short date format.');
+    $this->assertIdentical(format_date($timestamp), '25. marzo 2007 - 17:00','Test default date format.');
 
     // Restore the original user and language, and enable session saving.
     $user = $real_user;
Index: modules/simpletest/tests/actions.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/actions.test,v
retrieving revision 1.4
diff -u -r1.4 actions.test
--- modules/simpletest/tests/actions.test	30 May 2009 11:17:32 -0000	1.4
+++ modules/simpletest/tests/actions.test	9 Jul 2009 02:46:29 -0000
@@ -4,9 +4,9 @@
 class ActionsConfigurationTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Actions configuration'),
-      'description' => t('Tests complex actions configuration by adding, editing, and deleting a complex action.'),
-      'group' => t('System'),
+      'name' => 'Actions configuration',
+      'description' => 'Tests complex actions configuration by adding, editing, and deleting a complex action.',
+      'group' => 'System',
     );
   }
 
@@ -32,8 +32,8 @@
     $this->drupalPost('admin/settings/actions/configure/' . md5('system_goto_action'), $edit, t('Save'));
 
     // Make sure that the new complex action was saved properly.
-    $this->assertText(t('The action has been successfully saved.'), t("Make sure we get a confirmation that we've successfully saved the complex action."));
-    $this->assertText($action_description, t("Make sure the action description appears on the configuration page after we've saved the complex action."));
+    $this->assertText(t('The action has been successfully saved.'),"Make sure we get a confirmation that we've successfully saved the complex action.");
+    $this->assertText($action_description,"Make sure the action description appears on the configuration page after we've saved the complex action.");
 
     // Make another POST request to the action edit page.
     $this->clickLink(t('configure'));
@@ -44,9 +44,9 @@
     $this->drupalPost('admin/settings/actions/configure/1', $edit, t('Save'));
 
     // Make sure that the action updated properly.
-    $this->assertText(t('The action has been successfully saved.'), t("Make sure we get a confirmation that we've successfully updated the complex action."));
-    $this->assertNoText($action_description, t("Make sure the old action description does NOT appear on the configuration page after we've updated the complex action."));
-    $this->assertText($new_action_description, t("Make sure the action description appears on the configuration page after we've updated the complex action."));
+    $this->assertText(t('The action has been successfully saved.'),"Make sure we get a confirmation that we've successfully updated the complex action.");
+    $this->assertNoText($action_description,"Make sure the old action description does NOT appear on the configuration page after we've updated the complex action.");
+    $this->assertText($new_action_description,"Make sure the action description appears on the configuration page after we've updated the complex action.");
 
     // Make sure that deletions work properly.
     $this->clickLink(t('delete'));
@@ -54,10 +54,10 @@
     $this->drupalPost('admin/settings/actions/delete/1', $edit, t('Delete'));
 
     // Make sure that the action was actually deleted.
-    $this->assertRaw(t('Action %action was deleted', array('%action' => $new_action_description)), t('Make sure that we get a delete confirmation message.'));
+    $this->assertRaw(t('Action %action was deleted', array('%action' => $new_action_description)),'Make sure that we get a delete confirmation message.');
     $this->drupalGet('admin/settings/actions/manage');
-    $this->assertNoText($new_action_description, t("Make sure the action description does not appear on the overview page after we've deleted the action."));
+    $this->assertNoText($new_action_description,"Make sure the action description does not appear on the overview page after we've deleted the action.");
     $exists = db_query('SELECT aid FROM {actions} WHERE callback = :callback', array(':callback' => 'drupal_goto_action'))->fetchField();
-    $this->assertFalse($exists, t('Make sure the action is gone from the database after being deleted.'));
+    $this->assertFalse($exists,'Make sure the action is gone from the database after being deleted.');
   }
 }
Index: modules/simpletest/tests/database_test.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/database_test.test,v
retrieving revision 1.59
diff -u -r1.59 database_test.test
--- modules/simpletest/tests/database_test.test	6 Jul 2009 13:33:31 -0000	1.59
+++ modules/simpletest/tests/database_test.test	9 Jul 2009 02:46:29 -0000
@@ -173,9 +173,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Connection tests'),
-      'description' => t('Tests of the core database system.'),
-      'group' => t('Database'),
+      'name' => 'Connection tests',
+      'description' => 'Tests of the core database system.',
+      'group' => 'Database',
     );
   }
 
@@ -192,25 +192,25 @@
     $db1 = Database::getConnection('default', 'default');
     $db2 = Database::getConnection('slave', 'default');
 
-    $this->assertNotNull($db1, t('default connection is a real connection object.'));
-    $this->assertNotNull($db2, t('slave connection is a real connection object.'));
-    $this->assertNotIdentical($db1, $db2, t('Each target refers to a different connection.'));
+    $this->assertNotNull($db1,'default connection is a real connection object.');
+    $this->assertNotNull($db2,'slave connection is a real connection object.');
+    $this->assertNotIdentical($db1, $db2,'Each target refers to a different connection.');
 
     // Try to open those targets another time, that should return the same objects.
     $db1b = Database::getConnection('default', 'default');
     $db2b = Database::getConnection('slave', 'default');
-    $this->assertIdentical($db1, $db1b, t('A second call to getConnection() returns the same object.'));
-    $this->assertIdentical($db2, $db2b, t('A second call to getConnection() returns the same object.'));
+    $this->assertIdentical($db1, $db1b,'A second call to getConnection() returns the same object.');
+    $this->assertIdentical($db2, $db2b,'A second call to getConnection() returns the same object.');
 
     // Try to open an unknown target.
     $unknown_target = $this->randomName();
     $db3 = Database::getConnection($unknown_target, 'default');
-    $this->assertNotNull($db3, t('Opening an unknown target returns a real connection object.'));
-    $this->assertIdentical($db1, $db3, t('An unknown target opens the default connection.'));
+    $this->assertNotNull($db3,'Opening an unknown target returns a real connection object.');
+    $this->assertIdentical($db1, $db3,'An unknown target opens the default connection.');
 
     // Try to open that unknown target another time, that should return the same object.
     $db3b = Database::getConnection($unknown_target, 'default');
-    $this->assertIdentical($db3, $db3b, t('A second call to getConnection() returns the same object.'));
+    $this->assertIdentical($db3, $db3b,'A second call to getConnection() returns the same object.');
   }
 
   /**
@@ -228,7 +228,7 @@
     $db1 = Database::getConnection('default', 'default');
     $db2 = Database::getConnection('slave', 'default');
 
-    $this->assertIdentical($db1, $db2, t('Both targets refer to the same connection.'));
+    $this->assertIdentical($db1, $db2,'Both targets refer to the same connection.');
   }
 }
 
@@ -241,9 +241,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Fetch tests'),
-      'description' => t('Test the Database system\'s various fetch capabilities.'),
-      'group' => t('Database'),
+      'name' => 'Fetch tests',
+      'description' => 'Test the Database system\'s various fetch capabilities.',
+      'group' => 'Database',
     );
   }
 
@@ -253,14 +253,14 @@
   function testQueryFetchDefault() {
     $records = array();
     $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25));
-    $this->assertTrue($result instanceof DatabaseStatementInterface, t('Result set is a Drupal statement object.'));
+    $this->assertTrue($result instanceof DatabaseStatementInterface,'Result set is a Drupal statement object.');
     foreach ($result as $record) {
       $records[] = $record;
-      $this->assertTrue(is_object($record), t('Record is an object.'));
-      $this->assertIdentical($record->name, 'John', t('25 year old is John.'));
+      $this->assertTrue(is_object($record),'Record is an object.');
+      $this->assertIdentical($record->name, 'John','25 year old is John.');
     }
 
-    $this->assertIdentical(count($records), 1, t('There is only one record.'));
+    $this->assertIdentical(count($records), 1,'There is only one record.');
   }
 
   /**
@@ -271,11 +271,11 @@
     $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => PDO::FETCH_OBJ));
     foreach ($result as $record) {
       $records[] = $record;
-      $this->assertTrue(is_object($record), t('Record is an object.'));
-      $this->assertIdentical($record->name, 'John', t('25 year old is John.'));
+      $this->assertTrue(is_object($record),'Record is an object.');
+      $this->assertIdentical($record->name, 'John','25 year old is John.');
     }
 
-    $this->assertIdentical(count($records), 1, t('There is only one record.'));
+    $this->assertIdentical(count($records), 1,'There is only one record.');
   }
 
   /**
@@ -286,12 +286,12 @@
     $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => PDO::FETCH_ASSOC));
     foreach ($result as $record) {
       $records[] = $record;
-      if ($this->assertTrue(is_array($record), t('Record is an array.'))) {
-        $this->assertIdentical($record['name'], 'John', t('Record can be accessed associatively.'));
+      if ($this->assertTrue(is_array($record),'Record is an array.')) {
+        $this->assertIdentical($record['name'], 'John','Record can be accessed associatively.');
       }
     }
 
-    $this->assertIdentical(count($records), 1, t('There is only one record.'));
+    $this->assertIdentical(count($records), 1,'There is only one record.');
   }
 
   /**
@@ -304,12 +304,12 @@
     $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => 'FakeRecord'));
     foreach ($result as $record) {
       $records[] = $record;
-      if ($this->assertTrue($record instanceof FakeRecord, t('Record is an object of class FakeRecord.'))) {
-        $this->assertIdentical($record->name, 'John', t('25 year old is John.'));
+      if ($this->assertTrue($record instanceof FakeRecord,'Record is an object of class FakeRecord.')) {
+        $this->assertIdentical($record->name, 'John','25 year old is John.');
       }
     }
 
-    $this->assertIdentical(count($records), 1, t('There is only one record.'));
+    $this->assertIdentical(count($records), 1,'There is only one record.');
   }
 }
 
@@ -322,9 +322,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Fetch tests, part 2'),
-      'description' => t('Test the Database system\'s various fetch capabilities.'),
-      'group' => t('Database'),
+      'name' => 'Fetch tests, part 2',
+      'description' => 'Test the Database system\'s various fetch capabilities.',
+      'group' => 'Database',
     );
   }
 
@@ -338,8 +338,8 @@
     $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => PDO::FETCH_NUM));
     foreach ($result as $record) {
       $records[] = $record;
-      if ($this->assertTrue(is_array($record), t('Record is an array.'))) {
-        $this->assertIdentical($record[0], 'John', t('Record can be accessed numerically.'));
+      if ($this->assertTrue(is_array($record),'Record is an array.')) {
+        $this->assertIdentical($record[0], 'John','Record can be accessed numerically.');
       }
     }
 
@@ -354,13 +354,13 @@
     $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => PDO::FETCH_BOTH));
     foreach ($result as $record) {
       $records[] = $record;
-      if ($this->assertTrue(is_array($record), t('Record is an array.'))) {
-        $this->assertIdentical($record[0], 'John', t('Record can be accessed numerically.'));
-        $this->assertIdentical($record['name'], 'John', t('Record can be accessed associatively.'));
+      if ($this->assertTrue(is_array($record),'Record is an array.')) {
+        $this->assertIdentical($record[0], 'John','Record can be accessed numerically.');
+        $this->assertIdentical($record['name'], 'John','Record can be accessed associatively.');
       }
     }
 
-    $this->assertIdentical(count($records), 1, t('There is only one record.'));
+    $this->assertIdentical(count($records), 1,'There is only one record.');
   }
 
   /**
@@ -370,12 +370,12 @@
     $records = array();
     $result = db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25));
     $column = $result->fetchCol();
-    $this->assertIdentical(count($column), 3, t('fetchCol() returns the right number of records.'));
+    $this->assertIdentical(count($column), 3,'fetchCol() returns the right number of records.');
 
     $result = db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25));
     $i = 0;
     foreach ($result as $record) {
-      $this->assertIdentical($record->name, $column[$i++], t('Column matches direct accesss.'));
+      $this->assertIdentical($record->name, $column[$i++],'Column matches direct accesss.');
     }
   }
 }
@@ -387,9 +387,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Insert tests'),
-      'description' => t('Test the Insert query builder.'),
-      'group' => t('Database'),
+      'name' => 'Insert tests',
+      'description' => 'Test the Insert query builder.',
+      'group' => 'Database',
     );
   }
 
@@ -407,9 +407,9 @@
     $query->execute();
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-    $this->assertIdentical($num_records_before + 1, (int)$num_records_after, t('Record inserts correctly.'));
+    $this->assertIdentical($num_records_before + 1, (int)$num_records_after,'Record inserts correctly.');
     $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Yoko'))->fetchField();
-    $this->assertIdentical($saved_age, '29', t('Can retrieve after inserting.'));
+    $this->assertIdentical($saved_age, '29','Can retrieve after inserting.');
   }
 
   /**
@@ -436,13 +436,13 @@
     $query->execute();
 
     $num_records_after = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-    $this->assertIdentical($num_records_before + 3, $num_records_after, t('Record inserts correctly.'));
+    $this->assertIdentical($num_records_before + 3, $num_records_after,'Record inserts correctly.');
     $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Larry'))->fetchField();
-    $this->assertIdentical($saved_age, '30', t('Can retrieve after inserting.'));
+    $this->assertIdentical($saved_age, '30','Can retrieve after inserting.');
     $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Curly'))->fetchField();
-    $this->assertIdentical($saved_age, '31', t('Can retrieve after inserting.'));
+    $this->assertIdentical($saved_age, '31','Can retrieve after inserting.');
     $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Moe'))->fetchField();
-    $this->assertIdentical($saved_age, '32', t('Can retrieve after inserting.'));
+    $this->assertIdentical($saved_age, '32','Can retrieve after inserting.');
   }
 
   /**
@@ -471,13 +471,13 @@
     $query->execute();
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-    $this->assertIdentical((int) $num_records_before + 3, (int) $num_records_after, t('Record inserts correctly.'));
+    $this->assertIdentical((int) $num_records_before + 3, (int) $num_records_after,'Record inserts correctly.');
     $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Larry'))->fetchField();
-    $this->assertIdentical($saved_age, '30', t('Can retrieve after inserting.'));
+    $this->assertIdentical($saved_age, '30','Can retrieve after inserting.');
     $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Curly'))->fetchField();
-    $this->assertIdentical($saved_age, '31', t('Can retrieve after inserting.'));
+    $this->assertIdentical($saved_age, '31','Can retrieve after inserting.');
     $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Moe'))->fetchField();
-    $this->assertIdentical($saved_age, '32', t('Can retrieve after inserting.'));
+    $this->assertIdentical($saved_age, '32','Can retrieve after inserting.');
   }
 
   /**
@@ -493,11 +493,11 @@
       ->values(array('Moe', '32'))
       ->execute();
     $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Larry'))->fetchField();
-    $this->assertIdentical($saved_age, '30', t('Can retrieve after inserting.'));
+    $this->assertIdentical($saved_age, '30','Can retrieve after inserting.');
     $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Curly'))->fetchField();
-    $this->assertIdentical($saved_age, '31', t('Can retrieve after inserting.'));
+    $this->assertIdentical($saved_age, '31','Can retrieve after inserting.');
     $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Moe'))->fetchField();
-    $this->assertIdentical($saved_age, '32', t('Can retrieve after inserting.'));
+    $this->assertIdentical($saved_age, '32','Can retrieve after inserting.');
   }
 
   /**
@@ -511,7 +511,7 @@
       ))
       ->execute();
 
-    $this->assertIdentical($id, '5', t('Auto-increment ID returned successfully.'));
+    $this->assertIdentical($id, '5','Auto-increment ID returned successfully.');
   }
 
   /**
@@ -526,7 +526,7 @@
       ->execute();
 
     $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Meredith'))->fetchField();
-    $this->assertIdentical($saved_age, '30', t('Can retrieve after inserting.'));
+    $this->assertIdentical($saved_age, '30','Can retrieve after inserting.');
   }
 }
 
@@ -537,9 +537,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Insert tests, LOB fields'),
-      'description' => t('Test the Insert query builder with LOB fields.'),
-      'group' => t('Database'),
+      'name' => 'Insert tests, LOB fields',
+      'description' => 'Test the Insert query builder with LOB fields.',
+      'group' => 'Database',
     );
   }
 
@@ -548,7 +548,7 @@
    */
   function testInsertOneBlob() {
     $data = "This is\000a test.";
-    $this->assertTrue(strlen($data) === 15, t('Test data contains a NULL.'));
+    $this->assertTrue(strlen($data) === 15,'Test data contains a NULL.');
     $id = db_insert('test_one_blob')
       ->fields(array('blob1' => $data))
       ->execute();
@@ -567,7 +567,7 @@
       ))
       ->execute();
     $r = db_query('SELECT * FROM {test_two_blobs} WHERE id = :id', array(':id' => $id))->fetchAssoc();
-    $this->assertTrue($r['blob1'] === 'This is' && $r['blob2'] === 'a test', t('Can insert multiple blobs per row.'));
+    $this->assertTrue($r['blob1'] === 'This is' && $r['blob2'] === 'a test','Can insert multiple blobs per row.');
   }
 }
 
@@ -578,9 +578,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Insert tests, default fields'),
-      'description' => t('Test the Insert query builder with default values.'),
-      'group' => t('Database'),
+      'name' => 'Insert tests, default fields',
+      'description' => 'Test the Insert query builder with default values.',
+      'group' => 'Database',
     );
   }
 
@@ -594,7 +594,7 @@
     $schema = drupal_get_schema('test');
 
     $job = db_query('SELECT job FROM {test} WHERE id = :id', array(':id' => $id))->fetchField();
-    $this->assertEqual($job, $schema['fields']['job']['default'], t('Default field value is set.'));
+    $this->assertEqual($job, $schema['fields']['job']['default'],'Default field value is set.');
   }
 
   /**
@@ -604,10 +604,10 @@
     $num_records_before = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
 
     $result = db_insert('test')->execute();
-    $this->assertNull($result, t('Return NULL as no fields are specified.'));
+    $this->assertNull($result,'Return NULL as no fields are specified.');
 
     $num_records_after = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-    $this->assertIdentical($num_records_before, $num_records_after, t('Do nothing as no fields are specified.'));
+    $this->assertIdentical($num_records_before, $num_records_after,'Do nothing as no fields are specified.');
   }
 
   /**
@@ -622,7 +622,7 @@
     $schema = drupal_get_schema('test');
 
     $job = db_query('SELECT job FROM {test} WHERE id = :id', array(':id' => $id))->fetchField();
-    $this->assertEqual($job, $schema['fields']['job']['default'], t('Default field value is set.'));
+    $this->assertEqual($job, $schema['fields']['job']['default'],'Default field value is set.');
   }
 }
 
@@ -633,9 +633,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Update tests'),
-      'description' => t('Test the Update query builder.'),
-      'group' => t('Database'),
+      'name' => 'Update tests',
+      'description' => 'Test the Update query builder.',
+      'group' => 'Database',
     );
   }
 
@@ -647,10 +647,10 @@
       ->fields(array('name' => 'Tiffany'))
       ->condition('id', 1)
       ->execute();
-    $this->assertIdentical($num_updated, 1, t('Updated 1 record.'));
+    $this->assertIdentical($num_updated, 1,'Updated 1 record.');
 
     $saved_name = db_query('SELECT name FROM {test} WHERE id = :id', array(':id' => 1))->fetchField();
-    $this->assertIdentical($saved_name, 'Tiffany', t('Updated name successfully.'));
+    $this->assertIdentical($saved_name, 'Tiffany','Updated name successfully.');
   }
 
   /**
@@ -661,10 +661,10 @@
       ->fields(array('job' => 'Musician'))
       ->condition('job', 'Singer')
       ->execute();
-    $this->assertIdentical($num_updated, 2, t('Updated 2 records.'));
+    $this->assertIdentical($num_updated, 2,'Updated 2 records.');
 
     $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '2', t('Updated fields successfully.'));
+    $this->assertIdentical($num_matches, '2','Updated fields successfully.');
   }
 
   /**
@@ -675,10 +675,10 @@
       ->fields(array('job' => 'Musician'))
       ->condition('age', 26, '>')
       ->execute();
-    $this->assertIdentical($num_updated, 2, t('Updated 2 records.'));
+    $this->assertIdentical($num_updated, 2,'Updated 2 records.');
 
     $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '2', t('Updated fields successfully.'));
+    $this->assertIdentical($num_matches, '2','Updated fields successfully.');
   }
 
   /**
@@ -689,10 +689,10 @@
       ->fields(array('job' => 'Musician'))
       ->where('age > :age', array(':age' => 26))
       ->execute();
-    $this->assertIdentical($num_updated, 2, t('Updated 2 records.'));
+    $this->assertIdentical($num_updated, 2,'Updated 2 records.');
 
     $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '2', t('Updated fields successfully.'));
+    $this->assertIdentical($num_matches, '2','Updated fields successfully.');
   }
 
   /**
@@ -704,10 +704,10 @@
       ->where('age > :age', array(':age' => 26))
       ->condition('name', 'Ringo');
     $num_updated = $update->execute();
-    $this->assertIdentical($num_updated, 1, t('Updated 1 record.'));
+    $this->assertIdentical($num_updated, 1,'Updated 1 record.');
 
     $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '1', t('Updated fields successfully.'));
+    $this->assertIdentical($num_matches, '1','Updated fields successfully.');
   }
 
 }
@@ -719,9 +719,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Update tests, Complex'),
-      'description' => t('Test the Update query builder, complex queries.'),
-      'group' => t('Database'),
+      'name' => 'Update tests, Complex',
+      'description' => 'Test the Update query builder, complex queries.',
+      'group' => 'Database',
     );
   }
 
@@ -736,10 +736,10 @@
         ->condition('name', 'Paul')
       );
     $num_updated = $update->execute();
-    $this->assertIdentical($num_updated, 2, t('Updated 2 records.'));
+    $this->assertIdentical($num_updated, 2,'Updated 2 records.');
 
     $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '2', t('Updated fields successfully.'));
+    $this->assertIdentical($num_matches, '2','Updated fields successfully.');
   }
 
   /**
@@ -750,10 +750,10 @@
       ->fields(array('job' => 'Musician'))
       ->condition('name', array('John', 'Paul'), 'IN')
       ->execute();
-    $this->assertIdentical($num_updated, 2, t('Updated 2 records.'));
+    $this->assertIdentical($num_updated, 2,'Updated 2 records.');
 
     $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '2', t('Updated fields successfully.'));
+    $this->assertIdentical($num_matches, '2','Updated fields successfully.');
   }
 
   /**
@@ -764,10 +764,10 @@
       ->fields(array('job' => 'Musician'))
       ->condition('name', array('John', 'Paul', 'George'), 'NOT IN')
       ->execute();
-    $this->assertIdentical($num_updated, 1, t('Updated 1 record.'));
+    $this->assertIdentical($num_updated, 1,'Updated 1 record.');
 
     $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '1', t('Updated fields successfully.'));
+    $this->assertIdentical($num_matches, '1','Updated fields successfully.');
   }
 
   /**
@@ -778,10 +778,10 @@
       ->fields(array('job' => 'Musician'))
       ->condition('age', array(25, 26), 'BETWEEN')
       ->execute();
-    $this->assertIdentical($num_updated, 2, t('Updated 2 records.'));
+    $this->assertIdentical($num_updated, 2,'Updated 2 records.');
 
     $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '2', t('Updated fields successfully.'));
+    $this->assertIdentical($num_matches, '2','Updated fields successfully.');
   }
 
   /**
@@ -792,10 +792,10 @@
       ->fields(array('job' => 'Musician'))
       ->condition('name', '%ge%', 'LIKE')
       ->execute();
-    $this->assertIdentical($num_updated, 1, t('Updated 1 record.'));
+    $this->assertIdentical($num_updated, 1,'Updated 1 record.');
 
     $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '1', t('Updated fields successfully.'));
+    $this->assertIdentical($num_matches, '1','Updated fields successfully.');
   }
 
   /**
@@ -809,15 +809,15 @@
       ->fields(array('job' => 'Musician'))
       ->expression('age', 'age + :age', array(':age' => 4))
       ->execute();
-    $this->assertIdentical($num_updated, 1, t('Updated 1 record.'));
+    $this->assertIdentical($num_updated, 1,'Updated 1 record.');
 
     $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '1', t('Updated fields successfully.'));
+    $this->assertIdentical($num_matches, '1','Updated fields successfully.');
 
     $person = db_query('SELECT * FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetch();
-    $this->assertEqual($person->name, 'Ringo', t('Name set correctly.'));
-    $this->assertEqual($person->age, $before_age + 4, t('Age set correctly.'));
-    $this->assertEqual($person->job, 'Musician', t('Job set correctly.'));
+    $this->assertEqual($person->name, 'Ringo','Name set correctly.');
+    $this->assertEqual($person->age, $before_age + 4,'Age set correctly.');
+    $this->assertEqual($person->job, 'Musician','Job set correctly.');
     $GLOBALS['larry_test'] = 0;
   }
 
@@ -830,10 +830,10 @@
       ->condition('name', 'Ringo')
       ->expression('age', 'age + :age', array(':age' => 4))
       ->execute();
-    $this->assertIdentical($num_updated, 1, t('Updated 1 record.'));
+    $this->assertIdentical($num_updated, 1,'Updated 1 record.');
 
     $after_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
-    $this->assertEqual($before_age + 4, $after_age, t('Age updated correctly'));
+    $this->assertEqual($before_age + 4, $after_age,'Age updated correctly');
   }
 }
 
@@ -844,9 +844,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Update tests, LOB'),
-      'description' => t('Test the Update query builder with LOB fields.'),
-      'group' => t('Database'),
+      'name' => 'Update tests, LOB',
+      'description' => 'Test the Update query builder with LOB fields.',
+      'group' => 'Database',
     );
   }
 
@@ -855,7 +855,7 @@
    */
   function testUpdateOneBlob() {
     $data = "This is\000a test.";
-    $this->assertTrue(strlen($data) === 15, t('Test data contains a NULL.'));
+    $this->assertTrue(strlen($data) === 15,'Test data contains a NULL.');
     $id = db_insert('test_one_blob')
       ->fields(array('blob1' => $data))
       ->execute();
@@ -887,7 +887,7 @@
       ->execute();
 
     $r = db_query('SELECT * FROM {test_two_blobs} WHERE id = :id', array(':id' => $id))->fetchAssoc();
-    $this->assertTrue($r['blob1'] === 'and so' && $r['blob2'] === 'is this', t('Can update multiple blobs per row.'));
+    $this->assertTrue($r['blob1'] === 'and so' && $r['blob2'] === 'is this','Can update multiple blobs per row.');
   }
 }
 
@@ -906,9 +906,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Delete/Truncate tests'),
-      'description' => t('Test the Delete and Truncate query builders.'),
-      'group' => t('Database'),
+      'name' => 'Delete/Truncate tests',
+      'description' => 'Test the Delete and Truncate query builders.',
+      'group' => 'Database',
     );
   }
 
@@ -921,10 +921,10 @@
     $num_deleted = db_delete('test')
       ->condition('id', 1)
       ->execute();
-    $this->assertIdentical($num_deleted, 1, t('Deleted 1 record.'));
+    $this->assertIdentical($num_deleted, 1,'Deleted 1 record.');
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-    $this->assertEqual($num_records_before, $num_records_after + $num_deleted, t('Deletion adds up.'));
+    $this->assertEqual($num_records_before, $num_records_after + $num_deleted,'Deletion adds up.');
   }
 
 
@@ -937,7 +937,7 @@
     db_truncate('test')->execute();
 
     $num_records_after = db_query("SELECT COUNT(*) FROM {test}")->fetchField();
-    $this->assertEqual(0, $num_records_after, t('Truncate really deletes everything.'));
+    $this->assertEqual(0, $num_records_after,'Truncate really deletes everything.');
   }
 }
 
@@ -948,9 +948,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Merge tests'),
-      'description' => t('Test the Merge query builder.'),
-      'group' => t('Database'),
+      'name' => 'Merge tests',
+      'description' => 'Test the Merge query builder.',
+      'group' => 'Database',
     );
   }
 
@@ -969,12 +969,12 @@
       ->execute();
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before + 1, $num_records_after, t('Merge inserted properly.'));
+    $this->assertEqual($num_records_before + 1, $num_records_after,'Merge inserted properly.');
 
     $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Presenter'))->fetch();
-    $this->assertEqual($person->name, 'Tiffany', t('Name set correctly.'));
-    $this->assertEqual($person->age, 31, t('Age set correctly.'));
-    $this->assertEqual($person->job, 'Presenter', t('Job set correctly.'));
+    $this->assertEqual($person->name, 'Tiffany','Name set correctly.');
+    $this->assertEqual($person->age, 31,'Age set correctly.');
+    $this->assertEqual($person->job, 'Presenter','Job set correctly.');
   }
 
   /**
@@ -992,12 +992,12 @@
       ->execute();
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before, $num_records_after, t('Merge updated properly.'));
+    $this->assertEqual($num_records_before, $num_records_after,'Merge updated properly.');
 
     $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
-    $this->assertEqual($person->name, 'Tiffany', t('Name set correctly.'));
-    $this->assertEqual($person->age, 31, t('Age set correctly.'));
-    $this->assertEqual($person->job, 'Speaker', t('Job set correctly.'));
+    $this->assertEqual($person->name, 'Tiffany','Name set correctly.');
+    $this->assertEqual($person->age, 31,'Age set correctly.');
+    $this->assertEqual($person->job, 'Speaker','Job set correctly.');
   }
 
   /**
@@ -1016,12 +1016,12 @@
       ->execute();
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before, $num_records_after, t('Merge updated properly.'));
+    $this->assertEqual($num_records_before, $num_records_after,'Merge updated properly.');
 
     $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
-    $this->assertEqual($person->name, 'Tiffany', t('Name set correctly.'));
-    $this->assertEqual($person->age, 30, t('Age skipped correctly.'));
-    $this->assertEqual($person->job, 'Speaker', t('Job set correctly.'));
+    $this->assertEqual($person->name, 'Tiffany','Name set correctly.');
+    $this->assertEqual($person->age, 30,'Age skipped correctly.');
+    $this->assertEqual($person->job, 'Speaker','Job set correctly.');
   }
 
   /**
@@ -1040,12 +1040,12 @@
       ->execute();
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before, $num_records_after, t('Merge updated properly.'));
+    $this->assertEqual($num_records_before, $num_records_after,'Merge updated properly.');
 
     $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
-    $this->assertEqual($person->name, 'Joe', t('Name set correctly.'));
-    $this->assertEqual($person->age, 30, t('Age skipped correctly.'));
-    $this->assertEqual($person->job, 'Speaker', t('Job set correctly.'));
+    $this->assertEqual($person->name, 'Joe','Name set correctly.');
+    $this->assertEqual($person->age, 30,'Age skipped correctly.');
+    $this->assertEqual($person->job, 'Speaker','Job set correctly.');
   }
 
   /**
@@ -1071,12 +1071,12 @@
       ->execute();
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before, $num_records_after, t('Merge updated properly.'));
+    $this->assertEqual($num_records_before, $num_records_after,'Merge updated properly.');
 
     $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
-    $this->assertEqual($person->name, 'Tiffany', t('Name set correctly.'));
-    $this->assertEqual($person->age, $age_before + 4, t('Age updated correctly.'));
-    $this->assertEqual($person->job, 'Speaker', t('Job set correctly.'));
+    $this->assertEqual($person->name, 'Tiffany','Name set correctly.');
+    $this->assertEqual($person->age, $age_before + 4,'Age updated correctly.');
+    $this->assertEqual($person->job, 'Speaker','Job set correctly.');
   }
 
   /**
@@ -1090,12 +1090,12 @@
       ->execute();
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before + 1, $num_records_after, t('Merge inserted properly.'));
+    $this->assertEqual($num_records_before + 1, $num_records_after,'Merge inserted properly.');
 
     $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Presenter'))->fetch();
-    $this->assertEqual($person->name, '', t('Name set correctly.'));
-    $this->assertEqual($person->age, 0, t('Age set correctly.'));
-    $this->assertEqual($person->job, 'Presenter', t('Job set correctly.'));
+    $this->assertEqual($person->name, '','Name set correctly.');
+    $this->assertEqual($person->age, 0,'Age set correctly.');
+    $this->assertEqual($person->job, 'Presenter','Job set correctly.');
   }
 
   /**
@@ -1109,12 +1109,12 @@
       ->execute();
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before, $num_records_after, t('Merge skipped properly.'));
+    $this->assertEqual($num_records_before, $num_records_after,'Merge skipped properly.');
 
     $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
-    $this->assertEqual($person->name, 'Meredith', t('Name skipped correctly.'));
-    $this->assertEqual($person->age, 30, t('Age skipped correctly.'));
-    $this->assertEqual($person->job, 'Speaker', t('Job skipped correctly.'));
+    $this->assertEqual($person->name, 'Meredith','Name skipped correctly.');
+    $this->assertEqual($person->age, 30,'Age skipped correctly.');
+    $this->assertEqual($person->job, 'Speaker','Job skipped correctly.');
 
     db_merge('test_people')
       ->key(array('job' => 'Speaker'))
@@ -1123,12 +1123,12 @@
       ->execute();
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before, $num_records_after, t('Merge skipped properly.'));
+    $this->assertEqual($num_records_before, $num_records_after,'Merge skipped properly.');
 
     $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
-    $this->assertEqual($person->name, 'Meredith', t('Name skipped correctly.'));
-    $this->assertEqual($person->age, 30, t('Age skipped correctly.'));
-    $this->assertEqual($person->job, 'Speaker', t('Job skipped correctly.'));
+    $this->assertEqual($person->name, 'Meredith','Name skipped correctly.');
+    $this->assertEqual($person->age, 30,'Age skipped correctly.');
+    $this->assertEqual($person->job, 'Speaker','Job skipped correctly.');
   }
 
   /**
@@ -1159,9 +1159,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Select tests'),
-      'description' => t('Test the Select query builder.'),
-      'group' => t('Database'),
+      'name' => 'Select tests',
+      'description' => 'Test the Select query builder.',
+      'group' => 'Database',
     );
   }
 
@@ -1179,7 +1179,7 @@
       $num_records++;
     }
 
-    $this->assertEqual($num_records, 4, t('Returned the correct number of rows.'));
+    $this->assertEqual($num_records, 4,'Returned the correct number of rows.');
   }
 
   /**
@@ -1193,13 +1193,13 @@
     $result = $query->execute();
 
     // Check that the aliases are being created the way we want.
-    $this->assertEqual($name_field, 'name', t('Name field alias is correct.'));
-    $this->assertEqual($age_field, 'age', t('Age field alias is correct.'));
+    $this->assertEqual($name_field, 'name','Name field alias is correct.');
+    $this->assertEqual($age_field, 'age','Age field alias is correct.');
 
     // Ensure that we got the right record.
     $record = $result->fetch();
-    $this->assertEqual($record->$name_field, 'George', t('Fetched name is correct.'));
-    $this->assertEqual($record->$age_field, 27, t('Fetched age is correct.'));
+    $this->assertEqual($record->$name_field, 'George','Fetched name is correct.');
+    $this->assertEqual($record->$age_field, 27,'Fetched age is correct.');
   }
 
   /**
@@ -1213,13 +1213,13 @@
     $result = $query->execute();
 
     // Check that the aliases are being created the way we want.
-    $this->assertEqual($name_field, 'name', t('Name field alias is correct.'));
-    $this->assertEqual($age_field, 'double_age', t('Age field alias is correct.'));
+    $this->assertEqual($name_field, 'name','Name field alias is correct.');
+    $this->assertEqual($age_field, 'double_age','Age field alias is correct.');
 
     // Ensure that we got the right record.
     $record = $result->fetch();
-    $this->assertEqual($record->$name_field, 'George', t('Fetched name is correct.'));
-    $this->assertEqual($record->$age_field, 27*2, t('Fetched age expression is correct.'));
+    $this->assertEqual($record->$name_field, 'George','Fetched name is correct.');
+    $this->assertEqual($record->$age_field, 27*2,'Fetched age expression is correct.');
   }
 
   /**
@@ -1234,14 +1234,14 @@
     $result = $query->execute();
 
     // Check that the aliases are being created the way we want.
-    $this->assertEqual($age_double_field, 'expression', t('Double age field alias is correct.'));
-    $this->assertEqual($age_triple_field, 'expression_2', t('Triple age field alias is correct.'));
+    $this->assertEqual($age_double_field, 'expression','Double age field alias is correct.');
+    $this->assertEqual($age_triple_field, 'expression_2','Triple age field alias is correct.');
 
     // Ensure that we got the right record.
     $record = $result->fetch();
-    $this->assertEqual($record->$name_field, 'George', t('Fetched name is correct.'));
-    $this->assertEqual($record->$age_double_field, 27*2, t('Fetched double age expression is correct.'));
-    $this->assertEqual($record->$age_triple_field, 27*3, t('Fetched triple age expression is correct.'));
+    $this->assertEqual($record->$name_field, 'George','Fetched name is correct.');
+    $this->assertEqual($record->$age_double_field, 27*2,'Fetched double age expression is correct.');
+    $this->assertEqual($record->$age_triple_field, 27*3,'Fetched triple age expression is correct.');
   }
 
   /**
@@ -1254,17 +1254,17 @@
       ->execute()->fetchObject();
 
     // Check that all fields we asked for are present.
-    $this->assertNotNull($record->id, t('ID field is present.'));
-    $this->assertNotNull($record->name, t('Name field is present.'));
-    $this->assertNotNull($record->age, t('Age field is present.'));
-    $this->assertNotNull($record->job, t('Job field is present.'));
+    $this->assertNotNull($record->id,'ID field is present.');
+    $this->assertNotNull($record->name,'Name field is present.');
+    $this->assertNotNull($record->age,'Age field is present.');
+    $this->assertNotNull($record->job,'Job field is present.');
 
     // Ensure that we got the right record.
     // Check that all fields we asked for are present.
-    $this->assertEqual($record->id, 2, t('ID field has the correct value.'));
-    $this->assertEqual($record->name, 'George', t('Name field has the correct value.'));
-    $this->assertEqual($record->age, 27, t('Age field has the correct value.'));
-    $this->assertEqual($record->job, 'Singer', t('Job field has the correct value.'));
+    $this->assertEqual($record->id, 2,'ID field has the correct value.');
+    $this->assertEqual($record->name, 'George','Name field has the correct value.');
+    $this->assertEqual($record->age, 27,'Age field has the correct value.');
+    $this->assertEqual($record->job, 'Singer','Job field has the correct value.');
   }
 
   /**
@@ -1277,17 +1277,17 @@
       ->execute()->fetchObject();
 
     // Check that all fields we asked for are present.
-    $this->assertNotNull($record->id, t('ID field is present.'));
-    $this->assertNotNull($record->name, t('Name field is present.'));
-    $this->assertNotNull($record->age, t('Age field is present.'));
-    $this->assertNotNull($record->job, t('Job field is present.'));
+    $this->assertNotNull($record->id,'ID field is present.');
+    $this->assertNotNull($record->name,'Name field is present.');
+    $this->assertNotNull($record->age,'Age field is present.');
+    $this->assertNotNull($record->job,'Job field is present.');
 
     // Ensure that we got the right record.
     // Check that all fields we asked for are present.
-    $this->assertEqual($record->id, 2, t('ID field has the correct value.'));
-    $this->assertEqual($record->name, 'George', t('Name field has the correct value.'));
-    $this->assertEqual($record->age, 27, t('Age field has the correct value.'));
-    $this->assertEqual($record->job, 'Singer', t('Job field has the correct value.'));
+    $this->assertEqual($record->id, 2,'ID field has the correct value.');
+    $this->assertEqual($record->name, 'George','Name field has the correct value.');
+    $this->assertEqual($record->age, 27,'Age field has the correct value.');
+    $this->assertEqual($record->job, 'Singer','Job field has the correct value.');
   }
 
   /**
@@ -1301,8 +1301,8 @@
       ->isNull('age')
       ->execute()->fetchCol();
 
-    $this->assertEqual(count($names), 1, t('Correct number of records found with NULL age.'));
-    $this->assertEqual($names[0], 'Fozzie', t('Correct record returned for NULL age.'));
+    $this->assertEqual(count($names), 1,'Correct number of records found with NULL age.');
+    $this->assertEqual($names[0], 'Fozzie','Correct record returned for NULL age.');
   }
 
   /**
@@ -1317,9 +1317,9 @@
       ->orderBy('name')
       ->execute()->fetchCol();
 
-    $this->assertEqual(count($names), 2, t('Correct number of records found withNOT NULL age.'));
-    $this->assertEqual($names[0], 'Gonzo', t('Correct record returned for NOT NULL age.'));
-    $this->assertEqual($names[1], 'Kermit', t('Correct record returned for NOT NULL age.'));
+    $this->assertEqual(count($names), 2,'Correct number of records found withNOT NULL age.');
+    $this->assertEqual($names[0], 'Gonzo','Correct record returned for NOT NULL age.');
+    $this->assertEqual($names[1], 'Kermit','Correct record returned for NOT NULL age.');
   }
 }
 
@@ -1330,9 +1330,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Select tests, subqueries'),
-      'description' => t('Test the Select query builder.'),
-      'group' => t('Database'),
+      'name' => 'Select tests, subqueries',
+      'description' => 'Test the Select query builder.',
+      'group' => 'Database',
     );
   }
 
@@ -1361,7 +1361,7 @@
     // WHERE tt.task = 'code'
     $people = $select->execute()->fetchCol();
 
-    $this->assertEqual(count($people), 1, t('Returned the correct number of rows.'));
+    $this->assertEqual(count($people), 1,'Returned the correct number of rows.');
   }
 
   /**
@@ -1384,7 +1384,7 @@
     // FROM test tt2
     // WHERE tt2.pid IN (SELECT tt.pid AS pid FROM test_task tt WHERE tt.priority=1)
     $people = $select->execute()->fetchCol();
-    $this->assertEqual(count($people), 5, t('Returned the correct number of rows.'));
+    $this->assertEqual(count($people), 5,'Returned the correct number of rows.');
   }
 
   /**
@@ -1408,7 +1408,7 @@
     //   INNER JOIN (SELECT tt.pid AS pid FROM test_task tt WHERE priority=1) tt ON t.id=tt.pid
     $people = $select->execute()->fetchCol();
 
-    $this->assertEqual(count($people), 2, t('Returned the correct number of rows.'));
+    $this->assertEqual(count($people), 2,'Returned the correct number of rows.');
   }
 }
 
@@ -1419,9 +1419,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Select tests, ordered'),
-      'description' => t('Test the Select query builder.'),
-      'group' => t('Database'),
+      'name' => 'Select tests, ordered',
+      'description' => 'Test the Select query builder.',
+      'group' => 'Database',
     );
   }
 
@@ -1439,11 +1439,11 @@
     $last_age = 0;
     foreach ($result as $record) {
       $num_records++;
-      $this->assertTrue($record->age >= $last_age, t('Results returned in correct order.'));
+      $this->assertTrue($record->age >= $last_age,'Results returned in correct order.');
       $last_age = $record->age;
     }
 
-    $this->assertEqual($num_records, 4, t('Returned the correct number of rows.'));
+    $this->assertEqual($num_records, 4,'Returned the correct number of rows.');
   }
 
   /**
@@ -1470,11 +1470,11 @@
       $num_records++;
       foreach ($record as $kk => $col) {
         if ($expected[$k][$kk] != $results[$k][$kk]) {
-          $this->assertTrue(FALSE, t('Results returned in correct order.'));
+          $this->assertTrue(FALSE,'Results returned in correct order.');
         }
       }
     }
-    $this->assertEqual($num_records, 4, t('Returned the correct number of rows.'));
+    $this->assertEqual($num_records, 4,'Returned the correct number of rows.');
   }
 
   /**
@@ -1491,11 +1491,11 @@
     $last_age = 100000000;
     foreach ($result as $record) {
       $num_records++;
-      $this->assertTrue($record->age <= $last_age, t('Results returned in correct order.'));
+      $this->assertTrue($record->age <= $last_age,'Results returned in correct order.');
       $last_age = $record->age;
     }
 
-    $this->assertEqual($num_records, 4, t('Returned the correct number of rows.'));
+    $this->assertEqual($num_records, 4,'Returned the correct number of rows.');
   }
 }
 
@@ -1506,9 +1506,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Select tests, complex'),
-      'description' => t('Test the Select query builder with more complex queries.'),
-      'group' => t('Database'),
+      'name' => 'Select tests, complex',
+      'description' => 'Test the Select query builder with more complex queries.',
+      'group' => 'Database',
     );
   }
 
@@ -1529,12 +1529,12 @@
     $last_priority = 0;
     foreach ($result as $record) {
       $num_records++;
-      $this->assertTrue($record->$priority_field >= $last_priority, t('Results returned in correct order.'));
-      $this->assertNotEqual($record->$name_field, 'Ringo', t('Taskless person not selected.'));
+      $this->assertTrue($record->$priority_field >= $last_priority,'Results returned in correct order.');
+      $this->assertNotEqual($record->$name_field, 'Ringo','Taskless person not selected.');
       $last_priority = $record->$priority_field;
     }
 
-    $this->assertEqual($num_records, 7, t('Returned the correct number of rows.'));
+    $this->assertEqual($num_records, 7,'Returned the correct number of rows.');
   }
 
   /**
@@ -1555,11 +1555,11 @@
 
     foreach ($result as $record) {
       $num_records++;
-      $this->assertTrue(strcmp($record->$name_field, $last_name) >= 0, t('Results returned in correct order.'));
+      $this->assertTrue(strcmp($record->$name_field, $last_name) >= 0,'Results returned in correct order.');
       $last_priority = $record->$name_field;
     }
 
-    $this->assertEqual($num_records, 8, t('Returned the correct number of rows.'));
+    $this->assertEqual($num_records, 8,'Returned the correct number of rows.');
   }
 
   /**
@@ -1578,7 +1578,7 @@
     $records = array();
     foreach ($result as $record) {
       $num_records++;
-      $this->assertTrue($record->$count_field >= $last_count, t('Results returned in correct order.'));
+      $this->assertTrue($record->$count_field >= $last_count,'Results returned in correct order.');
       $last_count = $record->$count_field;
       $records[$record->$task_field] = $record->$count_field;
     }
@@ -1595,7 +1595,7 @@
       $this->assertEqual($records[$task], $count, t("Correct number of '@task' records found.", array('@task' => $task)));
     }
 
-    $this->assertEqual($num_records, 6, t('Returned the correct number of total rows.'));
+    $this->assertEqual($num_records, 6,'Returned the correct number of total rows.');
   }
 
   /**
@@ -1615,8 +1615,8 @@
     $records = array();
     foreach ($result as $record) {
       $num_records++;
-      $this->assertTrue($record->$count_field >= 2, t('Record has the minimum count.'));
-      $this->assertTrue($record->$count_field >= $last_count, t('Results returned in correct order.'));
+      $this->assertTrue($record->$count_field >= 2,'Record has the minimum count.');
+      $this->assertTrue($record->$count_field >= $last_count,'Results returned in correct order.');
       $last_count = $record->$count_field;
       $records[$record->$task_field] = $record->$count_field;
     }
@@ -1629,7 +1629,7 @@
       $this->assertEqual($records[$task], $count, t("Correct number of '@task' records found.", array('@task' => $task)));
     }
 
-    $this->assertEqual($num_records, 1, t('Returned the correct number of total rows.'));
+    $this->assertEqual($num_records, 1,'Returned the correct number of total rows.');
   }
 
   /**
@@ -1647,7 +1647,7 @@
       $num_records++;
     }
 
-    $this->assertEqual($num_records, 2, t('Returned the correct number of rows.'));
+    $this->assertEqual($num_records, 2,'Returned the correct number of rows.');
   }
 
   /**
@@ -1664,7 +1664,7 @@
       $num_records++;
     }
 
-    $this->assertEqual($num_records, 6, t('Returned the correct number of rows.'));
+    $this->assertEqual($num_records, 6,'Returned the correct number of rows.');
   }
 
   /**
@@ -1678,13 +1678,13 @@
 
     $count = $query->countQuery()->execute()->fetchField();
 
-    $this->assertEqual($count, 4, t('Counted the correct number of records.'));
+    $this->assertEqual($count, 4,'Counted the correct number of records.');
 
     // Now make sure we didn't break the original query!  We should still have
     // all of the fields we asked for.
     $record = $query->execute()->fetch();
-    $this->assertEqual($record->$name_field, 'George', t('Correct data retrieved.'));
-    $this->assertEqual($record->$age_field, 27, t('Correct data retrieved.'));
+    $this->assertEqual($record->$name_field, 'George','Correct data retrieved.');
+    $this->assertEqual($record->$age_field, 27,'Correct data retrieved.');
   }
 
   /**
@@ -1701,7 +1701,7 @@
     $query->condition(db_or()->condition('age', 26)->condition('age', 27));
 
     $job = $query->execute()->fetchField();
-    $this->assertEqual($job, 'Songwriter', t('Correct data retrieved.'));
+    $this->assertEqual($job, 'Songwriter','Correct data retrieved.');
   }
 }
 
@@ -1709,9 +1709,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Pager query tests'),
-      'description' => t('Test the pager query extender.'),
-      'group' => t('Database'),
+      'name' => 'Pager query tests',
+      'description' => 'Test the pager query extender.',
+      'group' => 'Database',
     );
   }
 
@@ -1801,7 +1801,7 @@
     $ages = $outer_query
       ->execute()
       ->fetchCol();
-    $this->assertEqual($ages, array(25, 26, 27, 28), t('Inner pager query returned the correct ages.'));
+    $this->assertEqual($ages, array(25, 26, 27, 28),'Inner pager query returned the correct ages.');
   }
 
   /**
@@ -1821,7 +1821,7 @@
     $ages = $query
       ->execute()
       ->fetchCol();
-    $this->assertEqual($ages, array('George', 'Ringo'), t('Pager query with having expression returned the correct ages.'));
+    $this->assertEqual($ages, array('George', 'Ringo'),'Pager query with having expression returned the correct ages.');
   }
 }
 
@@ -1830,9 +1830,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Tablesort query tests'),
-      'description' => t('Test the tablesort query extender.'),
-      'group' => t('Database'),
+      'name' => 'Tablesort query tests',
+      'description' => 'Test the tablesort query extender.',
+      'group' => 'Database',
     );
   }
 
@@ -1859,8 +1859,8 @@
       $first = array_shift($data->tasks);
       $last = array_pop($data->tasks);
 
-      $this->assertEqual($first->task, $sort['first'], t('Items appear in the correct order.'));
-      $this->assertEqual($last->task, $sort['last'], t('Items appear in the correct order.'));
+      $this->assertEqual($first->task, $sort['first'],'Items appear in the correct order.');
+      $this->assertEqual($last->task, $sort['last'],'Items appear in the correct order.');
     }
   }
 
@@ -1901,9 +1901,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Query tagging tests'),
-      'description' => t('Test the tagging capabilities of the Select builder.'),
-      'group' => t('Database'),
+      'name' => 'Query tagging tests',
+      'description' => 'Test the tagging capabilities of the Select builder.',
+      'group' => 'Database',
     );
   }
 
@@ -1917,8 +1917,8 @@
 
     $query->addTag('test');
 
-    $this->assertTrue($query->hasTag('test'), t('hasTag() returned true.'));
-    $this->assertFalse($query->hasTag('other'), t('hasTag() returned false.'));
+    $this->assertTrue($query->hasTag('test'),'hasTag() returned true.');
+    $this->assertFalse($query->hasTag('other'),'hasTag() returned false.');
   }
 
   /**
@@ -1932,8 +1932,8 @@
     $query->addTag('test');
     $query->addTag('other');
 
-    $this->assertTrue($query->hasAllTags('test', 'other'), t('hasAllTags() returned true.'));
-    $this->assertFalse($query->hasAllTags('test', 'stuff'), t('hasAllTags() returned false.'));
+    $this->assertTrue($query->hasAllTags('test', 'other'),'hasAllTags() returned true.');
+    $this->assertFalse($query->hasAllTags('test', 'stuff'),'hasAllTags() returned false.');
   }
 
   /**
@@ -1946,8 +1946,8 @@
 
     $query->addTag('test');
 
-    $this->assertTrue($query->hasAnyTag('test', 'other'), t('hasAnyTag() returned true.'));
-    $this->assertFalse($query->hasAnyTag('other', 'stuff'), t('hasAnyTag() returned false.'));
+    $this->assertTrue($query->hasAnyTag('test', 'other'),'hasAnyTag() returned true.');
+    $this->assertFalse($query->hasAnyTag('other', 'stuff'),'hasAnyTag() returned false.');
   }
 
   /**
@@ -1968,10 +1968,10 @@
     $query->addMetaData('test', $data);
 
     $return = $query->getMetaData('test');
-    $this->assertEqual($data, $return, t('Corect metadata returned.'));
+    $this->assertEqual($data, $return,'Corect metadata returned.');
 
     $return = $query->getMetaData('nothere');
-    $this->assertNull($return, t('Non-existent key returned NULL.'));
+    $this->assertNull($return,'Non-existent key returned NULL.');
   }
 }
 
@@ -1984,9 +1984,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Query altering tests'),
-      'description' => t('Test the hook_query_alter capabilities of the Select builder.'),
-      'group' => t('Database'),
+      'name' => 'Query altering tests',
+      'description' => 'Test the hook_query_alter capabilities of the Select builder.',
+      'group' => 'Database',
     );
   }
 
@@ -2006,7 +2006,7 @@
       $num_records++;
     }
 
-    $this->assertEqual($num_records, 2, t('Returned the correct number of rows.'));
+    $this->assertEqual($num_records, 2,'Returned the correct number of rows.');
   }
 
   /**
@@ -2023,14 +2023,14 @@
 
     $records = $result->fetchAll();
 
-    $this->assertEqual(count($records), 2, t('Returned the correct number of rows.'));
+    $this->assertEqual(count($records), 2,'Returned the correct number of rows.');
 
-    $this->assertEqual($records[0]->name, 'George', t('Correct data retrieved.'));
-    $this->assertEqual($records[0]->$tid_field, 4, t('Correct data retrieved.'));
-    $this->assertEqual($records[0]->$task_field, 'sing', t('Correct data retrieved.'));
-    $this->assertEqual($records[1]->name, 'George', t('Correct data retrieved.'));
-    $this->assertEqual($records[1]->$tid_field, 5, t('Correct data retrieved.'));
-    $this->assertEqual($records[1]->$task_field, 'sleep', t('Correct data retrieved.'));
+    $this->assertEqual($records[0]->name, 'George','Correct data retrieved.');
+    $this->assertEqual($records[0]->$tid_field, 4,'Correct data retrieved.');
+    $this->assertEqual($records[0]->$task_field, 'sing','Correct data retrieved.');
+    $this->assertEqual($records[1]->name, 'George','Correct data retrieved.');
+    $this->assertEqual($records[1]->$tid_field, 5,'Correct data retrieved.');
+    $this->assertEqual($records[1]->$task_field, 'sleep','Correct data retrieved.');
   }
 
   /**
@@ -2051,11 +2051,11 @@
 
     $records = $result->fetchAll();
 
-    $this->assertEqual(count($records), 1, t('Returned the correct number of rows.'));
-    $this->assertEqual($records[0]->$name_field, 'John', t('Correct data retrieved.'));
-    $this->assertEqual($records[0]->$tid_field, 2, t('Correct data retrieved.'));
-    $this->assertEqual($records[0]->$pid_field, 1, t('Correct data retrieved.'));
-    $this->assertEqual($records[0]->$task_field, 'sleep', t('Correct data retrieved.'));
+    $this->assertEqual(count($records), 1,'Returned the correct number of rows.');
+    $this->assertEqual($records[0]->$name_field, 'John','Correct data retrieved.');
+    $this->assertEqual($records[0]->$tid_field, 2,'Correct data retrieved.');
+    $this->assertEqual($records[0]->$pid_field, 1,'Correct data retrieved.');
+    $this->assertEqual($records[0]->$task_field, 'sleep','Correct data retrieved.');
   }
 }
 
@@ -2068,9 +2068,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Query altering tests, part 2'),
-      'description' => t('Test the hook_query_alter capabilities of the Select builder.'),
-      'group' => t('Database'),
+      'name' => 'Query altering tests, part 2',
+      'description' => 'Test the hook_query_alter capabilities of the Select builder.',
+      'group' => 'Database',
     );
   }
 
@@ -2085,8 +2085,8 @@
     $query->addTag('database_test_alter_change_fields');
 
     $record = $query->execute()->fetch();
-    $this->assertEqual($record->$name_field, 'George', t('Correct data retrieved.'));
-    $this->assertFalse(isset($record->$age_field), t('Age field not found, as intended.'));
+    $this->assertEqual($record->$name_field, 'George','Correct data retrieved.');
+    $this->assertFalse(isset($record->$age_field),'Age field not found, as intended.');
   }
 
   /**
@@ -2103,8 +2103,8 @@
     // Ensure that we got the right record.
     $record = $result->fetch();
 
-    $this->assertEqual($record->$name_field, 'George', t('Fetched name is correct.'));
-    $this->assertEqual($record->$age_field, 27*3, t('Fetched age expression is correct.'));
+    $this->assertEqual($record->$name_field, 'George','Fetched name is correct.');
+    $this->assertEqual($record->$age_field, 27*3,'Fetched age expression is correct.');
   }
 
   /**
@@ -2119,7 +2119,7 @@
 
     $num_records = count($query->execute()->fetchAll());
 
-    $this->assertEqual($num_records, 4, t('Returned the correct number of rows.'));
+    $this->assertEqual($num_records, 4,'Returned the correct number of rows.');
   }
 }
 
@@ -2130,9 +2130,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Regression tests'),
-      'description' => t('Regression tests cases for the database layer.'),
-      'group' => t('Database'),
+      'name' => 'Regression tests',
+      'description' => 'Regression tests cases for the database layer.',
+      'group' => 'Database',
     );
   }
 
@@ -2153,23 +2153,23 @@
       ))->execute();
 
     $from_database = db_query('SELECT name FROM {test} WHERE name = :name', array(':name' => $name))->fetchField();
-    $this->assertIdentical($name, $from_database, t("The database handles UTF-8 characters cleanly."));
+    $this->assertIdentical($name, $from_database,"The database handles UTF-8 characters cleanly.");
   }
 
   /**
    * Test the db_column_exists() function.
    */
   function testDBColumnExists() {
-    $this->assertTrue(db_column_exists('node', 'nid'), t('Returns true for existent column.'));
-    $this->assertFalse(db_column_exists('node', 'nosuchcolumn'), t('Returns false for nonexistent column.'));
+    $this->assertTrue(db_column_exists('node', 'nid'),'Returns true for existent column.');
+    $this->assertFalse(db_column_exists('node', 'nosuchcolumn'),'Returns false for nonexistent column.');
   }
 
   /**
    * Test the db_table_exists() function.
    */
   function testDBTableExists() {
-    $this->assertTrue(db_table_exists('node'), t('Returns true for existent table.'));
-    $this->assertFalse(db_table_exists('nosuchtable'), t('Returns false for nonexistent table.'));
+    $this->assertTrue(db_table_exists('node'),'Returns true for existent table.');
+    $this->assertFalse(db_table_exists('nosuchtable'),'Returns false for nonexistent table.');
   }
 }
 
@@ -2180,9 +2180,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Query logging'),
-      'description' => t('Test the query logging facility.'),
-      'group' => t('Database'),
+      'name' => 'Query logging',
+      'description' => 'Test the query logging facility.',
+      'group' => 'Database',
     );
   }
 
@@ -2197,10 +2197,10 @@
 
     $queries = Database::getLog('testing', 'default');
 
-    $this->assertEqual(count($queries), 2, t('Correct number of queries recorded.'));
+    $this->assertEqual(count($queries), 2,'Correct number of queries recorded.');
 
     foreach ($queries as $query) {
-      $this->assertEqual($query['caller']['function'], __FUNCTION__, t('Correct function in query log.'));
+      $this->assertEqual($query['caller']['function'], __FUNCTION__,'Correct function in query log.');
     }
   }
 
@@ -2219,8 +2219,8 @@
     $queries1 = Database::getLog('testing1');
     $queries2 = Database::getLog('testing2');
 
-    $this->assertEqual(count($queries1), 2, t('Correct number of queries recorded for log 1.'));
-    $this->assertEqual(count($queries2), 1, t('Correct number of queries recorded for log 2.'));
+    $this->assertEqual(count($queries1), 2,'Correct number of queries recorded for log 1.');
+    $this->assertEqual(count($queries2), 1,'Correct number of queries recorded for log 2.');
   }
 
   /**
@@ -2240,9 +2240,9 @@
 
     $queries1 = Database::getLog('testing1');
 
-    $this->assertEqual(count($queries1), 2, t('Recorded queries from all targets.'));
-    $this->assertEqual($queries1[0]['target'], 'default', t('First query used default target.'));
-    $this->assertEqual($queries1[1]['target'], 'slave', t('Second query used slave target.'));
+    $this->assertEqual(count($queries1), 2,'Recorded queries from all targets.');
+    $this->assertEqual($queries1[0]['target'], 'default','First query used default target.');
+    $this->assertEqual($queries1[1]['target'], 'slave','Second query used slave target.');
   }
 
   /**
@@ -2266,9 +2266,9 @@
 
     $queries1 = Database::getLog('testing1');
 
-    $this->assertEqual(count($queries1), 2, t('Recorded queries from all targets.'));
-    $this->assertEqual($queries1[0]['target'], 'default', t('First query used default target.'));
-    $this->assertEqual($queries1[1]['target'], 'default', t('Second query used default target as fallback.'));
+    $this->assertEqual(count($queries1), 2,'Recorded queries from all targets.');
+    $this->assertEqual($queries1[0]['target'], 'default','First query used default target.');
+    $this->assertEqual($queries1[1]['target'], 'default','Second query used default target as fallback.');
   }
 
   /**
@@ -2294,8 +2294,8 @@
     $queries1 = Database::getLog('testing1');
     $queries2 = Database::getLog('testing1', 'test2');
 
-    $this->assertEqual(count($queries1), 1, t('Correct number of queries recorded for first connection.'));
-    $this->assertEqual(count($queries2), 1, t('Correct number of queries recorded for second connection.'));
+    $this->assertEqual(count($queries1), 1,'Correct number of queries recorded for first connection.');
+    $this->assertEqual(count($queries2), 1,'Correct number of queries recorded for second connection.');
   }
 }
 
@@ -2305,9 +2305,9 @@
 class DatabaseRangeQueryTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Range query test'),
-      'description' => t('Test the Range query functionality.'),
-      'group' => t('Database'),
+      'name' => 'Range query test',
+      'description' => 'Test the Range query functionality.',
+      'group' => 'Database',
     );
   }
 
@@ -2321,12 +2321,12 @@
   function testRangeQuery() {
     // Test if return correct number of rows.
     $range_rows = db_query_range("SELECT name FROM {system} ORDER BY name", array(), 2, 3)->fetchAll();
-    $this->assertEqual(count($range_rows), 3, t('Range query work and return correct number of rows.'));
+    $this->assertEqual(count($range_rows), 3,'Range query work and return correct number of rows.');
 
     // Test if return target data.
     $raw_rows = db_query('SELECT name FROM {system} ORDER BY name')->fetchAll();
     $raw_rows = array_slice($raw_rows, 2, 3);
-    $this->assertEqual($range_rows, $raw_rows, t('Range query work and return target data.'));
+    $this->assertEqual($range_rows, $raw_rows,'Range query work and return target data.');
   }
 }
 
@@ -2336,9 +2336,9 @@
 class DatabaseTemporaryQueryTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Temporary query test'),
-      'description' => t('Test the temporary query functionality.'),
-      'group' => t('Database'),
+      'name' => 'Temporary query test',
+      'description' => 'Test the temporary query functionality.',
+      'group' => 'Database',
     );
   }
 
@@ -2360,8 +2360,8 @@
     $this->drupalGet('database_test/db_query_temporary');
     $data = json_decode($this->drupalGetContent());
     if ($data) {
-      $this->assertEqual($this->countTableRows("system"), $data->row_count, t('The temporary table contains the correct amount of rows.'));
-      $this->assertFalse(db_table_exists($data->table_name), t('The temporary table is, indeed, temporary.'));
+      $this->assertEqual($this->countTableRows("system"), $data->row_count,'The temporary table contains the correct amount of rows.');
+      $this->assertFalse(db_table_exists($data->table_name),'The temporary table is, indeed, temporary.');
     }
     else {
       $this->fail(t("The creation of the temporary table failed."));
@@ -2371,8 +2371,8 @@
     $table_name_system = db_query_temporary('SELECT status FROM {system}', array());
     $table_name_users = db_query_temporary('SELECT uid FROM {users}', array());
 
-    $this->assertEqual($this->countTableRows($table_name_system), $this->countTableRows("system"), t('A temporary table was created successfully in this request.'));
-    $this->assertEqual($this->countTableRows($table_name_users), $this->countTableRows("users"), t('A second temporary table was created successfully in this request.'));
+    $this->assertEqual($this->countTableRows($table_name_system), $this->countTableRows("system"),'A temporary table was created successfully in this request.');
+    $this->assertEqual($this->countTableRows($table_name_users), $this->countTableRows("users"),'A second temporary table was created successfully in this request.');
   }
 }
 
@@ -2386,9 +2386,9 @@
 class DatabaseAnsiSyntaxTestCase extends DatabaseTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('ANSI SQL syntax tests'),
-      'description' => t('Test ANSI SQL syntax interpretation.'),
-      'group' => t('Database'),
+      'name' => 'ANSI SQL syntax tests',
+      'description' => 'Test ANSI SQL syntax interpretation.',
+      'group' => 'Database',
     );
   }
 
@@ -2407,7 +2407,7 @@
       ':a4' => ' a ',
       ':a5' => 'test.',
     ));
-    $this->assertIdentical($result->fetchField(), 'This is a test.', t('Basic ANSI Concat works.'));
+    $this->assertIdentical($result->fetchField(), 'This is a test.','Basic ANSI Concat works.');
   }
 
   /**
@@ -2420,7 +2420,7 @@
       ':a3' => '.',
       ':age' => 25,
     ));
-    $this->assertIdentical($result->fetchField(), 'The age of John is 25.', t('Field ANSI Concat works.'));
+    $this->assertIdentical($result->fetchField(), 'The age of John is 25.','Field ANSI Concat works.');
   }
 }
 
@@ -2430,9 +2430,9 @@
 class DatabaseInvalidDataTestCase extends DatabaseTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Invalid data'),
-      'description' => t('Test handling of some invalid data.'),
-      'group' => t('Database'),
+      'name' => 'Invalid data',
+      'description' => 'Test handling of some invalid data.',
+      'group' => 'Database',
     );
   }
 
@@ -2491,7 +2491,7 @@
         ->condition('age', array(17, 75), 'IN')
         ->execute()->fetchObject();
 
-      $this->assertFalse($record, t('The rest of the insert aborted as expected.'));
+      $this->assertFalse($record,'The rest of the insert aborted as expected.');
     }
   }
 
@@ -2503,9 +2503,9 @@
 class DatabaseQueryTestCase extends DatabaseTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Custom query syntax tests'),
-      'description' => t('Test Drupal\'s extended prepared statement syntax..'),
-      'group' => t('Database'),
+      'name' => 'Custom query syntax tests',
+      'description' => 'Test Drupal\'s extended prepared statement syntax..',
+      'group' => 'Database',
     );
   }
 
@@ -2519,7 +2519,7 @@
   function testArraySubstitution() {
     $names = db_query('SELECT name FROM {test} WHERE age IN (:ages) ORDER BY age', array(':ages' => array(25, 26, 27)))->fetchAll();
 
-    $this->assertEqual(count($names), 3, t('Correct number of names returned'));
+    $this->assertEqual(count($names), 3,'Correct number of names returned');
   }
 }
 
@@ -2547,9 +2547,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Transaction tests'),
-      'description' => t('Test the transaction abstraction system.'),
-      'group' => t('Database'),
+      'name' => 'Transaction tests',
+      'description' => 'Test the transaction abstraction system.',
+      'group' => 'Database',
     );
   }
 
@@ -2584,13 +2584,13 @@
       ))
       ->execute();
 
-    $this->assertTrue($connection->inTransaction(), t('In transaction before calling nested transaction.'));
+    $this->assertTrue($connection->inTransaction(),'In transaction before calling nested transaction.');
 
     // We're already in a transaction, but we call ->transactionInnerLayer
     // to nest another transaction inside the current one.
     $this->transactionInnerLayer($suffix, $rollback);
 
-    $this->assertTrue($connection->inTransaction(), t('In transaction after calling nested transaction.'));
+    $this->assertTrue($connection->inTransaction(),'In transaction after calling nested transaction.');
   }
 
   /**
@@ -2619,13 +2619,13 @@
       ))
       ->execute();
 
-    $this->assertTrue($connection->inTransaction(), t('In transaction inside nested transaction.'));
+    $this->assertTrue($connection->inTransaction(),'In transaction inside nested transaction.');
 
     if ($rollback) {
       // Roll back the transaction, if requested.
       // This rollback should propagate to the the outer transaction, if present.
       $connection->rollBack();
-      $this->assertTrue($connection->willRollBack(), t('Transaction is scheduled to roll back after calling rollBack().'));
+      $this->assertTrue($connection->willRollBack(),'Transaction is scheduled to roll back after calling rollBack().');
     }
   }
 
@@ -2689,9 +2689,9 @@
       // Neither of the rows we inserted in the two transaction layers
       // should be present in the tables post-rollback.
       $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DavidB'))->fetchField();
-      $this->assertNotIdentical($saved_age, '24', t('Cannot retrieve DavidB row after commit.'));
+      $this->assertNotIdentical($saved_age, '24','Cannot retrieve DavidB row after commit.');
       $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DanielB'))->fetchField();
-      $this->assertNotIdentical($saved_age, '19', t('Cannot retrieve DanielB row after commit.'));
+      $this->assertNotIdentical($saved_age, '19','Cannot retrieve DanielB row after commit.');
     }
     catch (Exception $e) {
       $this->fail($e->getMessage());
@@ -2715,9 +2715,9 @@
       // Because our current database claims to not support transactions,
       // the inserted rows should be present despite the attempt to roll back.
       $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DavidB'))->fetchField();
-      $this->assertIdentical($saved_age, '24', t('DavidB not rolled back, since transactions are not supported.'));
+      $this->assertIdentical($saved_age, '24','DavidB not rolled back, since transactions are not supported.');
       $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DanielB'))->fetchField();
-      $this->assertIdentical($saved_age, '19', t('DanielB not rolled back, since transactions are not supported.'));
+      $this->assertIdentical($saved_age, '19','DanielB not rolled back, since transactions are not supported.');
     }
     catch (Exception $e) {
       $this->fail($e->getMessage());
@@ -2737,9 +2737,9 @@
 
       // Because we committed, both of the inserted rows should be present.
       $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DavidA'))->fetchField();
-      $this->assertIdentical($saved_age, '24', t('Can retrieve DavidA row after commit.'));
+      $this->assertIdentical($saved_age, '24','Can retrieve DavidA row after commit.');
       $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DanielA'))->fetchField();
-      $this->assertIdentical($saved_age, '19', t('Can retrieve DanielA row after commit.'));
+      $this->assertIdentical($saved_age, '19','Can retrieve DanielA row after commit.');
     }
     catch (Exception $e) {
       $this->fail($e->getMessage());
Index: modules/simpletest/tests/form.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/form.test,v
retrieving revision 1.13
diff -u -r1.13 form.test
--- modules/simpletest/tests/form.test	2 Jun 2009 13:47:26 -0000	1.13
+++ modules/simpletest/tests/form.test	9 Jul 2009 02:46:29 -0000
@@ -10,9 +10,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Required field validation'),
-      'description' => t('Carriage returns, tabs, and spaces are not valid content for a required field.'),
-      'group' => t('Form API'),
+      'name' => 'Required field validation',
+      'description' => 'Carriage returns, tabs, and spaces are not valid content for a required field.',
+      'group' => 'Form API',
     );
   }
 
@@ -80,9 +80,9 @@
 class FormsTestTypeCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Form type-specific tests'),
-      'description' => t('Test form type functions for expected behavior.'),
-      'group' => t('Form API'),
+      'name' => 'Form type-specific tests',
+      'description' => 'Test form type functions for expected behavior.',
+      'group' => 'Form API',
     );
   }
 
@@ -95,19 +95,19 @@
     // Element is disabled , and $edit is not empty.
     $form['#disabled'] = TRUE;
     $edit = array(1);
-    $this->assertEqual(form_type_checkbox_value($form, $edit), $default_value, t('form_type_checkbox_value() returns the default value when #disabled is set.'));
+    $this->assertEqual(form_type_checkbox_value($form, $edit), $default_value,'form_type_checkbox_value() returns the default value when #disabled is set.');
 
     // Element is not disabled, $edit is not empty.
     unset($form['#disabled']);
-    $this->assertEqual(form_type_checkbox_value($form, $edit), $return_value, t('form_type_checkbox_value() returns the return value when #disabled is not set.'));
+    $this->assertEqual(form_type_checkbox_value($form, $edit), $return_value,'form_type_checkbox_value() returns the return value when #disabled is not set.');
 
     // Element is not disabled, $edit is empty.
     $edit = array();
-    $this->assertIdentical(form_type_checkbox_value($form, $edit), 0, t('form_type_checkbox_value() returns 0 when #disabled is not set, and $edit is empty.'));
+    $this->assertIdentical(form_type_checkbox_value($form, $edit), 0,'form_type_checkbox_value() returns 0 when #disabled is not set, and $edit is empty.');
 
     // $edit is FALSE.
     $edit = FALSE;
-    $this->assertNull(form_type_checkbox_value($form, $edit), t('form_type_checkbox_value() returns NULL when $edit is FALSE'));
+    $this->assertNull(form_type_checkbox_value($form, $edit),'form_type_checkbox_value() returns NULL when $edit is FALSE');
   }
 }
 
@@ -118,9 +118,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Tableselect form element type test'),
-      'description' => t('Test the tableselect element for expected behavior'),
-      'group' => t('Form API'),
+      'name' => 'Tableselect form element type test',
+      'description' => 'Test the tableselect element for expected behavior',
+      'group' => 'Form API',
     );
   }
 
@@ -136,10 +136,10 @@
 
     $this->drupalGet('form_test/tableselect/multiple-true');
 
-    $this->assertNoText(t('Empty text.'), t('Empty text should not be displayed.'));
+    $this->assertNoText(t('Empty text.'),'Empty text should not be displayed.');
 
     // Test for the presence of the Select all rows tableheader.
-    $this->assertFieldByXPath('//th[@class="select-all"]', NULL, t('Presence of the "Select all" checkbox.'));
+    $this->assertFieldByXPath('//th[@class="select-all"]', NULL,'Presence of the "Select all" checkbox.');
 
     $rows = array('row1', 'row2', 'row3');
     foreach ($rows as $row) {
@@ -153,10 +153,10 @@
   function testMultipleFalse() {
     $this->drupalGet('form_test/tableselect/multiple-false');
 
-    $this->assertNoText(t('Empty text.'), t('Empty text should not be displayed.'));
+    $this->assertNoText(t('Empty text.'),'Empty text should not be displayed.');
 
     // Test for the absence of the Select all rows tableheader.
-    $this->assertNoFieldByXPath('//th[@class="select-all"]', '', t('Absence of the "Select all" checkbox.'));
+    $this->assertNoFieldByXPath('//th[@class="select-all"]', '','Absence of the "Select all" checkbox.');
 
     $rows = array('row1', 'row2', 'row3');
     foreach ($rows as $row) {
@@ -169,7 +169,7 @@
    */
   function testEmptyText() {
     $this->drupalGet('form_test/tableselect/empty-text');
-    $this->assertText(t('Empty text.'), t('Empty text should be displayed.'));
+    $this->assertText(t('Empty text.'),'Empty text should be displayed.');
   }
 
   /**
@@ -182,18 +182,18 @@
     $edit['tableselect[row1]'] = TRUE;
     $this->drupalPost('form_test/tableselect/multiple-true', $edit, 'Submit');
 
-    $this->assertText(t('Submitted: row1 = row1'), t('Checked checkbox row1'));
-    $this->assertText(t('Submitted: row2 = 0'), t('Unchecked checkbox row2.'));
-    $this->assertText(t('Submitted: row3 = 0'), t('Unchecked checkbox row3.'));
+    $this->assertText(t('Submitted: row1 = row1'),'Checked checkbox row1');
+    $this->assertText(t('Submitted: row2 = 0'),'Unchecked checkbox row2.');
+    $this->assertText(t('Submitted: row3 = 0'),'Unchecked checkbox row3.');
 
     // Test a submission with multiple checkboxes checked.
     $edit['tableselect[row1]'] = TRUE;
     $edit['tableselect[row3]'] = TRUE;
     $this->drupalPost('form_test/tableselect/multiple-true', $edit, 'Submit');
 
-    $this->assertText(t('Submitted: row1 = row1'), t('Checked checkbox row1.'));
-    $this->assertText(t('Submitted: row2 = 0'), t('Unchecked checkbox row2.'));
-    $this->assertText(t('Submitted: row3 = row3'), t('Checked checkbox row3.'));
+    $this->assertText(t('Submitted: row1 = row1'),'Checked checkbox row1.');
+    $this->assertText(t('Submitted: row2 = 0'),'Unchecked checkbox row2.');
+    $this->assertText(t('Submitted: row3 = row3'),'Checked checkbox row3.');
 
   }
 
@@ -203,7 +203,7 @@
   function testMultipleFalseSubmit() {
     $edit['tableselect'] = 'row1';
     $this->drupalPost('form_test/tableselect/multiple-false', $edit, 'Submit');
-    $this->assertText(t('Submitted: row1'), t('Selected radio button'));
+    $this->assertText(t('Submitted: row1'),'Selected radio button');
   }
 
   /**
@@ -212,18 +212,18 @@
   function testAdvancedSelect() {
     // When #multiple = TRUE a Select all checkbox should be displayed by default.
     $this->drupalGet('form_test/tableselect/advanced-select/multiple-true-default');
-    $this->assertFieldByXPath('//th[@class="select-all"]', NULL, t('Display a "Select all" checkbox by default when #multiple is TRUE.'));
+    $this->assertFieldByXPath('//th[@class="select-all"]', NULL,'Display a "Select all" checkbox by default when #multiple is TRUE.');
 
     // When #js_select is set to FALSE, a "Select all" checkbox should not be displayed.
     $this->drupalGet('form_test/tableselect/advanced-select/multiple-true-no-advanced-select');
-    $this->assertNoFieldByXPath('//th[@class="select-all"]', NULL, t('Do not display a "Select all" checkbox when #js_select is FALSE.'));
+    $this->assertNoFieldByXPath('//th[@class="select-all"]', NULL,'Do not display a "Select all" checkbox when #js_select is FALSE.');
 
     // A "Select all" checkbox never makes sense when #multiple = FALSE, regardless of the value of #js_select.
     $this->drupalGet('form_test/tableselect/advanced-select/multiple-false-default');
-    $this->assertNoFieldByXPath('//th[@class="select-all"]', NULL, t('Do not display a "Select all" checkbox when #multiple is FALSE.'));
+    $this->assertNoFieldByXPath('//th[@class="select-all"]', NULL,'Do not display a "Select all" checkbox when #multiple is FALSE.');
 
     $this->drupalGet('form_test/tableselect/advanced-select/multiple-false-advanced-select');
-    $this->assertNoFieldByXPath('//th[@class="select-all"]', NULL, t('Do not display a "Select all" checkbox when #multiple is FALSE, even when #js_select is TRUE.'));
+    $this->assertNoFieldByXPath('//th[@class="select-all"]', NULL,'Do not display a "Select all" checkbox when #multiple is FALSE, even when #js_select is TRUE.');
   }
 
 
@@ -242,11 +242,11 @@
 
     // Test with a valid value.
     list($processed_form, $form_state, $errors) = $this->formSubmitHelper($form, array('tableselect' => 'row1'));
-    $this->assertFalse(isset($errors['tableselect']), t('Option checker allows valid values for checkboxes.'));
+    $this->assertFalse(isset($errors['tableselect']),'Option checker allows valid values for checkboxes.');
 
     // Test with an invalid value.
     list($processed_form, $form_state, $errors) = $this->formSubmitHelper($form, array('tableselect' => 'non_existing_value'));
-    $this->assertTrue(isset($errors['tableselect']), t('Option checker disallows invalid values for checkboxes.'));
+    $this->assertTrue(isset($errors['tableselect']),'Option checker disallows invalid values for checkboxes.');
 
   }
 
@@ -267,11 +267,11 @@
 
     // Test with a valid value.
     list($processed_form, $form_state, $errors) = $this->formSubmitHelper($form, array('tableselect' => 'row1'));
-    $this->assertFalse(isset($errors['tableselect']), t('Option checker allows valid values for radio buttons.'));
+    $this->assertFalse(isset($errors['tableselect']),'Option checker allows valid values for radio buttons.');
 
     // Test with an invalid value.
     list($processed_form, $form_state, $errors) = $this->formSubmitHelper($form, array('tableselect' => 'non_existing_value'));
-    $this->assertTrue(isset($errors['tableselect']), t('Option checker disallows invalid values for radio buttons.'));
+    $this->assertTrue(isset($errors['tableselect']),'Option checker disallows invalid values for radio buttons.');
   }
 
 
@@ -322,9 +322,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('form_clean_id() test'),
-      'description' => t('Test the function form_clean_id() for expected behavior'),
-      'group' => t('Form API'),
+      'name' => 'form_clean_id() test',
+      'description' => 'Test the function form_clean_id() for expected behavior',
+      'group' => 'Form API',
     );
   }
 
@@ -352,9 +352,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Drupal Execute and Batch API'),
-      'description' => t('Tests the compatibility of drupal_form_submit and the Batch API'),
-      'group' => t('Form API'),
+      'name' => 'Drupal Execute and Batch API',
+      'description' => 'Tests the compatibility of drupal_form_submit and the Batch API',
+      'group' => 'Form API',
     );
   }
 
@@ -372,7 +372,7 @@
 
     // If the drupal_form_submit call executed correctly our test variable will be
     // set to 'form_submitted'.
-    $this->assertEqual('form_submitted', variable_get('form_test_mock_submit', 'initial_state'), t('Check drupal_form_submit called submit handlers when running in a batch'));
+    $this->assertEqual('form_submitted', variable_get('form_test_mock_submit', 'initial_state'),'Check drupal_form_submit called submit handlers when running in a batch');
 
     // Clean our variable up.
     variable_del('form_test_mock_submit');
@@ -397,9 +397,9 @@
 
   public static function getInfo() {
     return array(
-      'name'  => t('Multistep form using form storage'),
-      'description'  => t('Tests a multistep form using form storage and makes sure validation and caching works right.'),
-      'group' => t('Form API'),
+      'name'  => 'Multistep form using form storage',
+      'description'  => 'Tests a multistep form using form storage and makes sure validation and caching works right.',
+      'group' => 'Form API',
     );
   }
 
@@ -416,11 +416,11 @@
     $this->drupalLogin($user);
 
     $this->drupalPost('form_test/form-storage', array('title' => 'new', 'value' => 'value_is_set'), 'Continue');
-    $this->assertText('Form constructions: 2', t('The form has been constructed two times till now.'));
+    $this->assertText('Form constructions: 2','The form has been constructed two times till now.');
 
     $this->drupalPost(NULL, array(), 'Save');
-    $this->assertText('Form constructions: 3', t('The form has been constructed three times till now.'));
-    $this->assertText('Title: new', t('The form storage has stored the values.'));
+    $this->assertText('Form constructions: 3','The form has been constructed three times till now.');
+    $this->assertText('Title: new','The form storage has stored the values.');
   }
 
   /**
@@ -431,11 +431,11 @@
     $this->drupalLogin($user);
 
     $this->drupalPost('form_test/form-storage', array('title' => 'new', 'value' => 'value_is_set'), 'Continue', array('query' => 'cache=1'));
-    $this->assertText('Form constructions: 1', t('The form has been constructed one time till now.'));
+    $this->assertText('Form constructions: 1','The form has been constructed one time till now.');
 
     $this->drupalPost(NULL, array(), 'Save', array('query' => 'cache=1'));
-    $this->assertText('Form constructions: 2', t('The form has been constructed two times till now.'));
-    $this->assertText('Title: new', t('The form storage has stored the values.'));
+    $this->assertText('Form constructions: 2','The form has been constructed two times till now.');
+    $this->assertText('Title: new','The form storage has stored the values.');
   }
 
   /**
@@ -446,6 +446,6 @@
     $this->drupalLogin($user);
 
     $this->drupalPost('form_test/form-storage', array('title' => '', 'value' => 'value_is_set'), 'Continue');
-    $this->assertPattern('/value_is_set/', t("The input values have been kept."));
+    $this->assertPattern('/value_is_set/',"The input values have been kept.");
   }
 }
Index: modules/simpletest/tests/unicode.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/unicode.test,v
retrieving revision 1.4
diff -u -r1.4 unicode.test
--- modules/simpletest/tests/unicode.test	26 Apr 2009 15:14:55 -0000	1.4
+++ modules/simpletest/tests/unicode.test	9 Jul 2009 02:46:29 -0000
@@ -20,9 +20,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Unicode handling'),
-      'description' => t('Tests Drupal Unicode handling.'),
-      'group' => t('System'),
+      'name' => 'Unicode handling',
+      'description' => 'Tests Drupal Unicode handling.',
+      'group' => 'System',
     );
   }
 
Index: modules/simpletest/tests/batch.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/batch.test,v
retrieving revision 1.1
diff -u -r1.1 batch.test
--- modules/simpletest/tests/batch.test	6 May 2009 10:41:43 -0000	1.1
+++ modules/simpletest/tests/batch.test	9 Jul 2009 02:46:29 -0000
@@ -15,9 +15,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Batch API percentages'),
-      'description' => t('Tests the handling of percentage rounding in the Drupal batch API. This is critical to Drupal user experience.'),
-      'group' => t('Batch API'),
+      'name' => 'Batch API percentages',
+      'description' => 'Tests the handling of percentage rounding in the Drupal batch API. This is critical to Drupal user experience.',
+      'group' => 'Batch API',
     );
   }
 
Index: modules/simpletest/tests/menu.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/menu.test,v
retrieving revision 1.11
diff -u -r1.11 menu.test
--- modules/simpletest/tests/menu.test	30 May 2009 11:17:32 -0000	1.11
+++ modules/simpletest/tests/menu.test	9 Jul 2009 02:46:29 -0000
@@ -9,9 +9,9 @@
 class MenuIncTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Hook menu tests'),
-      'description' => t('Test menu hook functionality.'),
-      'group' => t('Menu'),
+      'name' => 'Hook menu tests',
+      'description' => 'Test menu hook functionality.',
+      'group' => 'Menu',
     );
   }
 
@@ -25,8 +25,8 @@
    */
   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.');
   }
 
   /**
@@ -60,19 +60,19 @@
     menu_link_maintain('menu_test', 'update', 'menu_test_maintain/1', 'Menu link updated');
     // Load a different page to be sure that we have up to date information.
     $this->drupalGet('menu_test_maintain/1');
-    $this->assertLink(t('Menu link updated'), 0, t('Found updated menu link'));
-    $this->assertNoLink(t('Menu link #1'), 0, t('Not found menu link #1'));
-    $this->assertNoLink(t('Menu link #1'), 0, t('Not found menu link #1-1'));
-    $this->assertLink(t('Menu link #2'), 0, t('Found menu link #2'));
+    $this->assertLink(t('Menu link updated'), 0,'Found updated menu link');
+    $this->assertNoLink(t('Menu link #1'), 0,'Not found menu link #1');
+    $this->assertNoLink(t('Menu link #1'), 0,'Not found menu link #1-1');
+    $this->assertLink(t('Menu link #2'), 0,'Found menu link #2');
 
     // Delete all links for the given path.
     menu_link_maintain('menu_test', 'delete', 'menu_test_maintain/1', '');
     // Load a different page to be sure that we have up to date information.
     $this->drupalGet('menu_test_maintain/2');
-    $this->assertNoLink(t('Menu link updated'), 0, t('Not found deleted menu link'));
-    $this->assertNoLink(t('Menu link #1'), 0, t('Not found menu link #1'));
-    $this->assertNoLink(t('Menu link #1'), 0, t('Not found menu link #1-1'));
-    $this->assertLink(t('Menu link #2'), 0, t('Found menu link #2'));
+    $this->assertNoLink(t('Menu link updated'), 0,'Not found deleted menu link');
+    $this->assertNoLink(t('Menu link #1'), 0,'Not found menu link #1');
+    $this->assertNoLink(t('Menu link #1'), 0,'Not found menu link #1-1');
+    $this->assertLink(t('Menu link #2'), 0,'Found menu link #2');
   }
 
   /**
@@ -84,14 +84,14 @@
 
     $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".');
 
     // Force a menu rebuild by going to the modules page.
     $this->drupalGet('admin/build/modules', array('query' => array("hook_menu_name" => 'changed')));
 
     $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.');
   }
 
   /**
@@ -102,8 +102,8 @@
     $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.');
   }
 
   /**
@@ -112,7 +112,7 @@
   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';
@@ -120,7 +120,7 @@
 
     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');
   }
 
 }
@@ -131,9 +131,9 @@
 class MenuRebuildTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Menu rebuild test'),
-      'description' => t('Test rebuilding of menu.'),
-      'group' => t('Menu'),
+      'name' => 'Menu rebuild test',
+      'description' => 'Test rebuilding of menu.',
+      'group' => 'Menu',
     );
   }
 
@@ -143,14 +143,14 @@
   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 trigger menu_execute_active_handler()
     // to rebuild the menu item. Now 'admin' should exist.
@@ -158,7 +158,7 @@
     // menu_execute_active_handler() should trigger the rebuild.
     $this->drupalGet('<front>');
     $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.");
   }
 
 }
Index: modules/simpletest/tests/registry.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/registry.test,v
retrieving revision 1.11
diff -u -r1.11 registry.test
--- modules/simpletest/tests/registry.test	30 May 2009 11:17:32 -0000	1.11
+++ modules/simpletest/tests/registry.test	9 Jul 2009 02:46:29 -0000
@@ -4,9 +4,9 @@
 class RegistryParseFileTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Registry parse file test'),
-      'description' => t('Parse a simple file and check that its resources are saved to the database.'),
-      'group' => t('System')
+      'name' => 'Registry parse file test',
+      'description' => 'Parse a simple file and check that its resources are saved to the database.',
+      'group' => 'System'
     );
   }
 
@@ -53,9 +53,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Registry parse files test'),
-      'description' => t('Read two a simple files from disc, and check that their resources are saved to the database.'),
-      'group' => t('System')
+      'name' => 'Registry parse files test',
+      'description' => 'Read two a simple files from disc, and check that their resources are saved to the database.',
+      'group' => 'System'
     );
   }
 
@@ -149,9 +149,9 @@
 class RegistrySkipBodyTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Skip function body test'),
-      'description' => t('Tokenize a simple function and check that the body is skipped right'),
-      'group' => t('System'),
+      'name' => 'Skip function body test',
+      'description' => 'Tokenize a simple function and check that the body is skipped right',
+      'group' => 'System',
     );
   }
 
@@ -163,7 +163,7 @@
     _registry_skip_body($tokens);
     // Consume the last }
     each($tokens);
-    $this->assertIdentical(each($tokens), FALSE, t('Tokens skipped'));
+    $this->assertIdentical(each($tokens), FALSE,'Tokens skipped');
 
     // Check workaround for PHP < 5.2.3 regarding tokenization of strings
     // containing variables. The { contained in the string should not be
@@ -171,7 +171,7 @@
     $function = '<?php function foo() { $x = "$y {"; $x = `$y {`; $x = ' . "<<<EOD\n\$y {\nEOD\n; } function bar() {}";
     $tokens = token_get_all($function);
     _registry_skip_body($tokens);
-    $this->assertTrue(each($tokens), t('Tokens not skipped to end of file.'));
+    $this->assertTrue(each($tokens),'Tokens not skipped to end of file.');
   }
 
 }
Index: modules/simpletest/tests/file.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/file.test,v
retrieving revision 1.32
diff -u -r1.32 file.test
--- modules/simpletest/tests/file.test	2 Jun 2009 13:42:40 -0000	1.32
+++ modules/simpletest/tests/file.test	9 Jul 2009 02:46:29 -0000
@@ -55,13 +55,13 @@
    *   File object to compare.
    */
   function assertFileUnchanged($before, $after) {
-    $this->assertEqual($before->fid, $after->fid, t('File id is the same: %file1 == %file2.', array('%file1' => $before->fid, '%file2' => $after->fid)), 'File unchanged');
-    $this->assertEqual($before->uid, $after->uid, t('File owner is the same: %file1 == %file2.', array('%file1' => $before->uid, '%file2' => $after->uid)), 'File unchanged');
-    $this->assertEqual($before->filename, $after->filename, t('File name is the same: %file1 == %file2.', array('%file1' => $before->filename, '%file2' => $after->filename)), 'File unchanged');
-    $this->assertEqual($before->filepath, $after->filepath, t('File path is the same: %file1 == %file2.', array('%file1' => $before->filepath, '%file2' => $after->filepath)), 'File unchanged');
-    $this->assertEqual($before->filemime, $after->filemime, t('File MIME type is the same: %file1 == %file2.', array('%file1' => $before->filemime, '%file2' => $after->filemime)), 'File unchanged');
-    $this->assertEqual($before->filesize, $after->filesize, t('File size is the same: %file1 == %file2.', array('%file1' => $before->filesize, '%file2' => $after->filesize)), 'File unchanged');
-    $this->assertEqual($before->status, $after->status, t('File status is the same: %file1 == %file2.', array('%file1' => $before->status, '%file2' => $after->status)), 'File unchanged');
+    $this->assertEqual($before->fid, $after->fid,'File id is the same: %file1 == %file2.', array('%file1' => $before->fid, '%file2' => $after->fid)), 'File unchanged';
+    $this->assertEqual($before->uid, $after->uid,'File owner is the same: %file1 == %file2.', array('%file1' => $before->uid, '%file2' => $after->uid)), 'File unchanged';
+    $this->assertEqual($before->filename, $after->filename,'File name is the same: %file1 == %file2.', array('%file1' => $before->filename, '%file2' => $after->filename)), 'File unchanged';
+    $this->assertEqual($before->filepath, $after->filepath,'File path is the same: %file1 == %file2.', array('%file1' => $before->filepath, '%file2' => $after->filepath)), 'File unchanged';
+    $this->assertEqual($before->filemime, $after->filemime,'File MIME type is the same: %file1 == %file2.', array('%file1' => $before->filemime, '%file2' => $after->filemime)), 'File unchanged';
+    $this->assertEqual($before->filesize, $after->filesize,'File size is the same: %file1 == %file2.', array('%file1' => $before->filesize, '%file2' => $after->filesize)), 'File unchanged';
+    $this->assertEqual($before->status, $after->status,'File status is the same: %file1 == %file2.', array('%file1' => $before->status, '%file2' => $after->status)), 'File unchanged';
   }
 
   /**
@@ -73,8 +73,8 @@
    *   File object to compare.
    */
   function assertDifferentFile($file1, $file2) {
-    $this->assertNotEqual($file1->fid, $file2->fid, t('Files have different ids: %file1 != %file2.', array('%file1' => $file1->fid, '%file2' => $file2->fid)), 'Different file');
-    $this->assertNotEqual($file1->filepath, $file2->filepath, t('Files have different paths: %file1 != %file2.', array('%file1' => $file1->filepath, '%file2' => $file2->filepath)), 'Different file');
+    $this->assertNotEqual($file1->fid, $file2->fid,'Files have different ids: %file1 != %file2.', array('%file1' => $file1->fid, '%file2' => $file2->fid)), 'Different file';
+    $this->assertNotEqual($file1->filepath, $file2->filepath,'Files have different paths: %file1 != %file2.', array('%file1' => $file1->filepath, '%file2' => $file2->filepath)), 'Different file';
   }
 
   /**
@@ -86,8 +86,8 @@
    *   File object to compare.
    */
   function assertSameFile($file1, $file2) {
-    $this->assertEqual($file1->fid, $file2->fid, t('Files have the same ids: %file1 == %file2.', array('%file1' => $file1->fid, '%file2-fid' => $file2->fid)), 'Same file');
-    $this->assertEqual($file1->filepath, $file2->filepath, t('Files have the same path: %file1 == %file2.', array('%file1' => $file1->filepath, '%file2' => $file2->filepath)), 'Same file');
+    $this->assertEqual($file1->fid, $file2->fid,'Files have the same ids: %file1 == %file2.', array('%file1' => $file1->fid, '%file2-fid' => $file2->fid)), 'Same file';
+    $this->assertEqual($file1->filepath, $file2->filepath,'Files have the same path: %file1 == %file2.', array('%file1' => $file1->filepath, '%file2' => $file2->filepath)), 'Same file';
   }
 
   /**
@@ -148,7 +148,7 @@
     if (is_null($path)) {
       $path = file_directory_path() . '/' . $this->randomName();
     }
-    $this->assertTrue(mkdir($path) && is_dir($path), t('Directory was created successfully.'));
+    $this->assertTrue(mkdir($path) && is_dir($path),'Directory was created successfully.');
     return $path;
   }
 
@@ -175,7 +175,7 @@
     }
 
     file_put_contents($filepath, $contents);
-    $this->assertTrue(is_file($filepath), t('The test file exists on the disk.'), 'Create test file');
+    $this->assertTrue(is_file($filepath),'The test file exists on the disk.', 'Create test file');
 
     $file = new stdClass();
     $file->filepath = $filepath;
@@ -187,7 +187,7 @@
     $file->status = 0;
     // Write the record directly rather than calling file_save() so we don't
     // invoke the hooks.
-    $this->assertNotIdentical(drupal_write_record('files', $file), FALSE, t('The file was added to the database.'), 'Create test file');
+    $this->assertNotIdentical(drupal_write_record('files', $file), FALSE,'The file was added to the database.', 'Create test file');
 
     return $file;
   }
@@ -232,7 +232,7 @@
       $this->assertTrue(FALSE, t('Unexpected hooks were called: %unexpected.', array('%unexpected' => implode(', ', $unexpected))));
     }
     else {
-      $this->assertTrue(TRUE, t('No unexpected hooks were called.'));
+      $this->assertTrue(TRUE,'No unexpected hooks were called.');
     }
   }
 
@@ -271,9 +271,9 @@
 class FileSpaceUsedTest extends FileTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('File space used tests'),
-      'description' => t('Tests the file_space_used() function.'),
-      'group' => t('File'),
+      'name' => 'File space used tests',
+      'description' => 'Tests the file_space_used() function.',
+      'group' => 'File',
     );
   }
 
@@ -297,9 +297,9 @@
    * Test different users with the default status.
    */
   function testUser() {
-    $this->assertEqual(file_space_used(2), 70, t("Found the size of the first user's files."));
-    $this->assertEqual(file_space_used(3), 300, t("Found the size of the second user's files."));
-    $this->assertEqual(file_space_used(), 370, t("Found the size of all user's files."));
+    $this->assertEqual(file_space_used(2), 70,"Found the size of the first user's files.");
+    $this->assertEqual(file_space_used(3), 300,"Found the size of the second user's files.");
+    $this->assertEqual(file_space_used(), 370,"Found the size of all user's files.");
   }
 
   /**
@@ -307,21 +307,21 @@
    */
   function testStatus() {
     // Check selection with a single bit set.
-    $this->assertEqual(file_space_used(NULL, 2), 4, t("Found the size of all user's files with status 2."));
-    $this->assertEqual(file_space_used(NULL, 4), 3, t("Found the size of all user's files with status 4."));
+    $this->assertEqual(file_space_used(NULL, 2), 4,"Found the size of all user's files with status 2.");
+    $this->assertEqual(file_space_used(NULL, 4), 3,"Found the size of all user's files with status 4.");
     // Check that the bitwise AND operator is used when selecting so that we
     // only get files with the 2 AND 4 bits set.
-    $this->assertEqual(file_space_used(NULL, 2 | 4), 3, t("Found the size of all user's files with status 6."));
+    $this->assertEqual(file_space_used(NULL, 2 | 4), 3,"Found the size of all user's files with status 6.");
   }
 
   /**
    * Test both the user and status.
    */
   function testUserAndStatus() {
-    $this->assertEqual(file_space_used(1, 8), 0, t("Found the size of the admin user's files with status 8."));
-    $this->assertEqual(file_space_used(2, 8), 1, t("Found the size of the first user's files with status 8."));
-    $this->assertEqual(file_space_used(2, 2), 1, t("Found the size of the first user's files with status 2."));
-    $this->assertEqual(file_space_used(3, 2), 3, t("Found the size of the second user's files with status 2."));
+    $this->assertEqual(file_space_used(1, 8), 0,"Found the size of the admin user's files with status 8.");
+    $this->assertEqual(file_space_used(2, 8), 1,"Found the size of the first user's files with status 8.");
+    $this->assertEqual(file_space_used(2, 2), 1,"Found the size of the first user's files with status 2.");
+    $this->assertEqual(file_space_used(3, 2), 3,"Found the size of the second user's files with status 2.");
   }
 }
 
@@ -331,9 +331,9 @@
 class FileValidatorTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('File validator tests'),
-      'description' => t('Tests the functions used to validate uploaded files.'),
-      'group' => t('File'),
+      'name' => 'File validator tests',
+      'description' => 'Tests the functions used to validate uploaded files.',
+      'group' => 'File',
     );
   }
 
@@ -356,24 +356,24 @@
     $file = new stdClass();
     $file->filename = 'asdf.txt';
     $errors = file_validate_extensions($file, 'asdf txt pork');
-    $this->assertEqual(count($errors), 0, t('Valid extension accepted.'), 'File');
+    $this->assertEqual(count($errors), 0,'Valid extension accepted.', 'File');
 
     $file->filename = 'asdf.txt';
     $errors = file_validate_extensions($file, 'exe png');
-    $this->assertEqual(count($errors), 1, t('Invalid extension blocked.'), 'File');
+    $this->assertEqual(count($errors), 1,'Invalid extension blocked.', 'File');
   }
 
   /**
    *  This ensures a specific file is actually an image.
    */
   function testFileValidateIsImage() {
-    $this->assertTrue(file_exists($this->image->filepath), t('The image being tested exists.'), 'File');
+    $this->assertTrue(file_exists($this->image->filepath),'The image being tested exists.', 'File');
     $errors = file_validate_is_image($this->image);
-    $this->assertEqual(count($errors), 0, t('No error reported for our image file.'), 'File');
+    $this->assertEqual(count($errors), 0,'No error reported for our image file.', 'File');
 
-    $this->assertTrue(file_exists($this->non_image->filepath), t('The non-image being tested exists.'), 'File');
+    $this->assertTrue(file_exists($this->non_image->filepath),'The non-image being tested exists.', 'File');
     $errors = file_validate_is_image($this->non_image);
-    $this->assertEqual(count($errors), 1, t('An error reported for our non-image file.'), 'File');
+    $this->assertEqual(count($errors), 1,'An error reported for our non-image file.', 'File');
   }
 
   /**
@@ -383,19 +383,19 @@
   function testFileValidateImageResolution() {
     // Non-images.
     $errors = file_validate_image_resolution($this->non_image);
-    $this->assertEqual(count($errors), 0, t("Shouldn't get any errors for a non-image file."), 'File');
+    $this->assertEqual(count($errors), 0,"Shouldn't get any errors for a non-image file.", 'File');
     $errors = file_validate_image_resolution($this->non_image, '50x50', '100x100');
-    $this->assertEqual(count($errors), 0, t("Don't check the resolution on non files."), 'File');
+    $this->assertEqual(count($errors), 0,"Don't check the resolution on non files.", 'File');
 
     // Minimum size.
     $errors = file_validate_image_resolution($this->image);
-    $this->assertEqual(count($errors), 0, t('No errors for an image when there is no minimum or maximum resolution.'), 'File');
+    $this->assertEqual(count($errors), 0,'No errors for an image when there is no minimum or maximum resolution.', 'File');
     $errors = file_validate_image_resolution($this->image, 0, '200x1');
-    $this->assertEqual(count($errors), 1, t("Got an error for an image that wasn't wide enough."), 'File');
+    $this->assertEqual(count($errors), 1,"Got an error for an image that wasn't wide enough.", 'File');
     $errors = file_validate_image_resolution($this->image, 0, '1x200');
-    $this->assertEqual(count($errors), 1, t("Got an error for an image that wasn't tall enough."), 'File');
+    $this->assertEqual(count($errors), 1,"Got an error for an image that wasn't tall enough.", 'File');
     $errors = file_validate_image_resolution($this->image, 0, '200x200');
-    $this->assertEqual(count($errors), 1, t('Small images report an error.'), 'File');
+    $this->assertEqual(count($errors), 1,'Small images report an error.', 'File');
 
     // Maximum size.
     if (image_get_toolkit()) {
@@ -405,18 +405,18 @@
       $this->image->filepath = $temp_dir . '/druplicon.png';
 
       $errors = file_validate_image_resolution($this->image, '10x5');
-      $this->assertEqual(count($errors), 0, t('No errors should be reported when an oversized image can be scaled down.'), 'File');
+      $this->assertEqual(count($errors), 0,'No errors should be reported when an oversized image can be scaled down.', 'File');
 
       $info = image_get_info($this->image->filepath);
-      $this->assertTrue($info['width'] <= 10, t('Image scaled to correct width.'), 'File');
-      $this->assertTrue($info['height'] <= 5, t('Image scaled to correct height.'), 'File');
+      $this->assertTrue($info['width'] <= 10,'Image scaled to correct width.', 'File');
+      $this->assertTrue($info['height'] <= 5,'Image scaled to correct height.', 'File');
 
       unlink(realpath($temp_dir . '/druplicon.png'));
     }
     else {
       // TODO: should check that the error is returned if no toolkit is available.
       $errors = file_validate_image_resolution($this->image, '5x10');
-      $this->assertEqual(count($errors), 1, t("Oversize images that can't be scaled get an error."), 'File');
+      $this->assertEqual(count($errors), 1,"Oversize images that can't be scaled get an error.", 'File');
     }
   }
 
@@ -431,17 +431,17 @@
     $file->filename = str_repeat('x', 255);
     $this->assertEqual(strlen($file->filename), 255);
     $errors = file_validate_name_length($file);
-    $this->assertEqual(count($errors), 0, t('No errors reported for 255 length filename.'), 'File');
+    $this->assertEqual(count($errors), 0,'No errors reported for 255 length filename.', 'File');
 
     // Add a filename with a length too long and test it.
     $file->filename = str_repeat('x', 256);
     $errors = file_validate_name_length($file);
-    $this->assertEqual(count($errors), 1, t('An error reported for 256 length filename.'), 'File');
+    $this->assertEqual(count($errors), 1,'An error reported for 256 length filename.', 'File');
 
     // Add a filename with an empty string and test it.
     $file->filename = '';
     $errors = file_validate_name_length($file);
-    $this->assertEqual(count($errors), 1, t('An error reported for 0 length filename.'), 'File');
+    $this->assertEqual(count($errors), 1,'An error reported for 0 length filename.', 'File');
   }
 
 
@@ -459,7 +459,7 @@
     $file = new stdClass();
     $file->filesize = 999999;
     $errors = file_validate_size($file, 1, 1);
-    $this->assertEqual(count($errors), 0, t('No size limits enforced on uid=1.'), 'File');
+    $this->assertEqual(count($errors), 0,'No size limits enforced on uid=1.', 'File');
 
     // Run these tests as a regular user.
     $user = $this->drupalCreateUser();
@@ -468,13 +468,13 @@
     $file = new stdClass();
     $file->filesize = 1000;
     $errors = file_validate_size($file, 0, 0);
-    $this->assertEqual(count($errors), 0, t('No limits means no errors.'), 'File');
+    $this->assertEqual(count($errors), 0,'No limits means no errors.', 'File');
     $errors = file_validate_size($file, 1, 0);
-    $this->assertEqual(count($errors), 1, t('Error for the file being over the limit.'), 'File');
+    $this->assertEqual(count($errors), 1,'Error for the file being over the limit.', 'File');
     $errors = file_validate_size($file, 0, 1);
-    $this->assertEqual(count($errors), 1, t('Error for the user being over their limit.'), 'File');
+    $this->assertEqual(count($errors), 1,'Error for the user being over their limit.', 'File');
     $errors = file_validate_size($file, 1, 1);
-    $this->assertEqual(count($errors), 2, t('Errors for both the file and their limit.'), 'File');
+    $this->assertEqual(count($errors), 2,'Errors for both the file and their limit.', 'File');
 
     $user = $original_user;
     drupal_save_session(TRUE);
@@ -489,9 +489,9 @@
 class FileUnmanagedSaveDataTest extends FileTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Unmanaged file save data'),
-      'description' => t('Tests the unmanaged file save data function.'),
-      'group' => t('File'),
+      'name' => 'Unmanaged file save data',
+      'description' => 'Tests the unmanaged file save data function.',
+      'group' => 'File',
     );
   }
 
@@ -503,16 +503,16 @@
 
     // No filename.
     $filepath = file_unmanaged_save_data($contents);
-    $this->assertTrue($filepath, t('Unnamed file saved correctly.'));
-    $this->assertEqual(file_directory_path(), dirname($filepath), t("File was placed in Drupal's files directory."));
-    $this->assertEqual($contents, file_get_contents(realpath($filepath)), t('Contents of the file are correct.'));
+    $this->assertTrue($filepath,'Unnamed file saved correctly.');
+    $this->assertEqual(file_directory_path(), dirname($filepath),"File was placed in Drupal's files directory.");
+    $this->assertEqual($contents, file_get_contents(realpath($filepath)),'Contents of the file are correct.');
 
     // Provide a filename.
     $filepath = file_unmanaged_save_data($contents, 'asdf.txt', FILE_EXISTS_REPLACE);
-    $this->assertTrue($filepath, t('Unnamed file saved correctly.'));
-    $this->assertEqual(file_directory_path(), dirname($filepath), t("File was placed in Drupal's files directory."));
-    $this->assertEqual('asdf.txt', basename($filepath), t('File was named correctly.'));
-    $this->assertEqual($contents, file_get_contents(realpath($filepath)), t('Contents of the file are correct.'));
+    $this->assertTrue($filepath,'Unnamed file saved correctly.');
+    $this->assertEqual(file_directory_path(), dirname($filepath),"File was placed in Drupal's files directory.");
+    $this->assertEqual('asdf.txt', basename($filepath),'File was named correctly.');
+    $this->assertEqual($contents, file_get_contents(realpath($filepath)),'Contents of the file are correct.');
     $this->assertFilePermissions($filepath, variable_get('file_chmod_file', 0664));
   }
 }
@@ -533,9 +533,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('File uploading'),
-      'description' => t('Tests the file uploading functions.'),
-      'group' => t('File'),
+      'name' => 'File uploading',
+      'description' => 'Tests the file uploading functions.',
+      'group' => 'File',
     );
   }
 
@@ -545,7 +545,7 @@
     $this->drupalLogin($account);
 
     $this->image = current($this->drupalGetTestFiles('image'));
-    $this->assertTrue(is_file($this->image->filepath), t("The file we're going to upload exists."));
+    $this->assertTrue(is_file($this->image->filepath),"The file we're going to upload exists.");
 
     $this->maxFidBefore = db_query('SELECT MAX(fid) AS fid FROM {files}')->fetchField();
 
@@ -555,8 +555,8 @@
       'files[file_test_upload]' => realpath($this->image->filepath)
     );
     $this->drupalPost('file-test/upload', $edit, t('Submit'));
-    $this->assertResponse(200, t('Received a 200 response for posted test file.'));
-    $this->assertRaw(t('You WIN!'), t('Found the success message.'));
+    $this->assertResponse(200,'Received a 200 response for posted test file.');
+    $this->assertRaw(t('You WIN!'),'Found the success message.');
 
     // Check that the correct hooks were called then clean out the hook
     // counters.
@@ -569,9 +569,9 @@
    */
   function testNormal() {
     $max_fid_after = db_query('SELECT MAX(fid) AS fid FROM {files}')->fetchField();
-    $this->assertTrue($max_fid_after > $this->maxFidBefore, t('A new file was created.'));
+    $this->assertTrue($max_fid_after > $this->maxFidBefore,'A new file was created.');
     $file1 = file_load($max_fid_after);
-    $this->assertTrue($file1, t('Loaded the file.'));
+    $this->assertTrue($file1,'Loaded the file.');
 
     // Reset the hook counters to get rid of the 'load' we just called.
     file_test_reset();
@@ -581,7 +581,7 @@
     $image2 = current($this->drupalGetTestFiles('image'));
     $edit = array('files[file_test_upload]' => realpath($image2->filepath));
     $this->drupalPost('file-test/upload', $edit, t('Submit'));
-    $this->assertResponse(200, t('Received a 200 response for posted test file.'));
+    $this->assertResponse(200,'Received a 200 response for posted test file.');
     $this->assertRaw(t('You WIN!'));
     $max_fid_after = db_query('SELECT MAX(fid) AS fid FROM {files}')->fetchField();
 
@@ -593,8 +593,8 @@
 
     // Load both files using file_load_multiple().
     $files = file_load_multiple(array($file1->fid, $file2->fid));
-    $this->assertTrue(isset($files[$file1->fid]), t('File was loaded successfully'));
-    $this->assertTrue(isset($files[$file2->fid]), t('File was loaded successfully'));
+    $this->assertTrue(isset($files[$file1->fid]),'File was loaded successfully');
+    $this->assertTrue(isset($files[$file2->fid]),'File was loaded successfully');
   }
 
 
@@ -607,8 +607,8 @@
       'files[file_test_upload]' => realpath($this->image->filepath)
     );
     $this->drupalPost('file-test/upload', $edit, t('Submit'));
-    $this->assertResponse(200, t('Received a 200 response for posted test file.'));
-    $this->assertRaw(t('You WIN!'), t('Found the success message.'));
+    $this->assertResponse(200,'Received a 200 response for posted test file.');
+    $this->assertRaw(t('You WIN!'),'Found the success message.');
 
     // Check that the correct hooks were called.
     $this->assertFileHooksCalled(array('validate', 'insert'));
@@ -623,8 +623,8 @@
       'files[file_test_upload]' => realpath($this->image->filepath)
     );
     $this->drupalPost('file-test/upload', $edit, t('Submit'));
-    $this->assertResponse(200, t('Received a 200 response for posted test file.'));
-    $this->assertRaw(t('You WIN!'), t('Found the success message.'));
+    $this->assertResponse(200,'Received a 200 response for posted test file.');
+    $this->assertRaw(t('You WIN!'),'Found the success message.');
 
     // Check that the correct hooks were called.
     $this->assertFileHooksCalled(array('validate', 'load', 'update'));
@@ -639,8 +639,8 @@
       'files[file_test_upload]' => realpath($this->image->filepath)
     );
     $this->drupalPost('file-test/upload', $edit, t('Submit'));
-    $this->assertResponse(200, t('Received a 200 response for posted test file.'));
-    $this->assertRaw(t('Epic upload FAIL!'), t('Found the failure message.'));
+    $this->assertResponse(200,'Received a 200 response for posted test file.');
+    $this->assertRaw(t('Epic upload FAIL!'),'Found the failure message.');
 
     // Check that the no hooks were called while failing.
     $this->assertFileHooksCalled(array());
@@ -651,7 +651,7 @@
    */
   function testNoUpload() {
     $this->drupalPost('file-test/upload', array(), t('Submit'));
-    $this->assertNoRaw(t('Epic upload FAIL!'), t('Failure message not found.'));
+    $this->assertNoRaw(t('Epic upload FAIL!'),'Failure message not found.');
   }
 }
 
@@ -661,9 +661,9 @@
 class FileDirectoryTest extends FileTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('File paths and directories'),
-      'description' => t('Tests operations dealing with directories.'),
-      'group' => t('File'),
+      'name' => 'File paths and directories',
+      'description' => 'Tests operations dealing with directories.',
+      'group' => 'File',
     );
   }
 
@@ -673,33 +673,33 @@
   function testFileCheckDirectory() {
     // A directory to operate on.
     $directory = file_directory_path() . '/' . $this->randomName();
-    $this->assertFalse(is_dir($directory), t('Directory does not exist prior to testing.'));
+    $this->assertFalse(is_dir($directory),'Directory does not exist prior to testing.');
 
     // Non-existent directory.
     $form_element = $this->randomName();
-    $this->assertFalse(file_check_directory($directory, 0, $form_element), t('Error reported for non-existing directory.'), 'File');
+    $this->assertFalse(file_check_directory($directory, 0, $form_element),'Error reported for non-existing directory.', 'File');
 
     // Check that an error was set for the form element above.
     $errors = form_get_errors();
-    $this->assertEqual($errors[$form_element], t('The directory %directory does not exist.', array('%directory' => $directory)), t('Properly generated an error for the passed form element.'), 'File');
+    $this->assertEqual($errors[$form_element],'The directory %directory does not exist.', array('%directory' => $directory)),'Properly generated an error for the passed form element.', 'File';
 
     // Make a directory.
-    $this->assertTrue(file_check_directory($directory, FILE_CREATE_DIRECTORY), t('No error reported when creating a new directory.'), 'File');
+    $this->assertTrue(file_check_directory($directory, FILE_CREATE_DIRECTORY),'No error reported when creating a new directory.', 'File');
 
     // Make sure directory actually exists.
-    $this->assertTrue(is_dir($directory), t('Directory actually exists.'), 'File');
+    $this->assertTrue(is_dir($directory),'Directory actually exists.', 'File');
 
     // Make directory read only.
     @chmod($directory, 0444);
     $form_element = $this->randomName();
-    $this->assertFalse(file_check_directory($directory, 0, $form_element), t('Error reported for a non-writeable directory.'), 'File');
+    $this->assertFalse(file_check_directory($directory, 0, $form_element),'Error reported for a non-writeable directory.', 'File');
 
     // Check if form error was set.
     $errors = form_get_errors();
-    $this->assertEqual($errors[$form_element], t('The directory %directory is not writable', array('%directory' => $directory)), t('Properly generated an error for the passed form element.'), 'File');
+    $this->assertEqual($errors[$form_element],'The directory %directory is not writable', array('%directory' => $directory)),'Properly generated an error for the passed form element.', 'File';
 
     // Test directory permission modification.
-    $this->assertTrue(file_check_directory($directory, FILE_MODIFY_PERMISSIONS), t('No error reported when making directory writeable.'), 'File');
+    $this->assertTrue(file_check_directory($directory, FILE_MODIFY_PERMISSIONS),'No error reported when making directory writeable.', 'File');
 
     // Test directory permission modification actually set correct permissions.
     $this->assertDirectoryPermissions($directory, variable_get('file_chmod_directory', 0775));
@@ -708,11 +708,11 @@
     @unlink(file_directory_path() . '/.htaccess');
     $directory = file_directory_path();
     file_check_directory($directory);
-    $this->assertTrue(is_file(file_directory_path() . '/.htaccess'), t('Successfully created the .htaccess file in the files directory.'), 'File');
+    $this->assertTrue(is_file(file_directory_path() . '/.htaccess'),'Successfully created the .htaccess file in the files directory.', 'File');
 
     // Verify contents of .htaccess file.
     $file = file_get_contents(file_directory_path() . '/.htaccess');
-    $this->assertEqual($file, "SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006\nOptions None\nOptions +FollowSymLinks", t('The .htaccess file contains the proper content.'), 'File');
+    $this->assertEqual($file, "SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006\nOptions None\nOptions +FollowSymLinks",'The .htaccess file contains the proper content.', 'File');
   }
 
   /**
@@ -721,7 +721,7 @@
   function testFileDirectoryPath() {
     // Directory path.
     $path = variable_get('file_directory_path', conf_path() . '/files');
-    $this->assertEqual($path, file_directory_path(), t('Properly returns the stored file directory path.'), 'File');
+    $this->assertEqual($path, file_directory_path(),'Properly returns the stored file directory path.', 'File');
   }
 
   /**
@@ -731,7 +731,7 @@
     // Temporary directory handling.
     variable_set('file_directory_temp', NULL);
     $temp = file_directory_temp();
-    $this->assertTrue(!is_null($temp), t('Properly set and retrieved temp directory %directory.', array('%directory' => $temp)), 'File');
+    $this->assertTrue(!is_null($temp),'Properly set and retrieved temp directory %directory.', array('%directory' => $temp)), 'File';
   }
 
   /**
@@ -742,25 +742,25 @@
     $source = 'misc/xyz.txt';
     $directory = 'misc';
     $result = file_check_location($source, $directory);
-    $this->assertTrue($result, t('Non-existent file validates when checked for location in existing directory.'), 'File');
+    $this->assertTrue($result,'Non-existent file validates when checked for location in existing directory.', 'File');
 
     $source = 'fake/xyz.txt';
     $directory = 'fake';
     $result = file_check_location($source, $directory);
-    $this->assertTrue($result, t('Non-existent file validates when checked for location in non-existing directory.'), 'File');
+    $this->assertTrue($result,'Non-existent file validates when checked for location in non-existing directory.', 'File');
 
     $source = 'misc/../install.php';
     $directory = 'misc';
     $result = file_check_location($source, $directory);
-    $this->assertFalse($result, t('Existing file fails validation when it exists outside the directory path, using a /../ exploit.'), 'File');
+    $this->assertFalse($result,'Existing file fails validation when it exists outside the directory path, using a /../ exploit.', 'File');
 
     $source = 'misc/druplicon.png';
     $directory = 'misc';
     $result = file_check_location($source, $directory);
-    $this->assertTrue($result, t('Existing file passes validation when checked for location in directory path, and filepath contains a subfolder of the checked path.'), 'File');
+    $this->assertTrue($result,'Existing file passes validation when checked for location in directory path, and filepath contains a subfolder of the checked path.', 'File');
 
     $result = file_check_location($source, $directory);
-    $this->assertTrue($result, t('Existing file passes validation, returning the source when checked for location in directory.'), 'File');
+    $this->assertTrue($result,'Existing file passes validation, returning the source when checked for location in directory.', 'File');
   }
 
 
@@ -775,14 +775,14 @@
     $directory = 'misc';
     $original = $directory . '/' . $basename;
     $path = file_create_filename($basename, $directory);
-    $this->assertEqual($path, $original, t('New filepath %new equals %original.', array('%new' => $path, '%original' => $original)), 'File');
+    $this->assertEqual($path, $original,'New filepath %new equals %original.', array('%new' => $path, '%original' => $original)), 'File';
 
     // Then we test against a file that already exists within that directory.
     $basename = 'druplicon.png';
     $original = $directory . '/' . $basename;
     $expected = $directory . '/druplicon_0.png';
     $path = file_create_filename($basename, $directory);
-    $this->assertEqual($path, $expected, t('Creating a new filepath from %original equals %new.', array('%new' => $path, '%original' => $original)), 'File');
+    $this->assertEqual($path, $expected,'Creating a new filepath from %original equals %new.', array('%new' => $path, '%original' => $original)), 'File';
 
     // @TODO: Finally we copy a file into a directory several times, to ensure a properly iterating filename suffix.
   }
@@ -803,19 +803,19 @@
     // First test for non-existent file.
     $destination = 'misc/xyz.txt';
     $path = file_destination($destination, FILE_EXISTS_REPLACE);
-    $this->assertEqual($path, $destination, t('Non-existing filepath destination is correct with FILE_EXISTS_REPLACE.'), 'File');
+    $this->assertEqual($path, $destination,'Non-existing filepath destination is correct with FILE_EXISTS_REPLACE.', 'File');
     $path = file_destination($destination, FILE_EXISTS_RENAME);
-    $this->assertEqual($path, $destination, t('Non-existing filepath destination is correct with FILE_EXISTS_RENAME.'), 'File');
+    $this->assertEqual($path, $destination,'Non-existing filepath destination is correct with FILE_EXISTS_RENAME.', 'File');
     $path = file_destination($destination, FILE_EXISTS_ERROR);
-    $this->assertEqual($path, $destination, t('Non-existing filepath destination is correct with FILE_EXISTS_ERROR.'), 'File');
+    $this->assertEqual($path, $destination,'Non-existing filepath destination is correct with FILE_EXISTS_ERROR.', 'File');
 
     $destination = 'misc/druplicon.png';
     $path = file_destination($destination, FILE_EXISTS_REPLACE);
-    $this->assertEqual($path, $destination, t('Existing filepath destination remains the same with FILE_EXISTS_REPLACE.'), 'File');
+    $this->assertEqual($path, $destination,'Existing filepath destination remains the same with FILE_EXISTS_REPLACE.', 'File');
     $path = file_destination($destination, FILE_EXISTS_RENAME);
-    $this->assertNotEqual($path, $destination, t('A new filepath destination is created when filepath destination already exists with FILE_EXISTS_RENAME.'), 'File');
+    $this->assertNotEqual($path, $destination,'A new filepath destination is created when filepath destination already exists with FILE_EXISTS_RENAME.', 'File');
     $path = file_destination($destination, FILE_EXISTS_ERROR);
-    $this->assertEqual($path, FALSE, t('An error is returned when filepath destination already exists with FILE_EXISTS_ERROR.'), 'File');
+    $this->assertEqual($path, FALSE,'An error is returned when filepath destination already exists with FILE_EXISTS_ERROR.', 'File');
   }
 }
 
@@ -826,9 +826,9 @@
 class FileScanDirectoryTest extends FileTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('File scan directory'),
-      'description' => t('Tests the file_scan_directory() function.'),
-      'group' => t('File'),
+      'name' => 'File scan directory',
+      'description' => 'Tests the file_scan_directory() function.',
+      'group' => 'File',
     );
   }
 
@@ -845,21 +845,21 @@
     // passed to the callback.
     $all_files = file_scan_directory($this->path, '/^javascript-/');
     ksort($all_files);
-    $this->assertEqual(2, count($all_files), t('Found two, expected javascript files.'));
+    $this->assertEqual(2, count($all_files),'Found two, expected javascript files.');
 
     // Check the first file.
     $file = reset($all_files);
-    $this->assertEqual(key($all_files), $file->filepath, t('Correct array key was used for the first returned file.'));
-    $this->assertEqual($file->filepath, $this->path . '/javascript-1.txt', t('First file name was set correctly.'));
-    $this->assertEqual($file->filename, 'javascript-1.txt', t('First basename was set correctly'));
-    $this->assertEqual($file->name, 'javascript-1', t('First name was set correctly.'));
+    $this->assertEqual(key($all_files), $file->filepath,'Correct array key was used for the first returned file.');
+    $this->assertEqual($file->filepath, $this->path . '/javascript-1.txt','First file name was set correctly.');
+    $this->assertEqual($file->filename, 'javascript-1.txt','First basename was set correctly');
+    $this->assertEqual($file->name, 'javascript-1','First name was set correctly.');
 
     // Check the second file.
     $file = next($all_files);
-    $this->assertEqual(key($all_files), $file->filepath, t('Correct array key was used for the second returned file.'));
-    $this->assertEqual($file->filepath, $this->path . '/javascript-2.script', t('Second file name was set correctly.'));
-    $this->assertEqual($file->filename, 'javascript-2.script', t('Second basename was set correctly'));
-    $this->assertEqual($file->name, 'javascript-2', t('Second name was set correctly.'));
+    $this->assertEqual(key($all_files), $file->filepath,'Correct array key was used for the second returned file.');
+    $this->assertEqual($file->filepath, $this->path . '/javascript-2.script','Second file name was set correctly.');
+    $this->assertEqual($file->filename, 'javascript-2.script','Second basename was set correctly');
+    $this->assertEqual($file->name, 'javascript-2','Second name was set correctly.');
   }
 
   /**
@@ -868,16 +868,16 @@
   function testOptionCallback() {
     // When nothing is matched nothing should be passed to the callback.
     $all_files = file_scan_directory($this->path, '/^NONEXISTINGFILENAME/', array('callback' => 'file_test_file_scan_callback'));
-    $this->assertEqual(0, count($all_files), t('No files were found.'));
+    $this->assertEqual(0, count($all_files),'No files were found.');
     $results = file_test_file_scan_callback(NULL, TRUE);
-    $this->assertEqual(0, count($results), t('No files were passed to the callback.'));
+    $this->assertEqual(0, count($results),'No files were passed to the callback.');
 
     // Grab a listing of all the JavaSscript files and check that they're
     // passed to the callback.
     $all_files = file_scan_directory($this->path, '/^javascript-/', array('callback' => 'file_test_file_scan_callback'));
-    $this->assertEqual(2, count($all_files), t('Found two, expected javascript files.'));
+    $this->assertEqual(2, count($all_files),'Found two, expected javascript files.');
     $results = file_test_file_scan_callback(NULL, TRUE);
-    $this->assertEqual(2, count($results), t('Files were passed to the callback.'));
+    $this->assertEqual(2, count($results),'Files were passed to the callback.');
   }
 
   /**
@@ -886,11 +886,11 @@
   function testOptionNoMask() {
     // Grab a listing of all the JavaSscript files.
     $all_files = file_scan_directory($this->path, '/^javascript-/');
-    $this->assertEqual(2, count($all_files), t('Found two, expected javascript files.'));
+    $this->assertEqual(2, count($all_files),'Found two, expected javascript files.');
 
     // Now use the nomast parameter to filter out the .script file.
     $filtered_files = file_scan_directory($this->path, '/^javascript-/', array('nomask' => '/.script$/'));
-    $this->assertEqual(1, count($filtered_files), t('Filtered correctly.'));
+    $this->assertEqual(1, count($filtered_files),'Filtered correctly.');
   }
 
   /**
@@ -901,25 +901,25 @@
     $expected = array($this->path . '/javascript-1.txt', $this->path . '/javascript-2.script');
     $actual = array_keys(file_scan_directory($this->path, '/^javascript-/', array('key' => 'filepath')));
     sort($actual);
-    $this->assertEqual($expected, $actual, t('Returned the correct values for the filename key.'));
+    $this->assertEqual($expected, $actual,'Returned the correct values for the filename key.');
 
     // "basename", for the basename of the file.
     $expected = array('javascript-1.txt', 'javascript-2.script');
     $actual = array_keys(file_scan_directory($this->path, '/^javascript-/', array('key' => 'filename')));
     sort($actual);
-    $this->assertEqual($expected, $actual, t('Returned the correct values for the basename key.'));
+    $this->assertEqual($expected, $actual,'Returned the correct values for the basename key.');
 
     // "name" for the name of the file without an extension.
     $expected = array('javascript-1', 'javascript-2');
     $actual = array_keys(file_scan_directory($this->path, '/^javascript-/', array('key' => 'name')));
     sort($actual);
-    $this->assertEqual($expected, $actual, t('Returned the correct values for the name key.'));
+    $this->assertEqual($expected, $actual,'Returned the correct values for the name key.');
 
     // Invalid option that should default back to "filename".
     $expected = array($this->path . '/javascript-1.txt', $this->path . '/javascript-2.script');
     $actual = array_keys(file_scan_directory($this->path, '/^javascript-/', array('key' => 'INVALID')));
     sort($actual);
-    $this->assertEqual($expected, $actual, t('An invalid key defaulted back to the default.'));
+    $this->assertEqual($expected, $actual,'An invalid key defaulted back to the default.');
   }
 
   /**
@@ -927,10 +927,10 @@
    */
   function testOptionRecurse() {
     $files = file_scan_directory($this->originalFileDirectory, '/^javascript-/', array('recurse' => FALSE));
-    $this->assertTrue(empty($files), t("Without recursion couldn't find javascript files."));
+    $this->assertTrue(empty($files),"Without recursion couldn't find javascript files.");
 
     $files = file_scan_directory($this->originalFileDirectory, '/^javascript-/', array('recurse' => TRUE));
-    $this->assertEqual(2, count($files), t('With recursion we found the expected javascript files.'));
+    $this->assertEqual(2, count($files),'With recursion we found the expected javascript files.');
   }
 
 
@@ -940,10 +940,10 @@
    */
   function testOptionMinDepth() {
     $files = file_scan_directory($this->path, '/^javascript-/', array('min_depth' => 0));
-    $this->assertEqual(2, count($files), t('No minimum-depth gets files in current directory.'));
+    $this->assertEqual(2, count($files),'No minimum-depth gets files in current directory.');
 
     $files = file_scan_directory($this->path, '/^javascript-/', array('min_depth' => 1));
-    $this->assertTrue(empty($files), t("Minimum-depth of 1 successfully excludes files from current directory."));
+    $this->assertTrue(empty($files),"Minimum-depth of 1 successfully excludes files from current directory.");
   }
 }
 
@@ -954,9 +954,9 @@
 class FileUnmanagedDeleteTest extends FileTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Unmanaged file delete'),
-      'description' => t('Tests the unmanaged file delete function.'),
-      'group' => t('File'),
+      'name' => 'Unmanaged file delete',
+      'description' => 'Tests the unmanaged file delete function.',
+      'group' => 'File',
     );
   }
 
@@ -968,8 +968,8 @@
     $file = $this->createFile();
 
     // Delete a regular file
-    $this->assertTrue(file_unmanaged_delete($file->filepath), t('Deleted worked.'));
-    $this->assertFalse(file_exists($file->filepath), t('Test file has actually been deleted.'));
+    $this->assertTrue(file_unmanaged_delete($file->filepath),'Deleted worked.');
+    $this->assertFalse(file_exists($file->filepath),'Test file has actually been deleted.');
   }
 
   /**
@@ -977,7 +977,7 @@
    */
   function testMissing() {
     // Try to delete a non-existing file
-    $this->assertTrue(file_unmanaged_delete(file_directory_path() . '/' . $this->randomName()), t('Returns true when deleting a non-existent file.'));
+    $this->assertTrue(file_unmanaged_delete(file_directory_path() . '/' . $this->randomName()),'Returns true when deleting a non-existent file.');
   }
 
   /**
@@ -988,8 +988,8 @@
     $directory = $this->createDirectory();
 
     // Try to delete a directory
-    $this->assertFalse(file_unmanaged_delete($directory), t('Could not delete the delete directory.'));
-    $this->assertTrue(file_exists($directory), t('Directory has not been deleted.'));
+    $this->assertFalse(file_unmanaged_delete($directory),'Could not delete the delete directory.');
+    $this->assertTrue(file_exists($directory),'Directory has not been deleted.');
   }
 }
 
@@ -1000,9 +1000,9 @@
 class FileUnmanagedDeleteRecursiveTest extends FileTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Unmanaged recursive file delete'),
-      'description' => t('Tests the unmanaged file delete recursive function.'),
-      'group' => t('File'),
+      'name' => 'Unmanaged recursive file delete',
+      'description' => 'Tests the unmanaged file delete recursive function.',
+      'group' => 'File',
     );
   }
 
@@ -1015,8 +1015,8 @@
     file_put_contents($filepath, '');
 
     // Delete the file.
-    $this->assertTrue(file_unmanaged_delete_recursive($filepath), t('Function reported success.'));
-    $this->assertFalse(file_exists($filepath), t('Test file has been deleted.'));
+    $this->assertTrue(file_unmanaged_delete_recursive($filepath),'Function reported success.');
+    $this->assertFalse(file_exists($filepath),'Test file has been deleted.');
   }
 
   /**
@@ -1027,8 +1027,8 @@
     $directory = $this->createDirectory();
 
     // Delete the directory.
-    $this->assertTrue(file_unmanaged_delete_recursive($directory), t('Function reported success.'));
-    $this->assertFalse(file_exists($directory), t('Directory has been deleted.'));
+    $this->assertTrue(file_unmanaged_delete_recursive($directory),'Function reported success.');
+    $this->assertFalse(file_exists($directory),'Directory has been deleted.');
   }
 
   /**
@@ -1043,10 +1043,10 @@
     file_put_contents($filepathB, '');
 
     // Delete the directory.
-    $this->assertTrue(file_unmanaged_delete_recursive($directory), t('Function reported success.'));
-    $this->assertFalse(file_exists($filepathA), t('Test file A has been deleted.'));
-    $this->assertFalse(file_exists($filepathB), t('Test file B has been deleted.'));
-    $this->assertFalse(file_exists($directory), t('Directory has been deleted.'));
+    $this->assertTrue(file_unmanaged_delete_recursive($directory),'Function reported success.');
+    $this->assertFalse(file_exists($filepathA),'Test file A has been deleted.');
+    $this->assertFalse(file_exists($filepathB),'Test file B has been deleted.');
+    $this->assertFalse(file_exists($directory),'Directory has been deleted.');
   }
 
   /**
@@ -1062,11 +1062,11 @@
     file_put_contents($filepathB, '');
 
     // Delete the directory.
-    $this->assertTrue(file_unmanaged_delete_recursive($directory), t('Function reported success.'));
-    $this->assertFalse(file_exists($filepathA), t('Test file A has been deleted.'));
-    $this->assertFalse(file_exists($filepathB), t('Test file B has been deleted.'));
-    $this->assertFalse(file_exists($subdirectory), t('Subdirectory has been deleted.'));
-    $this->assertFalse(file_exists($directory), t('Directory has been deleted.'));
+    $this->assertTrue(file_unmanaged_delete_recursive($directory),'Function reported success.');
+    $this->assertFalse(file_exists($filepathA),'Test file A has been deleted.');
+    $this->assertFalse(file_exists($filepathB),'Test file B has been deleted.');
+    $this->assertFalse(file_exists($subdirectory),'Subdirectory has been deleted.');
+    $this->assertFalse(file_exists($directory),'Directory has been deleted.');
   }
 }
 
@@ -1077,9 +1077,9 @@
 class FileUnmanagedMoveTest extends FileTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Unmanaged file moving'),
-      'description' => t('Tests the unmanaged file move function.'),
-      'group' => t('File'),
+      'name' => 'Unmanaged file moving',
+      'description' => 'Tests the unmanaged file move function.',
+      'group' => 'File',
     );
   }
 
@@ -1093,21 +1093,21 @@
     // Moving to a new name.
     $desired_filepath = file_directory_path() . '/' . $this->randomName();
     $new_filepath = file_unmanaged_move($file->filepath, $desired_filepath, FILE_EXISTS_ERROR);
-    $this->assertTrue($new_filepath, t('Move was successful.'));
-    $this->assertEqual($new_filepath, $desired_filepath, t('Returned expected filepath.'));
-    $this->assertTrue(file_exists($new_filepath), t('File exists at the new location.'));
-    $this->assertFalse(file_exists($file->filepath), t('No file remains at the old location.'));
+    $this->assertTrue($new_filepath,'Move was successful.');
+    $this->assertEqual($new_filepath, $desired_filepath,'Returned expected filepath.');
+    $this->assertTrue(file_exists($new_filepath),'File exists at the new location.');
+    $this->assertFalse(file_exists($file->filepath),'No file remains at the old location.');
     $this->assertFilePermissions($new_filepath, variable_get('file_chmod_file', 0664));
 
     // Moving with rename.
     $desired_filepath = file_directory_path() . '/' . $this->randomName();
-    $this->assertTrue(file_exists($new_filepath), t('File exists before moving.'));
-    $this->assertTrue(file_put_contents($desired_filepath, ' '), t('Created a file so a rename will have to happen.'));
+    $this->assertTrue(file_exists($new_filepath),'File exists before moving.');
+    $this->assertTrue(file_put_contents($desired_filepath, ' '),'Created a file so a rename will have to happen.');
     $newer_filepath = file_unmanaged_move($new_filepath, $desired_filepath, FILE_EXISTS_RENAME);
-    $this->assertTrue($newer_filepath, t('Move was successful.'));
-    $this->assertNotEqual($newer_filepath, $desired_filepath, t('Returned expected filepath.'));
-    $this->assertTrue(file_exists($newer_filepath), t('File exists at the new location.'));
-    $this->assertFalse(file_exists($new_filepath), t('No file remains at the old location.'));
+    $this->assertTrue($newer_filepath,'Move was successful.');
+    $this->assertNotEqual($newer_filepath, $desired_filepath,'Returned expected filepath.');
+    $this->assertTrue(file_exists($newer_filepath),'File exists at the new location.');
+    $this->assertFalse(file_exists($new_filepath),'No file remains at the old location.');
     $this->assertFilePermissions($newer_filepath, variable_get('file_chmod_file', 0664));
 
     // TODO: test moving to a directory (rather than full directory/file path)
@@ -1119,7 +1119,7 @@
   function testMissing() {
     // Move non-existent file.
     $new_filepath = file_unmanaged_move($this->randomName(), $this->randomName());
-    $this->assertFalse($new_filepath, t('Moving a missing file fails.'));
+    $this->assertFalse($new_filepath,'Moving a missing file fails.');
   }
 
   /**
@@ -1131,14 +1131,14 @@
 
     // Move the file onto itself without renaming shouldn't make changes.
     $new_filepath = file_unmanaged_move($file->filepath, $file->filepath, FILE_EXISTS_REPLACE);
-    $this->assertFalse($new_filepath, t('Moving onto itself without renaming fails.'));
-    $this->assertTrue(file_exists($file->filepath), t('File exists after moving onto itself.'));
+    $this->assertFalse($new_filepath,'Moving onto itself without renaming fails.');
+    $this->assertTrue(file_exists($file->filepath),'File exists after moving onto itself.');
 
     // Move the file onto itself with renaming will result in a new filename.
     $new_filepath = file_unmanaged_move($file->filepath, $file->filepath, FILE_EXISTS_RENAME);
-    $this->assertTrue($new_filepath, t('Moving onto itself with renaming works.'));
-    $this->assertFalse(file_exists($file->filepath), t('Original file has been removed.'));
-    $this->assertTrue(file_exists($new_filepath), t('File exists after moving onto itself.'));
+    $this->assertTrue($new_filepath,'Moving onto itself with renaming works.');
+    $this->assertFalse(file_exists($file->filepath),'Original file has been removed.');
+    $this->assertTrue(file_exists($new_filepath),'File exists after moving onto itself.');
   }
 }
 
@@ -1149,9 +1149,9 @@
 class FileUnmanagedCopyTest extends FileTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Unmanaged file copying'),
-      'description' => t('Tests the unmanaged file copy function.'),
-      'group' => t('File'),
+      'name' => 'Unmanaged file copying',
+      'description' => 'Tests the unmanaged file copy function.',
+      'group' => 'File',
     );
   }
 
@@ -1165,20 +1165,20 @@
     // Copying to a new name.
     $desired_filepath = file_directory_path() . '/' . $this->randomName();
     $new_filepath = file_unmanaged_copy($file->filepath, $desired_filepath, FILE_EXISTS_ERROR);
-    $this->assertTrue($new_filepath, t('Copy was successful.'));
-    $this->assertEqual($new_filepath, $desired_filepath, t('Returned expected filepath.'));
-    $this->assertTrue(file_exists($file->filepath), t('Original file remains.'));
-    $this->assertTrue(file_exists($new_filepath), t('New file exists.'));
+    $this->assertTrue($new_filepath,'Copy was successful.');
+    $this->assertEqual($new_filepath, $desired_filepath,'Returned expected filepath.');
+    $this->assertTrue(file_exists($file->filepath),'Original file remains.');
+    $this->assertTrue(file_exists($new_filepath),'New file exists.');
     $this->assertFilePermissions($new_filepath, variable_get('file_chmod_file', 0664));
 
     // Copying with rename.
     $desired_filepath = file_directory_path() . '/' . $this->randomName();
-    $this->assertTrue(file_put_contents($desired_filepath, ' '), t('Created a file so a rename will have to happen.'));
+    $this->assertTrue(file_put_contents($desired_filepath, ' '),'Created a file so a rename will have to happen.');
     $newer_filepath = file_unmanaged_copy($file->filepath, $desired_filepath, FILE_EXISTS_RENAME);
-    $this->assertTrue($newer_filepath, t('Copy was successful.'));
-    $this->assertNotEqual($newer_filepath, $desired_filepath, t('Returned expected filepath.'));
-    $this->assertTrue(file_exists($file->filepath), t('Original file remains.'));
-    $this->assertTrue(file_exists($newer_filepath), t('New file exists.'));
+    $this->assertTrue($newer_filepath,'Copy was successful.');
+    $this->assertNotEqual($newer_filepath, $desired_filepath,'Returned expected filepath.');
+    $this->assertTrue(file_exists($file->filepath),'Original file remains.');
+    $this->assertTrue(file_exists($newer_filepath),'New file exists.');
     $this->assertFilePermissions($newer_filepath, variable_get('file_chmod_file', 0664));
 
     // TODO: test copying to a directory (rather than full directory/file path)
@@ -1190,9 +1190,9 @@
   function testNonExistent() {
     // Copy non-existent file
     $desired_filepath = $this->randomName();
-    $this->assertFalse(file_exists($desired_filepath), t("Randomly named file doesn't exists."));
+    $this->assertFalse(file_exists($desired_filepath),"Randomly named file doesn't exists.");
     $new_filepath = file_unmanaged_copy($desired_filepath, $this->randomName());
-    $this->assertFalse($new_filepath, t('Copying a missing file fails.'));
+    $this->assertFalse($new_filepath,'Copying a missing file fails.');
   }
 
   /**
@@ -1204,28 +1204,28 @@
 
     // Copy the file onto itself with renaming works.
     $new_filepath = file_unmanaged_copy($file->filepath, $file->filepath, FILE_EXISTS_RENAME);
-    $this->assertTrue($new_filepath, t('Copying onto itself with renaming works.'));
-    $this->assertNotEqual($new_filepath, $file->filepath, t('Copied file has a new name.'));
-    $this->assertTrue(file_exists($file->filepath), t('Original file exists after copying onto itself.'));
-    $this->assertTrue(file_exists($new_filepath), t('Copied file exists after copying onto itself.'));
+    $this->assertTrue($new_filepath,'Copying onto itself with renaming works.');
+    $this->assertNotEqual($new_filepath, $file->filepath,'Copied file has a new name.');
+    $this->assertTrue(file_exists($file->filepath),'Original file exists after copying onto itself.');
+    $this->assertTrue(file_exists($new_filepath),'Copied file exists after copying onto itself.');
     $this->assertFilePermissions($new_filepath, variable_get('file_chmod_file', 0664));
 
     // Copy the file onto itself without renaming fails.
     $new_filepath = file_unmanaged_copy($file->filepath, $file->filepath, FILE_EXISTS_ERROR);
-    $this->assertFalse($new_filepath, t('Copying onto itself without renaming fails.'));
-    $this->assertTrue(file_exists($file->filepath), t('File exists after copying onto itself.'));
+    $this->assertFalse($new_filepath,'Copying onto itself without renaming fails.');
+    $this->assertTrue(file_exists($file->filepath),'File exists after copying onto itself.');
 
     // Copy the file into same directory without renaming fails.
     $new_filepath = file_unmanaged_copy($file->filepath, dirname($file->filepath), FILE_EXISTS_ERROR);
-    $this->assertFalse($new_filepath, t('Copying onto itself fails.'));
-    $this->assertTrue(file_exists($file->filepath), t('File exists after copying onto itself.'));
+    $this->assertFalse($new_filepath,'Copying onto itself fails.');
+    $this->assertTrue(file_exists($file->filepath),'File exists after copying onto itself.');
 
     // Copy the file into same directory with renaming works.
     $new_filepath = file_unmanaged_copy($file->filepath, dirname($file->filepath), FILE_EXISTS_RENAME);
-    $this->assertTrue($new_filepath, t('Copying into same directory works.'));
-    $this->assertNotEqual($new_filepath, $file->filepath, t('Copied file has a new name.'));
-    $this->assertTrue(file_exists($file->filepath), t('Original file exists after copying onto itself.'));
-    $this->assertTrue(file_exists($new_filepath), t('Copied file exists after copying onto itself.'));
+    $this->assertTrue($new_filepath,'Copying into same directory works.');
+    $this->assertNotEqual($new_filepath, $file->filepath,'Copied file has a new name.');
+    $this->assertTrue(file_exists($file->filepath),'Original file exists after copying onto itself.');
+    $this->assertTrue(file_exists($new_filepath),'Copied file exists after copying onto itself.');
     $this->assertFilePermissions($new_filepath, variable_get('file_chmod_file', 0664));
   }
 }
@@ -1236,9 +1236,9 @@
 class FileDeleteTest extends FileHookTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('File delete'),
-      'description' => t('Tests the file delete function.'),
-      'group' => t('File'),
+      'name' => 'File delete',
+      'description' => 'Tests the file delete function.',
+      'group' => 'File',
     );
   }
 
@@ -1249,11 +1249,11 @@
     $file = $this->createFile();
 
     // Check that deletion removes the file and database record.
-    $this->assertTrue(is_file($file->filepath), t("File exists."));
-    $this->assertIdentical(file_delete($file), TRUE, t("Delete worked."));
+    $this->assertTrue(is_file($file->filepath),"File exists.");
+    $this->assertIdentical(file_delete($file), TRUE,"Delete worked.");
     $this->assertFileHooksCalled(array('references', 'delete'));
-    $this->assertFalse(file_exists($file->filepath), t("Test file has actually been deleted."));
-    $this->assertFalse(file_load($file->fid), t('File was removed from the database.'));
+    $this->assertFalse(file_exists($file->filepath),"Test file has actually been deleted.");
+    $this->assertFalse(file_load($file->fid),'File was removed from the database.');
 
     // TODO: implement hook_file_references() in file_test.module and report a
     // file in use and test the $force parameter.
@@ -1267,9 +1267,9 @@
 class FileMoveTest extends FileHookTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('File moving'),
-      'description' => t('Tests the file move function.'),
-      'group' => t('File'),
+      'name' => 'File moving',
+      'description' => 'Tests the file move function.',
+      'group' => 'File',
     );
   }
 
@@ -1286,9 +1286,9 @@
     $result = file_move(clone $source, $desired_filepath, FILE_EXISTS_ERROR);
 
     // Check the return status and that the contents changed.
-    $this->assertTrue($result, t('File moved sucessfully.'));
+    $this->assertTrue($result,'File moved sucessfully.');
     $this->assertFalse(file_exists($source->filepath));
-    $this->assertEqual($contents, file_get_contents($result->filepath), t('Contents of file correctly written.'));
+    $this->assertEqual($contents, file_get_contents($result->filepath),'Contents of file correctly written.');
 
     // Check that the correct hooks were called.
     $this->assertFileHooksCalled(array('move', 'update'));
@@ -1299,7 +1299,7 @@
     // Reload the file from the database and check that the changes were
     // actually saved.
     $loaded_file = file_load($result->fid, TRUE);
-    $this->assertTrue($loaded_file, t('File can be loaded from the database.'));
+    $this->assertTrue($loaded_file,'File can be loaded from the database.');
     $this->assertFileUnchanged($result, $loaded_file);
   }
 
@@ -1318,9 +1318,9 @@
     $result = file_move(clone $source, $target->filepath, FILE_EXISTS_RENAME);
 
     // Check the return status and that the contents changed.
-    $this->assertTrue($result, t('File moved sucessfully.'));
+    $this->assertTrue($result,'File moved sucessfully.');
     $this->assertFalse(file_exists($source->filepath));
-    $this->assertEqual($contents, file_get_contents($result->filepath), t('Contents of file correctly written.'));
+    $this->assertEqual($contents, file_get_contents($result->filepath),'Contents of file correctly written.');
 
     // Check that the correct hooks were called.
     $this->assertFileHooksCalled(array('move', 'update'));
@@ -1334,8 +1334,8 @@
 
     // Compare the source and results.
     $loaded_source = file_load($source->fid, TRUE);
-    $this->assertEqual($loaded_source->fid, $result->fid, t("Returned file's id matches the source."));
-    $this->assertNotEqual($loaded_source->filepath, $source->filepath, t("Returned file path has changed from the original."));
+    $this->assertEqual($loaded_source->fid, $result->fid,"Returned file's id matches the source.");
+    $this->assertNotEqual($loaded_source->filepath, $source->filepath,"Returned file path has changed from the original.");
   }
 
   /**
@@ -1353,9 +1353,9 @@
     $result = file_move(clone $source, $target->filepath, FILE_EXISTS_REPLACE);
 
     // Look at the results.
-    $this->assertEqual($contents, file_get_contents($result->filepath), t('Contents of file were overwritten.'));
+    $this->assertEqual($contents, file_get_contents($result->filepath),'Contents of file were overwritten.');
     $this->assertFalse(file_exists($source->filepath));
-    $this->assertTrue($result, t('File moved sucessfully.'));
+    $this->assertTrue($result,'File moved sucessfully.');
 
     // Check that the correct hooks were called.
     $this->assertFileHooksCalled(array('move', 'update', 'delete', 'references', 'load'));
@@ -1381,8 +1381,8 @@
     // Copy the file over itself. Clone the object so we don't have to worry
     // about the function changing our reference copy.
     $result = file_move(clone $source, $source->filepath, FILE_EXISTS_REPLACE);
-    $this->assertFalse($result, t('File move failed.'));
-    $this->assertEqual($contents, file_get_contents($source->filepath), t('Contents of file were not altered.'));
+    $this->assertFalse($result,'File move failed.');
+    $this->assertEqual($contents, file_get_contents($source->filepath),'Contents of file were not altered.');
 
     // Check that no hooks were called while failing.
     $this->assertFileHooksCalled(array());
@@ -1407,9 +1407,9 @@
     $result = file_move(clone $source, $target->filepath, FILE_EXISTS_ERROR);
 
     // Check the return status and that the contents did not change.
-    $this->assertFalse($result, t('File move failed.'));
+    $this->assertFalse($result,'File move failed.');
     $this->assertTrue(file_exists($source->filepath));
-    $this->assertEqual($contents, file_get_contents($target->filepath), t('Contents of file were not altered.'));
+    $this->assertEqual($contents, file_get_contents($target->filepath),'Contents of file were not altered.');
 
     // Check that no hooks were called while failing.
     $this->assertFileHooksCalled(array());
@@ -1428,9 +1428,9 @@
 class FileCopyTest extends FileHookTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('File copying'),
-      'description' => t('Tests the file copy function.'),
-      'group' => t('File'),
+      'name' => 'File copying',
+      'description' => 'Tests the file copy function.',
+      'group' => 'File',
     );
   }
 
@@ -1447,16 +1447,16 @@
     $result = file_copy(clone $source, $desired_filepath, FILE_EXISTS_ERROR);
 
     // Check the return status and that the contents changed.
-    $this->assertTrue($result, t('File copied sucessfully.'));
-    $this->assertEqual($contents, file_get_contents($result->filepath), t('Contents of file were copied correctly.'));
+    $this->assertTrue($result,'File copied sucessfully.');
+    $this->assertEqual($contents, file_get_contents($result->filepath),'Contents of file were copied correctly.');
 
     // Check that the correct hooks were called.
     $this->assertFileHooksCalled(array('copy', 'insert'));
 
     $this->assertDifferentFile($source, $result);
-    $this->assertEqual($result->filepath, $desired_filepath, t('The copied file object has the desired filepath.'));
-    $this->assertTrue(file_exists($source->filepath), t('The original file still exists.'));
-    $this->assertTrue(file_exists($result->filepath), t('The copied file exists.'));
+    $this->assertEqual($result->filepath, $desired_filepath,'The copied file object has the desired filepath.');
+    $this->assertTrue(file_exists($source->filepath),'The original file still exists.');
+    $this->assertTrue(file_exists($result->filepath),'The copied file exists.');
 
     // Reload the file from the database and check that the changes were
     // actually saved.
@@ -1478,9 +1478,9 @@
     $result = file_copy(clone $source, $target->filepath, FILE_EXISTS_RENAME);
 
     // Check the return status and that the contents changed.
-    $this->assertTrue($result, t('File copied sucessfully.'));
-    $this->assertEqual($contents, file_get_contents($result->filepath), t('Contents of file were copied correctly.'));
-    $this->assertNotEqual($result->filepath, $source->filepath, t('Returned file path has changed from the original.'));
+    $this->assertTrue($result,'File copied sucessfully.');
+    $this->assertEqual($contents, file_get_contents($result->filepath),'Contents of file were copied correctly.');
+    $this->assertNotEqual($result->filepath, $source->filepath,'Returned file path has changed from the original.');
 
     // Check that the correct hooks were called.
     $this->assertFileHooksCalled(array('copy', 'insert'));
@@ -1518,8 +1518,8 @@
     $result = file_copy(clone $source, $target->filepath, FILE_EXISTS_REPLACE);
 
     // Check the return status and that the contents changed.
-    $this->assertTrue($result, t('File copied sucessfully.'));
-    $this->assertEqual($contents, file_get_contents($result->filepath), t('Contents of file were overwritten.'));
+    $this->assertTrue($result,'File copied sucessfully.');
+    $this->assertEqual($contents, file_get_contents($result->filepath),'Contents of file were overwritten.');
     $this->assertDifferentFile($source, $result);
 
     // Check that the correct hooks were called.
@@ -1556,8 +1556,8 @@
     $result = file_copy(clone $source, $target->filepath, FILE_EXISTS_ERROR);
 
     // Check the return status and that the contents were not changed.
-    $this->assertFalse($result, t('File copy failed.'));
-    $this->assertEqual($contents, file_get_contents($target->filepath), t('Contents of file were not altered.'));
+    $this->assertFalse($result,'File copy failed.');
+    $this->assertEqual($contents, file_get_contents($target->filepath),'Contents of file were not altered.');
 
     // Check that the correct hooks were called.
     $this->assertFileHooksCalled(array());
@@ -1574,9 +1574,9 @@
 class FileLoadTest extends FileHookTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('File loading'),
-      'description' => t('Tests the file_load() function.'),
-      'group' => t('File'),
+      'name' => 'File loading',
+      'description' => 'Tests the file_load() function.',
+      'group' => 'File',
     );
   }
 
@@ -1584,7 +1584,7 @@
    * Try to load a non-existent file by fid.
    */
   function testLoadMissingFid() {
-    $this->assertFalse(file_load(-1), t("Try to load an invalid fid fails."));
+    $this->assertFalse(file_load(-1),"Try to load an invalid fid fails.");
     $this->assertFileHooksCalled(array());
   }
 
@@ -1592,7 +1592,7 @@
    * Try to load a non-existent file by filepath.
    */
   function testLoadMissingFilepath() {
-    $this->assertFalse(reset(file_load_multiple(array(), array('filepath' => 'misc/druplicon.png'))), t("Try to load a file that doesn't exist in the database fails."));
+    $this->assertFalse(reset(file_load_multiple(array(), array('filepath' => 'misc/druplicon.png'))),"Try to load a file that doesn't exist in the database fails.");
     $this->assertFileHooksCalled(array());
   }
 
@@ -1600,7 +1600,7 @@
    * Try to load a non-existent file by status.
    */
   function testLoadInvalidStatus() {
-    $this->assertFalse(reset(file_load_multiple(array(), array('status' => -99))), t("Trying to load a file with an invalid status fails."));
+    $this->assertFalse(reset(file_load_multiple(array(), array('status' => -99))),"Trying to load a file with an invalid status fails.");
     $this->assertFileHooksCalled(array());
   }
 
@@ -1621,13 +1621,13 @@
 
     $by_fid_file = file_load($file->fid);
     $this->assertFileHookCalled('load');
-    $this->assertTrue(is_object($by_fid_file), t('file_load() returned an object.'));
-    $this->assertEqual($by_fid_file->fid, $file->fid, t("Loading by fid got the same fid."), 'File');
-    $this->assertEqual($by_fid_file->filepath, $file->filepath, t("Loading by fid got the correct filepath."), 'File');
-    $this->assertEqual($by_fid_file->filename, $file->filename, t("Loading by fid got the correct filename."), 'File');
-    $this->assertEqual($by_fid_file->filemime, $file->filemime, t("Loading by fid got the correct MIME type."), 'File');
-    $this->assertEqual($by_fid_file->status, $file->status, t("Loading by fid got the correct status."), 'File');
-    $this->assertTrue($by_fid_file->file_test['loaded'], t('file_test_file_load() was able to modify the file during load.'));
+    $this->assertTrue(is_object($by_fid_file),'file_load() returned an object.');
+    $this->assertEqual($by_fid_file->fid, $file->fid,"Loading by fid got the same fid.", 'File');
+    $this->assertEqual($by_fid_file->filepath, $file->filepath,"Loading by fid got the correct filepath.", 'File');
+    $this->assertEqual($by_fid_file->filename, $file->filename,"Loading by fid got the correct filename.", 'File');
+    $this->assertEqual($by_fid_file->filemime, $file->filemime,"Loading by fid got the correct MIME type.", 'File');
+    $this->assertEqual($by_fid_file->status, $file->status,"Loading by fid got the correct status.", 'File');
+    $this->assertTrue($by_fid_file->file_test['loaded'],'file_test_file_load() was able to modify the file during load.');
   }
 
   /**
@@ -1649,19 +1649,19 @@
     file_test_reset();
     $by_path_files = file_load_multiple(array(), array('filepath' => $file->filepath));
     $this->assertFileHookCalled('load');
-    $this->assertEqual(1, count($by_path_files), t('file_load_multiple() returned an array of the correct size.'));
+    $this->assertEqual(1, count($by_path_files),'file_load_multiple() returned an array of the correct size.');
     $by_path_file = reset($by_path_files);
-    $this->assertTrue($by_path_file->file_test['loaded'], t('file_test_file_load() was able to modify the file during load.'));
-    $this->assertEqual($by_path_file->fid, $file->fid, t("Loading by filepath got the correct fid."), 'File');
+    $this->assertTrue($by_path_file->file_test['loaded'],'file_test_file_load() was able to modify the file during load.');
+    $this->assertEqual($by_path_file->fid, $file->fid,"Loading by filepath got the correct fid.", 'File');
 
     // Load by fid.
     file_test_reset();
     $by_fid_files = file_load_multiple(array($file->fid), array());
     $this->assertFileHookCalled('load');
-    $this->assertEqual(1, count($by_fid_files), t('file_load_multiple() returned an array of the correct size.'));
+    $this->assertEqual(1, count($by_fid_files),'file_load_multiple() returned an array of the correct size.');
     $by_fid_file = reset($by_fid_files);
-    $this->assertTrue($by_fid_file->file_test['loaded'], t('file_test_file_load() was able to modify the file during load.'));
-    $this->assertEqual($by_fid_file->filepath, $file->filepath, t("Loading by fid got the correct filepath."), 'File');
+    $this->assertTrue($by_fid_file->file_test['loaded'],'file_test_file_load() was able to modify the file during load.');
+    $this->assertEqual($by_fid_file->filepath, $file->filepath,"Loading by fid got the correct filepath.", 'File');
   }
 }
 
@@ -1671,9 +1671,9 @@
 class FileSaveTest extends FileHookTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('File saving'),
-      'description' => t('Tests the file_save() function.'),
-      'group' => t('File'),
+      'name' => 'File saving',
+      'description' => 'Tests the file_save() function.',
+      'group' => 'File',
     );
   }
 
@@ -1695,13 +1695,13 @@
     // Check that the correct hooks were called.
     $this->assertFileHooksCalled(array('insert'));
 
-    $this->assertNotNull($saved_file, t("Saving the file should give us back a file object."), 'File');
-    $this->assertTrue($saved_file->fid > 0, t("A new file ID is set when saving a new file to the database."), 'File');
+    $this->assertNotNull($saved_file,"Saving the file should give us back a file object.", 'File');
+    $this->assertTrue($saved_file->fid > 0,"A new file ID is set when saving a new file to the database.", 'File');
     $loaded_file = db_query('SELECT * FROM {files} f WHERE f.fid = :fid', array(':fid' => $saved_file->fid))->fetch(PDO::FETCH_OBJ);
-    $this->assertNotNull($loaded_file, t("Record exists in the database."));
-    $this->assertEqual($loaded_file->status, $file->status, t("Status was saved correctly."));
-    $this->assertEqual($saved_file->filesize, filesize($file->filepath), t("File size was set correctly."), 'File');
-    $this->assertTrue($saved_file->timestamp > 1, t("File size was set correctly."), 'File');
+    $this->assertNotNull($loaded_file,"Record exists in the database.");
+    $this->assertEqual($loaded_file->status, $file->status,"Status was saved correctly.");
+    $this->assertEqual($saved_file->filesize, filesize($file->filepath),"File size was set correctly.", 'File');
+    $this->assertTrue($saved_file->timestamp > 1,"File size was set correctly.", 'File');
 
 
     // Resave the file, updating the existing record.
@@ -1712,11 +1712,11 @@
     // Check that the correct hooks were called.
     $this->assertFileHooksCalled(array('update'));
 
-    $this->assertEqual($resaved_file->fid, $saved_file->fid, t("The file ID of an existing file is not changed when updating the database."), 'File');
-    $this->assertTrue($resaved_file->timestamp >= $saved_file->timestamp, t("Timestamp didn't go backwards."), 'File');
+    $this->assertEqual($resaved_file->fid, $saved_file->fid,"The file ID of an existing file is not changed when updating the database.", 'File');
+    $this->assertTrue($resaved_file->timestamp >= $saved_file->timestamp,"Timestamp didn't go backwards.", 'File');
     $loaded_file = db_query('SELECT * FROM {files} f WHERE f.fid = :fid', array(':fid' => $saved_file->fid))->fetch(PDO::FETCH_OBJ);
-    $this->assertNotNull($loaded_file, t("Record still exists in the database."), 'File');
-    $this->assertEqual($loaded_file->status, $saved_file->status, t("Status was saved correctly."));
+    $this->assertNotNull($loaded_file,"Record still exists in the database.", 'File');
+    $this->assertEqual($loaded_file->status, $saved_file->status,"Status was saved correctly.");
   }
 }
 
@@ -1727,9 +1727,9 @@
 class FileValidateTest extends FileHookTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('File validate'),
-      'description' => t('Tests the file_validate() function.'),
-      'group' => t('File'),
+      'name' => 'File validate',
+      'description' => 'Tests the file_validate() function.',
+      'group' => 'File',
     );
   }
 
@@ -1740,7 +1740,7 @@
     $file = $this->createFile();
 
     // Empty validators.
-    $this->assertEqual(file_validate($file, array()), array(), t('Validating an empty array works succesfully.'));
+    $this->assertEqual(file_validate($file, array()), array(),'Validating an empty array works succesfully.');
     $this->assertFileHooksCalled(array('validate'));
 
     // Use the file_test.module's test validator to ensure that passing tests
@@ -1748,14 +1748,14 @@
     file_test_reset();
     file_test_set_return('validate', array());
     $passing = array('file_test_validator' => array(array()));
-    $this->assertEqual(file_validate($file, $passing), array(), t('Validating passes.'));
+    $this->assertEqual(file_validate($file, $passing), array(),'Validating passes.');
     $this->assertFileHooksCalled(array('validate'));
 
     // Now test for failures in validators passed in and by hook_validate.
     file_test_reset();
     file_test_set_return('validate', array('Epic fail'));
     $failing = array('file_test_validator' => array(array('Failed', 'Badly')));
-    $this->assertEqual(file_validate($file, $failing), array('Failed', 'Badly', 'Epic fail'), t('Validating returns errors.'));
+    $this->assertEqual(file_validate($file, $failing), array('Failed', 'Badly', 'Epic fail'),'Validating returns errors.');
     $this->assertFileHooksCalled(array('validate'));
   }
 }
@@ -1766,9 +1766,9 @@
 class FileSaveDataTest extends FileHookTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('File save data'),
-      'description' => t('Tests the file save data function.'),
-      'group' => t('File'),
+      'name' => 'File save data',
+      'description' => 'Tests the file save data function.',
+      'group' => 'File',
     );
   }
 
@@ -1779,13 +1779,13 @@
     $contents = $this->randomName(8);
 
     $result = file_save_data($contents);
-    $this->assertTrue($result, t('Unnamed file saved correctly.'));
+    $this->assertTrue($result,'Unnamed file saved correctly.');
 
-    $this->assertEqual(file_directory_path(), dirname($result->filepath), t("File was placed in Drupal's files directory."));
-    $this->assertEqual($result->filename, basename($result->filepath), t("Filename was set to the file's basename."));
-    $this->assertEqual($contents, file_get_contents($result->filepath), t('Contents of the file are correct.'));
-    $this->assertEqual($result->filemime, 'application/octet-stream', t('A MIME type was set.'));
-    $this->assertEqual($result->status, FILE_STATUS_PERMANENT, t("The file's status was set to permanent."));
+    $this->assertEqual(file_directory_path(), dirname($result->filepath),"File was placed in Drupal's files directory.");
+    $this->assertEqual($result->filename, basename($result->filepath),"Filename was set to the file's basename.");
+    $this->assertEqual($contents, file_get_contents($result->filepath),'Contents of the file are correct.');
+    $this->assertEqual($result->filemime, 'application/octet-stream','A MIME type was set.');
+    $this->assertEqual($result->status, FILE_STATUS_PERMANENT,"The file's status was set to permanent.");
 
     // Check that the correct hooks were called.
     $this->assertFileHooksCalled(array('insert'));
@@ -1801,13 +1801,13 @@
     $contents = $this->randomName(8);
 
     $result = file_save_data($contents, 'asdf.txt');
-    $this->assertTrue($result, t('Unnamed file saved correctly.'));
+    $this->assertTrue($result,'Unnamed file saved correctly.');
 
-    $this->assertEqual(file_directory_path(), dirname($result->filepath), t("File was placed in Drupal's files directory."));
-    $this->assertEqual('asdf.txt', basename($result->filepath), t('File was named correctly.'));
-    $this->assertEqual($contents, file_get_contents($result->filepath), t('Contents of the file are correct.'));
-    $this->assertEqual($result->filemime, 'text/plain', t('A MIME type was set.'));
-    $this->assertEqual($result->status, FILE_STATUS_PERMANENT, t("The file's status was set to permanent."));
+    $this->assertEqual(file_directory_path(), dirname($result->filepath),"File was placed in Drupal's files directory.");
+    $this->assertEqual('asdf.txt', basename($result->filepath),'File was named correctly.');
+    $this->assertEqual($contents, file_get_contents($result->filepath),'Contents of the file are correct.');
+    $this->assertEqual($result->filemime, 'text/plain','A MIME type was set.');
+    $this->assertEqual($result->status, FILE_STATUS_PERMANENT,"The file's status was set to permanent.");
 
     // Check that the correct hooks were called.
     $this->assertFileHooksCalled(array('insert'));
@@ -1825,13 +1825,13 @@
     $contents = $this->randomName(8);
 
     $result = file_save_data($contents, $existing->filepath, FILE_EXISTS_RENAME);
-    $this->assertTrue($result, t("File saved sucessfully."));
+    $this->assertTrue($result,"File saved sucessfully.");
 
-    $this->assertEqual(file_directory_path(), dirname($result->filepath), t("File was placed in Drupal's files directory."));
-    $this->assertEqual($result->filename, $existing->filename, t("Filename was set to the basename of the source, rather than that of the renamed file."));
-    $this->assertEqual($contents, file_get_contents($result->filepath), t("Contents of the file are correct."));
-    $this->assertEqual($result->filemime, 'application/octet-stream', t("A MIME type was set."));
-    $this->assertEqual($result->status, FILE_STATUS_PERMANENT, t("The file's status was set to permanent."));
+    $this->assertEqual(file_directory_path(), dirname($result->filepath),"File was placed in Drupal's files directory.");
+    $this->assertEqual($result->filename, $existing->filename,"Filename was set to the basename of the source, rather than that of the renamed file.");
+    $this->assertEqual($contents, file_get_contents($result->filepath),"Contents of the file are correct.");
+    $this->assertEqual($result->filemime, 'application/octet-stream',"A MIME type was set.");
+    $this->assertEqual($result->status, FILE_STATUS_PERMANENT,"The file's status was set to permanent.");
 
     // Check that the correct hooks were called.
     $this->assertFileHooksCalled(array('insert'));
@@ -1853,13 +1853,13 @@
     $contents = $this->randomName(8);
 
     $result = file_save_data($contents, $existing->filepath, FILE_EXISTS_REPLACE);
-    $this->assertTrue($result, t('File saved sucessfully.'));
+    $this->assertTrue($result,'File saved sucessfully.');
 
-    $this->assertEqual(file_directory_path(), dirname($result->filepath), t("File was placed in Drupal's files directory."));
-    $this->assertEqual($result->filename, $existing->filename, t('Filename was set to the basename of the existing file, rather than preserving the original name.'));
-    $this->assertEqual($contents, file_get_contents($result->filepath), t('Contents of the file are correct.'));
-    $this->assertEqual($result->filemime, 'application/octet-stream', t('A MIME type was set.'));
-    $this->assertEqual($result->status, FILE_STATUS_PERMANENT, t("The file's status was set to permanent."));
+    $this->assertEqual(file_directory_path(), dirname($result->filepath),"File was placed in Drupal's files directory.");
+    $this->assertEqual($result->filename, $existing->filename,'Filename was set to the basename of the existing file, rather than preserving the original name.');
+    $this->assertEqual($contents, file_get_contents($result->filepath),'Contents of the file are correct.');
+    $this->assertEqual($result->filemime, 'application/octet-stream','A MIME type was set.');
+    $this->assertEqual($result->status, FILE_STATUS_PERMANENT,"The file's status was set to permanent.");
 
     // Check that the correct hooks were called.
     $this->assertFileHooksCalled(array('load', 'update'));
@@ -1880,8 +1880,8 @@
 
     // Check the overwrite error.
     $result = file_save_data('asdf', $existing->filepath, FILE_EXISTS_ERROR);
-    $this->assertFalse($result, t('Overwriting a file fails when FILE_EXISTS_ERROR is specified.'));
-    $this->assertEqual($contents, file_get_contents($existing->filepath), t('Contents of existing file were unchanged.'));
+    $this->assertFalse($result,'Overwriting a file fails when FILE_EXISTS_ERROR is specified.');
+    $this->assertEqual($contents, file_get_contents($existing->filepath),'Contents of existing file were unchanged.');
 
     // Check that no hooks were called while failing.
     $this->assertFileHooksCalled(array());
@@ -1897,9 +1897,9 @@
 class FileDownloadTest extends FileTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('File download'),
-      'description' => t('Tests for file download/transfer functions.'),
-      'group' => t('File'),
+      'name' => 'File download',
+      'description' => 'Tests for file download/transfer functions.',
+      'group' => 'File',
     );
   }
 
@@ -1922,18 +1922,18 @@
     file_test_set_return('download', array('x-foo' => 'Bar'));
     $this->drupalHead($url);
     $headers = $this->drupalGetHeaders();
-    $this->assertEqual($headers['x-foo'] , 'Bar', t('Found header set by file_test module on private download.'));
-    $this->assertResponse(200, t('Correctly allowed access to a file when file_test provides headers.'));
+    $this->assertEqual($headers['x-foo'] , 'Bar','Found header set by file_test module on private download.');
+    $this->assertResponse(200,'Correctly allowed access to a file when file_test provides headers.');
 
     // Deny access to all downloads via a -1 header.
     file_test_set_return('download', -1);
     $this->drupalHead($url);
-    $this->assertResponse(403, t('Correctly denied access to a file when file_test sets the header to -1.'));
+    $this->assertResponse(403,'Correctly denied access to a file when file_test sets the header to -1.');
 
     // Try non-existent file.
     $url = file_create_url($this->randomName());
     $this->drupalHead($url);
-    $this->assertResponse(404, t('Correctly returned 404 response for a non-existent file.'));
+    $this->assertResponse(404,'Correctly returned 404 response for a non-existent file.');
   }
 }
 
@@ -1943,9 +1943,9 @@
 class FileNameMungingTest extends FileTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('File naming'),
-      'description' => t('Test filename munging and unmunging.'),
-      'group' => t('File'),
+      'name' => 'File naming',
+      'description' => 'Test filename munging and unmunging.',
+      'group' => 'File',
     );
   }
 
@@ -1963,7 +1963,7 @@
     variable_set('allow_insecure_uploads', 0);
     $munged_name = file_munge_filename($this->name, '', TRUE);
     $messages = drupal_get_messages();
-    $this->assertTrue(in_array(t('For security reasons, your upload has been renamed to %filename.', array('%filename' => $munged_name)), $messages['status']), t('Alert properly set when a file is renamed.'));
+    $this->assertTrue(in_array(t('For security reasons, your upload has been renamed to %filename.', array('%filename' => $munged_name)), $messages['status']),'Alert properly set when a file is renamed.');
     $this->assertNotEqual($munged_name, $this->name, t('The new filename (%munged) has been modified from the original (%original)', array('%munged' => $munged_name, '%original' => $this->name)));
   }
 
@@ -2004,9 +2004,9 @@
 class FileMimeTypeTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('File mimetypes'),
-      'description' => t('Test filename mimetype detection.'),
-      'group' => t('File'),
+      'name' => 'File mimetypes',
+      'description' => 'Test filename mimetype detection.',
+      'group' => 'File',
     );
   }
 
Index: modules/simpletest/tests/schema.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/schema.test,v
retrieving revision 1.7
diff -u -r1.7 schema.test
--- modules/simpletest/tests/schema.test	30 May 2009 11:17:32 -0000	1.7
+++ modules/simpletest/tests/schema.test	9 Jul 2009 02:46:29 -0000
@@ -12,9 +12,9 @@
 class SchemaTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Schema API'),
-      'description' => t('Tests table creation and modification via the schema API.'),
-      'group' => t('Database'),
+      'name' => 'Schema API',
+      'description' => 'Tests table creation and modification via the schema API.',
+      'group' => 'Database',
     );
   }
 
@@ -41,7 +41,7 @@
     db_create_table($ret, 'test_table', $table_specification);
 
     // Assert that the table exists.
-    $this->assertTrue(db_table_exists('test_table'), t('The table exists.'));
+    $this->assertTrue(db_table_exists('test_table'),'The table exists.');
 
     // Assert that the table comment has been set.
     $this->checkSchemaComment($table_specification['description'], 'test_table');
@@ -50,32 +50,32 @@
     $this->checkSchemaComment($table_specification['fields']['test_field']['description'], 'test_table', 'test_field');
 
     // An insert without a value for the column 'test_table' should fail.
-    $this->assertFalse($this->tryInsert(), t('Insert without a default failed.'));
+    $this->assertFalse($this->tryInsert(),'Insert without a default failed.');
 
     // Add a default value to the column.
     db_field_set_default($ret, 'test_table', 'test_field', 0);
     // The insert should now succeed.
-    $this->assertTrue($this->tryInsert(), t('Insert with a default succeeded.'));
+    $this->assertTrue($this->tryInsert(),'Insert with a default succeeded.');
 
     // Remove the default.
     db_field_set_no_default($ret, 'test_table', 'test_field');
     // The insert should fail again.
-    $this->assertFalse($this->tryInsert(), t('Insert without a default failed.'));
+    $this->assertFalse($this->tryInsert(),'Insert without a default failed.');
 
     // Rename the table.
     db_rename_table($ret, 'test_table', 'test_table2');
     // We need the default so that we can insert after the rename.
     db_field_set_default($ret, 'test_table2', 'test_field', 0);
-    $this->assertFalse($this->tryInsert(), t('Insert into the old table failed.'));
-    $this->assertTrue($this->tryInsert('test_table2'), t('Insert into the new table succeeded.'));
+    $this->assertFalse($this->tryInsert(),'Insert into the old table failed.');
+    $this->assertTrue($this->tryInsert('test_table2'),'Insert into the new table succeeded.');
 
     // We should have successfully inserted exactly two rows.
     $count = db_query('SELECT COUNT(*) FROM {test_table2}')->fetchField();
-    $this->assertEqual($count, 2, t('Two fields were successfully inserted.'));
+    $this->assertEqual($count, 2,'Two fields were successfully inserted.');
 
     // Try to drop the table.
     db_drop_table($ret, 'test_table2');
-    $this->assertFalse(db_table_exists('test_table2'), t('The dropped table does not exist.'));
+    $this->assertFalse(db_table_exists('test_table2'),'The dropped table does not exist.');
 
     // Recreate the table.
     db_create_table($ret, 'test_table', $table_specification);
@@ -91,14 +91,14 @@
     // Assert that the column comment has been set.
     $this->checkSchemaComment('Changed column description.', 'test_table', 'test_serial');
 
-    $this->assertTrue($this->tryInsert(), t('Insert with a serial succeeded.'));
+    $this->assertTrue($this->tryInsert(),'Insert with a serial succeeded.');
     $max1 = db_query('SELECT MAX(test_serial) FROM {test_table}')->fetchField();
-    $this->assertTrue($this->tryInsert(), t('Insert with a serial succeeded.'));
+    $this->assertTrue($this->tryInsert(),'Insert with a serial succeeded.');
     $max2 = db_query('SELECT MAX(test_serial) FROM {test_table}')->fetchField();
-    $this->assertTrue($max2 > $max1, t('The serial is monotone.'));
+    $this->assertTrue($max2 > $max1,'The serial is monotone.');
 
     $count = db_query('SELECT COUNT(*) FROM {test_table}')->fetchField();
-    $this->assertEqual($count, 2, t('There were two rows.'));
+    $this->assertEqual($count, 2,'There were two rows.');
   }
 
   function tryInsert($table = 'test_table') {
@@ -126,7 +126,7 @@
   function checkSchemaComment($description, $table, $column = NULL) {
     if (method_exists(Database::getConnection()->schema(), 'getComment')) {
       $comment = Database::getConnection()->schema()->getComment($table, $column);
-      $this->assertEqual($comment, $description, t('The comment matches the schema description.'));
+      $this->assertEqual($comment, $description,'The comment matches the schema description.');
     }
   }
 }
Index: modules/simpletest/tests/error.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/error.test,v
retrieving revision 1.3
diff -u -r1.3 error.test
--- modules/simpletest/tests/error.test	10 Jun 2009 20:00:10 -0000	1.3
+++ modules/simpletest/tests/error.test	9 Jul 2009 02:46:29 -0000
@@ -7,9 +7,9 @@
 class DrupalErrorHandlerUnitTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Drupal error handlers'),
-      'description' => t('Performs tests on the Drupal error and exception handler.'),
-      'group' => t('System'),
+      'name' => 'Drupal error handlers',
+      'description' => 'Performs tests on the Drupal error and exception handler.',
+      'group' => 'System',
     );
   }
 
@@ -46,7 +46,7 @@
     // Set error reporting to collect notices.
     variable_set('error_level', ERROR_REPORTING_DISPLAY_ALL);
     $this->drupalGet('error-test/generate-warnings');
-    $this->assertResponse(200, t('Received expected HTTP status code.'));
+    $this->assertResponse(200,'Received expected HTTP status code.');
     $this->assertErrorMessage($error_notice);
     $this->assertErrorMessage($error_warning);
     $this->assertErrorMessage($error_user_notice);
@@ -54,7 +54,7 @@
     // Set error reporting to not collect notices.
     variable_set('error_level', ERROR_REPORTING_DISPLAY_SOME);
     $this->drupalGet('error-test/generate-warnings');
-    $this->assertResponse(200, t('Received expected HTTP status code.'));
+    $this->assertResponse(200,'Received expected HTTP status code.');
     $this->assertNoErrorMessage($error_notice);
     $this->assertErrorMessage($error_warning);
     $this->assertErrorMessage($error_user_notice);
@@ -62,7 +62,7 @@
     // Set error reporting to not show any errors.
     variable_set('error_level', ERROR_REPORTING_HIDE);
     $this->drupalGet('error-test/generate-warnings');
-    $this->assertResponse(200, t('Received expected HTTP status code.'));
+    $this->assertResponse(200,'Received expected HTTP status code.');
     $this->assertNoErrorMessage($error_notice);
     $this->assertNoErrorMessage($error_warning);
     $this->assertNoErrorMessage($error_user_notice);
@@ -88,11 +88,11 @@
     );
 
     $this->drupalGet('error-test/trigger-exception');
-    $this->assertTrue(strpos($this->drupalGetHeader(':status'), '500 Service unavailable (with message)'), t('Received expected HTTP status line.'));
+    $this->assertTrue(strpos($this->drupalGetHeader(':status'), '500 Service unavailable (with message)'),'Received expected HTTP status line.');
     $this->assertErrorMessage($error_exception);
 
     $this->drupalGet('error-test/trigger-pdo-exception');
-    $this->assertTrue(strpos($this->drupalGetHeader(':status'), '500 Service unavailable (with message)'), t('Received expected HTTP status line.'));
+    $this->assertTrue(strpos($this->drupalGetHeader(':status'), '500 Service unavailable (with message)'),'Received expected HTTP status line.');
     // We cannot use assertErrorMessage() since the extact error reported
     // varies from database to database. Check that the SQL string is displayed.
     $this->assertText($error_pdo_exception['%type'], t('Found %type in error page.', $error_pdo_exception));
Index: modules/simpletest/tests/module.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/module.test,v
retrieving revision 1.7
diff -u -r1.7 module.test
--- modules/simpletest/tests/module.test	1 Jul 2009 08:39:55 -0000	1.7
+++ modules/simpletest/tests/module.test	9 Jul 2009 02:46:29 -0000
@@ -12,9 +12,9 @@
 class ModuleUnitTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Module API'),
-      'description' => t('Test low-level module functions.'),
-      'group' => t('Module'),
+      'name' => 'Module API',
+      'description' => 'Test low-level module functions.',
+      'group' => 'Module',
     );
   }
 
@@ -29,13 +29,13 @@
     // to match, since all default profile modules have a weight equal to 0
     // (except for block.module, which has a lower weight but comes first in
     // the alphabet anyway).
-    $this->assertModuleList($module_list, t('Default profile'));
+    $this->assertModuleList($module_list,'Default profile');
 
     // Try to install a new module.
     drupal_install_modules(array('contact'));
     $module_list[] = 'contact';
     sort($module_list);
-    $this->assertModuleList($module_list, t('After adding a module'));
+    $this->assertModuleList($module_list,'After adding a module');
 
     // Try to mess with the module weights.
     db_update('system')
@@ -48,7 +48,7 @@
     // Move contact to the end of the array.
     unset($module_list[array_search('contact', $module_list)]);
     $module_list[] = 'contact';
-    $this->assertModuleList($module_list, t('After changing weights'));
+    $this->assertModuleList($module_list,'After changing weights');
 
     // Test the fixed list feature.
     $fixed_list = array(
@@ -57,11 +57,11 @@
     );
     module_list(FALSE, FALSE, $fixed_list);
     $new_module_list = array_combine(array_keys($fixed_list), array_keys($fixed_list));
-    $this->assertModuleList($new_module_list, t('When using a fixed list'));
+    $this->assertModuleList($new_module_list,'When using a fixed list');
 
     // Reset the module list.
     module_list(TRUE);
-    $this->assertModuleList($module_list, t('After reset'));
+    $this->assertModuleList($module_list,'After reset');
   }
 
   /**
@@ -84,9 +84,9 @@
 class ModuleUninstallTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Module uninstallation'),
-      'description' => t('Checks module uninstallation'),
-      'group' => t('Module'),
+      'name' => 'Module uninstallation',
+      'description' => 'Checks module uninstallation',
+      'group' => 'Module',
     );
   }
 
@@ -104,6 +104,6 @@
 
     // 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.');
   }
 }
Index: modules/simpletest/tests/cache.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/cache.test,v
retrieving revision 1.8
diff -u -r1.8 cache.test
--- modules/simpletest/tests/cache.test	28 Jun 2009 01:00:42 -0000	1.8
+++ modules/simpletest/tests/cache.test	9 Jul 2009 02:46:29 -0000
@@ -104,9 +104,9 @@
 class CacheSavingCase extends CacheTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Cache saving test'),
-      'description' => t('Check our variables are saved and restored the right way.'),
-      'group' => t('Cache')
+      'name' => 'Cache saving test',
+      'description' => 'Check our variables are saved and restored the right way.',
+      'group' => 'Cache'
     );
   }
 
@@ -149,7 +149,7 @@
 
     cache_set('test_object', $test_object, 'cache');
     $cache = cache_get('test_object', 'cache');
-    $this->assertTrue(isset($cache->data) && $cache->data == $test_object, t('Object is saved and restored properly.'));
+    $this->assertTrue(isset($cache->data) && $cache->data == $test_object,'Object is saved and restored properly.');
   }
 
   /*
@@ -169,9 +169,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Fetching multiple cache items'),
-      'description' => t('Confirm that multiple records are fetched correctly.'),
-      'group' => t('Cache'),
+      'name' => 'Fetching multiple cache items',
+      'description' => 'Confirm that multiple records are fetched correctly.',
+      'group' => 'Cache',
     );
   }
 
@@ -188,14 +188,14 @@
     $item2 = $this->randomName(10);
     cache_set('item1', $item1, $this->default_bin);
     cache_set('item2', $item2, $this->default_bin);
-    $this->assertTrue($this->checkCacheExists('item1', $item1), t('Item 1 is cached.'));
-    $this->assertTrue($this->checkCacheExists('item2', $item2), t('Item 2 is cached.'));
+    $this->assertTrue($this->checkCacheExists('item1', $item1),'Item 1 is cached.');
+    $this->assertTrue($this->checkCacheExists('item2', $item2),'Item 2 is cached.');
 
     // Fetch both records from the database with cache_get_multiple().
     $item_ids = array('item1', 'item2');
     $items = cache_get_multiple($item_ids, $this->default_bin);
-    $this->assertEqual($items['item1']->data, $item1, t('Item was returned from cache successfully.'));
-    $this->assertEqual($items['item2']->data, $item2, t('Item was returned from cache successfully.'));
+    $this->assertEqual($items['item1']->data, $item1,'Item was returned from cache successfully.');
+    $this->assertEqual($items['item2']->data, $item2,'Item was returned from cache successfully.');
 
     // Remove one item from the cache.
     cache_clear_all('item2', $this->default_bin);
@@ -203,9 +203,9 @@
     // Confirm that only one item is returned by cache_get_multiple().
     $item_ids = array('item1', 'item2');
     $items = cache_get_multiple($item_ids, $this->default_bin);
-    $this->assertEqual($items['item1']->data, $item1, t('Item was returned from cache successfully.'));
-    $this->assertFalse(isset($items['item2']), t('Item was not returned from the cache.'));
-    $this->assertTrue(count($items) == 1, t('Only valid cache entries returned.'));
+    $this->assertEqual($items['item1']->data, $item1,'Item was returned from cache successfully.');
+    $this->assertFalse(isset($items['item2']),'Item was not returned from the cache.');
+    $this->assertTrue(count($items) == 1,'Only valid cache entries returned.');
   }
 }
 
@@ -215,9 +215,9 @@
 class CacheClearCase extends CacheTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Cache clear test'),
-      'description' => t('Check our clearing is done the proper way.'),
-      'group' => t('Cache')
+      'name' => 'Cache clear test',
+      'description' => 'Check our clearing is done the proper way.',
+      'group' => 'Cache'
     );
   }
 
Index: modules/simpletest/tests/theme.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/theme.test,v
retrieving revision 1.3
diff -u -r1.3 theme.test
--- modules/simpletest/tests/theme.test	9 Jun 2009 21:53:26 -0000	1.3
+++ modules/simpletest/tests/theme.test	9 Jul 2009 02:46:29 -0000
@@ -12,9 +12,9 @@
 class TemplateUnitTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Theme API'),
-      'description' => t('Test low-level theme template functions.'),
-      'group' => t('Theme'),
+      'name' => 'Theme API',
+      'description' => 'Test low-level theme template functions.',
+      'group' => 'Theme',
     );
   }
 
@@ -27,28 +27,28 @@
     variable_set('site_frontpage', 'nobody-home');
     $args = array('node', '1', 'edit');
     $suggestions = template_page_suggestions($args);
-    $this->assertEqual($suggestions, array('page-node', 'page-node-1', 'page-node-edit'), t('Found expected node edit page template suggestions'));
+    $this->assertEqual($suggestions, array('page-node', 'page-node-1', 'page-node-edit'),'Found expected node edit page template suggestions');
     // Check attack vectors.
     $args = array('node', '\\1');
     $suggestions = template_page_suggestions($args);
-    $this->assertEqual($suggestions, array('page-node', 'page-node-1'), t('Removed invalid \\ from template suggestions'));
+    $this->assertEqual($suggestions, array('page-node', 'page-node-1'),'Removed invalid \\ from template suggestions');
     $args = array('node', '1/');
     $suggestions = template_page_suggestions($args);
-    $this->assertEqual($suggestions, array('page-node', 'page-node-1'), t('Removed invalid / from template suggestions'));
+    $this->assertEqual($suggestions, array('page-node', 'page-node-1'),'Removed invalid / from template suggestions');
     $args = array('node', "1\0");
     $suggestions = template_page_suggestions($args);
-    $this->assertEqual($suggestions, array('page-node', 'page-node-1'), t('Removed invalid \\0 from template suggestions'));
+    $this->assertEqual($suggestions, array('page-node', 'page-node-1'),'Removed invalid \\0 from template suggestions');
     // Tests for drupal_discover_template()
     $suggestions = array('page');
-    $this->assertEqual(drupal_discover_template(array('themes/garland'), $suggestions), 'themes/garland/page.tpl.php', t('Safe template discovered'));
+    $this->assertEqual(drupal_discover_template(array('themes/garland'), $suggestions), 'themes/garland/page.tpl.php','Safe template discovered');
     $suggestions = array('page');
-    $this->assertEqual(drupal_discover_template(array('themes/garland'), $suggestions, '\\.tpl.php'), 'themes/garland/page.tpl.php', t('Unsafe extension fixed'));
+    $this->assertEqual(drupal_discover_template(array('themes/garland'), $suggestions, '\\.tpl.php'), 'themes/garland/page.tpl.php','Unsafe extension fixed');
     $suggestions = array('page\\');
-    $this->assertEqual(drupal_discover_template(array('themes/garland'), $suggestions), 'themes/garland/page.tpl.php', t('Unsafe template suggestion fixed'));
+    $this->assertEqual(drupal_discover_template(array('themes/garland'), $suggestions), 'themes/garland/page.tpl.php','Unsafe template suggestion fixed');
     $suggestions = array('page/');
-    $this->assertEqual(drupal_discover_template(array('themes/garland'), $suggestions), 'themes/garland/page.tpl.php', t('Unsafe template suggestion fixed'));
+    $this->assertEqual(drupal_discover_template(array('themes/garland'), $suggestions), 'themes/garland/page.tpl.php','Unsafe template suggestion fixed');
     $suggestions = array("page\0");
-    $this->assertEqual(drupal_discover_template(array('themes/garland'), $suggestions), 'themes/garland/page.tpl.php', t('Unsafe template suggestion fixed'));
+    $this->assertEqual(drupal_discover_template(array('themes/garland'), $suggestions), 'themes/garland/page.tpl.php','Unsafe template suggestion fixed');
   }
 }
 
@@ -58,9 +58,9 @@
 class ThemeTableUnitTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Theme Table'),
-      'description' => t('Tests built-in theme functions.'),
-      'group' => t('Theme'),
+      'name' => 'Theme Table',
+      'description' => 'Tests built-in theme functions.',
+      'group' => 'Theme',
     );
   }
   
@@ -72,8 +72,8 @@
     $rows = array(array(1,2,3), array(4,5,6), array(7,8,9));
     $this->content = theme('table', $header, $rows);
     $js = drupal_add_js();
-    $this->assertTrue(isset($js['misc/tableheader.js']), t('tableheader.js was included when $sticky = TRUE.'));
-    $this->assertRaw('sticky-enabled',  t('Table has a class of sticky-enabled when $sticky = TRUE.'));
+    $this->assertTrue(isset($js['misc/tableheader.js']),'tableheader.js was included when $sticky = TRUE.');
+    $this->assertRaw('sticky-enabled', 'Table has a class of sticky-enabled when $sticky = TRUE.');
     drupal_static_reset('drupal_add_js');
   }
 
@@ -88,8 +88,8 @@
     $colgroups = array();
     $this->content = theme('table', $header, $rows, $attributes, $caption, $colgroups, FALSE);
     $js = drupal_add_js();
-    $this->assertFalse(isset($js['misc/tableheader.js']), t('tableheader.js was not included because $sticky = FALSE.'));
-    $this->assertNoRaw('sticky-enabled',  t('Table does not have a class of sticky-enabled because $sticky = FALSE.'));
+    $this->assertFalse(isset($js['misc/tableheader.js']),'tableheader.js was not included because $sticky = FALSE.');
+    $this->assertNoRaw('sticky-enabled', 'Table does not have a class of sticky-enabled because $sticky = FALSE.');
     drupal_static_reset('drupal_add_js');
   }
 }
Index: modules/simpletest/tests/bootstrap.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/bootstrap.test,v
retrieving revision 1.17
diff -u -r1.17 bootstrap.test
--- modules/simpletest/tests/bootstrap.test	30 May 2009 11:17:32 -0000	1.17
+++ modules/simpletest/tests/bootstrap.test	9 Jul 2009 02:46:29 -0000
@@ -5,9 +5,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('IP address and HTTP_HOST test'),
-      'description' => t('Get the IP address from the current visitor from the server variables, check hostname validation.'),
-      'group' => t('Bootstrap')
+      'name' => 'IP address and HTTP_HOST test',
+      'description' => 'Get the IP address from the current visitor from the server variables, check hostname validation.',
+      'group' => 'Bootstrap'
     );
   }
 
@@ -77,12 +77,12 @@
       ip_address() == $this->cluster_ip,
       t('Cluster environment got cluster client IP')
     );
-    $this->assertFalse(drupal_valid_http_host('security/.drupal.org:80'), t('HTTP_HOST with / is invalid'));
-    $this->assertFalse(drupal_valid_http_host('security\\.drupal.org:80'), t('HTTP_HOST with \\ is invalid'));
-    $this->assertFalse(drupal_valid_http_host('security<.drupal.org:80'), t('HTTP_HOST with &lt; is invalid'));
-    $this->assertFalse(drupal_valid_http_host('security..drupal.org:80'), t('HTTP_HOST with .. is invalid'));
+    $this->assertFalse(drupal_valid_http_host('security/.drupal.org:80'),'HTTP_HOST with / is invalid');
+    $this->assertFalse(drupal_valid_http_host('security\\.drupal.org:80'),'HTTP_HOST with \\ is invalid');
+    $this->assertFalse(drupal_valid_http_host('security<.drupal.org:80'),'HTTP_HOST with &lt; is invalid');
+    $this->assertFalse(drupal_valid_http_host('security..drupal.org:80'),'HTTP_HOST with .. is invalid');
     // IPv6 loopback address
-    $this->assertTrue(drupal_valid_http_host('[::1]:80'), t('HTTP_HOST containing IPv6 loopback is valid'));
+    $this->assertTrue(drupal_valid_http_host('[::1]:80'),'HTTP_HOST containing IPv6 loopback is valid');
   }
 }
 
@@ -90,9 +90,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Page cache test'),
-      'description' => t('Enable the page cache and test it with conditional HTTP requests.'),
-      'group' => t('Bootstrap')
+      'name' => 'Page cache test',
+      'description' => 'Enable the page cache and test it with conditional HTTP requests.',
+      'group' => 'Bootstrap'
     );
   }
 
@@ -110,32 +110,32 @@
     $this->drupalGet('');
 
     $this->drupalHead('');
-    $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', t('Page was cached.'));
+    $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT','Page was cached.');
     $etag = $this->drupalGetHeader('ETag');
     $last_modified = $this->drupalGetHeader('Last-Modified');
 
     $this->drupalGet('', array(), array('If-Modified-Since: ' . $last_modified, 'If-None-Match: ' . $etag));
-    $this->assertResponse(304, t('Conditional request returned 304 Not Modified.'));
+    $this->assertResponse(304,'Conditional request returned 304 Not Modified.');
 
     $this->drupalGet('', array(), array('If-Modified-Since: ' . gmdate(DATE_RFC822, strtotime($last_modified)), 'If-None-Match: ' . $etag));
-    $this->assertResponse(304, t('Conditional request with obsolete If-Modified-Since date returned 304 Not Modified.'));
+    $this->assertResponse(304,'Conditional request with obsolete If-Modified-Since date returned 304 Not Modified.');
 
     $this->drupalGet('', array(), array('If-Modified-Since: ' . gmdate(DATE_RFC850, strtotime($last_modified)), 'If-None-Match: ' . $etag));
-    $this->assertResponse(304, t('Conditional request with obsolete If-Modified-Since date returned 304 Not Modified.'));
+    $this->assertResponse(304,'Conditional request with obsolete If-Modified-Since date returned 304 Not Modified.');
 
     $this->drupalGet('', array(), array('If-Modified-Since: ' . $last_modified));
-    $this->assertResponse(200, t('Conditional request without If-None-Match returned 200 OK.'));
-    $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', t('Page was cached.'));
+    $this->assertResponse(200,'Conditional request without If-None-Match returned 200 OK.');
+    $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT','Page was cached.');
 
     $this->drupalGet('', array(), array('If-Modified-Since: ' . gmdate(DATE_RFC1123, strtotime($last_modified) + 1), 'If-None-Match: ' . $etag));
-    $this->assertResponse(200, t('Conditional request with new a If-Modified-Since date newer than Last-Modified returned 200 OK.'));
-    $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', t('Page was cached.'));
+    $this->assertResponse(200,'Conditional request with new a If-Modified-Since date newer than Last-Modified returned 200 OK.');
+    $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT','Page was cached.');
 
     $user = $this->drupalCreateUser();
     $this->drupalLogin($user);
     $this->drupalGet('', array(), array('If-Modified-Since: ' . $last_modified, 'If-None-Match: ' . $etag));
-    $this->assertResponse(200, t('Conditional request returned 200 OK for authenticated user.'));
-    $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), t('Absense of Page was not cached.'));
+    $this->assertResponse(200,'Conditional request returned 200 OK for authenticated user.');
+    $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'),'Absense of Page was not cached.');
   }
 
   /**
@@ -146,35 +146,35 @@
 
     // Fill the cache.
     $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Foo', 'value' => 'bar')));
-    $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', t('Page was not cached.'));
-    $this->assertEqual($this->drupalGetHeader('Vary'), 'Cookie,Accept-Encoding', t('Vary header was sent.'));
-    $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'public, max-age=0', t('Cache-Control header was sent.'));
-    $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', t('Expires header was sent.'));
-    $this->assertEqual($this->drupalGetHeader('Foo'), 'bar', t('Custom header was sent.'));
+    $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS','Page was not cached.');
+    $this->assertEqual($this->drupalGetHeader('Vary'), 'Cookie,Accept-Encoding','Vary header was sent.');
+    $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'public, max-age=0','Cache-Control header was sent.');
+    $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT','Expires header was sent.');
+    $this->assertEqual($this->drupalGetHeader('Foo'), 'bar','Custom header was sent.');
 
     // Check cache.
     $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Foo', 'value' => 'bar')));
-    $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', t('Page was cached.'));
-    $this->assertEqual($this->drupalGetHeader('Vary'), 'Cookie,Accept-Encoding', t('Vary: Cookie header was sent.'));
-    $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'public, max-age=0', t('Cache-Control header was sent.'));
-    $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', t('Expires header was sent.'));
-    $this->assertEqual($this->drupalGetHeader('Foo'), 'bar', t('Custom header was sent.'));
+    $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT','Page was cached.');
+    $this->assertEqual($this->drupalGetHeader('Vary'), 'Cookie,Accept-Encoding','Vary: Cookie header was sent.');
+    $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'public, max-age=0','Cache-Control header was sent.');
+    $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT','Expires header was sent.');
+    $this->assertEqual($this->drupalGetHeader('Foo'), 'bar','Custom header was sent.');
 
     // Check replacing default headers.
     $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Expires', 'value' => 'Fri, 19 Nov 2008 05:00:00 GMT')));
-    $this->assertEqual($this->drupalGetHeader('Expires'), 'Fri, 19 Nov 2008 05:00:00 GMT', t('Default header was replaced.'));
+    $this->assertEqual($this->drupalGetHeader('Expires'), 'Fri, 19 Nov 2008 05:00:00 GMT','Default header was replaced.');
     $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Vary', 'value' => 'User-Agent')));
-    $this->assertEqual($this->drupalGetHeader('Vary'), 'User-Agent,Accept-Encoding', t('Default header was replaced.'));
+    $this->assertEqual($this->drupalGetHeader('Vary'), 'User-Agent,Accept-Encoding','Default header was replaced.');
 
     // Check that authenticated users bypass the cache.
     $user = $this->drupalCreateUser();
     $this->drupalLogin($user);
     $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Foo', 'value' => 'bar')));
-    $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), t('Caching was bypassed.'));
-    $this->assertTrue(strpos($this->drupalGetHeader('Vary'), 'Cookie') === FALSE, t('Vary: Cookie header was not sent.'));
-    $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'no-cache, must-revalidate, post-check=0, pre-check=0', t('Cache-Control header was sent.'));
-    $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', t('Expires header was sent.'));
-    $this->assertEqual($this->drupalGetHeader('Foo'), 'bar', t('Custom header was sent.'));
+    $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'),'Caching was bypassed.');
+    $this->assertTrue(strpos($this->drupalGetHeader('Vary'), 'Cookie') === FALSE,'Vary: Cookie header was not sent.');
+    $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'no-cache, must-revalidate, post-check=0, pre-check=0','Cache-Control header was sent.');
+    $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT','Expires header was sent.');
+    $this->assertEqual($this->drupalGetHeader('Foo'), 'bar','Custom header was sent.');
 
   }
 }
@@ -187,9 +187,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Variable test'),
-      'description' => t('Make sure the variable system functions correctly.'),
-      'group' => t('Bootstrap')
+      'name' => 'Variable test',
+      'description' => 'Make sure the variable system functions correctly.',
+      'group' => 'Bootstrap'
     );
   }
 
@@ -200,17 +200,17 @@
     // Setting and retrieving values.
     $variable = $this->randomName();
     variable_set('simpletest_bootstrap_variable_test', $variable);
-    $this->assertIdentical($variable, variable_get('simpletest_bootstrap_variable_test'), t('Setting and retrieving values'));
+    $this->assertIdentical($variable, variable_get('simpletest_bootstrap_variable_test'),'Setting and retrieving values');
 
     // Make sure the variable persists across multiple requests.
     $this->drupalGet('system-test/variable-get');
-    $this->assertText($variable, t('Variable persists across multiple requests'));
+    $this->assertText($variable,'Variable persists across multiple requests');
 
     // Deleting variables.
     $default_value = $this->randomName();
     variable_del('simpletest_bootstrap_variable_test');
     $variable = variable_get('simpletest_bootstrap_variable_test', $default_value);
-    $this->assertIdentical($variable, $default_value, t('Deleting variables'));
+    $this->assertIdentical($variable, $default_value,'Deleting variables');
   }
 
   /**
@@ -218,10 +218,10 @@
    */
   function testVariableDefaults() {
     // Tests passing nothing through to the default.
-    $this->assertIdentical(NULL, variable_get('simpletest_bootstrap_variable_test'), t('Variables are correctly defaulting to NULL.'));
+    $this->assertIdentical(NULL, variable_get('simpletest_bootstrap_variable_test'),'Variables are correctly defaulting to NULL.');
 
     // Tests passing 5 to the default parameter.
-    $this->assertIdentical(5, variable_get('simpletest_bootstrap_variable_test', 5), t('The default variable parameter is passed through correctly.'));
+    $this->assertIdentical(5, variable_get('simpletest_bootstrap_variable_test', 5),'The default variable parameter is passed through correctly.');
   }
 
 }
@@ -233,9 +233,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Boot and exit hook invocation'),
-      'description' => t('Test that hook_boot() and hook_exit() are called correctly.'),
-      'group' => t('Bootstrap'),
+      'name' => 'Boot and exit hook invocation',
+      'description' => 'Test that hook_boot() and hook_exit() are called correctly.',
+      'group' => 'Bootstrap',
     );
   }
 
@@ -251,31 +251,31 @@
     variable_set('cache', CACHE_DISABLED);
     $this->drupalGet('');
     $calls = 1;
-    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot called with disabled cache.'));
-    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit called with disabled cache.'));
+    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls,'hook_boot called with disabled cache.');
+    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls,'hook_exit called with disabled cache.');
 
     // Test with normal cache. Boot and exit should be called.
     variable_set('cache', CACHE_NORMAL);
     $this->drupalGet('');
     $calls++;
-    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot called with normal cache.'));
-    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit called with normal cache.'));
+    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls,'hook_boot called with normal cache.');
+    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls,'hook_exit called with normal cache.');
 
     // Test with aggressive cache. Boot and exit should not fire since the
     // page is cached.
     variable_set('cache', CACHE_AGGRESSIVE);
-    $this->assertTrue(cache_get(url('', array('absolute' => TRUE)), 'cache_page'), t('Page has been cached.'));
+    $this->assertTrue(cache_get(url('', array('absolute' => TRUE)), 'cache_page'),'Page has been cached.');
     $this->drupalGet('');
-    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot not called with agressive cache and a cached page.'));
-    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit not called with agressive cache and a cached page.'));
+    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls,'hook_boot not called with agressive cache and a cached page.');
+    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls,'hook_exit not called with agressive cache and a cached page.');
 
     // Test with aggressive cache and page cache cleared. Boot and exit should
     // be called.
-    $this->assertTrue(db_delete('cache_page')->execute(), t('Page cache cleared.'));
+    $this->assertTrue(db_delete('cache_page')->execute(),'Page cache cleared.');
     $this->drupalGet('');
     $calls++;
-    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot called with agressive cache and no cached page.'));
-    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit called with agressive cache and no cached page.'));
+    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls,'hook_boot called with agressive cache and no cached page.');
+    $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls,'hook_exit called with agressive cache and no cached page.');
   }
 }
 
Index: modules/simpletest/tests/xmlrpc.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/xmlrpc.test,v
retrieving revision 1.10
diff -u -r1.10 xmlrpc.test
--- modules/simpletest/tests/xmlrpc.test	28 Jun 2009 03:08:38 -0000	1.10
+++ modules/simpletest/tests/xmlrpc.test	9 Jul 2009 02:46:29 -0000
@@ -4,9 +4,9 @@
 class XMLRPCValidator1IncTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name'  => t('XML-RPC validator'),
-      'description'  => t('See !validator-link.', array('!validator-link' => l('the xmlrpc validator1 specification', 'http://www.xmlrpc.com/validator1Docs'))),
-      'group' => t('XML-RPC'),
+      'name'  => 'XML-RPC validator',
+      'description'  => 'See !validator-link.', array('!validator-link' => l('the xmlrpc validator1 specification', 'http://www.xmlrpc.com/validator1Docs')),
+      'group' => 'XML-RPC',
     );
   }
 
@@ -127,9 +127,9 @@
 class XMLRPCMessagesTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name'  => t('XML-RPC message'),
-      'description' => t('Test large messages.'),
-      'group' => t('XML-RPC'),
+      'name'  => 'XML-RPC message',
+      'description' => 'Test large messages.',
+      'group' => 'XML-RPC',
     );
   }
 
Index: modules/simpletest/tests/session.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/session.test,v
retrieving revision 1.15
diff -u -r1.15 session.test
--- modules/simpletest/tests/session.test	1 Jul 2009 12:47:30 -0000	1.15
+++ modules/simpletest/tests/session.test	9 Jul 2009 02:46:29 -0000
@@ -9,9 +9,9 @@
 class SessionTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Session tests'),
-      'description' => t('Drupal session handling tests.'),
-      'group' => t('Session')
+      'name' => 'Session tests',
+      'description' => 'Drupal session handling tests.',
+      'group' => 'Session'
     );
   }
 
@@ -23,11 +23,11 @@
    * 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.','Session');
+    $this->assertFalse(drupal_save_session(FALSE),'drupal_save_session() correctly returns FALSE when called with FALSE.','Session');
+    $this->assertFalse(drupal_save_session(),'drupal_save_session() correctly returns FALSE when saving has been disabled.','Session');
+    $this->assertTrue(drupal_save_session(TRUE),'drupal_save_session() correctly returns TRUE when called with TRUE.','Session');
+    $this->assertTrue(drupal_save_session(),'drupal_save_session() correctly returns TRUE when saving has been enabled.','Session');
 
     // Test session hardening code from SA-2008-044.
     $user = $this->drupalCreateUser(array('access content'));
@@ -37,7 +37,7 @@
 
     // 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
@@ -47,7 +47,7 @@
     $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
@@ -58,14 +58,14 @@
     );
     $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,'Found name: %name', array('%name' => $user->name)),'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.');
   }
 
   /**
@@ -86,22 +86,22 @@
 
     $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.','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.','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.','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).','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.','Session');
 
     // Logout the user and make sure the stored value no longer persists.
     $this->drupalLogout();
@@ -109,23 +109,23 @@
 
     $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.",'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.','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.','Session');
     // Session count should go up since we have started an anonymous session now.
     $expected_anonymous++;
 
     // 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.','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).','Session');
 
     // Login, the data should persist.
     $this->drupalLogin($user);
@@ -133,7 +133,7 @@
     $expected_authenticated++;
     $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.','Session');
 
     // Change session and create another user.
     $user2 = $this->drupalCreateUser(array('access content'));
@@ -145,16 +145,16 @@
     // Test absolute count.
     $anonymous = drupal_session_count(0, TRUE);
     $authenticated = drupal_session_count(0, FALSE);
-    $this->assertEqual($anonymous + $authenticated, $expected_anonymous + $expected_authenticated, t('@count total sessions (expected @expected).', array('@count' => $anonymous + $authenticated, '@expected' => $expected_anonymous + $expected_authenticated)), t('Session'));
+    $this->assertEqual($anonymous + $authenticated, $expected_anonymous + $expected_authenticated,'@count total sessions (expected @expected).', array('@count' => $anonymous + $authenticated, '@expected' => $expected_anonymous + $expected_authenticated)),'Session';
 
     // Test anonymous count.
-    $this->assertEqual($anonymous, $expected_anonymous, t('@count anonymous sessions (expected @expected).', array('@count' => $anonymous, '@expected' => $expected_anonymous)), t('Session'));
+    $this->assertEqual($anonymous, $expected_anonymous,'@count anonymous sessions (expected @expected).', array('@count' => $anonymous, '@expected' => $expected_anonymous)),'Session';
 
     // Test authenticated count.
-    $this->assertEqual($authenticated, $expected_authenticated, t('@count authenticated sessions (expected @expected).', array('@count' => $authenticated, '@expected' => $expected_authenticated)), t('Session'));
+    $this->assertEqual($authenticated, $expected_authenticated,'@count authenticated sessions (expected @expected).', array('@count' => $authenticated, '@expected' => $expected_authenticated)),'Session';
 
     // Should return 0 sessions from 1 second from now.
-    $this->assertEqual(drupal_session_count(time() + 1), 0, t('0 sessions newer than the current time.'), t('Session'));
+    $this->assertEqual(drupal_session_count(time() + 1), 0,'0 sessions newer than the current time.','Session');
 
   }
 
@@ -172,29 +172,29 @@
     $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');
@@ -205,7 +205,7 @@
     $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.');
   }
 
   /**
@@ -223,7 +223,7 @@
     $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.','Session');
   }
 
   /**
@@ -231,10 +231,10 @@
    */
   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.');
     }
   }
 
@@ -243,10 +243,10 @@
    */
   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.');
     }
   }
 }
Index: modules/simpletest/tests/image.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/image.test,v
retrieving revision 1.4
diff -u -r1.4 image.test
--- modules/simpletest/tests/image.test	24 May 2009 17:39:34 -0000	1.4
+++ modules/simpletest/tests/image.test	9 Jul 2009 02:46:29 -0000
@@ -16,9 +16,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Image toolkit tests'),
-      'description' => t('Check image tookit functions.'),
-      'group' => t('Image API'),
+      'name' => 'Image toolkit tests',
+      'description' => 'Check image tookit functions.',
+      'group' => 'Image API',
     );
   }
 
@@ -69,7 +69,7 @@
       $this->assertTrue(FALSE, t('Unexpected operations were called: %unexpected.', array('%unexpected' => implode(', ', $unexpected))));
     }
     else {
-      $this->assertTrue(TRUE, t('No unexpected operations were called.'));
+      $this->assertTrue(TRUE,'No unexpected operations were called.');
     }
   }
 
@@ -79,8 +79,8 @@
    */
   function testGetAvailableToolkits() {
     $toolkits = image_get_available_toolkits();
-    $this->assertTrue(isset($toolkits['test']), t('The working toolkit was returned.'));
-    $this->assertFalse(isset($toolkits['broken']), t('The toolkit marked unavailable was not returned'));
+    $this->assertTrue(isset($toolkits['test']),'The working toolkit was returned.');
+    $this->assertFalse(isset($toolkits['broken']),'The toolkit marked unavailable was not returned');
     $this->assertToolkitOperationsCalled(array());
   }
 
@@ -89,8 +89,8 @@
    */
   function testLoad() {
     $image = image_load($this->file, $this->toolkit);
-    $this->assertTrue(is_object($image), t('Returned an object.'));
-    $this->assertEqual($this->toolkit, $image->toolkit, t('Image had toolkit set.'));
+    $this->assertTrue(is_object($image),'Returned an object.');
+    $this->assertEqual($this->toolkit, $image->toolkit,'Image had toolkit set.');
     $this->assertToolkitOperationsCalled(array('load'));
   }
 
@@ -98,7 +98,7 @@
    * Test the image_save() function.
    */
   function testSave() {
-    $this->assertFalse(image_save($this->image), t('Function returned the expected value.'));
+    $this->assertFalse(image_save($this->image),'Function returned the expected value.');
     $this->assertToolkitOperationsCalled(array('save'));
   }
 
@@ -106,13 +106,13 @@
    * Test the image_resize() function.
    */
   function testResize() {
-    $this->assertTrue(image_resize($this->image, 1, 2), t('Function returned the expected value.'));
+    $this->assertTrue(image_resize($this->image, 1, 2),'Function returned the expected value.');
     $this->assertToolkitOperationsCalled(array('resize'));
 
     // Check the parameters.
     $calls = image_test_get_all_calls();
-    $this->assertEqual($calls['resize'][0][1], 1, t('Width was passed correctly'));
-    $this->assertEqual($calls['resize'][0][2], 2, t('Height was passed correctly'));
+    $this->assertEqual($calls['resize'][0][1], 1,'Width was passed correctly');
+    $this->assertEqual($calls['resize'][0][2], 2,'Height was passed correctly');
   }
 
   /**
@@ -120,69 +120,69 @@
    */
   function testScale() {
 // TODO: need to test upscaling
-    $this->assertTrue(image_scale($this->image, 10, 10), t('Function returned the expected value.'));
+    $this->assertTrue(image_scale($this->image, 10, 10),'Function returned the expected value.');
     $this->assertToolkitOperationsCalled(array('resize'));
 
     // Check the parameters.
     $calls = image_test_get_all_calls();
-    $this->assertEqual($calls['resize'][0][1], 10, t('Width was passed correctly'));
-    $this->assertEqual($calls['resize'][0][2], 5, t('Height was based off aspect ratio and passed correctly'));
+    $this->assertEqual($calls['resize'][0][1], 10,'Width was passed correctly');
+    $this->assertEqual($calls['resize'][0][2], 5,'Height was based off aspect ratio and passed correctly');
   }
 
   /**
    * Test the image_scale_and_crop() function.
    */
   function testScaleAndCrop() {
-    $this->assertTrue(image_scale_and_crop($this->image, 5, 10), t('Function returned the expected value.'));
+    $this->assertTrue(image_scale_and_crop($this->image, 5, 10),'Function returned the expected value.');
     $this->assertToolkitOperationsCalled(array('resize', 'crop'));
 
     // Check the parameters.
     $calls = image_test_get_all_calls();
 
-    $this->assertEqual($calls['crop'][0][1], 7.5, t('X was computed and passed correctly'));
-    $this->assertEqual($calls['crop'][0][2], 0, t('Y was computed and passed correctly'));
-    $this->assertEqual($calls['crop'][0][3], 5, t('Width was computed and passed correctly'));
-    $this->assertEqual($calls['crop'][0][4], 10, t('Height was computed and passed correctly'));
+    $this->assertEqual($calls['crop'][0][1], 7.5,'X was computed and passed correctly');
+    $this->assertEqual($calls['crop'][0][2], 0,'Y was computed and passed correctly');
+    $this->assertEqual($calls['crop'][0][3], 5,'Width was computed and passed correctly');
+    $this->assertEqual($calls['crop'][0][4], 10,'Height was computed and passed correctly');
   }
 
   /**
    * Test the image_rotate() function.
    */
   function testRotate() {
-    $this->assertTrue(image_rotate($this->image, 90, 1), t('Function returned the expected value.'));
+    $this->assertTrue(image_rotate($this->image, 90, 1),'Function returned the expected value.');
     $this->assertToolkitOperationsCalled(array('rotate'));
 
     // Check the parameters.
     $calls = image_test_get_all_calls();
-    $this->assertEqual($calls['rotate'][0][1], 90, t('Degrees were passed correctly'));
-    $this->assertEqual($calls['rotate'][0][2], 1, t('Background color was passed correctly'));
+    $this->assertEqual($calls['rotate'][0][1], 90,'Degrees were passed correctly');
+    $this->assertEqual($calls['rotate'][0][2], 1,'Background color was passed correctly');
   }
 
   /**
    * Test the image_crop() function.
    */
   function testCrop() {
-    $this->assertTrue(image_crop($this->image, 1, 2, 3, 4), t('Function returned the expected value.'));
+    $this->assertTrue(image_crop($this->image, 1, 2, 3, 4),'Function returned the expected value.');
     $this->assertToolkitOperationsCalled(array('crop'));
 
     // Check the parameters.
     $calls = image_test_get_all_calls();
-    $this->assertEqual($calls['crop'][0][1], 1, t('X was passed correctly'));
-    $this->assertEqual($calls['crop'][0][2], 2, t('Y was passed correctly'));
-    $this->assertEqual($calls['crop'][0][3], 3, t('Width was passed correctly'));
-    $this->assertEqual($calls['crop'][0][4], 4, t('Height was passed correctly'));
+    $this->assertEqual($calls['crop'][0][1], 1,'X was passed correctly');
+    $this->assertEqual($calls['crop'][0][2], 2,'Y was passed correctly');
+    $this->assertEqual($calls['crop'][0][3], 3,'Width was passed correctly');
+    $this->assertEqual($calls['crop'][0][4], 4,'Height was passed correctly');
   }
 
   /**
    * Test the image_desaturate() function.
    */
   function testDesaturate() {
-    $this->assertTrue(image_desaturate($this->image), t('Function returned the expected value.'));
+    $this->assertTrue(image_desaturate($this->image),'Function returned the expected value.');
     $this->assertToolkitOperationsCalled(array('desaturate'));
 
     // Check the parameters.
     $calls = image_test_get_all_calls();
-    $this->assertEqual(count($calls['desaturate'][0]), 1, t('Only the image was passed.'));
+    $this->assertEqual(count($calls['desaturate'][0]), 1,'Only the image was passed.');
   }
 }
 
@@ -205,9 +205,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Image GD manipulation tests'),
-      'description' => t('Check that core image manipulations work properly: scale, resize, rotate, crop, scale and crop, and desaturate.'),
-      'group' => t('Image API'),
+      'name' => 'Image GD manipulation tests',
+      'description' => 'Check that core image manipulations work properly: scale, resize, rotate, crop, scale and crop, and desaturate.',
+      'group' => 'Image API',
     );
   }
 
Index: modules/contact/contact.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.test,v
retrieving revision 1.25
diff -u -r1.25 contact.test
--- modules/contact/contact.test	13 Jun 2009 20:40:07 -0000	1.25
+++ modules/contact/contact.test	9 Jul 2009 02:46:29 -0000
@@ -7,9 +7,9 @@
 class ContactSitewideTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Site-wide contact form'),
-      'description' => t('Tests site-wide contact form functionality.'),
-      'group' => t('Contact'),
+      'name' => 'Site-wide contact form',
+      'description' => 'Tests site-wide contact form functionality.',
+      'group' => 'Contact',
     );
   }
 
@@ -30,7 +30,7 @@
     $edit['contact_hourly_threshold'] = 3;
     $edit['contact_default_status'] = TRUE;
     $this->drupalPost('admin/settings/contact', $edit, t('Save configuration'));
-    $this->assertText(t('The configuration options have been saved.'), t('Setting successfully saved.'));
+    $this->assertText(t('The configuration options have been saved.'),'Setting successfully saved.');
 
     // Delete old categories to ensure that new categories are used.
     $this->deleteCategories();
@@ -50,21 +50,21 @@
     $invalid_recipients = array('invalid', 'invalid@', 'invalid@site.', '@site.', '@site.com');
     foreach ($invalid_recipients as $invalid_recipient) {
       $this->addCategory($this->randomName(16), $invalid_recipient, '', FALSE);
-      $this->assertRaw(t('%recipient is an invalid e-mail address.', array('%recipient' => $invalid_recipient)), t('Caught invalid recipient (' . $invalid_recipient . ').'));
+      $this->assertRaw(t('%recipient is an invalid e-mail address.', array('%recipient' => $invalid_recipient)),'Caught invalid recipient (' . $invalid_recipient . '.'));
     }
 
     // Test validation of empty category and recipients fields.
     $this->addCategory($category = '', '', '', TRUE);
-    $this->assertText(t('Category field is required.'), t('Caught empty category field'));
-    $this->assertText(t('Recipients field is required.'), t('Caught empty recipients field.'));
+    $this->assertText(t('Category field is required.'),'Caught empty category field');
+    $this->assertText(t('Recipients field is required.'),'Caught empty recipients field.');
 
     // Create first valid category.
     $recipients = array('simpletest@example.com', 'simpletest2@example.com', 'simpletest3@example.com');
     $this->addCategory($category = $this->randomName(16), implode(',', array($recipients[0])), '', TRUE);
-    $this->assertRaw(t('Category %category has been added.', array('%category' => $category)), t('Category successfully added.'));
+    $this->assertRaw(t('Category %category has been added.', array('%category' => $category)),'Category successfully added.');
 
     // Make sure the newly created category is included in the list of categories.
-    $this->assertNoUniqueText($category, t('New category included in categories list.'));
+    $this->assertNoUniqueText($category,'New category included in categories list.');
 
     // Test update contact form category.
     $categories = $this->getCategories();
@@ -74,34 +74,34 @@
     $this->assertEqual($category_array['recipients'], $recipients_str);
     $this->assertEqual($category_array['reply'], $reply);
     $this->assertFalse($category_array['selected']);
-    $this->assertRaw(t('Category %category has been updated.', array('%category' => $category)), t('Category successfully updated.'));
+    $this->assertRaw(t('Category %category has been updated.', array('%category' => $category)),'Category successfully updated.');
 
     // Ensure that the contact form is shown without a category selection input.
     $this->setPermission('anonymous user', array('access site-wide contact form' => TRUE));
     $this->drupalLogout();
     $this->drupalGet('contact');
-    $this->assertText(t('Your e-mail address'), t('Contact form is shown when there is one category.'));
-    $this->assertNoText(t('Category'), t('When there is only one category, the category selection element is hidden.'));
+    $this->assertText(t('Your e-mail address'),'Contact form is shown when there is one category.');
+    $this->assertNoText(t('Category'),'When there is only one category, the category selection element is hidden.');
     $this->drupalLogin($admin_user);
 
     // Add more categories.
     $this->addCategory($category = $this->randomName(16), implode(',', array($recipients[0], $recipients[1])), '', FALSE);
-    $this->assertRaw(t('Category %category has been added.', array('%category' => $category)), t('Category successfully added.'));
+    $this->assertRaw(t('Category %category has been added.', array('%category' => $category)),'Category successfully added.');
 
     $this->addCategory($category = $this->randomName(16), implode(',', array($recipients[0], $recipients[1], $recipients[2])), '', FALSE);
-    $this->assertRaw(t('Category %category has been added.', array('%category' => $category)), t('Category successfully added.'));
+    $this->assertRaw(t('Category %category has been added.', array('%category' => $category)),'Category successfully added.');
 
     // Clear flood table in preparation for flood test and allow other checks to complete.
     db_delete('flood')->execute();
     $num_records_after = db_query("SELECT COUNT(*) FROM {flood}")->fetchField();
-    $this->assertIdentical($num_records_after, '0', t('Flood table emptied.'));
+    $this->assertIdentical($num_records_after, '0','Flood table emptied.');
 
     // Check to see that anonymous user cannot see contact page without permission.
     $this->setPermission('anonymous user', array('access site-wide contact form' => FALSE));
     $this->drupalLogout();
 
     $this->drupalGet('contact');
-    $this->assertResponse(403, t('Access denied to anonymous user without permission.'));
+    $this->assertResponse(403,'Access denied to anonymous user without permission.');
 
     // Give anonymous user permission and see that page is viewable.
     $this->drupalLogin($admin_user);
@@ -109,43 +109,43 @@
     $this->drupalLogout();
 
     $this->drupalGet('contact');
-    $this->assertResponse(200, t('Access granted to anonymous user with permission.'));
+    $this->assertResponse(200,'Access granted to anonymous user with permission.');
 
     // Submit contact form with invalid values.
     $this->submitContact('', $recipients[0], $this->randomName(16), $categories[0], $this->randomName(64));
-    $this->assertText(t('Your name field is required.'), t('Name required.'));
+    $this->assertText(t('Your name field is required.'),'Name required.');
 
     $this->submitContact($this->randomName(16), '', $this->randomName(16), $categories[0], $this->randomName(64));
-    $this->assertText(t('Your e-mail address field is required.'), t('E-mail required.'));
+    $this->assertText(t('Your e-mail address field is required.'),'E-mail required.');
 
     $this->submitContact($this->randomName(16), $invalid_recipients[0], $this->randomName(16), $categories[0], $this->randomName(64));
-    $this->assertText(t('You must enter a valid e-mail address.'), t('Valid e-mail required.'));
+    $this->assertText(t('You must enter a valid e-mail address.'),'Valid e-mail required.');
 
     $this->submitContact($this->randomName(16), $recipients[0], '', $categories[0], $this->randomName(64));
-    $this->assertText(t('Subject field is required.'), t('Subject required.'));
+    $this->assertText(t('Subject field is required.'),'Subject required.');
 
     $this->submitContact($this->randomName(16), $recipients[0], $this->randomName(16), $categories[0], '');
-    $this->assertText(t('Message field is required.'), t('Message required.'));
+    $this->assertText(t('Message field is required.'),'Message required.');
 
     // Test contact form with no default category selected.
     db_update('contact')
       ->fields(array('selected' => 0))
       ->execute();
     $this->drupalGet('contact');
-    $this->assertRaw(t('- Please choose -'), t('Without selected categories the visitor is asked to chose a category.'));
+    $this->assertRaw(t('- Please choose -'),'Without selected categories the visitor is asked to chose a category.');
 
     // Submit contact form with invalid category id (cid 0).
     $this->submitContact($this->randomName(16), $recipients[0], $this->randomName(16), 0, '');
-    $this->assertText(t('You must select a valid category.'), t('Valid category required.'));
+    $this->assertText(t('You must select a valid category.'),'Valid category required.');
 
     // Submit contact form with correct values and check flood interval.
     for ($i = 0; $i < $edit['contact_hourly_threshold']; $i++) {
       $this->submitContact($this->randomName(16), $recipients[0], $this->randomName(16), $categories[0], $this->randomName(64));
-      $this->assertText(t('Your message has been sent.'), t('Message sent.'));
+      $this->assertText(t('Your message has been sent.'),'Message sent.');
     }
     // Submit contact form one over limit.
     $this->drupalGet('contact');
-    $this->assertRaw(t('You cannot send more than %number messages per hour. Please try again later.', array('%number' => $edit['contact_hourly_threshold'])), t('Message threshold reached.'));
+    $this->assertRaw(t('You cannot send more than %number messages per hour. Please try again later.', array('%number' => $edit['contact_hourly_threshold'])),'Message threshold reached.');
 
     // Delete created categories.
     $this->drupalLogin($admin_user);
@@ -174,8 +174,8 @@
 
     // We are testing the auto-reply, so there should be one e-mail going to the sender.
     $captured_emails = $this->drupalGetMails(array('id' => 'contact_page_autoreply', 'to' => $email, 'from' => 'foo@example.com'));
-    $this->assertEqual(count($captured_emails), 1, t('Auto-reply e-mail was sent to the sender for category "foo".'), t('Contact'));
-    $this->assertEqual($captured_emails[0]['body'], $foo_autoreply, t('Auto-reply e-mail body is correct for category "foo".'), t('Contact'));
+    $this->assertEqual(count($captured_emails), 1,'Auto-reply e-mail was sent to the sender for category "foo".','Contact');
+    $this->assertEqual($captured_emails[0]['body'], $foo_autoreply,'Auto-reply e-mail body is correct for category "foo".','Contact');
 
     // Test the auto-reply for category 'bar'.
     $email = $this->randomName(32) . '@example.com';
@@ -183,14 +183,14 @@
 
     // Auto-reply for category 'bar' should result in one auto-reply e-mail to the sender.
     $captured_emails = $this->drupalGetMails(array('id' => 'contact_page_autoreply', 'to' => $email, 'from' => 'bar@example.com'));
-    $this->assertEqual(count($captured_emails), 1, t('Auto-reply e-mail was sent to the sender for category "bar".'), t('Contact'));
-    $this->assertEqual($captured_emails[0]['body'], $bar_autoreply, t('Auto-reply e-mail body is correct for category "bar".'), t('Contact'));
+    $this->assertEqual(count($captured_emails), 1,'Auto-reply e-mail was sent to the sender for category "bar".','Contact');
+    $this->assertEqual($captured_emails[0]['body'], $bar_autoreply,'Auto-reply e-mail body is correct for category "bar".','Contact');
 
     // Verify that no auto-reply is sent when the auto-reply field is left blank.
     $email = $this->randomName(32) . '@example.com';
     $this->submitContact($this->randomName(16), $email, $this->randomString(64), 3, $this->randomString(128));
     $captured_emails = $this->drupalGetMails(array('id' => 'contact_page_autoreply', 'to' => $email, 'from' => 'no_autoreply@example.com'));
-    $this->assertEqual(count($captured_emails), 0, t('No auto-reply e-mail was sent to the sender for category "no-autoreply".'), t('Contact'));
+    $this->assertEqual(count($captured_emails), 0,'No auto-reply e-mail was sent to the sender for category "no-autoreply".','Contact');
   }
 
   /**
@@ -256,7 +256,7 @@
     foreach ($categories as $category) {
       $category_name = db_query("SELECT category FROM {contact} WHERE cid = :cid", array(':cid' => $category))->fetchField();
       $this->drupalPost('admin/build/contact/delete/' . $category, array(), t('Delete'));
-      $this->assertRaw(t('Category %category has been deleted.', array('%category' => $category_name)), t('Category deleted sucessfully.'));
+      $this->assertRaw(t('Category %category has been deleted.', array('%category' => $category_name)),'Category deleted sucessfully.');
     }
   }
 
@@ -290,7 +290,7 @@
     }
 
     $this->drupalPost('admin/user/permissions', $edit, t('Save permissions'));
-    $this->assertText(t('The changes have been saved.'), t(' [permission] Saved changes.'));
+    $this->assertText(t('The changes have been saved.'),' [permission] Saved changes.');
   }
 }
 
@@ -300,9 +300,9 @@
 class ContactPersonalTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Personal contact form'),
-      'description' => t('Tests personal contact form functionality.'),
-      'group' => t('Contact'),
+      'name' => 'Personal contact form',
+      'description' => 'Tests personal contact form functionality.',
+      'group' => 'Contact',
     );
   }
 
@@ -323,7 +323,7 @@
     $edit['contact_default_status'] = TRUE;
     $edit['contact_hourly_threshold'] = $flood_control;
     $this->drupalPost('admin/settings/contact', $edit, t('Save configuration'));
-    $this->assertText(t('The configuration options have been saved.'), t('Setting successfully saved.'));
+    $this->assertText(t('The configuration options have been saved.'),'Setting successfully saved.');
 
     // Reload variables.
     $this->drupalLogout();
@@ -335,29 +335,29 @@
     $this->drupalLogin($web_user1);
 
     $this->drupalGet('user/' . $web_user2->uid . '/contact');
-    $this->assertResponse(200, t('Access to personal contact form granted.'));
+    $this->assertResponse(200,'Access to personal contact form granted.');
 
     $edit = array();
     $edit['subject'] = $this->randomName(16);
     $edit['message'] = $this->randomName(64);
     $this->drupalPost(NULL, $edit, t('Send message'));
-    $this->assertText(t('Your message has been sent.'), t('Message sent.'));
+    $this->assertText(t('Your message has been sent.'),'Message sent.');
 
     // Clear flood table in preparation for flood test and allow other checks to complete.
     db_delete('flood')->execute();
     $num_records_flood = db_query("SELECT COUNT(*) FROM {flood}")->fetchField();
-    $this->assertIdentical($num_records_flood, '0', t('Flood table emptied.'));
+    $this->assertIdentical($num_records_flood, '0','Flood table emptied.');
 
     // Submit contact form with correct values and check flood interval.
     for ($i = 0; $i < $flood_control; $i++) {
       $this->drupalGet('user/' . $web_user2->uid . '/contact');
       $this->drupalPost(NULL, $edit, t('Send message'));
-      $this->assertText(t('Your message has been sent.'), t('Message sent.'));
+      $this->assertText(t('Your message has been sent.'),'Message sent.');
     }
 
     // Submit contact form one over limit.
     $this->drupalGet('user/' . $web_user2->uid . '/contact');
-    $this->assertRaw(t('You cannot send more than %number messages per hour. Please try again later.', array('%number' => $flood_control)), t('Message threshold reached.'));
+    $this->assertRaw(t('You cannot send more than %number messages per hour. Please try again later.', array('%number' => $flood_control)),'Message threshold reached.');
 
     $this->drupalLogout();
 
@@ -367,7 +367,7 @@
     $edit = array();
     $edit['contact_default_status'] = FALSE;
     $this->drupalPost('admin/settings/contact', $edit, t('Save configuration'));
-    $this->assertText(t('The configuration options have been saved.'), t('Setting successfully saved.'));
+    $this->assertText(t('The configuration options have been saved.'),'Setting successfully saved.');
 
     // Reload variables.
     $this->drupalLogout();
@@ -379,6 +379,6 @@
     $this->drupalLogin($web_user3);
 
     $this->drupalGet('user/' . $web_user4->uid . '/contact');
-    $this->assertResponse(403, t('Access to personal contact form denied.'));
+    $this->assertResponse(403,'Access to personal contact form denied.');
   }
 }
Index: modules/tracker/tracker.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.test,v
retrieving revision 1.9
diff -u -r1.9 tracker.test
--- modules/tracker/tracker.test	29 Apr 2009 12:08:28 -0000	1.9
+++ modules/tracker/tracker.test	9 Jul 2009 02:46:30 -0000
@@ -8,9 +8,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Tracker'),
-      'description' => t('Create nodes and check for their display in the tracker listings.'),
-      'group' => t('Tracker')
+      'name' => 'Tracker',
+      'description' => 'Create nodes and check for their display in the tracker listings.',
+      'group' => 'Tracker'
     );
   }
 
@@ -40,9 +40,9 @@
     $this->drupalCreateNode($page2);
 
     $this->drupalGet('tracker');
-    $this->assertText($page1['title'], t('Nodes show up in the tracker listing.'));
-    $this->assertNoText($page2['title'], t('Unpublished nodes do not show up in the tracker listing.'));
-    $this->assertLink(t('My recent posts'), 0, t('User tab shows up on the global tracker page.'));
+    $this->assertText($page1['title'],'Nodes show up in the tracker listing.');
+    $this->assertNoText($page2['title'],'Unpublished nodes do not show up in the tracker listing.');
+    $this->assertLink(t('My recent posts'), 0,'User tab shows up on the global tracker page.');
   }
 
   /**
@@ -65,8 +65,8 @@
     $this->drupalCreateNode($page2);
 
     $this->drupalGet('user/' . $this->user->uid . '/track');
-    $this->assertText($page1['title'], t("Nodes show up in the author's tracker listing."));
-    $this->assertNoText($page2['title'], t("Unpublished nodes do not show up in the author's tracker listing."));
+    $this->assertText($page1['title'],"Nodes show up in the author's tracker listing.");
+    $this->assertNoText($page2['title'],"Unpublished nodes do not show up in the author's tracker listing.");
   }
 
   /**
@@ -81,19 +81,19 @@
     $node = $this->drupalCreateNode($edit);
 
     $this->drupalGet('tracker');
-    $this->assertPattern('/' . $edit['title'] . '.*new/', t('New nodes are flagged as such in the tracker listing.'));
+    $this->assertPattern('/' . $edit['title'] . '.*new/','New nodes are flagged as such in the tracker listing.');
 
     $this->drupalGet('node/' . $node->nid);
     $this->drupalGet('tracker');
-    $this->assertNoPattern('/' . $edit['title'] . '.*new/', t('Visited nodes are not flagged as new.'));
+    $this->assertNoPattern('/' . $edit['title'] . '.*new/','Visited nodes are not flagged as new.');
 
     $this->drupalLogin($this->other_user);
     $this->drupalGet('tracker');
-    $this->assertPattern('/' . $edit['title'] . '.*new/', t('For another user, new nodes are flagged as such in the tracker listing.'));
+    $this->assertPattern('/' . $edit['title'] . '.*new/','For another user, new nodes are flagged as such in the tracker listing.');
 
     $this->drupalGet('node/' . $node->nid);
     $this->drupalGet('tracker');
-    $this->assertNoPattern('/' . $edit['title'] . '.*new/', t('For another user, visited nodes are not flagged as new.'));
+    $this->assertNoPattern('/' . $edit['title'] . '.*new/','For another user, visited nodes are not flagged as new.');
   }
 
   /**
@@ -120,7 +120,7 @@
 
     $this->drupalLogin($this->other_user);
     $this->drupalGet('tracker');
-    $this->assertText('1 new', t('New comments are counted on the tracker listing pages.'));
+    $this->assertText('1 new','New comments are counted on the tracker listing pages.');
     $this->drupalGet('node/' . $node->nid);
 
     // Add another comment as other_user.
@@ -135,6 +135,6 @@
 
     $this->drupalLogin($this->user);
     $this->drupalGet('tracker');
-    $this->assertText('1 new', t('New comments are counted on the tracker listing pages.'));
+    $this->assertText('1 new','New comments are counted on the tracker listing pages.');
   }
 }
Index: modules/user/user.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.test,v
retrieving revision 1.44
diff -u -r1.44 user.test
--- modules/user/user.test	1 Jul 2009 12:06:22 -0000	1.44
+++ modules/user/user.test	9 Jul 2009 02:46:30 -0000
@@ -4,9 +4,9 @@
 class UserRegistrationTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('User registration'),
-      'description' => t('Registers a user, fails login, resets password, successfully logs in with the one time password, fails password change, changes password, logs out, successfully logs in with the new password, visits profile page.'),
-      'group' => t('User')
+      'name' => 'User registration',
+      'description' => 'Registers a user, fails login, resets password, successfully logs in with the one time password, fails password change, changes password, logs out, successfully logs in with the new password, visits profile page.',
+      'group' => 'User'
     );
   }
 
@@ -28,48 +28,48 @@
     $edit['name'] = $name = $this->randomName();
     $edit['mail'] = $mail = $edit['name'] . '@example.com';
     $this->drupalPost('user/register', $edit, t('Create new account'));
-    $this->assertText(t('Your password and further instructions have been sent to your e-mail address.'), t('User registered successfully.'));
+    $this->assertText(t('Your password and further instructions have been sent to your e-mail address.'),'User registered successfully.');
 
     // Check database for created user.
     $users = user_load_multiple(array(), array('name' => $name, 'mail' => $mail));
     $user = reset($users);
-    $this->assertTrue($user, t('User found in database.'));
-    $this->assertTrue($user->uid > 0, t('User has valid user id.'));
+    $this->assertTrue($user,'User found in database.');
+    $this->assertTrue($user->uid > 0,'User has valid user id.');
 
     // Check user fields.
-    $this->assertEqual($user->name, $name, t('Username matches.'));
-    $this->assertEqual($user->mail, $mail, t('E-mail address matches.'));
-    $this->assertEqual($user->theme, '', t('Correct theme field.'));
-    $this->assertEqual($user->signature, '', t('Correct signature field.'));
-    $this->assertTrue(($user->created > REQUEST_TIME - 20 ), t('Correct creation time.'));
-    $this->assertEqual($user->status, variable_get('user_register', 1) == 1 ? 1 : 0, t('Correct status field.'));
-    $this->assertEqual($user->timezone, variable_get('date_default_timezone'), t('Correct time zone field.'));
-    $this->assertEqual($user->language, '', t('Correct language field.'));
-    $this->assertEqual($user->picture, '', t('Correct picture field.'));
-    $this->assertEqual($user->init, $mail, t('Correct init field.'));
+    $this->assertEqual($user->name, $name,'Username matches.');
+    $this->assertEqual($user->mail, $mail,'E-mail address matches.');
+    $this->assertEqual($user->theme, '','Correct theme field.');
+    $this->assertEqual($user->signature, '','Correct signature field.');
+    $this->assertTrue(($user->created > REQUEST_TIME - 20 ),'Correct creation time.');
+    $this->assertEqual($user->status, variable_get('user_register', 1) == 1 ? 1 : 0,'Correct status field.');
+    $this->assertEqual($user->timezone, variable_get('date_default_timezone'),'Correct time zone field.');
+    $this->assertEqual($user->language, '','Correct language field.');
+    $this->assertEqual($user->picture, '','Correct picture field.');
+    $this->assertEqual($user->init, $mail,'Correct init field.');
 
     // Attempt to login with incorrect password.
     $edit = array();
     $edit['name'] = $name;
     $edit['pass'] = 'foo';
     $this->drupalPost('user', $edit, t('Log in'));
-    $this->assertText(t('Sorry, unrecognized username or password. Have you forgotten your password?'), t('Invalid login attempt failed.'));
+    $this->assertText(t('Sorry, unrecognized username or password. Have you forgotten your password?'),'Invalid login attempt failed.');
 
     // Login using password reset page.
     $url = user_pass_reset_url($user);
     $this->drupalGet($url);
-    $this->assertText(t('This login can be used only once.'), t('Login can be used only once.'));
+    $this->assertText(t('This login can be used only once.'),'Login can be used only once.');
 
     $this->drupalPost(NULL, NULL, t('Log in'));
-    $this->assertText(t('You have just used your one-time login link. It is no longer necessary to use this link to login. Please change your password.'), t('This link is no longer valid.'));
+    $this->assertText(t('You have just used your one-time login link. It is no longer necessary to use this link to login. Please change your password.'),'This link is no longer valid.');
 
     // Check password type validation
     $edit = array();
     $edit['pass[pass1]'] = '99999.0';
     $edit['pass[pass2]'] = '99999';
     $this->drupalPost(NULL, $edit, t('Save'));
-    $this->assertText(t('The specified passwords do not match.'), t('Type mismatched passwords display an error message.'));
-    $this->assertNoText(t('The changes have been saved.'), t('Save user password with mismatched type in password confirm.'));
+    $this->assertText(t('The specified passwords do not match.'),'Type mismatched passwords display an error message.');
+    $this->assertNoText(t('The changes have been saved.'),'Save user password with mismatched type in password confirm.');
 
     // Change user password.
     $new_pass = user_password();
@@ -83,27 +83,27 @@
     require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'includes/password.inc');
 
     $user = user_load($user->uid, TRUE);
-    $this->assertTrue(user_check_password($new_pass, $user), t('Correct password in database.'));
+    $this->assertTrue(user_check_password($new_pass, $user),'Correct password in database.');
 
     // Logout of user account.
     $this->clickLink(t('Log out'));
-    $this->assertNoText($user->name, t('Logged out.'));
+    $this->assertNoText($user->name,'Logged out.');
 
     // Login user.
     $edit = array();
     $edit['name'] = $user->name;
     $edit['pass'] = $new_pass;
     $this->drupalPost('user', $edit, t('Log in'));
-    $this->assertText(t('Log out'), t('Logged in.'));
+    $this->assertText(t('Log out'),'Logged in.');
 
-    $this->assertText($user->name, t('[logged in] Username found.'));
-    $this->assertNoText(t('Sorry. Unrecognized username or password.'), t('[logged in] No message for unrecognized username or password.'));
-    $this->assertNoText(t('User login'), t('[logged in] No user login form present.'));
+    $this->assertText($user->name,'[logged in] Username found.');
+    $this->assertNoText(t('Sorry. Unrecognized username or password.'),'[logged in] No message for unrecognized username or password.');
+    $this->assertNoText(t('User login'),'[logged in] No user login form present.');
 
     $this->drupalGet('user');
-    $this->assertText($user->name, t('[user auth] Not login page.'));
-    $this->assertText(t('View'), t('[user auth] Found view tab on the profile page.'));
-    $this->assertText(t('Edit'), t('[user auth] Found edit tab on the profile page.'));
+    $this->assertText($user->name,'[user auth] Not login page.');
+    $this->assertText(t('View'),'[user auth] Found view tab on the profile page.');
+    $this->assertText(t('Edit'),'[user auth] Found edit tab on the profile page.');
   }
 }
 
@@ -111,9 +111,9 @@
 class UserValidationTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Username/e-mail validation'),
-      'description' => t('Verify that username/email validity checks behave as designed.'),
-      'group' => t('User')
+      'name' => 'Username/e-mail validation',
+      'description' => 'Verify that username/email validity checks behave as designed.',
+      'group' => 'User'
     );
   }
 
@@ -162,9 +162,9 @@
 class UserCancelTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Cancel account'),
-      'description' => t('Ensure that account cancellation methods work as expected.'),
-      'group' => t('User'),
+      'name' => 'Cancel account',
+      'description' => 'Ensure that account cancellation methods work as expected.',
+      'group' => 'User',
     );
   }
 
@@ -185,18 +185,18 @@
 
     // Attempt to cancel account.
     $this->drupalGet('user/' . $account->uid . '/edit');
-    $this->assertNoRaw(t('Cancel account'), t('No cancel account button displayed.'));
+    $this->assertNoRaw(t('Cancel account'),'No cancel account button displayed.');
 
     // Attempt bogus account cancellation request confirmation.
     $timestamp = $account->login;
     $this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
-    $this->assertResponse(403, t('Bogus cancelling request rejected.'));
+    $this->assertResponse(403,'Bogus cancelling request rejected.');
     $account = user_load($account->uid);
-    $this->assertTrue($account->status == 1, t('User account was not canceled.'));
+    $this->assertTrue($account->status == 1,'User account was not canceled.');
 
     // Confirm user's content has not been altered.
     $test_node = node_load($node->nid, NULL, TRUE);
-    $this->assertTrue(($test_node->uid == $account->uid && $test_node->status == 1), t('Node of the user has not been altered.'));
+    $this->assertTrue(($test_node->uid == $account->uid && $test_node->status == 1),'Node of the user has not been altered.');
   }
 
   /**
@@ -220,24 +220,24 @@
     // Confirm account cancellation.
     $timestamp = time();
     $this->drupalPost(NULL, NULL, t('Cancel account'));
-    $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), t('Account cancellation request mailed message displayed.'));
+    $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'),'Account cancellation request mailed message displayed.');
 
     // Attempt bogus account cancellation request confirmation.
     $bogus_timestamp = $timestamp + 60;
     $this->drupalGet("user/$account->uid/cancel/confirm/$bogus_timestamp/" . user_pass_rehash($account->pass, $bogus_timestamp, $account->login));
-    $this->assertText(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'), t('Bogus cancelling request rejected.'));
+    $this->assertText(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'),'Bogus cancelling request rejected.');
     $account = user_load($account->uid);
-    $this->assertTrue($account->status == 1, t('User account was not canceled.'));
+    $this->assertTrue($account->status == 1,'User account was not canceled.');
 
     // Attempt expired account cancellation request confirmation.
     $bogus_timestamp = $timestamp - 86400 - 60;
     $this->drupalGet("user/$account->uid/cancel/confirm/$bogus_timestamp/" . user_pass_rehash($account->pass, $bogus_timestamp, $account->login));
-    $this->assertText(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'), t('Expired cancel account request rejected.'));
-    $this->assertTrue(reset(user_load_multiple(array($account->uid), array('status' => 1))), t('User account was not canceled.'));
+    $this->assertText(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'),'Expired cancel account request rejected.');
+    $this->assertTrue(reset(user_load_multiple(array($account->uid), array('status' => 1))),'User account was not canceled.');
 
     // Confirm user's content has not been altered.
     $test_node = node_load($node->nid, NULL, TRUE);
-    $this->assertTrue(($test_node->uid == $account->uid && $test_node->status == 1), t('Node of the user has not been altered.'));
+    $this->assertTrue(($test_node->uid == $account->uid && $test_node->status == 1),'Node of the user has not been altered.');
   }
 
   /**
@@ -256,23 +256,23 @@
     // Attempt to cancel account.
     $this->drupalGet('user/' . $account->uid . '/edit');
     $this->drupalPost(NULL, NULL, t('Cancel account'));
-    $this->assertText(t('Are you sure you want to cancel your account?'), t('Confirmation form to cancel account displayed.'));
-    $this->assertText(t('Your account will be blocked and you will no longer be able to log in. All of your content will remain attributed to your user name.'), t('Informs that all content will be remain as is.'));
-    $this->assertNoText(t('Select the method to cancel the account above.'), t('Does not allow user to select account cancellation method.'));
+    $this->assertText(t('Are you sure you want to cancel your account?'),'Confirmation form to cancel account displayed.');
+    $this->assertText(t('Your account will be blocked and you will no longer be able to log in. All of your content will remain attributed to your user name.'),'Informs that all content will be remain as is.');
+    $this->assertNoText(t('Select the method to cancel the account above.'),'Does not allow user to select account cancellation method.');
 
     // Confirm account cancellation.
     $timestamp = time();
 
     $this->drupalPost(NULL, NULL, t('Cancel account'));
-    $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), t('Account cancellation request mailed message displayed.'));
+    $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'),'Account cancellation request mailed message displayed.');
 
     // Confirm account cancellation request.
     $this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
     $account = user_load($account->uid, TRUE);
-    $this->assertTrue($account->status == 0, t('User has been blocked.'));
+    $this->assertTrue($account->status == 0,'User has been blocked.');
 
     // Confirm user is logged out.
-    $this->assertNoText($account->name, t('Logged out.'));
+    $this->assertNoText($account->name,'Logged out.');
   }
 
   /**
@@ -296,27 +296,27 @@
     // Attempt to cancel account.
     $this->drupalGet('user/' . $account->uid . '/edit');
     $this->drupalPost(NULL, NULL, t('Cancel account'));
-    $this->assertText(t('Are you sure you want to cancel your account?'), t('Confirmation form to cancel account displayed.'));
-    $this->assertText(t('Your account will be blocked and you will no longer be able to log in. All of your content will be hidden from everyone but administrators.'), t('Informs that all content will be unpublished.'));
+    $this->assertText(t('Are you sure you want to cancel your account?'),'Confirmation form to cancel account displayed.');
+    $this->assertText(t('Your account will be blocked and you will no longer be able to log in. All of your content will be hidden from everyone but administrators.'),'Informs that all content will be unpublished.');
 
     // Confirm account cancellation.
     $timestamp = time();
     $this->drupalPost(NULL, NULL, t('Cancel account'));
-    $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), t('Account cancellation request mailed message displayed.'));
+    $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'),'Account cancellation request mailed message displayed.');
 
     // Confirm account cancellation request.
     $this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
     $account = user_load($account->uid, TRUE);
-    $this->assertTrue($account->status == 0, t('User has been blocked.'));
+    $this->assertTrue($account->status == 0,'User has been blocked.');
 
     // Confirm user's content has been unpublished.
     $test_node = node_load($node->nid, NULL, TRUE);
-    $this->assertTrue($test_node->status == 0, t('Node of the user has been unpublished.'));
+    $this->assertTrue($test_node->status == 0,'Node of the user has been unpublished.');
     $test_node = node_load($node->nid, $node->vid, TRUE);
-    $this->assertTrue($test_node->status == 0, t('Node revision of the user has been unpublished.'));
+    $this->assertTrue($test_node->status == 0,'Node revision of the user has been unpublished.');
 
     // Confirm user is logged out.
-    $this->assertNoText($account->name, t('Logged out.'));
+    $this->assertNoText($account->name,'Logged out.');
   }
 
   /**
@@ -346,28 +346,28 @@
     // Attempt to cancel account.
     $this->drupalGet('user/' . $account->uid . '/edit');
     $this->drupalPost(NULL, NULL, t('Cancel account'));
-    $this->assertText(t('Are you sure you want to cancel your account?'), t('Confirmation form to cancel account displayed.'));
-    $this->assertRaw(t('Your account will be removed and all account information deleted. All of your content will be assigned to the %anonymous-name user.', array('%anonymous-name' => variable_get('anonymous', t('Anonymous')))), t('Informs that all content will be attributed to anonymous account.'));
+    $this->assertText(t('Are you sure you want to cancel your account?'),'Confirmation form to cancel account displayed.');
+    $this->assertRaw(t('Your account will be removed and all account information deleted. All of your content will be assigned to the %anonymous-name user.', array('%anonymous-name' => variable_get('anonymous','Anonymous'))),'Informs that all content will be attributed to anonymous account.');
 
     // Confirm account cancellation.
     $timestamp = time();
     $this->drupalPost(NULL, NULL, t('Cancel account'));
-    $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), t('Account cancellation request mailed message displayed.'));
+    $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'),'Account cancellation request mailed message displayed.');
 
     // Confirm account cancellation request.
     $this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
-    $this->assertFalse(user_load($account->uid, TRUE), t('User is not found in the database.'));
+    $this->assertFalse(user_load($account->uid, TRUE),'User is not found in the database.');
 
     // Confirm that user's content has been attributed to anonymous user.
     $test_node = node_load($node->nid, NULL, TRUE);
-    $this->assertTrue(($test_node->uid == 0 && $test_node->status == 1), t('Node of the user has been attributed to anonymous user.'));
+    $this->assertTrue(($test_node->uid == 0 && $test_node->status == 1),'Node of the user has been attributed to anonymous user.');
     $test_node = node_load($revision_node->nid, $revision, TRUE);
-    $this->assertTrue(($test_node->uid == 0 && $test_node->status == 1), t('Node revision of the user has been attributed to anonymous user.'));
+    $this->assertTrue(($test_node->uid == 0 && $test_node->status == 1),'Node revision of the user has been attributed to anonymous user.');
     $test_node = node_load($revision_node->nid, NULL, TRUE);
-    $this->assertTrue(($test_node->uid != 0 && $test_node->status == 1), t("Current revision of the user's node was not attributed to anonymous user."));
+    $this->assertTrue(($test_node->uid != 0 && $test_node->status == 1),"Current revision of the user's node was not attributed to anonymous user.");
 
     // Confirm that user is logged out.
-    $this->assertNoText($account->name, t('Logged out.'));
+    $this->assertNoText($account->name,'Logged out.');
   }
 
   /**
@@ -388,7 +388,7 @@
     // Create comment.
     module_load_include('test', 'comment');
     $comment = CommentHelperCase::postComment($node, '', $this->randomName(32), FALSE, TRUE);
-    $this->assertTrue(comment_load($comment->id), t('Comment found.'));
+    $this->assertTrue(comment_load($comment->id),'Comment found.');
 
     // Create a node with two revisions, the initial one belonging to the
     // cancelling user.
@@ -402,26 +402,26 @@
     // Attempt to cancel account.
     $this->drupalGet('user/' . $account->uid . '/edit');
     $this->drupalPost(NULL, NULL, t('Cancel account'));
-    $this->assertText(t('Are you sure you want to cancel your account?'), t('Confirmation form to cancel account displayed.'));
-    $this->assertText(t('Your account will be removed and all account information deleted. All of your content will also be deleted.'), t('Informs that all content will be deleted.'));
+    $this->assertText(t('Are you sure you want to cancel your account?'),'Confirmation form to cancel account displayed.');
+    $this->assertText(t('Your account will be removed and all account information deleted. All of your content will also be deleted.'),'Informs that all content will be deleted.');
 
     // Confirm account cancellation.
     $timestamp = time();
     $this->drupalPost(NULL, NULL, t('Cancel account'));
-    $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), t('Account cancellation request mailed message displayed.'));
+    $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'),'Account cancellation request mailed message displayed.');
 
     // Confirm account cancellation request.
     $this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
-    $this->assertFalse(user_load($account->uid, TRUE), t('User is not found in the database.'));
+    $this->assertFalse(user_load($account->uid, TRUE),'User is not found in the database.');
 
     // Confirm that user's content has been deleted.
-    $this->assertFalse(node_load($node->nid, NULL, TRUE), t('Node of the user has been deleted.'));
-    $this->assertFalse(node_load($node->nid, $revision, TRUE), t('Node revision of the user has been deleted.'));
-    $this->assertTrue(node_load($revision_node->nid, NULL, TRUE), t("Current revision of the user's node was not deleted."));
-    $this->assertFalse(comment_load($comment->id), t('Comment of the user has been deleted.'));
+    $this->assertFalse(node_load($node->nid, NULL, TRUE),'Node of the user has been deleted.');
+    $this->assertFalse(node_load($node->nid, $revision, TRUE),'Node revision of the user has been deleted.');
+    $this->assertTrue(node_load($revision_node->nid, NULL, TRUE),"Current revision of the user's node was not deleted.");
+    $this->assertFalse(comment_load($comment->id),'Comment of the user has been deleted.');
 
     // Confirm that user is logged out.
-    $this->assertNoText($account->name, t('Logged out.'));
+    $this->assertNoText($account->name,'Logged out.');
   }
 
   /**
@@ -440,13 +440,13 @@
     // Delete regular user.
     $this->drupalGet('user/' . $account->uid . '/edit');
     $this->drupalPost(NULL, NULL, t('Cancel account'));
-    $this->assertRaw(t('Are you sure you want to cancel the account %name?', array('%name' => $account->name)), t('Confirmation form to cancel account displayed.'));
-    $this->assertText(t('Select the method to cancel the account above.'), t('Allows to select account cancellation method.'));
+    $this->assertRaw(t('Are you sure you want to cancel the account %name?', array('%name' => $account->name)),'Confirmation form to cancel account displayed.');
+    $this->assertText(t('Select the method to cancel the account above.'),'Allows to select account cancellation method.');
 
     // Confirm deletion.
     $this->drupalPost(NULL, NULL, t('Cancel account'));
-    $this->assertRaw(t('%name has been deleted.', array('%name' => $account->name)), t('User deleted.'));
-    $this->assertFalse(user_load($account->uid), t('User is not found in the database.'));
+    $this->assertRaw(t('%name has been deleted.', array('%name' => $account->name)),'User deleted.');
+    $this->assertFalse(user_load($account->uid),'User is not found in the database.');
   }
 
   /**
@@ -476,10 +476,10 @@
     }
     $edit['accounts[' . $admin_user->uid . ']'] = TRUE;
     $this->drupalPost('admin/user/user', $edit, t('Update'));
-    $this->assertText(t('Are you sure you want to cancel these user accounts?'), t('Confirmation form to cancel accounts displayed.'));
-    $this->assertText(t('When cancelling these accounts'), t('Allows to select account cancellation method.'));
-    $this->assertText(t('Require e-mail confirmation to cancel account.'), t('Allows to send confirmation mail.'));
-    $this->assertText(t('Notify user when account is canceled.'), t('Allows to send notification mail.'));
+    $this->assertText(t('Are you sure you want to cancel these user accounts?'),'Confirmation form to cancel accounts displayed.');
+    $this->assertText(t('When cancelling these accounts'),'Allows to select account cancellation method.');
+    $this->assertText(t('Require e-mail confirmation to cancel account.'),'Allows to send confirmation mail.');
+    $this->assertText(t('Notify user when account is canceled.'),'Allows to send notification mail.');
 
     // Confirm deletion.
     $this->drupalPost(NULL, NULL, t('Cancel accounts'));
@@ -488,12 +488,12 @@
       $status = $status && (strpos($this->content, t('%name has been deleted.', array('%name' => $account->name))) !== FALSE);
       $status = $status && !user_load($account->uid, TRUE);
     }
-    $this->assertTrue($status, t('Users deleted and not found in the database.'));
+    $this->assertTrue($status,'Users deleted and not found in the database.');
 
     // Ensure that admin account was not cancelled.
-    $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), t('Account cancellation request mailed message displayed.'));
+    $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'),'Account cancellation request mailed message displayed.');
     $admin_user = user_load($admin_user->uid);
-    $this->assertTrue($admin_user->status == 1, t('Administrative user is found in the database and enabled.'));
+    $this->assertTrue($admin_user->status == 1,'Administrative user is found in the database and enabled.');
   }
 }
 
@@ -503,9 +503,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Upload user picture'),
-      'description' => t('Assure that dimension check, extension check and image scaling work as designed.'),
-      'group' => t('User')
+      'name' => 'Upload user picture',
+      'description' => 'Assure that dimension check, extension check and image scaling work as designed.',
+      'group' => 'User'
     );
   }
 
@@ -534,7 +534,7 @@
     // Try to upload a file that is not an image for the user picture.
     $not_an_image = current($this->drupalGetTestFiles('html'));
     $this->saveUserPicture($not_an_image);
-    $this->assertRaw(t('Only JPEG, PNG and GIF images are allowed.'), t('Non-image files are not accepted.'));
+    $this->assertRaw(t('Only JPEG, PNG and GIF images are allowed.'),'Non-image files are not accepted.');
   }
 
   /**
@@ -561,12 +561,12 @@
         // Check that the image was resized and is being displayed on the
         // user's profile page.
         $text = t('The image was resized to fit within the maximum allowed dimensions of %dimensions pixels.', array('%dimensions' => $test_dim));
-        $this->assertRaw($text, t('Image was resized.'));
+        $this->assertRaw($text,'Image was resized.');
         $alt = t("@user's picture", array('@user' => $this->user->name));
-        $this->assertRaw(theme('image', $pic_path, $alt, $alt, '', FALSE), t("Image is displayed in user's edit page"));
+        $this->assertRaw(theme('image', $pic_path, $alt, $alt, '', FALSE),"Image is displayed in user's edit page");
 
         // Check if file is located in proper directory.
-        $this->assertTrue(is_file($pic_path), t("File is located in proper directory"));
+        $this->assertTrue(is_file($pic_path),"File is located in proper directory");
       }
   }
 
@@ -598,12 +598,12 @@
 
         // Test that the upload failed and that the correct reason was cited.
         $text = t('The specified file %filename could not be uploaded.', array('%filename' => $image->filename));
-        $this->assertRaw($text, t('Upload failed.'));
+        $this->assertRaw($text,'Upload failed.');
         $text = t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => format_size(filesize($image->filepath)), '%maxsize' => format_size($test_size * 1024)));
-        $this->assertRaw($text, t('File size cited as reason for failure.'));
+        $this->assertRaw($text,'File size cited as reason for failure.');
 
         // Check if file is not uploaded.
-        $this->assertFalse(is_file($pic_path), t('File was not uploaded.'));
+        $this->assertFalse(is_file($pic_path),'File was not uploaded.');
       }
   }
 
@@ -632,12 +632,12 @@
 
         // Test that the upload failed and that the correct reason was cited.
         $text = t('The specified file %filename could not be uploaded.', array('%filename' => $image->filename));
-        $this->assertRaw($text, t('Upload failed.'));
+        $this->assertRaw($text,'Upload failed.');
         $text = t('The image is too large; the maximum dimensions are %dimensions pixels.', array('%dimensions' => $test_dim));
-        $this->assertRaw($text, t('Checking response on invalid image (dimensions).'));
+        $this->assertRaw($text,'Checking response on invalid image (dimensions).');
 
         // Check if file is not uploaded.
-        $this->assertFalse(is_file($pic_path), t('File was not uploaded.'));
+        $this->assertFalse(is_file($pic_path),'File was not uploaded.');
       }
   }
 
@@ -666,12 +666,12 @@
 
         // Test that the upload failed and that the correct reason was cited.
         $text = t('The specified file %filename could not be uploaded.', array('%filename' => $image->filename));
-        $this->assertRaw($text, t('Upload failed.'));
+        $this->assertRaw($text,'Upload failed.');
         $text = t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => format_size(filesize($image->filepath)), '%maxsize' => format_size($test_size * 1024)));
-        $this->assertRaw($text, t('File size cited as reason for failure.'));
+        $this->assertRaw($text,'File size cited as reason for failure.');
 
         // Check if file is not uploaded.
-        $this->assertFalse(is_file($pic_path), t('File was not uploaded.'));
+        $this->assertFalse(is_file($pic_path),'File was not uploaded.');
       }
   }
 
@@ -697,10 +697,10 @@
 
       // Check if image is displayed in user's profile page.
       $this->drupalGet('user');
-      $this->assertRaw($pic_path, t("Image is displayed in user's profile page"));
+      $this->assertRaw($pic_path,"Image is displayed in user's profile page");
 
       // Check if file is located in proper directory.
-      $this->assertTrue(is_file($pic_path), t('File is located in proper directory'));
+      $this->assertTrue(is_file($pic_path),'File is located in proper directory');
     }
   }
 
@@ -723,9 +723,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Role permissions'),
-      'description' => t('Verify that role permissions can be added and removed via the permissions page.'),
-      'group' => t('User')
+      'name' => 'Role permissions',
+      'description' => 'Verify that role permissions can be added and removed via the permissions page.',
+      'group' => 'User'
     );
   }
 
@@ -749,20 +749,20 @@
     $account = $this->admin_user;
 
     // Add a permission.
-    $this->assertFalse(user_access('administer nodes', $account, TRUE), t('User does not have "administer nodes" permission.'));
+    $this->assertFalse(user_access('administer nodes', $account, TRUE),'User does not have "administer nodes" permission.');
     $edit = array();
     $edit[$rid . '[administer nodes]'] = TRUE;
     $this->drupalPost('admin/user/permissions', $edit, t('Save permissions'));
-    $this->assertText(t('The changes have been saved.'), t('Successful save message displayed.'));
-    $this->assertTrue(user_access('administer nodes', $account, TRUE), t('User now has "administer nodes" permission.'));
+    $this->assertText(t('The changes have been saved.'),'Successful save message displayed.');
+    $this->assertTrue(user_access('administer nodes', $account, TRUE),'User now has "administer nodes" permission.');
 
     // Remove a permission.
-    $this->assertTrue(user_access('access user profiles', $account, TRUE), t('User has "access user profiles" permission.'));
+    $this->assertTrue(user_access('access user profiles', $account, TRUE),'User has "access user profiles" permission.');
     $edit = array();
     $edit[$rid . '[access user profiles]'] = FALSE;
     $this->drupalPost('admin/user/permissions', $edit, t('Save permissions'));
-    $this->assertText(t('The changes have been saved.'), t('Successful save message displayed.'));
-    $this->assertFalse(user_access('access user profiles', $account, TRUE), t('User no longer has "access user profiles" permission.'));
+    $this->assertText(t('The changes have been saved.'),'Successful save message displayed.');
+    $this->assertFalse(user_access('access user profiles', $account, TRUE),'User no longer has "access user profiles" permission.');
   }
 
   /**
@@ -783,16 +783,16 @@
     $edit['modules[Core][aggregator][enable]'] = TRUE;
     $this->drupalPost('admin/build/modules', $edit, t('Save configuration'));
 
-    $this->assertTrue(user_access('administer news feeds', $this->admin_user, TRUE), t('The permission was automatically assigned to the administrator role'));
+    $this->assertTrue(user_access('administer news feeds', $this->admin_user, TRUE),'The permission was automatically assigned to the administrator role');
   }
 }
 
 class UserAdminTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('User administration'),
-      'description' => t('Test user administration page functionality.'),
-      'group' => t('User')
+      'name' => 'User administration',
+      'description' => 'Test user administration page functionality.',
+      'group' => 'User'
     );
   }
 
@@ -809,10 +809,10 @@
     $admin_user = $this->drupalCreateUser(array('administer users'));
     $this->drupalLogin($admin_user);
     $this->drupalGet('admin/user/user');
-    $this->assertText($user_a->name, t('Found user A on admin users page'));
-    $this->assertText($user_b->name, t('Found user B on admin users page'));
-    $this->assertText($user_c->name, t('Found user C on admin users page'));
-    $this->assertText($admin_user->name, t('Found Admin user on admin users page'));
+    $this->assertText($user_a->name,'Found user A on admin users page');
+    $this->assertText($user_b->name,'Found user B on admin users page');
+    $this->assertText($user_c->name,'Found user C on admin users page');
+    $this->assertText($admin_user->name,'Found Admin user on admin users page');
 
     // Filter the users by permission 'administer taxonomy'.
     $edit = array();
@@ -821,9 +821,9 @@
     $this->drupalPost('admin/user/user', $edit, t('Filter'));
 
     // Check if the correct users show up.
-    $this->assertNoText($user_a->name, t('User A not on filtered by perm  admin users page'));
-    $this->assertText($user_b->name, t('Found user B on filtered by perm admin users page'));
-    $this->assertText($user_c->name, t('Found user C on filtered by perm admin users page'));
+    $this->assertNoText($user_a->name,'User A not on filtered by perm  admin users page');
+    $this->assertText($user_b->name,'Found user B on filtered by perm admin users page');
+    $this->assertText($user_c->name,'Found user C on filtered by perm admin users page');
 
     // Test blocking of a user.
     $account = user_load($user_b->uid);
@@ -843,9 +843,9 @@
 class UserTimeZoneFunctionalTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('User time zones'),
-      'description' => t('Set a user time zone and verify that dates are displayed in local time.'),
-      'group' => t('User'),
+      'name' => 'User time zones',
+      'description' => 'Set a user time zone and verify that dates are displayed in local time.',
+      'group' => 'User',
     );
   }
 
@@ -874,26 +874,26 @@
 
     // Confirm date format and time zone.
     $this->drupalGet("node/$node1->nid");
-    $this->assertText('2007-03-09 21:00 PST', t('Date should be PST.'));
+    $this->assertText('2007-03-09 21:00 PST','Date should be PST.');
     $this->drupalGet("node/$node2->nid");
-    $this->assertText('2007-03-11 01:00 PST', t('Date should be PST.'));
+    $this->assertText('2007-03-11 01:00 PST','Date should be PST.');
     $this->drupalGet("node/$node3->nid");
-    $this->assertText('2007-03-20 21:00 PDT', t('Date should be PDT.'));
+    $this->assertText('2007-03-20 21:00 PDT','Date should be PDT.');
 
     // Change user time zone to Santiago time.
     $edit = array();
     $edit['mail'] = $web_user->mail;
     $edit['timezone'] = 'America/Santiago';
     $this->drupalPost("user/$web_user->uid/edit", $edit, t('Save'));
-    $this->assertText(t('The changes have been saved.'), t('Time zone changed to Santiago time.'));
+    $this->assertText(t('The changes have been saved.'),'Time zone changed to Santiago time.');
 
     // Confirm date format and time zone.
     $this->drupalGet("node/$node1->nid");
-    $this->assertText('2007-03-10 02:00 CLST', t('Date should be Chile summer time; five hours ahead of PST.'));
+    $this->assertText('2007-03-10 02:00 CLST','Date should be Chile summer time; five hours ahead of PST.');
     $this->drupalGet("node/$node2->nid");
-    $this->assertText('2007-03-11 05:00 CLT', t('Date should be Chile time; four hours ahead of PST'));
+    $this->assertText('2007-03-11 05:00 CLT','Date should be Chile time; four hours ahead of PST');
     $this->drupalGet("node/$node3->nid");
-    $this->assertText('2007-03-21 00:00 CLT', t('Date should be Chile time; three hours ahead of PDT.'));
+    $this->assertText('2007-03-21 00:00 CLT','Date should be Chile time; three hours ahead of PDT.');
   }
 }
 
@@ -903,9 +903,9 @@
 class UserAutocompleteTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('User autocompletion'),
-      'description' => t('Test user autocompletion functionality.'),
-      'group' => t('User')
+      'name' => 'User autocompletion',
+      'description' => 'Test user autocompletion functionality.',
+      'group' => 'User'
     );
   }
 
@@ -924,16 +924,16 @@
     // Check access from unprivileged user, should be denied.
     $this->drupalLogin($this->unprivileged_user);
     $this->drupalGet('user/autocomplete/' . $this->unprivileged_user->name[0]);
-    $this->assertResponse(403, t('Autocompletion access denied to user without permission.'));
+    $this->assertResponse(403,'Autocompletion access denied to user without permission.');
 
     // Check access from privileged user.
     $this->drupalLogout();
     $this->drupalLogin($this->privileged_user);
     $this->drupalGet('user/autocomplete/' . $this->unprivileged_user->name[0]);
-    $this->assertResponse(200, t('Autocompletion access allowed.'));
+    $this->assertResponse(200,'Autocompletion access allowed.');
 
     // Using first letter of the user's name, make sure the user's full name is in the results.
-    $this->assertRaw($this->unprivileged_user->name, t('User name found in autocompletion results.'));
+    $this->assertRaw($this->unprivileged_user->name,'User name found in autocompletion results.');
   }
 }
 
@@ -943,9 +943,9 @@
 class UserBlocksUnitTests extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('User blocks'),
-      'description' => t('Test user blocks.'),
-      'group' => t('User')
+      'name' => 'User blocks',
+      'description' => 'Test user blocks.',
+      'group' => 'User'
     );
   }
 
@@ -961,16 +961,16 @@
     $edit['name'] = $user->name;
     $edit['pass'] = $user->pass_raw;
     $this->drupalPost('admin/user/permissions', $edit, t('Log in'));
-    $this->assertText(t('Log out'), t('Logged in.'));
+    $this->assertText(t('Log out'),'Logged in.');
 
     // Check that we are still on the same page.
-    $this->assertPattern('!<title.*?' . t('Permissions') . '.*?</title>!', t('Still on the same page after login for access denied page'));
+    $this->assertPattern('!<title.*?' . t('Permissions') . '.*?</title>!','Still on the same page after login for access denied page');
 
     // Now, log out and repeat with a non-403 page.
     $this->clickLink(t('Log out'));
     $this->drupalPost('filter/tips', $edit, t('Log in'));
-    $this->assertText(t('Log out'), t('Logged in.'));
-    $this->assertPattern('!<title.*?' . t('Compose tips') . '.*?</title>!', t('Still on the same page after login for allowed page'));
+    $this->assertText(t('Log out'),'Logged in.');
+    $this->assertPattern('!<title.*?' . t('Compose tips') . '.*?</title>!','Still on the same page after login for allowed page');
   }
 
   /**
@@ -981,12 +981,12 @@
     $user1 = $this->drupalCreateUser(array());
     $user2 = $this->drupalCreateUser(array());
     $user3 = $this->drupalCreateUser(array());
-    $this->assertEqual(db_query("SELECT COUNT(*) FROM {sessions}")->fetchField(), 0, t('Sessions table is empty.'));
+    $this->assertEqual(db_query("SELECT COUNT(*) FROM {sessions}")->fetchField(), 0,'Sessions table is empty.');
 
     // Insert a user with two sessions.
     $this->insertSession(array('uid' => $user1->uid));
     $this->insertSession(array('uid' => $user1->uid));
-    $this->assertEqual(db_query("SELECT COUNT(*) FROM {sessions} WHERE uid = :uid", array(':uid' => $user1->uid))->fetchField(), 2, t('Duplicate user session has been inserted.'));
+    $this->assertEqual(db_query("SELECT COUNT(*) FROM {sessions} WHERE uid = :uid", array(':uid' => $user1->uid))->fetchField(), 2,'Duplicate user session has been inserted.');
 
     // Insert a user with only one session.
     $this->insertSession(array('uid' => $user2->uid, 'timestamp' => REQUEST_TIME + 1));
@@ -1001,11 +1001,11 @@
     // Test block output.
     $block = user_block_view('online');
     $this->drupalSetContent($block['content']);
-    $this->assertRaw(t('%members and %visitors', array('%members' => '2 users', '%visitors' => '2 guests')), t('Correct number of online users (2 users and 2 guests).'));
-    $this->assertText($user1->name, t('Active user 1 found in online list.'));
-    $this->assertText($user2->name, t('Active user 2 found in online list.'));
-    $this->assertNoText($user3->name, t("Inactive user not found in online list."));
-    $this->assertTrue(strpos($this->drupalGetContent(), $user1->name) > strpos($this->drupalGetContent(), $user2->name), t('Online users are ordered correctly.'));
+    $this->assertRaw(t('%members and %visitors', array('%members' => '2 users', '%visitors' => '2 guests')),'Correct number of online users (2 users and 2 guests).');
+    $this->assertText($user1->name,'Active user 1 found in online list.');
+    $this->assertText($user2->name,'Active user 2 found in online list.');
+    $this->assertNoText($user3->name,"Inactive user not found in online list.");
+    $this->assertTrue(strpos($this->drupalGetContent(), $user1->name) > strpos($this->drupalGetContent(), $user2->name),'Online users are ordered correctly.');
   }
 
   /**
@@ -1021,7 +1021,7 @@
     db_insert('sessions')
       ->fields($fields)
       ->execute();
-    $this->assertEqual(db_query("SELECT COUNT(*) FROM {sessions} WHERE uid = :uid AND sid = :sid AND timestamp = :timestamp", array(':uid' => $fields['uid'], ':sid' => $fields['sid'], ':timestamp' => $fields['timestamp']))->fetchField(), 1, t('Session record inserted.'));
+    $this->assertEqual(db_query("SELECT COUNT(*) FROM {sessions} WHERE uid = :uid AND sid = :sid AND timestamp = :timestamp", array(':uid' => $fields['uid'], ':sid' => $fields['sid'], ':timestamp' => $fields['timestamp']))->fetchField(), 1,'Session record inserted.');
   }
 }
 
@@ -1032,9 +1032,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('User save test'),
-      'description' => t('Test user_save() for arbitrary new uid.'),
-      'group' => t('User'),
+      'name' => 'User save test',
+      'description' => 'Test user_save() for arbitrary new uid.',
+      'group' => 'User',
     );
   }
 
@@ -1057,13 +1057,13 @@
       'status' => 1,
     );
     $user_by_return = user_save('', $user);
-    $this->assertTrue($user_by_return, t('Loading user by return of user_save().'));
+    $this->assertTrue($user_by_return,'Loading user by return of user_save().');
 
     // Test if created user exists.
     $user_by_uid = user_load($test_uid);
-    $this->assertTrue($user_by_uid, t('Loading user by uid.'));
+    $this->assertTrue($user_by_uid,'Loading user by uid.');
 
     $user_by_name = user_load_by_name($test_name);
-    $this->assertTrue($user_by_name, t('Loading user by name.'));
+    $this->assertTrue($user_by_name,'Loading user by name.');
   }
 }
Index: modules/path/path.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.test,v
retrieving revision 1.14
diff -u -r1.14 path.test
--- modules/path/path.test	30 Jun 2009 18:21:06 -0000	1.14
+++ modules/path/path.test	9 Jul 2009 02:46:29 -0000
@@ -9,9 +9,9 @@
 class PathTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Path alias functionality'),
-      'description' => t('Add, edit, delete, and change alias and verify its consistency in the database.'),
-      'group' => t('Path'),
+      'name' => 'Path alias functionality',
+      'description' => 'Add, edit, delete, and change alias and verify its consistency in the database.',
+      'group' => 'Path',
     );
   }
 
@@ -43,12 +43,12 @@
     // created.
     cache_clear_all('*', 'cache_path', TRUE);
     $this->drupalGet($edit['src']);
-    $this->assertTrue(cache_get($edit['src'], 'cache_path'), t('Cache entry was created.'));
+    $this->assertTrue(cache_get($edit['src'], 'cache_path'),'Cache entry was created.');
 
     // Visit the alias for the node and confirm a cache entry is created.
     cache_clear_all('*', 'cache_path', TRUE);
     $this->drupalGet($edit['dst']);
-    $this->assertTrue(cache_get($edit['src'], 'cache_path'), t('Cache entry was created.'));
+    $this->assertTrue(cache_get($edit['src'], 'cache_path'),'Cache entry was created.');
   }
 
   /**
@@ -159,9 +159,9 @@
 class PathLanguageTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Path aliases with translated nodes'),
-      'description' => t('Confirm that paths work with translated nodes'),
-      'group' => t('Path'),
+      'name' => 'Path aliases with translated nodes',
+      'description' => 'Confirm that paths work with translated nodes',
+      'group' => 'Path',
     );
   }
 
@@ -231,7 +231,7 @@
     // Confirm that the alias is returned by url().
     $languages = language_list();
     $url = url('node/' . $french_node->nid, array('language' => $languages[$french_node->language]));
-    $this->assertTrue(strpos($url, $edit['path']), t('URL contains the path alias.'));
+    $this->assertTrue(strpos($url, $edit['path']),'URL contains the path alias.');
   }
 }
 
Index: modules/blog/blog.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.test,v
retrieving revision 1.13
diff -u -r1.13 blog.test
--- modules/blog/blog.test	12 Jun 2009 08:39:35 -0000	1.13
+++ modules/blog/blog.test	9 Jul 2009 02:46:28 -0000
@@ -8,9 +8,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Blog functionality'),
-      'description' => t('Create, view, edit, delete, and change blog entries and verify its consistency in the database.'),
-      'group' => t('Blog'),
+      'name' => 'Blog functionality',
+      'description' => 'Create, view, edit, delete, and change blog entries and verify its consistency in the database.',
+      'group' => 'Blog',
     );
   }
 
@@ -38,8 +38,8 @@
 
     $this->drupalGet('blog/' . $this->big_user->uid);
     $this->assertResponse(200);
-    $this->assertTitle(t("@name's blog", array('@name' => $this->big_user->name)) . ' | Drupal', t('Blog title was displayed'));
-    $this->assertText(t('You are not allowed to post a new blog entry.'), t('No new entries can be posted without the right permission'));
+    $this->assertTitle(t("@name's blog", array('@name' => $this->big_user->name)) . ' | Drupal','Blog title was displayed');
+    $this->assertText(t('You are not allowed to post a new blog entry.'),'No new entries can be posted without the right permission');
   }
 
   /**
@@ -50,8 +50,8 @@
 
     $this->drupalGet('blog/' . $this->own_user->uid);
     $this->assertResponse(200);
-    $this->assertTitle(t("@name's blog", array('@name' => $this->own_user->name)) . ' | Drupal', t('Blog title was displayed'));
-    $this->assertText(t('!author has not created any blog entries.', array('!author' => $this->own_user->name)), t('Users blog displayed with no entries'));
+    $this->assertTitle(t("@name's blog", array('@name' => $this->own_user->name)) . ' | Drupal','Blog title was displayed');
+    $this->assertText(t('!author has not created any blog entries.', array('!author' => $this->own_user->name)),'Users blog displayed with no entries');
   }
 
   /**
@@ -126,28 +126,28 @@
     $this->drupalGet('admin/help/blog');
     $this->assertResponse($response2);
     if ($response2 == 200) {
-      $this->assertTitle(t('Blog | Drupal'), t('Blog help node was displayed'));
-      $this->assertText(t('Blog'), t('Blog help node was displayed'));
-      $this->assertText(t('Home ' . $crumb . ' Administer ' . $crumb . ' Help'), t('Breadcrumbs were displayed'));
+      $this->assertTitle(t('Blog | Drupal'),'Blog help node was displayed');
+      $this->assertText(t('Blog'),'Blog help node was displayed');
+      $this->assertText(t('Home ' . $crumb . ' Administer ' . $crumb . ' Help'),'Breadcrumbs were displayed');
     }
 
     // Verify the blog block was displayed.
     $this->drupalGet('');
     $this->assertResponse(200);
-    $this->assertText(t('Recent blog posts'), t('Blog block was displayed'));
+    $this->assertText(t('Recent blog posts'),'Blog block was displayed');
 
     // View blog node.
     $this->drupalGet('node/' . $node->nid);
     $this->assertResponse(200);
-    $this->assertTitle($node->title . ' | Drupal', t('Blog node was displayed'));
-    $this->assertText(t('Home ' . $crumb . ' Blogs ' . $crumb . ' @name' . $quote . 's blog', array('@name' => $node_user->name)), t('Breadcrumbs were displayed'));
+    $this->assertTitle($node->title . ' | Drupal','Blog node was displayed');
+    $this->assertText(t('Home ' . $crumb . ' Blogs ' . $crumb . ' @name' . $quote . 's blog', array('@name' => $node_user->name)),'Breadcrumbs were displayed');
 
     // View blog edit node.
     $this->drupalGet('node/' . $node->nid . '/edit');
     $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertTitle('Edit Blog entry ' . $node->title . ' | Drupal', t('Blog edit node was displayed'));
-      $this->assertText(t('Home ' . $crumb . ' @title', array('@title' => $node->title)), t('Breadcrumbs were displayed'));
+      $this->assertTitle('Edit Blog entry ' . $node->title . ' | Drupal','Blog edit node was displayed');
+      $this->assertText(t('Home ' . $crumb . ' @title', array('@title' => $node->title)),'Breadcrumbs were displayed');
     }
 
     if ($response == 200) {
@@ -156,12 +156,12 @@
       $edit['title'] = 'node/' . $node->nid;
       $edit['body[0][value]'] = $this->randomName(256);
       $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
-      $this->assertRaw(t('Blog entry %title has been updated.', array('%title' => $edit['title'])), t('Blog node was edited'));
+      $this->assertRaw(t('Blog entry %title has been updated.', array('%title' => $edit['title'])),'Blog node was edited');
 
       // Delete blog node.
       $this->drupalPost('node/' . $node->nid . '/delete', array(), t('Delete'));
       $this->assertResponse($response);
-      $this->assertRaw(t('Blog entry %title has been deleted.', array('%title' => $edit['title'])), t('Blog node was deleted'));
+      $this->assertRaw(t('Blog entry %title has been deleted.', array('%title' => $edit['title'])),'Blog node was deleted');
     }
   }
 
@@ -177,29 +177,29 @@
     // Confirm blog entries link exists on the user page.
     $this->drupalGet('user/' . $user->uid);
     $this->assertResponse(200);
-    $this->assertText(t('View recent blog entries'), t('View recent blog entries link was displayed'));
+    $this->assertText(t('View recent blog entries'),'View recent blog entries link was displayed');
 
     // Confirm the recent blog entries link goes to the user's blog page.
     $this->clickLink('View recent blog entries');
-    $this->assertTitle(t("@name's blog | Drupal", array('@name' => $user->name)), t('View recent blog entries link target was correct'));
+    $this->assertTitle(t("@name's blog | Drupal", array('@name' => $user->name)),'View recent blog entries link target was correct');
 
     // Confirm a blog page was displayed.
     $this->drupalGet('blog');
     $this->assertResponse(200);
-    $this->assertTitle('Blogs | Drupal', t('Blog page was displayed'));
-    $this->assertText(t('Home'), t('Breadcrumbs were displayed'));
+    $this->assertTitle('Blogs | Drupal','Blog page was displayed');
+    $this->assertText(t('Home'),'Breadcrumbs were displayed');
     $this->assertLink(t('Create new blog entry.'));
 
     // Confirm a blog page was displayed per user.
     $this->drupalGet('blog/' . $user->uid);
-    $this->assertTitle(t("@name's blog | Drupal", array('@name' => $user->name)), t('User blog node was displayed'));
+    $this->assertTitle(t("@name's blog | Drupal", array('@name' => $user->name)),'User blog node was displayed');
 
     // Confirm a blog feed was displayed.
     $this->drupalGet('blog/feed');
-    $this->assertTitle(t('Drupal blogs'), t('Blog feed was displayed'));
+    $this->assertTitle(t('Drupal blogs'),'Blog feed was displayed');
 
     // Confirm a blog feed was displayed per user.
     $this->drupalGet('blog/' . $user->uid . '/feed');
-    $this->assertTitle(t("@name's blog", array('@name' => $user->name)), t('User blog feed was displayed'));
+    $this->assertTitle(t("@name's blog", array('@name' => $user->name)),'User blog feed was displayed');
   }
 }
Index: modules/field/modules/field_sql_storage/field_sql_storage.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/field_sql_storage/field_sql_storage.test,v
retrieving revision 1.4
diff -u -r1.4 field_sql_storage.test
--- modules/field/modules/field_sql_storage/field_sql_storage.test	28 May 2009 10:05:32 -0000	1.4
+++ modules/field/modules/field_sql_storage/field_sql_storage.test	9 Jul 2009 02:46:29 -0000
@@ -15,9 +15,9 @@
 class FieldSqlStorageTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name'  => t('Field SQL storage tests'),
-      'description'  => t("Test field SQL storage module."),
-      'group' => t('Field')
+      'name'  => 'Field SQL storage tests',
+      'description'  => "Test field SQL storage module.",
+      'group' => 'Field'
     );
   }
 
@@ -128,7 +128,7 @@
     $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC);
     foreach ($values as $delta => $value) {
       if ($delta < $this->field['cardinality']) {
-        $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'], t("Value $delta is inserted correctly"));
+        $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'],"Value $delta is inserted correctly");
       }
       else {
         $this->assertFalse(array_key_exists($delta, $rows), "No extraneous value gets inserted.");
@@ -147,7 +147,7 @@
     $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC);
     foreach ($values as $delta => $value) {
       if ($delta < $this->field['cardinality']) {
-        $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'], t("Value $delta is updated correctly"));
+        $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'],"Value $delta is updated correctly");
       }
       else {
         $this->assertFalse(array_key_exists($delta, $rows), "No extraneous value gets updated.");
@@ -177,7 +177,7 @@
     $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC);
     foreach ($values as $delta => $value) {
       if ($delta < $this->field['cardinality']) {
-        $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'], t("Update with no field_name entry leaves value $delta untouched"));
+        $this->assertEqual($rows[$delta][$this->field_name . '_value'], $value['value'],"Update with no field_name entry leaves value $delta untouched");
       }
     }
 
@@ -185,7 +185,7 @@
     $entity->{$this->field_name} = NULL;
     field_attach_update($entity_type, $entity);
     $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', PDO::FETCH_ASSOC);
-    $this->assertEqual(count($rows), 0, t("Update with an empty field_name entry empties the field."));
+    $this->assertEqual(count($rows), 0,"Update with an empty field_name entry empties the field.");
   }
 
   /**
Index: modules/block/block.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.test,v
retrieving revision 1.20
diff -u -r1.20 block.test
--- modules/block/block.test	8 Jun 2009 09:23:50 -0000	1.20
+++ modules/block/block.test	9 Jul 2009 02:46:28 -0000
@@ -11,9 +11,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Block functionality'),
-      'description' => t('Add, edit and delete custom block. Configure and move a module-defined block.'),
-      'group' => t('Block'),
+      'name' => 'Block functionality',
+      'description' => 'Add, edit and delete custom block. Configure and move a module-defined block.',
+      'group' => 'Block',
     );
   }
 
@@ -45,11 +45,11 @@
     $this->drupalPost('admin/build/block/add', $box, t('Save block'));
 
     // Confirm that the box has been created, and then query the created bid.
-    $this->assertText(t('The block has been created.'), t('Box successfully created.'));
+    $this->assertText(t('The block has been created.'),'Box successfully created.');
     $bid = db_query("SELECT bid FROM {box} WHERE info = :info", array(':info' => $box['info']))->fetchField();
 
     // Check to see if the box was created by checking that it's in the database..
-    $this->assertNotNull($bid, t('Box found in database'));
+    $this->assertNotNull($bid,'Box found in database');
 
     // Check if the block can be moved to all availble regions.
     $box['module'] = 'block';
@@ -61,8 +61,8 @@
     // Delete the created box & verify that it's been deleted and no longer appearing on the page.
     $this->clickLink(t('delete'));
     $this->drupalPost('admin/build/block/delete/' . $bid, array(), t('Delete'));
-    $this->assertRaw(t('The block %title has been removed.', array('%title' => $box['info'])), t('Box successfully deleted.'));
-    $this->assertNoText(t($box['title']), t('Box no longer appears on page.'));
+    $this->assertRaw(t('The block %title has been removed.', array('%title' => $box['info'])),'Box successfully deleted.');
+    $this->assertNoText(t($box['title']),'Box no longer appears on page.');
   }
 
   /**
@@ -84,7 +84,7 @@
     $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
 
     // Confirm that the box is being displayed using configured text format.
-    $this->assertRaw('<h1>Full HTML</h1>', t('Box successfully being displayed using Full HTML.'));
+    $this->assertRaw('<h1>Full HTML</h1>','Box successfully being displayed using Full HTML.');
 
     // Confirm that a user without access to Full HTML can not see the body field,
     // but can still submit the form without errors.
@@ -96,7 +96,7 @@
     $this->assertNoText(t('Please ensure that each block description is unique.'));
 
     // Confirm that the box is still being displayed using configured text format.
-    $this->assertRaw('<h1>Full HTML</h1>', t('Box successfully being displayed using Full HTML.'));
+    $this->assertRaw('<h1>Full HTML</h1>','Box successfully being displayed using Full HTML.');
   }
 
   /**
@@ -119,15 +119,15 @@
     $this->moveBlockToRegion($block, $this->regions[1]);
 
     $this->drupalGet('');
-    $this->assertText('Syndicate', t('Block was displayed on the front page.'));
+    $this->assertText('Syndicate','Block was displayed on the front page.');
 
     $this->drupalGet('user*');
-    $this->assertNoText('Syndicate', t('Block was not displayed according to block visibility rules.'));
+    $this->assertNoText('Syndicate','Block was not displayed according to block visibility rules.');
 
     // Confirm that the block is not displayed to anonymous users.
     $this->drupalLogout();
     $this->drupalGet('');
-    $this->assertNoText('Syndicate', t('Block was not displayed to anonymous users.'));
+    $this->assertNoText('Syndicate','Block was not displayed to anonymous users.');
   }
 
   /**
@@ -142,14 +142,14 @@
 
     // Set block title to confirm that interface works and override any custom titles.
     $this->drupalPost('admin/build/block/configure/' . $block['module'] . '/' . $block['delta'], array('title' => $block['title']), t('Save block'));
-    $this->assertText(t('The block configuration has been saved.'), t('Block title set.'));
+    $this->assertText(t('The block configuration has been saved.'),'Block title set.');
     $bid = db_query("SELECT bid FROM {block} WHERE module = :module AND delta = :delta", array(
       ':module' => $block['module'],
       ':delta' => $block['delta'],
     ))->fetchField();
 
     // Check to see if the block was created by checking that it's in the database.
-    $this->assertNotNull($bid, t('Block found in database'));
+    $this->assertNotNull($bid,'Block found in database');
 
     // Check if the block can be moved to all availble regions.
     foreach ($this->regions as $region) {
@@ -162,21 +162,21 @@
     $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
 
     // Confirm that the block was moved to the proper region.
-    $this->assertText(t('The block settings have been updated.'), t('Block successfully move to disabled region.'));
-    $this->assertNoText(t($block['title']), t('Block no longer appears on page.'));
+    $this->assertText(t('The block settings have been updated.'),'Block successfully move to disabled region.');
+    $this->assertNoText(t($block['title']),'Block no longer appears on page.');
 
     // Confirm that the regions xpath is not availble
     $xpath = '//div[@id="block-block-' . $bid . '"]/*';
-    $this->assertNoFieldByXPath($xpath, FALSE, t('Box found in no regions.'));
+    $this->assertNoFieldByXPath($xpath, FALSE,'Box found in no regions.');
 
     // For convenience of developers, put the navigation block back.
     $edit = array();
     $edit[$block['module'] . '_' . $block['delta'] . '[region]'] = 'left';
     $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
-    $this->assertText(t('The block settings have been updated.'), t('Block successfully move to left region.'));
+    $this->assertText(t('The block settings have been updated.'),'Block successfully move to left region.');
 
     $this->drupalPost('admin/build/block/configure/' . $block['module'] . '/' . $block['delta'], array('title' => 'Navigation'), t('Save block'));
-    $this->assertText(t('The block configuration has been saved.'), t('Block title set.'));
+    $this->assertText(t('The block configuration has been saved.'),'Block title set.');
   }
 
   function moveBlockToRegion($block, $region) {
@@ -194,7 +194,7 @@
     $this->assertText(t('The block settings have been updated.'), t('Block successfully moved to %region_name region.', array( '%region_name' => $region['name'])));
 
     // Confirm that the block is being displayed.
-    $this->assertText(t($block['title']), t('Block successfully being displayed on the page.'));
+    $this->assertText(t($block['title']),'Block successfully being displayed on the page.');
 
     // Confirm that the box was found at the proper region.
     $xpath = '//div[@id="' . $region['id'] . '"]//div[@id="block-' . $block['module'] . '-' . $block['delta'] . '"]/*';
@@ -205,9 +205,9 @@
 class NonDefaultBlockAdmin extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Non default theme admin'),
-      'description' => t('Check the administer page for non default theme.'),
-      'group' => t('Block'),
+      'name' => 'Non default theme admin',
+      'description' => 'Check the administer page for non default theme.',
+      'group' => 'Block',
     );
   }
 
@@ -219,7 +219,7 @@
     $this->drupalLogin($admin_user);
     $this->drupalPost('admin/build/themes', array('status[stark]' => 1), t('Save configuration'));
     $this->drupalGet('admin/build/block/list/stark');
-    $this->assertRaw('stark/layout.css', t('Stark CSS found'));
+    $this->assertRaw('stark/layout.css','Stark CSS found');
   }
 }
 
@@ -229,9 +229,9 @@
 class NewDefaultThemeBlocks extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('New default theme blocks'),
-      'description' => t('Checks that the new default theme gets blocks.'),
-      'group' => t('Block'),
+      'name' => 'New default theme blocks',
+      'description' => 'Checks that the new default theme gets blocks.',
+      'group' => 'Block',
     );
   }
   
@@ -245,7 +245,7 @@
 
     // Ensure no other theme's blocks are in the block table yet.
     $count = db_query_range("SELECT 1 FROM {block} WHERE theme != 'garland'", 0, 1)->fetchField();
-    $this->assertFalse($count, t('Only Garland has blocks.'));
+    $this->assertFalse($count,'Only Garland has blocks.');
 
     // Populate list of all blocks for matching against new theme.
     $blocks = array();
@@ -262,7 +262,7 @@
     $result = db_query("SELECT * FROM {block} WHERE theme='stark'");
     foreach ($result as $block) {
       unset($block->theme, $block->bid);
-      $this->assertEqual($blocks[$block->module][$block->delta], $block, t('Block matched'));
+      $this->assertEqual($blocks[$block->module][$block->delta], $block,'Block matched');
     }
   }
 }
@@ -273,9 +273,9 @@
 class BlockAdminThemeTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Admin theme block admin accessibility'),
-      'description' => t("Check whether the block administer page for a disabled theme acccessible if and only if it's the admin theme."),
-      'group' => t('Block'),
+      'name' => 'Admin theme block admin accessibility',
+      'description' => "Check whether the block administer page for a disabled theme acccessible if and only if it's the admin theme.",
+      'group' => 'Block',
     );
   }
   
@@ -289,12 +289,12 @@
 
     // Ensure that access to block admin page is denied when theme is disabled.
     $this->drupalGet('admin/build/block/list/stark');
-    $this->assertResponse(403, t('The block admin page for a disabled theme can not be accessed'));
+    $this->assertResponse(403,'The block admin page for a disabled theme can not be accessed');
 
     // Enable admin theme and confirm that tab is accessible.
     $edit['admin_theme'] = 'stark';
     $this->drupalPost('admin/build/themes', $edit, t('Save configuration'));
     $this->drupalGet('admin/build/block/list/stark');
-    $this->assertResponse(200, t('The block admin page for the admin theme can be accessed'));
+    $this->assertResponse(200,'The block admin page for the admin theme can be accessed');
   }
 }
Index: modules/book/book.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.test,v
retrieving revision 1.11
diff -u -r1.11 book.test
--- modules/book/book.test	12 Jun 2009 08:39:36 -0000	1.11
+++ modules/book/book.test	9 Jul 2009 02:46:28 -0000
@@ -6,9 +6,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Book functionality'),
-      'description' => t('Create a book, add pages, and test book interface.'),
-      'group' => t('Book'),
+      'name' => 'Book functionality',
+      'description' => 'Create a book, add pages, and test book interface.',
+      'group' => 'Book',
     );
   }
 
@@ -102,7 +102,7 @@
 
     // Check outline structure.
     if ($nodes !== NULL) {
-      $this->assertPattern($this->generateOutlinePattern($nodes), t('Node ' . $number . ' outline confirmed.'));
+      $this->assertPattern($this->generateOutlinePattern($nodes),'Node ' . $number . ' outline confirmed.');
     }
     else {
       $this->pass(t('Node ' . $number . ' doesn\'t have outline.'));
@@ -110,15 +110,15 @@
 
     // Check previous, up, and next links.
     if ($previous) {
-      $this->assertRaw(l('‹ ' . $previous->title, 'node/' . $previous->nid, array('attributes' => array('class' => 'page-previous', 'title' => t('Go to previous page')))), t('Prevoius page link found.'));
+      $this->assertRaw(l('‹ ' . $previous->title, 'node/' . $previous->nid, array('attributes' => array('class' => 'page-previous', 'title' =>'Go to previous page'))),'Prevoius page link found.');
     }
 
     if ($up) {
-      $this->assertRaw(l('up', 'node/' . $up->nid, array('attributes' => array('class' => 'page-up', 'title' => t('Go to parent page')))), t('Up page link found.'));
+      $this->assertRaw(l('up', 'node/' . $up->nid, array('attributes' => array('class' => 'page-up', 'title' =>'Go to parent page'))),'Up page link found.');
     }
 
     if ($next) {
-      $this->assertRaw(l($next->title . ' ›', 'node/' . $next->nid, array('attributes' => array('class' => 'page-next', 'title' => t('Go to next page')))), t('Next page link found.'));
+      $this->assertRaw(l($next->title . ' ›', 'node/' . $next->nid, array('attributes' => array('class' => 'page-next', 'title' =>'Go to next page'))),'Next page link found.');
     }
 
     // Compute the expected breadcrumb.
@@ -136,12 +136,12 @@
     }
 
     // Compare expected and got breadcrumbs.
-    $this->assertIdentical($expected_breadcrumb, $got_breadcrumb, t('The breadcrumb is correctly displayed on the page.'));
+    $this->assertIdentical($expected_breadcrumb, $got_breadcrumb,'The breadcrumb is correctly displayed on the page.');
 
     // Check printer friendly version.
     $this->drupalGet('book/export/html/' . $node->nid);
-    $this->assertText($node->title, t('Printer friendly title found.'));
-    $this->assertRaw(check_markup($node->body[0]['value'], $node->body[0]['format']), t('Printer friendly body found.'));
+    $this->assertText($node->title,'Printer friendly title found.');
+    $this->assertRaw(check_markup($node->body[0]['value'], $node->body[0]['format']),'Printer friendly body found.');
 
     $number++;
   }
@@ -188,7 +188,7 @@
 
     // Check to make sure the book node was created.
     $node = $this->drupalGetNodeByTitle($edit['title']);
-    $this->assertNotNull(($node === FALSE ? NULL : $node), t('Book node found in database.'));
+    $this->assertNotNull(($node === FALSE ? NULL : $node),'Book node found in database.');
     $number++;
 
     return $node;
@@ -198,9 +198,9 @@
 class BookBlockTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Block availability'),
-      'description' => t('Check if the book navigation block is available.'),
-      'group' => t('Book'),
+      'name' => 'Block availability',
+      'description' => 'Check if the book navigation block is available.',
+      'group' => 'Book',
     );
   }
 
@@ -215,12 +215,12 @@
   function testBookNavigationBlock() {
     // Set block title to confirm that the interface is availble.
     $this->drupalPost('admin/build/block/configure/book/navigation', array('title' => $this->randomName(8)), t('Save block'));
-    $this->assertText(t('The block configuration has been saved.'), t('Block configuration set.'));
+    $this->assertText(t('The block configuration has been saved.'),'Block configuration set.');
 
     // Set the block to a region to confirm block is availble.
     $edit = array();
     $edit['book_navigation[region]'] = 'footer';
     $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
-    $this->assertText(t('The block settings have been updated.'), t('Block successfully move to footer region.'));
+    $this->assertText(t('The block settings have been updated.'),'Block successfully move to footer region.');
   }
 }
Index: modules/menu/menu.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.test,v
retrieving revision 1.15
diff -u -r1.15 menu.test
--- modules/menu/menu.test	24 May 2009 17:39:32 -0000	1.15
+++ modules/menu/menu.test	9 Jul 2009 02:46:29 -0000
@@ -9,9 +9,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Menu link creation/deletion'),
-      'description' => t('Add a custom menu, add menu links to the custom menu and Navigation menu, check their data, and delete them using the menu module UI.'),
-      'group' => t('Menu')
+      'name' => 'Menu link creation/deletion',
+      'description' => 'Add a custom menu, add menu links to the custom menu and Navigation menu, check their data, and delete them using the menu module UI.',
+      'group' => 'Menu'
     );
   }
 
@@ -66,7 +66,7 @@
     $item['options']['attributes']['title']  = $description;
     menu_link_save($item);
     $saved_item = menu_link_load($item['mlid']);
-    $this->assertEqual($description, $saved_item['options']['attributes']['title'], t('Saving an existing link updates the description (title attribute)'));
+    $this->assertEqual($description, $saved_item['options']['attributes']['title'],'Saving an existing link updates the description (title attribute)');
     $this->resetMenuLink($item, $old_title);
   }
 
@@ -108,7 +108,7 @@
     $this->drupalPost('admin/build/menu/add', $edit, t('Save'));
 
     // Verify that using a menu_name that is too long results in a validation message.
-    $this->assertText(format_plural(MENU_MAX_MENU_NAME_LENGTH_UI, "The menu name can't be longer than 1 character.", "The menu name can't be longer than @count characters."), t('Validation failed when menu name is too long.'));
+    $this->assertText(format_plural(MENU_MAX_MENU_NAME_LENGTH_UI, "The menu name can't be longer than 1 character.", "The menu name can't be longer than @count characters."),'Validation failed when menu name is too long.');
 
     // Change the menu_name so it no longer exceeds the maximum length.
     $menu_name = substr(md5($this->randomName(16)), 0, MENU_MAX_MENU_NAME_LENGTH_UI);
@@ -116,7 +116,7 @@
     $this->drupalPost('admin/build/menu/add', $edit, t('Save'));
 
     // Verify that no validation error is given for menu_name length.
-    $this->assertNoText(format_plural(MENU_MAX_MENU_NAME_LENGTH_UI, "The menu name can't be longer than 1 character.", "The menu name can't be longer than @count characters."), t('Validation failed when menu name is too long.'));
+    $this->assertNoText(format_plural(MENU_MAX_MENU_NAME_LENGTH_UI, "The menu name can't be longer than 1 character.", "The menu name can't be longer than @count characters."),'Validation failed when menu name is too long.');
     // Unlike most other modules, there is no confirmation message displayed.
 
     $this->drupalGet('admin/build/menu');
@@ -128,7 +128,7 @@
     $edit['menu_' . $menu_name . '[region]'] = 'left';
     $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
     $this->assertResponse(200);
-    $this->assertText(t('The block settings have been updated.'), t('Custom menu block was enabled'));
+    $this->assertText(t('The block settings have been updated.'),'Custom menu block was enabled');
 
     return menu_load($menu_name);
   }
@@ -145,7 +145,7 @@
     // Delete custom menu.
     $this->drupalPost("admin/build/menu-customize/$menu_name/delete", array(), t('Delete'));
     $this->assertResponse(200);
-    $this->assertRaw(t('The custom menu %title has been deleted.', array('%title' => $title)), t('Custom menu was deleted'));
+    $this->assertRaw(t('The custom menu %title has been deleted.', array('%title' => $title)),'Custom menu was deleted');
     $this->assertFalse(menu_load($menu_name), 'Custom menu was deleted');
   }
 
@@ -185,7 +185,7 @@
 
     // Verify in the database.
     $hidden = db_query("SELECT hidden FROM {menu_links} WHERE mlid = :mlid", array(':mlid' => $item1['mlid']))->fetchField();
-    $this->assertEqual($hidden, 0, t('Link is not hidden in the database table when enabled via the overview form'));
+    $this->assertEqual($hidden, 0,'Link is not hidden in the database table when enabled via the overview form');
 
     // Save menu links for later tests.
     $this->items[] = $item1;
@@ -281,7 +281,7 @@
       // Verify menu link link.
       $this->clickLink($title);
       $title = $parent_node->title;
-      $this->assertTitle(t("@title | Drupal", array('@title' => $title)), t('Parent menu link link target was correct'));
+      $this->assertTitle(t("@title | Drupal", array('@title' => $title)),'Parent menu link link target was correct');
     }
 
     // Verify menu link.
@@ -291,7 +291,7 @@
     // Verify menu link link.
     $this->clickLink($title);
     $title = $item_node->title;
-    $this->assertTitle(t("@title | Drupal", array('@title' => $title)), t('Menu link link target was correct'));
+    $this->assertTitle(t("@title | Drupal", array('@title' => $title)),'Menu link link target was correct');
   }
 
   /**
@@ -330,7 +330,7 @@
     // Reset menu link.
     $this->drupalPost("admin/build/menu/item/$mlid/reset", array(), t('Reset'));
     $this->assertResponse(200);
-    $this->assertRaw(t('The menu link was reset to its default settings.'), t('Menu link was reset'));
+    $this->assertRaw(t('The menu link was reset to its default settings.'),'Menu link was reset');
 
     // Verify menu link.
     $this->drupalGet('');
@@ -353,7 +353,7 @@
     // Delete menu link.
     $this->drupalPost("admin/build/menu/item/$mlid/delete", array(), t('Confirm'));
     $this->assertResponse(200);
-    $this->assertRaw(t('The menu link %title has been deleted.', array('%title' => $title)), t('Menu link was deleted'));
+    $this->assertRaw(t('The menu link %title has been deleted.', array('%title' => $title)),'Menu link was deleted');
 
     // Verify deletion.
     $this->drupalGet('');
@@ -393,7 +393,7 @@
     // Unlike most other modules, there is no confirmation message displayed.
     // Verify in the database.
     $hidden = db_query("SELECT hidden FROM {menu_links} WHERE mlid = :mlid", array(':mlid' => $mlid))->fetchField();
-    $this->assertEqual($hidden, 1, t('Link is hidden in the database table'));
+    $this->assertEqual($hidden, 1,'Link is hidden in the database table');
   }
 
   /**
@@ -409,7 +409,7 @@
 
     // Verify in the database.
     $hidden = db_query("SELECT hidden FROM {menu_links} WHERE mlid = :mlid", array(':mlid' => $mlid))->fetchField();
-    $this->assertEqual($hidden, 0, t('Link is not hidden in the database table'));
+    $this->assertEqual($hidden, 0,'Link is not hidden in the database table');
   }
 
   /**
@@ -436,21 +436,21 @@
     $this->drupalGet('admin/help/menu');
     $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertText(t('Menu'), t('Menu help was displayed'));
+      $this->assertText(t('Menu'),'Menu help was displayed');
     }
 
     // View menu build overview node.
     $this->drupalGet('admin/build/menu');
     $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertText(t('Menus'), t('Menu build overview node was displayed'));
+      $this->assertText(t('Menus'),'Menu build overview node was displayed');
     }
 
     // View navigation menu customization node.
     $this->drupalGet('admin/build/menu-customize/navigation');
         $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertText(t('Navigation'), t('Navigation menu node was displayed'));
+      $this->assertText(t('Navigation'),'Navigation menu node was displayed');
     }
 
     // View menu edit node.
@@ -458,21 +458,21 @@
     $this->drupalGet('admin/build/menu/item/' . $item['mlid'] . '/edit');
     $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertText(t('Edit menu item'), t('Menu edit node was displayed'));
+      $this->assertText(t('Edit menu item'),'Menu edit node was displayed');
     }
 
     // View menu settings node.
     $this->drupalGet('admin/build/menu/settings');
     $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertText(t('Menus'), t('Menu settings node was displayed'));
+      $this->assertText(t('Menus'),'Menu settings node was displayed');
     }
 
     // View add menu node.
     $this->drupalGet('admin/build/menu/add');
     $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertText(t('Menus'), t('Add menu node was displayed'));
+      $this->assertText(t('Menus'),'Add menu node was displayed');
     }
   }
 }
Index: modules/node/node.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.test,v
retrieving revision 1.34
diff -u -r1.34 node.test
--- modules/node/node.test	1 Jul 2009 12:10:32 -0000	1.34
+++ modules/node/node.test	9 Jul 2009 02:46:29 -0000
@@ -8,9 +8,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Load multiple nodes'),
-      'description' => t('Test the loading of multiple nodes.'),
-      'group' => t('Node'),
+      'name' => 'Load multiple nodes',
+      'description' => 'Test the loading of multiple nodes.',
+      'group' => 'Node',
     );
   }
 
@@ -31,15 +31,15 @@
 
     // Confirm that promoted nodes appear in the default node listing.
     $this->drupalGet('node');
-    $this->assertText($node1->title, t('Node title appears on the default listing.'));
-    $this->assertText($node2->title, t('Node title appears on the default listing.'));
-    $this->assertNoText($node3->title, t('Node title does not appear in the default listing.'));
-    $this->assertNoText($node4->title, t('Node title does not appear in the default listing.'));
+    $this->assertText($node1->title,'Node title appears on the default listing.');
+    $this->assertText($node2->title,'Node title appears on the default listing.');
+    $this->assertNoText($node3->title,'Node title does not appear in the default listing.');
+    $this->assertNoText($node4->title,'Node title does not appear in the default listing.');
 
     // Load nodes with only a condition. Nodes 3 and 4 will be loaded.
     $nodes = node_load_multiple(NULL, array('promote' => 0));
-    $this->assertEqual($node3->title, $nodes[$node3->nid]->title, t('Node was loaded.'));
-    $this->assertEqual($node4->title, $nodes[$node4->nid]->title, t('Node was loaded.'));
+    $this->assertEqual($node3->title, $nodes[$node3->nid]->title,'Node was loaded.');
+    $this->assertEqual($node4->title, $nodes[$node4->nid]->title,'Node was loaded.');
     $count = count($nodes);
     $this->assertTrue($count == 2, t('@count nodes loaded.', array('@count' => $count)));
 
@@ -47,20 +47,20 @@
     $nodes = node_load_multiple(array(1, 2, 4));
     $count = count($nodes);
     $this->assertTrue(count($nodes) == 3, t('@count nodes loaded', array('@count' => $count)));
-    $this->assertTrue(isset($nodes[$node1->nid]), t('Node is correctly keyed in the array'));
-    $this->assertTrue(isset($nodes[$node2->nid]), t('Node is correctly keyed in the array'));
-    $this->assertTrue(isset($nodes[$node4->nid]), t('Node is correctly keyed in the array'));
+    $this->assertTrue(isset($nodes[$node1->nid]),'Node is correctly keyed in the array');
+    $this->assertTrue(isset($nodes[$node2->nid]),'Node is correctly keyed in the array');
+    $this->assertTrue(isset($nodes[$node4->nid]),'Node is correctly keyed in the array');
     foreach ($nodes as $node) {
-      $this->assertTrue(is_object($node), t('Node is an object'));
+      $this->assertTrue(is_object($node),'Node is an object');
     }
 
     // Load nodes by nid, where type = article. Nodes 1, 2 and 3 will be loaded.
     $nodes = node_load_multiple(array(1, 2, 3, 4), array('type' => 'article'));
     $count = count($nodes);
     $this->assertTrue($count == 3, t('@count nodes loaded', array('@count' => $count)));
-    $this->assertEqual($nodes[$node1->nid]->title, $node1->title, t('Node successfully loaded.'));
-    $this->assertEqual($nodes[$node2->nid]->title, $node2->title, t('Node successfully loaded.'));
-    $this->assertEqual($nodes[$node3->nid]->title, $node3->title, t('Node successfully loaded.'));
+    $this->assertEqual($nodes[$node1->nid]->title, $node1->title,'Node successfully loaded.');
+    $this->assertEqual($nodes[$node2->nid]->title, $node2->title,'Node successfully loaded.');
+    $this->assertEqual($nodes[$node3->nid]->title, $node3->title,'Node successfully loaded.');
     $this->assertFalse(isset($nodes[$node4->nid]));
 
     // Now that all nodes have been loaded into the static cache, ensure that
@@ -68,16 +68,16 @@
     $nodes = node_load_multiple(array(1, 2, 3, 4), array('type' => 'article'));
     $count = count($nodes);
     $this->assertTrue($count == 3, t('@count nodes loaded.', array('@count' => $count)));
-    $this->assertEqual($nodes[$node1->nid]->title, $node1->title, t('Node successfully loaded'));
-    $this->assertEqual($nodes[$node2->nid]->title, $node2->title, t('Node successfully loaded'));
-    $this->assertEqual($nodes[$node3->nid]->title, $node3->title, t('Node successfully loaded'));
-    $this->assertFalse(isset($nodes[$node4->nid]), t('Node was not loaded'));
+    $this->assertEqual($nodes[$node1->nid]->title, $node1->title,'Node successfully loaded');
+    $this->assertEqual($nodes[$node2->nid]->title, $node2->title,'Node successfully loaded');
+    $this->assertEqual($nodes[$node3->nid]->title, $node3->title,'Node successfully loaded');
+    $this->assertFalse(isset($nodes[$node4->nid]),'Node was not loaded');
 
     // Load nodes by nid, where type = article and promote = 0.
     $nodes = node_load_multiple(array(1, 2, 3, 4), array('type' => 'article', 'promote' => 0));
     $count = count($nodes);
     $this->assertTrue($count == 1, t('@count node loaded', array('@count' => $count)));
-    $this->assertEqual($nodes[$node3->nid]->title, $node3->title, t('Node successfully loaded.'));
+    $this->assertEqual($nodes[$node3->nid]->title, $node3->title,'Node successfully loaded.');
   }
 }
 
@@ -87,9 +87,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Node revisions'),
-      'description' => t('Create a node with revisions and test viewing, reverting, and deleting revisions.'),
-      'group' => t('Node'),
+      'name' => 'Node revisions',
+      'description' => 'Create a node with revisions and test viewing, reverting, and deleting revisions.',
+      'group' => 'Node',
     );
   }
 
@@ -141,12 +141,12 @@
 
     // Confirm the correct revision text appears on "view revisions" page.
     $this->drupalGet("node/$node->nid/revisions/$node->vid/view");
-    $this->assertText($node->body[0]['value'], t('Correct text displays for version.'));
+    $this->assertText($node->body[0]['value'],'Correct text displays for version.');
 
     // Confirm the correct log message appears on "revisions overview" page.
     $this->drupalGet("node/$node->nid/revisions");
     foreach ($logs as $log) {
-      $this->assertText($log, t('Log message found.'));
+      $this->assertText($log,'Log message found.');
     }
 
     // Confirm that revisions revert properly.
@@ -155,23 +155,23 @@
                         array('@type' => 'Page', '%title' => $nodes[1]->title,
                               '%revision-date' => format_date($nodes[1]->revision_timestamp))), t('Revision reverted.'));
     $reverted_node = node_load($node->nid);
-    $this->assertTrue(($nodes[1]->body[0]['value'] == $reverted_node->body[0]['value']), t('Node reverted correctly.'));
+    $this->assertTrue(($nodes[1]->body[0]['value'] == $reverted_node->body[0]['value']),'Node reverted correctly.');
 
     // Confirm revisions delete properly.
     $this->drupalPost("node/$node->nid/revisions/{$nodes[1]->vid}/delete", array(), t('Delete'));
     $this->assertRaw(t('Revision from %revision-date of @type %title has been deleted.',
                         array('%revision-date' => format_date($nodes[1]->revision_timestamp),
                               '@type' => 'Page', '%title' => $nodes[1]->title)), t('Revision deleted.'));
-    $this->assertTrue(db_query('SELECT COUNT(vid) FROM {node_revision} WHERE nid = :nid and vid = :vid', array(':nid' => $node->nid, ':vid' => $nodes[1]->vid))->fetchField() == 0, t('Revision not found.'));
+    $this->assertTrue(db_query('SELECT COUNT(vid) FROM {node_revision} WHERE nid = :nid and vid = :vid', array(':nid' => $node->nid, ':vid' => $nodes[1]->vid))->fetchField() == 0,'Revision not found.');
   }
 }
 
 class PageEditTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Node edit'),
-      'description' => t('Create a node and test node edit functionality.'),
-      'group' => t('Node'),
+      'name' => 'Node edit',
+      'description' => 'Create a node and test node edit functionality.',
+      'group' => 'Node',
     );
   }
 
@@ -195,18 +195,18 @@
 
     // Check that the node exists in the database.
     $node = $this->drupalGetNodeByTitle($edit['title']);
-    $this->assertTrue($node, t('Node found in database.'));
+    $this->assertTrue($node,'Node found in database.');
 
     // Check that "edit" link points to correct page.
     $this->clickLink(t('Edit'));
     $edit_url = url("node/$node->nid/edit", array('absolute' => TRUE));
     $actual_url = $this->getURL();
-    $this->assertEqual($edit_url, $actual_url, t('On edit page.'));
+    $this->assertEqual($edit_url, $actual_url,'On edit page.');
 
     // Check that the title and body fields are displayed with the correct values.
-    $this->assertLink(t('Edit'), 0, t('Edit tab found.'));
-    $this->assertFieldByName('title', $edit['title'], t('Title field displayed.'));
-    $this->assertFieldByName($body_key, $edit[$body_key], t('Body field displayed.'));
+    $this->assertLink(t('Edit'), 0,'Edit tab found.');
+    $this->assertFieldByName('title', $edit['title'],'Title field displayed.');
+    $this->assertFieldByName($body_key, $edit[$body_key],'Body field displayed.');
 
     // Edit the content of the node.
     $edit = array();
@@ -216,17 +216,17 @@
     $this->drupalPost(NULL, $edit, t('Save'));
 
     // Check that the title and body fields are displayed with the updated values.
-    $this->assertText($edit['title'], t('Title displayed.'));
-    $this->assertText($edit[$body_key], t('Body displayed.'));
+    $this->assertText($edit['title'],'Title displayed.');
+    $this->assertText($edit[$body_key],'Body displayed.');
   }
 }
 
 class PagePreviewTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Node preview'),
-      'description' => t('Test node preview functionality.'),
-      'group' => t('Node'),
+      'name' => 'Node preview',
+      'description' => 'Test node preview functionality.',
+      'group' => 'Node',
     );
   }
 
@@ -250,13 +250,13 @@
     $this->drupalPost('node/add/page', $edit, t('Preview'));
 
     // Check that the preview is displaying the title and body.
-    $this->assertTitle(t('Preview | Drupal'), t('Page title is preview.'));
-    $this->assertText($edit['title'], t('Title displayed.'));
-    $this->assertText($edit[$body_key], t('Body displayed.'));
+    $this->assertTitle(t('Preview | Drupal'),'Page title is preview.');
+    $this->assertText($edit['title'],'Title displayed.');
+    $this->assertText($edit[$body_key],'Body displayed.');
 
     // Check that the title and body fields are displayed with the correct values.
-    $this->assertFieldByName('title', $edit['title'], t('Title field displayed.'));
-    $this->assertFieldByName($body_key, $edit[$body_key], t('Body field displayed.'));
+    $this->assertFieldByName('title', $edit['title'],'Title field displayed.');
+    $this->assertFieldByName($body_key, $edit[$body_key],'Body field displayed.');
   }
 
   /**
@@ -275,25 +275,25 @@
     $this->drupalPost('node/add/page', $edit, t('Preview'));
 
     // Check that the preview is displaying the title and body.
-    $this->assertTitle(t('Preview | Drupal'), t('Page title is preview.'));
-    $this->assertText($edit['title'], t('Title displayed.'));
-    $this->assertText($edit[$body_key], t('Body displayed.'));
+    $this->assertTitle(t('Preview | Drupal'),'Page title is preview.');
+    $this->assertText($edit['title'],'Title displayed.');
+    $this->assertText($edit[$body_key],'Body displayed.');
 
     // Check that the title and body fields are displayed with the correct values.
-    $this->assertFieldByName('title', $edit['title'], t('Title field displayed.'));
-    $this->assertFieldByName($body_key, $edit[$body_key], t('Body field displayed.'));
+    $this->assertFieldByName('title', $edit['title'],'Title field displayed.');
+    $this->assertFieldByName($body_key, $edit[$body_key],'Body field displayed.');
 
     // Check that the log field has the correct value.
-    $this->assertFieldByName('log', $edit['log'], t('Log field displayed.'));
+    $this->assertFieldByName('log', $edit['log'],'Log field displayed.');
   }
 }
 
 class PageCreationTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Node creation'),
-      'description' => t('Create a node and test saving it.'),
-      'group' => t('Node'),
+      'name' => 'Node creation',
+      'description' => 'Create a node and test saving it.',
+      'group' => 'Node',
     );
   }
 
@@ -315,20 +315,20 @@
     $this->drupalPost('node/add/page', $edit, t('Save'));
 
     // Check that the page has been created.
-    $this->assertRaw(t('!post %title has been created.', array('!post' => 'Page', '%title' => $edit['title'])), t('Page created.'));
+    $this->assertRaw(t('!post %title has been created.', array('!post' => 'Page', '%title' => $edit['title'])),'Page created.');
 
     // Check that the node exists in the database.
     $node = $this->drupalGetNodeByTitle($edit['title']);
-    $this->assertTrue($node, t('Node found in database.'));
+    $this->assertTrue($node,'Node found in database.');
   }
 }
 
 class PageViewTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Node edit permissions'),
-      'description' => t('Create a node and test edit permissions.'),
-      'group' => t('Node'),
+      'name' => 'Node edit permissions',
+      'description' => 'Create a node and test edit permissions.',
+      'group' => 'Node',
     );
   }
 
@@ -338,7 +338,7 @@
   function testPageView() {
     // Create a node to view.
     $node = $this->drupalCreateNode();
-    $this->assertTrue(node_load($node->nid), t('Node created.'));
+    $this->assertTrue(node_load($node->nid),'Node created.');
 
     // Try to edit with anonymous user.
     $html = $this->drupalGet("node/$node->nid/edit");
@@ -365,9 +365,9 @@
 class SummaryLengthTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Summary length'),
-      'description' => t('Test summary length.'),
-      'group' => t('Node'),
+      'name' => 'Summary length',
+      'description' => 'Test summary length.',
+      'group' => 'Node',
     );
   }
 
@@ -381,7 +381,7 @@
       'promote' => 1,
     );
     $node = $this->drupalCreateNode($settings);
-    $this->assertTrue(node_load($node->nid), t('Node created.'));
+    $this->assertTrue(node_load($node->nid),'Node created.');
 
     // Create user with permission to view the node.
     $web_user = $this->drupalCreateUser(array('access content', 'administer content types'));
@@ -391,7 +391,7 @@
     $this->drupalGet("node");
     // The node teaser when it has 600 characters in length
     $expected = 'What is a Drupalism?';
-    $this->assertRaw($expected, t('Check that the summary is 600 characters in length'), 'Node');
+    $this->assertRaw($expected,'Check that the summary is 600 characters in length', 'Node');
     
     // Edit the teaser lenght for 'page' content type
     $edit = array (
@@ -400,16 +400,16 @@
     $this->drupalPost('admin/build/node-type/page', $edit, t('Save content type'));
     // Attempt to access the front page again and check if the summary is now only 200 characters in length.
     $this->drupalGet("node");
-    $this->assertNoRaw($expected, t('Check that the summary is not longer than 200 characters'), 'Node');
+    $this->assertNoRaw($expected,'Check that the summary is not longer than 200 characters', 'Node');
   }
 }
 
 class NodeTitleXSSTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Node title XSS filtering'),
-      'description' => t('Create a node with dangerous tags in its title and test that they are escaped.'),
-      'group' => t('Node'),
+      'name' => 'Node title XSS filtering',
+      'description' => 'Create a node with dangerous tags in its title and test that they are escaped.',
+      'group' => 'Node',
     );
   }
 
@@ -424,26 +424,26 @@
       'title' => $xss . $this->randomName(),
     );
     $this->drupalPost('node/add/page', $edit, t('Preview'));
-    $this->assertNoRaw($xss, t('Harmful tags are escaped when previewing a node.'));
+    $this->assertNoRaw($xss,'Harmful tags are escaped when previewing a node.');
 
     $node = $this->drupalCreateNode($edit);
 
     $this->drupalGet('node/' . $node->nid);
     // assertTitle() decodes HTML-entities inside the <title> element.
-    $this->assertTitle($edit['title'] . ' | Drupal', t('Title is diplayed when viewing a node.'));
-    $this->assertNoRaw($xss, t('Harmful tags are escaped when viewing a node.'));
+    $this->assertTitle($edit['title'] . ' | Drupal','Title is diplayed when viewing a node.');
+    $this->assertNoRaw($xss,'Harmful tags are escaped when viewing a node.');
 
     $this->drupalGet('node/' . $node->nid . '/edit');
-    $this->assertNoRaw($xss, t('Harmful tags are escaped when editing a node.'));
+    $this->assertNoRaw($xss,'Harmful tags are escaped when editing a node.');
   }
 }
 
 class NodeBlockTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Block availability'),
-      'description' => t('Check if the syndicate block is available.'),
-      'group' => t('Node'),
+      'name' => 'Block availability',
+      'description' => 'Check if the syndicate block is available.',
+      'group' => 'Node',
     );
   }
 
@@ -458,13 +458,13 @@
   function testSearchFormBlock() {
     // Set block title to confirm that the interface is availble.
     $this->drupalPost('admin/build/block/configure/node/syndicate', array('title' => $this->randomName(8)), t('Save block'));
-    $this->assertText(t('The block configuration has been saved.'), t('Block configuration set.'));
+    $this->assertText(t('The block configuration has been saved.'),'Block configuration set.');
 
     // Set the block to a region to confirm block is availble.
     $edit = array();
     $edit['node_syndicate[region]'] = 'footer';
     $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
-    $this->assertText(t('The block settings have been updated.'), t('Block successfully move to footer region.'));
+    $this->assertText(t('The block settings have been updated.'),'Block successfully move to footer region.');
   }
 }
 
@@ -474,9 +474,9 @@
 class NodePostSettingsTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Node post information display'),
-      'description' => t('Check that the post information (submitted by Username on date) text displays appropriately.'),
-      'group' => t('Node'),
+      'name' => 'Node post information display',
+      'description' => 'Check that the post information (submitted by Username on date) text displays appropriately.',
+      'group' => 'Node',
     );
   }
 
@@ -505,7 +505,7 @@
 
     // Check that the post information is displayed.
     $node = $this->drupalGetNodeByTitle($edit['title']);
-    $this->assertRaw(theme('node_submitted', $node), t('Post information is displayed.'));
+    $this->assertRaw(theme('node_submitted', $node),'Post information is displayed.');
   }
 
   /**
@@ -526,7 +526,7 @@
 
     // Check that the post information is displayed.
     $node = $this->drupalGetNodeByTitle($edit['title']);
-    $this->assertNoRaw(theme('node_submitted', $node), t('Post information is not displayed.'));
+    $this->assertNoRaw(theme('node_submitted', $node),'Post information is not displayed.');
   }
 }
 
@@ -540,9 +540,9 @@
 class NodeRSSContentTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Node RSS Content'),
-      'description' => t('Ensure that data added to nodes by other modules appears in RSS feeds.'),
-      'group' => t('Node'),
+      'name' => 'Node RSS Content',
+      'description' => 'Ensure that data added to nodes by other modules appears in RSS feeds.',
+      'group' => 'Node',
     );
   }
 
@@ -563,12 +563,12 @@
 
     // Check that content added in 'rss' build mode appear in RSS feed.
     $rss_only_content = t('Extra data that should appear only in the RSS feed for node !nid.', array('!nid' => $node->nid));
-    $this->assertText($rss_only_content, t('Node content designated for RSS appear in RSS feed.'));
+    $this->assertText($rss_only_content,'Node content designated for RSS appear in RSS feed.');
 
     // Check that content added in build modes other than 'rss' doesn't
     // appear in RSS feed.
     $non_rss_content = t('Extra data that should appear everywhere except the RSS feed for node !nid.', array('!nid' => $node->nid));
-    $this->assertNoText($non_rss_content, t('Node content not designed for RSS doesn\'t appear in RSS feed.'));
+    $this->assertNoText($non_rss_content,'Node content not designed for RSS doesn\'t appear in RSS feed.');
 
     // Check that extra RSS elements and namespaces are added to RSS feed.
     $test_element = array(
@@ -576,13 +576,13 @@
       'value' => t('Value of testElement RSS element for node !nid.', array('!nid' => $node->nid)),
     );
     $test_ns = 'xmlns:drupaltest="http://example.com/test-namespace"';
-    $this->assertRaw(format_xml_elements(array($test_element)), t('Extra RSS elements appear in RSS feed.'));
-    $this->assertRaw($test_ns, t('Extra namespaces appear in RSS feed.'));
+    $this->assertRaw(format_xml_elements(array($test_element)),'Extra RSS elements appear in RSS feed.');
+    $this->assertRaw($test_ns,'Extra namespaces appear in RSS feed.');
 
     // Check that content added in 'rss' build mode doesn't appear when
     // viewing node.
     $this->drupalGet("node/$node->nid");
-    $this->assertNoText($rss_only_content, t('Node content designed for RSS doesn\'t appear when viewing node.'));
+    $this->assertNoText($rss_only_content,'Node content designed for RSS doesn\'t appear when viewing node.');
   }
 }
 
@@ -592,9 +592,9 @@
 class NodeAccessRecordsAlterUnitTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Node access records alter'),
-      'description' => t('Test hook_node_access_records_alter when acquiring grants.'),
-      'group' => t('Node'),
+      'name' => 'Node access records alter',
+      'description' => 'Test hook_node_access_records_alter when acquiring grants.',
+      'group' => 'Node',
     );
   }
 
@@ -611,34 +611,34 @@
   function testGrantAlter() {
     // Create an article node.
     $node1 = $this->drupalCreateNode(array('type' => 'article'));
-    $this->assertTrue(node_load($node1->nid), t('Article node created.'));
+    $this->assertTrue(node_load($node1->nid),'Article node created.');
 
     // Check to see if grants added by node_test_node_access_records made it in.
     $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = %d', $node1->nid)->fetchAll();
-    $this->assertEqual(count($records), 1, t('Returned the correct number of rows.'));
-    $this->assertEqual($records[0]->realm, 'test_article_realm', t('Grant with article_realm acquired for node without alteration.'));
-    $this->assertEqual($records[0]->gid, 1, t('Grant with gid = 1 acquired for node without alteration.'));
+    $this->assertEqual(count($records), 1,'Returned the correct number of rows.');
+    $this->assertEqual($records[0]->realm, 'test_article_realm','Grant with article_realm acquired for node without alteration.');
+    $this->assertEqual($records[0]->gid, 1,'Grant with gid = 1 acquired for node without alteration.');
 
     // Create an unpromoted page node.
     $node2 = $this->drupalCreateNode(array('type' => 'page', 'promote' => 0));
-    $this->assertTrue(node_load($node1->nid), t('Unpromoted page node created.'));
+    $this->assertTrue(node_load($node1->nid),'Unpromoted page node created.');
 
     // Check to see if grants added by node_test_node_access_records made it in.
     $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = %d', $node2->nid)->fetchAll();
-    $this->assertEqual(count($records), 1, t('Returned the correct number of rows.'));
-    $this->assertEqual($records[0]->realm, 'test_page_realm', t('Grant with page_realm acquired for node without alteration.'));
-    $this->assertEqual($records[0]->gid, 1, t('Grant with gid = 1 acquired for node without alteration.'));
+    $this->assertEqual(count($records), 1,'Returned the correct number of rows.');
+    $this->assertEqual($records[0]->realm, 'test_page_realm','Grant with page_realm acquired for node without alteration.');
+    $this->assertEqual($records[0]->gid, 1,'Grant with gid = 1 acquired for node without alteration.');
 
     // Create a promoted page node.
     $node3 = $this->drupalCreateNode(array('type' => 'page', 'promote' => 1));
-    $this->assertTrue(node_load($node3->nid), t('Promoted page node created.'));
+    $this->assertTrue(node_load($node3->nid),'Promoted page node created.');
 
     // Check to see if grant added by node_test_node_access_records was altered
     // by node_test_node_access_records_alter.
     $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = %d', $node3->nid)->fetchAll();
-    $this->assertEqual(count($records), 1, t('Returned the correct number of rows.'));
-    $this->assertEqual($records[0]->realm, 'test_alter_realm', t('Altered grant with alter_realm acquired for node.'));
-    $this->assertEqual($records[0]->gid, 2, t('Altered grant with gid = 2 acquired for node.'));
+    $this->assertEqual(count($records), 1,'Returned the correct number of rows.');
+    $this->assertEqual($records[0]->realm, 'test_alter_realm','Altered grant with alter_realm acquired for node.');
+    $this->assertEqual($records[0]->gid, 2,'Altered grant with gid = 2 acquired for node.');
 
     // Check to see if we can alter grants with hook_node_grants_alter().
     $operations = array('view', 'update', 'delete');
@@ -659,9 +659,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Node save'),
-      'description' => t('Test node_save() for saving content.'),
-      'group' => t('Node'),
+      'name' => 'Node save',
+      'description' => 'Test node_save() for saving content.',
+      'group' => 'Node',
     );
   }
 
@@ -697,10 +697,10 @@
     node_save($node);
     // Test the import.
     $node_by_nid = node_load($test_nid);
-    $this->assertTrue($node_by_nid, t('Node load by node ID.'));
+    $this->assertTrue($node_by_nid,'Node load by node ID.');
 
     $node_by_title = $this->drupalGetNodeByTitle($title);
-    $this->assertTrue($node_by_title, t('Node load by node title.'));
+    $this->assertTrue($node_by_title,'Node load by node title.');
   }
 }
 
@@ -710,9 +710,9 @@
 class NodeTypeTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Node types'),
-      'description' => t('Ensures that node type functions work correctly.'),
-      'group' => t('Node'),
+      'name' => 'Node types',
+      'description' => 'Ensures that node type functions work correctly.',
+      'group' => 'Node',
     );
   }
 
@@ -725,14 +725,14 @@
     $node_types = node_type_get_types();
     $node_names = node_type_get_names();
 
-    $this->assertTrue(isset($node_types['article']), t('Node type article is available.'));
-    $this->assertTrue(isset($node_types['page']), t('Node type page is available.'));
+    $this->assertTrue(isset($node_types['article']),'Node type article is available.');
+    $this->assertTrue(isset($node_types['page']),'Node type page is available.');
 
-    $this->assertEqual($node_types['article']->name, $node_names['article'], t('Correct node type base has been returned.'));
+    $this->assertEqual($node_types['article']->name, $node_names['article'],'Correct node type base has been returned.');
 
-    $this->assertEqual($node_types['article'], node_type_get_type('article'), t('Correct node type has been returned.'));
-    $this->assertEqual($node_types['article']->name, node_type_get_name('article'), t('Correct node type name has been returned.'));
-    $this->assertEqual($node_types['page']->base, node_type_get_base('page'), t('Correct node type base has been returned.'));
+    $this->assertEqual($node_types['article'], node_type_get_type('article'),'Correct node type has been returned.');
+    $this->assertEqual($node_types['article']->name, node_type_get_name('article'),'Correct node type name has been returned.');
+    $this->assertEqual($node_types['page']->base, node_type_get_base('page'),'Correct node type base has been returned.');
   }
 }
 
@@ -742,9 +742,9 @@
 class NodeAccessRebuildTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Node access rebuild'),
-      'description' => t('Ensures that node access rebuild functions work correctly.'),
-      'group' => t('Node'),
+      'name' => 'Node access rebuild',
+      'description' => 'Ensures that node access rebuild functions work correctly.',
+      'group' => 'Node',
     );
   }
 
Index: modules/php/php.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/php/php.test,v
retrieving revision 1.13
diff -u -r1.13 php.test
--- modules/php/php.test	27 Jun 2009 02:05:55 -0000	1.13
+++ modules/php/php.test	9 Jul 2009 02:46:29 -0000
@@ -14,7 +14,7 @@
 
     // Confirm that the PHP filter is #3.
     $this->drupalGet('admin/settings/formats/3');
-    $this->assertText('PHP code', t('On PHP code filter page.'));
+    $this->assertText('PHP code','On PHP code filter page.');
   }
 
   /**
@@ -33,9 +33,9 @@
 class PHPFilterTestCase extends PHPTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('PHP filter functionality'),
-      'description' => t('Make sure that PHP filter properly evaluates PHP code when enabled.'),
-      'group' => t('PHP'),
+      'name' => 'PHP filter functionality',
+      'description' => 'Make sure that PHP filter properly evaluates PHP code when enabled.',
+      'group' => 'PHP',
     );
   }
 
@@ -47,7 +47,7 @@
     $edit = array();
     $edit['roles[2]'] = TRUE; // Set authenticated users to have permission to use filter.
     $this->drupalPost(NULL, $edit, 'Save configuration');
-    $this->assertText(t('The text format settings have been updated.'), t('PHP format available to authenticated users.'));
+    $this->assertText(t('The text format settings have been updated.'),'PHP format available to authenticated users.');
 
     // Create node with PHP filter enabled.
     $web_user = $this->drupalCreateUser(array('access content', 'create page content', 'edit own page content'));
@@ -56,17 +56,17 @@
 
     // Make sure that the PHP code shows up as text.
     $this->drupalGet('node/' . $node->nid);
-    $this->assertText('print', t('PHP code is displayed.'));
+    $this->assertText('print','PHP code is displayed.');
 
     // Change filter to PHP filter and see that PHP code is evaluated.
     $edit = array();
     $edit['body[0][value_format]'] = 3;
     $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
-    $this->assertRaw(t('Page %title has been updated.', array('%title' => $node->title)), t('PHP code filter turned on.'));
+    $this->assertRaw(t('Page %title has been updated.', array('%title' => $node->title)),'PHP code filter turned on.');
 
     // Make sure that the PHP code shows up as text.
-    $this->assertNoText('print', t('PHP code isn\'t displayed.'));
-    $this->assertText('SimpleTest PHP was executed!', t('PHP code has been evaluated.'));
+    $this->assertNoText('print','PHP code isn\'t displayed.');
+    $this->assertText('SimpleTest PHP was executed!','PHP code has been evaluated.');
   }
 }
 
@@ -76,9 +76,9 @@
 class PHPAccessTestCase extends PHPTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('PHP filter access check'),
-      'description' => t('Make sure that users who don\'t have access to the PHP filter can\'t see it.'),
-      'group' => t('PHP'),
+      'name' => 'PHP filter access check',
+      'description' => 'Make sure that users who don\'t have access to the PHP filter can\'t see it.',
+      'group' => 'PHP',
     );
   }
 
@@ -93,10 +93,10 @@
 
     // Make sure that the PHP code shows up as text.
     $this->drupalGet('node/' . $node->nid);
-    $this->assertText('print', t('PHP code is displayed.'));
+    $this->assertText('print','PHP code is displayed.');
 
     // Make sure that user doesn't have access to filter.
     $this->drupalGet('node/' . $node->nid . '/edit');
-    $this->assertNoFieldByName('body_format', '3', t('Format not available.'));
+    $this->assertNoFieldByName('body_format', '3','Format not available.');
   }
 }
Index: modules/forum/forum.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.test,v
retrieving revision 1.23
diff -u -r1.23 forum.test
--- modules/forum/forum.test	27 Jun 2009 19:49:07 -0000	1.23
+++ modules/forum/forum.test	9 Jul 2009 02:46:29 -0000
@@ -13,9 +13,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Forum functionality'),
-      'description' => t('Create, view, edit, delete, and change forum entries and verify its consistency in the database.'),
-      'group' => t('Forum'),
+      'name' => 'Forum functionality',
+      'description' => 'Create, view, edit, delete, and change forum entries and verify its consistency in the database.',
+      'group' => 'Forum',
     );
   }
 
@@ -79,14 +79,14 @@
     $edit['forum_active[region]'] = 'right';
     $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
     $this->assertResponse(200);
-    $this->assertText(t('The block settings have been updated.'), t('[Active forum topics] Forum block was enabled'));
+    $this->assertText(t('The block settings have been updated.'),'[Active forum topics] Forum block was enabled');
 
     // Enable the new forum block.
     $edit = array();
     $edit['forum_new[region]'] = 'right';
     $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
     $this->assertResponse(200);
-    $this->assertText(t('The block settings have been updated.'), t('[New forum topics] Forum block was enabled'));
+    $this->assertText(t('The block settings have been updated.'),'[New forum topics] Forum block was enabled');
 
     // Retrieve forum menu id.
     $mlid = db_query_range("SELECT mlid FROM {menu_links} WHERE link_path = 'forum' AND menu_name = 'navigation' AND module = 'system' ORDER BY mlid ASC", 0, 1)->fetchField();
@@ -133,15 +133,15 @@
     // Edit the vocabulary.
     $this->drupalPost('admin/build/taxonomy/' . $vid, $edit, t('Save'));
     $this->assertResponse(200);
-    $this->assertRaw(t('Updated vocabulary %name.', array('%name' => $title)), t('Vocabulary was edited'));
+    $this->assertRaw(t('Updated vocabulary %name.', array('%name' => $title)),'Vocabulary was edited');
 
     // Grab the newly edited vocabulary.
     drupal_static_reset('taxonomy_vocabulary_load_multiple');
     $current_settings = taxonomy_vocabulary_load($vid);
 
     // Make sure we actually edited the vocabulary properly.
-    $this->assertEqual($current_settings->name, $title, t('The name was updated'));
-    $this->assertEqual($current_settings->description, $description, t('The description was updated'));
+    $this->assertEqual($current_settings->name, $title,'The name was updated');
+    $this->assertEqual($current_settings->description, $description,'The description was updated');
 
     // Restore the original vocabulary.
     taxonomy_vocabulary_save($original_settings);
@@ -247,13 +247,13 @@
     $this->drupalPost('node/add/forum/', $edit, t('Save'));
     $type = t('Forum topic');
     if ($container) {
-      $this->assertNoRaw(t('@type %title has been created.', array('@type' => $type, '%title' => $title)), t('Forum topic was not created'));
-      $this->assertRaw(t('The item %title is only a container for forums.', array('%title' => $forum['name'])), t('Error message was shown'));
+      $this->assertNoRaw(t('@type %title has been created.', array('@type' => $type, '%title' => $title)),'Forum topic was not created');
+      $this->assertRaw(t('The item %title is only a container for forums.', array('%title' => $forum['name'])),'Error message was shown');
       return;
     }
     else {
-      $this->assertRaw(t('@type %title has been created.', array('%title' => $title, '@type' => $type)), t('Forum topic was created'));
-      $this->assertNoRaw(t('The item %title is only a container for forums.', array('%title' => $forum['name'])), t('No error message was shown'));
+      $this->assertRaw(t('@type %title has been created.', array('%title' => $title, '@type' => $type)),'Forum topic was created');
+      $this->assertNoRaw(t('The item %title is only a container for forums.', array('%title' => $forum['name'])),'No error message was shown');
     }
 
     // Retrieve node object.
@@ -262,8 +262,8 @@
 
     // View forum topic.
     $this->drupalGet('node/' . $node->nid);
-    $this->assertRaw($title, t('Subject was found'));
-    $this->assertRaw($body, t('Body was found'));
+    $this->assertRaw($title,'Subject was found');
+    $this->assertRaw($body,'Body was found');
 
     return $node;
   }
@@ -286,17 +286,17 @@
     $this->drupalGet('admin/help/forum');
     $this->assertResponse($response2);
     if ($response2 == 200) {
-      $this->assertTitle(t('Forum | Drupal'), t('Forum help title was displayed'));
-      $this->assertText(t('Forum'), t('Forum help node was displayed'));
-      $this->assertText(t('Home ' . $crumb . ' Administer ' . $crumb . ' Help'), t('Breadcrumbs were displayed'));
+      $this->assertTitle(t('Forum | Drupal'),'Forum help title was displayed');
+      $this->assertText(t('Forum'),'Forum help node was displayed');
+      $this->assertText(t('Home ' . $crumb . ' Administer ' . $crumb . ' Help'),'Breadcrumbs were displayed');
     }
 
     // Verify the forum blocks were displayed.
     $this->drupalGet('');
     $this->assertResponse(200);
     // This block never seems to display?
-//    $this->assertText(t('Active forum topics'), t('[Active forum topics] Forum block was displayed'));
-    $this->assertText(t('New forum topics'), t('[New forum topics] Forum block was displayed'));
+//    $this->assertText(t('Active forum topics'),'[Active forum topics] Forum block was displayed');
+    $this->assertText(t('New forum topics'),'[New forum topics] Forum block was displayed');
 
     // View forum container page.
     $this->verifyForumView($this->container);
@@ -308,15 +308,15 @@
     // View forum node.
     $this->drupalGet('node/' . $node->nid);
     $this->assertResponse(200);
-    $this->assertTitle($node->title . ' | Drupal', t('Forum node was displayed'));
-    $this->assertText(t('Home ' . $crumb . ' Forums ' . $crumb . ' @container ' . $crumb . ' @forum', array('@container' => $this->container['name'], '@forum' => $this->forum['name'])), t('Breadcrumbs were displayed'));
+    $this->assertTitle($node->title . ' | Drupal','Forum node was displayed');
+    $this->assertText(t('Home ' . $crumb . ' Forums ' . $crumb . ' @container ' . $crumb . ' @forum', array('@container' => $this->container['name'], '@forum' => $this->forum['name'])),'Breadcrumbs were displayed');
 
     // View forum edit node.
     $this->drupalGet('node/' . $node->nid . '/edit');
     $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertTitle('Edit Forum topic ' . $node->title . ' | Drupal', t('Forum edit node was displayed'));
-      $this->assertText(t('Home ' . $crumb . ' @title', array('@title' => $node->title)), t('Breadcrumbs were displayed'));
+      $this->assertTitle('Edit Forum topic ' . $node->title . ' | Drupal','Forum edit node was displayed');
+      $this->assertText(t('Home ' . $crumb . ' @title', array('@title' => $node->title)),'Breadcrumbs were displayed');
     }
 
     if ($response == 200) {
@@ -327,7 +327,7 @@
       $edit['taxonomy[1]'] = $this->root_forum['tid']; // Assumes the topic is initially associated with $forum.
       $edit['shadow'] = TRUE;
       $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
-      $this->assertRaw(t('Forum topic %title has been updated.', array('%title' => $edit['title'])), t('Forum node was edited'));
+      $this->assertRaw(t('Forum topic %title has been updated.', array('%title' => $edit['title'])),'Forum node was edited');
 
       // Verify topic was moved to a different forum.
       $forum_tid = db_query("SELECT tid FROM {forum} WHERE nid = :nid AND vid = :vid", array(
@@ -339,7 +339,7 @@
       // Delete forum node.
       $this->drupalPost('node/' . $node->nid . '/delete', array(), t('Delete'));
       $this->assertResponse($response);
-      $this->assertRaw(t('Forum topic %title has been deleted.', array('%title' => $edit['title'])), t('Forum node was deleted'));
+      $this->assertRaw(t('Forum topic %title has been deleted.', array('%title' => $edit['title'])),'Forum node was deleted');
     }
   }
 
@@ -354,12 +354,12 @@
     // View forum page.
     $this->drupalGet('forum/' . $forum['tid']);
     $this->assertResponse(200);
-    $this->assertTitle($forum['name'] . ' | Drupal', t('Forum name was displayed'));
+    $this->assertTitle($forum['name'] . ' | Drupal','Forum name was displayed');
     if (isset($parent)) {
-      $this->assertText(t('Home ' . $crumb . ' Forums ' . $crumb . ' @name', array('@name' => $parent['name'])), t('Breadcrumbs were displayed'));
+      $this->assertText(t('Home ' . $crumb . ' Forums ' . $crumb . ' @name', array('@name' => $parent['name'])),'Breadcrumbs were displayed');
     }
     else {
-      $this->assertText(t('Home ' . $crumb . ' Forums'), t('Breadcrumbs were displayed'));
+      $this->assertText(t('Home ' . $crumb . ' Forums'),'Breadcrumbs were displayed');
     }
   }
 
Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.54
diff -u -r1.54 system.test
--- modules/system/system.test	1 Jul 2009 08:39:55 -0000	1.54
+++ modules/system/system.test	9 Jul 2009 02:46:29 -0000
@@ -94,9 +94,9 @@
 class EnableDisableTestCase extends ModuleTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Enable/disable modules'),
-      'description' => t('Enable/disable core module and confirm table creation/deletion.'),
-      'group' => t('Module'),
+      'name' => 'Enable/disable modules',
+      'description' => 'Enable/disable core module and confirm table creation/deletion.',
+      'group' => 'Module',
     );
   }
 
@@ -115,11 +115,11 @@
     $edit['modules[Core][aggregator][enable]'] = 'aggregator';
     $edit['modules[Core][forum][enable]'] = 'forum';
     $this->drupalPost('admin/build/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.');
 
     // Check that hook_modules_installed and hook_modules_enabled hooks were invoked and check tables.
-    $this->assertText(t('hook_modules_installed fired for aggregator'), t('hook_modules_installed fired.'));
-    $this->assertText(t('hook_modules_enabled fired for aggregator'), t('hook_modules_enabled fired.'));
+    $this->assertText(t('hook_modules_installed fired for aggregator'),'hook_modules_installed fired.');
+    $this->assertText(t('hook_modules_enabled fired for aggregator'),'hook_modules_enabled fired.');
     $this->assertModules(array('aggregator'), TRUE);
     $this->assertTableCount('aggregator', TRUE);
     $this->assertLogMessage('system', "%module module enabled.", array('%module' => 'aggregator'), WATCHDOG_INFO);
@@ -128,10 +128,10 @@
     $edit = array();
     $edit['modules[Core][aggregator][enable]'] = FALSE;
     $this->drupalPost('admin/build/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.');
 
     // Check that hook_modules_disabled hook was invoked and check tables.
-    $this->assertText(t('hook_modules_disabled fired for aggregator'), t('hook_modules_disabled fired.'));
+    $this->assertText(t('hook_modules_disabled fired for aggregator'),'hook_modules_disabled fired.');
     $this->assertModules(array('aggregator'), FALSE);
     $this->assertTableCount('aggregator', TRUE);
     $this->assertLogMessage('system', "%module module disabled.", array('%module' => 'aggregator'), WATCHDOG_INFO);
@@ -142,10 +142,10 @@
     $this->drupalPost('admin/build/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.');
 
     // Check that hook_modules_uninstalled hook was invoked and check tables.
-    $this->assertText(t('hook_modules_uninstalled fired for aggregator'), t('hook_modules_uninstalled fired.'));
+    $this->assertText(t('hook_modules_uninstalled fired for aggregator'),'hook_modules_uninstalled fired.');
     $this->assertModules(array('aggregator'), FALSE);
     $this->assertTableCount('aggregator', FALSE);
     $this->assertLogMessage('system', "%module module uninstalled.", array('%module' => 'aggregator'), WATCHDOG_INFO);
@@ -154,7 +154,7 @@
     $edit = array();
     $edit['modules[Core][aggregator][enable]'] = 'aggregator';
     $this->drupalPost('admin/build/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.');
   }
 }
 
@@ -164,9 +164,9 @@
 class ModuleDependencyTestCase extends ModuleTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Module dependencies'),
-      'description' => t('Enable module without dependency enabled.'),
-      'group' => t('Module'),
+      'name' => 'Module dependencies',
+      'description' => 'Enable module without dependency enabled.',
+      'group' => 'Module',
     );
   }
 
@@ -178,7 +178,7 @@
     $edit = array();
     $edit['modules[Core][translation][enable]'] = 'translation';
     $this->drupalPost('admin/build/modules', $edit, t('Save configuration'));
-    $this->assertText(t('Some required modules must be enabled'), t('Dependecy required.'));
+    $this->assertText(t('Some required modules must be enabled'),'Dependecy required.');
 
     $this->assertModules(array('translation', 'locale'), FALSE);
 
@@ -187,7 +187,7 @@
     $this->assertTableCount('locale', 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', 'locale'), TRUE);
 
@@ -203,9 +203,9 @@
 class ModuleRequiredTestCase extends ModuleTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Required modules'),
-      'description' => t('Attempt disabling of required modules.'),
-      'group' => t('Module'),
+      'name' => 'Required modules',
+      'description' => 'Attempt disabling of required modules.',
+      'group' => 'Module',
     );
   }
 
@@ -230,9 +230,9 @@
    */
   public static function getInfo() {
     return array(
-      'name' => t('IP address blocking'),
-      'description' => t('Test IP address blocking.'),
-      'group' => t('System')
+      'name' => 'IP address blocking',
+      'description' => 'Test IP address blocking.',
+      'group' => 'System'
     );
   }
 
@@ -258,8 +258,8 @@
     $edit['ip'] = '192.168.1.1';
     $this->drupalPost('admin/settings/ip-blocking', $edit, t('Save'));
     $ip = db_query("SELECT iid from {blocked_ips} WHERE ip = :ip", array(':ip' => $edit['ip']))->fetchField();
-    $this->assertNotNull($ip, t('IP address found in database'));
-    $this->assertRaw(t('The IP address %ip has been blocked.', array('%ip' => $edit['ip'])), t('IP address was blocked.'));
+    $this->assertNotNull($ip,'IP address found in database');
+    $this->assertRaw(t('The IP address %ip has been blocked.', array('%ip' => $edit['ip'])),'IP address was blocked.');
 
     // Try to block an IP address that's already blocked.
     $edit = array();
@@ -300,9 +300,9 @@
    */
   public static function getInfo() {
     return array(
-      'name' => t('Cron run'),
-      'description' => t('Test cron run.'),
-      'group' => t('System')
+      'name' => 'Cron run',
+      'description' => 'Test cron run.',
+      'group' => 'System'
     );
   }
 
@@ -326,7 +326,7 @@
     $this->assertResponse(200);
 
     // Execute cron directly.
-    $this->assertTrue(drupal_cron_run(), t('Cron ran successfully.'));
+    $this->assertTrue(drupal_cron_run(),'Cron ran successfully.');
   }
 
   /**
@@ -346,7 +346,7 @@
       ))
       ->condition('fid', $temp_old->fid)
       ->execute();
-    $this->assertTrue(file_exists($temp_old->filepath), t('Old temp file was created correctly.'));
+    $this->assertTrue(file_exists($temp_old->filepath),'Old temp file was created correctly.');
 
     // Temporary file that is less than DRUPAL_MAXIMUM_TEMP_FILE_AGE.
     $temp_new = file_save_data('');
@@ -354,7 +354,7 @@
       ->fields(array('status' => 0))
       ->condition('fid', $temp_new->fid)
       ->execute();
-    $this->assertTrue(file_exists($temp_new->filepath), t('New temp file was created correctly.'));
+    $this->assertTrue(file_exists($temp_new->filepath),'New temp file was created correctly.');
 
     // Permanent file that is older than DRUPAL_MAXIMUM_TEMP_FILE_AGE.
     $perm_old = file_save_data('');
@@ -362,18 +362,18 @@
       ->fields(array('timestamp' => 1))
       ->condition('fid', $temp_old->fid)
       ->execute();
-    $this->assertTrue(file_exists($perm_old->filepath), t('Old permanent file was created correctly.'));
+    $this->assertTrue(file_exists($perm_old->filepath),'Old permanent file was created correctly.');
 
     // Permanent file that is newer than DRUPAL_MAXIMUM_TEMP_FILE_AGE.
     $perm_new = file_save_data('');
-    $this->assertTrue(file_exists($perm_new->filepath), t('New permanent file was created correctly.'));
+    $this->assertTrue(file_exists($perm_new->filepath),'New permanent file was created correctly.');
 
     // Run cron and then ensure that only the old, temp file was deleted.
-    $this->assertTrue(drupal_cron_run(), t('Cron ran successfully.'));
-    $this->assertFalse(file_exists($temp_old->filepath), t('Old temp file was correctly removed.'));
-    $this->assertTrue(file_exists($temp_new->filepath), t('New temp file was correctly ignored.'));
-    $this->assertTrue(file_exists($perm_old->filepath), t('Old permanent file was correctly ignored.'));
-    $this->assertTrue(file_exists($perm_new->filepath), t('New permanent file was correctly ignored.'));
+    $this->assertTrue(drupal_cron_run(),'Cron ran successfully.');
+    $this->assertFalse(file_exists($temp_old->filepath),'Old temp file was correctly removed.');
+    $this->assertTrue(file_exists($temp_new->filepath),'New temp file was correctly ignored.');
+    $this->assertTrue(file_exists($perm_old->filepath),'Old permanent file was correctly ignored.');
+    $this->assertTrue(file_exists($perm_new->filepath),'New permanent file was correctly ignored.');
   }
 }
 
@@ -387,9 +387,9 @@
    */
   public static function getInfo() {
     return array(
-      'name' => t('Admin overview'),
-      'description' => t('Confirm that the admin overview page appears as expected.'),
-      'group' => t('System')
+      'name' => 'Admin overview',
+      'description' => 'Confirm that the admin overview page appears as expected.',
+      'group' => 'System'
     );
   }
 
@@ -438,7 +438,7 @@
           $found++;
         }
       }
-      $this->assertTrue(count($panels) == $found, t('Required panels found.'));
+      $this->assertTrue(count($panels) == $found,'Required panels found.');
     }
   }
 
@@ -469,9 +469,9 @@
    */
   public static function getInfo() {
     return array(
-      'name' => t('Fingerprinting meta tag'),
-      'description' => t('Confirm that the fingerprinting meta tag appears as expected.'),
-      'group' => t('System')
+      'name' => 'Fingerprinting meta tag',
+      'description' => 'Confirm that the fingerprinting meta tag appears as expected.',
+      'group' => 'System'
     );
   }
 
@@ -482,7 +482,7 @@
     list($version, ) = explode('.', VERSION);
     $string = '<meta name="Generator" content="Drupal ' . $version . ' (http://drupal.org)" />';
     $this->drupalGet('node');
-    $this->assertRaw($string, t('Fingerprinting meta tag generated correctly.'), t('System'));
+    $this->assertRaw($string,'Fingerprinting meta tag generated correctly.','System');
   }
 }
 
@@ -497,9 +497,9 @@
    */
   public static function getInfo() {
     return array(
-      'name' => t('403 functionality'),
-      'description' => t("Tests page access denied functionality, including custom 403 pages."),
-      'group' => t('System')
+      'name' => '403 functionality',
+      'description' => "Tests page access denied functionality, including custom 403 pages.",
+      'group' => 'System'
     );
   }
 
@@ -516,7 +516,7 @@
 
   function testAccessDenied() {
     $this->drupalGet('admin');
-    $this->assertText(t('Access denied'), t('Found the default 403 page'));
+    $this->assertText(t('Access denied'),'Found the default 403 page');
 
     $edit = array(
       'title' => $this->randomName(10),
@@ -528,14 +528,14 @@
     $this->drupalPost('admin/settings/site-information', array('site_403' => 'node/' . $node->nid), t('Save configuration'));
 
     $this->drupalGet('admin');
-    $this->assertText($node->title, t('Found the custom 403 page'));
+    $this->assertText($node->title,'Found the custom 403 page');
 
     // Logout and check that the user login block is shown on custom 403 pages.
     $this->drupalLogout();
 
     $this->drupalGet('admin');
-    $this->assertText($node->title, t('Found the custom 403 page'));
-    $this->assertText(t('User login'), t('Blocks are shown on the custom 403 page'));
+    $this->assertText($node->title,'Found the custom 403 page');
+    $this->assertText(t('User login'),'Blocks are shown on the custom 403 page');
 
     // Log back in and remove the custom 403 page.
     $this->drupalLogin($this->admin_user);
@@ -545,8 +545,8 @@
     $this->drupalLogout();
 
     $this->drupalGet('admin');
-    $this->assertText(t('Access denied'), t('Found the default 403 page'));
-    $this->assertText(t('User login'), t('Blocks are shown on the default 403 page'));
+    $this->assertText(t('Access denied'),'Found the default 403 page');
+    $this->assertText(t('User login'),'Blocks are shown on the default 403 page');
   }
 }
 
@@ -558,9 +558,9 @@
    */
   public static function getInfo() {
     return array(
-      'name' => t('404 functionality'),
-      'description' => t("Tests page not found functionality, including custom 404 pages."),
-      'group' => t('System')
+      'name' => '404 functionality',
+      'description' => "Tests page not found functionality, including custom 404 pages.",
+      'group' => 'System'
     );
   }
 
@@ -577,7 +577,7 @@
 
   function testPageNotFound() {
     $this->drupalGet($this->randomName(10));
-    $this->assertText(t('Page not found'), t('Found the default 404 page'));
+    $this->assertText(t('Page not found'),'Found the default 404 page');
 
     $edit = array(
       'title' => $this->randomName(10),
@@ -589,14 +589,14 @@
     $this->drupalPost('admin/settings/site-information', array('site_404' => 'node/' . $node->nid), t('Save configuration'));
 
     $this->drupalGet($this->randomName(10));
-    $this->assertText($node->title, t('Found the custom 404 page'));
+    $this->assertText($node->title,'Found the custom 404 page');
 
     // Logout and check that the user login block is not shown on custom 404 pages.
     $this->drupalLogout();
 
     $this->drupalGet($this->randomName(10));
-    $this->assertText($node->title, t('Found the custom 404 page'));
-    $this->assertNoText(t('User login'), t('Blocks are not shown on the custom 404 page'));
+    $this->assertText($node->title,'Found the custom 404 page');
+    $this->assertNoText(t('User login'),'Blocks are not shown on the custom 404 page');
 
     // Log back in and remove the custom 404 page.
     $this->drupalLogin($this->admin_user);
@@ -606,8 +606,8 @@
     $this->drupalLogout();
 
     $this->drupalGet($this->randomName(10));
-    $this->assertText(t('Page not found'), t('Found the default 404 page'));
-    $this->assertNoText(t('User login'), t('Blocks are not shown on the default 404 page'));
+    $this->assertText(t('Page not found'),'Found the default 404 page');
+    $this->assertNoText(t('User login'),'Blocks are not shown on the default 404 page');
   }
 }
 
@@ -617,9 +617,9 @@
 class DateTimeFunctionalTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Date and time'),
-      'description' => t('Configure date and time settings. Test date formatting and time zone handling, including daylight saving time.'),
-      'group' => t('System'),
+      'name' => 'Date and time',
+      'description' => 'Configure date and time settings. Test date formatting and time zone handling, including daylight saving time.',
+      'group' => 'System',
     );
   }
 
@@ -640,18 +640,18 @@
 
     // Confirm date format and time zone.
     $this->drupalGet("node/$node1->nid");
-    $this->assertText('2007-01-31 21:00:00 -1000', t('Date should be identical, with GMT offset of -10 hours.'));
+    $this->assertText('2007-01-31 21:00:00 -1000','Date should be identical, with GMT offset of -10 hours.');
     $this->drupalGet("node/$node2->nid");
-    $this->assertText('2007-07-31 21:00:00 -1000', t('Date should be identical, with GMT offset of -10 hours.'));
+    $this->assertText('2007-07-31 21:00:00 -1000','Date should be identical, with GMT offset of -10 hours.');
 
     // Set time zone to Los Angeles time.
     variable_set('date_default_timezone', 'America/Los_Angeles');
 
     // Confirm date format and time zone.
     $this->drupalGet("node/$node1->nid");
-    $this->assertText('2007-01-31 23:00:00 -0800', t('Date should be two hours ahead, with GMT offset of -8 hours.'));
+    $this->assertText('2007-01-31 23:00:00 -0800','Date should be two hours ahead, with GMT offset of -8 hours.');
     $this->drupalGet("node/$node2->nid");
-    $this->assertText('2007-08-01 00:00:00 -0700', t('Date should be three hours ahead, with GMT offset of -7 hours.'));
+    $this->assertText('2007-08-01 00:00:00 -0700','Date should be three hours ahead, with GMT offset of -7 hours.');
   }
 }
 
@@ -664,9 +664,9 @@
    */
   public static function getInfo() {
     return array(
-      'name' => t('HTML in page titles'),
-      'description' => t('Tests correct handling or conversion by drupal_set_title() and drupal_get_title().'),
-      'group' => t('System')
+      'name' => 'HTML in page titles',
+      'description' => 'Tests correct handling or conversion by drupal_set_title() and drupal_get_title().',
+      'group' => 'System'
     );
   }
 
@@ -699,11 +699,11 @@
     // drupal_set_title's $filter is CHECK_PLAIN by default, so the title should be
     // returned with check_plain().
     drupal_set_title($title, CHECK_PLAIN);
-    $this->assertTrue(strpos(drupal_get_title(), '<em>') === FALSE, t('Tags in title converted to entities when $output is CHECK_PLAIN.'));
+    $this->assertTrue(strpos(drupal_get_title(), '<em>') === FALSE,'Tags in title converted to entities when $output is CHECK_PLAIN.');
     // drupal_set_title's $filter is passed as PASS_THROUGH, so the title should be
     // returned with HTML.
     drupal_set_title($title, PASS_THROUGH);
-    $this->assertTrue(strpos(drupal_get_title(), '<em>') !== FALSE, t('Tags in title are not converted to entities when $output is PASS_THROUGH.'));
+    $this->assertTrue(strpos(drupal_get_title(), '<em>') !== FALSE,'Tags in title are not converted to entities when $output is PASS_THROUGH.');
     // Generate node content.
     $edit = array(
      'title' => '!SimpleTest! ' . $title . $this->randomName(20),
@@ -726,9 +726,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Front page'),
-      'description' => t('Tests front page functionality and administration.'),
-      'group' => t('System'),
+      'name' => 'Front page',
+      'description' => 'Tests front page functionality and administration.',
+      'group' => 'System',
     );
   }
 
@@ -749,11 +749,11 @@
    */
   function testDrupalIsFrontPage() {
     $this->drupalGet('');
-    $this->assertText(t('On front page.'), t('Path is the front page.'));
+    $this->assertText(t('On front page.'),'Path is the front page.');
     $this->drupalGet('node');
-    $this->assertText(t('On front page.'), t('Path is the front page.'));
+    $this->assertText(t('On front page.'),'Path is the front page.');
     $this->drupalGet($this->node_path);
-    $this->assertNoText(t('On front page.'), t('Path is not the front page.'));
+    $this->assertNoText(t('On front page.'),'Path is not the front page.');
 
     // Change the front page to an invalid path.
     $edit = array('site_frontpage' => 'kittens');
@@ -763,23 +763,23 @@
     // Change the front page to a valid path.
     $edit['site_frontpage'] = $this->node_path;
     $this->drupalPost('admin/settings/site-information', $edit, t('Save configuration'));
-    $this->assertText(t('The configuration options have been saved.'), t('The front page path has been saved.'));
+    $this->assertText(t('The configuration options have been saved.'),'The front page path has been saved.');
 
     $this->drupalGet('');
-    $this->assertText(t('On front page.'), t('Path is the front page.'));
+    $this->assertText(t('On front page.'),'Path is the front page.');
     $this->drupalGet('node');
-    $this->assertNoText(t('On front page.'), t('Path is not the front page.'));
+    $this->assertNoText(t('On front page.'),'Path is not the front page.');
     $this->drupalGet($this->node_path);
-    $this->assertText(t('On front page.'), t('Path is the front page.'));
+    $this->assertText(t('On front page.'),'Path is the front page.');
   }
 }
 
 class SystemBlockTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Block functionality'),
-      'description' => t('Configure and move powered-by block.'),
-      'group' => t('System'),
+      'name' => 'Block functionality',
+      'description' => 'Configure and move powered-by block.',
+      'group' => 'System',
     );
   }
 
@@ -797,16 +797,16 @@
   function testPoweredByBlock() {
     // Set block title and some settings to confirm that the interface is availble.
     $this->drupalPost('admin/build/block/configure/system/powered-by', array('title' => $this->randomName(8), 'color' => 'powered-black', 'size' => '135x42'), t('Save block'));
-    $this->assertText(t('The block configuration has been saved.'), t('Block configuration set.'));
+    $this->assertText(t('The block configuration has been saved.'),'Block configuration set.');
 
     // Set the powered-by block to the footer region.
     $edit = array();
     $edit['system_powered-by[region]'] = 'footer';
     $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
-    $this->assertText(t('The block settings have been updated.'), t('Block successfully move to footer region.'));
+    $this->assertText(t('The block settings have been updated.'),'Block successfully move to footer region.');
 
     // Confirm that the block is being displayed.
-    $this->assertRaw('id="block-system-powered-by"', t('Block successfully being displayed on the page.'));
+    $this->assertRaw('id="block-system-powered-by"','Block successfully being displayed on the page.');
 
     // Set the block to the disabled region.
     $edit = array();
@@ -814,7 +814,7 @@
     $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
 
     // Confirm that the block is hidden.
-    $this->assertNoRaw('id="block-system-powered-by"', t('Block no longer appears on page.'));
+    $this->assertNoRaw('id="block-system-powered-by"','Block no longer appears on page.');
 
     // For convenience of developers, set the block to it's default settings.
     $edit = array();
@@ -831,9 +831,9 @@
    */
   public static function getInfo() {
     return array(
-      'name' => t('System setting forms'),
-      'description' => t('Tests correctness of system_settings_form() processing.'),
-      'group' => t('System')
+      'name' => 'System setting forms',
+      'description' => 'Tests correctness of system_settings_form() processing.',
+      'group' => 'System'
     );
   }
 
@@ -910,9 +910,9 @@
 class SystemThemeFunctionalTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Theme interface functionality'),
-      'description' => t('Tests the theme interface functionality by enabling and switching themes, and using an administration theme.'),
-      'group' => t('System'),
+      'name' => 'Theme interface functionality',
+      'description' => 'Tests the theme interface functionality by enabling and switching themes, and using an administration theme.',
+      'group' => 'System',
     );
   }
 
@@ -937,16 +937,16 @@
     $this->drupalPost('admin/build/themes', $edit, t('Save configuration'));
 
     $this->drupalGet('admin');
-    $this->assertRaw('themes/garland', t('Administration theme used on an administration page.'));
+    $this->assertRaw('themes/garland','Administration theme used on an administration page.');
 
     $this->drupalGet('node/' . $this->node->nid);
-    $this->assertRaw('themes/stark', t('Site default theme used on node page.'));
+    $this->assertRaw('themes/stark','Site default theme used on node page.');
 
     $this->drupalGet('node/add');
-    $this->assertRaw('themes/garland', t('Administration theme used on the add content page.'));
+    $this->assertRaw('themes/garland','Administration theme used on the add content page.');
 
     $this->drupalGet('node/' . $this->node->nid . '/edit');
-    $this->assertRaw('themes/garland', t('Administration theme used on the edit content page.'));
+    $this->assertRaw('themes/garland','Administration theme used on the edit content page.');
 
     // Disable the admin theme on the node admin pages.
     $edit = array(
@@ -955,19 +955,19 @@
     $this->drupalPost('admin/build/themes', $edit, t('Save configuration'));
 
     $this->drupalGet('admin');
-    $this->assertRaw('themes/garland', t('Administration theme used on an administration page.'));
+    $this->assertRaw('themes/garland','Administration theme used on an administration page.');
 
     $this->drupalGet('node/add');
-    $this->assertRaw('themes/stark', t('Site default theme used on the add content page.'));
+    $this->assertRaw('themes/stark','Site default theme used on the add content page.');
 
     // Reset to the default theme settings.
     $this->drupalPost('admin/build/themes', array(), t('Reset to defaults'));
 
     $this->drupalGet('admin');
-    $this->assertRaw('themes/garland', t('Site default theme used on administration page.'));
+    $this->assertRaw('themes/garland','Site default theme used on administration page.');
 
     $this->drupalGet('node/add');
-    $this->assertRaw('themes/garland', t('Site default theme used on the add content page.'));
+    $this->assertRaw('themes/garland','Site default theme used on the add content page.');
   }
 }
 
@@ -978,9 +978,9 @@
 class QueueTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Queue functionality'),
-      'description' => t('Queues and dequeues a set of items to check the basic queue functionality.'),
-      'group' => t('System'),
+      'name' => 'Queue functionality',
+      'description' => 'Queues and dequeues a set of items to check the basic queue functionality.',
+      'group' => 'System',
     );
   }
 
@@ -1015,14 +1015,14 @@
     $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;
@@ -1032,10 +1032,10 @@
 
     // 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) {
@@ -1043,8 +1043,8 @@
     }
 
     // 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');
   }
 
   /**
Index: modules/trigger/trigger.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.test,v
retrieving revision 1.12
diff -u -r1.12 trigger.test
--- modules/trigger/trigger.test	12 Jun 2009 08:39:40 -0000	1.12
+++ modules/trigger/trigger.test	9 Jul 2009 02:46:30 -0000
@@ -7,9 +7,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Trigger content (node) actions'),
-      'description' => t('Perform various tests with content actions.') ,
-      'group' => t('Trigger'),
+      'name' => 'Trigger content (node) actions',
+      'description' => 'Perform various tests with content actions.' ,
+      'group' => 'Trigger',
     );
   }
 
@@ -42,7 +42,7 @@
       $edit[$info['property']] = !$info['expected'];
       $this->drupalPost('node/add/page', $edit, t('Save'));
       // Make sure the text we want appears.
-      $this->assertRaw(t('!post %title has been created.', array('!post' => 'Page', '%title' => $edit['title'])), t('Make sure the page has actually been created'));
+      $this->assertRaw(t('!post %title has been created.', array('!post' => 'Page', '%title' => $edit['title'])),'Make sure the page has actually been created');
       // Action should have been fired.
       $loaded_node = $this->drupalGetNodeByTitle($edit['title']);;
       $this->assertTrue($loaded_node->$info['property'] == $info['expected'], t('Make sure the @action action fired.', array('@action' => $info['name'])));
@@ -55,13 +55,13 @@
       $this->drupalPost('admin/build/trigger/node', $edit, t('Assign'));
       $edit = array('aid' => $hash);
       $this->drupalPost('admin/build/trigger/node', $edit, t('Assign'));
-      $this->assertRaw(t('The action you chose is already assigned to that trigger.'), t('Check to make sure an error occurs when assigning an action to a trigger twice.'));
+      $this->assertRaw(t('The action you chose is already assigned to that trigger.'),'Check to make sure an error occurs when assigning an action to a trigger twice.');
 
       // Test 3: The action should be able to be unassigned from a trigger.
       $this->drupalPost('admin/build/trigger/unassign/node/presave/' . $hash, array(), t('Unassign'));
       $this->assertRaw(t('Action %action has been unassigned.', array('%action' => ucfirst($info['name']))), t('Check to make sure the @action action can be unassigned from the trigger.', array('@action' => $info['name'])));
       $assigned = db_result(db_query("SELECT COUNT(*) FROM {trigger_assignments} WHERE aid IN ('" . implode("','", $content_actions) . "')"));
-      $this->assertFalse($assigned, t('Check to make sure unassign worked properly at the database level.'));
+      $this->assertFalse($assigned,'Check to make sure unassign worked properly at the database level.');
     }
   }
 
@@ -116,9 +116,9 @@
 class TriggerCronTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Trigger cron (system) actions'),
-      'description' => t('Perform various tests with cron trigger.') ,
-      'group' => t('Trigger'),
+      'name' => 'Trigger cron (system) actions',
+      'description' => 'Perform various tests with cron trigger.' ,
+      'group' => 'Trigger',
     );
   }
 
@@ -168,10 +168,10 @@
  
     // Make sure the non-configurable action has fired.
     $action_run = variable_get('trigger_test_system_cron_action', FALSE);
-    $this->assertTrue($action_run, t('Check that the cron run triggered the test action.'));
+    $this->assertTrue($action_run,'Check that the cron run triggered the test action.');
  
     // Make sure that both configurable actions have fired.
     $action_run = variable_get('trigger_test_system_cron_conf_action', 0) == 2;
-    $this->assertTrue($action_run, t('Check that the cron run triggered both complex actions.'));
+    $this->assertTrue($action_run,'Check that the cron run triggered both complex actions.');
   }
 }
Index: modules/dblog/dblog.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.test,v
retrieving revision 1.21
diff -u -r1.21 dblog.test
--- modules/dblog/dblog.test	12 Jun 2009 08:39:36 -0000	1.21
+++ modules/dblog/dblog.test	9 Jul 2009 02:46:29 -0000
@@ -7,9 +7,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('DBLog functionality'),
-      'description' => t('Generate events and verify dblog entries; verify user access to log reports based on persmissions.'),
-      'group' => t('DBLog'),
+      'name' => 'DBLog functionality',
+      'description' => 'Generate events and verify dblog entries; verify user access to log reports based on persmissions.',
+      'group' => 'DBLog',
     );
   }
 
@@ -76,7 +76,7 @@
     // Run cron job.
     $this->drupalGet('admin/reports/status/run-cron');
     $this->assertResponse(200);
-    $this->assertText(t('Cron ran successfully'), t('Cron ran successfully'));
+    $this->assertText(t('Cron ran successfully'),'Cron ran successfully');
     // Verify dblog row count equals row limit plus one because cron adds a record after it runs.
     $count = db_query('SELECT COUNT(wid) FROM {watchdog}')->fetchField();
     $this->assertTrue($count == $row_limit + 1, t('Dblog row count of @count equals row limit of @limit plus one', array('@count' => $count, '@limit' => $row_limit)));
@@ -122,35 +122,35 @@
     $this->drupalGet('admin/help/dblog');
     $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertText(t('Database logging'), t('DBLog help was displayed'));
+      $this->assertText(t('Database logging'),'DBLog help was displayed');
     }
 
     // View dblog report node.
     $this->drupalGet('admin/reports/dblog');
     $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertText(t('Recent log entries'), t('DBLog report was displayed'));
+      $this->assertText(t('Recent log entries'),'DBLog report was displayed');
     }
 
     // View dblog page-not-found report node.
     $this->drupalGet('admin/reports/page-not-found');
     $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertText(t('Top ' . $quote . 'page not found' . $quote . ' errors'), t('DBLog page-not-found report was displayed'));
+      $this->assertText(t('Top ' . $quote . 'page not found' . $quote . ' errors'),'DBLog page-not-found report was displayed');
     }
 
     // View dblog access-denied report node.
     $this->drupalGet('admin/reports/access-denied');
     $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertText(t('Top ' . $quote . 'access denied' . $quote . ' errors'), t('DBLog access-denied report was displayed'));
+      $this->assertText(t('Top ' . $quote . 'access denied' . $quote . ' errors'),'DBLog access-denied report was displayed');
     }
 
     // View dblog event node.
     $this->drupalGet('admin/reports/event/1');
     $this->assertResponse($response);
     if ($response == 200) {
-      $this->assertText(t('Details'), t('DBLog event node was displayed'));
+      $this->assertText(t('Details'),'DBLog event node was displayed');
     }
   }
 
@@ -237,14 +237,14 @@
     // Verify events were recorded.
     // Add user.
     // Default display includes name and email address; if too long then email is replaced by three periods.
-    // $this->assertRaw(t('New user: %name (%mail)', array('%name' => $edit['name'], '%mail' => $edit['mail'])), t('DBLog event was recorded: [add user]'));
-    $this->assertRaw(t('New user: %name', array('%name' => $name)), t('DBLog event was recorded: [add user]'));
+    // $this->assertRaw(t('New user: %name (%mail)', array('%name' => $edit['name'], '%mail' => $edit['mail'])),'DBLog event was recorded: [add user]');
+    $this->assertRaw(t('New user: %name', array('%name' => $name)),'DBLog event was recorded: [add user]');
     // Login user.
-    $this->assertRaw(t('Session opened for %name', array('%name' => $name)), t('DBLog event was recorded: [login user]'));
+    $this->assertRaw(t('Session opened for %name', array('%name' => $name)),'DBLog event was recorded: [login user]');
     // Logout user.
-    $this->assertRaw(t('Session closed for %name', array('%name' => $name)), t('DBLog event was recorded: [logout user]'));
+    $this->assertRaw(t('Session closed for %name', array('%name' => $name)),'DBLog event was recorded: [logout user]');
     // Delete user.
-    $this->assertRaw(t('Deleted user: %name', array('%name' => $name)), t('DBLog event was recorded: [delete user]'));
+    $this->assertRaw(t('Deleted user: %name', array('%name' => $name)),'DBLog event was recorded: [delete user]');
   }
 
   /**
@@ -289,23 +289,23 @@
 
     // Verify events were recorded.
     // Content added.
-    $this->assertRaw(t('@type: added %title', array('@type' => $type, '%title' => $title)), t('DBLog event was recorded: [content added]'));
+    $this->assertRaw(t('@type: added %title', array('@type' => $type, '%title' => $title)),'DBLog event was recorded: [content added]');
     // Content updated.
-    $this->assertRaw(t('@type: updated %title', array('@type' => $type, '%title' => $title)), t('DBLog event was recorded: [content updated]'));
+    $this->assertRaw(t('@type: updated %title', array('@type' => $type, '%title' => $title)),'DBLog event was recorded: [content updated]');
     // Content deleted.
-    $this->assertRaw(t('@type: deleted %title', array('@type' => $type, '%title' => $title)), t('DBLog event was recorded: [content deleted]'));
+    $this->assertRaw(t('@type: deleted %title', array('@type' => $type, '%title' => $title)),'DBLog event was recorded: [content deleted]');
 
     // View dblog access-denied report node.
     $this->drupalGet('admin/reports/access-denied');
     $this->assertResponse(200);
     // Access denied.
-    $this->assertText(t('admin/reports/dblog'), t('DBLog event was recorded: [access denied]'));
+    $this->assertText(t('admin/reports/dblog'),'DBLog event was recorded: [access denied]');
 
     // View dblog page-not-found report node.
     $this->drupalGet('admin/reports/page-not-found');
     $this->assertResponse(200);
     // Page not found.
-    $this->assertText(t('node/@nid', array('@nid' => $node->nid)), t('DBLog event was recorded: [page not found]'));
+    $this->assertText(t('node/@nid', array('@nid' => $node->nid)),'DBLog event was recorded: [page not found]');
   }
 
   /**
Index: modules/simpletest/simpletest.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.test,v
retrieving revision 1.25
diff -u -r1.25 simpletest.test
--- modules/simpletest/simpletest.test	17 Jun 2009 13:40:26 -0000	1.25
+++ modules/simpletest/simpletest.test	9 Jul 2009 02:46:29 -0000
@@ -15,12 +15,12 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('SimpleTest functionality'),
-      'description' => t('Test SimpleTest\'s web interface: check that the intended tests were
+      'name' => 'SimpleTest functionality',
+      'description' => 'Test SimpleTest\'s web interface: check that the intended tests were
                           run and ensure that test reports display the intended results. Also
                           test SimpleTest\'s internal browser and API\'s both explicitly and
-                          implicitly.'),
-      'group' => t('SimpleTest')
+                          implicitly.',
+      'group' => 'SimpleTest'
     );
   }
 
@@ -44,9 +44,9 @@
     global $conf;
     if (!$this->inCURL()) {
       $this->drupalGet('node');
-      $this->assertTrue($this->drupalGetHeader('Date'), t('An HTTP header was received.'));
-      $this->assertTitle(t('Welcome to @site-name | @site-name', array('@site-name' => variable_get('site_name', 'Drupal'))), t('Site title matches.'));
-      $this->assertNoTitle('Foo', t('Site title does not match.'));
+      $this->assertTrue($this->drupalGetHeader('Date'),'An HTTP header was received.');
+      $this->assertTitle(t('Welcome to @site-name | @site-name', array('@site-name' => variable_get('site_name', 'Drupal'))),'Site title matches.');
+      $this->assertNoTitle('Foo','Site title does not match.');
       // Make sure that we are locked out of the installer when prefixing
       // using the user-agent header. This is an important security check.
       global $base_url;
@@ -56,12 +56,12 @@
 
       $this->drupalLogin($this->drupalCreateUser());
       $headers = $this->drupalGetHeaders(TRUE);
-      $this->assertEqual(count($headers), 2, t('There was one intermediate request.'));
-      $this->assertTrue(strpos($headers[0][':status'], '302') !== FALSE, t('Intermediate response code was 302.'));
-      $this->assertFalse(empty($headers[0]['location']), t('Intermediate request contained a Location header.'));
-      $this->assertEqual($this->getUrl(), $headers[0]['location'], t('HTTP redirect was followed'));
-      $this->assertFalse($this->drupalGetHeader('Location'), t('Headers from intermediate request were reset.'));
-      $this->assertResponse(200, t('Response code from intermediate request was reset.'));
+      $this->assertEqual(count($headers), 2,'There was one intermediate request.');
+      $this->assertTrue(strpos($headers[0][':status'], '302') !== FALSE,'Intermediate response code was 302.');
+      $this->assertFalse(empty($headers[0]['location']),'Intermediate request contained a Location header.');
+      $this->assertEqual($this->getUrl(), $headers[0]['location'],'HTTP redirect was followed');
+      $this->assertFalse($this->drupalGetHeader('Location'),'Headers from intermediate request were reset.');
+      $this->assertResponse(200,'Response code from intermediate request was reset.');
     }
   }
 
@@ -97,7 +97,7 @@
 
       // Regression test for #290316.
       // Check that test_id is incrementing.
-      $this->assertTrue($this->test_ids[0] != $this->test_ids[1], t('Test ID is incrementing.'));
+      $this->assertTrue($this->test_ids[0] != $this->test_ids[1],'Test ID is incrementing.');
     }
   }
 
@@ -152,7 +152,7 @@
     $this->assertAssertion('array_key_exists', 'Warning', 'Fail', 'simpletest.test', 'SimpleTestFunctionalTest->stubTest()');
 
     $this->test_ids[] = $test_id = $this->getTestIdFromResults();
-    $this->assertTrue($test_id, t('Found test ID in results.'));
+    $this->assertTrue($test_id,'Found test ID in results.');
   }
 
   /**
@@ -270,9 +270,9 @@
    */
   public static function getInfo() {
     return array(
-      'name' => t('SimpleTest e-mail capturing'),
-      'description' => t('Test the SimpleTest e-mail capturing logic, the assertMail assertion and the drupalGetMails function.'),
-      'group' => t('SimpleTest'),
+      'name' => 'SimpleTest e-mail capturing',
+      'description' => 'Test the SimpleTest e-mail capturing logic, the assertMail assertion and the drupalGetMails function.',
+      'group' => 'SimpleTest',
     );
   }
 
@@ -293,19 +293,19 @@
 
     // Before we send the e-mail, drupalGetMails should return an empty array.
     $captured_emails = $this->drupalGetMails();
-    $this->assertEqual(count($captured_emails), 0, t('The captured e-mails queue is empty.'), t('E-mail'));
+    $this->assertEqual(count($captured_emails), 0,'The captured e-mails queue is empty.','E-mail');
 
     // Send the e-mail.
     $response = drupal_mail_send($message);
 
     // Ensure that there is one e-mail in the captured e-mails array.
     $captured_emails = $this->drupalGetMails();
-    $this->assertEqual(count($captured_emails), 1, t('One e-mail was captured.'), t('E-mail'));
+    $this->assertEqual(count($captured_emails), 1,'One e-mail was captured.','E-mail');
 
     // Assert that the e-mail was sent by iterating over the message properties
     // and ensuring that they are captured intact.
     foreach($message as $field => $value) {
-      $this->assertMail($field, $value, t('The e-mail was sent and the value for property @field is intact.', array('@field' => $field)), t('E-mail'));
+      $this->assertMail($field, $value,'The e-mail was sent and the value for property @field is intact.', array('@field' => $field)),'E-mail';
     }
 
     // Send additional e-mails so more than one e-mail is captured.
@@ -322,20 +322,20 @@
 
     // There should now be 6 e-mails captured.
     $captured_emails = $this->drupalGetMails();
-    $this->assertEqual(count($captured_emails), 6, t('All e-mails were captured.'), t('E-mail'));
+    $this->assertEqual(count($captured_emails), 6,'All e-mails were captured.','E-mail');
 
     // Test different ways of getting filtered e-mails via drupalGetMails().
     $captured_emails = $this->drupalGetMails(array('id' => 'drupal_mail_test'));
-    $this->assertEqual(count($captured_emails), 1, t('Only one e-mail is returned when filtering by id.'), t('E-mail'));
+    $this->assertEqual(count($captured_emails), 1,'Only one e-mail is returned when filtering by id.','E-mail');
     $captured_emails = $this->drupalGetMails(array('id' => 'drupal_mail_test', 'subject' => $subject));
-    $this->assertEqual(count($captured_emails), 1, t('Only one e-mail is returned when filtering by id and subject.'), t('E-mail'));
+    $this->assertEqual(count($captured_emails), 1,'Only one e-mail is returned when filtering by id and subject.','E-mail');
     $captured_emails = $this->drupalGetMails(array('id' => 'drupal_mail_test', 'subject' => $subject, 'from' => 'this_was_not_used@example.com'));
-    $this->assertEqual(count($captured_emails), 0, t('No e-mails are returned when querying with an unused from address.'), t('E-mail'));
+    $this->assertEqual(count($captured_emails), 0,'No e-mails are returned when querying with an unused from address.','E-mail');
 
     // Send the last e-mail again, so we can confirm that the drupalGetMails-filter
     // correctly returns all e-mails with a given property/value.
     drupal_mail_send($message);
     $captured_emails = $this->drupalGetMails(array('id' => 'drupal_mail_test_4'));
-    $this->assertEqual(count($captured_emails), 2, t('All e-mails with the same id are returned when filtering by id.'), t('E-mail'));
+    $this->assertEqual(count($captured_emails), 2,'All e-mails with the same id are returned when filtering by id.','E-mail');
   }
 }
Index: modules/field/modules/text/text.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/text/text.test,v
retrieving revision 1.7
diff -u -r1.7 text.test
--- modules/field/modules/text/text.test	12 Jun 2009 08:39:37 -0000	1.7
+++ modules/field/modules/text/text.test	9 Jul 2009 02:46:29 -0000
@@ -6,9 +6,9 @@
 
   public static function getInfo() {
     return array(
-      'name'  => t('Text Field'),
-      'description'  => t("Test the creation of text fields."),
-      'group' => t('Field')
+      'name'  => 'Text Field',
+      'description'  => "Test the creation of text fields.",
+      'group' => 'Field'
     );
   }
 
@@ -94,8 +94,8 @@
 
     // Display creation form.
     $this->drupalGet('test-entity/add/test-bundle');
-    $this->assertFieldByName($this->field_name . '[0][value]', '', t('Widget is displayed'));
-    $this->assertNoFieldByName($this->field_name . '[0][format]', '1', t('Format selector is not displayed'));
+    $this->assertFieldByName($this->field_name . '[0][value]', '','Widget is displayed');
+    $this->assertNoFieldByName($this->field_name . '[0][format]', '1','Format selector is not displayed');
 
     // Submit with some value.
     $value = $this->randomName();
@@ -105,7 +105,7 @@
     $this->drupalPost(NULL, $edit, t('Save'));
     preg_match('|test-entity/(\d+)/edit|', $this->url, $match);
     $id = $match[1];
-    $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), t('Entity was created'));
+    $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)),'Entity was created');
 
     // Display the object.
     $entity = field_test_entity_load($id);
@@ -148,8 +148,8 @@
     // By default, the user only has access to 'Filtered HTML', and no format
     // selector is displayed
     $this->drupalGet('test-entity/add/test-bundle');
-    $this->assertFieldByName($this->field_name . '[0][value]', '', t('Widget is displayed'));
-    $this->assertNoFieldByName($this->field_name . '[0][value_format]', '1', t('Format selector is not displayed'));
+    $this->assertFieldByName($this->field_name . '[0][value]', '','Widget is displayed');
+    $this->assertNoFieldByName($this->field_name . '[0][value_format]', '1','Format selector is not displayed');
 
     // Submit with data that should be filtered.
     $value = $this->randomName() . '<br />' . $this->randomName();
@@ -159,14 +159,14 @@
     $this->drupalPost(NULL, $edit, t('Save'));
     preg_match('|test-entity/(\d+)/edit|', $this->url, $match);
     $id = $match[1];
-    $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)), t('Entity was created'));
+    $this->assertRaw(t('test_entity @id has been created.', array('@id' => $id)),'Entity was created');
 
     // Display the object.
     $entity = field_test_entity_load($id);
     $entity->content = field_attach_view($entity_type, $entity);
     $this->content = drupal_render($entity->content);
     $this->assertNoRaw($value, 'Filtered tags are not displayed');
-    $this->assertRaw(str_replace('<br />', '', $value), t('Filtered value is displayed correctly'));
+    $this->assertRaw(str_replace('<br />', '', $value),'Filtered value is displayed correctly');
 
     // Allow the user to use the 'Full HTML' format.
     db_update('filter_format')->fields(array('roles' => ',2,'))->condition('format', 2)->execute();
@@ -174,21 +174,21 @@
     // Display edition form.
     // We should now have a 'text format' selector.
     $this->drupalGet('test-entity/' . $id . '/edit');
-    $this->assertFieldByName($this->field_name . '[0][value]', '', t('Widget is displayed'));
-    $this->assertFieldByName($this->field_name . '[0][value_format]', '1', t('Format selector is displayed'));
+    $this->assertFieldByName($this->field_name . '[0][value]', '','Widget is displayed');
+    $this->assertFieldByName($this->field_name . '[0][value_format]', '1','Format selector is displayed');
 
     // Edit and change the format to 'Full HTML'.
     $edit = array(
       $this->field_name . '[0][value_format]' => 2,
     );
     $this->drupalPost(NULL, $edit, t('Save'));
-    $this->assertRaw(t('test_entity @id has been updated.', array('@id' => $id)), t('Entity was updated'));
+    $this->assertRaw(t('test_entity @id has been updated.', array('@id' => $id)),'Entity was updated');
 
     // Display the object.
     $entity = field_test_entity_load($id);
     $entity->content = field_attach_view($entity_type, $entity);
     $this->content = drupal_render($entity->content);
-    $this->assertRaw($value, t('Value is displayed unfiltered'));
+    $this->assertRaw($value,'Value is displayed unfiltered');
   }
 
   // Test formatters.
@@ -200,9 +200,9 @@
 class TextSummaryTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Text summary'),
-      'description' => t('Test text_summary() with different strings and lengths.'),
-      'group' => t('Field'),
+      'name' => 'Text summary',
+      'description' => 'Test text_summary() with different strings and lengths.',
+      'group' => 'Field',
     );
   }
 
Index: modules/filter/filter.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.test,v
retrieving revision 1.26
diff -u -r1.26 filter.test
--- modules/filter/filter.test	3 Jul 2009 18:26:35 -0000	1.26
+++ modules/filter/filter.test	9 Jul 2009 02:46:29 -0000
@@ -4,9 +4,9 @@
 class FilterAdminTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Filter administration functionality'),
-      'description' => t('Thoroughly test the administrative interface of the filter module.'),
-      'group' => t('Filter'),
+      'name' => 'Filter administration functionality',
+      'description' => 'Thoroughly test the administrative interface of the filter module.',
+      'group' => 'Filter',
     );
   }
 
@@ -30,27 +30,27 @@
     $edit = array();
     $edit['default'] = $full;
     $this->drupalPost('admin/settings/formats', $edit, t('Save changes'));
-    $this->assertText(t('Default format updated.'), t('Default filter updated successfully.'));
+    $this->assertText(t('Default format updated.'),'Default filter updated successfully.');
 
-    $this->assertNoRaw('admin/settings/formats/delete/' . $full, t('Delete link not found.'));
+    $this->assertNoRaw('admin/settings/formats/delete/' . $full,'Delete link not found.');
 
     // Add an additional tag.
     $edit = array();
     $edit['allowed_html_1'] = '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd> <quote>';
     $this->drupalPost('admin/settings/formats/' . $filtered . '/configure', $edit, t('Save configuration'));
-    $this->assertText(t('The configuration options have been saved.'), t('Allowed HTML tag added.'));
+    $this->assertText(t('The configuration options have been saved.'),'Allowed HTML tag added.');
 
-    $this->assertRaw(htmlentities($edit['allowed_html_1']), t('Tag displayed.'));
+    $this->assertRaw(htmlentities($edit['allowed_html_1']),'Tag displayed.');
 
     $result = db_query('SELECT * FROM {cache_filter}')->fetchObject();
-    $this->assertFalse($result, t('Cache cleared.'));
+    $this->assertFalse($result,'Cache cleared.');
 
     // Reorder filters.
     $edit = array();
     $edit['weights[filter/' . $second_filter . ']'] = 1;
     $edit['weights[filter/' . $first_filter . ']'] = 2;
     $this->drupalPost('admin/settings/formats/' . $filtered . '/order', $edit, t('Save configuration'));
-    $this->assertText(t('The filter ordering has been saved.'), t('Order saved successfully.'));
+    $this->assertText(t('The filter ordering has been saved.'),'Order saved successfully.');
 
     $result = db_query('SELECT * FROM {filter} WHERE format = :format ORDER BY weight ASC', array(':format' => $filtered));
     $filters = array();
@@ -59,7 +59,7 @@
         $filters[] = $filter;
       }
     }
-    $this->assertTrue(($filters[0]->delta == $second_filter && $filters[1]->delta == $first_filter), t('Order confirmed.'));
+    $this->assertTrue(($filters[0]->delta == $second_filter && $filters[1]->delta == $first_filter),'Order confirmed.');
 
     // Add filter.
     $edit = array();
@@ -68,41 +68,41 @@
     $edit['filters[filter/' . $second_filter . ']'] = TRUE;
     $edit['filters[filter/' . $first_filter . ']'] = TRUE;
     $this->drupalPost('admin/settings/formats/add', $edit, t('Save configuration'));
-    $this->assertRaw(t('Added text format %format.', array('%format' => $edit['name'])), t('New filter created.'));
+    $this->assertRaw(t('Added text format %format.', array('%format' => $edit['name'])),'New filter created.');
 
     $format = $this->getFilter($edit['name']);
-    $this->assertNotNull($format, t('Format found in database.'));
+    $this->assertNotNull($format,'Format found in database.');
 
     if ($format !== NULL) {
-      $this->assertFieldByName('roles[2]', '', t('Role found.'));
-      $this->assertFieldByName('filters[filter/' . $second_filter . ']', '', t('Line break filter found.'));
-      $this->assertFieldByName('filters[filter/' . $first_filter . ']', '', t('Url filter found.'));
+      $this->assertFieldByName('roles[2]', '','Role found.');
+      $this->assertFieldByName('filters[filter/' . $second_filter . ']', '','Line break filter found.');
+      $this->assertFieldByName('filters[filter/' . $first_filter . ']', '','Url filter found.');
 
       // Delete new filter.
       $this->drupalPost('admin/settings/formats/delete/' . $format->format, array(), t('Delete'));
-      $this->assertRaw(t('Deleted text format %format.', array('%format' => $edit['name'])), t('Format successfully deleted.'));
+      $this->assertRaw(t('Deleted text format %format.', array('%format' => $edit['name'])),'Format successfully deleted.');
     }
 
     // Change default filter back.
     $edit = array();
     $edit['default'] = $filtered;
     $this->drupalPost('admin/settings/formats', $edit, t('Save changes'));
-    $this->assertText(t('Default format updated.'), t('Default filter updated successfully.'));
+    $this->assertText(t('Default format updated.'),'Default filter updated successfully.');
 
-    $this->assertNoRaw('admin/settings/formats/delete/' . $filtered, t('Delete link not found.'));
+    $this->assertNoRaw('admin/settings/formats/delete/' . $filtered,'Delete link not found.');
 
     // Allow authenticated users on full HTML.
     $edit = array();
     $edit['roles[2]'] = TRUE;
     $this->drupalPost('admin/settings/formats/' . $full, $edit, t('Save configuration'));
-    $this->assertText(t('The text format settings have been updated.'), t('Full HTML format successfully updated.'));
+    $this->assertText(t('The text format settings have been updated.'),'Full HTML format successfully updated.');
 
     // Switch user.
     $this->drupalLogout();
     $this->drupalLogin($web_user);
 
     $this->drupalGet('node/add/page');
-    $this->assertRaw('<option value="' . $full . '">Full HTML</option>', t('Full HTML filter accessible.'));
+    $this->assertRaw('<option value="' . $full . '">Full HTML</option>','Full HTML filter accessible.');
 
     // Use filtered HTML and see if it removes tags that are not allowed.
     $body = $this->randomName();
@@ -113,13 +113,13 @@
     $edit['body[0][value]'] = $body . '<random>' . $extra_text . '</random>';
     $edit['body[0][value_format]'] = $filtered;
     $this->drupalPost('node/add/page', $edit, t('Save'));
-    $this->assertRaw(t('Page %title has been created.', array('%title' => $edit['title'])), t('Filtered node created.'));
+    $this->assertRaw(t('Page %title has been created.', array('%title' => $edit['title'])),'Filtered node created.');
 
     $node = $this->drupalGetNodeByTitle($edit['title']);
-    $this->assertTrue($node, t('Node found in database.'));
+    $this->assertTrue($node,'Node found in database.');
 
     $this->drupalGet('node/' . $node->nid);
-    $this->assertText($body . $extra_text, t('Filter removed invalid tag.'));
+    $this->assertText($body . $extra_text,'Filter removed invalid tag.');
 
     // Switch user.
     $this->drupalLogout();
@@ -130,20 +130,20 @@
     $edit = array();
     $edit['allowed_html_1'] = '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>';
     $this->drupalPost('admin/settings/formats/' . $filtered . '/configure', $edit, t('Save configuration'));
-    $this->assertText(t('The configuration options have been saved.'), t('Changes reverted.'));
+    $this->assertText(t('The configuration options have been saved.'),'Changes reverted.');
 
     // Full HTML.
     $edit = array();
     $edit['roles[2]'] = FALSE;
     $this->drupalPost('admin/settings/formats/' . $full, $edit, t('Save configuration'));
-    $this->assertText(t('The text format settings have been updated.'), t('Full HTML format successfully reverted.'));
+    $this->assertText(t('The text format settings have been updated.'),'Full HTML format successfully reverted.');
 
     // Filter order.
     $edit = array();
     $edit['weights[filter/' . $second_filter . ']'] = 2;
     $edit['weights[filter/' . $first_filter . ']'] = 1;
     $this->drupalPost('admin/settings/formats/' . $filtered . '/order', $edit, t('Save configuration'));
-    $this->assertText(t('The filter ordering has been saved.'), t('Order successfully reverted.'));
+    $this->assertText(t('The filter ordering has been saved.'),'Order successfully reverted.');
   }
 
   /**
@@ -187,9 +187,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Core filters'),
-      'description' => t('Filter each filter individually: Convert URLs into links, Convert line breaks, Correct broken HTML, Escape all HTML, Limit allowed HTML tags.'),
-      'group' => t('Filter'),
+      'name' => 'Core filters',
+      'description' => 'Filter each filter individually: Convert URLs into links, Convert line breaks, Correct broken HTML, Escape all HTML, Limit allowed HTML tags.',
+      'group' => 'Filter',
     );
   }
 
@@ -207,24 +207,24 @@
     // Single line breaks should be changed to <br /> tags, while paragraphs
     // separated with double line breaks should be enclosed with <p></p> tags.
     $f = _filter_autop("aaa\nbbb\n\nccc");
-    $this->assertEqual(str_replace("\n", '', $f), "<p>aaa<br />bbb</p><p>ccc</p>", t('Line breaking basic case.'));
+    $this->assertEqual(str_replace("\n", '', $f), "<p>aaa<br />bbb</p><p>ccc</p>",'Line breaking basic case.');
 
     // Text within some contexts should not be processed.
     $f = _filter_autop("<script>aaa\nbbb\n\nccc</script>");
-    $this->assertEqual($f, "<script>aaa\nbbb\n\nccc</script>", t('Line breaking -- do not break scripts.'));
+    $this->assertEqual($f, "<script>aaa\nbbb\n\nccc</script>",'Line breaking -- do not break scripts.');
 
     $f = _filter_autop('<p><div>  </div></p>');
-    $this->assertEqual(substr_count($f, '<p>'), substr_count($f, '</p>'), t('Make sure line breaking produces matching paragraph tags.'));
+    $this->assertEqual(substr_count($f, '<p>'), substr_count($f, '</p>'),'Make sure line breaking produces matching paragraph tags.');
 
     $f = _filter_autop('<div><p>  </p></div>');
-    $this->assertEqual(substr_count($f, '<p>'), substr_count($f, '</p>'), t('Make sure line breaking produces matching paragraph tags.'));
+    $this->assertEqual(substr_count($f, '<p>'), substr_count($f, '</p>'),'Make sure line breaking produces matching paragraph tags.');
 
     $f = _filter_autop('<blockquote><pre>aaa</pre></blockquote>');
-    $this->assertEqual(substr_count($f, '<p>'), substr_count($f, '</p>'), t('Make sure line breaking produces matching paragraph tags.'));
+    $this->assertEqual(substr_count($f, '<p>'), substr_count($f, '</p>'),'Make sure line breaking produces matching paragraph tags.');
 
     $limit = max(ini_get('pcre.backtrack_limit'), ini_get('pcre.recursion_limit'));
     $f = _filter_autop($this->randomName($limit));
-    $this->assertNotEqual($f, '', t('Make sure line breaking can process long strings.'));
+    $this->assertNotEqual($f, '','Make sure line breaking can process long strings.');
   }
 
   /**
@@ -242,172 +242,172 @@
   function testHtmlFilter() {
     // Tag stripping, different ways to work around removal of HTML tags.
     $f = filter_xss('<script>alert(0)</script>');
-    $this->assertNoNormalized($f, 'script', t('HTML tag stripping -- simple script without special characters.'));
+    $this->assertNoNormalized($f, 'script','HTML tag stripping -- simple script without special characters.');
 
     $f = filter_xss('<script src="http://www.example.com" />');
-    $this->assertNoNormalized($f, 'script', t('HTML tag stripping -- empty script with source.'));
+    $this->assertNoNormalized($f, 'script','HTML tag stripping -- empty script with source.');
 
     $f = filter_xss('<ScRipt sRc=http://www.example.com/>');
-    $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- varying case.'));
+    $this->assertNoNormalized($f, 'script','HTML tag stripping evasion -- varying case.');
 
     $f = filter_xss("<script\nsrc\n=\nhttp://www.example.com/\n>");
-    $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- multiline tag.'));
+    $this->assertNoNormalized($f, 'script','HTML tag stripping evasion -- multiline tag.');
 
     $f = filter_xss('<script/a src=http://www.example.com/a.js></script>');
-    $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- non whitespace character after tag name.'));
+    $this->assertNoNormalized($f, 'script','HTML tag stripping evasion -- non whitespace character after tag name.');
 
     $f = filter_xss('<script/src=http://www.example.com/a.js></script>');
-    $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- no space between tag and attribute.'));
+    $this->assertNoNormalized($f, 'script','HTML tag stripping evasion -- no space between tag and attribute.');
 
     // Null between < and tag name works at least with IE6.
     $f = filter_xss("<\0scr\0ipt>alert(0)</script>");
-    $this->assertNoNormalized($f, 'ipt', t('HTML tag stripping evasion -- breaking HTML with nulls.'));
+    $this->assertNoNormalized($f, 'ipt','HTML tag stripping evasion -- breaking HTML with nulls.');
 
     $f = filter_xss("<scrscriptipt src=http://www.example.com/a.js>");
-    $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- filter just removing "script".'));
+    $this->assertNoNormalized($f, 'script','HTML tag stripping evasion -- filter just removing "script".');
 
     $f = filter_xss('<<script>alert(0);//<</script>');
-    $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- double opening brackets.'));
+    $this->assertNoNormalized($f, 'script','HTML tag stripping evasion -- double opening brackets.');
 
     $f = filter_xss('<script src=http://www.example.com/a.js?<b>');
-    $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- no closing tag.'));
+    $this->assertNoNormalized($f, 'script','HTML tag stripping evasion -- no closing tag.');
 
     // DRUPAL-SA-2008-047: This doesn't seem exploitable, but the filter should
     // work consistently.
     $f = filter_xss('<script>>');
-    $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- double closing tag.'));
+    $this->assertNoNormalized($f, 'script','HTML tag stripping evasion -- double closing tag.');
 
     $f = filter_xss('<script src=//www.example.com/.a>');
-    $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- no scheme or ending slash.'));
+    $this->assertNoNormalized($f, 'script','HTML tag stripping evasion -- no scheme or ending slash.');
 
     $f = filter_xss('<script src=http://www.example.com/.a');
-    $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- no closing bracket.'));
+    $this->assertNoNormalized($f, 'script','HTML tag stripping evasion -- no closing bracket.');
 
     $f = filter_xss('<script src=http://www.example.com/ <');
-    $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- opening instead of closing bracket.'));
+    $this->assertNoNormalized($f, 'script','HTML tag stripping evasion -- opening instead of closing bracket.');
 
     $f = filter_xss('<nosuchtag attribute="newScriptInjectionVector">');
-    $this->assertNoNormalized($f, 'nosuchtag', t('HTML tag stripping evasion -- unknown tag.'));
+    $this->assertNoNormalized($f, 'nosuchtag','HTML tag stripping evasion -- unknown tag.');
 
     $f = filter_xss('<?xml:namespace ns="urn:schemas-microsoft-com:time">');
-    $this->assertTrue(stripos($f, '<?xml') === FALSE, t('HTML tag stripping evasion -- starting with a question sign (processing instructions).'));
+    $this->assertTrue(stripos($f, '<?xml') === FALSE,'HTML tag stripping evasion -- starting with a question sign (processing instructions).');
 
     $f = filter_xss('<t:set attributeName="innerHTML" to="&lt;script defer&gt;alert(0)&lt;/script&gt;">');
-    $this->assertNoNormalized($f, 't:set', t('HTML tag stripping evasion -- colon in the tag name (namespaces\' tricks).'));
+    $this->assertNoNormalized($f, 't:set','HTML tag stripping evasion -- colon in the tag name (namespaces\' tricks).');
 
     $f = filter_xss('<img """><script>alert(0)</script>', array('img'));
-    $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- a malformed image tag.'));
+    $this->assertNoNormalized($f, 'script','HTML tag stripping evasion -- a malformed image tag.');
 
     $f = filter_xss('<blockquote><script>alert(0)</script></blockquote>', array('blockquote'));
-    $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- script in a blockqoute.'));
+    $this->assertNoNormalized($f, 'script','HTML tag stripping evasion -- script in a blockqoute.');
 
     $f = filter_xss("<!--[if true]><script>alert(0)</script><![endif]-->");
-    $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- script within a comment.'));
+    $this->assertNoNormalized($f, 'script','HTML tag stripping evasion -- script within a comment.');
 
     // Dangerous attributes removal.
     $f = filter_xss('<p onmouseover="http://www.example.com/">', array('p'));
-    $this->assertNoNormalized($f, 'onmouseover', t('HTML filter attributes removal -- events, no evasion.'));
+    $this->assertNoNormalized($f, 'onmouseover','HTML filter attributes removal -- events, no evasion.');
 
     $f = filter_xss('<li style="list-style-image: url(javascript:alert(0))">', array('li'));
-    $this->assertNoNormalized($f, 'style', t('HTML filter attributes removal -- style, no evasion.'));
+    $this->assertNoNormalized($f, 'style','HTML filter attributes removal -- style, no evasion.');
 
     $f = filter_xss('<img onerror   =alert(0)>', array('img'));
-    $this->assertNoNormalized($f, 'onerror', t('HTML filter attributes removal evasion -- spaces before equals sign.'));
+    $this->assertNoNormalized($f, 'onerror','HTML filter attributes removal evasion -- spaces before equals sign.');
 
     $f = filter_xss('<img onabort!#$%&()*~+-_.,:;?@[/|\]^`=alert(0)>', array('img'));
-    $this->assertNoNormalized($f, 'onabort', t('HTML filter attributes removal evasion -- non alphanumeric characters before equals sign.'));
+    $this->assertNoNormalized($f, 'onabort','HTML filter attributes removal evasion -- non alphanumeric characters before equals sign.');
 
     $f = filter_xss('<img oNmediAError=alert(0)>', array('img'));
-    $this->assertNoNormalized($f, 'onmediaerror', t('HTML filter attributes removal evasion -- varying case.'));
+    $this->assertNoNormalized($f, 'onmediaerror','HTML filter attributes removal evasion -- varying case.');
 
     // Works at least with IE6.
     $f = filter_xss("<img o\0nfocus\0=alert(0)>", array('img'));
-    $this->assertNoNormalized($f, 'focus', t('HTML filter attributes removal evasion -- breaking with nulls.'));
+    $this->assertNoNormalized($f, 'focus','HTML filter attributes removal evasion -- breaking with nulls.');
 
     // Only whitelisted scheme names allowed in attributes.
     $f = filter_xss('<img src="javascript:alert(0)">', array('img'));
-    $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing -- no evasion.'));
+    $this->assertNoNormalized($f, 'javascript','HTML scheme clearing -- no evasion.');
 
     $f = filter_xss('<img src=javascript:alert(0)>', array('img'));
-    $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing evasion -- no quotes.'));
+    $this->assertNoNormalized($f, 'javascript','HTML scheme clearing evasion -- no quotes.');
 
     // A bit like CVE-2006-0070.
     $f = filter_xss('<img src="javascript:confirm(0)">', array('img'));
-    $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing evasion -- no alert ;)'));
+    $this->assertNoNormalized($f, 'javascript','HTML scheme clearing evasion -- no alert ;)');
 
     $f = filter_xss('<img src=`javascript:alert(0)`>', array('img'));
-    $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing evasion -- grave accents.'));
+    $this->assertNoNormalized($f, 'javascript','HTML scheme clearing evasion -- grave accents.');
 
     $f = filter_xss('<img dynsrc="javascript:alert(0)">', array('img'));
-    $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing -- rare attribute.'));
+    $this->assertNoNormalized($f, 'javascript','HTML scheme clearing -- rare attribute.');
 
     $f = filter_xss('<table background="javascript:alert(0)">', array('table'));
-    $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing -- another tag.'));
+    $this->assertNoNormalized($f, 'javascript','HTML scheme clearing -- another tag.');
 
     $f = filter_xss('<base href="javascript:alert(0);//">', array('base'));
-    $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing -- one more attribute and tag.'));
+    $this->assertNoNormalized($f, 'javascript','HTML scheme clearing -- one more attribute and tag.');
 
     $f = filter_xss('<img src="jaVaSCriPt:alert(0)">', array('img'));
-    $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing evasion -- varying case.'));
+    $this->assertNoNormalized($f, 'javascript','HTML scheme clearing evasion -- varying case.');
 
     $f = filter_xss('<img src=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#48;&#41;>', array('img'));
-    $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing evasion -- UTF-8 decimal encoding.'));
+    $this->assertNoNormalized($f, 'javascript','HTML scheme clearing evasion -- UTF-8 decimal encoding.');
 
     $f = filter_xss('<img src=&#00000106&#0000097&#00000118&#0000097&#00000115&#0000099&#00000114&#00000105&#00000112&#00000116&#0000058&#0000097&#00000108&#00000101&#00000114&#00000116&#0000040&#0000048&#0000041>', array('img'));
-    $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing evasion -- long UTF-8 encoding.'));
+    $this->assertNoNormalized($f, 'javascript','HTML scheme clearing evasion -- long UTF-8 encoding.');
 
     $f = filter_xss('<img src=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x30&#x29>', array('img'));
-    $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing evasion -- UTF-8 hex encoding.'));
+    $this->assertNoNormalized($f, 'javascript','HTML scheme clearing evasion -- UTF-8 hex encoding.');
 
     $f = filter_xss("<img src=\"jav\tascript:alert(0)\">", array('img'));
-    $this->assertNoNormalized($f, 'script', t('HTML scheme clearing evasion -- an embedded tab.'));
+    $this->assertNoNormalized($f, 'script','HTML scheme clearing evasion -- an embedded tab.');
 
     $f = filter_xss('<img src="jav&#x09;ascript:alert(0)">', array('img'));
-    $this->assertNoNormalized($f, 'script', t('HTML scheme clearing evasion -- an encoded, embedded tab.'));
+    $this->assertNoNormalized($f, 'script','HTML scheme clearing evasion -- an encoded, embedded tab.');
 
     $f = filter_xss('<img src="jav&#x000000A;ascript:alert(0)">', array('img'));
-    $this->assertNoNormalized($f, 'script', t('HTML scheme clearing evasion -- an encoded, embedded newline.'));
+    $this->assertNoNormalized($f, 'script','HTML scheme clearing evasion -- an encoded, embedded newline.');
 
     // With &#xD; this test would fail, but the entity gets turned into
     // &amp;#xD;, so it's OK.
     $f = filter_xss('<img src="jav&#x0D;ascript:alert(0)">', array('img'));
-    $this->assertNoNormalized($f, 'script', t('HTML scheme clearing evasion -- an encoded, embedded carriage return.'));
+    $this->assertNoNormalized($f, 'script','HTML scheme clearing evasion -- an encoded, embedded carriage return.');
 
     $f = filter_xss("<img src=\"\n\n\nj\na\nva\ns\ncript:alert(0)\">", array('img'));
-    $this->assertNoNormalized($f, 'cript', t('HTML scheme clearing evasion -- broken into many lines.'));
+    $this->assertNoNormalized($f, 'cript','HTML scheme clearing evasion -- broken into many lines.');
 
     $f = filter_xss("<img src=\"jav\0a\0\0cript:alert(0)\">", array('img'));
-    $this->assertNoNormalized($f, 'cript', t('HTML scheme clearing evasion -- embedded nulls.'));
+    $this->assertNoNormalized($f, 'cript','HTML scheme clearing evasion -- embedded nulls.');
 
     $f = filter_xss('<img src=" &#14;  javascript:alert(0)">', array('img'));
-    $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing evasion -- spaces and metacharacters before scheme.'));
+    $this->assertNoNormalized($f, 'javascript','HTML scheme clearing evasion -- spaces and metacharacters before scheme.');
 
     $f = filter_xss('<img src="vbscript:msgbox(0)">', array('img'));
-    $this->assertNoNormalized($f, 'vbscript', t('HTML scheme clearing evasion -- another scheme.'));
+    $this->assertNoNormalized($f, 'vbscript','HTML scheme clearing evasion -- another scheme.');
 
     $f = filter_xss('<img src="nosuchscheme:notice(0)">', array('img'));
-    $this->assertNoNormalized($f, 'nosuchscheme', t('HTML scheme clearing evasion -- unknown scheme.'));
+    $this->assertNoNormalized($f, 'nosuchscheme','HTML scheme clearing evasion -- unknown scheme.');
 
     // Netscape 4.x javascript entities.
     $f = filter_xss('<br size="&{alert(0)}">', array('br'));
-    $this->assertNoNormalized($f, 'alert', t('Netscape 4.x javascript entities.'));
+    $this->assertNoNormalized($f, 'alert','Netscape 4.x javascript entities.');
 
     // DRUPAL-SA-2008-006: Invalid UTF-8, these only work as reflected XSS with
     // Internet Explorer 6.
     $f = filter_xss("<p arg=\"\xe0\">\" style=\"background-image: url(javascript:alert(0));\"\xe0<p>", array('p'));
-    $this->assertNoNormalized($f, 'style', t('HTML filter -- invalid UTF-8.'));
+    $this->assertNoNormalized($f, 'style','HTML filter -- invalid UTF-8.');
 
     $f = filter_xss("\xc0aaa");
-    $this->assertEqual($f, '', t('HTML filter -- overlong UTF-8 sequences.'));
+    $this->assertEqual($f, '','HTML filter -- overlong UTF-8 sequences.');
 
     $f = filter_xss("Who&#039;s Online");
-    $this->assertNormalized($f, "who's online", t('HTML filter -- html entity number'));
+    $this->assertNormalized($f, "who's online",'HTML filter -- html entity number');
 
     $f = filter_xss("Who&amp;#039;s Online");
-    $this->assertNormalized($f, "who&#039;s online", t('HTML filter -- encoded html entity number'));
+    $this->assertNormalized($f, "who&#039;s online",'HTML filter -- encoded html entity number');
 
     $f = filter_xss("Who&amp;amp;#039; Online");
-    $this->assertNormalized($f, "who&amp;#039; online", t('HTML filter -- double encoded html entity number'));
+    $this->assertNormalized($f, "who&amp;#039; online",'HTML filter -- double encoded html entity number');
   }
 
   /**
@@ -430,31 +430,31 @@
     // HTML filter is not able to secure some tags, these should never be
     // allowed.
     $f = filter_filter('process', 0, 'no_such_format', '<script />');
-    $this->assertNoNormalized($f, 'script', t('HTML filter should always remove script tags.'));
+    $this->assertNoNormalized($f, 'script','HTML filter should always remove script tags.');
 
     $f = filter_filter('process', 0, 'no_such_format', '<iframe />');
-    $this->assertNoNormalized($f, 'iframe', t('HTML filter should always remove iframe tags.'));
+    $this->assertNoNormalized($f, 'iframe','HTML filter should always remove iframe tags.');
 
     $f = filter_filter('process', 0, 'no_such_format', '<object />');
-    $this->assertNoNormalized($f, 'object', t('HTML filter should always remove object tags.'));
+    $this->assertNoNormalized($f, 'object','HTML filter should always remove object tags.');
 
     $f = filter_filter('process', 0, 'no_such_format', '<style />');
-    $this->assertNoNormalized($f, 'style', t('HTML filter should always remove style tags.'));
+    $this->assertNoNormalized($f, 'style','HTML filter should always remove style tags.');
 
     // Some tags make CSRF attacks easier, let the user take the risk herself.
     $f = filter_filter('process', 0, 'no_such_format', '<img />');
-    $this->assertNoNormalized($f, 'img', t('HTML filter should remove img tags on default.'));
+    $this->assertNoNormalized($f, 'img','HTML filter should remove img tags on default.');
 
     $f = filter_filter('process', 0, 'no_such_format', '<input />');
-    $this->assertNoNormalized($f, 'img', t('HTML filter should remove input tags on default.'));
+    $this->assertNoNormalized($f, 'img','HTML filter should remove input tags on default.');
 
     // Filtering content of some attributes is infeasible, these shouldn't be
     // allowed too.
     $f = filter_filter('process', 0, 'no_such_format', '<p style="display: none;" />');
-    $this->assertNoNormalized($f, 'style', t('HTML filter should remove style attribute on default.'));
+    $this->assertNoNormalized($f, 'style','HTML filter should remove style attribute on default.');
 
     $f = filter_filter('process', 0, 'no_such_format', '<p onerror="alert(0);" />');
-    $this->assertNoNormalized($f, 'onerror', t('HTML filter should remove on* attributes on default.'));
+    $this->assertNoNormalized($f, 'onerror','HTML filter should remove on* attributes on default.');
   }
 
   /**
@@ -466,19 +466,19 @@
     // Test if the rel="nofollow" attribute is added, even if we try to prevent
     // it.
     $f = _filter_html('<a href="http://www.example.com/">text</a>', 'f');
-    $this->assertNormalized($f, 'rel="nofollow"', t('Spam deterrent -- no evasion.'));
+    $this->assertNormalized($f, 'rel="nofollow"','Spam deterrent -- no evasion.');
 
     $f = _filter_html('<A href="http://www.example.com/">text</a>', 'f');
-    $this->assertNormalized($f, 'rel="nofollow"', t('Spam deterrent evasion -- capital A.'));
+    $this->assertNormalized($f, 'rel="nofollow"','Spam deterrent evasion -- capital A.');
 
     $f = _filter_html("<a/href=\"http://www.example.com/\">text</a>", 'f');
-    $this->assertNormalized($f, 'rel="nofollow"', t('Spam deterrent evasion -- non whitespace character after tag name.'));
+    $this->assertNormalized($f, 'rel="nofollow"','Spam deterrent evasion -- non whitespace character after tag name.');
 
     $f = _filter_html("<\0a\0 href=\"http://www.example.com/\">text</a>", 'f');
-    $this->assertNormalized($f, 'rel="nofollow"', t('Spam deterrent evasion -- some nulls.'));
+    $this->assertNormalized($f, 'rel="nofollow"','Spam deterrent evasion -- some nulls.');
 
     $f = _filter_html('<!--[if true]><a href="http://www.example.com/">text</a><![endif]-->', 'f');
-    $this->assertNormalized($f, 'rel="nofollow"', t('Spam deterrent evasion -- link within a comment.'));
+    $this->assertNormalized($f, 'rel="nofollow"','Spam deterrent evasion -- link within a comment.');
   }
 
   /**
@@ -487,13 +487,13 @@
   function testAdminHtmlFilter() {
     // DRUPAL-SA-2008-044
     $f = filter_xss_admin('<object />');
-    $this->assertNoNormalized($f, 'object', t('Admin HTML filter -- should not allow object tag.'));
+    $this->assertNoNormalized($f, 'object','Admin HTML filter -- should not allow object tag.');
 
     $f = filter_xss_admin('<script />');
-    $this->assertNoNormalized($f, 'script', t('Admin HTML filter -- should not allow script tag.'));
+    $this->assertNoNormalized($f, 'script','Admin HTML filter -- should not allow script tag.');
 
     $f = filter_xss_admin('<style /><iframe /><frame /><frameset /><meta /><link /><embed /><applet /><param /><layer />');
-    $this->assertEqual($f, '', t('Admin HTML filter -- should never allow some tags.'));
+    $this->assertEqual($f, '','Admin HTML filter -- should never allow some tags.');
   }
 
   /**
@@ -505,15 +505,15 @@
     // Test that characters that have special meaning in XML are changed into
     // entities.
     $f = check_plain('<>&"');
-    $this->assertEqual($f, '&lt;&gt;&amp;&quot;', t('No HTML filter basic test.'));
+    $this->assertEqual($f, '&lt;&gt;&amp;&quot;','No HTML filter basic test.');
 
     // A single quote can also be used for evil things in some contexts.
     $f = check_plain('\'');
-    $this->assertEqual($f, '&#039;', t('No HTML filter -- single quote.'));
+    $this->assertEqual($f, '&#039;','No HTML filter -- single quote.');
 
     // Test that the filter is not fooled by different evasion techniques.
     $f = check_plain("\xc2\"");
-    $this->assertEqual($f, '', t('No HTML filter -- invalid UTF-8.'));
+    $this->assertEqual($f, '','No HTML filter -- invalid UTF-8.');
   }
 
   /**
@@ -524,73 +524,73 @@
 
     // Converting URLs.
     $f = _filter_url('http://www.example.com/', 'f');
-    $this->assertEqual($f, '<a href="http://www.example.com/" title="http://www.example.com/">http://www.example.com/</a>', t('Converting URLs.'));
+    $this->assertEqual($f, '<a href="http://www.example.com/" title="http://www.example.com/">http://www.example.com/</a>','Converting URLs.');
 
     $f = _filter_url('http://www.example.com/?a=1&b=2', 'f');
-    $this->assertEqual($f, '<a href="http://www.example.com/?a=1&amp;b=2" title="http://www.example.com/?a=1&amp;b=2">http://www.example.com/?a=1&amp;b=2</a>', t('Converting URLs -- ampersands.'));
+    $this->assertEqual($f, '<a href="http://www.example.com/?a=1&amp;b=2" title="http://www.example.com/?a=1&amp;b=2">http://www.example.com/?a=1&amp;b=2</a>','Converting URLs -- ampersands.');
 
     $f = _filter_url('ftp://user:pass@ftp.example.com/dir1/dir2', 'f');
-    $this->assertEqual($f, '<a href="ftp://user:pass@ftp.example.com/dir1/dir2" title="ftp://user:pass@ftp.example.com/dir1/dir2">ftp://user:pass@ftp.example.com/dir1/dir2</a>', t('Converting URLs -- FTP scheme.'));
+    $this->assertEqual($f, '<a href="ftp://user:pass@ftp.example.com/dir1/dir2" title="ftp://user:pass@ftp.example.com/dir1/dir2">ftp://user:pass@ftp.example.com/dir1/dir2</a>','Converting URLs -- FTP scheme.');
 
     // Converting domain names.
     $f = _filter_url('www.example.com', 'f');
-    $this->assertEqual($f, '<a href="http://www.example.com" title="www.example.com">www.example.com</a>', t('Converting domain names.'));
+    $this->assertEqual($f, '<a href="http://www.example.com" title="www.example.com">www.example.com</a>','Converting domain names.');
 
     $f = _filter_url('<li>www.example.com</li>', 'f');
-    $this->assertEqual($f, '<li><a href="http://www.example.com" title="www.example.com">www.example.com</a></li>', t('Converting domain names -- domain in a list.'));
+    $this->assertEqual($f, '<li><a href="http://www.example.com" title="www.example.com">www.example.com</a></li>','Converting domain names -- domain in a list.');
 
     $f = _filter_url('(www.example.com/dir?a=1&b=2#a)', 'f');
-    $this->assertEqual($f, '(<a href="http://www.example.com/dir?a=1&amp;b=2#a" title="www.example.com/dir?a=1&amp;b=2#a">www.example.com/dir?a=1&amp;b=2#a</a>)', t('Converting domain names --  domain in parentheses.'));
+    $this->assertEqual($f, '(<a href="http://www.example.com/dir?a=1&amp;b=2#a" title="www.example.com/dir?a=1&amp;b=2#a">www.example.com/dir?a=1&amp;b=2#a</a>)','Converting domain names --  domain in parentheses.');
 
     // Converting e-mail addresses.
     $f = _filter_url('johndoe@example.com', 'f');
-    $this->assertEqual($f, '<a href="mailto:johndoe@example.com">johndoe@example.com</a>', t('Converting e-mail addresses.'));
+    $this->assertEqual($f, '<a href="mailto:johndoe@example.com">johndoe@example.com</a>','Converting e-mail addresses.');
 
     $f = _filter_url('aaa@sub.tv', 'f');
-    $this->assertEqual($f, '<a href="mailto:aaa@sub.tv">aaa@sub.tv</a>', t('Converting e-mail addresses -- a short e-mail from Tuvalu.'));
+    $this->assertEqual($f, '<a href="mailto:aaa@sub.tv">aaa@sub.tv</a>','Converting e-mail addresses -- a short e-mail from Tuvalu.');
 
     // URL trimming.
     variable_set('filter_url_length_f', 28);
 
     $f = _filter_url('http://www.example.com/d/ff.ext?a=1&b=2#a1', 'f');
-    $this->assertNormalized($f, 'http://www.example.com/d/ff....', t('URL trimming.'));
+    $this->assertNormalized($f, 'http://www.example.com/d/ff....','URL trimming.');
 
     // Not breaking existing links.
     $f = _filter_url('<a href="http://www.example.com">www.example.com</a>', 'f');
-    $this->assertEqual($f, '<a href="http://www.example.com">www.example.com</a>', t('Converting URLs -- do not break existing links.'));
+    $this->assertEqual($f, '<a href="http://www.example.com">www.example.com</a>','Converting URLs -- do not break existing links.');
 
     $f = _filter_url('<a href="foo">http://www.example.com</a>', 'f');
-    $this->assertEqual($f, '<a href="foo">http://www.example.com</a>', t('Converting URLs -- do not break existing, relative links.'));
+    $this->assertEqual($f, '<a href="foo">http://www.example.com</a>','Converting URLs -- do not break existing, relative links.');
 
     // Addresses within some tags such as code or script should not be converted.
     $f = _filter_url('<code>http://www.example.com</code>', 'f');
-    $this->assertEqual($f, '<code>http://www.example.com</code>', t('Converting URLs -- skip code contents.'));
+    $this->assertEqual($f, '<code>http://www.example.com</code>','Converting URLs -- skip code contents.');
 
     $f = _filter_url('<code><em>http://www.example.com</em></code>', 'f');
-    $this->assertEqual($f, '<code><em>http://www.example.com</em></code>', t('Converting URLs -- really skip code contents.'));
+    $this->assertEqual($f, '<code><em>http://www.example.com</em></code>','Converting URLs -- really skip code contents.');
 
     $f = _filter_url('<script>http://www.example.com</script>', 'f');
-    $this->assertEqual($f, '<script>http://www.example.com</script>', t('Converting URLs -- do not process scripts.'));
+    $this->assertEqual($f, '<script>http://www.example.com</script>','Converting URLs -- do not process scripts.');
 
     // Addresses in attributes should not be converted.
     $f = _filter_url('<p xmlns="http://www.example.com" />', 'f');
-    $this->assertEqual($f, '<p xmlns="http://www.example.com" />', t('Converting URLs -- do not convert addresses in attributes.'));
+    $this->assertEqual($f, '<p xmlns="http://www.example.com" />','Converting URLs -- do not convert addresses in attributes.');
 
     $f = _filter_url('<a title="Go to www.example.com" href="http://www.example.com">text</a>', 'f');
-    $this->assertEqual($f, '<a title="Go to www.example.com" href="http://www.example.com">text</a>', t('Converting URLs -- do not break existing links with custom title attribute.'));
+    $this->assertEqual($f, '<a title="Go to www.example.com" href="http://www.example.com">text</a>','Converting URLs -- do not break existing links with custom title attribute.');
 
     // Even though a dot at the end of a URL can indicate a fully qualified
     // domain name, such usage is rare compared to using a link at the end
     // of a sentence, so remove the dot from the link.
     // @todo It can also be used at the end of a filename or a query string.
     $f = _filter_url('www.example.com.', 'f');
-    $this->assertEqual($f, '<a href="http://www.example.com" title="www.example.com">www.example.com</a>.', t('Converting URLs -- do not recognize a dot at the end of a domain name (FQDNs).'));
+    $this->assertEqual($f, '<a href="http://www.example.com" title="www.example.com">www.example.com</a>.','Converting URLs -- do not recognize a dot at the end of a domain name (FQDNs).');
 
     $f = _filter_url('http://www.example.com.', 'f');
-    $this->assertEqual($f, '<a href="http://www.example.com" title="http://www.example.com">http://www.example.com</a>.', t('Converting URLs -- do not recognize a dot at the end of an URL (FQDNs).'));
+    $this->assertEqual($f, '<a href="http://www.example.com" title="http://www.example.com">http://www.example.com</a>.','Converting URLs -- do not recognize a dot at the end of an URL (FQDNs).');
 
     $f = _filter_url('www.example.com/index.php?a=.', 'f');
-    $this->assertEqual($f, '<a href="http://www.example.com/index.php?a=" title="www.example.com/index.php?a=">www.example.com/index.php?a=</a>.', t('Converting URLs -- do forget about a dot at the end of a query string.'));
+    $this->assertEqual($f, '<a href="http://www.example.com/index.php?a=" title="www.example.com/index.php?a=">www.example.com/index.php?a=</a>.','Converting URLs -- do forget about a dot at the end of a query string.');
   }
 
   /**
@@ -601,20 +601,20 @@
   function testHtmlCorrector() {
     // Tag closing.
     $f = _filter_htmlcorrector('<p>text');
-    $this->assertEqual($f, '<p>text</p>', t('HTML corrector -- tag closing at the end of input.'));
+    $this->assertEqual($f, '<p>text</p>','HTML corrector -- tag closing at the end of input.');
 
     $f = _filter_htmlcorrector('<p>text<p><p>text');
-    $this->assertEqual($f, '<p>text</p><p></p><p>text</p>', t('HTML corrector -- tag closing.'));
+    $this->assertEqual($f, '<p>text</p><p></p><p>text</p>','HTML corrector -- tag closing.');
 
     $f = _filter_htmlcorrector("<ul><li>e1<li>e2");
-    $this->assertEqual($f, "<ul><li>e1</li><li>e2</li></ul>", t('HTML corrector -- unclosed list tags.'));
+    $this->assertEqual($f, "<ul><li>e1</li><li>e2</li></ul>",'HTML corrector -- unclosed list tags.');
 
     $f = _filter_htmlcorrector('<div id="d">content');
-    $this->assertEqual($f, '<div id="d">content</div>', t('HTML corrector -- unclosed tag with attribute.'));
+    $this->assertEqual($f, '<div id="d">content</div>','HTML corrector -- unclosed tag with attribute.');
 
     // XHTML slash for empty elements.
     $f = _filter_htmlcorrector('<hr><br>');
-    $this->assertEqual($f, '<hr /><br />', t('HTML corrector -- XHTML closing slash.'));
+    $this->assertEqual($f, '<hr /><br />','HTML corrector -- XHTML closing slash.');
   }
 
   function createFormat($filter) {
Index: modules/field/field.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.test,v
retrieving revision 1.30
diff -u -r1.30 field.test
--- modules/field/field.test	7 Jul 2009 09:28:07 -0000	1.30
+++ modules/field/field.test	9 Jul 2009 02:46:29 -0000
@@ -15,9 +15,9 @@
 class FieldAttachTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name'  => t('Field attach tests'),
-      'description'  => t("Test Field Attach API functions."),
-      'group' => t('Field')
+      'name'  => 'Field attach tests',
+      'description'  => "Test Field Attach API functions.",
+      'group' => 'Field'
     );
   }
 
@@ -87,7 +87,7 @@
     $entity = field_test_create_stub_entity(0, 0, $this->instance['bundle']);
     field_attach_load($entity_type, array(0 => $entity));
     // Number of values per field loaded equals the field cardinality.
-    $this->assertEqual(count($entity->{$this->field_name}), $this->field['cardinality'], t('Currrent revision: expected number of values'));
+    $this->assertEqual(count($entity->{$this->field_name}), $this->field['cardinality'],'Currrent revision: expected number of values');
     for ($delta = 0; $delta < $this->field['cardinality']; $delta++) {
       // The field value loaded matches the one inserted or updated.
       $this->assertEqual($entity->{$this->field_name}[$delta]['value'] , $values[$current_revision][$delta]['value'], t('Currrent revision: expected value %delta was found.', array('%delta' => $delta)));
@@ -188,7 +188,7 @@
 
     $entity = clone($entity_init);
     field_attach_load($entity_type, array($entity->ftid => $entity));
-    $this->assertTrue(empty($entity->{$this->field_name}), t('Insert: missing field results in no value saved'));
+    $this->assertTrue(empty($entity->{$this->field_name}),'Insert: missing field results in no value saved');
 
     // Insert: Field is NULL.
     field_cache_clear();
@@ -198,7 +198,7 @@
 
     $entity = clone($entity_init);
     field_attach_load($entity_type, array($entity->ftid => $entity));
-    $this->assertTrue(empty($entity->{$this->field_name}), t('Insert: NULL field results in no value saved'));
+    $this->assertTrue(empty($entity->{$this->field_name}),'Insert: NULL field results in no value saved');
 
     // Add some real data.
     field_cache_clear();
@@ -209,7 +209,7 @@
 
     $entity = clone($entity_init);
     field_attach_load($entity_type, array($entity->ftid => $entity));
-    $this->assertEqual($entity->{$this->field_name}, $values, t('Field data saved'));
+    $this->assertEqual($entity->{$this->field_name}, $values,'Field data saved');
 
     // Update: Field is missing. Data should survive.
     field_cache_clear();
@@ -218,7 +218,7 @@
 
     $entity = clone($entity_init);
     field_attach_load($entity_type, array($entity->ftid => $entity));
-    $this->assertEqual($entity->{$this->field_name}, $values, t('Update: missing field leaves existing values in place'));
+    $this->assertEqual($entity->{$this->field_name}, $values,'Update: missing field leaves existing values in place');
 
     // Update: Field is NULL. Data should be wiped.
     field_cache_clear();
@@ -228,7 +228,7 @@
 
     $entity = clone($entity_init);
     field_attach_load($entity_type, array($entity->ftid => $entity));
-    $this->assertTrue(empty($entity->{$this->field_name}), t('Update: NULL field removes existing values'));
+    $this->assertTrue(empty($entity->{$this->field_name}),'Update: NULL field removes existing values');
   }
 
   /**
@@ -249,7 +249,7 @@
 
     $entity = clone($entity_init);
     field_attach_load($entity_type, array($entity->ftid => $entity));
-    $this->assertTrue(empty($entity->{$this->field_name}), t('Insert: NULL field results in no value saved'));
+    $this->assertTrue(empty($entity->{$this->field_name}),'Insert: NULL field results in no value saved');
 
     // Insert: Field is missing.
     field_cache_clear();
@@ -259,7 +259,7 @@
     $entity = clone($entity_init);
     field_attach_load($entity_type, array($entity->ftid => $entity));
     $values = field_test_default_value($entity_type, $entity, $this->field, $this->instance);
-    $this->assertEqual($entity->{$this->field_name}, $values, t('Insert: missing field results in default value saved'));
+    $this->assertEqual($entity->{$this->field_name}, $values,'Insert: missing field results in default value saved');
   }
 
   /**
@@ -307,26 +307,26 @@
     } while (in_array($different_value, $values));
     $conditions = array(array('value', $different_value));
     $result = field_attach_query($this->field_name, $conditions, FIELD_QUERY_NO_LIMIT);
-    $this->assertFalse(isset($result[$entity_types[1]][1]), t("Query on a value that is not in the object doesn't return the object"));
+    $this->assertFalse(isset($result[$entity_types[1]][1]),"Query on a value that is not in the object doesn't return the object");
 
     // Query on the value shared by both objects, and discriminate using
     // additional conditions.
 
     $conditions = array(array('value', $common_value));
     $result = field_attach_query($this->field_name, $conditions, FIELD_QUERY_NO_LIMIT);
-    $this->assertTrue(isset($result[$entity_types[1]][1]) && isset($result[$entity_types[2]][2]), t('Query on a value common to both objects returns both objects'));
+    $this->assertTrue(isset($result[$entity_types[1]][1]) && isset($result[$entity_types[2]][2]),'Query on a value common to both objects returns both objects');
 
     $conditions = array(array('type', $entity_types[1]), array('value', $common_value));
     $result = field_attach_query($this->field_name, $conditions, FIELD_QUERY_NO_LIMIT);
-    $this->assertTrue(isset($result[$entity_types[1]][1]) && !isset($result[$entity_types[2]][2]), t("Query on a value common to both objects and a 'type' condition only returns the relevant object"));
+    $this->assertTrue(isset($result[$entity_types[1]][1]) && !isset($result[$entity_types[2]][2]),"Query on a value common to both objects and a 'type' condition only returns the relevant object");
 
     $conditions = array(array('bundle', $entities[1]->fttype), array('value', $common_value));
     $result = field_attach_query($this->field_name, $conditions, FIELD_QUERY_NO_LIMIT);
-    $this->assertTrue(isset($result[$entity_types[1]][1]) && !isset($result[$entity_types[2]][2]), t("Query on a value common to both objects and a 'bundle' condition only returns the relevant object"));
+    $this->assertTrue(isset($result[$entity_types[1]][1]) && !isset($result[$entity_types[2]][2]),"Query on a value common to both objects and a 'bundle' condition only returns the relevant object");
 
     $conditions = array(array('entity_id', $entities[1]->ftid), array('value', $common_value));
     $result = field_attach_query($this->field_name, $conditions, FIELD_QUERY_NO_LIMIT);
-    $this->assertTrue(isset($result[$entity_types[1]][1]) && !isset($result[$entity_types[2]][2]), t("Query on a value common to both objects and an 'entity_id' condition only returns the relevant object"));
+    $this->assertTrue(isset($result[$entity_types[1]][1]) && !isset($result[$entity_types[2]][2]),"Query on a value common to both objects and an 'entity_id' condition only returns the relevant object");
 
     // Test FIELD_QUERY_RETURN_IDS result format.
     $conditions = array(array('value', $values[0]));
@@ -336,7 +336,7 @@
         $entities[1]->ftid => field_test_create_stub_entity($entities[1]->ftid, $entities[1]->ftvid),
       )
     );
-    $this->assertEqual($result, $expected, t('FIELD_QUERY_RETURN_IDS result format returns the expect result'));
+    $this->assertEqual($result, $expected,'FIELD_QUERY_RETURN_IDS result format returns the expect result');
   }
 
   /**
@@ -376,18 +376,18 @@
     } while (in_array($different_value, $values));
     $conditions = array(array('value', $different_value));
     $result = field_attach_query_revisions($this->field_name, $conditions, FIELD_QUERY_NO_LIMIT);
-    $this->assertFalse(isset($result[$entity_type][1]), t("Query on a value that is not in the object doesn't return the object"));
+    $this->assertFalse(isset($result[$entity_type][1]),"Query on a value that is not in the object doesn't return the object");
 
     // Query on the value shared by both objects, and discriminate using
     // additional conditions.
 
     $conditions = array(array('value', $common_value));
     $result = field_attach_query_revisions($this->field_name, $conditions, FIELD_QUERY_NO_LIMIT);
-    $this->assertTrue(isset($result[$entity_type][1]) && isset($result[$entity_type][2]), t('Query on a value common to both objects returns both objects'));
+    $this->assertTrue(isset($result[$entity_type][1]) && isset($result[$entity_type][2]),'Query on a value common to both objects returns both objects');
 
     $conditions = array(array('revision_id', $entities[1]->ftvid), array('value', $common_value));
     $result = field_attach_query_revisions($this->field_name, $conditions, FIELD_QUERY_NO_LIMIT);
-    $this->assertTrue(isset($result[$entity_type][1]) && !isset($result[$entity_type][2]), t("Query on a value common to both objects and a 'revision_id' condition only returns the relevant object"));
+    $this->assertTrue(isset($result[$entity_type][1]) && !isset($result[$entity_type][2]),"Query on a value common to both objects and a 'revision_id' condition only returns the relevant object");
 
     // Test FIELD_QUERY_RETURN_IDS result format.
     $conditions = array(array('value', $values[0]));
@@ -397,7 +397,7 @@
         $entities[1]->ftid => field_test_create_stub_entity($entities[1]->ftid, $entities[1]->ftvid),
       )
     );
-    $this->assertEqual($result, $expected, t('FIELD_QUERY_RETURN_IDS result format returns the expect result'));
+    $this->assertEqual($result, $expected,'FIELD_QUERY_RETURN_IDS result format returns the expect result');
   }
 
   function testFieldAttachViewAndPreprocess() {
@@ -526,7 +526,7 @@
     }
     $read = field_test_create_stub_entity(0, 2, $this->instance['bundle']);
     field_attach_load($entity_type, array(0 => $read));
-    $this->assertIdentical($read->{$this->field_name}, array(), t('The test object current revision is deleted.'));
+    $this->assertIdentical($read->{$this->field_name}, array(),'The test object current revision is deleted.');
   }
 
   function testFieldAttachCreateRenameBundle() {
@@ -638,50 +638,50 @@
     $cid = "field:$noncached_type:{$entity_init->ftid}";
 
     // Check that no initial cache entry is present.
-    $this->assertFalse(cache_get($cid, 'cache_field'), t('Non-cached: no initial cache entry'));
+    $this->assertFalse(cache_get($cid, 'cache_field'),'Non-cached: no initial cache entry');
 
     // Save, and check that no cache entry is present.
     $entity = clone($entity_init);
     $entity->{$this->field_name} = $values;
     field_attach_insert($noncached_type, $entity);
-    $this->assertFalse(cache_get($cid, 'cache_field'), t('Non-cached: no cache entry on insert'));
+    $this->assertFalse(cache_get($cid, 'cache_field'),'Non-cached: no cache entry on insert');
 
     // Load, and check that no cache entry is present.
     $entity = clone($entity_init);
     field_attach_load($noncached_type, array($entity->ftid => $entity));
-    $this->assertFalse(cache_get($cid, 'cache_field'), t('Non-cached: no cache entry on load'));
+    $this->assertFalse(cache_get($cid, 'cache_field'),'Non-cached: no cache entry on load');
 
 
     // Cacheable entity type.
     $cid = "field:$cached_type:{$entity_init->ftid}";
 
     // Check that no initial cache entry is present.
-    $this->assertFalse(cache_get($cid, 'cache_field'), t('Cached: no initial cache entry'));
+    $this->assertFalse(cache_get($cid, 'cache_field'),'Cached: no initial cache entry');
 
     // Save, and check that no cache entry is present.
     $entity = clone($entity_init);
     $entity->{$this->field_name} = $values;
     field_attach_insert($cached_type, $entity);
-    $this->assertFalse(cache_get($cid, 'cache_field'), t('Cached: no cache entry on insert'));
+    $this->assertFalse(cache_get($cid, 'cache_field'),'Cached: no cache entry on insert');
 
     // Load, and check that a cache entry is present with the expected values.
     $entity = clone($entity_init);
     field_attach_load($cached_type, array($entity->ftid => $entity));
     $cache = cache_get($cid, 'cache_field');
-    $this->assertEqual($cache->data[$this->field_name], $values, t('Cached: correct cache entry on load'));
+    $this->assertEqual($cache->data[$this->field_name], $values,'Cached: correct cache entry on load');
 
     // Update with different values, and check that the cache entry is wiped.
     $values = $this->_generateTestFieldValues($this->field['cardinality']);
     $entity = clone($entity_init);
     $entity->{$this->field_name} = $values;
     field_attach_update($cached_type, $entity);
-    $this->assertFalse(cache_get($cid, 'cache_field'), t('Cached: no cache entry on update'));
+    $this->assertFalse(cache_get($cid, 'cache_field'),'Cached: no cache entry on update');
 
     // Load, and check that a cache entry is present with the expected values.
     $entity = clone($entity_init);
     field_attach_load($cached_type, array($entity->ftid => $entity));
     $cache = cache_get($cid, 'cache_field');
-    $this->assertEqual($cache->data[$this->field_name], $values, t('Cached: correct cache entry on load'));
+    $this->assertEqual($cache->data[$this->field_name], $values,'Cached: correct cache entry on load');
 
     // Create a new revision, and check that the cache entry is wiped.
     $entity_init = field_test_create_stub_entity(1, 2, $this->instance['bundle']);
@@ -690,17 +690,17 @@
     $entity->{$this->field_name} = $values;
     field_attach_update($cached_type, $entity);
     $cache = cache_get($cid, 'cache_field');
-    $this->assertFalse(cache_get($cid, 'cache_field'), t('Cached: no cache entry on new revision creation'));
+    $this->assertFalse(cache_get($cid, 'cache_field'),'Cached: no cache entry on new revision creation');
 
     // Load, and check that a cache entry is present with the expected values.
     $entity = clone($entity_init);
     field_attach_load($cached_type, array($entity->ftid => $entity));
     $cache = cache_get($cid, 'cache_field');
-    $this->assertEqual($cache->data[$this->field_name], $values, t('Cached: correct cache entry on load'));
+    $this->assertEqual($cache->data[$this->field_name], $values,'Cached: correct cache entry on load');
 
     // Delete, and check that the cache entry is wiped.
     field_attach_delete($cached_type, $entity);
-    $this->assertFalse(cache_get($cid, 'cache_field'), t('Cached: no cache entry after delete'));
+    $this->assertFalse(cache_get($cid, 'cache_field'),'Cached: no cache entry after delete');
   }
 
   // Verify that field_attach_validate() invokes the correct
@@ -813,9 +813,9 @@
 
   public static function getInfo() {
     return array(
-      'name'  => t('Field info tests'),
-      'description'  => t("Get information about existing fields, instances and bundles."),
-      'group' => t('Field')
+      'name'  => 'Field info tests',
+      'description'  => "Get information about existing fields, instances and bundles.",
+      'group' => 'Field'
     );
   }
 
@@ -832,31 +832,31 @@
     $info = field_info_field_types();
     foreach ($field_test_info as $t_key => $field_type) {
       foreach ($field_type as $key => $val) {
-        $this->assertEqual($info[$t_key][$key], $val, t("Field type $t_key key $key is $val"));
+        $this->assertEqual($info[$t_key][$key], $val,"Field type $t_key key $key is $val");
       }
-      $this->assertEqual($info[$t_key]['module'], 'field_test',  t("Field type field_test module appears"));
+      $this->assertEqual($info[$t_key]['module'], 'field_test', "Field type field_test module appears");
     }
 
     $info = field_info_formatter_types();
     foreach ($formatter_info as $f_key => $formatter) {
       foreach ($formatter as $key => $val) {
-        $this->assertEqual($info[$f_key][$key], $val, t("Formatter type $f_key key $key is $val"));
+        $this->assertEqual($info[$f_key][$key], $val,"Formatter type $f_key key $key is $val");
       }
-      $this->assertEqual($info[$f_key]['module'], 'field_test',  t("Formatter type field_test module appears"));
+      $this->assertEqual($info[$f_key]['module'], 'field_test', "Formatter type field_test module appears");
     }
 
     $info = field_info_widget_types();
     foreach ($widget_info as $w_key => $widget) {
       foreach ($widget as $key => $val) {
-        $this->assertEqual($info[$w_key][$key], $val, t("Widget type $w_key key $key is $val"));
+        $this->assertEqual($info[$w_key][$key], $val,"Widget type $w_key key $key is $val");
       }
-      $this->assertEqual($info[$w_key]['module'], 'field_test',  t("Widget type field_test module appears"));
+      $this->assertEqual($info[$w_key]['module'], 'field_test', "Widget type field_test module appears");
     }
 
     // Verify that no unexpected instances exist.
     $core_fields = field_info_fields();
     $instances = field_info_instances(FIELD_TEST_BUNDLE);
-    $this->assertTrue(empty($instances), t('With no instances, info bundles is empty.'));
+    $this->assertTrue(empty($instances),'With no instances, info bundles is empty.');
 
     // Create a field, verify it shows up.
     $field = array(
@@ -865,16 +865,16 @@
     );
     field_create_field($field);
     $fields = field_info_fields();
-    $this->assertEqual(count($fields), count($core_fields) + 1, t('One new field exists'));
-    $this->assertEqual($fields[$field['field_name']]['field_name'], $field['field_name'], t('info fields contains field name'));
-    $this->assertEqual($fields[$field['field_name']]['type'], $field['type'], t('info fields contains field type'));
-    $this->assertEqual($fields[$field['field_name']]['module'], 'field_test', t('info fields contains field module'));
+    $this->assertEqual(count($fields), count($core_fields) + 1,'One new field exists');
+    $this->assertEqual($fields[$field['field_name']]['field_name'], $field['field_name'],'info fields contains field name');
+    $this->assertEqual($fields[$field['field_name']]['type'], $field['type'],'info fields contains field type');
+    $this->assertEqual($fields[$field['field_name']]['module'], 'field_test','info fields contains field module');
     $settings = array('test_field_setting' => 'dummy test string');
     foreach ($settings as $key => $val) {
-      $this->assertEqual($fields[$field['field_name']]['settings'][$key], $val, t("Field setting $key has correct default value $val"));
+      $this->assertEqual($fields[$field['field_name']]['settings'][$key], $val,"Field setting $key has correct default value $val");
     }
-    $this->assertEqual($fields[$field['field_name']]['cardinality'], 1, t('info fields contains cardinality 1'));
-    $this->assertEqual($fields[$field['field_name']]['active'], 1, t('info fields contains active 1'));
+    $this->assertEqual($fields[$field['field_name']]['cardinality'], 1,'info fields contains cardinality 1');
+    $this->assertEqual($fields[$field['field_name']]['active'], 1,'info fields contains active 1');
 
     // Create an instance, verify that it shows up
     $instance = array(
@@ -891,8 +891,8 @@
     field_create_instance($instance);
 
     $instances = field_info_instances($instance['bundle']);
-    $this->assertEqual(count($instances), 1, t('One instance shows up in info when attached to a bundle.'));
-    $this->assertTrue($instance < $instances[$instance['field_name']], t('Instance appears in info correctly'));
+    $this->assertEqual(count($instances), 1,'One instance shows up in info when attached to a bundle.');
+    $this->assertTrue($instance < $instances[$instance['field_name']],'Instance appears in info correctly');
   }
 
   // Test that the field_info settings convenience functions work
@@ -918,9 +918,9 @@
 class FieldFormTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name'  => t('Field form tests'),
-      'description'  => t("Test Field form handling."),
-      'group' => t('Field')
+      'name'  => 'Field form tests',
+      'description'  => "Test Field form handling.",
+      'group' => 'Field'
     );
   }
 
@@ -1193,8 +1193,8 @@
 
     // The response is drupal_json, so we need to undo some escaping.
     $response = json_decode(str_replace(array('\x3c', '\x3e', '\x26'), array("<", ">", "&"), $this->drupalGetContent()));
-    $this->assertTrue(is_object($response), t('The response is an object'));
-    $this->assertIdentical($response->status, TRUE, t('Response status is true'));
+    $this->assertTrue(is_object($response),'The response is an object');
+    $this->assertIdentical($response->status, TRUE,'Response status is true');
     // This response data is valid HTML so we will can reuse everything we have
     // for HTML pages.
     $this->content = $response->data;
@@ -1207,9 +1207,9 @@
 class FieldCrudTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name'  => t('Field CRUD tests'),
-      'description'  => t("Create / read /update a field."),
-      'group' => t('Field')
+      'name'  => 'Field CRUD tests',
+      'description'  => "Create / read /update a field.",
+      'group' => 'Field'
     );
   }
 
@@ -1258,16 +1258,16 @@
     $field = field_read_field($field_definition['field_name']);
 
     // Ensure that basic properties are preserved.
-    $this->assertEqual($field['field_name'], $field_definition['field_name'], t('The field name is properly saved.'));
-    $this->assertEqual($field['type'], $field_definition['type'], t('The field type is properly saved.'));
+    $this->assertEqual($field['field_name'], $field_definition['field_name'],'The field name is properly saved.');
+    $this->assertEqual($field['type'], $field_definition['type'],'The field type is properly saved.');
 
     // Ensure that cardinality defaults to 1.
-    $this->assertEqual($field['cardinality'], 1, t('Cardinality defaults to 1.'));
+    $this->assertEqual($field['cardinality'], 1,'Cardinality defaults to 1.');
 
     // Ensure that default settings are present.
     $info = field_info_field_types($field['type']);
     $settings = $info['settings'];
-    $this->assertIdentical($settings, $field['settings'] , t('Default field settings have been written.'));
+    $this->assertIdentical($settings, $field['settings'] ,'Default field settings have been written.');
 
     // Guarantee that the name is unique.
     try {
@@ -1305,7 +1305,7 @@
     field_create_field($field_definition);
     $field = field_read_field($field_definition['field_name']);
     $expected_indexes = array('value' => array('value'));
-    $this->assertEqual($field['indexes'], $expected_indexes, t('Field type indexes saved by default'));
+    $this->assertEqual($field['indexes'], $expected_indexes,'Field type indexes saved by default');
 
     // Check that indexes specified by the field definition override the field
     // type indexes.
@@ -1319,7 +1319,7 @@
     field_create_field($field_definition);
     $field = field_read_field($field_definition['field_name']);
     $expected_indexes = array('value' => array());
-    $this->assertEqual($field['indexes'], $expected_indexes, t('Field definition indexes override field type indexes'));
+    $this->assertEqual($field['indexes'], $expected_indexes,'Field definition indexes override field type indexes');
 
     // Check that indexes specified by the field definition add to the field
     // type indexes.
@@ -1333,7 +1333,7 @@
     field_create_field($field_definition);
     $field = field_read_field($field_definition['field_name']);
     $expected_indexes = array('value' => array('value'), 'value_2' => array('value'));
-    $this->assertEqual($field['indexes'], $expected_indexes, t('Field definition indexes are merged with field type indexes'));
+    $this->assertEqual($field['indexes'], $expected_indexes,'Field definition indexes are merged with field type indexes');
   }
 
   function testReadField() {
@@ -1367,42 +1367,42 @@
 
     // Test that the first field is not deleted, and then delete it.
     $field = field_read_field($this->field['field_name'], array('include_deleted' => TRUE));
-    $this->assertTrue(!empty($field) && empty($field['deleted']), t('A new field is not marked for deletion.'));
+    $this->assertTrue(!empty($field) && empty($field['deleted']),'A new field is not marked for deletion.');
     field_delete_field($this->field['field_name']);
 
     // Make sure that the field is marked as deleted when it is specifically
     // loaded.
     $fields = field_read_fields(array(), array('include_deleted' => TRUE));
     $field = current($field);
-    $this->assertTrue(!empty($field['deleted']), t('A deleted field is marked for deletion.'));
+    $this->assertTrue(!empty($field['deleted']),'A deleted field is marked for deletion.');
 
     // Make sure that this field's instance is marked as deleted when it is
     // specifically loaded.
     $instance = field_read_instance($this->instance_definition['field_name'], $this->instance_definition['bundle'], array('include_deleted' => TRUE));
-    $this->assertTrue(!empty($instance['deleted']), t('An instance for a deleted field is marked for deletion.'));
+    $this->assertTrue(!empty($instance['deleted']),'An instance for a deleted field is marked for deletion.');
 
     // Try to load the field normally and make sure it does not show up.
     $field = field_read_field($this->field['field_name']);
-    $this->assertTrue(empty($field), t('A deleted field is not loaded by default.'));
+    $this->assertTrue(empty($field),'A deleted field is not loaded by default.');
 
     // Try to load the instance normally and make sure it does not show up.
     $instance = field_read_instance($this->instance_definition['field_name'], $this->instance_definition['bundle']);
-    $this->assertTrue(empty($instance), t('An instance for a deleted field is not loaded by default.'));
+    $this->assertTrue(empty($instance),'An instance for a deleted field is not loaded by default.');
 
     // Make sure the other field (and its field instance) are not deleted.
     $another_field = field_read_field($this->another_field['field_name']);
-    $this->assertTrue(!empty($another_field) && empty($another_field['deleted']), t('A non-deleted field is not marked for deletion.'));
+    $this->assertTrue(!empty($another_field) && empty($another_field['deleted']),'A non-deleted field is not marked for deletion.');
     $another_instance = field_read_instance($this->another_instance_definition['field_name'], $this->another_instance_definition['bundle']);
-    $this->assertTrue(!empty($another_instance) && empty($another_instance['deleted']), t('An instance of a non-deleted field is not marked for deletion.'));
+    $this->assertTrue(!empty($another_instance) && empty($another_instance['deleted']),'An instance of a non-deleted field is not marked for deletion.');
 
     // Try to create a new field the same name as a deleted field and
     // write data into it.
     field_create_field($this->field);
     field_create_instance($this->instance_definition);
     $field = field_read_field($this->field['field_name']);
-    $this->assertTrue(!empty($field) && empty($field['deleted']), t('A new field with a previously used name is created.'));
+    $this->assertTrue(!empty($field) && empty($field['deleted']),'A new field with a previously used name is created.');
     $instance = field_read_instance($this->instance_definition['field_name'], $this->instance_definition['bundle']);
-    $this->assertTrue(!empty($instance) && empty($instance['deleted']), t('A new instance for a previously used field name is created.'));
+    $this->assertTrue(!empty($instance) && empty($instance['deleted']),'A new instance for a previously used field name is created.');
 
     // Save an object with data for the field
     $entity = field_test_create_stub_entity(0, 0, $instance['bundle']);
@@ -1426,9 +1426,9 @@
 
   public static function getInfo() {
     return array(
-      'name'  => t('Field instance tests'),
-      'description'  => t("Create field entities by attaching fields to entities."),
-      'group' => t('Field')
+      'name'  => 'Field instance tests',
+      'description'  => "Create field entities by attaching fields to entities.",
+      'group' => 'Field'
     );
   }
 
@@ -1458,22 +1458,22 @@
     $formatter_type = field_info_formatter_types($instance['display']['full']['type']);
 
     // Check that default values are set.
-    $this->assertIdentical($instance['required'], FALSE, t('Required defaults to false.'));
-    $this->assertIdentical($instance['label'], $this->instance_definition['field_name'], t('Label defaults to field name.'));
-    $this->assertIdentical($instance['description'], '', t('Description defaults to empty string.'));
+    $this->assertIdentical($instance['required'], FALSE,'Required defaults to false.');
+    $this->assertIdentical($instance['label'], $this->instance_definition['field_name'],'Label defaults to field name.');
+    $this->assertIdentical($instance['description'], '','Description defaults to empty string.');
 
     // Check that default instance settings are set.
-    $this->assertIdentical($instance['settings'], $field_type['instance_settings'] , t('Default instance settings have been written.'));
+    $this->assertIdentical($instance['settings'], $field_type['instance_settings'] ,'Default instance settings have been written.');
     // Check that the widget is the default one.
-    $this->assertIdentical($instance['widget']['type'], $field_type['default_widget'], t('Default widget has been written.'));
+    $this->assertIdentical($instance['widget']['type'], $field_type['default_widget'],'Default widget has been written.');
     // Check that default widget settings are set.
-    $this->assertIdentical($instance['widget']['settings'], $widget_type['settings'] , t('Default widget settings have been written.'));
+    $this->assertIdentical($instance['widget']['settings'], $widget_type['settings'] ,'Default widget settings have been written.');
     // Check that we have display info for 'full' build_mode.
-    $this->assertTrue(isset($instance['display']['full']), t('Display for "full" build_mode has been written.'));
+    $this->assertTrue(isset($instance['display']['full']),'Display for "full" build_mode has been written.');
     // Check that the formatter is the default one.
-    $this->assertIdentical($instance['display']['full']['type'], $field_type['default_formatter'], t('Default formatter for "full" build_mode has been written.'));
+    $this->assertIdentical($instance['display']['full']['type'], $field_type['default_formatter'],'Default formatter for "full" build_mode has been written.');
     // Check that the default formatter settings are set.
-    $this->assertIdentical($instance['display']['full']['settings'], $formatter_type['settings'], t('Default formatter settings for "full" build_mode have been written.'));
+    $this->assertIdentical($instance['display']['full']['settings'], $formatter_type['settings'],'Default formatter settings for "full" build_mode have been written.');
 
     // Guarantee that the field/bundle combination is unique.
     try {
@@ -1517,12 +1517,12 @@
     field_update_instance($instance);
 
     $instance_new = field_read_instance($this->instance_definition['field_name'], $this->instance_definition['bundle']);
-    $this->assertEqual($instance['required'], $instance_new['required'], t('"required" change is saved'));
-    $this->assertEqual($instance['weight'], $instance_new['weight'], t('"weight" change is saved'));
-    $this->assertEqual($instance['label'], $instance_new['label'], t('"label" change is saved'));
-    $this->assertEqual($instance['description'], $instance_new['description'], t('"description" change is saved'));
-    $this->assertEqual($instance['widget']['settings']['test_widget_setting'], $instance_new['widget']['settings']['test_widget_setting'], t('Widget setting change is saved'));
-    $this->assertEqual($instance['display']['full']['settings']['test_formatter_setting'], $instance_new['display']['full']['settings']['test_formatter_setting'], t('Formatter setting change is saved'));
+    $this->assertEqual($instance['required'], $instance_new['required'],'"required" change is saved');
+    $this->assertEqual($instance['weight'], $instance_new['weight'],'"weight" change is saved');
+    $this->assertEqual($instance['label'], $instance_new['label'],'"label" change is saved');
+    $this->assertEqual($instance['description'], $instance_new['description'],'"description" change is saved');
+    $this->assertEqual($instance['widget']['settings']['test_widget_setting'], $instance_new['widget']['settings']['test_widget_setting'],'Widget setting change is saved');
+    $this->assertEqual($instance['display']['full']['settings']['test_formatter_setting'], $instance_new['display']['full']['settings']['test_formatter_setting'],'Formatter setting change is saved');
 
     // Check that changing widget and formatter types updates the default settings.
     $instance = field_read_instance($this->instance_definition['field_name'], $this->instance_definition['bundle']);
@@ -1531,13 +1531,13 @@
     field_update_instance($instance);
 
     $instance_new = field_read_instance($this->instance_definition['field_name'], $this->instance_definition['bundle']);
-    $this->assertEqual($instance['widget']['type'], $instance_new['widget']['type'] , t('Widget type change is saved.'));
+    $this->assertEqual($instance['widget']['type'], $instance_new['widget']['type'] ,'Widget type change is saved.');
     $settings = field_info_widget_settings($instance_new['widget']['type']);
-    $this->assertIdentical($settings, array_intersect_key($instance_new['widget']['settings'], $settings) , t('Widget type change updates default settings.'));
-    $this->assertEqual($instance['display']['full']['type'], $instance_new['display']['full']['type'] , t('Formatter type change is saved.'));
+    $this->assertIdentical($settings, array_intersect_key($instance_new['widget']['settings'], $settings) ,'Widget type change updates default settings.');
+    $this->assertEqual($instance['display']['full']['type'], $instance_new['display']['full']['type'] ,'Formatter type change is saved.');
     $info = field_info_formatter_types($instance_new['display']['full']['type']);
     $settings = $info['settings'];
-    $this->assertIdentical($settings, array_intersect_key($instance_new['display']['full']['settings'], $settings) , t('Changing formatter type updates default settings.'));
+    $this->assertIdentical($settings, array_intersect_key($instance_new['display']['full']['settings'], $settings) ,'Changing formatter type updates default settings.');
 
     // Check that adding a new build mode is saved and gets default settings.
     $instance = field_read_instance($this->instance_definition['field_name'], $this->instance_definition['bundle']);
@@ -1545,11 +1545,11 @@
     field_update_instance($instance);
 
     $instance_new = field_read_instance($this->instance_definition['field_name'], $this->instance_definition['bundle']);
-    $this->assertTrue(isset($instance_new['display']['teaser']), t('Display for the new build_mode has been written.'));
-    $this->assertIdentical($instance_new['display']['teaser']['type'], $field_type['default_formatter'], t('Default formatter for the new build_mode has been written.'));
+    $this->assertTrue(isset($instance_new['display']['teaser']),'Display for the new build_mode has been written.');
+    $this->assertIdentical($instance_new['display']['teaser']['type'], $field_type['default_formatter'],'Default formatter for the new build_mode has been written.');
     $info = field_info_formatter_types($instance_new['display']['teaser']['type']);
     $settings = $info['settings'];
-    $this->assertIdentical($settings, $instance_new['display']['teaser']['settings'] , t('Default formatter settings for the new build_mode have been written.'));
+    $this->assertIdentical($settings, $instance_new['display']['teaser']['settings'] ,'Default formatter settings for the new build_mode have been written.');
 
     // TODO: test failures.
   }
@@ -1568,20 +1568,20 @@
 
     // Test that the first instance is not deleted, and then delete it.
     $instance = field_read_instance($this->instance_definition['field_name'], $this->instance_definition['bundle'], array('include_deleted' => TRUE));
-    $this->assertTrue(!empty($instance) && empty($instance['deleted']), t('A new field instance is not marked for deletion.'));
+    $this->assertTrue(!empty($instance) && empty($instance['deleted']),'A new field instance is not marked for deletion.');
     field_delete_instance($this->instance_definition['field_name'], $this->instance_definition['bundle']);
 
     // Make sure the instance is marked as deleted when the instance is
     // specifically loaded.
     $instance = field_read_instance($this->instance_definition['field_name'], $this->instance_definition['bundle'], array('include_deleted' => TRUE));
-    $this->assertTrue(!empty($instance['deleted']), t('A deleted field instance is marked for deletion.'));
+    $this->assertTrue(!empty($instance['deleted']),'A deleted field instance is marked for deletion.');
 
     // Try to load the instance normally and make sure it does not show up.
     $instance = field_read_instance($this->instance_definition['field_name'], $this->instance_definition['bundle']);
-    $this->assertTrue(empty($instance), t('A deleted field instance is not loaded by default.'));
+    $this->assertTrue(empty($instance),'A deleted field instance is not loaded by default.');
 
     // Make sure the other field instance is not deleted.
     $another_instance = field_read_instance($this->another_instance_definition['field_name'], $this->another_instance_definition['bundle']);
-    $this->assertTrue(!empty($another_instance) && empty($another_instance['deleted']), t('A non-deleted field instance is not marked for deletion.'));
+    $this->assertTrue(!empty($another_instance) && empty($another_instance['deleted']),'A non-deleted field instance is not marked for deletion.');
   }
 }
Index: modules/blogapi/blogapi.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.test,v
retrieving revision 1.14
diff -u -r1.14 blogapi.test
--- modules/blogapi/blogapi.test	2 Jul 2009 20:23:28 -0000	1.14
+++ modules/blogapi/blogapi.test	9 Jul 2009 02:46:28 -0000
@@ -4,9 +4,9 @@
 class BlogAPITestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Blog API functionality'),
-      'description' => t('Create, edit, and delete post; upload file; and set/get categories.'),
-      'group' => t('Blog API'),
+      'name' => 'Blog API functionality',
+      'description' => 'Create, edit, and delete post; upload file; and set/get categories.',
+      'group' => 'Blog API',
     );
   }
 
@@ -37,10 +37,10 @@
 
     // Get user's blog.
     $result = xmlrpc($local, 'blogger.getUsersBlogs', $appid, $web_user->name, $web_user->pass_raw);
-    $this->assertTrue($result, t('Request for user\'s blogs returned correctly.'));
+    $this->assertTrue($result,'Request for user\'s blogs returned correctly.');
 
     if ($result !== FALSE) {
-      if ($this->assertTrue(array_key_exists('blogid', $result[0]), t('Blog found.'))) {
+      if ($this->assertTrue(array_key_exists('blogid', $result[0]),'Blog found.')) {
         $blog_id = $result[0]['blogid'];
       }
     }
@@ -48,16 +48,16 @@
     // Create post.
     $content = $this->randomName(32);
     $result = xmlrpc($local, 'blogger.newPost', $appid, $blog_id, $web_user->name, $web_user->pass_raw, $content, TRUE);
-    $this->assertTrue($result, t('Post created.'));
+    $this->assertTrue($result,'Post created.');
 
     $nid = $result;
 
     // Check recent posts.
     $result = xmlrpc($local, 'blogger.getRecentPosts', $appid, $blog_id, $web_user->name, $web_user->pass_raw, 5);
-    $this->assertTrue($result, t('Recent post list retrieved.'));
+    $this->assertTrue($result,'Recent post list retrieved.');
 
     if ($result !== FALSE && array_key_exists('title', $result[0])) {
-      $this->assertEqual($content, $result[0]['title'], t('Post found.'));
+      $this->assertEqual($content, $result[0]['title'],'Post found.');
     }
     else {
       $this->fail(t('Post found.'));
@@ -66,7 +66,7 @@
     // Edit post.
     $content_new = $this->randomName(10);
     $result = xmlrpc($local, 'blogger.editPost', $appid, $nid, $web_user->name, $web_user->pass_raw, $content_new, TRUE);
-    $this->assertTrue($result, t('Post successfully modified.'));
+    $this->assertTrue($result,'Post successfully modified.');
 
     // Upload file.
     $file = current($this->drupalGetTestFiles('text'));
@@ -76,60 +76,60 @@
     $file['type'] = 'text';
     $file['bits'] = xmlrpc_base64($file_contents);
     $result = xmlrpc($local, 'metaWeblog.newMediaObject', $blog_id, $web_user->name, $web_user->pass_raw, $file);
-    $this->assertTrue($result, t('File successfully uploaded.'));
+    $this->assertTrue($result,'File successfully uploaded.');
 
     $url = (array_key_exists('url', $result) ? $result['url'] : '');
 
     // Check uploaded file.
     $this->drupalGet($url);
-    $this->assertEqual($this->drupalGetContent(), $file_contents, t('Uploaded contents verified.'));
+    $this->assertEqual($this->drupalGetContent(), $file_contents,'Uploaded contents verified.');
 
     // Set post categories.
     $categories = array(array('categoryId' => $term_1));
     $result = xmlrpc($local, 'mt.setPostCategories', $nid, $web_user->name, $web_user->pass_raw, $categories);
-    $this->assertTrue($result, t('Post categories set.'));
+    $this->assertTrue($result,'Post categories set.');
 
     // Get post categories.
     $result = xmlrpc($local, 'mt.getPostCategories', $nid, $web_user->name, $web_user->pass_raw);
-    $this->assertTrue($result, t('Category list successfully retrieved.'));
+    $this->assertTrue($result,'Category list successfully retrieved.');
 
     if ($result !== FALSE && isset($result[0]['categoryId'])) {
-      $this->assertEqual($term_1, $result[0]['categoryId'], t('Category list verified.'));
+      $this->assertEqual($term_1, $result[0]['categoryId'],'Category list verified.');
     }
 
     // Test validation of category assignment.
     // Set post categories.
     $categories[] = array('categoryId' => $term_2);
     $result = xmlrpc($local, 'mt.setPostCategories', $nid, $web_user->name, $web_user->pass_raw, $categories);
-    $this->assertFalse($result, t('Post categories fail validation (attempt to post two when one is allowed).'));
+    $this->assertFalse($result,'Post categories fail validation (attempt to post two when one is allowed).');
 
     // Change to required.
     $this->updateVocabulary($vid, 'simpletest_vocab1', FALSE, TRUE);
     $result = xmlrpc($local, 'mt.setPostCategories', $nid, $web_user->name, $web_user->pass_raw, array());
-    $this->assertFalse($result, t("Post categories fail validation (none posted when it's required)."));
+    $this->assertFalse($result,"Post categories fail validation (none posted when it's required).");
 
     // Change to allowing multiple, not required.
     $this->updateVocabulary($vid, 'simpletest_vocab1', TRUE, FALSE);
     $result = xmlrpc($local, 'mt.setPostCategories', $nid, $web_user->name, $web_user->pass_raw, $categories);
-    $this->assertTrue($result, t('Post categories pass validation (multiple allowed).'));
+    $this->assertTrue($result,'Post categories pass validation (multiple allowed).');
     $result = xmlrpc($local, 'mt.setPostCategories', $nid, $web_user->name, $web_user->pass_raw, array());
-    $this->assertTrue($result, t('Post categories pass validation (multiple allowed, none posted).'));
+    $this->assertTrue($result,'Post categories pass validation (multiple allowed, none posted).');
 
     // Change to multiple, but required.
     $this->updateVocabulary($vid, 'simpletest_vocab1', TRUE, TRUE);
     $result = xmlrpc($local, 'mt.setPostCategories', $nid, $web_user->name, $web_user->pass_raw, $categories);
-    $this->assertTrue($result, t('Post categories pass validation (multiple allowed).'));
+    $this->assertTrue($result,'Post categories pass validation (multiple allowed).');
     $result = xmlrpc($local, 'mt.setPostCategories', $nid, $web_user->name, $web_user->pass_raw, array());
-    $this->assertFalse($result, t("Post categories fail validation (none posted when it's required)."));
+    $this->assertFalse($result,"Post categories fail validation (none posted when it's required).");
 
     // Try to add a non-existent term.
     $categories[] = array('categoryId' => $term_2 + 1);
     $result = xmlrpc($local, 'mt.setPostCategories', $nid, $web_user->name, $web_user->pass_raw, $categories);
-    $this->assertFalse($result, t('Post categories fail validation (unknown term).'));
+    $this->assertFalse($result,'Post categories fail validation (unknown term).');
  
     // Delete post.
     $result = xmlrpc($local, 'blogger.deletePost', $appid, $nid, $web_user->name, $web_user->pass_raw, TRUE);
-    $this->assertTrue($result, t('Post successfully deleted.'));
+    $this->assertTrue($result,'Post successfully deleted.');
   }
 
   /**
Index: modules/taxonomy/taxonomy.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.test,v
retrieving revision 1.38
diff -u -r1.38 taxonomy.test
--- modules/taxonomy/taxonomy.test	27 Jun 2009 19:49:07 -0000	1.38
+++ modules/taxonomy/taxonomy.test	9 Jul 2009 02:46:30 -0000
@@ -46,9 +46,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Taxonomy vocabulary interface'),
-      'description' => t('Test the taxonomy vocabulary interface.'),
-      'group' => t('Taxonomy'),
+      'name' => 'Taxonomy vocabulary interface',
+      'description' => 'Test the taxonomy vocabulary interface.',
+      'group' => 'Taxonomy',
     );
   }
 
@@ -79,22 +79,22 @@
     $edit['multiple'] = 1;
     $edit['required'] = 1;
     $this->drupalPost(NULL, $edit, t('Save'));
-    $this->assertRaw(t('Created new vocabulary %name.', array('%name' => $edit['name'])), t('Vocabulary created successfully'));
+    $this->assertRaw(t('Created new vocabulary %name.', array('%name' => $edit['name'])),'Vocabulary created successfully');
 
     // Edit the vocabulary.
     $this->drupalGet('admin/build/taxonomy');
-    $this->assertText($edit['name'], t('Vocabulary found in the vocabulary overview listing.'));
+    $this->assertText($edit['name'],'Vocabulary found in the vocabulary overview listing.');
     $this->clickLink(t('edit vocabulary'));
     $edit = array();
     $edit['name'] = $this->randomName();
     $this->drupalPost(NULL, $edit, t('Save'));
     $this->drupalGet('admin/build/taxonomy');
-    $this->assertText($edit['name'], t('Vocabulary found in the vocabulary overview listing.'));
+    $this->assertText($edit['name'],'Vocabulary found in the vocabulary overview listing.');
 
     // Try to submit a vocabulary with a duplicate machine name.
     $edit['machine_name'] = $machine_name;
     $this->drupalPost('admin/build/taxonomy/add', $edit, t('Save'));
-    $this->assertText(t('This machine-readable name is already in use by another vocabulary and must be unique.'), t('Duplicate machine name validation was successful'));
+    $this->assertText(t('This machine-readable name is already in use by another vocabulary and must be unique.'),'Duplicate machine name validation was successful');
 
     // Try to submit an invalid machine name.
     $edit['machine_name'] = '!&^%';
@@ -126,7 +126,7 @@
 
     // Check that the weights are saved in the database correctly.
     foreach ($vocabularies as $key => $vocabulary) {
-      $this->assertEqual($new_vocabularies[$key]->weight, $vocabularies[$key]->weight, t('The vocabulary weight was changed.'));
+      $this->assertEqual($new_vocabularies[$key]->weight, $vocabularies[$key]->weight,'The vocabulary weight was changed.');
     }
   }
 
@@ -140,10 +140,10 @@
       taxonomy_vocabulary_delete($key);
     }
     // Confirm that no vocabularies are found in the database.
-    $this->assertFalse(taxonomy_get_vocabularies(), t('No vocabularies found in the database'));
+    $this->assertFalse(taxonomy_get_vocabularies(),'No vocabularies found in the database');
     $this->drupalGet('admin/build/taxonomy');
     // Check the default message for no vocabularies.
-    $this->assertText(t('No vocabularies available.'), t('No vocabularies were found.'));
+    $this->assertText(t('No vocabularies available.'),'No vocabularies were found.');
   }
 
   /**
@@ -157,26 +157,26 @@
       'nodes[article]' => 'article',
     );
     $this->drupalPost('admin/build/taxonomy/add', $edit, t('Save'));
-    $this->assertText(t('Created new vocabulary'), t('New vocabulary was created.'));
+    $this->assertText(t('Created new vocabulary'),'New vocabulary was created.');
 
     // Check the created vocabulary.
     $vocabularies = taxonomy_get_vocabularies();
     $vid = $vocabularies[count($vocabularies)-1]->vid;
     drupal_static_reset('taxonomy_vocabulary_load_multiple');
     $vocabulary = taxonomy_vocabulary_load($vid);
-    $this->assertTrue($vocabulary, t('Vocabulary found in database'));
+    $this->assertTrue($vocabulary,'Vocabulary found in database');
 
     // Delete the vocabulary.
     $edit = array();
     $this->drupalPost('admin/build/taxonomy/' . $vid, $edit, t('Delete'));
-    $this->assertRaw(t('Are you sure you want to delete the vocabulary %name?', array('%name' => $vocabulary->name)), t('[confirm deletion] Asks for confirmation.'));
-    $this->assertText(t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.'), t('[confirm deletion] Inform that all terms will be deleted.'));
+    $this->assertRaw(t('Are you sure you want to delete the vocabulary %name?', array('%name' => $vocabulary->name)),'[confirm deletion] Asks for confirmation.');
+    $this->assertText(t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.'),'[confirm deletion] Inform that all terms will be deleted.');
 
     // Confirm deletion.
     $this->drupalPost(NULL, NULL, t('Delete'));
-    $this->assertRaw(t('Deleted vocabulary %name.', array('%name' => $vocabulary->name)), t('Vocabulary deleted'));
+    $this->assertRaw(t('Deleted vocabulary %name.', array('%name' => $vocabulary->name)),'Vocabulary deleted');
     drupal_static_reset('taxonomy_vocabulary_load_multiple');
-    $this->assertFalse(taxonomy_vocabulary_load($vid), t('Vocabulary is not found in the database'));
+    $this->assertFalse(taxonomy_vocabulary_load($vid),'Vocabulary is not found in the database');
   }
 }
 
@@ -188,9 +188,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Taxonomy vocabularies'),
-      'description' => t('Test loading, saving and deleting vocabularies.'),
-      'group' => t('Taxonomy'),
+      'name' => 'Taxonomy vocabularies',
+      'description' => 'Test loading, saving and deleting vocabularies.',
+      'group' => 'Taxonomy',
     );
   }
 
@@ -211,15 +211,15 @@
     $vid = count($vocabularies) + 1;
     $vocabulary = taxonomy_vocabulary_load($vid);
     // This should not return an object because no such vocabulary exists.
-    $this->assertTrue(empty($vocabulary), t('No object loaded.'));
+    $this->assertTrue(empty($vocabulary),'No object loaded.');
 
     // Create a new vocabulary.
     $this->createVocabulary();
     // Load the vocabulary with the same $vid from earlier.
     // This should return a vocabulary object since it now matches a real vid.
     $vocabulary = taxonomy_vocabulary_load($vid);
-    $this->assertTrue(!empty($vocabulary) && is_object($vocabulary), t('Vocabulary is an object'));
-    $this->assertTrue($vocabulary->vid == $vid, t('Valid vocabulary vid is the same as our previously invalid one.'));
+    $this->assertTrue(!empty($vocabulary) && is_object($vocabulary),'Vocabulary is an object');
+    $this->assertTrue($vocabulary->vid == $vid,'Valid vocabulary vid is the same as our previously invalid one.');
   }
 
   /**
@@ -227,8 +227,8 @@
    */
   function testTaxonomyVocabularyLoadStaticReset() {
     $original_vocabulary = taxonomy_vocabulary_load($this->vocabulary->vid);
-    $this->assertTrue(is_object($original_vocabulary), t('Vocabulary loaded successfully'));
-    $this->assertEqual($this->vocabulary->name, $original_vocabulary->name, t('Vocabulary loaded successfully'));
+    $this->assertTrue(is_object($original_vocabulary),'Vocabulary loaded successfully');
+    $this->assertEqual($this->vocabulary->name, $original_vocabulary->name,'Vocabulary loaded successfully');
 
     // Change the name and description.
     $vocabulary = $original_vocabulary;
@@ -244,7 +244,7 @@
     // Delete the vocabulary.
     taxonomy_vocabulary_delete($this->vocabulary->vid);
     $vocabularies = taxonomy_get_vocabularies();
-    $this->assertTrue(!isset($vocabularies[$this->vocabulary->vid]), t('The vocabulary was deleted'));
+    $this->assertTrue(!isset($vocabularies[$this->vocabulary->vid]),'The vocabulary was deleted');
   }
 
   /**
@@ -271,33 +271,33 @@
     // Fetch the names for all vocabularies, confirm that they are keyed by
     // machine name.
     $names = taxonomy_vocabulary_get_names();
-    $this->assertTrue(in_array($vocabulary1->name, $names), t('Vocabulary 1 name found.'));
-    $this->assertTrue(isset($names[$vocabulary1->machine_name]), t('Vocabulary names are keyed by machine name.'));
+    $this->assertTrue(in_array($vocabulary1->name, $names),'Vocabulary 1 name found.');
+    $this->assertTrue(isset($names[$vocabulary1->machine_name]),'Vocabulary names are keyed by machine name.');
 
     // Fetch all of the vocabularies using taxonomy_get_vocabularies().
     // Confirm that the vocabularies are ordered by weight.
     $vocabularies = taxonomy_get_vocabularies();
-    $this->assertEqual(array_shift($vocabularies), $vocabulary1, t('Vocabulary was found in the vocabularies array.'));
-    $this->assertEqual(array_shift($vocabularies), $vocabulary2, t('Vocabulary was found in the vocabularies array.'));
-    $this->assertEqual(array_shift($vocabularies), $vocabulary3, t('Vocabulary was found in the vocabularies array.'));
+    $this->assertEqual(array_shift($vocabularies), $vocabulary1,'Vocabulary was found in the vocabularies array.');
+    $this->assertEqual(array_shift($vocabularies), $vocabulary2,'Vocabulary was found in the vocabularies array.');
+    $this->assertEqual(array_shift($vocabularies), $vocabulary3,'Vocabulary was found in the vocabularies array.');
 
     // Fetch the vocabularies with taxonomy_vocabulary_load_multiple(), specifying IDs.
     // Ensure they are returned in the same order as the original array.
     $vocabularies = taxonomy_vocabulary_load_multiple(array($vocabulary3->vid, $vocabulary2->vid, $vocabulary1->vid));
-    $this->assertEqual(array_shift($vocabularies), $vocabulary3, t('Vocabulary loaded successfully by ID.'));
-    $this->assertEqual(array_shift($vocabularies), $vocabulary2, t('Vocabulary loaded successfully by ID.'));
-    $this->assertEqual(array_shift($vocabularies), $vocabulary1, t('Vocabulary loaded successfully by ID.'));
+    $this->assertEqual(array_shift($vocabularies), $vocabulary3,'Vocabulary loaded successfully by ID.');
+    $this->assertEqual(array_shift($vocabularies), $vocabulary2,'Vocabulary loaded successfully by ID.');
+    $this->assertEqual(array_shift($vocabularies), $vocabulary1,'Vocabulary loaded successfully by ID.');
 
     // Fetch vocabulary 1 by name.
-    $this->assertTrue(current(taxonomy_vocabulary_load_multiple(array(), array('name' => $vocabulary1->name))) == $vocabulary1, t('Vocabulary loaded successfully by name.'));
+    $this->assertTrue(current(taxonomy_vocabulary_load_multiple(array(), array('name' => $vocabulary1->name))) == $vocabulary1,'Vocabulary loaded successfully by name.');
 
     // Fetch vocabulary 1 by name and ID.
-    $this->assertTrue(current(taxonomy_vocabulary_load_multiple(array($vocabulary1->vid), array('name' => $vocabulary1->name))) == $vocabulary1, t('Vocabulary loaded successfully by name and ID.'));
+    $this->assertTrue(current(taxonomy_vocabulary_load_multiple(array($vocabulary1->vid), array('name' => $vocabulary1->name))) == $vocabulary1,'Vocabulary loaded successfully by name and ID.');
 
     // Fetch vocabulary 1 with specified node type.
     drupal_static_reset('taxonomy_vocabulary_load_multiple');
     $vocabulary_node_type = current(taxonomy_vocabulary_load_multiple(array($vocabulary1->vid), array('type' => 'article')));
-    $this->assertEqual($vocabulary_node_type, $vocabulary1, t('Vocabulary with specified node type loaded successfully.'));
+    $this->assertEqual($vocabulary_node_type, $vocabulary1,'Vocabulary with specified node type loaded successfully.');
   }
 }
 
@@ -308,9 +308,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Taxonomy term unit tests'),
-      'description' => t('Unit tests for taxonomy term functions.'),
-      'group' => t('Taxonomy'),
+      'name' => 'Taxonomy term unit tests',
+      'description' => 'Unit tests for taxonomy term functions.',
+      'group' => 'Taxonomy',
     );
   }
 
@@ -331,16 +331,16 @@
     $node1 = $this->drupalCreateNode(array('type' => 'page'));
     $node1->taxonomy = array($term1->tid);
     node_save($node1);
-    $this->assertEqual(taxonomy_term_count_nodes($term1->tid), 1, t('Term has one valid node association.'));
+    $this->assertEqual(taxonomy_term_count_nodes($term1->tid), 1,'Term has one valid node association.');
 
     // Attach term2 to a node.
     $node2 = $this->drupalCreateNode(array('type' => 'article'));
     $node2->taxonomy = array($term2->tid);
     node_save($node2);
-    $this->assertEqual(taxonomy_term_count_nodes($term2->tid), 1, t('Term has one valid node association.'));
+    $this->assertEqual(taxonomy_term_count_nodes($term2->tid), 1,'Term has one valid node association.');
 
     // Confirm that term3 is not associated with any nodes.
-    $this->assertEqual(taxonomy_term_count_nodes($term3->tid), 0, t('Term is not associated with any nodes'));
+    $this->assertEqual(taxonomy_term_count_nodes($term3->tid), 0,'Term is not associated with any nodes');
 
     // Set term3 as the parent of term1.
     $term1->parent = array($term3->tid);
@@ -348,29 +348,29 @@
 
     // Confirm that the term hierarchy is altered correctly.
     $children = taxonomy_get_children($term3->tid);
-    $this->assertTrue(isset($children[$term1->tid]), t('Term 3 saved as parent of term 1'));
+    $this->assertTrue(isset($children[$term1->tid]),'Term 3 saved as parent of term 1');
 
-    $this->assertEqual(count(taxonomy_get_tree($term3->vid, $term3->tid)), 1, t('Term 3 has one child term'));
+    $this->assertEqual(count(taxonomy_get_tree($term3->vid, $term3->tid)), 1,'Term 3 has one child term');
 
     // Confirm that term3's parental relationship with term1 leads to a
     // node assocation being counted.
-    $this->assertEqual(taxonomy_term_count_nodes($term3->tid, NULL), 1, t('Term has one valid node association due to child term.'));
+    $this->assertEqual(taxonomy_term_count_nodes($term3->tid, NULL), 1,'Term has one valid node association due to child term.');
 
     // Set term3 as the parent of term2.
     $term2->parent = array($term3->tid);
     taxonomy_term_save($term2);
 
     // term3 should now have two node associations counted.
-    $this->assertEqual(taxonomy_term_count_nodes($term3->tid, NULL), 2, t('Term has two valid node associations due to child terms.'));
+    $this->assertEqual(taxonomy_term_count_nodes($term3->tid, NULL), 2,'Term has two valid node associations due to child terms.');
 
     // Save node1 with both child taxonomy terms, this should still result
     // in term3 having two node associations.
     $node1->taxonomy = array($term1->tid, $term2->tid);
     node_save($node1);
-    $this->assertEqual(taxonomy_term_count_nodes($term3->tid, NULL), 2, t('Term has two valid node associations.'));
+    $this->assertEqual(taxonomy_term_count_nodes($term3->tid, NULL), 2,'Term has two valid node associations.');
 
     // Confirm that the node type argument returns a single node association.
-    $this->assertEqual(taxonomy_term_count_nodes($term3->tid, 'page'), 1, t("Term is associated with one node of type 'page'."));
+    $this->assertEqual(taxonomy_term_count_nodes($term3->tid, 'page'), 1,"Term is associated with one node of type 'page'.");
   }
 }
 
@@ -381,9 +381,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Taxonomy term functions and forms.'),
-      'description' => t('Test load, save and delete for taxonomy terms.'),
-      'group' => t('Taxonomy')
+      'name' => 'Taxonomy term functions and forms.',
+      'description' => 'Test load, save and delete for taxonomy terms.',
+      'group' => 'Taxonomy'
     );
   }
 
@@ -407,15 +407,15 @@
     $edit['relations[]'] = $term2->tid;
     $this->drupalPost('taxonomy/term/' . $term1->tid . '/edit', $edit, t('Save'));
     $related = taxonomy_get_related($term1->tid);
-    $this->assertTrue(isset($related[$term2->tid]), t('Related term was found'));
+    $this->assertTrue(isset($related[$term2->tid]),'Related term was found');
     // Create a third term.
     $term3 = $this->createTerm($this->vocabulary);
     $edit['relations[]'] = $term3->tid;
     $this->drupalPost('taxonomy/term/' . $term1->tid . '/edit', $edit, t('Save'));
 
     $related = taxonomy_get_related($term1->tid);
-    $this->assertTrue(isset($related[$term3->tid]), t('Related term was found'));
-    $this->assertFalse(isset($related[$term2->tid]), t('Term relationship no longer exists'));
+    $this->assertTrue(isset($related[$term3->tid]),'Related term was found');
+    $this->assertFalse(isset($related[$term2->tid]),'Term relationship no longer exists');
   }
 
   /**
@@ -434,7 +434,7 @@
 
     // Fetch the term using the synonyms.
     $returned_term = taxonomy_get_synonym_root($synonyms[0]);
-    $this->assertEqual($term->tid, $returned_term->tid, t('Term ID returned correctly'));
+    $this->assertEqual($term->tid, $returned_term->tid,'Term ID returned correctly');
   }
 
   /**
@@ -453,15 +453,15 @@
     // Check the hierarchy.
     $children = taxonomy_get_children($term1->tid);
     $parents = taxonomy_get_parents($term2->tid);
-    $this->assertTrue(isset($children[$term2->tid]), t('Child found correctly.'));
-    $this->assertTrue(isset($parents[$term1->tid]), t('Parent found correctly.'));
+    $this->assertTrue(isset($children[$term2->tid]),'Child found correctly.');
+    $this->assertTrue(isset($parents[$term1->tid]),'Parent found correctly.');
 
     // Create a third term and save this as a parent of term2.
     $term3 = $this->createTerm($this->vocabulary);
     $term2->parent = array($term1->tid, $term3->tid);
     taxonomy_term_save($term2);
     $parents = taxonomy_get_parents($term2->tid);
-    $this->assertTrue(isset($parents[$term1->tid]) && isset($parents[$term3->tid]), t('Both parents found successfully.'));
+    $this->assertTrue(isset($parents[$term1->tid]) && isset($parents[$term3->tid]),'Both parents found successfully.');
   }
 
   /**
@@ -484,22 +484,22 @@
     // Check that the term is displayed when the node is viewed.
     $node = $this->drupalGetNodeByTitle($edit['title']);
     $this->drupalGet('node/' . $node->nid);
-    $this->assertText($term1->name, t('Term is displayed when viewing the node.'));
+    $this->assertText($term1->name,'Term is displayed when viewing the node.');
 
     // Edit the node with a different term.
     $edit['taxonomy[' . $this->vocabulary->vid . ']'] = $term2->tid;
     $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
 
     $this->drupalGet('node/' . $node->nid);
-    $this->assertText($term2->name, t('Term is displayed when viewing the node.'));
+    $this->assertText($term2->name,'Term is displayed when viewing the node.');
 
     // Delete node through browser.
     $this->drupalPost('node/' . $node->nid . '/delete', array(), t('Delete'));
     $this->drupalGet('node/' . $node->nid);
-    $this->assertNoText($term2->name, t('Checking if node exists'));
+    $this->assertNoText($term2->name,'Checking if node exists');
     // Checking database fields.
     $result = db_query('SELECT * FROM {taxonomy_term_node} WHERE nid = :nid', array(':nid' => $node->nid))->fetch();
-    $this->assertTrue(empty($result), t('Term/node relationships are no longer in the database table.'));
+    $this->assertTrue(empty($result),'Term/node relationships are no longer in the database table.');
   }
 
   /**
@@ -521,9 +521,9 @@
     $edit['taxonomy[tags][' . $this->vocabulary->vid . ']'] =  implode(', ', $terms);
     $edit['body[0][value]'] = $this->randomName();
     $this->drupalPost('node/add/article', $edit, t('Save'));
-    $this->assertRaw(t('@type %title has been created.', array('@type' => t('Article'), '%title' => $edit['title'])), t('The node was created successfully'));
+    $this->assertRaw(t('@type %title has been created.', array('@type' =>'Article', '%title' => $edit['title'])),'The node was created successfully');
     foreach ($terms as $term) {
-      $this->assertText($term, t('The term was saved and appears on the node page'));
+      $this->assertText($term,'The term was saved and appears on the node page');
     }
   }
 
@@ -543,7 +543,7 @@
     $this->drupalPost('admin/build/taxonomy/' . $this->vocabulary->vid . '/add', $edit, t('Save'));
 
     $term = reset(taxonomy_get_term_by_name($edit['name']));
-    $this->assertNotNull($term, t('Term found in database'));
+    $this->assertNotNull($term,'Term found in database');
 
     // Submitting a term takes us to the add page; we need the List page.
     $this->drupalGet('admin/build/taxonomy/' . $this->vocabulary->vid . '/list');
@@ -554,8 +554,8 @@
     $this->clickLink(t('edit'));
 
     // This failed inexplicably with assertText, so used assertRaw. @TODO: Why?
-    $this->assertText($edit['name'], t('The randomly generated term name is present.'));
-    $this->assertText($edit['description'], t('The randomly generated term description is present.'));
+    $this->assertText($edit['name'],'The randomly generated term name is present.');
+    $this->assertText($edit['description'],'The randomly generated term description is present.');
 
     $edit = array(
       'name' => $this->randomName(14),
@@ -567,8 +567,8 @@
 
     // View the term and check that it is correct.
     $this->drupalGet('taxonomy/term/' . $term->tid);
-    $this->assertText($edit['name'], t('The randomly generated term name is present.'));
-    $this->assertText($edit['description'], t('The randomly generated term description is present.'));
+    $this->assertText($edit['name'],'The randomly generated term name is present.');
+    $this->assertText($edit['description'],'The randomly generated term description is present.');
 
     // Delete the term.
     $this->drupalPost('taxonomy/term/' . $term->tid . '/edit', array(), t('Delete'));
@@ -576,7 +576,7 @@
 
     // Assert that the term no longer exists.
     $this->drupalGet('taxonomy/term/' . $term->tid);
-    $this->assertResponse(404, t('The taxonomy term page was not found'));
+    $this->assertResponse(404,'The taxonomy term page was not found');
   }
 
   /**
@@ -587,19 +587,19 @@
 
     // Load the term with the exact name.
     $terms = taxonomy_get_term_by_name($term->name);
-    $this->assertTrue(isset($terms[$term->tid]), t('Term loaded using exact name.'));
+    $this->assertTrue(isset($terms[$term->tid]),'Term loaded using exact name.');
 
     // Load the term with space concatenated.
     $terms  = taxonomy_get_term_by_name('  ' . $term->name . '   ');
-    $this->assertTrue(isset($terms[$term->tid]), t('Term loaded with extra whitespace.'));
+    $this->assertTrue(isset($terms[$term->tid]),'Term loaded with extra whitespace.');
 
     // Load the term with name uppercased.
     $terms = taxonomy_get_term_by_name(strtoupper($term->name));
-    $this->assertTrue(isset($terms[$term->tid]), t('Term loaded with uppercased name.'));
+    $this->assertTrue(isset($terms[$term->tid]),'Term loaded with uppercased name.');
 
     // Load the term with name lowercased.
     $terms = taxonomy_get_term_by_name(strtolower($term->name));
-    $this->assertTrue(isset($terms[$term->tid]), t('Term loaded with lowercased name.'));
+    $this->assertTrue(isset($terms[$term->tid]),'Term loaded with lowercased name.');
 
     // Try to load an invalid term name.
     $terms = taxonomy_get_term_by_name('Banana');
@@ -618,9 +618,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Taxonomy term multiple loading'),
-      'description' => t('Test the loading of multiple taxonomy terms at once'),
-      'group' => t('Taxonomy'),
+      'name' => 'Taxonomy term multiple loading',
+      'description' => 'Test the loading of multiple taxonomy terms at once',
+      'group' => 'Taxonomy',
     );
   }
 
@@ -651,8 +651,8 @@
 
     // Load the same terms again by tid.
     $terms2 = taxonomy_term_load_multiple(array_keys($terms));
-    $this->assertTrue($count == count($terms2), t('Five terms were loaded by tid'));
-    $this->assertEqual($terms, $terms2, t('Both arrays contain the same terms'));
+    $this->assertTrue($count == count($terms2),'Five terms were loaded by tid');
+    $this->assertEqual($terms, $terms2,'Both arrays contain the same terms');
 
     // Load the terms by tid, with a condition on vid.
     $terms3 = taxonomy_term_load_multiple(array_keys($terms2), array('vid' => $vocabulary->vid));
@@ -666,15 +666,15 @@
 
     // Load terms from the vocabulary by vid.
     $terms4 = taxonomy_term_load_multiple(NULL, array('vid' => $vocabulary->vid));
-    $this->assertTrue(count($terms4 == 4), t('Correct number of terms were loaded.'));
+    $this->assertTrue(count($terms4 == 4),'Correct number of terms were loaded.');
     $this->assertFalse(isset($terms4[$deleted->tid]));
 
     // Create a single term and load it by name.
     $term = $this->createTerm($vocabulary);
     $loaded_terms = taxonomy_term_load_multiple(array(), array('name' => $term->name));
-    $this->assertEqual(count($loaded_terms), 1, t('One term was loaded'));
+    $this->assertEqual(count($loaded_terms), 1,'One term was loaded');
     $loaded_term = reset($loaded_terms);
-    $this->assertEqual($term->tid, $loaded_term->tid, t('Term loaded by name successfully.'));
+    $this->assertEqual($term->tid, $loaded_term->tid,'Term loaded by name successfully.');
   }
 }
 
@@ -684,9 +684,9 @@
 class TaxonomyHooksTestCase extends TaxonomyWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Taxonomy term hooks'),
-      'description' => t('Hooks for taxonomy term load/save/delete.'),
-      'group' => t('Taxonomy')
+      'name' => 'Taxonomy term hooks',
+      'description' => 'Hooks for taxonomy term load/save/delete.',
+      'group' => 'Taxonomy'
     );
   }
 
@@ -709,7 +709,7 @@
     );
     $this->drupalPost('admin/build/taxonomy/' . $vocabulary->vid . '/add', $edit, t('Save'));
     $term = reset(taxonomy_get_term_by_name($edit['name']));
-    $this->assertEqual($term->antonyms[0], $edit['antonyms'], t('Antonyms were loaded into the term object'));
+    $this->assertEqual($term->antonyms[0], $edit['antonyms'],'Antonyms were loaded into the term object');
 
     // Update the term with a different antonym.
     $edit = array(
@@ -719,11 +719,11 @@
     $this->drupalPost('taxonomy/term/' . $term->tid . '/edit', $edit, t('Save'));
     taxonomy_terms_static_reset();
     $term = taxonomy_term_load($term->tid);
-    $this->assertTrue(in_array($edit['antonyms'], $term->antonyms), t('Antonym was successfully edited'));
+    $this->assertTrue(in_array($edit['antonyms'], $term->antonyms),'Antonym was successfully edited');
 
     // Delete the term.
     taxonomy_term_delete($term->tid);
     $antonyms = db_query('SELECT taid FROM {term_antonym} WHERE tid = :tid', array(':tid' => $term->tid))->fetchField();
-    $this->assertFalse($antonyms, t('The antonyms were deleted from the database.'));
+    $this->assertFalse($antonyms,'The antonyms were deleted from the database.');
   }
 }
Index: modules/syslog/syslog.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/syslog/syslog.test,v
retrieving revision 1.7
diff -u -r1.7 syslog.test
--- modules/syslog/syslog.test	13 Apr 2009 08:49:01 -0000	1.7
+++ modules/syslog/syslog.test	9 Jul 2009 02:46:29 -0000
@@ -4,9 +4,9 @@
 class SyslogTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Syslog functionality'),
-      'description' => t('Test syslog settings.'),
-      'group' => t('Syslog')
+      'name' => 'Syslog functionality',
+      'description' => 'Test syslog settings.',
+      'group' => 'Syslog'
     );
   }
 
@@ -35,7 +35,7 @@
     $this->drupalGet('admin/settings/logging');
     if ($this->parse()) {
       $field = $this->xpath('//option[@value="' . $edit['syslog_facility'] . '"]'); // Should be one field.
-      $this->assertTrue($field[0]['selected'] == 'selected', t('Facility value saved.'));
+      $this->assertTrue($field[0]['selected'] == 'selected','Facility value saved.');
     }
   }
 }
Index: modules/search/search.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.test,v
retrieving revision 1.24
diff -u -r1.24 search.test
--- modules/search/search.test	3 Jul 2009 19:21:54 -0000	1.24
+++ modules/search/search.test	9 Jul 2009 02:46:29 -0000
@@ -9,9 +9,9 @@
 class SearchMatchTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Search engine queries'),
-      'description' => t('Indexes content and queries it.'),
-      'group' => t('Search'),
+      'name' => 'Search engine queries',
+      'description' => 'Indexes content and queries it.',
+      'group' => 'Search',
     );
   }
 
@@ -199,9 +199,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Bike shed'),
-      'description' => t('Tests the bike shed text on the no results page.'),
-      'group' => t('Search')
+      'name' => 'Bike shed',
+      'description' => 'Tests the bike shed text on the no results page.',
+      'group' => 'Search'
     );
   }
 
@@ -220,7 +220,7 @@
     $edit = array();
     $edit['keys'] = 'bike shed ' . $this->randomName();
     $this->drupalPost('search/node', $edit, t('Search'));
-    $this->assertText(t('Consider loosening your query with OR. bike OR shed will often show more results than bike shed.'), t('Help text is displayed when search returns no results.'));
+    $this->assertText(t('Consider loosening your query with OR. bike OR shed will often show more results than bike shed.'),'Help text is displayed when search returns no results.');
   }
 }
 
@@ -229,9 +229,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Advanced search form'),
-      'description' => t('Indexes content and tests the advanced search form.'),
-      'group' => t('Search'),
+      'name' => 'Advanced search form',
+      'description' => 'Indexes content and tests the advanced search form.',
+      'group' => 'Search',
     );
   }
 
@@ -259,40 +259,40 @@
    * Test using the advanced search form to limit search to pages.
    */
   function testNodeType() {
-    $this->assertTrue($this->node->type == 'page', t('Node type is page.'));
+    $this->assertTrue($this->node->type == 'page','Node type is page.');
 
     // Assert that the dummy title doesn't equal the real title.
     $dummy_title = 'Lorem ipsum';
-    $this->assertNotEqual($dummy_title, $this->node->title, t("Dummy title doens't equal node title"));
+    $this->assertNotEqual($dummy_title, $this->node->title,"Dummy title doens't equal node title");
 
     // Search for the dummy title with a GET query.
     $this->drupalGet('search/node/' . $dummy_title);
-    $this->assertNoText($this->node->title, t('Page node is not found with dummy title.'));
+    $this->assertNoText($this->node->title,'Page node is not found with dummy title.');
 
     // Search for the title of the node with a GET query.
     $this->drupalGet('search/node/' . $this->node->title);
-    $this->assertText($this->node->title, t('Page node is found with GET query.'));
+    $this->assertText($this->node->title,'Page node is found with GET query.');
 
     // Search for the title of the node with a POST query.
     $edit = array('or' => $this->node->title);
     $this->drupalPost('search/node', $edit, t('Advanced search'));
-    $this->assertText($this->node->title, t('Page node is found with POST query.'));
+    $this->assertText($this->node->title,'Page node is found with POST query.');
 
     // Advanced search type option.
     $this->drupalPost('search/node', array_merge($edit, array('type[page]' => 'page')), t('Advanced search'));
-    $this->assertText($this->node->title, t('Page node is found with POST query and type:page.'));
+    $this->assertText($this->node->title,'Page node is found with POST query and type:page.');
 
     $this->drupalPost('search/node', array_merge($edit, array('type[article]' => 'article')), t('Advanced search'));
-    $this->assertText('bike shed', t('Article node is not found with POST query and type:article.'));
+    $this->assertText('bike shed','Article node is not found with POST query and type:article.');
   }
 }
 
 class SearchRankingTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Search engine ranking'),
-      'description' => t('Indexes content and tests ranking factors.'),
-      'group' => t('Search'),
+      'name' => 'Search engine ranking',
+      'description' => 'Indexes content and tests ranking factors.',
+      'group' => 'Search',
     );
   }
 
@@ -373,9 +373,9 @@
 class SearchBlockTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Block availability'),
-      'description' => t('Check if the search form block is available.'),
-      'group' => t('Search'),
+      'name' => 'Block availability',
+      'description' => 'Check if the search form block is available.',
+      'group' => 'Search',
     );
   }
 
@@ -395,13 +395,13 @@
   function testSearchFormBlock() {
     // Set block title to confirm that the interface is availble.
     $this->drupalPost('admin/build/block/configure/search/form', array('title' => $this->randomName(8)), t('Save block'));
-    $this->assertText(t('The block configuration has been saved.'), t('Block configuration set.'));
+    $this->assertText(t('The block configuration has been saved.'),'Block configuration set.');
 
     // Set the block to a region to confirm block is availble.
     $edit = array();
     $edit['search_form[region]'] = 'footer';
     $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
-    $this->assertText(t('The block settings have been updated.'), t('Block successfully move to footer region.'));
+    $this->assertText(t('The block settings have been updated.'),'Block successfully move to footer region.');
   }
 
   /**
@@ -439,9 +439,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Comment Search tests'),
-      'description' => t('Verify text formats and filters used elsewhere.'),
-      'group' => t('Search'),
+      'name' => 'Comment Search tests',
+      'description' => 'Verify text formats and filters used elsewhere.',
+      'group' => 'Search',
     );
   }
 
@@ -496,13 +496,13 @@
       'search_theme_form' => $comment_body,
     );
     $this->drupalPost('', $edit, t('Search'));
-    $this->assertText($node->title, t('Node found in search results.'));
+    $this->assertText($node->title,'Node found in search results.');
 
     // Verify that comment is rendered using proper format.
-    $this->assertText($edit_comment['subject'], t('Comment subject found in search results.'));
-    $this->assertText($comment_body, t('Comment body text found in search results.'));
-    $this->assertNoRaw(t('n/a'), t('HTML in comment body is not hidden.'));
-    $this->assertNoRaw(check_plain($edit_comment['comment']), t('HTML in comment body is not escaped.'));
+    $this->assertText($edit_comment['subject'],'Comment subject found in search results.');
+    $this->assertText($comment_body,'Comment body text found in search results.');
+    $this->assertNoRaw(t('n/a'),'HTML in comment body is not hidden.');
+    $this->assertNoRaw(check_plain($edit_comment['comment']),'HTML in comment body is not escaped.');
 
     // Hide comments.
     $this->drupalLogin($this->admin_user);
@@ -515,6 +515,6 @@
 
     // Search for $title.
     $this->drupalPost('', $edit, t('Search'));
-    $this->assertNoText($comment_body, t('Comment body text not found in search results.'));
+    $this->assertNoText($comment_body,'Comment body text not found in search results.');
   }
 }
Index: modules/statistics/statistics.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.test,v
retrieving revision 1.8
diff -u -r1.8 statistics.test
--- modules/statistics/statistics.test	13 Apr 2009 10:40:13 -0000	1.8
+++ modules/statistics/statistics.test	9 Jul 2009 02:46:29 -0000
@@ -4,9 +4,9 @@
 class StatisticsBlockVisitorsTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Top visitor blocking'),
-      'description' => t('Tests blocking of IP addresses via the top visitors report.'),
-      'group' => t('Statistics')
+      'name' => 'Top visitor blocking',
+      'description' => 'Tests blocking of IP addresses via the top visitors report.',
+      'group' => 'Statistics'
     );
   }
 
@@ -45,28 +45,28 @@
     // and that a 'block IP address' link is displayed.
     $this->drupalLogin($this->blocking_user);
     $this->drupalGet('admin/reports/visitors');
-    $this->assertText($test_ip_address, t('IP address found.'));
-    $this->assertText(t('block IP address'), t('Block IP link displayed'));
+    $this->assertText($test_ip_address,'IP address found.');
+    $this->assertText(t('block IP address'),'Block IP link displayed');
 
     // Block the IP address.
     $this->clickLink('block IP address');
-    $this->assertText(t('IP address blocking'), t('IP blocking page displayed.'));
+    $this->assertText(t('IP address blocking'),'IP blocking page displayed.');
     $edit = array();
     $edit['ip'] = $test_ip_address;
     $this->drupalPost('admin/settings/ip-blocking', $edit, t('Save'));
     $ip = db_query("SELECT iid from {blocked_ips} WHERE ip = :ip", array(':ip' => $edit['ip']))->fetchField();
-    $this->assertNotEqual($ip, FALSE, t('IP address found in database'));
-    $this->assertRaw(t('The IP address %ip has been blocked.', array('%ip' => $edit['ip'])), t('IP address was blocked.'));
+    $this->assertNotEqual($ip, FALSE,'IP address found in database');
+    $this->assertRaw(t('The IP address %ip has been blocked.', array('%ip' => $edit['ip'])),'IP address was blocked.');
 
     // Verify that the block/unblock link on the top visitors page has been altered.
     $this->drupalGet('admin/reports/visitors');
-    $this->assertText(t('unblock IP address'), t('Unblock IP address link displayed'));
+    $this->assertText(t('unblock IP address'),'Unblock IP address link displayed');
 
     // Unblock the IP address.
     $this->clickLink('unblock IP address');
-    $this->assertRaw(t('Are you sure you want to delete %ip?', array('%ip' => $test_ip_address)), t('IP address deletion confirmation found.'));
+    $this->assertRaw(t('Are you sure you want to delete %ip?', array('%ip' => $test_ip_address)),'IP address deletion confirmation found.');
     $edit = array();
     $this->drupalPost('admin/settings/ip-blocking/delete/1', NULL, t('Delete'));
-    $this->assertRaw(t('The IP address %ip was deleted.', array('%ip' => $test_ip_address)), t('IP address deleted.'));
+    $this->assertRaw(t('The IP address %ip was deleted.', array('%ip' => $test_ip_address)),'IP address deleted.');
   }
 }
Index: modules/translation/translation.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/translation/translation.test,v
retrieving revision 1.12
diff -u -r1.12 translation.test
--- modules/translation/translation.test	12 Jun 2009 08:39:40 -0000	1.12
+++ modules/translation/translation.test	9 Jul 2009 02:46:30 -0000
@@ -6,9 +6,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Translation functionality'),
-      'description' => t('Create a page with translation, modify the page outdating translation, and update translation.'),
-      'group' => t('Translation')
+      'name' => 'Translation functionality',
+      'description' => 'Create a page with translation, modify the page outdating translation, and update translation.',
+      'group' => 'Translation'
     );
   }
 
@@ -35,7 +35,7 @@
     $edit = array();
     $edit['language_content_type'] = 2;
     $this->drupalPost('admin/build/node-type/page', $edit, t('Save content type'));
-    $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Page')), t('Page content type has been updated.'));
+    $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Page')),'Page content type has been updated.');
 
     $this->drupalLogout();
     $this->drupalLogin($translator);
@@ -54,7 +54,7 @@
     // with identical query string.
     $languages = language_list();
     $this->drupalGet('node/add/page', array('query' => array('translation' => $node->nid, 'language' => 'es')));
-    $this->assertRaw(t('A translation of %title in %language already exists', array('%title' => $node_title, '%language' => $languages['es']->name)), t('Message regarding attempted duplicate translation is displayed.'));
+    $this->assertRaw(t('A translation of %title in %language already exists', array('%title' => $node_title, '%language' => $languages['es']->name)),'Message regarding attempted duplicate translation is displayed.');
 
     // Attempt a resubmission of the form - this emulates using the back button
     // to return to the page then resubmitting the form without a refresh.
@@ -63,25 +63,25 @@
     $edit['body[0][value]'] = $this->randomName();
     $this->drupalPost('node/add/page', $edit, t('Save'), array('query' => array('translation' => $node->nid, 'language' => 'es')));
     $duplicate = $this->drupalGetNodeByTitle($edit['title']);
-    $this->assertEqual($duplicate->tnid, 0, t('The node does not have a tnid.'));
+    $this->assertEqual($duplicate->tnid, 0,'The node does not have a tnid.');
 
     // Update original and mark translation as outdated.
     $edit = array();
     $edit['body[0][value]'] = $this->randomName();
     $edit['translation[retranslate]'] = TRUE;
     $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
-    $this->assertRaw(t('Page %title has been updated.', array('%title' => $node_title)), t('Original node updated.'));
+    $this->assertRaw(t('Page %title has been updated.', array('%title' => $node_title)),'Original node updated.');
 
     // Check to make sure that interface shows translation as outdated
     $this->drupalGet('node/' . $node->nid . '/translate');
-    $this->assertRaw('<span class="marker">' . t('outdated') . '</span>', t('Translation marked as outdated.'));
+    $this->assertRaw('<span class="marker">' . t('outdated') . '</span>','Translation marked as outdated.');
 
     // Update translation and mark as updated.
     $edit = array();
     $edit['body[0][value]'] = $this->randomName();
     $edit['translation[status]'] = FALSE;
     $this->drupalPost('node/' . $node_translation->nid . '/edit', $edit, t('Save'));
-    $this->assertRaw(t('Page %title has been updated.', array('%title' => $node_translation_title)), t('Translated node updated.'));
+    $this->assertRaw(t('Page %title has been updated.', array('%title' => $node_translation_title)),'Translated node updated.');
   }
 
   /**
@@ -103,10 +103,10 @@
       // Make sure we're not using a stale list.
       drupal_static_reset('language_list');
       $languages = language_list('language');
-      $this->assertTrue(array_key_exists($language_code, $languages), t('Language was installed successfully.'));
+      $this->assertTrue(array_key_exists($language_code, $languages),'Language was installed successfully.');
 
       if (array_key_exists($language_code, $languages)) {
-        $this->assertRaw(t('The language %language has been created and can now be used. More information is available on the <a href="@locale-help">help screen</a>.', array('%language' => $languages[$language_code]->name, '@locale-help' => url('admin/help/locale'))), t('Language has been created.'));
+        $this->assertRaw(t('The language %language has been created and can now be used. More information is available on the <a href="@locale-help">help screen</a>.', array('%language' => $languages[$language_code]->name, '@locale-help' => url('admin/help/locale'))),'Language has been created.');
       }
     }
     else {
@@ -114,7 +114,7 @@
       $this->assertTrue(true, 'Language [' . $language_code . '] already installed.');
       $this->drupalPost(NULL, array('enabled[' . $language_code . ']' => TRUE), t('Save configuration'));
 
-      $this->assertRaw(t('Configuration saved.'), t('Language successfully enabled.'));
+      $this->assertRaw(t('Configuration saved.'),'Language successfully enabled.');
     }
   }
 
@@ -131,11 +131,11 @@
     $edit['body[0][value]'] = $body;
     $edit['language'] = $language;
     $this->drupalPost('node/add/page', $edit, t('Save'));
-    $this->assertRaw(t('Page %title has been created.', array('%title' => $edit['title'])), t('Page created.'));
+    $this->assertRaw(t('Page %title has been created.', array('%title' => $edit['title'])),'Page created.');
 
     // Check to make sure the node was created.
     $node = $this->drupalGetNodeByTitle($edit['title']);
-    $this->assertTrue($node, t('Node found in database.'));
+    $this->assertTrue($node,'Node found in database.');
 
     return $node;
   }
@@ -155,11 +155,11 @@
     $edit['title'] = $title;
     $edit['body[0][value]'] = $body;
     $this->drupalPost(NULL, $edit, t('Save'));
-    $this->assertRaw(t('Page %title has been created.', array('%title' => $edit['title'])), t('Translation created.'));
+    $this->assertRaw(t('Page %title has been created.', array('%title' => $edit['title'])),'Translation created.');
 
     // Check to make sure that translation was successful.
     $node = $this->drupalGetNodeByTitle($edit['title']);
-    $this->assertTrue($node, t('Node found in database.'));
+    $this->assertTrue($node,'Node found in database.');
 
     return $node;
   }
Index: modules/openid/openid.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/openid/openid.test,v
retrieving revision 1.2
diff -u -r1.2 openid.test
--- modules/openid/openid.test	6 May 2009 19:56:21 -0000	1.2
+++ modules/openid/openid.test	9 Jul 2009 02:46:29 -0000
@@ -9,9 +9,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('OpenID login and account registration'),
-      'description' => t("Adds an identity to a user's profile and uses it to log in, creates a user account using auto-registration."),
-      'group' => t('OpenID')
+      'name' => 'OpenID login and account registration',
+      'description' => "Adds an identity to a user's profile and uses it to log in, creates a user account using auto-registration.",
+      'group' => 'OpenID'
     );
   }
 
@@ -83,12 +83,12 @@
     $this->drupalPost(NULL, $edit, t('Log in'));
 
     // Check we are on the OpenID redirect form.
-    $this->assertTitle(t('OpenID redirect'), t('OpenID redirect page was displayed.'));
+    $this->assertTitle(t('OpenID redirect'),'OpenID redirect page was displayed.');
 
     // Submit form to the OpenID Provider Endpoint.
     $this->drupalPost(NULL, array(), t('Send'));
 
-    $this->assertText(t('My account'), t('User was logged in.'));
+    $this->assertText(t('My account'),'User was logged in.');
   }
 
   /**
@@ -100,14 +100,14 @@
     // Add identity to user's profile.
     $identity = url('openid-test/yadis/xrds', array('absolute' => TRUE));
     $this->addIdentity($identity);
-    $this->assertText($identity, t('Identity appears in list.'));
+    $this->assertText($identity,'Identity appears in list.');
 
     // Delete the newly added identity.
     $this->clickLink(t('Delete'));
     $this->drupalPost(NULL, array(), t('Confirm'));
 
-    $this->assertText(t('OpenID deleted.'), t('Identity deleted'));
-    $this->assertNoText($identity, t('Identity no longer appears in list.'));
+    $this->assertText(t('OpenID deleted.'),'Identity deleted');
+    $this->assertNoText($identity,'Identity no longer appears in list.');
   }
 
   /**
@@ -121,7 +121,7 @@
     // OpenID 1 used a HTTP redirect, OpenID 2 uses a HTML form that is submitted automatically using JavaScript.
     if ($version == 2) {
       // Manually submit form because SimpleTest is not able to execute JavaScript.
-      $this->assertRaw('<script type="text/javascript">document.getElementById("openid-redirect-form").submit();</script>', t('JavaScript form submission found.'));
+      $this->assertRaw('<script type="text/javascript">document.getElementById("openid-redirect-form").submit();</script>','JavaScript form submission found.');
       $this->drupalPost(NULL, array(), t('Send'));
     }
 
@@ -148,13 +148,13 @@
     // to the OpenID Provider Endpoint. This is usually done automatically
     // using JavaScript, but the SimpleTest browser does not support JavaScript,
     // so the form is submitted manually instead.
-    $this->assertRaw('<script type="text/javascript">document.getElementById("openid-redirect-form").submit();</script>', t('JavaScript form submission found.'));
+    $this->assertRaw('<script type="text/javascript">document.getElementById("openid-redirect-form").submit();</script>','JavaScript form submission found.');
     $this->drupalPost(NULL, array(), t('Send'));
-    $this->assertText(t('My account'), t('User was logged in.'));
+    $this->assertText(t('My account'),'User was logged in.');
 
     $user = user_load_by_name('johndoe');
-    $this->assertTrue($user, t('User was found.'));
-    $this->assertEqual($user->mail, 'johndoe@example.com', t('User was registered with right email address.'));
+    $this->assertTrue($user,'User was found.');
+    $this->assertEqual($user->mail, 'johndoe@example.com','User was registered with right email address.');
   }
 }
 
@@ -164,9 +164,9 @@
 class OpenIDUnitTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('OpenID helper functions'),
-      'description' => t('Test OpenID helper functions.'),
-      'group' => t('OpenID')
+      'name' => 'OpenID helper functions',
+      'description' => 'Test OpenID helper functions.',
+      'group' => 'OpenID'
     );
   }
 
@@ -179,25 +179,25 @@
    * Test _openid_dh_XXX_to_XXX() functions.
    */
   function testConversion() {
-    $this->assertEqual(_openid_dh_long_to_base64('12345678901234567890123456789012345678901234567890'), 'CHJ/Y2mq+DyhUCZ0evjH8ZbOPwrS', t('_openid_dh_long_to_base64() returned expected result.'));
-    $this->assertEqual(_openid_dh_base64_to_long('BsH/g8Nrpn2dtBSdu/sr1y8hxwyx'), '09876543210987654321098765432109876543210987654321', t('_openid_dh_base64_to_long() returned expected result.'));
+    $this->assertEqual(_openid_dh_long_to_base64('12345678901234567890123456789012345678901234567890'), 'CHJ/Y2mq+DyhUCZ0evjH8ZbOPwrS','_openid_dh_long_to_base64() returned expected result.');
+    $this->assertEqual(_openid_dh_base64_to_long('BsH/g8Nrpn2dtBSdu/sr1y8hxwyx'), '09876543210987654321098765432109876543210987654321','_openid_dh_base64_to_long() returned expected result.');
 
-    $this->assertEqual(_openid_dh_long_to_binary('12345678901234567890123456789012345678901234567890'), "\x08r\x7fci\xaa\xf8<\xa1P&tz\xf8\xc7\xf1\x96\xce?\x0a\xd2", t('_openid_dh_long_to_binary() returned expected result.'));
-    $this->assertEqual(_openid_dh_binary_to_long("\x06\xc1\xff\x83\xc3k\xa6}\x9d\xb4\x14\x9d\xbb\xfb+\xd7/!\xc7\x0c\xb1"), '09876543210987654321098765432109876543210987654321', t('_openid_dh_binary_to_long() returned expected result.'));
+    $this->assertEqual(_openid_dh_long_to_binary('12345678901234567890123456789012345678901234567890'), "\x08r\x7fci\xaa\xf8<\xa1P&tz\xf8\xc7\xf1\x96\xce?\x0a\xd2",'_openid_dh_long_to_binary() returned expected result.');
+    $this->assertEqual(_openid_dh_binary_to_long("\x06\xc1\xff\x83\xc3k\xa6}\x9d\xb4\x14\x9d\xbb\xfb+\xd7/!\xc7\x0c\xb1"), '09876543210987654321098765432109876543210987654321','_openid_dh_binary_to_long() returned expected result.');
   }
 
   /**
    * Test _openid_dh_xorsecret().
    */
   function testOpenidDhXorsecret() {
-    $this->assertEqual(_openid_dh_xorsecret('123456790123456790123456790', "abc123ABC\x00\xFF"), "\xa4'\x06\xbe\xf1.\x00y\xff\xc2\xc1", t('_openid_dh_xorsecret() returned expected result.'));
+    $this->assertEqual(_openid_dh_xorsecret('123456790123456790123456790', "abc123ABC\x00\xFF"), "\xa4'\x06\xbe\xf1.\x00y\xff\xc2\xc1",'_openid_dh_xorsecret() returned expected result.');
   }
 
   /**
    * Test _openid_get_bytes().
    */
   function testOpenidGetBytes() {
-    $this->assertEqual(strlen(_openid_get_bytes(20)), 20, t('_openid_get_bytes() returned expected result.'));
+    $this->assertEqual(strlen(_openid_get_bytes(20)), 20,'_openid_get_bytes() returned expected result.');
   }
 
   /**
@@ -217,6 +217,6 @@
     );
     $association = new stdClass;
     $association->mac_key = "1234567890abcdefghij\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9";
-    $this->assertEqual(_openid_signature($association, $response, array('foo', 'bar')), 'QnKZQzSFstT+GNiJDFOptdcZjrc=', t('Expected signature calculated.'));
+    $this->assertEqual(_openid_signature($association, $response, array('foo', 'bar')), 'QnKZQzSFstT+GNiJDFOptdcZjrc=','Expected signature calculated.');
   }
 }
Index: modules/upload/upload.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.test,v
retrieving revision 1.20
diff -u -r1.20 upload.test
--- modules/upload/upload.test	22 Jun 2009 09:10:06 -0000	1.20
+++ modules/upload/upload.test	9 Jul 2009 02:46:30 -0000
@@ -10,9 +10,9 @@
 class UploadTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Upload functionality'),
-      'description' => t('Check content uploaded to nodes.'),
-      'group' => t('Upload'),
+      'name' => 'Upload functionality',
+      'description' => 'Check content uploaded to nodes.',
+      'group' => 'Upload',
     );
   }
 
@@ -123,7 +123,7 @@
     // Test the error message in two steps in case there are additional errors
     // that change the error message's format.
     $this->assertRaw(t('The specified file %name could not be uploaded.', array('%name' => $text_file->filename)), t('File %filepath was not allowed to be uploaded', array('%filepath' => $text_file->filepath)));
-    $this->assertRaw(t('Only files with the following extensions are allowed: %files-allowed.', array('%files-allowed' => $settings['upload_extensions'])), t('File extension cited as reason for failure'));
+    $this->assertRaw(t('Only files with the following extensions are allowed: %files-allowed.', array('%files-allowed' => $settings['upload_extensions'])),'File extension cited as reason for failure');
 
     // Attempt to upload .html file when .html is only extension allowed.
     $html_files = array_values($this->drupalGetTestFiles('html'));
@@ -131,7 +131,7 @@
     // extension.
     $html_file = $html_files[1]->filepath;
     $this->uploadFile($node, $html_file);
-    $this->assertNoRaw(t('The specified file %name could not be uploaded.', array('%name' => basename($html_file))), t('File ' . $html_file . ' was allowed to be uploaded'));
+    $this->assertNoRaw(t('The specified file %name could not be uploaded.', array('%name' => basename($html_file))),'File ' . $html_file . ' was allowed to be uploaded');
   }
 
   /**
@@ -167,8 +167,8 @@
     $maxsize = format_size(parse_size(($settings['upload_uploadsize'] * 1024) . 'KB')); // Won't parse decimals.
     // Test the error message in two steps in case there are additional errors
     // that change the error message's format.
-    $this->assertRaw(t('The specified file %name could not be uploaded.', array('%name' => $filename)), t('File upload was blocked'));
-    $this->assertRaw(t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => $filesize, '%maxsize' => $maxsize)), t('File size cited as problem with upload'));
+    $this->assertRaw(t('The specified file %name could not be uploaded.', array('%name' => $filename)),'File upload was blocked');
+    $this->assertRaw(t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => $filesize, '%maxsize' => $maxsize)),'File size cited as problem with upload');
   }
 
   function setUploadSettings($settings, $rid = NULL) {
@@ -209,11 +209,11 @@
     $file = file_directory_path() . '/' . $filename;
     $this->drupalGet(file_create_url($file), array('external' => TRUE));
     $this->assertResponse(array(200), 'Uploaded ' . $filename . ' is accessible.');
-    $this->assertTrue(strpos($this->drupalGetHeader('Content-Type'), 'text/plain') === 0, t('MIME type is text/plain.'));
+    $this->assertTrue(strpos($this->drupalGetHeader('Content-Type'), 'text/plain') === 0,'MIME type is text/plain.');
     $this->assertEqual(file_get_contents($file), $this->drupalGetContent(), 'Uploaded contents of ' . $filename . ' verified.');
     // Verify file actually is readable and writeable by PHP.
-    $this->assertTrue(is_readable($file), t('Uploaded file is readable.'));
-    $this->assertTrue(is_writeable($file), t('Uploaded file is writeable.'));
+    $this->assertTrue(is_readable($file),'Uploaded file is readable.');
+    $this->assertTrue(is_writeable($file),'Uploaded file is writeable.');
   }
 
   /**
Index: modules/locale/locale.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.test,v
retrieving revision 1.28
diff -u -r1.28 locale.test
--- modules/locale/locale.test	30 Jun 2009 18:21:06 -0000	1.28
+++ modules/locale/locale.test	9 Jul 2009 02:46:29 -0000
@@ -25,9 +25,9 @@
 class LocaleConfigurationTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Language configuration'),
-      'description' => t('Adds a new locale and tests changing its status and the default language.'),
-      'group' => t('Locale'),
+      'name' => 'Language configuration',
+      'description' => 'Adds a new locale and tests changing its status and the default language.',
+      'group' => 'Locale',
     );
   }
 
@@ -50,8 +50,8 @@
       'langcode' => 'fr',
     );
     $this->drupalPost('admin/international/language/add', $edit, t('Add language'));
-    $this->assertText('fr', t('Language added successfully.'));
-    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)), t('Correct page redirection.'));
+    $this->assertText('fr','Language added successfully.');
+    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)),'Correct page redirection.');
 
     // Add custom language.
     // Code for the language.
@@ -70,32 +70,32 @@
       'direction' => '0',
     );
     $this->drupalPost('admin/international/language/add', $edit, t('Add custom language'));
-    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)), t('Correct page redirection.'));
-    $this->assertText($langcode, t('Language code found.'));
-    $this->assertText($name, t('Name found.'));
-    $this->assertText($native, t('Native found.'));
-    $this->assertText($native, t('Test language added.'));
+    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)),'Correct page redirection.');
+    $this->assertText($langcode,'Language code found.');
+    $this->assertText($name,'Name found.');
+    $this->assertText($native,'Native found.');
+    $this->assertText($native,'Test language added.');
 
     // Check if we can change the default language.
     $path = 'admin/international/language';
     $this->drupalGet($path);
     // Set up the raw HTML strings we need to search for.
     $elements = $this->xpath('//input[@id="edit-site-default-en"]');
-    $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), t('English is the default language.'));
+    $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']),'English is the default language.');
     // Change the default language.
     $edit = array(
       'site_default' => $langcode,
     );
     $this->drupalPost($path, $edit, t('Save configuration'));
     $elements = $this->xpath('//input[@id="edit-site-default-en"]');
-    $this->assertTrue(isset($elements[0]) && empty($elements[0]['checked']), t('Default language updated.'));
-    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)), t('Correct page redirection.'));
+    $this->assertTrue(isset($elements[0]) && empty($elements[0]['checked']),'Default language updated.');
+    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)),'Correct page redirection.');
 
     // Ensure we can't delete the default language.
     $path = 'admin/international/language/delete/' . $langcode;
     $this->drupalGet($path);
-    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)), t('Correct page redirection.'));
-    $this->assertText(t('The default language cannot be deleted.'), t('Failed to delete the default language.'));
+    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)),'Correct page redirection.');
+    $this->assertText(t('The default language cannot be deleted.'),'Failed to delete the default language.');
 
     // Check if we can disable a language.
     $edit = array(
@@ -103,7 +103,7 @@
     );
     $this->drupalPost($path, $edit, t('Save configuration'));
     $elements = $this->xpath('//input[@id="edit-enabled-en"]');
-    $this->assertTrue(isset($elements[0]) && empty($elements[0]['checked']), t('Language disabled.'));
+    $this->assertTrue(isset($elements[0]) && empty($elements[0]['checked']),'Language disabled.');
 
     // Set disabled language to be the default and ensure it is re-enabled.
     $edit = array(
@@ -111,11 +111,11 @@
     );
     $this->drupalPost($path, $edit, t('Save configuration'));
     $elements = $this->xpath('//input[@id="edit-enabled-en"]');
-    $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), t('Default language re-enabled.'));
+    $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']),'Default language re-enabled.');
 
     // Ensure 'edit' link works.
     $this->clickLink(t('edit'));
-    $this->assertTitle(t('Edit language | Drupal'), t('Page title is "Edit language".'));
+    $this->assertTitle(t('Edit language | Drupal'),'Page title is "Edit language".');
     // Edit a language.
     $path = 'admin/international/language/edit/' . $langcode;
     $name = $this->randomName(16);
@@ -123,38 +123,38 @@
       'name' => $name,
     );
     $this->drupalPost($path, $edit, t('Save language'));
-    $this->assertRaw($name, t('The language has been updated.'));
-    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)), t('Correct page redirection.'));
+    $this->assertRaw($name,'The language has been updated.');
+    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)),'Correct page redirection.');
 
     // Ensure 'delete' link works.
     $path = 'admin/international/language';
     $this->drupalGet($path);
     $this->clickLink(t('delete'));
-    $this->assertText(t('Are you sure you want to delete the language'), t('"delete" link is correct.'));
+    $this->assertText(t('Are you sure you want to delete the language'),'"delete" link is correct.');
     // Delete the language.
     $path = 'admin/international/language/delete/' . $langcode;
     $this->drupalGet($path);
     // First test the 'cancel' link.
     $this->clickLink(t('Cancel'));
-    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)), t('Correct page redirection.'));
-    $this->assertRaw($name, t('The language was not deleted.'));
+    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)),'Correct page redirection.');
+    $this->assertRaw($name,'The language was not deleted.');
     // Delete the language for real. This a confirm form, we do not need any
     // fields changed.
     $this->drupalPost($path, array(), t('Delete'));
     // We need raw here because %locale will add HTML.
-    $this->assertRaw(t('The language %locale has been removed.', array('%locale' => $name)), t('The test language has been removed.'));
-    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)), t('Correct page redirection.'));
+    $this->assertRaw(t('The language %locale has been removed.', array('%locale' => $name)),'The test language has been removed.');
+    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)),'Correct page redirection.');
     // Reload to remove $name.
     $this->drupalGet($path);
-    $this->assertNoText($langcode, t('Language code not found.'));
-    $this->assertNoText($name, t('Name not found.'));
-    $this->assertNoText($native, t('Native not found.'));
+    $this->assertNoText($langcode,'Language code not found.');
+    $this->assertNoText($name,'Name not found.');
+    $this->assertNoText($native,'Native not found.');
 
     // Ensure we can't delete the English language.
     $path = 'admin/international/language/delete/en';
     $this->drupalGet($path);
-    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)), t('Correct page redirection.'));
-    $this->assertText(t('The English language cannot be deleted.'), t('Failed to delete English language.'));
+    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)),'Correct page redirection.');
+    $this->assertText(t('The English language cannot be deleted.'),'Failed to delete English language.');
 
     $this->drupalLogout();
   }
@@ -167,9 +167,9 @@
 class LocaleTranslationFunctionalTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('String translate, search and validate'),
-      'description' => t('Adds a new locale and translates its name. Checks the validation of translation strings and search results.'),
-      'group' => t('Locale'),
+      'name' => 'String translate, search and validate',
+      'description' => 'Adds a new locale and translates its name. Checks the validation of translation strings and search results.',
+      'group' => 'Locale',
     );
   }
 
@@ -215,12 +215,12 @@
     t($name, array(), array('langcode' => $langcode));
     // Reset locale cache.
     locale(NULL, NULL, NULL, TRUE);
-    $this->assertText($langcode, t('Language code found.'));
-    $this->assertText($name, t('Name found.'));
-    $this->assertText($native, t('Native found.'));
+    $this->assertText($langcode,'Language code found.');
+    $this->assertText($name,'Name found.');
+    $this->assertText($native,'Native found.');
     // No t() here, we do not want to add this string to the database and it's
     // surely not translated yet.
-    $this->assertText($native, t('Test language added.'));
+    $this->assertText($native,'Test language added.');
     $this->drupalLogout();
 
     // Search for the name and translate it.
@@ -235,8 +235,8 @@
     // assertText() seems to remove the input field where $name always could be
     // found, so this is not a false assert. See how assertNoText succeeds
     // later.
-    $this->assertText($name, t('Search found the name.'));
-    $this->assertRaw($language_indicator, t('Name is untranslated.'));
+    $this->assertText($name,'Search found the name.');
+    $this->assertRaw($language_indicator,'Name is untranslated.');
     // Assume this is the only result, given the random name.
     $this->clickLink(t('edit'));
     // We save the lid from the path.
@@ -244,24 +244,24 @@
     preg_match('!admin/international/translate/edit/(\d)+!', $this->getUrl(), $matches);
     $lid = $matches[1];
     // No t() here, it's surely not translated yet.
-    $this->assertText($name, t('name found on edit screen.'));
+    $this->assertText($name,'name found on edit screen.');
     $edit = array(
       "translations[$langcode]" => $translation,
     );
     $this->drupalPost(NULL, $edit, t('Save translations'));
-    $this->assertText(t('The string has been saved.'), t('The string has been saved.'));
-    $this->assertEqual($this->getUrl(), url('admin/international/translate/translate', array('absolute' => TRUE)), t('Correct page redirection.'));
-    $this->assertTrue($name != $translation && t($name, array(), array('langcode' => $langcode)) == $translation, t('t() works.'));
+    $this->assertText(t('The string has been saved.'),'The string has been saved.');
+    $this->assertEqual($this->getUrl(), url('admin/international/translate/translate', array('absolute' => TRUE)),'Correct page redirection.');
+    $this->assertTrue($name != $translation && t($name, array(), array('langcode' => $langcode)) == $translation,'t() works.');
     $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
     // The indicator should not be here.
-    $this->assertNoRaw($language_indicator, t('String is translated.'));
+    $this->assertNoRaw($language_indicator,'String is translated.');
 
     // Try to edit a non-existent string and ensure we're redirected correctly.
     // Assuming we don't have 999,999 strings already.
     $random_lid = 999999;
     $this->drupalGet('admin/international/translate/edit/' . $random_lid);
-    $this->assertText(t('String not found'), t('String not found.'));
-    $this->assertEqual($this->getUrl(), url('admin/international/translate/translate', array('absolute' => TRUE)), t('Correct page redirection.'));
+    $this->assertText(t('String not found'),'String not found.');
+    $this->assertEqual($this->getUrl(), url('admin/international/translate/translate', array('absolute' => TRUE)),'Correct page redirection.');
     $this->drupalLogout();
 
     // Delete the language.
@@ -270,12 +270,12 @@
     // This a confirm form, we do not need any fields changed.
     $this->drupalPost($path, array(), t('Delete'));
     // We need raw here because %locale will add HTML.
-    $this->assertRaw(t('The language %locale has been removed.', array('%locale' => $name)), t('The test language has been removed.'));
+    $this->assertRaw(t('The language %locale has been removed.', array('%locale' => $name)),'The test language has been removed.');
     // Reload to remove $name.
     $this->drupalGet($path);
-    $this->assertNoText($langcode, t('Language code not found.'));
-    $this->assertNoText($name, t('Name not found.'));
-    $this->assertNoText($native, t('Native not found.'));
+    $this->assertNoText($langcode,'Language code not found.');
+    $this->assertNoText($name,'Name not found.');
+    $this->assertNoText($native,'Native not found.');
     $this->drupalLogout();
 
     // Delete the string.
@@ -289,20 +289,20 @@
     $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
     // Assume this is the only result, given the random name.
     $this->clickLink(t('delete'));
-    $this->assertText(t('Are you sure you want to delete the string'), t('"delete" link is correct.'));
+    $this->assertText(t('Are you sure you want to delete the string'),'"delete" link is correct.');
     // Delete the string.
     $path = 'admin/international/translate/delete/' . $lid;
     $this->drupalGet($path);
     // First test the 'cancel' link.
     $this->clickLink(t('Cancel'));
-    $this->assertEqual($this->getUrl(), url('admin/international/translate/translate', array('absolute' => TRUE)), t('Correct page redirection.'));
-    $this->assertRaw($name, t('The string was not deleted.'));
+    $this->assertEqual($this->getUrl(), url('admin/international/translate/translate', array('absolute' => TRUE)),'Correct page redirection.');
+    $this->assertRaw($name,'The string was not deleted.');
     // Delete the name string.
     $this->drupalPost('admin/international/translate/delete/' . $lid, array(), t('Delete'));
-    $this->assertText(t('The string has been removed.'), t('The string has been removed message.'));
-    $this->assertEqual($this->getUrl(), url('admin/international/translate/translate', array('absolute' => TRUE)), t('Correct page redirection.'));
+    $this->assertText(t('The string has been removed.'),'The string has been removed message.');
+    $this->assertEqual($this->getUrl(), url('admin/international/translate/translate', array('absolute' => TRUE)),'Correct page redirection.');
     $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
-    $this->assertNoText($name, t('Search now can not find the name.'));
+    $this->assertNoText($name,'Search now can not find the name.');
   }
 
   /**
@@ -355,7 +355,7 @@
     $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
     // Find the edit path.
     $content = $this->drupalGetContent();
-    $this->assertTrue(preg_match('@(admin/international/translate/edit/[0-9]+)@', $content, $matches), t('Found the edit path.'));
+    $this->assertTrue(preg_match('@(admin/international/translate/edit/[0-9]+)@', $content, $matches),'Found the edit path.');
     $path = $matches[0];
     foreach ($bad_translations as $key => $translation) {
       $edit = array(
@@ -364,8 +364,8 @@
       $this->drupalPost($path, $edit, t('Save translations'));
       // Check for a form error on the textarea.
       $form_class = $this->xpath('//form[@id="locale-translate-edit-form"]//textarea/@class');
-      $this->assertNotIdentical(FALSE, strpos($form_class[0], 'error'), t('The string was rejected as unsafe.'));
-      $this->assertNoText(t('The string has been saved.'), t('The string was not saved.'));
+      $this->assertNotIdentical(FALSE, strpos($form_class[0], 'error'),'The string was rejected as unsafe.');
+      $this->assertNoText(t('The string has been saved.'),'The string was not saved.');
     }
   }
 
@@ -422,7 +422,7 @@
     // assertText() seems to remove the input field where $name always could be
     // found, so this is not a false assert. See how assertNoText succeeds
     // later.
-    $this->assertText($name, t('Search found the string.'));
+    $this->assertText($name,'Search found the string.');
 
     // Ensure untranslated string doesn't appear if searching on 'only
     // translated strings'.
@@ -433,7 +433,7 @@
       'group' => 'all',
     );
     $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
-    $this->assertText(t('No strings found for your search.'), t("Search didn't find the string."));
+    $this->assertText(t('No strings found for your search.'),"Search didn't find the string.");
 
     // Ensure untranslated string appears if searching on 'only untranslated
     // strings'.
@@ -444,7 +444,7 @@
       'group' => 'all',
     );
     $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
-    $this->assertNoText(t('No strings found for your search.'), t('Search found the string.'));
+    $this->assertNoText(t('No strings found for your search.'),'Search found the string.');
 
     // Add translation.
     // Assume this is the only result, given the random name.
@@ -467,7 +467,7 @@
       'group' => 'all',
     );
     $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
-    $this->assertNoText(t('No strings found for your search.'), t('Search found the translation.'));
+    $this->assertNoText(t('No strings found for your search.'),'Search found the translation.');
 
     // Ensure translated source string doesn't appear if searching on 'only
     // untranslated strings'.
@@ -478,7 +478,7 @@
       'group' => 'all',
     );
     $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
-    $this->assertText(t('No strings found for your search.'), t("Search didn't find the source string."));
+    $this->assertText(t('No strings found for your search.'),"Search didn't find the source string.");
 
     // Ensure translated string doesn't appear if searching on 'only
     // untranslated strings'.
@@ -489,7 +489,7 @@
       'group' => 'all',
     );
     $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
-    $this->assertText(t('No strings found for your search.'), t("Search didn't find the translation."));
+    $this->assertText(t('No strings found for your search.'),"Search didn't find the translation.");
 
     // Ensure translated string does appear if searching on the custom language.
     $search = array(
@@ -499,7 +499,7 @@
       'group' => 'all',
     );
     $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
-    $this->assertNoText(t('No strings found for your search.'), t('Search found the translation.'));
+    $this->assertNoText(t('No strings found for your search.'),'Search found the translation.');
 
     // Ensure translated string doesn't appear if searching on English.
     $search = array(
@@ -509,7 +509,7 @@
       'group' => 'all',
     );
     $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
-    $this->assertText(t('No strings found for your search.'), t("Search didn't find the translation."));
+    $this->assertText(t('No strings found for your search.'),"Search didn't find the translation.");
 
     // Search for a string that isn't in the system.
     $unavailable_string = $this->randomName(16);
@@ -520,7 +520,7 @@
       'group' => 'all',
     );
     $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
-    $this->assertText(t('No strings found for your search.'), t("Search didn't find the invalid string."));
+    $this->assertText(t('No strings found for your search.'),"Search didn't find the invalid string.");
   }
 }
 
@@ -530,9 +530,9 @@
 class LocaleImportFunctionalTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Translation import'),
-      'description' => t('Tests the importation of locale files.'),
-      'group' => t('Locale'),
+      'name' => 'Translation import',
+      'description' => 'Tests the importation of locale files.',
+      'group' => 'Locale',
     );
   }
 
@@ -558,13 +558,13 @@
     ));
 
     // The import should automatically create the corresponding language.
-    $this->assertRaw(t('The language %language has been created.', array('%language' => 'French')), t('The language has been automatically created.'));
+    $this->assertRaw(t('The language %language has been created.', array('%language' => 'French')),'The language has been automatically created.');
 
     // The import should have created 7 strings.
-    $this->assertRaw(t('The translation was successfully imported. There are %number newly created translated strings, %update strings were updated and %delete strings were removed.', array('%number' => 7, '%update' => 0, '%delete' => 0)), t('The translation file was successfully imported.'));
+    $this->assertRaw(t('The translation was successfully imported. There are %number newly created translated strings, %update strings were updated and %delete strings were removed.', array('%number' => 7, '%update' => 0, '%delete' => 0)),'The translation file was successfully imported.');
 
     // Ensure we were redirected correctly.
-    $this->assertEqual($this->getUrl(), url('admin/international/translate', array('absolute' => TRUE)), t('Correct page redirection.'));
+    $this->assertEqual($this->getUrl(), url('admin/international/translate', array('absolute' => TRUE)),'Correct page redirection.');
 
 
     // Try importing a .po file with invalid tags in the default text group.
@@ -573,9 +573,9 @@
     ));
 
     // The import should have created 1 string and rejected 2.
-    $this->assertRaw(t('The translation was successfully imported. There are %number newly created translated strings, %update strings were updated and %delete strings were removed.', array('%number' => 1, '%update' => 0, '%delete' => 0)), t('The translation file was successfully imported.'));
+    $this->assertRaw(t('The translation was successfully imported. There are %number newly created translated strings, %update strings were updated and %delete strings were removed.', array('%number' => 1, '%update' => 0, '%delete' => 0)),'The translation file was successfully imported.');
     $skip_message = format_plural(2, 'One translation string was skipped because it contains disallowed HTML.', '@count translation strings were skipped because they contain disallowed HTML.');
-    $this->assertRaw($skip_message, t('Unsafe strings were skipped.'));
+    $this->assertRaw($skip_message,'Unsafe strings were skipped.');
 
 
     // Try importing a .po file with invalid tags in a non default text group.
@@ -585,7 +585,7 @@
     ));
 
     // The import should have created 3 strings.
-    $this->assertRaw(t('The translation was successfully imported. There are %number newly created translated strings, %update strings were updated and %delete strings were removed.', array('%number' => 3, '%update' => 0, '%delete' => 0)), t('The translation file was successfully imported.'));
+    $this->assertRaw(t('The translation was successfully imported. There are %number newly created translated strings, %update strings were updated and %delete strings were removed.', array('%number' => 3, '%update' => 0, '%delete' => 0)),'The translation file was successfully imported.');
 
 
     // Try importing a .po file which doesn't exist.
@@ -595,8 +595,8 @@
       'files[file]' => $name,
       'group' => 'custom',
     ), t('Import'));
-    $this->assertEqual($this->getUrl(), url('admin/international/translate/import', array('absolute' => TRUE)), t('Correct page redirection.'));
-    $this->assertText(t('File to import not found.'), t('File to import not found message.'));
+    $this->assertEqual($this->getUrl(), url('admin/international/translate/import', array('absolute' => TRUE)),'Correct page redirection.');
+    $this->assertText(t('File to import not found.'),'File to import not found message.');
 
 
     // Try importing a .po file with overriding strings, and ensure existing
@@ -607,7 +607,7 @@
     ));
 
     // The import should have created 1 string.
-    $this->assertRaw(t('The translation was successfully imported. There are %number newly created translated strings, %update strings were updated and %delete strings were removed.', array('%number' => 1, '%update' => 0, '%delete' => 0)), t('The translation file was successfully imported.'));
+    $this->assertRaw(t('The translation was successfully imported. There are %number newly created translated strings, %update strings were updated and %delete strings were removed.', array('%number' => 1, '%update' => 0, '%delete' => 0)),'The translation file was successfully imported.');
     // Ensure string wasn't overwritten.
     $search = array(
       'string' => 'Montag',
@@ -616,7 +616,7 @@
       'group' => 'all',
     );
     $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
-    $this->assertText(t('No strings found for your search.'), t('String not overwritten by imported string.'));
+    $this->assertText(t('No strings found for your search.'),'String not overwritten by imported string.');
 
 
     // Try importing a .po file with overriding strings, and ensure existing
@@ -627,7 +627,7 @@
     ));
 
     // The import should have updated 2 strings.
-    $this->assertRaw(t('The translation was successfully imported. There are %number newly created translated strings, %update strings were updated and %delete strings were removed.', array('%number' => 0, '%update' => 2, '%delete' => 0)), t('The translation file was successfully imported.'));
+    $this->assertRaw(t('The translation was successfully imported. There are %number newly created translated strings, %update strings were updated and %delete strings were removed.', array('%number' => 0, '%update' => 2, '%delete' => 0)),'The translation file was successfully imported.');
     // Ensure string was overwritten.
     $search = array(
       'string' => 'Montag',
@@ -636,7 +636,7 @@
       'group' => 'all',
     );
     $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
-    $this->assertNoText(t('No strings found for your search.'), t('String overwritten by imported string.'));
+    $this->assertNoText(t('No strings found for your search.'),'String overwritten by imported string.');
   }
 
   /**
@@ -665,7 +665,7 @@
 
     // Ensure the translation file was automatically imported when language was
     // added.
-    $this->assertText(t('One translation file imported for the enabled modules.'), t('Language file automatically imported.'));
+    $this->assertText(t('One translation file imported for the enabled modules.'),'Language file automatically imported.');
 
     // Ensure strings were successfully imported.
     $search = array(
@@ -675,7 +675,7 @@
       'group' => 'all',
     );
     $this->drupalPost('admin/international/translate/translate', $search, t('Filter'));
-    $this->assertNoText(t('No strings found for your search.'), t('String successfully imported.'));
+    $this->assertNoText(t('No strings found for your search.'),'String successfully imported.');
   }
 
   /**
@@ -688,8 +688,8 @@
       'langcode' => 'hr',
     ));
 
-    $this->assertIdentical(t('May', array(), array('langcode' => 'hr', 'context' => 'Long month name')), 'Svibanj', t('Long month name context is working.'));
-    $this->assertIdentical(t('May', array(), array('langcode' => 'hr', 'context' => 'Short month name')), 'Svi.', t('Short month name context is working.'));
+    $this->assertIdentical(t('May', array(), array('langcode' => 'hr', 'context' => 'Long month name')), 'Svibanj','Long month name context is working.');
+    $this->assertIdentical(t('May', array(), array('langcode' => 'hr', 'context' => 'Short month name')), 'Svi.','Short month name context is working.');
   }
 
   /**
@@ -825,9 +825,9 @@
 class LocaleExportFunctionalTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Translation export'),
-      'description' => t('Tests the exportation of locale files.'),
-      'group' => t('Locale'),
+      'name' => 'Translation export',
+      'description' => 'Tests the exportation of locale files.',
+      'group' => 'Locale',
     );
   }
 
@@ -863,9 +863,9 @@
     ), t('Export'));
 
     // Ensure we have a translation file.
-    $this->assertRaw('# French translation of Drupal', t('Exported French translation file.'));
+    $this->assertRaw('# French translation of Drupal','Exported French translation file.');
     // Ensure our imported translations exist in the file.
-    $this->assertRaw('msgstr "lundi"', t('French translations present in exported file.'));
+    $this->assertRaw('msgstr "lundi"','French translations present in exported file.');
   }
 
   /**
@@ -878,7 +878,7 @@
     // doesn't work.
     $this->drupalPost('admin/international/translate/export', array(), t('Export'));
     // Ensure we have a translation file.
-    $this->assertRaw('# LANGUAGE translation of PROJECT', t('Exported translation template file.'));
+    $this->assertRaw('# LANGUAGE translation of PROJECT','Exported translation template file.');
   }
 
   /**
@@ -907,9 +907,9 @@
 class LocaleUninstallFunctionalTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Locale uninstall (EN)'),
-      'description' => t('Tests the uninstall process using the built-in UI language.'),
-      'group' => t('Locale'),
+      'name' => 'Locale uninstall (EN)',
+      'description' => 'Tests the uninstall process using the built-in UI language.',
+      'group' => 'Locale',
     );
   }
 
@@ -960,7 +960,7 @@
     _locale_rebuild_js('fr');
     $file = db_query('SELECT javascript FROM {languages} WHERE language = :language', array(':language' => 'fr'))->fetchObject();
     $js_file = file_create_path(variable_get('locale_js_directory', 'languages')) . '/fr_' . $file->javascript . '.js';
-    $this->assertTrue($result = file_exists($js_file), t('JavaScript file created: %file', array('%file' => $result ? $js_file : t('none'))));
+    $this->assertTrue($result = file_exists($js_file),'JavaScript file created: %file', array('%file' => $result ? $js_file :'none'));
 
     // Disable string caching.
     variable_set('locale_cache_strings', 0);
@@ -977,7 +977,7 @@
     $this->assertEqual($language->language, 'en', t('Language after uninstall: %lang', array('%lang' => $language->language)));
 
     // Check JavaScript files deletion.
-    $this->assertTrue($result = !file_exists($js_file), t('JavaScript file deleted: %file', array('%file' => $result ? $js_file : t('found'))));
+    $this->assertTrue($result = !file_exists($js_file),'JavaScript file deleted: %file', array('%file' => $result ? $js_file :'found'));
 
     // Check language count.
     $language_count = variable_get('language_count', 1);
@@ -985,7 +985,7 @@
 
     // Check language negotiation.
     $language_negotiation = variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE) == LANGUAGE_NEGOTIATION_NONE;
-    $this->assertTrue($language_negotiation, t('Language negotiation: %setting', array('%setting' => t($language_negotiation ? 'none' : 'set'))));
+    $this->assertTrue($language_negotiation,'Language negotiation: %setting', array('%setting' => t($language_negotiation ? 'none' : 'set')));
 
     // Check JavaScript parsed.
     $javascript_parsed_count = count(variable_get('javascript_parsed', array()));
@@ -993,7 +993,7 @@
 
     // Check multilingual workflow option for articles.
     $multilingual = variable_get('language_content_type_article', 0);
-    $this->assertEqual($multilingual, 0, t('Multilingual workflow option: %status', array('%status' => t($multilingual ? 'enabled': 'disabled'))));
+    $this->assertEqual($multilingual, 0,'Multilingual workflow option: %status', array('%status' => t($multilingual ? 'enabled': 'disabled')));
 
     // Check JavaScript translations directory.
     $locale_js_directory = variable_get('locale_js_directory', 'languages');
@@ -1001,7 +1001,7 @@
 
     // Check string caching.
     $locale_cache_strings = variable_get('locale_cache_strings', 1);
-    $this->assertEqual($locale_cache_strings, 1, t('String caching: %status', array('%status' => t($locale_cache_strings ? 'enabled': 'disabled'))));
+    $this->assertEqual($locale_cache_strings, 1,'String caching: %status', array('%status' => t($locale_cache_strings ? 'enabled': 'disabled')));
   }
 }
 
@@ -1016,9 +1016,9 @@
 class LocaleUninstallFrenchFunctionalTest extends LocaleUninstallFunctionalTest {
   public static function getInfo() {
     return array(
-      'name' => t('Locale uninstall (FR)'),
-      'description' => t('Tests the uninstall process using French as UI language.'),
-      'group' => t('Locale'),
+      'name' => 'Locale uninstall (FR)',
+      'description' => 'Tests the uninstall process using French as UI language.',
+      'group' => 'Locale',
     );
   }
 
@@ -1036,9 +1036,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Language switching'),
-      'description' => t('Tests for the language switching feature.'),
-      'group' => t('Locale'),
+      'name' => 'Language switching',
+      'description' => 'Tests for the language switching feature.',
+      'group' => 'Locale',
     );
   }
 
@@ -1071,11 +1071,11 @@
       'language_negotiation' => LANGUAGE_NEGOTIATION_PATH_DEFAULT,
     );
     $this->drupalPost('admin/international/language/configure', $edit, t('Save settings'));
-    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)), t('Correct page redirection.'));
+    $this->assertEqual($this->getUrl(), url('admin/international/language', array('absolute' => TRUE)),'Correct page redirection.');
 
     // Assert that the language switching block is displayed on the frontpage.
     $this->drupalGet('');
-    $this->assertText(t('Languages'), t('Language switcher block found.'));
+    $this->assertText(t('Languages'),'Language switcher block found.');
 
     // Assert that only the current language is marked as active.
     list($language_switcher) = $this->xpath('//div[@id="block-locale-language-switcher"]');
@@ -1104,8 +1104,8 @@
         $anchors['inactive'][] = $language;
       }
     }
-    $this->assertIdentical($links, array('active' => array('en'), 'inactive' => array('fr')), t('Only the current language list item is marked as active on the language switcher block.'));
-    $this->assertIdentical($anchors, array('active' => array('en'), 'inactive' => array('fr')), t('Only the current language anchor is marked as active on the language switcher block.'));
+    $this->assertIdentical($links, array('active' => array('en'), 'inactive' => array('fr')),'Only the current language list item is marked as active on the language switcher block.');
+    $this->assertIdentical($anchors, array('active' => array('en'), 'inactive' => array('fr')),'Only the current language anchor is marked as active on the language switcher block.');
   }
 }
 
@@ -1115,9 +1115,9 @@
 class LocaleUserLanguageFunctionalTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('User language settings'),
-      'description' => t("Tests user's ability to change their default language."),
-      'group' => t('Locale'),
+      'name' => 'User language settings',
+      'description' => "Tests user's ability to change their default language.",
+      'group' => 'Locale',
     );
   }
 
@@ -1184,21 +1184,21 @@
     $path = 'user/' . $web_user->uid . '/edit';
     $this->drupalGet($path);
     // Ensure language settings fieldset is available.
-    $this->assertText(t('Language settings'), t('Language settings available.'));
+    $this->assertText(t('Language settings'),'Language settings available.');
     // Ensure custom language is present.
-    $this->assertText($name, t('Language present on form.'));
+    $this->assertText($name,'Language present on form.');
     // Ensure disabled language isn't present.
-    $this->assertNoText($name_disabled, t('Disabled language not present on form.'));
+    $this->assertNoText($name_disabled,'Disabled language not present on form.');
     // Switch to our custom language.
     $edit = array(
       'language' => $langcode,
     );
     $this->drupalPost($path, $edit, t('Save'));
     // Ensure form was submitted successfully.
-    $this->assertText(t('The changes have been saved.'), t('Changes were saved.'));
+    $this->assertText(t('The changes have been saved.'),'Changes were saved.');
     // Check if language was changed.
     $elements = $this->xpath('//input[@id="edit-language-' . $langcode . '"]');
-    $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), t('Default language successfully updated.'));
+    $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']),'Default language successfully updated.');
 
     $this->drupalLogout();
   }
@@ -1210,9 +1210,9 @@
 class LocalePathFunctionalTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Path language settings'),
-      'description' => t('Checks you can configure a language for individual url aliases.'),
-      'group' => t('Locale'),
+      'name' => 'Path language settings',
+      'description' => 'Checks you can configure a language for individual url aliases.',
+      'group' => 'Locale',
     );
   }
 
@@ -1278,11 +1278,11 @@
 
     // Confirm English language path alias works.
     $this->drupalGet($english_path);
-    $this->assertText($node->title, t('English alias works.'));
+    $this->assertText($node->title,'English alias works.');
 
     // Confirm custom language path alias works.
     $this->drupalGet($prefix . '/' . $custom_language_path);
-    $this->assertText($node->title, t('Custom language alias works.'));
+    $this->assertText($node->title,'Custom language alias works.');
 
     $this->drupalLogout();
   }
@@ -1293,9 +1293,9 @@
 class LocaleContentFunctionalTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Content language settings'),
-      'description' => t('Checks you can enable multilingual support on content types and configure a language for a node.'),
-      'group' => t('Locale'),
+      'name' => 'Content language settings',
+      'description' => 'Checks you can enable multilingual support on content types and configure a language for a node.',
+      'group' => 'Locale',
     );
   }
 
@@ -1366,28 +1366,28 @@
 
     // Set page content type to use multilingual support.
     $this->drupalGet('admin/build/node-type/page');
-    $this->assertText(t('Multilingual support'), t('Multilingual support fieldset present on content type configuration form.'));
+    $this->assertText(t('Multilingual support'),'Multilingual support fieldset present on content type configuration form.');
     $edit = array(
       'language_content_type' => 1,
     );
     $this->drupalPost('admin/build/node-type/page', $edit, t('Save content type'));
-    $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Page')), t('Page content type has been updated.'));
+    $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Page')),'Page content type has been updated.');
     $this->drupalLogout();
 
     // Verify language selection is not present on add article form.
     $this->drupalLogin($web_user);
     $this->drupalGet('node/add/article');
     // Verify language select list is not present.
-    $this->assertNoRaw('<select name="language" class="form-select" id="edit-language" >', t('Language select not present on add article form.'));
+    $this->assertNoRaw('<select name="language" class="form-select" id="edit-language" >','Language select not present on add article form.');
 
     // Verify language selection appears on add page form.
     $this->drupalGet('node/add/page');
     // Verify language select list is present.
-    $this->assertRaw('<select name="language" class="form-select" id="edit-language" >', t('Language select present on add page form.'));
+    $this->assertRaw('<select name="language" class="form-select" id="edit-language" >','Language select present on add page form.');
     // Ensure enabled language appears.
-    $this->assertText($name, t('Enabled language present.'));
+    $this->assertText($name,'Enabled language present.');
     // Ensure disabled language doesn't appear.
-    $this->assertNoText($name_disabled, t('Disabled language not present.'));
+    $this->assertNoText($name_disabled,'Disabled language not present.');
 
     // Create page content.
     $node_title = $this->randomName();
@@ -1402,13 +1402,13 @@
     // Edit the page content and ensure correct language is selected.
     $path = 'node/' . $node->nid . '/edit';
     $this->drupalGet($path);
-    $this->assertRaw('<option value="' . $langcode . '" selected="selected">' .  $name . '</option>', t('Correct language selected.'));
+    $this->assertRaw('<option value="' . $langcode . '" selected="selected">' .  $name . '</option>','Correct language selected.');
     // Ensure we can change the node language.
     $edit = array(
       'language' => 'en',
     );
     $this->drupalPost($path, $edit, t('Save'));
-    $this->assertRaw(t('Page %title has been updated.', array('%title' => $node_title)), t('Page updated.'));
+    $this->assertRaw(t('Page %title has been updated.', array('%title' => $node_title)),'Page updated.');
 
     $this->drupalLogout();
   }
Index: modules/aggregator/aggregator.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.test,v
retrieving revision 1.26
diff -u -r1.26 aggregator.test
--- modules/aggregator/aggregator.test	12 Jun 2009 08:39:35 -0000	1.26
+++ modules/aggregator/aggregator.test	9 Jul 2009 02:46:28 -0000
@@ -29,7 +29,7 @@
     $this->assertRaw(t('The feed %name has been added.', array('%name' => $edit['title'])), t('The feed !name has been added.', array('!name' => $edit['title'])));
 
     $feed = db_query("SELECT *  FROM {aggregator_feed} WHERE title = :title AND url = :url", array(':title' => $edit['title'], ':url' => $edit['url']))->fetch();
-    $this->assertTrue(!empty($feed), t('The feed found in database.'));
+    $this->assertTrue(!empty($feed),'The feed found in database.');
     return $feed;
   }
 
@@ -41,7 +41,7 @@
    */
   function deleteFeed($feed) {
     $this->drupalPost('admin/content/aggregator/edit/feed/' . $feed->fid, array(), t('Delete'));
-    $this->assertRaw(t('The feed %title has been deleted.', array('%title' => $feed->title)), t('Feed deleted successfully.'));
+    $this->assertRaw(t('The feed %title has been deleted.', array('%title' => $feed->title)),'Feed deleted successfully.');
   }
 
   /**
@@ -115,7 +115,7 @@
    */
   function removeFeedItems($feed) {
     $this->drupalPost('admin/content/aggregator/remove/' . $feed->fid, array(), t('Remove items'));
-    $this->assertRaw(t('The news items from %title have been removed.', array('%title' => $feed->title)), t('Feed items removed.'));
+    $this->assertRaw(t('The news items from %title have been removed.', array('%title' => $feed->title)),'Feed items removed.');
   }
 
   /**
@@ -261,9 +261,9 @@
 class AddFeedTestCase extends AggregatorTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Add feed functionality'),
-      'description' => t('Add feed test.'),
-      'group' => t('Aggregator')
+      'name' => 'Add feed functionality',
+      'description' => 'Add feed test.',
+      'group' => 'Aggregator'
     );
   }
 
@@ -274,13 +274,13 @@
     $feed = $this->createFeed();
 
     // Check feed data.
-    $this->assertEqual($this->getUrl(), url('admin/content/aggregator/add/feed', array('absolute' => TRUE)), t('Directed to correct url.'));
-    $this->assertTrue($this->uniqueFeed($feed->title, $feed->url), t('The feed is unique.'));
+    $this->assertEqual($this->getUrl(), url('admin/content/aggregator/add/feed', array('absolute' => TRUE)),'Directed to correct url.');
+    $this->assertTrue($this->uniqueFeed($feed->title, $feed->url),'The feed is unique.');
 
     // Check feed source.
     $this->drupalGet('aggregator/sources/' . $feed->fid);
-    $this->assertResponse(200, t('Feed source exists.'));
-    $this->assertText($feed->title, t('Page title'));
+    $this->assertResponse(200,'Feed source exists.');
+    $this->assertText($feed->title,'Page title');
 
     // Delete feed.
     $this->deleteFeed($feed);
@@ -290,9 +290,9 @@
 class UpdateFeedTestCase extends AggregatorTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Update feed functionality'),
-      'description' => t('Update feed test.'),
-      'group' => t('Aggregator')
+      'name' => 'Update feed functionality',
+      'description' => 'Update feed test.',
+      'group' => 'Aggregator'
     );
   }
 
@@ -315,12 +315,12 @@
 
       // Check feed data.
       $this->assertEqual($this->getUrl(), url('admin/content/aggregator/', array('absolute' => TRUE)));
-      $this->assertTrue($this->uniqueFeed($edit['title'], $edit['url']), t('The feed is unique.'));
+      $this->assertTrue($this->uniqueFeed($edit['title'], $edit['url']),'The feed is unique.');
 
       // Check feed source.
       $this->drupalGet('aggregator/sources/' . $feed->fid);
-      $this->assertResponse(200, t('Feed source exists.'));
-      $this->assertText($edit['title'], t('Page title'));
+      $this->assertResponse(200,'Feed source exists.');
+      $this->assertText($edit['title'],'Page title');
 
       // Delete feed.
       $feed->title = $edit['title']; // Set correct title so deleteFeed() will work.
@@ -332,9 +332,9 @@
 class RemoveFeedTestCase extends AggregatorTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Remove feed functionality'),
-      'description' => t('Remove feed test.'),
-      'group' => t('Aggregator')
+      'name' => 'Remove feed functionality',
+      'description' => 'Remove feed test.',
+      'group' => 'Aggregator'
     );
   }
 
@@ -349,20 +349,20 @@
 
     // Check feed source.
     $this->drupalGet('aggregator/sources/' . $feed->fid);
-    $this->assertResponse(404, t('Deleted feed source does not exists.'));
+    $this->assertResponse(404,'Deleted feed source does not exists.');
 
     // Check database for feed.
     $result = db_query("SELECT COUNT(*) FROM {aggregator_feed} WHERE title = :title AND url = :url", array(':title' => $feed->title, ':url' => $feed->url))->fetchField();
-    $this->assertFalse($result, t('Feed not found in database'));
+    $this->assertFalse($result,'Feed not found in database');
   }
 }
 
 class UpdateFeedItemTestCase extends AggregatorTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Update feed item functionality'),
-      'description' => t('Update feed items from a feed.'),
-      'group' => t('Aggregator')
+      'name' => 'Update feed item functionality',
+      'description' => 'Update feed items from a feed.',
+      'group' => 'Aggregator'
     );
   }
 
@@ -421,9 +421,9 @@
 class RemoveFeedItemTestCase extends AggregatorTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Remove feed item functionality'),
-      'description' => t('Remove feed items from a feed.'),
-      'group' => t('Aggregator')
+      'name' => 'Remove feed item functionality',
+      'description' => 'Remove feed items from a feed.',
+      'group' => 'Aggregator'
     );
   }
 
@@ -459,9 +459,9 @@
 class CategorizeFeedItemTestCase extends AggregatorTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Categorize feed item functionality'),
-      'description' => t('Test feed item categorization.'),
-      'group' => t('Aggregator')
+      'name' => 'Categorize feed item functionality',
+      'description' => 'Test feed item categorization.',
+      'group' => 'Aggregator'
     );
   }
 
@@ -478,11 +478,11 @@
     $this->assertRaw(t('The category %title has been added.', array('%title' => $edit['title'])), t('The category %title has been added.', array('%title' => $edit['title'])));
 
     $category = db_query("SELECT * FROM {aggregator_category} WHERE title = :title", array(':title' => $edit['title']))->fetch();
-    $this->assertTrue(!empty($category), t('The category found in database.'));
+    $this->assertTrue(!empty($category),'The category found in database.');
 
     $link_path = 'aggregator/categories/' . $category->cid;
     $menu_link = db_query("SELECT * FROM {menu_links} WHERE link_path = :link_path", array(':link_path' => $link_path))->fetch();
-    $this->assertTrue(!empty($menu_link), t('The menu link associated with the category found in database.'));
+    $this->assertTrue(!empty($menu_link),'The menu link associated with the category found in database.');
 
     $feed = $this->createFeed();
     db_insert('aggregator_category_feed')
@@ -493,7 +493,7 @@
       ->execute();
     $this->updateFeedItems($feed, $this->getDefaultFeedItemCount());
     $this->getFeedCategories($feed);
-    $this->assertTrue(!empty($feed->categories), t('The category found in the feed.'));
+    $this->assertTrue(!empty($feed->categories),'The category found in the feed.');
 
     // For each category of a feed, ensure feed items have that category, too.
     if (!empty($feed->categories) && !empty($feed->items)) {
@@ -504,7 +504,7 @@
           ->execute()
           ->fetchField();
 
-        $this->assertEqual($feed->item_count, $categorized_count, t('Total items in feed equal to the total categorized feed items in database'));
+        $this->assertEqual($feed->item_count, $categorized_count,'Total items in feed equal to the total categorized feed items in database');
       }
     }
 
@@ -516,9 +516,9 @@
 class ImportOPMLTestCase extends AggregatorTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Import feeds from OPML functionality'),
-      'description' => t('Test OPML import.'),
-      'group' => t('Aggregator'),
+      'name' => 'Import feeds from OPML functionality',
+      'description' => 'Test OPML import.',
+      'group' => 'Aggregator',
     );
   }
 
@@ -537,11 +537,11 @@
       ->execute();
 
     $this->drupalGet('admin/content/aggregator/add/opml');
-    $this->assertText('A single OPML document may contain a collection of many feeds.', t('Looking for help text.'));
-    $this->assertFieldByName('files[upload]', '', t('Looking for file upload field.'));
-    $this->assertFieldByName('remote', '', t('Looking for remote URL field.'));
-    $this->assertFieldByName('refresh', '', t('Looking for refresh field.'));
-    $this->assertFieldByName("category[$cid]", $cid, t('Looking for category field.'));
+    $this->assertText('A single OPML document may contain a collection of many feeds.','Looking for help text.');
+    $this->assertFieldByName('files[upload]', '','Looking for file upload field.');
+    $this->assertFieldByName('remote', '','Looking for remote URL field.');
+    $this->assertFieldByName('refresh', '','Looking for refresh field.');
+    $this->assertFieldByName("category[$cid]", $cid,'Looking for category field.');
   }
 
   /**
@@ -552,7 +552,7 @@
 
     $form = array();
     $this->drupalPost('admin/content/aggregator/add/opml', $form, t('Import'));
-    $this->assertRaw(t('You must <em>either</em> upload a file or enter a URL.'), t('Error if no fields are filled.'));
+    $this->assertRaw(t('You must <em>either</em> upload a file or enter a URL.'),'Error if no fields are filled.');
 
     $path = $this->getEmptyOpml();
     $form = array(
@@ -560,14 +560,14 @@
       'remote' => file_create_url($path),
     );
     $this->drupalPost('admin/content/aggregator/add/opml', $form, t('Import'));
-    $this->assertRaw(t('You must <em>either</em> upload a file or enter a URL.'), t('Error if both fields are filled.'));
+    $this->assertRaw(t('You must <em>either</em> upload a file or enter a URL.'),'Error if both fields are filled.');
 
     $form = array('remote' => 'invalidUrl://empty');
     $this->drupalPost('admin/content/aggregator/add/opml', $form, t('Import'));
-    $this->assertText(t('This URL is not valid.'), t('Error if the URL is invalid.'));
+    $this->assertText(t('This URL is not valid.'),'Error if the URL is invalid.');
 
     $after = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
-    $this->assertEqual($before, $after, t('No feeds were added during the three last form submissions.'));
+    $this->assertEqual($before, $after,'No feeds were added during the three last form submissions.');
   }
 
   /**
@@ -578,14 +578,14 @@
 
     $form['files[upload]'] = $this->getInvalidOpml();
     $this->drupalPost('admin/content/aggregator/add/opml', $form, t('Import'));
-    $this->assertText(t('No new feed has been added.'), t('Attempting to upload invalid XML.'));
+    $this->assertText(t('No new feed has been added.'),'Attempting to upload invalid XML.');
 
     $form = array('remote' => file_create_url($this->getEmptyOpml()));
     $this->drupalPost('admin/content/aggregator/add/opml', $form, t('Import'));
-    $this->assertText(t('No new feed has been added.'), t('Attempting to load empty OPML from remote URL.'));
+    $this->assertText(t('No new feed has been added.'),'Attempting to load empty OPML from remote URL.');
 
     $after = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
-    $this->assertEqual($before, $after, t('No feeds were added during the two last form submissions.'));
+    $this->assertEqual($before, $after,'No feeds were added during the two last form submissions.');
 
     db_delete('aggregator_feed')->execute();
     db_delete('aggregator_category')->execute();
@@ -609,11 +609,11 @@
       'category[1]'   => $category,
     );
     $this->drupalPost('admin/content/aggregator/add/opml', $form, t('Import'));
-    $this->assertRaw(t('A feed with the URL %url already exists.', array('%url' => $feeds[0]['url'])), t('Verifying that a duplicate URL was identified'));
-    $this->assertRaw(t('A feed named %title already exists.', array('%title' => $feeds[1]['title'])), t('Verifying that a duplicate title was identified'));
+    $this->assertRaw(t('A feed with the URL %url already exists.', array('%url' => $feeds[0]['url'])),'Verifying that a duplicate URL was identified');
+    $this->assertRaw(t('A feed named %title already exists.', array('%title' => $feeds[1]['title'])),'Verifying that a duplicate title was identified');
 
     $after = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
-    $this->assertEqual($after, 2, t('Verifying that two distinct feeds were added.'));
+    $this->assertEqual($after, 2,'Verifying that two distinct feeds were added.');
 
     $feeds_from_db = db_query("SELECT f.title, f.url, f.refresh, cf.cid FROM {aggregator_feed} f LEFT JOIN {aggregator_category_feed} cf ON f.fid = cf.fid");
     $refresh = $category = TRUE;
@@ -624,10 +624,10 @@
       $refresh = $refresh && $feed->refresh == 900;
     }
 
-    $this->assertEqual($title[$feeds[0]['url']], $feeds[0]['title'], t('First feed was added correctly.'));
-    $this->assertEqual($url[$feeds[1]['title']], $feeds[1]['url'], t('Second feed was added correctly.'));
-    $this->assertTrue($refresh, t('Refresh times are correct.'));
-    $this->assertTrue($category, t('Categories are correct.'));
+    $this->assertEqual($title[$feeds[0]['url']], $feeds[0]['title'],'First feed was added correctly.');
+    $this->assertEqual($url[$feeds[1]['title']], $feeds[1]['url'],'Second feed was added correctly.');
+    $this->assertTrue($refresh,'Refresh times are correct.');
+    $this->assertTrue($category,'Categories are correct.');
   }
 
   function testOPMLImport() {
Index: modules/poll/poll.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.test,v
retrieving revision 1.19
diff -u -r1.19 poll.test
--- modules/poll/poll.test	4 Jun 2009 03:33:28 -0000	1.19
+++ modules/poll/poll.test	9 Jul 2009 02:46:29 -0000
@@ -47,7 +47,7 @@
     $this->drupalPost(NULL, $edit, t('Save'));
     $node = $this->drupalGetNodeByTitle($title);
     $this->assertText(t('@type @title has been created.', array('@type' => node_type_get_name('poll'), '@title' => $title)), 'Poll has been created.');
-    $this->assertTrue($node->nid, t('Poll has been found in the database.'));
+    $this->assertTrue($node->nid,'Poll has been found in the database.');
 
     return isset($node->nid) ? $node->nid : FALSE;
   }
@@ -86,7 +86,7 @@
 
 class PollCreateTestCase extends PollTestCase {
   public static function getInfo() {
-    return array('name' => t('Poll create'), 'description' => 'Adds "more choices", previews and creates a poll.', 'group' => t('Poll'));
+    return array('name' => 'Poll create', 'description' => 'Adds "more choices", previews and creates a poll.', 'group' => 'Poll');
   }
 
   function setUp() {
@@ -99,7 +99,7 @@
     $this->pollCreate($title, $choices, TRUE);
 
     // Verify poll appears on 'poll' page.
-    $this->drupalGet('poll');
+    $this->drupalGe'poll';
     $this->assertText($title, 'Poll appears in poll list.');
     $this->assertText('open', 'Poll is active.');
 
@@ -127,7 +127,7 @@
     // Verify 'Vote' button no longer appears.
     $this->drupalGet('node/' . $poll_nid);
     $elements = $this->xpath('//input[@id="edit-vote"]');
-    $this->assertTrue(empty($elements), t("Vote button doesn't appear."));
+    $this->assertTrue(empty($elements),"Vote button doesn't appear.");
 
     // Verify status on 'poll' page is 'closed'.
     $this->drupalGet('poll');
@@ -145,7 +145,7 @@
     $this->drupalPost('node/' . $poll_nid, $vote_edit, t('Vote'));
     $this->assertText('Your vote was recorded.', 'Your vote was recorded.');
     $elements = $this->xpath('//input[@value="Cancel your vote"]');
-    $this->assertTrue(isset($elements[0]), t("'Cancel your vote' button appears."));
+    $this->assertTrue(isset($elements[0]),"'Cancel your vote' button appears.");
 
     // Edit the poll node and close the poll.
     $this->drupalLogout();
@@ -156,13 +156,13 @@
     // Verify 'Cancel your vote' button no longer appears.
     $this->drupalGet('node/' . $poll_nid);
     $elements = $this->xpath('//input[@value="Cancel your vote"]');
-    $this->assertTrue(empty($elements), t("'Cancel your vote' button no longer appears."));
+    $this->assertTrue(empty($elements),"'Cancel your vote' button no longer appears.");
   }
 }
 
 class PollVoteTestCase extends PollTestCase {
   public static function getInfo() {
-    return array('name' => t('Poll vote'), 'description' => 'Vote on a poll', 'group' => t('Poll'));
+    return array('name' => 'Poll vote', 'description' => 'Vote on a poll', 'group' => 'Poll');
   }
 
   function setUp() {
@@ -188,11 +188,11 @@
     $edit = array(
       'choice' => '1',
     );
-    $this->drupalPost('node/' . $poll_nid, $edit, t('Vote'));
+    $this->drupalPos'node/' . $poll_nid, $edit, t('Vote');
     $this->assertText('Your vote was recorded.', 'Your vote was recorded.');
     $this->assertText('Total votes: 1', 'Vote count updated correctly.');
     $elements = $this->xpath('//input[@value="Cancel your vote"]');
-    $this->assertTrue(isset($elements[0]), t("'Cancel your vote' button appears."));
+    $this->assertTrue(isset($elements[0]),"'Cancel your vote' button appears.");
 
     $this->drupalGet("node/$poll_nid/votes");
     $this->assertText(t('This table lists all the recorded votes for this poll. If anonymous users are allowed to vote, they will be identified by the IP address of the computer they used when they voted.'), 'Vote table text.');
@@ -228,16 +228,16 @@
     $this->assertText('Your vote was recorded.', 'Your vote was recorded.');
     $this->assertText('Total votes: 1', 'Vote count updated correctly.');
     $elements = $this->xpath('//input[@value="Cancel your vote"]');
-    $this->assertTrue(empty($elements), t("'Cancel your vote' button does not appear."));
+    $this->assertTrue(empty($elements),"'Cancel your vote' button does not appear.");
   }
 }
 
 class PollBlockTestCase extends PollTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Block availability'),
-      'description' => t('Check if the most recent poll block is available.'),
-      'group' => t('Poll'),
+      'name' => 'Block availability',
+      'description' => 'Check if the most recent poll block is available.',
+      'group' => 'Poll',
     );
   }
 
@@ -252,13 +252,13 @@
   function testRecentBlock() {
     // Set block title to confirm that the interface is available.
     $this->drupalPost('admin/build/block/configure/poll/recent', array('title' => $this->randomName(8)), t('Save block'));
-    $this->assertText(t('The block configuration has been saved.'), t('Block configuration set.'));
+    $this->assertText(t('The block configuration has been saved.'),'Block configuration set.');
 
     // Set the block to a region to confirm block is available.
     $edit = array();
     $edit['poll_recent[region]'] = 'footer';
     $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
-    $this->assertText(t('The block settings have been updated.'), t('Block successfully move to footer region.'));
+    $this->assertText(t('The block settings have been updated.'),'Block successfully move to footer region.');
 
     // Create a poll which should appear in recent polls block.
     $title = $this->randomName();
@@ -306,9 +306,9 @@
 
   public static function getInfo() {
     return array(
-      'name' => t('Poll add choice'),
-      'description' => t('Submits a POST request for an additional poll choice.'),
-      'group' => t('Poll')
+      'name' => 'Poll add choice',
+      'description' => 'Submits a POST request for an additional poll choice.',
+      'group' => 'Poll'
     );
   }
 
@@ -338,8 +338,8 @@
 
     // The response is drupal_json, so we need to undo some escaping.
     $response = json_decode(str_replace(array('\x3c', '\x3e', '\x26'), array("<", ">", "&"), $this->drupalGetContent()));
-    $this->assertTrue(is_object($response), t('The response is an object'));
-    $this->assertIdentical($response->status, TRUE, t('Response status is true'));
+    $this->assertTrue(is_object($response),'The response is an object');
+    $this->assertIdentical($response->status, TRUE,'Response status is true');
     // This response data is valid HTML so we will can reuse everything we have
     // for HTML pages.
     $this->content = $response->data;
Index: modules/profile/profile.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.test,v
retrieving revision 1.14
diff -u -r1.14 profile.test
--- modules/profile/profile.test	24 May 2009 17:39:33 -0000	1.14
+++ modules/profile/profile.test	9 Jul 2009 02:46:29 -0000
@@ -38,16 +38,16 @@
 
     $this->drupalPost('admin/user/profile/add/' . $type, $edit, t('Save field'));
     $fid = db_result(db_query("SELECT fid FROM {profile_field} WHERE title = '%s'", $title));
-    $this->assertTrue($fid, t('New Profile field has been entered in the database'));
+    $this->assertTrue($fid,'New Profile field has been entered in the database');
 
     // Check that the new field is appearing on the user edit form.
     $this->drupalGet('user/' . $this->admin_user->uid . '/edit/' . $category);
 
     // Checking field.
     if ($type == 'date') {
-      $this->assertField($form_name . '[month]', t('Found month selection field'));
-      $this->assertField($form_name . '[day]', t('Found day selection field'));
-      $this->assertField($form_name . '[year]', t('Found day selection field'));
+      $this->assertField($form_name . '[month]','Found month selection field');
+      $this->assertField($form_name . '[day]','Found day selection field');
+      $this->assertField($form_name . '[year]','Found day selection field');
     }
     else {
       $this->assertField($form_name , t('Found form named @name', array('@name' => $form_name)));
@@ -117,8 +117,8 @@
   public static function getInfo() {
     return array(
       'name' => 'Test single fields',
-      'description' => t('Testing profile module with add/edit/delete textfield, textarea, list, checkbox, and url fields into profile page') ,
-      'group' => t('Profile'));
+      'description' => 'Testing profile module with add/edit/delete textfield, textarea, list, checkbox, and url fields into profile page' ,
+      'group' => 'Profile');
   }
 
   /**
@@ -152,7 +152,7 @@
   public static function getInfo() {
     return array(
       'name' => 'Test select field',
-      'description' => t('Testing profile module with add/edit/delete a select field') ,
+      'description' => 'Testing profile module with add/edit/delete a select field' ,
       'group' => t('Profile'));
   }
 
@@ -177,8 +177,8 @@
   public static function getInfo() {
     return array(
       'name' => 'Test date field',
-      'description' => t('Testing profile module with add/edit/delete a date field') ,
-      'group' => t('Profile'));
+      'description' => 'Testing profile module with add/edit/delete a date field' ,
+      'group' => 'Profile');
   }
 
   /**
@@ -187,7 +187,7 @@
   function testProfileDateField() {
     $this->drupalLogin($this->admin_user);
 
-    variable_set('date_format_short', 'm/d/Y - H:i');
+    variable_se'date_format_short', 'm/d/Y - H:i';
     $field = $this->createProfileField('date');
 
     // Set date to January 09, 1983
@@ -203,7 +203,7 @@
     $this->drupalGet('user/' . $this->normal_user->uid);
     $this->assertText($field['title'], t('Found profile field with title %title', array('%title' => $field['title'])));
 
-    $this->assertText('01/09/1983', t('Found date profile field.'));
+    $this->assertText('01/09/1983','Found date profile field.');
 
     $this->deleteProfileField($field);
   }
@@ -213,8 +213,8 @@
   public static function getInfo() {
     return array(
       'name' => 'Test field weights',
-      'description' => t('Testing profile modules weigting of fields') ,
-      'group' => t('Profile'));
+      'description' => 'Testing profile modules weigting of fields' ,
+      'group' => 'Profile');
   }
 
   function testProfileFieldWeights() {
@@ -227,11 +227,11 @@
     $this->setProfileField($field1, $this->randomName(8));
     $this->setProfileField($field2, $this->randomName(8));
 
-    $profile_edit = $this->drupalGet('user/' . $this->normal_user->uid . '/edit/' . $category);
-    $this->assertTrue(strpos($profile_edit, $field1['title']) > strpos($profile_edit, $field2['title']), t('Profile field weights are respected on the user edit form.'));
+    $profile_edit = $this->drupalGe'user/' . $this->normal_user->uid . '/edit/' . $category);
+    $this->assertTrue(strpos($profile_edit, $field1['title']) > strpos($profile_edit, $field2['title']),'Profile field weights are respected on the user edit form.';
 
     $profile_page = $this->drupalGet('user/' . $this->normal_user->uid);
-    $this->assertTrue(strpos($profile_page, $field1['title']) > strpos($profile_page, $field2['title']), t('Profile field weights are respected on the user profile page.'));
+    $this->assertTrue(strpos($profile_page, $field1['title']) > strpos($profile_page, $field2['title']),'Profile field weights are respected on the user profile page.');
   }
 }
 
@@ -241,9 +241,9 @@
 class ProfileTestAutocomplete extends ProfileTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Autocompletion'),
-      'description' => t('Test profile fields with autocompletion.'),
-      'group' => t('Profile')
+      'name' => 'Autocompletion',
+      'description' => 'Test profile fields with autocompletion.',
+      'group' => 'Profile'
     );
   }
 
@@ -267,15 +267,15 @@
 
     // Check that autocompletion html is found on the user's profile edit page.
     $this->drupalGet('user/' . $this->admin_user->uid . '/edit/' . $category);
-    $this->assertRaw($autocomplete_html, t('Autocomplete found.'));
-    $this->assertRaw('misc/autocomplete.js', t('Autocomplete JavaScript found.'));
-    $this->assertRaw('class="form-text form-autocomplete"', t('Autocomplete form element class found.'));
+    $this->assertRaw($autocomplete_html,'Autocomplete found.');
+    $this->assertRaw('misc/autocomplete.js','Autocomplete JavaScript found.');
+    $this->assertRaw('class="form-text form-autocomplete"','Autocomplete form element class found.');
 
     // Check the autocompletion path using the first letter of our user's profile
     // field value to make sure access is allowed and a valid result if found.
     $this->drupalGet('profile/autocomplete/' . $field['fid'] . '/' . $field['value'][0]);
-    $this->assertResponse(200, t('Autocomplete path allowed to user with permission.'));
-    $this->assertRaw($field['value'], t('Autocomplete value found.'));
+    $this->assertResponse(200,'Autocomplete path allowed to user with permission.');
+    $this->assertRaw($field['value'],'Autocomplete value found.');
 
     // Logout and login with a user without the 'access user profiles' permission.
     $this->drupalLogout();
@@ -283,20 +283,20 @@
 
     // Check that autocompletion html is not found on the user's profile edit page.
     $this->drupalGet('user/' . $this->normal_user->uid . '/edit/' . $category);
-    $this->assertNoRaw($autocomplete_html, t('Autocomplete not found.'));
+    $this->assertNoRaw($autocomplete_html,'Autocomplete not found.');
 
     // User should be denied access to the profile autocomplete path.
     $this->drupalGet('profile/autocomplete/' . $field['fid'] . '/' . $field['value'][0]);
-    $this->assertResponse(403, t('Autocomplete path denied to user without permission.'));
+    $this->assertResponse(403,'Autocomplete path denied to user without permission.');
   }
 }
 
 class ProfileBlockTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
-      'name' => t('Block availability'),
-      'description' => t('Check if the author-information block is available.'),
-      'group' => t('Profile'),
+      'name' => 'Block availability',
+      'description' => 'Check if the author-information block is available.',
+      'group' => 'Profile',
     );
   }
 
@@ -311,13 +311,13 @@
   function testAuthorInformationBlock() {
     // Set block title to confirm that the interface is availble.
     $this->drupalPost('admin/build/block/configure/profile/author-information', array('title' => $this->randomName(8)), t('Save block'));
-    $this->assertText(t('The block configuration has been saved.'), t('Block configuration set.'));
+    $this->assertText(t('The block configuration has been saved.'),'Block configuration set.');
 
     // Set the block to a region to confirm block is availble.
     $edit = array();
     $edit['profile_author-information[region]'] = 'footer';
     $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
-    $this->assertText(t('The block settings have been updated.'), t('Block successfully move to footer region.'));
+    $this->assertText(t('The block settings have been updated.'),'Block successfully move to footer region.');
   }
 }