? .kdev4
? drupal-7.kdev4
? sites/default/files
? sites/default/settings.php
Index: modules/aggregator/aggregator.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.test,v
retrieving revision 1.42
diff -u -p -r1.42 aggregator.test
--- modules/aggregator/aggregator.test	4 Aug 2010 03:54:55 -0000	1.42
+++ modules/aggregator/aggregator.test	5 Aug 2010 00:22:22 -0000
@@ -26,7 +26,7 @@ class AggregatorTestCase extends DrupalW
   function createFeed($feed_url = NULL) {
     $edit = $this->getFeedEditArray($feed_url);
     $this->drupalPost('admin/config/services/aggregator/add/feed', $edit, t('Save'));
-    $this->assertRaw(t('The feed %name has been added.', array('%name' => $edit['title'])), t('The feed !name has been added.', array('!name' => $edit['title'])));
+    $this->assertRaw(t('The feed %name has been added.', array('%name' => $edit['title'])), 'The feed ' . $edit['title'] . ' has been added.');
 
     $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.'));
@@ -91,7 +91,7 @@ class AggregatorTestCase extends DrupalW
   function updateFeedItems(&$feed, $expected_count) {
     // First, let's ensure we can get to the rss xml.
     $this->drupalGet($feed->url);
-    $this->assertResponse(200, t('!url is reachable.', array('!url' => $feed->url)));
+    $this->assertResponse(200, $feed->url . ' is reachable.');
 
     // Refresh the feed (simulated link click).
     $this->drupalGet('admin/config/services/aggregator/update/' . $feed->fid);
@@ -104,7 +104,7 @@ class AggregatorTestCase extends DrupalW
       $feed->items[] = $item->iid;
     }
     $feed->item_count = count($feed->items);
-    $this->assertEqual($expected_count, $feed->item_count, t('Total items in feed equal to the total items in database (!val1 != !val2)', array('!val1' => $expected_count, '!val2' => $feed->item_count)));
+    $this->assertEqual($expected_count, $feed->item_count, 'Total items in feed equal to the total items in database (' . $expected_count . ' != ' . $feed->item_count . ')');
   }
 
   /**
@@ -327,11 +327,11 @@ class CategorizeFeedTestCase extends Agg
     // Create 2 categories.
     $category_1 = array('title' => $this->randomName(10), 'description' => '');
     $this->drupalPost('admin/config/services/aggregator/add/category', $category_1, t('Save'));
-    $this->assertRaw(t('The category %title has been added.', array('%title' => $category_1['title'])), t('The category %title has been added.', array('%title' => $category_1['title'])));
+    $this->assertRaw(t('The category %title has been added.', array('%title' => $category_1['title'])), 'The category ' . $category_1['title'] . ' has been added.');
 
     $category_2 = array('title' => $this->randomName(10), 'description' => '');
     $this->drupalPost('admin/config/services/aggregator/add/category', $category_2, t('Save'));
-    $this->assertRaw(t('The category %title has been added.', array('%title' => $category_2['title'])), t('The category %title has been added.', array('%title' => $category_2['title'])));
+    $this->assertRaw(t('The category %title has been added.', array('%title' => $category_2['title'])), 'The category ' . $category_2['title'] . ' has been added.');
 
     // Get categories from database.
     $categories = $this->getCategories();
@@ -377,7 +377,7 @@ class UpdateFeedTestCase extends Aggrega
         $edit[$same_field] = $feed->{$same_field};
       }
       $this->drupalPost('admin/config/services/aggregator/edit/feed/' . $feed->fid, $edit, t('Save'));
-      $this->assertRaw(t('The feed %name has been updated.', array('%name' => $edit['title'])), t('The feed %name has been updated.', array('%name' => $edit['title'])));
+      $this->assertRaw(t('The feed %name has been updated.', array('%name' => $edit['title'])), 'The feed ' . $edit['title'] . ' has been updated.');
 
       // Check feed data.
       $this->assertEqual($this->getUrl(), url('admin/config/services/aggregator/', array('absolute' => TRUE)));
@@ -455,10 +455,10 @@ class UpdateFeedItemTestCase extends Agg
     );
 
     $this->drupalGet($edit['url']);
-    $this->assertResponse(array(200), t('URL !url is accessible', array('!url' => $edit['url'])));
+    $this->assertResponse(array(200), 'URL ' . $edit['url'] . ' is accessible');
 
     $this->drupalPost('admin/config/services/aggregator/add/feed', $edit, t('Save'));
-    $this->assertRaw(t('The feed %name has been added.', array('%name' => $edit['title'])), t('The feed !name has been added.', array('!name' => $edit['title'])));
+    $this->assertRaw(t('The feed %name has been added.', array('%name' => $edit['title'])), 'The feed ' . $edit['title'] . ' has been added.');
 
     $feed = db_query("SELECT * FROM {aggregator_feed} WHERE url = :url", array(':url' => $edit['url']))->fetchObject();
     $this->drupalGet('admin/config/services/aggregator/update/' . $feed->fid);
@@ -480,7 +480,7 @@ class UpdateFeedItemTestCase extends Agg
 
     $after = db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchField();
 
-    $this->assertTrue($before === $after, t('Publish timestamp of feed item was not updated (!before === !after)', array('!before' => $before, '!after' => $after)));
+    $this->assertTrue($before === $after, 'Publish timestamp of feed item was not updated (' . $before . ' === ' . $after . ')');
   }
 }
 
@@ -541,7 +541,7 @@ class CategorizeFeedItemTestCase extends
     // Simulate form submission on "admin/config/services/aggregator/add/category".
     $edit = array('title' => $this->randomName(10), 'description' => '');
     $this->drupalPost('admin/config/services/aggregator/add/category', $edit, t('Save'));
-    $this->assertRaw(t('The category %title has been added.', array('%title' => $edit['title'])), t('The category %title has been added.', array('%title' => $edit['title'])));
+    $this->assertRaw(t('The category %title has been added.', array('%title' => $edit['title'])), 'The category ' . $edit['title'] . ' has been added.');
 
     $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.'));
@@ -793,7 +793,7 @@ class AggregatorRenderingTestCase extend
     $this->assertFieldByName($block['module'] . '_' . $block['delta'] . '[region]', '', 'Aggregator feed block is available for positioning.');
     // Position it.
     $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
-    $this->assertText(t('The block settings have been updated.'), t('Block successfully moved to %region_name region.', array( '%region_name' => $region)));
+    $this->assertText(t('The block settings have been updated.'), 'Block successfully moved to ' . $region . ' region.');
     // Confirm that the block is now being displayed on pages.
     $this->drupalGet('node');
     $this->assertText(t($block['title']), t('Feed block is displayed on the page.'));
@@ -801,7 +801,7 @@ class AggregatorRenderingTestCase extend
     // Find the expected read_more link.
     $href = 'aggregator/sources/' . $feed->fid;
     $links = $this->xpath('//a[@href = :href]', array(':href' => url($href)));
-    $this->assert(isset($links[0]), t('Link to href %href found.', array('%href' => $href)));
+    $this->assert(isset($links[0]), 'Link to href ' . $href . ' found.');
 
     // Visit that page.
     $this->drupalGet($href);
@@ -837,7 +837,7 @@ class FeedParserTestCase extends Aggrega
     $feed = $this->createFeed($this->getRSS091Sample());
     aggregator_refresh($feed);
     $this->drupalGet('aggregator/sources/' . $feed->fid);
-    $this->assertResponse(200, t('Feed %name exists.', array('%name' => $feed->title)));
+    $this->assertResponse(200, 'Feed ' . $feed->title . ' exists.');
     $this->assertText('First example feed item title');
     $this->assertLinkByHref('http://example.com/example-turns-one');
     $this->assertText('First example feed item description.');
@@ -850,7 +850,7 @@ class FeedParserTestCase extends Aggrega
     $feed = $this->createFeed($this->getAtomSample());
     aggregator_refresh($feed);
     $this->drupalGet('aggregator/sources/' . $feed->fid);
-    $this->assertResponse(200, t('Feed %name exists.', array('%name' => $feed->title)));
+    $this->assertResponse(200, 'Feed ' . $feed->title . ' exists.');
     $this->assertText('Atom-Powered Robots Run Amok');
     $this->assertLinkByHref('http://example.org/2003/12/13/atom03');
     $this->assertText('Some text.');
Index: modules/block/block.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.test,v
retrieving revision 1.54
diff -u -p -r1.54 block.test
--- modules/block/block.test	8 Jul 2010 03:41:27 -0000	1.54
+++ modules/block/block.test	5 Aug 2010 00:22:22 -0000
@@ -59,7 +59,7 @@ class BlockTestCase extends DrupalWebTes
       if ($theme->status) {
         foreach ($theme->info['regions_hidden'] as $hidden_region) {
           $elements = $this->xpath('//select[@id=:id]//option[@value=:value]', array(':id' => 'edit-regions-' . $key, ':value' => $hidden_region));
-          $this->assertFalse(isset($elements[0]), t('The hidden region @region is not available for @theme.', array('@region' => $hidden_region, '@theme' => $key)));
+          $this->assertFalse(isset($elements[0]), 'The hidden region ' . $hidden_region . ' is not available for ' . $key . '.');
         }
       }
     }
@@ -243,7 +243,7 @@ class BlockTestCase extends DrupalWebTes
     $this->drupalPost('admin/structure/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 moved to %region_name region.', array( '%region_name' => $region)));
+    $this->assertText(t('The block settings have been updated.'), 'Block successfully moved to ' . $region . ' region.');
 
     // Confirm that the block is being displayed.
     $this->drupalGet('node');
@@ -254,7 +254,7 @@ class BlockTestCase extends DrupalWebTes
       ':region-class' => 'region region-' . str_replace('_', '-', $region),
       ':block-id' => 'block-' . $block['module'] . '-' . $block['delta'],
     ));
-    $this->assertFieldByXPath($xpath, FALSE, t('Custom block found in %region_name region.', array('%region_name' => $region)));
+    $this->assertFieldByXPath($xpath, FALSE, 'Custom block found in ' . $region . ' region.');
   }
 
   /**
@@ -346,7 +346,7 @@ class NewDefaultThemeBlocks extends Drup
     $result = db_query('SELECT * FROM {block} WHERE theme = :theme', array(':theme' => 'stark'));
     foreach ($result as $block) {
       unset($block->theme, $block->bid);
-      $this->assertEqual($blocks[$block->module][$block->delta], $block, t('Block %name matched', array('%name' => $block->module . '-' . $block->delta)));
+      $this->assertEqual($blocks[$block->module][$block->delta], $block, 'Block ' . $block->module . '-' . $block->delta . ' matched');
     }
   }
 }
@@ -568,7 +568,7 @@ class BlockCacheTestCase extends DrupalW
 
     $current_mode = db_query("SELECT cache FROM {block} WHERE module = 'block_test'")->fetchField();
     if ($current_mode != $cache_mode) {
-      $this->fail(t('Unable to set cache mode to %mode. Current mode: %current_mode', array('%mode' => $cache_mode, '%current_mode' => $current_mode)));
+      $this->fail('Unable to set cache mode to ' . $cache_mode . '. Current mode: ' . $current_mode);
     }
   }
 }
Index: modules/book/book.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.test,v
retrieving revision 1.24
diff -u -p -r1.24 book.test
--- modules/book/book.test	22 Apr 2010 23:31:23 -0000	1.24
+++ modules/book/book.test	5 Aug 2010 00:22:22 -0000
@@ -5,10 +5,10 @@ class BookTestCase extends DrupalWebTest
   protected $book;
   // $book_author is a user with permission to author a book.
   protected $book_author;
-  // $web_user is a user with permission to view a book 
+  // $web_user is a user with permission to view a book
   // and access the printer-friendly version.
   protected $web_user;
-  
+
   public static function getInfo() {
     return array(
       'name' => 'Book functionality',
@@ -19,12 +19,12 @@ class BookTestCase extends DrupalWebTest
 
   function setUp() {
     parent::setUp('book');
-    
+
     // Create users.
     $this->book_author = $this->drupalCreateUser(array('create new books', 'create book content', 'edit own book content', 'add content to books'));
     $this->web_user = $this->drupalCreateUser(array('access printer-friendly version'));
   }
-  
+
   /**
    * Create a new book with a page hierarchy.
    */
@@ -52,7 +52,7 @@ class BookTestCase extends DrupalWebTest
     $nodes[] = $this->createBookNode($book->nid); // Node 4.
 
     $this->drupalLogout();
-    
+
     return $nodes;
   }
 
@@ -63,7 +63,7 @@ class BookTestCase extends DrupalWebTest
     // Create new book.
     $nodes = $this->createBook();
     $book = $this->book;
-    
+
     $this->drupalLogin($this->web_user);
 
     // Check that book pages display along with the correct outlines and
@@ -211,36 +211,36 @@ class BookTestCase extends DrupalWebTest
 
     return $node;
   }
-  
+
   /**
    * Tests book export ("printer-friendly version") functionality.
    */
   function testBookExport() {
     // Create a book.
     $nodes = $this->createBook();
-    
+
     // Login as web user and view printer-friendly version.
     $this->drupalLogin($this->web_user);
     $this->drupalGet('node/' . $this->book->nid);
     $this->clickLink(t('Printer-friendly version'));
-    
+
     // Make sure each part of the book is there.
     foreach ($nodes as $node) {
       $this->assertText($node->title, t('Node title found in printer friendly version.'));
       $this->assertRaw(check_markup($node->body[LANGUAGE_NONE][0]['value'], $node->body[LANGUAGE_NONE][0]['format']), t('Node body found in printer friendly version.'));
     }
-    
+
     // Make sure we can't export an unsupported format.
     $this->drupalGet('book/export/foobar/' . $this->book->nid);
-    $this->assertResponse('404', t('Unsupported export format returned "not found".'));    
-    
+    $this->assertResponse('404', t('Unsupported export format returned "not found".'));
+
     // Make sure an anonymous user cannot view printer-friendly version.
     $this->drupalLogout();
-    
+
     // Load the book and verify there is no printer-friendly version link.
     $this->drupalGet('node/' . $this->book->nid);
     $this->assertNoLink(t('Printer-friendly version'), t('Anonymous user is not shown link to printer-friendly version.'));
-    
+
     // Try getting the URL directly, and verify it fails.
     $this->drupalGet('book/export/html/' . $this->book->nid);
     $this->assertResponse('403', t('Anonymous user properly forbidden.'));
Index: modules/comment/comment.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v
retrieving revision 1.85
diff -u -p -r1.85 comment.test
--- modules/comment/comment.test	20 Jul 2010 02:05:13 -0000	1.85
+++ modules/comment/comment.test	5 Aug 2010 00:22:22 -0000
@@ -103,7 +103,7 @@ class CommentHelperCase extends DrupalWe
       $regex .= $comment->comment . '(.*?)'; // Match comment.
       $regex .= '/s';
 
-      return (boolean)preg_match($regex, $this->drupalGetContent());
+      return (boolean) preg_match($regex, $this->drupalGetContent());
     }
     else {
       return FALSE;
@@ -780,7 +780,7 @@ class CommentPagerTest extends CommentHe
       $result_order[] = substr($anchor['id'], 8);
     }
 
-    return $this->assertIdentical($expected_cids, $result_order, t('Comment order: expected @expected, returned @returned.', array('@expected' => implode(',', $expected_cids), '@returned' => implode(',', $result_order))));
+    return $this->assertIdentical($expected_cids, $result_order, 'Comment order: expected ' . implode(',', $expected_cids) . ', returned ' . implode(',', $result_order) . '.');
   }
 
   /**
@@ -840,7 +840,7 @@ class CommentPagerTest extends CommentHe
     foreach ($expected_pages as $new_replies => $expected_page) {
       $returned = comment_new_page_count($node->comment_count, $new_replies, $node);
       $returned_page = is_array($returned) ? $returned['page'] : 0;
-      $this->assertIdentical($expected_page, $returned_page, t('Flat mode, @new replies: expected page @expected, returned page @returned.', array('@new' => $new_replies, '@expected' => $expected_page, '@returned' => $returned_page)));
+      $this->assertIdentical($expected_page, $returned_page, 'Flat mode, ' . $new_replies . ' replies: expected page ' . $expected_page . ', returned page ' . $returned_page . '.');
     }
 
     $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, t('Switched to threaded mode.'));
@@ -858,7 +858,7 @@ class CommentPagerTest extends CommentHe
     foreach ($expected_pages as $new_replies => $expected_page) {
       $returned = comment_new_page_count($node->comment_count, $new_replies, $node);
       $returned_page = is_array($returned) ? $returned['page'] : 0;
-      $this->assertEqual($expected_page, $returned_page, t('Threaded mode, @new replies: expected page @expected, returned page @returned.', array('@new' => $new_replies, '@expected' => $expected_page, '@returned' => $returned_page)));
+      $this->assertEqual($expected_page, $returned_page, 'Threaded mode, ' . $new_replies . ' replies: expected page ' . $expected_page . ', returned page ' . $returned_page . '.');
     }
   }
 }
@@ -1214,7 +1214,7 @@ class CommentTokenReplaceTestCase extend
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('comment' => $comment), array('language' => $language));
-      $this->assertFalse(strcmp($output, $expected), t('Sanitized comment token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Sanitized comment token ' . $input . ' replaced.');
     }
 
     // Generate and test unsanitized tokens.
@@ -1230,7 +1230,7 @@ class CommentTokenReplaceTestCase extend
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('comment' => $comment), array('language' => $language, 'sanitize' => FALSE));
-      $this->assertFalse(strcmp($output, $expected), t('Unsanitized comment token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Unsanitized comment token ' . $input . ' replaced.');
     }
 
     // Load node so comment_count gets computed.
@@ -1243,7 +1243,7 @@ class CommentTokenReplaceTestCase extend
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('node' => $node), array('language' => $language));
-      $this->assertFalse(strcmp($output, $expected), t('Node comment token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Node comment token ' . $input . ' replaced.');
     }
   }
 }
Index: modules/contact/contact.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.test,v
retrieving revision 1.43
diff -u -p -r1.43 contact.test
--- modules/contact/contact.test	22 Mar 2010 17:52:58 -0000	1.43
+++ modules/contact/contact.test	5 Aug 2010 00:22:22 -0000
@@ -158,8 +158,8 @@ class ContactSitewideTestCase extends Dr
   }
 
   /**
-  * Test auto-reply on the site-wide contact form.
-  */
+   * Test auto-reply on the site-wide contact form.
+   */
   function testAutoReply() {
     // Create and login administrative user.
     $admin_user = $this->drupalCreateUser(array('access site-wide contact form', 'administer contact forms', 'administer permissions', 'administer users'));
@@ -388,7 +388,7 @@ class ContactPersonalTestCase extends Dr
     }
 
     // Submit contact form one over limit.
-    $this->drupalGet('user/' . $this->contact_user->uid. '/contact');
+    $this->drupalGet('user/' . $this->contact_user->uid . '/contact');
     $this->assertRaw(t('You cannot send more than %number messages in @interval. Try again later.', array('%number' => $flood_limit, '@interval' => format_interval(variable_get('contact_threshold_window', 3600)))), 'Normal user denied access to flooded contact form.');
 
     // Test that the admin user can still access the contact form even though
Index: modules/dblog/dblog.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.test,v
retrieving revision 1.36
diff -u -p -r1.36 dblog.test
--- modules/dblog/dblog.test	27 Mar 2010 14:24:14 -0000	1.36
+++ modules/dblog/dblog.test	5 Aug 2010 00:22:22 -0000
@@ -55,10 +55,10 @@ class DBLogTestCase extends DrupalWebTes
 
     // Check row limit variable.
     $current_limit = variable_get('dblog_row_limit', 1000);
-    $this->assertTrue($current_limit == $row_limit, t('[Cache] Row limit variable of @count equals row limit of @limit', array('@count' => $current_limit, '@limit' => $row_limit)));
+    $this->assertTrue($current_limit == $row_limit, '[Cache] Row limit variable of ' . $current_limit . ' equals row limit of ' . $row_limit);
     // Verify dblog row limit equals specified row limit.
     $current_limit = unserialize(db_query("SELECT value FROM {variable} WHERE name = :dblog_limit", array(':dblog_limit' => 'dblog_row_limit'))->fetchField());
-    $this->assertTrue($current_limit == $row_limit, t('[Variable table] Row limit variable of @count equals row limit of @limit', array('@count' => $current_limit, '@limit' => $row_limit)));
+    $this->assertTrue($current_limit == $row_limit, '[Variable table] Row limit variable of ' . $current_limit . ' equals row limit of ' . $row_limit);
   }
 
   /**
@@ -71,13 +71,13 @@ class DBLogTestCase extends DrupalWebTes
     $this->generateLogEntries($row_limit + 10);
     // Verify dblog row count exceeds row limit.
     $count = db_query('SELECT COUNT(wid) FROM {watchdog}')->fetchField();
-    $this->assertTrue($count > $row_limit, t('Dblog row count of @count exceeds row limit of @limit', array('@count' => $count, '@limit' => $row_limit)));
+    $this->assertTrue($count > $row_limit, 'Dblog row count of ' . $count . ' exceeds row limit of ' . $row_limit);
 
     // Run cron job.
     $this->cronRun();
     // 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)));
+    $this->assertTrue($count == $row_limit + 1, 'Dblog row count of ' . $count . ' equals row limit of ' . $row_limit . ' plus one');
   }
 
   /**
@@ -192,7 +192,7 @@ class DBLogTestCase extends DrupalWebTes
     $this->assertResponse(200);
     // Retrieve user object.
     $user = user_load_by_name($name);
-    $this->assertTrue($user != NULL, t('User @name was loaded', array('@name' => $name)));
+    $this->assertTrue($user != NULL, 'User ' . $name . ' was loaded');
     $user->pass_raw = $pass; // Needed by drupalLogin.
     // Login user.
     $this->drupalLogin($user);
@@ -204,7 +204,7 @@ class DBLogTestCase extends DrupalWebTes
       $ids[] = $row->wid;
     }
     $count_before = (isset($ids)) ? count($ids) : 0;
-    $this->assertTrue($count_before > 0, t('DBLog contains @count records for @name', array('@count' => $count_before, '@name' => $user->name)));
+    $this->assertTrue($count_before > 0, 'DBLog contains ' . $count_before . ' records for ' . $user->name);
 
     // Login the admin user.
     $this->drupalLogin($this->big_user);
@@ -275,7 +275,7 @@ class DBLogTestCase extends DrupalWebTes
     $this->assertResponse(200);
     // Retrieve node object.
     $node = $this->drupalGetNodeByTitle($title);
-    $this->assertTrue($node != NULL, t('Node @title was loaded', array('@title' => $title)));
+    $this->assertTrue($node != NULL, 'Node ' . $title . ' was loaded');
     // Edit node.
     $edit = $this->getContentUpdate($type);
     $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
@@ -332,14 +332,14 @@ class DBLogTestCase extends DrupalWebTes
           'choice[new:0][chtext]' => $this->randomName(32),
           'choice[new:1][chtext]' => $this->randomName(32),
         );
-      break;
+        break;
 
       default:
         $content = array(
           "title" => $this->randomName(8),
           "body[$langcode][0][value]" => $this->randomName(32),
         );
-      break;
+        break;
     }
     return $content;
   }
@@ -357,14 +357,14 @@ class DBLogTestCase extends DrupalWebTes
           'choice[chid:1][chtext]' => $this->randomName(32),
           'choice[chid:2][chtext]' => $this->randomName(32),
         );
-      break;
+        break;
 
       default:
         $langcode = LANGUAGE_NONE;
         $content = array(
           "body[$langcode][0][value]" => $this->randomName(32),
         );
-      break;
+        break;
     }
     return $content;
   }
@@ -391,14 +391,14 @@ class DBLogTestCase extends DrupalWebTes
     // Add a watchdog entry.
     dblog_watchdog($log);
     // Make sure the table count has actually incremented.
-    $this->assertEqual($count + 1, db_query('SELECT COUNT(*) FROM {watchdog}')->fetchField(), t('dblog_watchdog() added an entry to the dblog :count', array(':count' => $count)));
+    $this->assertEqual($count + 1, db_query('SELECT COUNT(*) FROM {watchdog}')->fetchField(), 'dblog_watchdog() added an entry to the dblog ' . $count);
     // Login the admin user.
     $this->drupalLogin($this->big_user);
     // Now post to clear the db table.
     $this->drupalPost('admin/reports/dblog', array(), t('Clear log messages'));
     // Count rows in watchdog that previously related to the deleted user.
     $count = db_query('SELECT COUNT(*) FROM {watchdog}')->fetchField();
-    $this->assertEqual($count, 0, t('DBLog contains :count records after a clear.', array(':count' => $count)));
+    $this->assertEqual($count, 0, 'DBLog contains ' . $count . ' records after a clear.');
   }
 
   /**
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.19
diff -u -p -r1.19 field_sql_storage.test
--- modules/field/modules/field_sql_storage/field_sql_storage.test	27 Mar 2010 05:52:49 -0000	1.19
+++ modules/field/modules/field_sql_storage/field_sql_storage.test	5 Aug 2010 00:22:23 -0000
@@ -41,7 +41,7 @@ class FieldSqlStorageTestCase extends Dr
     $t1 = _field_sql_storage_etid('t1');
     $t2 = _field_sql_storage_etid('t2');
 
-    $this->assertEqual($t1+1, $t2, 'Entity type ids are sequential');
+    $this->assertEqual($t1 + 1, $t2, 'Entity type ids are sequential');
     $this->assertIdentical(variable_get('field_sql_storage_t1_etid', NULL), $t1, 'First entity type variable is correct');
     $this->assertIdentical(variable_get('field_sql_storage_t2_etid', NULL), $t2, 'Second entity type variable is correct');
     $this->assertEqual(db_query("SELECT etid FROM {field_config_entity_type} WHERE type='t1'")->fetchField(), $t1, 'First entity type in database is correct');
@@ -388,8 +388,8 @@ class FieldSqlStorageTestCase extends Dr
     // are the same.
     foreach ((array) $this->field['columns'] as $column_name => $attributes) {
       $storage_column_name = _field_sql_storage_columnname($this->field['field_name'], $column_name);
-      $this->assertEqual($details[FIELD_LOAD_CURRENT][$current][$column_name], $storage_column_name, t('Column name %value matches the definition in %bin.', array('%value' => $column_name, '%bin' => $current)));
-      $this->assertEqual($details[FIELD_LOAD_REVISION][$revision][$column_name], $storage_column_name, t('Column name %value matches the definition in %bin.', array('%value' => $column_name, '%bin' => $revision)));
+      $this->assertEqual($details[FIELD_LOAD_CURRENT][$current][$column_name], $storage_column_name, 'Column name ' . $column_name . ' matches the definition in ' . $current . '.');
+      $this->assertEqual($details[FIELD_LOAD_REVISION][$revision][$column_name], $storage_column_name, 'Column name ' . $column_name . ' matches the definition in ' . $revision . '.');
     }
   }
 }
Index: modules/field/modules/list/tests/list.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/list/tests/list.test,v
retrieving revision 1.5
diff -u -p -r1.5 list.test
--- modules/field/modules/list/tests/list.test	27 Mar 2010 12:49:32 -0000	1.5
+++ modules/field/modules/list/tests/list.test	5 Aug 2010 00:22:23 -0000
@@ -98,8 +98,8 @@ class ListFieldTestCase extends FieldTes
 }
 
 /**
-* List module UI tests.
-*/
+ * List module UI tests.
+ */
 class ListFieldUITestCase extends FieldTestCase {
   public static function getInfo() {
     return array(
Index: modules/field/modules/options/options.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/options/options.test,v
retrieving revision 1.13
diff -u -p -r1.13 options.test
--- modules/field/modules/options/options.test	7 Apr 2010 17:30:43 -0000	1.13
+++ modules/field/modules/options/options.test	5 Aug 2010 00:22:23 -0000
@@ -77,7 +77,7 @@ class OptionsWidgetsTestCase extends Fie
     field_test_entity_save($entity);
 
     // With no field data, no buttons are checked.
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertNoFieldChecked("edit-card-1-$langcode-0");
     $this->assertNoFieldChecked("edit-card-1-$langcode-1");
     $this->assertNoFieldChecked("edit-card-1-$langcode-2");
@@ -89,7 +89,7 @@ class OptionsWidgetsTestCase extends Fie
     $this->assertFieldValues($entity_init, 'card_1', $langcode, array(0));
 
     // Check that the selected button is checked.
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertFieldChecked("edit-card-1-$langcode-0");
     $this->assertNoFieldChecked("edit-card-1-$langcode-1");
     $this->assertNoFieldChecked("edit-card-1-$langcode-2");
@@ -104,7 +104,7 @@ class OptionsWidgetsTestCase extends Fie
     field_update_field($this->card_1);
     $instance['required'] = TRUE;
     field_update_instance($instance);
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertFieldChecked("edit-card-1-$langcode-99");
   }
 
@@ -134,7 +134,7 @@ class OptionsWidgetsTestCase extends Fie
     field_test_entity_save($entity);
 
     // Display form: with no field data, nothing is checked.
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertNoFieldChecked("edit-card-2-$langcode-0");
     $this->assertNoFieldChecked("edit-card-2-$langcode-1");
     $this->assertNoFieldChecked("edit-card-2-$langcode-2");
@@ -150,7 +150,7 @@ class OptionsWidgetsTestCase extends Fie
     $this->assertFieldValues($entity_init, 'card_2', $langcode, array(0, 2));
 
     // Display form: check that the right options are selected.
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertFieldChecked("edit-card-2-$langcode-0");
     $this->assertNoFieldChecked("edit-card-2-$langcode-1");
     $this->assertFieldChecked("edit-card-2-$langcode-2");
@@ -165,7 +165,7 @@ class OptionsWidgetsTestCase extends Fie
     $this->assertFieldValues($entity_init, 'card_2', $langcode, array(0));
 
     // Display form: check that the right options are selected.
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertFieldChecked("edit-card-2-$langcode-0");
     $this->assertNoFieldChecked("edit-card-2-$langcode-1");
     $this->assertNoFieldChecked("edit-card-2-$langcode-2");
@@ -194,7 +194,7 @@ class OptionsWidgetsTestCase extends Fie
     field_update_field($this->card_2);
     $instance['required'] = TRUE;
     field_update_instance($instance);
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertFieldChecked("edit-card-2-$langcode-99");
   }
 
@@ -221,7 +221,7 @@ class OptionsWidgetsTestCase extends Fie
     field_test_entity_save($entity);
 
     // Display form: with no field data, nothing is selected.
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertNoOptionSelected("edit-card-1-$langcode", 0);
     $this->assertNoOptionSelected("edit-card-1-$langcode", 1);
     $this->assertNoOptionSelected("edit-card-1-$langcode", 2);
@@ -233,20 +233,20 @@ class OptionsWidgetsTestCase extends Fie
     $this->assertFieldValues($entity_init, 'card_1', $langcode, array(0));
 
     // Display form: check that the right options are selected.
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertOptionSelected("edit-card-1-$langcode", 0);
     $this->assertNoOptionSelected("edit-card-1-$langcode", 1);
     $this->assertNoOptionSelected("edit-card-1-$langcode", 2);
 
     // Submit form: Unselect the option.
     $edit = array("card_1[$langcode]" => '_none');
-    $this->drupalPost('test-entity/' . $entity->ftid .'/edit', $edit, t('Save'));
+    $this->drupalPost('test-entity/' . $entity->ftid . '/edit', $edit, t('Save'));
     $this->assertFieldValues($entity_init, 'card_1', $langcode, array());
 
     // A required select list does not have an empty key.
     $instance['required'] = TRUE;
     field_update_instance($instance);
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertFalse($this->xpath('//select[@id=:id]//option[@value=""]', array(':id' => 'edit-card-1-' . $langcode)), t('A required select list does not have an empty key.'));
 
     // We do not have to test that a required select list with one option is
@@ -261,7 +261,7 @@ class OptionsWidgetsTestCase extends Fie
     field_update_instance($instance);
 
     // Display form: with no field data, nothing is selected
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertNoOptionSelected("edit-card-1-$langcode", 0);
     $this->assertNoOptionSelected("edit-card-1-$langcode", 1);
     $this->assertNoOptionSelected("edit-card-1-$langcode", 2);
@@ -274,14 +274,14 @@ class OptionsWidgetsTestCase extends Fie
     $this->assertFieldValues($entity_init, 'card_1', $langcode, array(0));
 
     // Display form: check that the right options are selected.
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertOptionSelected("edit-card-1-$langcode", 0);
     $this->assertNoOptionSelected("edit-card-1-$langcode", 1);
     $this->assertNoOptionSelected("edit-card-1-$langcode", 2);
 
     // Submit form: Unselect the option.
     $edit = array("card_1[$langcode]" => '_none');
-    $this->drupalPost('test-entity/' . $entity->ftid .'/edit', $edit, t('Save'));
+    $this->drupalPost('test-entity/' . $entity->ftid . '/edit', $edit, t('Save'));
     $this->assertFieldValues($entity_init, 'card_1', $langcode, array());
   }
 
@@ -308,7 +308,7 @@ class OptionsWidgetsTestCase extends Fie
     field_test_entity_save($entity);
 
     // Display form: with no field data, nothing is selected.
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertNoOptionSelected("edit-card-2-$langcode", 0);
     $this->assertNoOptionSelected("edit-card-2-$langcode", 1);
     $this->assertNoOptionSelected("edit-card-2-$langcode", 2);
@@ -320,7 +320,7 @@ class OptionsWidgetsTestCase extends Fie
     $this->assertFieldValues($entity_init, 'card_2', $langcode, array(0, 2));
 
     // Display form: check that the right options are selected.
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertOptionSelected("edit-card-2-$langcode", 0);
     $this->assertNoOptionSelected("edit-card-2-$langcode", 1);
     $this->assertOptionSelected("edit-card-2-$langcode", 2);
@@ -331,7 +331,7 @@ class OptionsWidgetsTestCase extends Fie
     $this->assertFieldValues($entity_init, 'card_2', $langcode, array(0));
 
     // Display form: check that the right options are selected.
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertOptionSelected("edit-card-2-$langcode", 0);
     $this->assertNoOptionSelected("edit-card-2-$langcode", 1);
     $this->assertNoOptionSelected("edit-card-2-$langcode", 2);
@@ -351,18 +351,18 @@ class OptionsWidgetsTestCase extends Fie
     // Check that the 'none' option has no efect if actual options are selected
     // as well.
     $edit = array("card_2[$langcode][]" => array('_none' => '_none', 0 => 0));
-    $this->drupalPost('test-entity/' . $entity->ftid .'/edit', $edit, t('Save'));
+    $this->drupalPost('test-entity/' . $entity->ftid . '/edit', $edit, t('Save'));
     $this->assertFieldValues($entity_init, 'card_2', $langcode, array(0));
 
     // Check that selecting the 'none' option empties the field.
     $edit = array("card_2[$langcode][]" => array('_none' => '_none'));
-    $this->drupalPost('test-entity/' . $entity->ftid .'/edit', $edit, t('Save'));
+    $this->drupalPost('test-entity/' . $entity->ftid . '/edit', $edit, t('Save'));
     $this->assertFieldValues($entity_init, 'card_2', $langcode, array());
 
     // A required select list does not have an empty key.
     $instance['required'] = TRUE;
     field_update_instance($instance);
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertFalse($this->xpath('//select[@id=:id]//option[@value=""]', array(':id' => 'edit-card-2-' . $langcode)), t('A required select list does not have an empty key.'));
 
     // We do not have to test that a required select list with one option is
@@ -378,7 +378,7 @@ class OptionsWidgetsTestCase extends Fie
     field_update_instance($instance);
 
     // Display form: with no field data, nothing is selected.
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertNoOptionSelected("edit-card-2-$langcode", 0);
     $this->assertNoOptionSelected("edit-card-2-$langcode", 1);
     $this->assertNoOptionSelected("edit-card-2-$langcode", 2);
@@ -391,14 +391,14 @@ class OptionsWidgetsTestCase extends Fie
     $this->assertFieldValues($entity_init, 'card_2', $langcode, array(0));
 
     // Display form: check that the right options are selected.
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertOptionSelected("edit-card-2-$langcode", 0);
     $this->assertNoOptionSelected("edit-card-2-$langcode", 1);
     $this->assertNoOptionSelected("edit-card-2-$langcode", 2);
 
     // Submit form: Unselect the option.
     $edit = array("card_2[$langcode][]" => array('_none' => '_none'));
-    $this->drupalPost('test-entity/' . $entity->ftid .'/edit', $edit, t('Save'));
+    $this->drupalPost('test-entity/' . $entity->ftid . '/edit', $edit, t('Save'));
     $this->assertFieldValues($entity_init, 'card_2', $langcode, array());
   }
 
@@ -425,7 +425,7 @@ class OptionsWidgetsTestCase extends Fie
     field_test_entity_save($entity);
 
     // Display form: with no field data, option is unchecked.
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertNoFieldChecked("edit-bool-$langcode");
     $this->assertRaw('Some dangerous &amp; unescaped <strong>markup</strong>', t('Option text was properly filtered.'));
 
@@ -435,7 +435,7 @@ class OptionsWidgetsTestCase extends Fie
     $this->assertFieldValues($entity_init, 'bool', $langcode, array(0));
 
     // Display form: check that the right options are selected.
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertFieldChecked("edit-bool-$langcode");
 
     // Submit form: uncheck the option.
@@ -444,7 +444,7 @@ class OptionsWidgetsTestCase extends Fie
     $this->assertFieldValues($entity_init, 'bool', $langcode, array(1));
 
     // Display form: with 'off' value, option is unchecked.
-    $this->drupalGet('test-entity/' . $entity->ftid .'/edit');
+    $this->drupalGet('test-entity/' . $entity->ftid . '/edit');
     $this->assertNoFieldChecked("edit-bool-$langcode");
   }
 }
Index: modules/field/modules/text/text.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/text/text.test,v
retrieving revision 1.24
diff -u -p -r1.24 text.test
--- modules/field/modules/text/text.test	28 Jun 2010 20:58:42 -0000	1.24
+++ modules/field/modules/text/text.test	5 Aug 2010 00:22:23 -0000
@@ -359,9 +359,9 @@ class TextSummaryTestCase extends Drupal
 
     // Test text_summary() for different sizes.
     for ($i = 0; $i <= 37; $i++) {
-      $this->callTextSummary($text, $expected[$i],    NULL, $i);
-      $this->callTextSummary($text, $expected_lb[$i], 1,    $i);
-      $this->callTextSummary($text, $expected_lb[$i], 2,    $i);
+      $this->callTextSummary($text, $expected[$i],     NULL, $i);
+      $this->callTextSummary($text, $expected_lb[$i], 1,     $i);
+      $this->callTextSummary($text, $expected_lb[$i], 2,     $i);
     }
   }
 
@@ -370,7 +370,7 @@ class TextSummaryTestCase extends Drupal
    */
   function callTextSummary($text, $expected, $format = NULL, $size = NULL) {
     $summary = text_summary($text, $format, $size);
-    $this->assertIdentical($summary, $expected, t('Generated summary "@summary" matches expected "@expected".', array('@summary' => $summary, '@expected' => $expected)));
+    $this->assertIdentical($summary, $expected, 'Generated summary "' . $summary . '" matches expected "' . $expected . '".');
   }
 }
 
@@ -434,7 +434,7 @@ class TextTranslationTestCase extends Dr
         "body[$langcode][$delta][format]" => $format--,
       );
       $this->drupalPost('node/1/edit', $edit, t('Save'));
-      $this->assertText($body[$delta], t('The body field with delta @delta has been saved.', array('@delta' => $delta)));
+      $this->assertText($body[$delta], 'The body field with delta ' . $delta . ' has been saved.');
     }
 
     // Login as translator.
@@ -444,7 +444,7 @@ class TextTranslationTestCase extends Dr
     // Translate the article in french.
     $this->drupalGet('node/1/translate');
     $this->clickLink(t('add translation'));
-    $this->assertNoText($body[0], t('The body field with delta @delta is hidden.', array('@delta' => 0)));
-    $this->assertText($body[1], t('The body field with delta @delta is shown.', array('@delta' => 1)));
+    $this->assertNoText($body[0], 'The body field with delta ' . 0 . ' is hidden.');
+    $this->assertText($body[1], 'The body field with delta ' . 1 . ' is shown.');
   }
 }
Index: modules/field/tests/field.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/tests/field.test,v
retrieving revision 1.34
diff -u -p -r1.34 field.test
--- modules/field/tests/field.test	2 Aug 2010 05:40:17 -0000	1.34
+++ modules/field/tests/field.test	5 Aug 2010 00:22:23 -0000
@@ -67,7 +67,7 @@ class FieldTestCase extends DrupalWebTes
     $values = isset($e->{$field_name}[$langcode]) ? $e->{$field_name}[$langcode] : array();
     $this->assertEqual(count($values), count($expected_values), t('Expected number of values were saved.'));
     foreach ($expected_values as $key => $value) {
-      $this->assertEqual($values[$key][$column], $value, t('Value @value was saved correctly.', array('@value' => $value)));
+      $this->assertEqual($values[$key][$column], $value, 'Value ' . $value . ' was saved correctly.');
     }
   }
 }
@@ -169,9 +169,9 @@ class FieldAttachStorageTestCase extends
     $this->assertEqual(count($entity->{$this->field_name}[$langcode]), $this->field['cardinality'], t('Current 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}[$langcode][$delta]['value'] , $values[$current_revision][$delta]['value'], t('Current revision: expected value %delta was found.', array('%delta' => $delta)));
+      $this->assertEqual($entity->{$this->field_name}[$langcode][$delta]['value'], $values[$current_revision][$delta]['value'], 'Current revision: expected value ' . $delta . ' was found.');
       // The value added in hook_field_load() is found.
-      $this->assertEqual($entity->{$this->field_name}[$langcode][$delta]['additional_key'], 'additional_value', t('Current revision: extra information for value %delta was found', array('%delta' => $delta)));
+      $this->assertEqual($entity->{$this->field_name}[$langcode][$delta]['additional_key'], 'additional_value', 'Current revision: extra information for value ' . $delta . ' was found');
     }
 
     // Confirm each revision loads the correct data.
@@ -179,12 +179,12 @@ class FieldAttachStorageTestCase extends
       $entity = field_test_create_stub_entity(0, $revision_id, $this->instance['bundle']);
       field_attach_load_revision($entity_type, array(0 => $entity));
       // Number of values per field loaded equals the field cardinality.
-      $this->assertEqual(count($entity->{$this->field_name}[$langcode]), $this->field['cardinality'], t('Revision %revision_id: expected number of values.', array('%revision_id' => $revision_id)));
+      $this->assertEqual(count($entity->{$this->field_name}[$langcode]), $this->field['cardinality'], 'Revision ' . $revision_id . ': 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}[$langcode][$delta]['value'], $values[$revision_id][$delta]['value'], t('Revision %revision_id: expected value %delta was found.', array('%revision_id' => $revision_id, '%delta' => $delta)));
+        $this->assertEqual($entity->{$this->field_name}[$langcode][$delta]['value'], $values[$revision_id][$delta]['value'], 'Revision ' . $revision_id . ': expected value ' . $delta . ' was found.');
         // The value added in hook_field_load() is found.
-        $this->assertEqual($entity->{$this->field_name}[$langcode][$delta]['additional_key'], 'additional_value', t('Revision %revision_id: extra information for value %delta was found', array('%revision_id' => $revision_id, '%delta' => $delta)));
+        $this->assertEqual($entity->{$this->field_name}[$langcode][$delta]['additional_key'], 'additional_value', 'Revision ' . $revision_id . ': extra information for value ' . $delta . ' was found');
       }
     }
   }
@@ -250,19 +250,19 @@ class FieldAttachStorageTestCase extends
       $instances = field_info_instances($entity_type, $bundles[$index]);
       foreach ($instances as $field_name => $instance) {
         // The field value loaded matches the one inserted.
-        $this->assertEqual($entity->{$field_name}[$langcode][0]['value'], $values[$index][$field_name], t('Entity %index: expected value was found.', array('%index' => $index)));
+        $this->assertEqual($entity->{$field_name}[$langcode][0]['value'], $values[$index][$field_name], 'Entity ' . $index . ': expected value was found.');
         // The value added in hook_field_load() is found.
-        $this->assertEqual($entity->{$field_name}[$langcode][0]['additional_key'], 'additional_value', t('Entity %index: extra information was found', array('%index' => $index)));
+        $this->assertEqual($entity->{$field_name}[$langcode][0]['additional_key'], 'additional_value', 'Entity ' . $index . ': extra information was found');
       }
     }
 
     // Check that the single-field load option works.
     $entity = field_test_create_stub_entity(1, 1, $bundles[1]);
     field_attach_load($entity_type, array(1 => $entity), FIELD_LOAD_CURRENT, array('field_id' => $field_ids[1]));
-    $this->assertEqual($entity->{$field_names[1]}[$langcode][0]['value'], $values[1][$field_names[1]], t('Entity %index: expected value was found.', array('%index' => 1)));
-    $this->assertEqual($entity->{$field_names[1]}[$langcode][0]['additional_key'], 'additional_value', t('Entity %index: extra information was found', array('%index' => 1)));
-    $this->assert(!isset($entity->{$field_names[2]}), t('Entity %index: field %field_name is not loaded.', array('%index' => 2, '%field_name' => $field_names[2])));
-    $this->assert(!isset($entity->{$field_names[3]}), t('Entity %index: field %field_name is not loaded.', array('%index' => 3, '%field_name' => $field_names[3])));
+    $this->assertEqual($entity->{$field_names[1]}[$langcode][0]['value'], $values[1][$field_names[1]], 'Entity ' . 1 . ': expected value was found.');
+    $this->assertEqual($entity->{$field_names[1]}[$langcode][0]['additional_key'], 'additional_value', 'Entity ' . 1 . ': extra information was found');
+    $this->assert(!isset($entity->{$field_names[2]}), 'Entity ' . 2 . ': field ' . $field_names[2] . ' is not loaded.');
+    $this->assert(!isset($entity->{$field_names[3]}), 'Entity ' . 3 . ': field ' . $field_names[3] . ' is not loaded.');
   }
 
   /**
@@ -312,7 +312,7 @@ class FieldAttachStorageTestCase extends
     $entity = clone($entity_init);
     field_attach_load($entity_type, array($entity->ftid => $entity));
     foreach ($fields as $field) {
-      $this->assertEqual($values[$field['field_name']], $entity->{$field['field_name']}[$langcode], t('%storage storage: expected values were found.', array('%storage' => $field['storage']['type'])));
+      $this->assertEqual($values[$field['field_name']], $entity->{$field['field_name']}[$langcode], $field['storage']['type'] . ' storage: expected values were found.');
     }
   }
 
@@ -353,8 +353,8 @@ class FieldAttachStorageTestCase extends
     // Test current and revision storage details together because the columns
     // are the same.
     foreach ((array) $field['columns'] as $column_name => $attributes) {
-      $this->assertEqual($details[FIELD_LOAD_CURRENT]['moon'][$column_name], $column_name, t('Column name %value matches the definition in %bin.', array('%value' => $column_name, '%bin' => 'moon[FIELD_LOAD_CURRENT]')));
-      $this->assertEqual($details[FIELD_LOAD_REVISION]['mars'][$column_name], $column_name, t('Column name %value matches the definition in %bin.', array('%value' => $column_name, '%bin' => 'mars[FIELD_LOAD_REVISION]')));
+      $this->assertEqual($details[FIELD_LOAD_CURRENT]['moon'][$column_name], $column_name, 'Column name ' . $column_name . ' matches the definition in ' . 'moon[FIELD_LOAD_CURRENT]' . '.');
+      $this->assertEqual($details[FIELD_LOAD_REVISION]['mars'][$column_name], $column_name, 'Column name ' . $column_name . ' matches the definition in ' . 'mars[FIELD_LOAD_REVISION]' . '.');
     }
   }
 
@@ -759,7 +759,7 @@ class FieldAttachOtherTestCase extends F
         break;
       }
     }
-    $this->assertTrue($result, t('Variable $@field_name correctly populated.', array('@field_name' => $this->field_name)));
+    $this->assertTrue($result, 'Variable $' . $this->field_name . ' correctly populated.');
   }
 
   /**
@@ -998,7 +998,7 @@ class FieldInfoTestCase extends FieldTes
       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]['module'], 'field_test',  t("Field type field_test module appears"));
+      $this->assertEqual($info[$t_key]['module'], 'field_test',   t("Field type field_test module appears"));
     }
 
     $info = field_info_formatter_types();
@@ -1006,7 +1006,7 @@ class FieldInfoTestCase extends FieldTes
       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]['module'], 'field_test',  t("Formatter type field_test module appears"));
+      $this->assertEqual($info[$f_key]['module'], 'field_test',   t("Formatter type field_test module appears"));
     }
 
     $info = field_info_widget_types();
@@ -1014,7 +1014,7 @@ class FieldInfoTestCase extends FieldTes
       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]['module'], 'field_test',  t("Widget type field_test module appears"));
+      $this->assertEqual($info[$w_key]['module'], 'field_test',   t("Widget type field_test module appears"));
     }
 
     $info = field_info_storage_types();
@@ -1022,7 +1022,7 @@ class FieldInfoTestCase extends FieldTes
       foreach ($storage as $key => $val) {
         $this->assertEqual($info[$s_key][$key], $val, t("Storage type $s_key key $key is $val"));
       }
-      $this->assertEqual($info[$s_key]['module'], 'field_test',  t("Storage type field_test module appears"));
+      $this->assertEqual($info[$s_key]['module'], 'field_test',   t("Storage type field_test module appears"));
     }
 
     // Verify that no unexpected instances exist.
@@ -1138,18 +1138,18 @@ class FieldInfoTestCase extends FieldTes
 
     // Check that all expected instance settings are in place.
     $field_type = field_info_field_types($field_definition['type']);
-    $this->assertIdentical($instance['settings'], $field_type['instance_settings'] , t('All expected instance settings are present.'));
+    $this->assertIdentical($instance['settings'], $field_type['instance_settings'], t('All expected instance settings are present.'));
 
     // Check that the default widget is used and expected settings are in place.
     $this->assertIdentical($instance['widget']['type'], $field_type['default_widget'], t('Unavailable widget replaced with default widget.'));
     $widget_type = field_info_widget_types($instance['widget']['type']);
-    $this->assertIdentical($instance['widget']['settings'], $widget_type['settings'] , t('All expected widget settings are present.'));
+    $this->assertIdentical($instance['widget']['settings'], $widget_type['settings'], t('All expected widget settings are present.'));
 
     // Check that display settings are set for the 'default' mode.
     $display = $instance['display']['default'];
     $this->assertIdentical($display['type'], $field_type['default_formatter'], t("Formatter is set for the 'default' view mode"));
     $formatter_type = field_info_formatter_types($display['type']);
-    $this->assertIdentical($display['settings'], $formatter_type['settings'] , t("Formatter settings are set for the 'default' view mode"));
+    $this->assertIdentical($display['settings'], $formatter_type['settings'], t("Formatter settings are set for the 'default' view mode"));
   }
 
   /**
@@ -1319,13 +1319,13 @@ class FieldFormTestCase extends FieldTes
     $this->assertRaw(t('!name field is required.', array('!name' => $this->instance['label'])), 'Required field with no value fails validation');
   }
 
-//  function testFieldFormMultiple() {
-//    $this->field = $this->field_multiple;
-//    $this->field_name = $this->field['field_name'];
-//    $this->instance['field_name'] = $this->field_name;
-//    field_create_field($this->field);
-//    field_create_instance($this->instance);
-//  }
+  //  function testFieldFormMultiple() {
+  //    $this->field = $this->field_multiple;
+  //    $this->field_name = $this->field['field_name'];
+  //    $this->instance['field_name'] = $this->field_name;
+  //    field_create_field($this->field);
+  //    field_create_instance($this->instance);
+  //  }
 
   function testFieldFormUnlimited() {
     $this->field = $this->field_unlimited;
@@ -1616,8 +1616,8 @@ class FieldDisplayAPITestCase extends Fi
     $settings = field_info_formatter_settings('field_test_default');
     $setting = $settings['test_formatter_setting'];
     $this->assertText($this->label, t('Label was displayed.'));
-    foreach($this->values as $delta => $value) {
-      $this->assertText($setting . '|' . $value['value'], t('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+    foreach ($this->values as $delta => $value) {
+      $this->assertText($setting . '|' . $value['value'], 'Value ' . $delta . ' was displayed with expected setting.');
     }
 
     // Check that explicit display settings are used.
@@ -1633,7 +1633,7 @@ class FieldDisplayAPITestCase extends Fi
     $setting = $display['settings']['test_formatter_setting_multiple'];
     $this->assertNoText($this->label, t('Label was not displayed.'));
     $array = array();
-    foreach($this->values as $delta => $value) {
+    foreach ($this->values as $delta => $value) {
       $array[] = $delta . ':' . $value['value'];
     }
     $this->assertText($setting . '|' . implode('|', $array), t('Values were displayed with expected setting.'));
@@ -1652,7 +1652,7 @@ class FieldDisplayAPITestCase extends Fi
     $setting = $display['settings']['test_formatter_setting_additional'];
     $this->assertNoText($this->label, t('Label was not displayed.'));
     foreach ($this->values as $delta => $value) {
-      $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), t('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+      $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), 'Value ' . $delta . ' was displayed with expected setting.');
     }
 
     // View mode: check that display settings specified in the instance are
@@ -1661,8 +1661,8 @@ class FieldDisplayAPITestCase extends Fi
     $this->drupalSetContent(drupal_render($output));
     $setting = $this->instance['display']['teaser']['settings']['test_formatter_setting'];
     $this->assertText($this->label, t('Label was displayed.'));
-    foreach($this->values as $delta => $value) {
-      $this->assertText($setting . '|' . $value['value'], t('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+    foreach ($this->values as $delta => $value) {
+      $this->assertText($setting . '|' . $value['value'], 'Value ' . $delta . ' was displayed with expected setting.');
     }
 
     // Unknown view mode: check that display settings for 'default' view mode
@@ -1671,8 +1671,8 @@ class FieldDisplayAPITestCase extends Fi
     $this->drupalSetContent(drupal_render($output));
     $setting = $this->instance['display']['default']['settings']['test_formatter_setting'];
     $this->assertText($this->label, t('Label was displayed.'));
-    foreach($this->values as $delta => $value) {
-      $this->assertText($setting . '|' . $value['value'], t('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+    foreach ($this->values as $delta => $value) {
+      $this->assertText($setting . '|' . $value['value'], 'Value ' . $delta . ' was displayed with expected setting.');
     }
   }
 
@@ -1687,7 +1687,7 @@ class FieldDisplayAPITestCase extends Fi
       $item = $this->entity->{$this->field_name}[LANGUAGE_NONE][$delta];
       $output = field_view_value('test_entity', $this->entity, $this->field_name, $item);
       $this->drupalSetContent(drupal_render($output));
-      $this->assertText($setting . '|' . $value['value'], t('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+      $this->assertText($setting . '|' . $value['value'], 'Value ' . $delta . ' was displayed with expected setting.');
     }
 
     // Check that explicit display settings are used.
@@ -1703,7 +1703,7 @@ class FieldDisplayAPITestCase extends Fi
       $item = $this->entity->{$this->field_name}[LANGUAGE_NONE][$delta];
       $output = field_view_value('test_entity', $this->entity, $this->field_name, $item, $display);
       $this->drupalSetContent(drupal_render($output));
-      $this->assertText($setting . '|0:' .  $value['value'], t('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+      $this->assertText($setting . '|0:' .  $value['value'], 'Value ' . $delta . ' was displayed with expected setting.');
     }
 
     // Check that prepare_view steps are invoked.
@@ -1719,7 +1719,7 @@ class FieldDisplayAPITestCase extends Fi
       $item = $this->entity->{$this->field_name}[LANGUAGE_NONE][$delta];
       $output = field_view_value('test_entity', $this->entity, $this->field_name, $item, $display);
       $this->drupalSetContent(drupal_render($output));
-      $this->assertText($setting . '|' .  $value['value'] . '|' . ($value['value'] + 1), t('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+      $this->assertText($setting . '|' .  $value['value'] . '|' . ($value['value'] + 1), 'Value ' . $delta . ' was displayed with expected setting.');
     }
 
     // View mode: check that display settings specified in the instance are
@@ -1729,7 +1729,7 @@ class FieldDisplayAPITestCase extends Fi
       $item = $this->entity->{$this->field_name}[LANGUAGE_NONE][$delta];
       $output = field_view_value('test_entity', $this->entity, $this->field_name, $item, 'teaser');
       $this->drupalSetContent(drupal_render($output));
-      $this->assertText($setting . '|' . $value['value'], t('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+      $this->assertText($setting . '|' . $value['value'], 'Value ' . $delta . ' was displayed with expected setting.');
     }
 
     // Unknown view mode: check that display settings for 'default' view mode
@@ -1739,7 +1739,7 @@ class FieldDisplayAPITestCase extends Fi
       $item = $this->entity->{$this->field_name}[LANGUAGE_NONE][$delta];
       $output = field_view_value('test_entity', $this->entity, $this->field_name, $item, 'unknown_view_mode');
       $this->drupalSetContent(drupal_render($output));
-      $this->assertText($setting . '|' . $value['value'], t('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+      $this->assertText($setting . '|' . $value['value'], 'Value ' . $delta . ' was displayed with expected setting.');
     }
   }
 }
@@ -2192,7 +2192,7 @@ class FieldCrudTestCase extends FieldTes
     // while some modules remain disabled.
     while ($modules) {
       $field = field_read_field($field_name);
-      $this->assertTrue(empty($field), t('%modules disabled. The field is marked inactive.', array('%modules' => implode(', ', $modules))));
+      $this->assertTrue(empty($field), implode(', ', $modules) . ' disabled. The field is marked inactive.');
 
       $module = array_shift($modules);
       module_enable(array($module), FALSE);
@@ -2261,8 +2261,8 @@ class FieldInstanceCrudTestCase extends 
     $this->assertIdentical($record['data']['display']['default']['type'], $field_type['default_formatter'], t('Default formatter for "full" view_mode has been written.'));
 
     // Check that default settings are set.
-    $this->assertIdentical($record['data']['settings'], $field_type['instance_settings'] , t('Default instance settings have been written.'));
-    $this->assertIdentical($record['data']['widget']['settings'], $widget_type['settings'] , t('Default widget settings have been written.'));
+    $this->assertIdentical($record['data']['settings'], $field_type['instance_settings'], t('Default instance settings have been written.'));
+    $this->assertIdentical($record['data']['widget']['settings'], $widget_type['settings'], t('Default widget settings have been written.'));
     $this->assertIdentical($record['data']['display']['default']['settings'], $formatter_type['settings'], t('Default formatter settings for "full" view_mode have been written.'));
 
     // Guarantee that the field/bundle combination is unique.
@@ -2344,7 +2344,7 @@ class FieldInstanceCrudTestCase extends 
     $instance['label'] = $this->randomName();
     $instance['description'] = $this->randomName();
     $instance['settings']['test_instance_setting'] = $this->randomName();
-    $instance['widget']['settings']['test_widget_setting'] =$this->randomName();
+    $instance['widget']['settings']['test_widget_setting'] = $this->randomName();
     $instance['widget']['weight']++;
     $instance['display']['default']['settings']['test_formatter_setting'] = $this->randomName();
     $instance['display']['default']['weight']++;
@@ -2366,13 +2366,13 @@ class FieldInstanceCrudTestCase extends 
     field_update_instance($instance);
 
     $instance_new = field_read_instance('test_entity', $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'], t('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']['default']['type'], $instance_new['display']['default']['type'] , t('Formatter type change is saved.'));
+    $this->assertIdentical($settings, array_intersect_key($instance_new['widget']['settings'], $settings), t('Widget type change updates default settings.'));
+    $this->assertEqual($instance['display']['default']['type'], $instance_new['display']['default']['type'], t('Formatter type change is saved.'));
     $info = field_info_formatter_types($instance_new['display']['default']['type']);
     $settings = $info['settings'];
-    $this->assertIdentical($settings, array_intersect_key($instance_new['display']['default']['settings'], $settings) , t('Changing formatter type updates default settings.'));
+    $this->assertIdentical($settings, array_intersect_key($instance_new['display']['default']['settings'], $settings), t('Changing formatter type updates default settings.'));
 
     // Check that adding a new view mode is saved and gets default settings.
     $instance = field_read_instance('test_entity', $this->instance_definition['field_name'], $this->instance_definition['bundle']);
@@ -2384,7 +2384,7 @@ class FieldInstanceCrudTestCase extends 
     $this->assertIdentical($instance_new['display']['teaser']['type'], $field_type['default_formatter'], t('Default formatter for the new view_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 view_mode have been written.'));
+    $this->assertIdentical($settings, $instance_new['display']['teaser']['settings'], t('Default formatter settings for the new view_mode have been written.'));
 
     // TODO: test failures.
   }
@@ -2487,11 +2487,11 @@ class FieldTranslationsTestCase extends 
     $available_languages = field_available_languages($this->entity_type, $this->field);
     foreach ($available_languages as $delta => $langcode) {
       if ($langcode != 'xx' && $langcode != 'en') {
-        $this->assertTrue(in_array($langcode, $enabled_languages), t('%language is an enabled language.', array('%language' => $langcode)));
+        $this->assertTrue(in_array($langcode, $enabled_languages), $langcode . ' is an enabled language.');
       }
     }
-    $this->assertTrue(in_array('xx', $available_languages), t('%language was made available.', array('%language' => 'xx')));
-    $this->assertFalse(in_array('en', $available_languages), t('%language was made unavailable.', array('%language' => 'en')));
+    $this->assertTrue(in_array('xx', $available_languages), 'xx' . ' was made available.');
+    $this->assertFalse(in_array('en', $available_languages), 'en' . ' was made unavailable.');
 
     // Test field_available_languages() behavior for untranslatable fields.
     $this->field['translatable'] = FALSE;
@@ -2529,7 +2529,7 @@ class FieldTranslationsTestCase extends 
       $hash = hash('sha256', serialize(array($entity_type, $entity, $this->field_name, $langcode, $values[$langcode])));
       // Check whether the parameters passed to _field_invoke() were correctly
       // forwarded to the callback function.
-      $this->assertEqual($hash, $result, t('The result for %language is correctly stored.', array('%language' => $langcode)));
+      $this->assertEqual($hash, $result, 'The result for ' . $langcode . ' is correctly stored.');
     }
     $this->assertEqual(count($results), count($available_languages), t('No unavailable language has been processed.'));
   }
@@ -2571,9 +2571,9 @@ class FieldTranslationsTestCase extends 
         $hash = hash('sha256', serialize(array($entity_type, $entities[$id], $this->field_name, $langcode, $values[$id][$langcode])));
         // Check whether the parameters passed to _field_invoke() were correctly
         // forwarded to the callback function.
-        $this->assertEqual($hash, $result, t('The result for entity %id/%language is correctly stored.', array('%id' => $id, '%language' => $langcode)));
+        $this->assertEqual($hash, $result, 'The result for entity ' . $id . '/' . $langcode . ' is correctly stored.');
       }
-      $this->assertEqual(count($results), count($available_languages), t('No unavailable language has been processed for entity %id.', array('%id' => $id)));
+      $this->assertEqual(count($results), count($available_languages), 'No unavailable language has been processed for entity ' . $id . '.');
     }
   }
 
@@ -2610,7 +2610,7 @@ class FieldTranslationsTestCase extends 
       foreach ($items as $delta => $item) {
         $result = $result && $item['value'] == $entity->{$this->field_name}[$langcode][$delta]['value'];
       }
-      $this->assertTrue($result, t('%language translation correctly handled.', array('%language' => $langcode)));
+      $this->assertTrue($result, $langcode . ' translation correctly handled.');
     }
   }
 
@@ -2654,8 +2654,7 @@ class FieldTranslationsTestCase extends 
         // Index 0 is reserved for the requested language, this way we ensure
         // that no field is actually populated with it.
         $langcode = $enabled_languages[mt_rand(1, count($enabled_languages) - 1)];
-      }
-      while (isset($languages[$langcode]));
+      } while (isset($languages[$langcode]));
       $languages[$langcode] = TRUE;
       $entity->{$field_name}[$langcode] = $this->_generateTestFieldValues($field['cardinality']);
     }
@@ -2667,7 +2666,7 @@ class FieldTranslationsTestCase extends 
     $display_language = field_language($entity_type, $entity, NULL, $requested_language);
     foreach ($instances as $instance) {
       $field_name = $instance['field_name'];
-      $this->assertTrue($display_language[$field_name] == LANGUAGE_NONE, t('The display language for field %field_name is %language.', array('%field_name' => $field_name, '%language' => LANGUAGE_NONE)));
+      $this->assertTrue($display_language[$field_name] == LANGUAGE_NONE, 'The display language for field ' . $field_name . ' is ' . LANGUAGE_NONE . '.');
     }
 
     // Test multiple-fields display languages for translatable entities.
@@ -2681,13 +2680,13 @@ class FieldTranslationsTestCase extends 
       // As the requested language was not assinged to any field, if the
       // returned language is defined for the current field, core fallback rules
       // were successfully applied.
-      $this->assertTrue(isset($entity->{$field_name}[$langcode]) && $langcode != $requested_language, t('The display language for the field %field_name is %language.', array('%field_name' => $field_name, '%language' => $langcode)));
+      $this->assertTrue(isset($entity->{$field_name}[$langcode]) && $langcode != $requested_language, 'The display language for the field ' . $field_name . ' is ' . $langcode . '.');
     }
 
     // Test single-field display language.
     drupal_static_reset('field_language');
     $langcode = field_language($entity_type, $entity, $this->field_name, $requested_language);
-    $this->assertTrue(isset($entity->{$this->field_name}[$langcode]) && $langcode != $requested_language, t('The display language for the (single) field %field_name is %language.', array('%field_name' => $field_name, '%language' => $langcode)));
+    $this->assertTrue(isset($entity->{$this->field_name}[$langcode]) && $langcode != $requested_language, 'The display language for the (single) field ' . $field_name . ' is ' . $langcode . '.');
   }
 
   /**
@@ -2731,7 +2730,7 @@ class FieldTranslationsTestCase extends 
     $entity = field_test_entity_test_load($eid, $evid);
     foreach ($available_languages as $langcode => $value) {
       $passed = isset($entity->{$field_name}[$langcode]) && $entity->{$field_name}[$langcode][0]['value'] == $value + 1;
-      $this->assertTrue($passed, t('The @language translation for revision @revision was correctly stored', array('@language' => $langcode, '@revision' => $entity->ftvid)));
+      $this->assertTrue($passed, 'The ' . $langcode . ' translation for revision ' . $entity->ftvid . ' was correctly stored');
     }
   }
 }
@@ -2745,7 +2744,7 @@ class FieldBulkDeleteTestCase extends Fi
   public static function getInfo() {
     return array(
       'name' => 'Field bulk delete tests',
-      'description'=> 'Bulk delete fields and instances, and clean up afterwards.',
+      'description' => 'Bulk delete fields and instances, and clean up afterwards.',
       'group' => 'Field API',
     );
   }
@@ -2926,7 +2925,7 @@ class FieldBulkDeleteTestCase extends Fi
       $this->assertEqual($stubs[$entity->ftid], $entity, 'hook_field_delete() called with the correct stub');
       unset($stubs[$entity->ftid]);
     }
-    $this->assertEqual(count($stubs), $count-10, 'hook_field_delete was called with each entity once');
+    $this->assertEqual(count($stubs), $count -10, 'hook_field_delete was called with each entity once');
 
     // The instance still exists, deleted.
     $instances = field_read_instances(array('field_id' => $field['id'], 'deleted' => 1), array('include_deleted' => 1, 'include_inactive' => 1));
Index: modules/field_ui/field_ui.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/field_ui/field_ui.test,v
retrieving revision 1.18
diff -u -p -r1.18 field_ui.test
--- modules/field_ui/field_ui.test	27 Jun 2010 18:05:54 -0000	1.18
+++ modules/field_ui/field_ui.test	5 Aug 2010 00:22:23 -0000
@@ -10,7 +10,7 @@
  * Field UI tests.
  */
 class FieldUITestCase extends DrupalWebTestCase {
-    public static function getInfo() {
+  public static function getInfo() {
     return array(
       'name' => 'Field UI tests',
       'description' => 'Test the field UI functionality.',
@@ -26,7 +26,7 @@ class FieldUITestCase extends DrupalWebT
     $this->drupalLogin($admin_user);
 
     // Create content type, with underscores.
-    $type_name =  strtolower($this->randomName(8)) . '_' .'test';
+    $type_name =  strtolower($this->randomName(8)) . '_' . 'test';
     $type = $this->drupalCreateContentType(array('name' => $type_name, 'type' => $type_name));
     $this->type = $type->type;
     // Store a valid URL name, with hyphens instead of underscores.
@@ -35,7 +35,7 @@ class FieldUITestCase extends DrupalWebT
     // Create random field name.
     $this->field_label = $this->randomName(8);
     $this->field_name_input =  strtolower($this->randomName(8));
-    $this->field_name = 'field_'. $this->field_name_input;
+    $this->field_name = 'field_' . $this->field_name_input;
   }
 
   /**
@@ -66,13 +66,13 @@ class FieldUITestCase extends DrupalWebT
     );
     foreach ($table_headers as $table_header) {
       // We check that the label appear in the table headings.
-      $this->assertRaw($table_header . '</th>', t('%table_header table header was found.', array('%table_header' => $table_header)));
+      $this->assertRaw($table_header . '</th>', $table_header . ' table header was found.');
     }
 
     // "Add new field" and "Add existing field" aren't a table heading so just
     // test the text.
     foreach (array('Add new field', 'Add existing field') as $element) {
-      $this->assertText($element, t('"@element" was found.', array('@element' => $element)));
+      $this->assertText($element, '"' . $element . '" was found.');
     }
   }
 
@@ -230,7 +230,7 @@ class FieldUITestCase extends DrupalWebT
     $this->fieldUIAddNewField($bundle_path1, $edit1);
 
     // Create an additional node type.
-    $type_name2 =  strtolower($this->randomName(8)) . '_' .'test';
+    $type_name2 =  strtolower($this->randomName(8)) . '_' . 'test';
     $type2 = $this->drupalCreateContentType(array('name' => $type_name2, 'type' => $type_name2));
     $type_name2 = $type2->type;
     $hyphen_type2 = str_replace('_', '-', $type_name2);
@@ -285,7 +285,7 @@ class FieldUITestCase extends DrupalWebT
       'widget_type' => 'test_field_widget',
     );
     field_create_instance($instance);
-    $this->assertTrue(field_read_instance('node', $field_name, $this->type), t('An instance of the field %field was created programmatically.', array('%field' => $field_name)));
+    $this->assertTrue(field_read_instance('node', $field_name, $this->type), 'An instance of the field ' . $field_name . ' was created programmatically.');
 
     // Check that the newly added instance appears on the 'Manage Fields'
     // screen.
@@ -324,7 +324,7 @@ class FieldUITestCase extends DrupalWebT
     $field_name = $initial_edit['_add_new_field[field_name]'];
 
     // First step : 'Add new field' on the 'Manage fields' page.
-    $this->drupalPost("$bundle_path/fields",  $initial_edit, t('Save'));
+    $this->drupalPost("$bundle_path/fields",   $initial_edit, t('Save'));
     $this->assertRaw(t('These settings apply to the %label field everywhere it is used.', array('%label' => $label)), t('Field settings page was displayed.'));
 
     // Second step : 'Field settings' form.
Index: modules/file/tests/file.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/file/tests/file.test,v
retrieving revision 1.19
diff -u -p -r1.19 file.test
--- modules/file/tests/file.test	4 Aug 2010 03:50:17 -0000	1.19
+++ modules/file/tests/file.test	5 Aug 2010 00:22:23 -0000
@@ -559,13 +559,13 @@ class FileFieldValidateTestCase extends 
       $nid = $this->uploadNodeFile($small_file, $field_name, $type_name);
       $node = node_load($nid, NULL, TRUE);
       $node_file = (object) $node->{$field_name}[LANGUAGE_NONE][0];
-      $this->assertFileExists($node_file, t('File exists after uploading a file (%filesize) under the max limit (%maxsize).', array('%filesize' => format_size($small_file->filesize), '%maxsize' => $max_filesize)));
-      $this->assertFileEntryExists($node_file, t('File entry exists after uploading a file (%filesize) under the max limit (%maxsize).', array('%filesize' => format_size($small_file->filesize), '%maxsize' => $max_filesize)));
+      $this->assertFileExists($node_file, 'File exists after uploading a file (' . format_size($small_file->filesize) . ') under the max limit (' . $max_filesize . ').');
+      $this->assertFileEntryExists($node_file, 'File entry exists after uploading a file (' . format_size($small_file->filesize) . ') under the max limit (' . $max_filesize . ').');
 
       // Check that uploading the large file fails (1M limit).
       $nid = $this->uploadNodeFile($large_file, $field_name, $type_name);
       $error_message = t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => format_size($large_file->filesize), '%maxsize' => format_size($file_limit)));
-      $this->assertRaw($error_message, t('Node save failed when file (%filesize) exceeded the max upload size (%maxsize).', array('%filesize' => format_size($large_file->filesize), '%maxsize' => $max_filesize)));
+      $this->assertRaw($error_message, 'Node save failed when file (' . format_size($large_file->filesize) . ') exceeded the max upload size (' . $max_filesize . ').');
     }
 
     // Turn off the max filesize.
@@ -575,8 +575,8 @@ class FileFieldValidateTestCase extends 
     $nid = $this->uploadNodeFile($large_file, $field_name, $type_name);
     $node = node_load($nid, NULL, TRUE);
     $node_file = (object) $node->{$field_name}[LANGUAGE_NONE][0];
-    $this->assertFileExists($node_file, t('File exists after uploading a file (%filesize) with no max limit.', array('%filesize' => format_size($large_file->filesize))));
-    $this->assertFileEntryExists($node_file, t('File entry exists after uploading a file (%filesize) with no max limit.', array('%filesize' => format_size($large_file->filesize))));
+    $this->assertFileExists($node_file, 'File exists after uploading a file (' . format_size($large_file->filesize) . ') with no max limit.');
+    $this->assertFileEntryExists($node_file, 'File entry exists after uploading a file (' . format_size($large_file->filesize) . ') with no max limit.');
 
     // Remove our file field.
     field_delete_field($field_name);
@@ -655,7 +655,7 @@ class FileFieldPathTestCase extends File
     // Check that the file was uploaded to the file root.
     $node = node_load($nid, NULL, TRUE);
     $node_file = (object) $node->{$field_name}[LANGUAGE_NONE][0];
-    $this->assertPathMatch('public://' . $test_file->filename, $node_file->uri, t('The file %file was uploaded to the correct path.', array('%file' => $node_file->uri)));
+    $this->assertPathMatch('public://' . $test_file->filename, $node_file->uri, 'The file ' . $node_file->uri . ' was uploaded to the correct path.');
 
     // Change the path to contain multiple subdirectories.
     $field = $this->updateFileField($field_name, $type_name, array('file_directory' => 'foo/bar/baz'));
@@ -666,7 +666,7 @@ class FileFieldPathTestCase extends File
     // Check that the file was uploaded into the subdirectory.
     $node = node_load($nid, NULL, TRUE);
     $node_file = (object) $node->{$field_name}[LANGUAGE_NONE][0];
-    $this->assertPathMatch('public://foo/bar/baz/' . $test_file->filename, $node_file->uri, t('The file %file was uploaded to the correct path.', array('%file' => $node_file->uri)));
+    $this->assertPathMatch('public://foo/bar/baz/' . $test_file->filename, $node_file->uri, 'The file ' . $node_file->uri . ' was uploaded to the correct path.');
 
     // Check the path when used with tokens.
     // Change the path to contain multiple token directories.
@@ -680,7 +680,7 @@ class FileFieldPathTestCase extends File
     $node_file = (object) $node->{$field_name}[LANGUAGE_NONE][0];
     $data = array('user' => $this->admin_user);
     $subdirectory = token_replace('[user:uid]/[user:name]', $data);
-    $this->assertPathMatch('public://' . $subdirectory . '/' . $test_file->filename, $node_file->uri, t('The file %file was uploaded to the correct path with token replacements.', array('%file' => $node_file->uri)));
+    $this->assertPathMatch('public://' . $subdirectory . '/' . $test_file->filename, $node_file->uri, 'The file ' . $node_file->uri . ' was uploaded to the correct path with token replacements.');
   }
 
   /**
@@ -764,7 +764,7 @@ class FileTokenReplaceTestCase extends F
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('file' => $file), array('language' => $language));
-      $this->assertFalse(strcmp($output, $expected), t('Sanitized file token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Sanitized file token ' . $input . ' replaced.');
     }
 
     // Generate and test unsanitized tokens.
@@ -776,7 +776,7 @@ class FileTokenReplaceTestCase extends F
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('file' => $file), array('language' => $language, 'sanitize' => FALSE));
-      $this->assertFalse(strcmp($output, $expected), t('Unsanitized file token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Unsanitized file token ' . $input . ' replaced.');
     }
   }
 }
Index: modules/filter/filter.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.test,v
retrieving revision 1.69
diff -u -p -r1.69 filter.test
--- modules/filter/filter.test	1 Jul 2010 19:41:18 -0000	1.69
+++ modules/filter/filter.test	5 Aug 2010 00:22:23 -0000
@@ -78,17 +78,17 @@ class FilterCRUDTestCase extends DrupalW
       ->condition('format', $format->format)
       ->execute()
       ->fetchObject();
-    $this->assertEqual($db_format->format, $format->format, t('Database: Proper format id for text format %format.', $t_args));
-    $this->assertEqual($db_format->name, $format->name, t('Database: Proper title for text format %format.', $t_args));
-    $this->assertEqual($db_format->cache, $format->cache, t('Database: Proper cache indicator for text format %format.', $t_args));
-    $this->assertEqual($db_format->weight, $format->weight, t('Database: Proper weight for text format %format.', $t_args));
+    $this->assertEqual($db_format->format, $format->format, 'Database: Proper format id for text format ' . $t_args['%format'] . '.');
+    $this->assertEqual($db_format->name, $format->name, 'Database: Proper title for text format ' . $t_args['%format'] . '.');
+    $this->assertEqual($db_format->cache, $format->cache, 'Database: Proper cache indicator for text format ' . $t_args['%format'] . '.');
+    $this->assertEqual($db_format->weight, $format->weight, 'Database: Proper weight for text format ' . $t_args['%format'] . '.');
 
     // Verify filter_format_load().
     $filter_format = filter_format_load($format->format);
-    $this->assertEqual($filter_format->format, $format->format, t('filter_format_load: Proper format id for text format %format.', $t_args));
-    $this->assertEqual($filter_format->name, $format->name, t('filter_format_load: Proper title for text format %format.', $t_args));
-    $this->assertEqual($filter_format->cache, $format->cache, t('filter_format_load: Proper cache indicator for text format %format.', $t_args));
-    $this->assertEqual($filter_format->weight, $format->weight, t('filter_format_load: Proper weight for text format %format.', $t_args));
+    $this->assertEqual($filter_format->format, $format->format, 'filter_format_load: Proper format id for text format ' . $t_args['%format'] . '.');
+    $this->assertEqual($filter_format->name, $format->name, 'filter_format_load: Proper title for text format ' . $t_args['%format'] . '.');
+    $this->assertEqual($filter_format->cache, $format->cache, 'filter_format_load: Proper cache indicator for text format ' . $t_args['%format'] . '.');
+    $this->assertEqual($filter_format->weight, $format->weight, 'filter_format_load: Proper weight for text format ' . $t_args['%format'] . '.');
 
     // Verify the 'cache' text format property according to enabled filters.
     $filter_info = filter_get_filters();
@@ -116,13 +116,13 @@ class FilterCRUDTestCase extends DrupalW
       $t_args = array('%format' => $format->name, '%filter' => $name);
 
       // Verify that filter status is properly stored.
-      $this->assertEqual($filter->status, $format_filters[$name]['status'], t('Database: Proper status for %filter in text format %format.', $t_args));
+      $this->assertEqual($filter->status, $format_filters[$name]['status'], 'Database: Proper status for ' . $t_args['%filter'] . ' in text format ' . $t_args['%format'] . '.');
 
       // Verify that filter settings were properly stored.
-      $this->assertEqual(unserialize($filter->settings), isset($format_filters[$name]['settings']) ? $format_filters[$name]['settings'] : array(), t('Database: Proper filter settings for %filter in text format %format.', $t_args));
+      $this->assertEqual(unserialize($filter->settings), isset($format_filters[$name]['settings']) ? $format_filters[$name]['settings'] : array(), 'Database: Proper filter settings for ' . $t_args['%filter'] . ' in text format ' . $t_args['%format'] . '.');
 
       // Verify that each filter has a module name assigned.
-      $this->assertTrue(!empty($filter->module), t('Database: Proper module name for %filter in text format %format.', $t_args));
+      $this->assertTrue(!empty($filter->module), 'Database: Proper module name for ' . $t_args['%filter'] . ' in text format ' . $t_args['%format'] . '.');
 
       // Remove the filter from the copy of saved $format to check whether all
       // filters have been processed later.
@@ -138,13 +138,13 @@ class FilterCRUDTestCase extends DrupalW
       $t_args = array('%format' => $format->name, '%filter' => $name);
 
       // Verify that filter status is properly stored.
-      $this->assertEqual($filter->status, $format_filters[$name]['status'], t('filter_list_format: Proper status for %filter in text format %format.', $t_args));
+      $this->assertEqual($filter->status, $format_filters[$name]['status'], 'filter_list_format: Proper status for ' . $t_args['%filter'] . ' in text format ' . $t_args['%format'] . '.');
 
       // Verify that filter settings were properly stored.
-      $this->assertEqual($filter->settings, isset($format_filters[$name]['settings']) ? $format_filters[$name]['settings'] : array(), t('filter_list_format: Proper filter settings for %filter in text format %format.', $t_args));
+      $this->assertEqual($filter->settings, isset($format_filters[$name]['settings']) ? $format_filters[$name]['settings'] : array(), 'filter_list_format: Proper filter settings for ' . $t_args['%filter'] . ' in text format ' . $t_args['%format'] . '.');
 
       // Verify that each filter has a module name assigned.
-      $this->assertTrue(!empty($filter->module), t('filter_list_format: Proper module name for %filter in text format %format.', $t_args));
+      $this->assertTrue(!empty($filter->module), 'filter_list_format: Proper module name for ' . $t_args['%filter'] . ' in text format ' . $t_args['%format'] . '.');
 
       // Remove the filter from the copy of saved $format to check whether all
       // filters have been processed later.
@@ -913,7 +913,7 @@ class FilterUnitTestCase extends DrupalU
     $f = _filter_html('<p onerror="alert(0);" />', $filter);
     $this->assertNoNormalized($f, 'onerror', t('HTML filter should remove on* attributes on default.'));
 
-    $f = _filter_html('<code onerror>&nbsp;</code>', $filter);    
+    $f = _filter_html('<code onerror>&nbsp;</code>', $filter);
     $this->assertNoNormalized($f, 'onerror', t('HTML filter should remove empty on* attributes on default.'));
   }
 
@@ -1240,16 +1240,16 @@ alert("test")
     // Test that characters that have special meaning in XML are changed into
     // entities.
     $f = $function('<>&"');
-    $this->assertEqual($f, '&lt;&gt;&amp;&quot;', t('The @function() function correctly filters basic HTML entities.', $replacements));
+    $this->assertEqual($f, '&lt;&gt;&amp;&quot;', 'The ' . $replacements['@function'] . '() function correctly filters basic HTML entities.');
 
     // A single quote can also be used for evil things in some contexts.
     $f = $function('\'');
-    $this->assertEqual($f, '&#039;', t('The @function() function correctly filters single quotes.', $replacements));
+    $this->assertEqual($f, '&#039;', 'The ' . $replacements['@function'] . '() function correctly filters single quotes.');
 
     // Test that the filter is not fooled by different evasion techniques.
     // Ignore PHP 5.3+ invalid multibyte sequence warning.
     $f = @$function("\xc2\"");
-    $this->assertEqual($f, '', t('The @function() function correctly filters invalid UTF-8.', $replacements));
+    $this->assertEqual($f, '', 'The ' . $replacements['@function'] . '() function correctly filters invalid UTF-8.');
   }
 }
 
Index: modules/forum/forum.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.test,v
retrieving revision 1.57
diff -u -p -r1.57 forum.test
--- modules/forum/forum.test	8 Jul 2010 03:41:27 -0000	1.57
+++ modules/forum/forum.test	5 Aug 2010 00:22:23 -0000
@@ -102,13 +102,13 @@ class ForumTestCase extends DrupalWebTes
     // Must remove forum topics to test creating orphan topics.
     $vid = variable_get('forum_nav_vocabulary');
     $tree = taxonomy_get_tree($vid);
-    foreach($tree as $term) {
+    foreach ($tree as $term) {
       taxonomy_term_delete($term->tid);
     }
 
     // Create an orphan forum item.
     $this->drupalLogin($this->admin_user);
-    $this->drupalPost('node/add/forum', array('title' => $this->randomName(10), 'body[' . LANGUAGE_NONE .'][0][value]' => $this->randomName(120)), t('Save'));
+    $this->drupalPost('node/add/forum', array('title' => $this->randomName(10), 'body[' . LANGUAGE_NONE . '][0][value]' => $this->randomName(120)), t('Save'));
 
     $nid_count = db_query('SELECT COUNT(nid) FROM {node}')->fetchField();
     $this->assertEqual(0, $nid_count, t('A forum node was not created when missing a forum vocabulary.'));
@@ -329,7 +329,7 @@ class ForumTestCase extends DrupalWebTes
 
     // Retrieve node object, ensure that the topic was created and in the proper forum.
     $node = $this->drupalGetNodeByTitle($title);
-    $this->assertTrue($node != NULL, t('Node @title was loaded', array('@title' => $title)));
+    $this->assertTrue($node != NULL, 'Node ' . $title . ' was loaded');
     $this->assertEqual($node->taxonomy_forums[LANGUAGE_NONE][0]['tid'], $tid, 'Saved forum topic was in the expected forum');
 
     // View forum topic.
Index: modules/help/help.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/help/help.test,v
retrieving revision 1.19
diff -u -p -r1.19 help.test
--- modules/help/help.test	1 Apr 2010 14:52:21 -0000	1.19
+++ modules/help/help.test	5 Aug 2010 00:22:23 -0000
@@ -51,7 +51,7 @@ class HelpTestCase extends DrupalWebTest
 
     // Make sure links are properly added for modules implementing hook_help().
     foreach ($this->modules as $module => $name) {
-      $this->assertLink($name, 0, t('Link properly added to @name (admin/help/@module)', array('@module' => $module, '@name' => $name)));
+      $this->assertLink($name, 0, 'Link properly added to ' . $name . ' (admin/help/' . $module . ')');
     }
   }
 
@@ -68,7 +68,7 @@ class HelpTestCase extends DrupalWebTest
       if ($response == 200) {
         $this->assertTitle($name . ' | Drupal', t('[' . $module . '] Title was displayed'));
         $this->assertRaw('<h1 class="page-title">' . t($name) . '</h1>', t('[' . $module . '] Heading was displayed'));
-       }
+      }
     }
   }
 
Index: modules/image/image.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/image/image.test,v
retrieving revision 1.23
diff -u -p -r1.23 image.test
--- modules/image/image.test	30 Jun 2010 22:37:49 -0000	1.23
+++ modules/image/image.test	5 Aug 2010 00:22:23 -0000
@@ -422,7 +422,7 @@ class ImageAdminStylesUnitTest extends I
     foreach ($style['effects'] as $ieid => $effect) {
       $this->drupalGet($style_path . '/effects/' . $ieid);
       foreach ($effect_edits[$effect['name']] as $field => $value) {
-        $this->assertFieldByName($field, $value, t('The %field field in the %effect effect has the correct value of %value.', array('%field' => $field, '%effect' => $effect['name'], '%value' => $value)));
+        $this->assertFieldByName($field, $value, 'The ' . $field . ' field in the ' . $effect['name'] . ' effect has the correct value of ' . $value . '.');
       }
     }
 
@@ -454,7 +454,7 @@ class ImageAdminStylesUnitTest extends I
 
     // Create an image to make sure it gets flushed after saving.
     $image_path = $this->createSampleImage($style);
-    $this->assertEqual($this->getImageCount($style), 1, t('Image style %style image %file successfully generated.', array('%style' => $style['name'], '%file' => $image_path)));
+    $this->assertEqual($this->getImageCount($style), 1, 'Image style ' . $style['name'] . ' image ' . $image_path . ' successfully generated.');
 
     $this->drupalPost($style_path, $edit, t('Update style'));
 
@@ -463,12 +463,12 @@ class ImageAdminStylesUnitTest extends I
 
     // Check that the URL was updated.
     $this->drupalGet($style_path);
-    $this->assertResponse(200, t('Image style %original renamed to %new', array('%original' => $style['name'], '%new' => $style_name)));
+    $this->assertResponse(200, 'Image style ' . $style['name'] . ' renamed to ' . $style_name);
 
     // Check that the image was flushed after updating the style.
     // This is especially important when renaming the style. Make sure that
     // the old image directory has been deleted.
-    $this->assertEqual($this->getImageCount($style), 0, t('Image style %style was flushed after renaming the style and updating the order of effects.', array('%style' => $style['name'])));
+    $this->assertEqual($this->getImageCount($style), 0, 'Image style ' . $style['name'] . ' was flushed after renaming the style and updating the order of effects.');
 
     // Load the style by the new name with the new weights.
     drupal_static_reset('image_styles');
@@ -489,7 +489,7 @@ class ImageAdminStylesUnitTest extends I
 
     // Create an image to make sure it gets flushed after deleting an effect.
     $image_path = $this->createSampleImage($style);
-    $this->assertEqual($this->getImageCount($style), 1, t('Image style %style image %file successfully generated.', array('%style' => $style['name'], '%file' => $image_path)));
+    $this->assertEqual($this->getImageCount($style), 1, 'Image style ' . $style['name'] . ' image ' . $image_path . ' successfully generated.');
 
     // Test effect deletion form.
     $effect = array_pop($style['effects']);
@@ -503,10 +503,10 @@ class ImageAdminStylesUnitTest extends I
 
     // Confirm the style directory has been removed.
     $directory = file_directory_path() . '/styles/' . $style_name;
-    $this->assertFalse(is_dir($directory), t('Image style %style directory removed on style deletion.', array('%style' => $style['name'])));
+    $this->assertFalse(is_dir($directory), 'Image style ' . $style['name'] . ' directory removed on style deletion.');
 
     drupal_static_reset('image_styles');
-    $this->assertFalse(image_style_load($style_name), t('Image style %style successfully deleted.', array('%style' => $style['name'])));
+    $this->assertFalse(image_style_load($style_name), 'Image style ' . $style['name'] . ' successfully deleted.');
 
   }
 
@@ -534,11 +534,11 @@ class ImageAdminStylesUnitTest extends I
     drupal_static_reset('image_styles');
     $style = image_style_load($style_name);
     $image_path = $this->createSampleImage($style);
-    $this->assertEqual($this->getImageCount($style), 1, t('Image style %style image %file successfully generated.', array('%style' => $style['name'], '%file' => $image_path)));
+    $this->assertEqual($this->getImageCount($style), 1, 'Image style ' . $style['name'] . ' image ' . $image_path . ' successfully generated.');
 
     // Verify that effects attached to a default style do not have an ieid key.
     foreach ($style['effects'] as $effect) {
-      $this->assertFalse(isset($effect['ieid']), t('The %effect effect does not have an ieid.', array('%effect' => $effect['name'])));
+      $this->assertFalse(isset($effect['ieid']), 'The ' . $effect['name'] . ' effect does not have an ieid.');
     }
 
     // Override the default.
@@ -552,7 +552,7 @@ class ImageAdminStylesUnitTest extends I
 
     // Verify that effects attached to the style have an ieid now.
     foreach ($style['effects'] as $effect) {
-      $this->assertTrue(isset($effect['ieid']), t('The %effect effect has an ieid.', array('%effect' => $effect['name'])));
+      $this->assertTrue(isset($effect['ieid']), 'The ' . $effect['name'] . ' effect has an ieid.');
     }
 
     // The style should now have 2 effect, the original scale provided by core
@@ -567,7 +567,7 @@ class ImageAdminStylesUnitTest extends I
 
     // Create an image to ensure the override works properly.
     $image_path = $this->createSampleImage($style);
-    $this->assertEqual($this->getImageCount($style), 1, t('Image style %style image %file successfully generated.', array('%style' => $style['name'], '%file' => $image_path)));
+    $this->assertEqual($this->getImageCount($style), 1, 'Image style ' . $style['name'] . ' image ' . $image_path . ' successfully generated.');
 
     // Revert the image style.
     $this->drupalPost($revert_path, array(), t('Revert'));
@@ -602,7 +602,7 @@ class ImageAdminStylesUnitTest extends I
 
     // Test that image is displayed using newly created style.
     $this->drupalGet('node/' . $nid);
-    $this->assertRaw(image_style_url($style_name, $node->{$field_name}[LANGUAGE_NONE][0]['uri']), t('Image displayed using style @style.', array('@style' => $style_name)));
+    $this->assertRaw(image_style_url($style_name, $node->{$field_name}[LANGUAGE_NONE][0]['uri']), 'Image displayed using style ' . $style_name . '.');
 
     // Rename the style and make sure the image field is updated.
     $new_style_name = strtolower($this->randomName(10));
@@ -610,7 +610,7 @@ class ImageAdminStylesUnitTest extends I
       'name' => $new_style_name,
     );
     $this->drupalPost('admin/config/media/image-styles/edit/' . $style_name, $edit, t('Update style'));
-    $this->assertText(t('Changes to the style have been saved.'), t('Style %name was renamed to %new_name.', array('%name' => $style_name, '%new_name' => $new_style_name)));
+    $this->assertText(t('Changes to the style have been saved.'), 'Style ' . $style_name . ' was renamed to ' . $new_style_name . '.');
     $this->drupalGet('node/' . $nid);
     $this->assertRaw(image_style_url($new_style_name, $node->{$field_name}[LANGUAGE_NONE][0]['uri']), t('Image displayed using style replacement style.'));
 
Index: modules/locale/locale.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.test,v
retrieving revision 1.74
diff -u -p -r1.74 locale.test
--- modules/locale/locale.test	30 Jul 2010 01:52:54 -0000	1.74
+++ modules/locale/locale.test	5 Aug 2010 00:22:23 -0000
@@ -330,7 +330,7 @@ class LocaleTranslationFunctionalTest ex
       ->condition('l.textgroup', 'default')
       ->execute();
     $url = 'admin/config/regional/translate/edit/' . $result->fetchObject()->lid;
-    $edit = array('translations['. $langcode .']' => $this->randomName());
+    $edit = array('translations[' . $langcode . ']' => $this->randomName());
     $this->drupalPost($url, $edit, t('Save translations'));
 
     // Trigger JavaScript translation parsing and building.
@@ -345,14 +345,14 @@ class LocaleTranslationFunctionalTest ex
       ->execute()
       ->fetchObject();
     $js_file = 'public://' . variable_get('locale_js_directory', 'languages') . '/' . $langcode . '_' . $file->javascript . '.js';
-    $this->assertTrue($result = file_exists($js_file), t('JavaScript file created: %file', array('%file' => $result ? $js_file : t('not found'))));
+    $this->assertTrue($result = file_exists($js_file), 'JavaScript file created: ' . $result ? $js_file : t('not found'));
 
     // Test JavaScript translation rebuilding.
     file_unmanaged_delete($js_file);
-    $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: ' . $result ? $js_file : t('found'));
     cache_clear_all();
     _locale_rebuild_js($langcode);
-    $this->assertTrue($result = file_exists($js_file), t('JavaScript file rebuilt: %file', array('%file' => $result ? $js_file : t('not found'))));
+    $this->assertTrue($result = file_exists($js_file), 'JavaScript file rebuilt: ' . $result ? $js_file : t('not found'));
   }
 
   /**
@@ -382,7 +382,7 @@ class LocaleTranslationFunctionalTest ex
     $key = $this->randomName(16);
     $bad_translations[$key] = '<<SCRIPT>alert("xss");//<</SCRIPT>' . $key;
     $key = $this->randomName(16);
-    $bad_translations[$key] ="<BODY ONLOAD=alert('xss')>" . $key;
+    $bad_translations[$key] = "<BODY ONLOAD=alert('xss')>" . $key;
 
     // Add custom language.
     $edit = array(
@@ -1021,7 +1021,7 @@ class LocaleUninstallFunctionalTest exte
     // Check the UI language.
     drupal_language_initialize();
     global $language;
-    $this->assertEqual($language->language, $this->language, t('Current language: %lang', array('%lang' => $language->language)));
+    $this->assertEqual($language->language, $this->language, 'Current language: ' . $language->language);
 
     // Enable multilingual workflow option for articles.
     variable_set('language_content_type_article', 1);
@@ -1042,7 +1042,7 @@ class LocaleUninstallFunctionalTest exte
     _locale_rebuild_js('fr');
     $file = db_query('SELECT javascript FROM {languages} WHERE language = :language', array(':language' => 'fr'))->fetchObject();
     $js_file = 'public://' . 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: ' . $result ? $js_file : t('none'));
 
     // Disable string caching.
     variable_set('locale_cache_strings', 0);
@@ -1067,24 +1067,24 @@ class LocaleUninstallFunctionalTest exte
 
     // Check the init language logic.
     drupal_language_initialize();
-    $this->assertEqual($language->language, 'en', t('Language after uninstall: %lang', array('%lang' => $language->language)));
+    $this->assertEqual($language->language, 'en', 'Language after uninstall: ' . $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: ' . $result ? $js_file : t('found'));
 
     // Check language count.
     $language_count = variable_get('language_count', 1);
-    $this->assertEqual($language_count, 1, t('Language count: %count', array('%count' => $language_count)));
+    $this->assertEqual($language_count, 1, 'Language count: ' . $language_count);
 
     // Check language negotiation.
     require_once DRUPAL_ROOT . '/includes/language.inc';
     $this->assertTrue(count(language_types()) == count(drupal_language_types()), t('Language types reset'));
     $language_negotiation = language_negotiation_get(LANGUAGE_TYPE_INTERFACE) == LANGUAGE_NEGOTIATION_DEFAULT;
-    $this->assertTrue($language_negotiation, t('Interface language negotiation: %setting', array('%setting' => t($language_negotiation ? 'none' : 'set'))));
+    $this->assertTrue($language_negotiation, 'Interface language negotiation: ' . t($language_negotiation ? 'none' : 'set'));
     $language_negotiation = language_negotiation_get(LANGUAGE_TYPE_CONTENT) == LANGUAGE_NEGOTIATION_DEFAULT;
-    $this->assertTrue($language_negotiation, t('Content language negotiation: %setting', array('%setting' => t($language_negotiation ? 'none' : 'set'))));
+    $this->assertTrue($language_negotiation, 'Content language negotiation: ' . t($language_negotiation ? 'none' : 'set'));
     $language_negotiation = language_negotiation_get(LANGUAGE_TYPE_URL) == LANGUAGE_NEGOTIATION_DEFAULT;
-    $this->assertTrue($language_negotiation, t('URL language negotiation: %setting', array('%setting' => t($language_negotiation ? 'none' : 'set'))));
+    $this->assertTrue($language_negotiation, 'URL language negotiation: ' . t($language_negotiation ? 'none' : 'set'));
 
     // Check language providers settings.
     $this->assertFalse(variable_get('locale_language_negotiation_url_part', FALSE), t('URL language provider indicator settings cleared.'));
@@ -1092,19 +1092,19 @@ class LocaleUninstallFunctionalTest exte
 
     // Check JavaScript parsed.
     $javascript_parsed_count = count(variable_get('javascript_parsed', array()));
-    $this->assertEqual($javascript_parsed_count, 0, t('JavaScript parsed count: %count', array('%count' => $javascript_parsed_count)));
+    $this->assertEqual($javascript_parsed_count, 0, 'JavaScript parsed count: ' . $javascript_parsed_count);
 
     // 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: ' . t($multilingual ? 'enabled' : 'disabled'));
 
     // Check JavaScript translations directory.
     $locale_js_directory = variable_get('locale_js_directory', 'languages');
-    $this->assertEqual($locale_js_directory, 'languages', t('JavaScript translations directory: %dir', array('%dir' => $locale_js_directory)));
+    $this->assertEqual($locale_js_directory, 'languages', 'JavaScript translations directory: ' . $locale_js_directory);
 
     // 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: ' . t($locale_cache_strings ? 'enabled' : 'disabled'));
   }
 }
 
@@ -1698,7 +1698,7 @@ class LocaleUILanguageNegotiationTest ex
     $language_browser_fallback_string = "In $language_browser_fallback In $language_browser_fallback In $language_browser_fallback";
     $language_string = "In $language In $language In $language";
     // Do a translate search of our target string.
-    $edit = array( 'string' => $default_string);
+    $edit = array('string' => $default_string);
     $this->drupalPost('admin/config/regional/translate/translate', $edit, t('Filter'));
     // Should find the string and now click edit to post translated string.
     $this->clickLink('edit');
Index: modules/menu/menu.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.test,v
retrieving revision 1.36
diff -u -p -r1.36 menu.test
--- modules/menu/menu.test	6 May 2010 05:59:31 -0000	1.36
+++ modules/menu/menu.test	5 Aug 2010 00:22:24 -0000
@@ -509,7 +509,7 @@ class MenuTestCase extends DrupalWebTest
 
     // View navigation menu customization node.
     $this->drupalGet('admin/structure/menu/manage/navigation');
-        $this->assertResponse($response);
+    $this->assertResponse($response);
     if ($response == 200) {
       $this->assertText(t('Navigation'), t('Navigation menu node was displayed'));
     }
Index: modules/node/node.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.test,v
retrieving revision 1.89
diff -u -p -r1.89 node.test
--- modules/node/node.test	8 Jul 2010 03:41:27 -0000	1.89
+++ modules/node/node.test	5 Aug 2010 00:22:24 -0000
@@ -41,12 +41,12 @@ class NodeLoadMultipleUnitTest extends D
     $this->assertEqual($node3->title, $nodes[$node3->nid]->title, t('Node was loaded.'));
     $this->assertEqual($node4->title, $nodes[$node4->nid]->title, t('Node was loaded.'));
     $count = count($nodes);
-    $this->assertTrue($count == 2, t('@count nodes loaded.', array('@count' => $count)));
+    $this->assertTrue($count == 2, $count . ' nodes loaded.');
 
     // Load nodes by nid. Nodes 1, 2 and 4 will be loaded.
     $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(count($nodes) == 3, $count . ' nodes loaded');
     $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'));
@@ -57,7 +57,7 @@ class NodeLoadMultipleUnitTest extends D
     // 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->assertTrue($count == 3, $count . ' nodes loaded');
     $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.'));
@@ -67,7 +67,7 @@ class NodeLoadMultipleUnitTest extends D
     // they are loaded correctly again when a condition is passed.
     $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->assertTrue($count == 3, $count . ' nodes loaded.');
     $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'));
@@ -76,7 +76,7 @@ class NodeLoadMultipleUnitTest extends D
     // 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->assertTrue($count == 1, $count . ' node loaded');
     $this->assertEqual($nodes[$node3->nid]->title, $node3->title, t('Node successfully loaded.'));
   }
 }
@@ -566,7 +566,7 @@ class SummaryLengthTestCase extends Drup
     $this->assertRaw($expected, t('Check that the summary is 600 characters in length'), 'Node');
 
     // Edit the teaser length for "Basic page" content type
-    $edit = array (
+    $edit = array(
       'teaser_length' => 200,
     );
     $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
@@ -907,7 +907,7 @@ class NodeAccessRecordsUnitTest extends 
       $grants = node_test_node_grants($op, $web_user);
       $altered_grants = $grants;
       drupal_alter('node_grants', $altered_grants, $web_user, $op);
-      $this->assertNotEqual($grants, $altered_grants, t('Altered the %op grant for a user.', array('%op' => $op)));
+      $this->assertNotEqual($grants, $altered_grants, 'Altered the ' . $op . ' grant for a user.');
     }
   }
 }
@@ -1072,7 +1072,7 @@ class NodeTypeTestCase extends DrupalWeb
 
     $this->drupalGet('node/add/' . str_replace('_', '-', $type->name));
     $this->assertResponse(200, 'The new content type can be accessed at node/add.');
-    
+
     // Create a content type via the user interface.
     $web_user = $this->drupalCreateUser(array('bypass node access', 'administer content types'));
     $this->drupalLogin($web_user);
@@ -1325,7 +1325,7 @@ class NodeTitleTestCase extends DrupalWe
     // Test <title> tag.
     $this->drupalGet("node/$node->nid");
     $xpath = '//title';
-    $this->assertEqual(current($this->xpath($xpath)), $node->title .' | Drupal', 'Page title is equal to node title.', 'Node');
+    $this->assertEqual(current($this->xpath($xpath)), $node->title . ' | Drupal', 'Page title is equal to node title.', 'Node');
 
     // Test breadcrumb in comment preview.
     $this->drupalGet("comment/reply/$node->nid");
@@ -1548,9 +1548,9 @@ class NodeBuildContent extends DrupalWeb
     );
   }
 
- /**
-  * Test to ensure that a node's content array is rebuilt on every call to node_build_content().
-  */
+  /**
+   * Test to ensure that a node's content array is rebuilt on every call to node_build_content().
+   */
   function testNodeRebuildContent() {
     $node = $this->drupalCreateNode();
 
@@ -1751,7 +1751,7 @@ class NodeTokenReplaceTestCase extends D
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('node' => $node), array('language' => $language));
-      $this->assertFalse(strcmp($output, $expected), t('Sanitized node token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Sanitized node token ' . $input . ' replaced.');
     }
 
     // Generate and test unsanitized tokens.
@@ -1763,7 +1763,7 @@ class NodeTokenReplaceTestCase extends D
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('node' => $node), array('language' => $language, 'sanitize' => FALSE));
-      $this->assertFalse(strcmp($output, $expected), t('Unsanitized node token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Unsanitized node token ' . $input . ' replaced.');
     }
   }
 }
Index: modules/openid/openid.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/openid/openid.test,v
retrieving revision 1.28
diff -u -p -r1.28 openid.test
--- modules/openid/openid.test	7 Jul 2010 08:05:01 -0000	1.28
+++ modules/openid/openid.test	5 Aug 2010 00:22:24 -0000
@@ -262,7 +262,7 @@ class OpenIDFunctionalTestCase extends O
     if (!isset($claimed_id)) {
       $claimed_id = $identity;
     }
-    $this->assertRaw(t('Successfully added %identity', array('%identity' => $claimed_id)), t('Identity %identity was added.', array('%identity' => $identity)));
+    $this->assertRaw(t('Successfully added %identity', array('%identity' => $claimed_id)), 'Identity ' . $identity . ' was added.');
   }
 }
 
Index: modules/path/path.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.test,v
retrieving revision 1.37
diff -u -p -r1.37 path.test
--- modules/path/path.test	31 Jul 2010 04:10:30 -0000	1.37
+++ modules/path/path.test	5 Aug 2010 00:22:24 -0000
@@ -191,7 +191,7 @@ class PathTaxonomyTermTestCase extends D
   function testTermAlias() {
     // Create a term in the default 'Tags' vocabulary with URL alias.
     $vocabulary = taxonomy_vocabulary_load(1);
-    $description = $this->randomName();;
+    $description = $this->randomName();
     $edit = array();
     $edit['name'] = $this->randomName();
     $edit['description[value]'] = $description;
Index: modules/poll/poll.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.test,v
retrieving revision 1.35
diff -u -p -r1.35 poll.test
--- modules/poll/poll.test	23 Jun 2010 19:15:07 -0000	1.35
+++ modules/poll/poll.test	5 Aug 2010 00:22:24 -0000
@@ -39,7 +39,7 @@ class PollTestCase extends DrupalWebTest
     if ($test_preview) {
       $this->drupalPost(NULL, $edit, t('Preview'));
       foreach ($choices as $k => $choice_text) {
-        $this->assertRaw($choice_text, t('Choice @choice found was in preview.', array('@choice' => $k)));
+        $this->assertRaw($choice_text, 'Choice ' . $k . ' found was in preview.');
       }
       list($edit, $index) = $this->_pollGenerateEdit($title, $choices, $index);
     }
@@ -344,9 +344,9 @@ class PollJSAddChoice extends DrupalWebT
     $commands = $this->drupalPostAJAX(NULL, $edit, array('op' => t('More choices')));
     $this->content = $commands[1]['data'];
 
-    $this->assertFieldByName('choice[chid:0][chtext]', $edit['choice[new:0][chtext]'], t('Field !i found', array('!i' => 0)));
-    $this->assertFieldByName('choice[chid:1][chtext]', $edit['choice[new:1][chtext]'], t('Field !i found', array('!i' => 1)));
-    $this->assertFieldByName('choice[new:0][chtext]', '', t('Field !i found', array('!i' => 2)));
+    $this->assertFieldByName('choice[chid:0][chtext]', $edit['choice[new:0][chtext]'], 'Field ' . 0 . ' found');
+    $this->assertFieldByName('choice[chid:1][chtext]', $edit['choice[new:1][chtext]'], 'Field ' . 1 . ' found');
+    $this->assertFieldByName('choice[new:0][chtext]', '', 'Field ' . 2 . ' found');
   }
 }
 
@@ -403,13 +403,13 @@ class PollVoteCheckHostname extends Poll
 
     // User1 vote on Poll.
     $this->drupalPost('node/' . $this->poll_nid, $edit, t('Vote'));
-    $this->assertText(t('Your vote was recorded.'), t('%user vote was recorded.', array('%user' => $this->web_user1->name)));
+    $this->assertText(t('Your vote was recorded.'), $this->web_user1->name . ' vote was recorded.');
     $this->assertText(t('Total votes: @votes', array('@votes' => 1)), t('Vote count updated correctly.'));
 
     // Check to make sure User1 cannot vote again.
     $this->drupalGet('node/' . $this->poll_nid);
     $elements = $this->xpath('//input[@value="Vote"]');
-    $this->assertTrue(empty($elements), t("%user is not able to vote again.", array('%user' => $this->web_user1->name)));
+    $this->assertTrue(empty($elements), "" . $this->web_user1->name . " is not able to vote again.");
     $elements = $this->xpath('//input[@value="Cancel your vote"]');
     $this->assertTrue(!empty($elements), t("'Cancel your vote' button appears."));
 
@@ -442,7 +442,7 @@ class PollVoteCheckHostname extends Poll
 
     // User2 vote on poll.
     $this->drupalPost('node/' . $this->poll_nid, $edit, t('Vote'));
-    $this->assertText(t('Your vote was recorded.'), t('%user vote was recorded.', array('%user' => $this->web_user2->name)));
+    $this->assertText(t('Your vote was recorded.'), $this->web_user2->name . ' vote was recorded.');
     $this->assertText(t('Total votes: @votes', array('@votes' => 3)), 'Vote count updated correctly.');
     $elements = $this->xpath('//input[@value="Cancel your vote"]');
     $this->assertTrue(empty($elements), t("'Cancel your vote' button does not appear."));
@@ -463,7 +463,7 @@ class PollVoteCheckHostname extends Poll
     $this->drupalGet('node/' . $this->poll_nid);
     $this->assertEqual($this->drupalGetHeader('x-drupal-cache'), 'MISS', t('Page was cacheable but was not in the cache.'));
     $this->drupalPost(NULL, $edit, t('Vote'));
-    $this->assertText(t('Your vote was recorded.'), t('%user vote was recorded.', array('%user' => $this->web_user2->name)));
+    $this->assertText(t('Your vote was recorded.'), $this->web_user2->name . ' vote was recorded.');
     $this->assertText(t('Total votes: @votes', array('@votes' => 4)), 'Vote count updated correctly.');
     $elements = $this->xpath('//input[@value="Cancel your vote"]');
     $this->assertTrue(!empty($elements), t("'Cancel your vote' button appears."));
@@ -484,7 +484,7 @@ class PollVoteCheckHostname extends Poll
     // Check to make sure User1 still cannot vote even after hostname changed.
     $this->drupalGet('node/' . $this->poll_nid);
     $elements = $this->xpath('//input[@value="Vote"]');
-    $this->assertTrue(empty($elements), t("%user is not able to vote again.", array('%user' => $this->web_user1->name)));
+    $this->assertTrue(empty($elements), "" . $this->web_user1->name . " is not able to vote again.");
     $elements = $this->xpath('//input[@value="Cancel your vote"]');
     $this->assertTrue(!empty($elements), t("'Cancel your vote' button appears."));
   }
@@ -566,7 +566,7 @@ class PollTokenReplaceTestCase extends P
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('node' => $poll), array('language' => $language));
-      $this->assertFalse(strcmp($output, $expected), t('Sanitized poll token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Sanitized poll token ' . $input . ' replaced.');
     }
 
     // Generate and test unsanitized tokens.
@@ -574,7 +574,7 @@ class PollTokenReplaceTestCase extends P
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('node' => $poll), array('language' => $language, 'sanitize' => FALSE));
-      $this->assertFalse(strcmp($output, $expected), t('Unsanitized poll token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Unsanitized poll token ' . $input . ' replaced.');
     }
   }
 }
@@ -640,4 +640,4 @@ class PollExpirationTestCase extends Pol
     $elements = $this->xpath('//input[@id="edit-active-0"]');
     $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), t('Poll has expired.'), t('Poll'));
   }
-}
\ No newline at end of file
+}
Index: modules/profile/profile.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.test,v
retrieving revision 1.27
diff -u -p -r1.27 profile.test
--- modules/profile/profile.test	31 Jul 2010 04:01:51 -0000	1.27
+++ modules/profile/profile.test	5 Aug 2010 00:22:24 -0000
@@ -50,13 +50,13 @@ class ProfileTestCase extends DrupalWebT
       $this->assertField($form_name . '[year]', t('Found day selection field'));
     }
     else {
-      $this->assertField($form_name , t('Found form named @name', array('@name' => $form_name)));
+      $this->assertField($form_name, 'Found form named ' . $form_name);
     }
 
     // Checking name.
-    $this->assertText($title, t('Checking title for field %title', array('%title' => $title)));
+    $this->assertText($title, 'Checking title for field ' . $title);
     // Checking explanation.
-    $this->assertText($edit['explanation'], t('Checking explanation for field %title', array('%title' => $title)));
+    $this->assertText($edit['explanation'], 'Checking explanation for field ' . $title);
 
     return array(
       'fid' => $fid,
@@ -97,13 +97,13 @@ class ProfileTestCase extends DrupalWebT
       $this->assertField($form_name . '[year]', t('Found day selection field'));
     }
     else {
-      $this->assertField($form_name , t('Found form named @name', array('@name' => $form_name)));
+      $this->assertField($form_name, 'Found form named ' . $form_name);
     }
 
     // Checking name.
-    $this->assertText($title, t('Checking title for field %title', array('%title' => $title)));
+    $this->assertText($title, 'Checking title for field ' . $title);
     // Checking explanation.
-    $this->assertText($edit['explanation'], t('Checking explanation for field %title', array('%title' => $title)));
+    $this->assertText($edit['explanation'], 'Checking explanation for field ' . $title);
 
     return array(
       'fid' => $fid,
@@ -137,11 +137,11 @@ class ProfileTestCase extends DrupalWebT
 
     // Check profile page.
     $content = $this->drupalGet('user/' . $this->normal_user->uid);
-    $this->assertText($field['title'], t('Found profile field with title %title', array('%title' => $field['title'])));
+    $this->assertText($field['title'], 'Found profile field with title ' . $field['title']);
 
     if ($field['type'] != 'checkbox') {
       // $value must be cast to a string in order to be found by assertText.
-      $this->assertText("$value", t('Found profile field with value %value', array('%value' => $value)));
+      $this->assertText("$value", 'Found profile field with value ' . $value);
     }
 
     return $value;
@@ -156,7 +156,7 @@ class ProfileTestCase extends DrupalWebT
   function deleteProfileField($field) {
     $this->drupalPost('admin/config/people/profile/delete/' . $field['fid'], array(), t('Delete'));
     $this->drupalGet('admin/config/people/profile');
-    $this->assertNoText($field['title'], t('Checking deleted field %title', array('%title' => $field['title'])));
+    $this->assertNoText($field['title'], 'Checking deleted field ' . $field['title']);
   }
 }
 
@@ -266,7 +266,7 @@ class ProfileTestDate extends ProfileTes
 
     // Check profile page.
     $this->drupalGet('user/' . $this->normal_user->uid);
-    $this->assertText($field['title'], t('Found profile field with title %title', array('%title' => $field['title'])));
+    $this->assertText($field['title'], 'Found profile field with title ' . $field['title']);
 
     $this->assertText('01/09/1983', t('Found date profile field.'));
 
@@ -477,10 +477,10 @@ class ProfileTestBrowsing extends Profil
   }
 }
 
-  /**
-   * TODO:
-   * - Test field visibility
-   * - Test required fields
-   * - Test fields on registration form
-   * - Test updating fields
-   */
+/**
+ * TODO:
+ * - Test field visibility
+ * - Test required fields
+ * - Test fields on registration form
+ * - Test updating fields
+ */
Index: modules/rdf/rdf.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/rdf/rdf.test,v
retrieving revision 1.24
diff -u -p -r1.24 rdf.test
--- modules/rdf/rdf.test	1 Jun 2010 18:29:41 -0000	1.24
+++ modules/rdf/rdf.test	5 Aug 2010 00:22:24 -0000
@@ -541,15 +541,15 @@ class RdfCommentAttributesTestCase exten
     $comment_container = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]');
     $this->assertTrue(!empty($comment_container), t("Comment RDF type for comment found."));
     $comment_title = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]//h3[@property="dc:title"]');
-    $this->assertEqual((string)$comment_title[0]->a, $comment->subject, t("RDFa markup for the comment title found."));
+    $this->assertEqual((string) $comment_title[0]->a, $comment->subject, t("RDFa markup for the comment title found."));
     $comment_date = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]//*[contains(@property, "dc:date") and contains(@property, "dc:created")]');
     $this->assertTrue(!empty($comment_date), t("RDFa markup for the date of the comment found."));
     // The author tag can be either a or span
     $comment_author = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]//span[@rel="sioc:has_creator"]/*[contains(@class, "username") and @typeof="sioc:UserAccount" and @property="foaf:name"]');
     $name = empty($account["name"]) ? $this->web_user->name : $account["name"] . " (not verified)";
-    $this->assertEqual((string)$comment_author[0], $name, t("RDFa markup for the comment author found."));
+    $this->assertEqual((string) $comment_author[0], $name, t("RDFa markup for the comment author found."));
     $comment_body = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]//div[@class="content"]//div[contains(@class, "comment-body")]//div[@property="content:encoded"]');
-    $this->assertEqual((string)$comment_body[0]->p, $comment->comment, t("RDFa markup for the comment body found."));
+    $this->assertEqual((string) $comment_body[0]->p, $comment->comment, t("RDFa markup for the comment body found."));
   }
 }
 
@@ -610,35 +610,35 @@ class RdfTrackerAttributesTestCase exten
     // success of the following tests, but making it explicit will make
     // debugging easier in case of failure.
     $tracker_about = $this->xpath('//tr[@about=:url]', array(':url' => $url));
-    $this->assertTrue(!empty($tracker_about), t('About attribute found on table row for @user content.', array('@user'=> $user)));
+    $this->assertTrue(!empty($tracker_about), 'About attribute found on table row for ' . $user . ' content.');
 
     // Tests whether the title has the correct property attribute.
     $tracker_title = $this->xpath('//tr[@about=:url]/td[@property="dc:title" and @datatype=""]', array(':url' => $url));
-    $this->assertTrue(!empty($tracker_title), t('Title property attribute found on @user content.', array('@user'=> $user)));
+    $this->assertTrue(!empty($tracker_title), 'Title property attribute found on ' . $user . ' content.');
 
     // Tests whether the relationship between the content and user has been set.
     $tracker_user = $this->xpath('//tr[@about=:url]//td[contains(@rel, "sioc:has_creator")]//*[contains(@typeof, "sioc:UserAccount") and contains(@property, "foaf:name")]', array(':url' => $url));
-    $this->assertTrue(!empty($tracker_user), t('Typeof and name property attributes found on @user.', array('@user'=> $user)));
+    $this->assertTrue(!empty($tracker_user), 'Typeof and name property attributes found on ' . $user . '.');
     // There should be an about attribute on logged in users and no about
     // attribute for anonymous users.
     $tracker_user = $this->xpath('//tr[@about=:url]//td[@rel="sioc:has_creator"]/*[@about]', array(':url' => $url));
     if ($node->uid == 0) {
-      $this->assertTrue(empty($tracker_user), t('No about attribute is present on @user.', array('@user'=> $user)));
+      $this->assertTrue(empty($tracker_user), 'No about attribute is present on ' . $user . '.');
     }
     elseif ($node->uid > 0) {
-      $this->assertTrue(!empty($tracker_user), t('About attribute is present on @user.', array('@user'=> $user)));
+      $this->assertTrue(!empty($tracker_user), 'About attribute is present on ' . $user . '.');
     }
 
     // Tests whether the property has been set for number of comments.
     $tracker_replies = $this->xpath('//tr[@about=:url]//td[contains(@property, "sioc:num_replies") and contains(@content, "0") and @datatype="xsd:integer"]', array(':url' => $url));
-    $this->assertTrue($tracker_replies, t('Num replies property and content attributes found on @user content.', array('@user'=> $user)));
+    $this->assertTrue($tracker_replies, 'Num replies property and content attributes found on ' . $user . ' content.');
 
     // Tests that the appropriate RDFa markup to annotate the latest activity
     // date has been added to the tracker output before comments have been
     // posted, meaning the latest activity reflects changes to the node itself.
     $isoDate = date('c', $node->changed);
     $tracker_activity = $this->xpath('//tr[@about=:url]//td[contains(@property, "dc:modified") and contains(@property, "sioc:last_activity_date") and contains(@datatype, "xsd:dateTime") and @content=:date]', array(':url' => $url, ':date' => $isoDate));
-    $this->assertTrue(!empty($tracker_activity), t('Latest activity date and changed properties found when there are no comments on @user content. Latest activity date content is correct.', array('@user'=> $user)));
+    $this->assertTrue(!empty($tracker_activity), 'Latest activity date and changed properties found when there are no comments on ' . $user . ' content. Latest activity date content is correct.');
 
     // Tests that the appropriate RDFa markup to annotate the latest activity
     // date has been added to the tracker output after a comment is posted.
@@ -651,7 +651,7 @@ class RdfTrackerAttributesTestCase exten
 
     // Tests whether the property has been set for number of comments.
     $tracker_replies = $this->xpath('//tr[@about=:url]//td[contains(@property, "sioc:num_replies") and contains(@content, "1") and @datatype="xsd:integer"]', array(':url' => $url));
-    $this->assertTrue($tracker_replies, t('Num replies property and content attributes found on @user content.', array('@user'=> $user)));
+    $this->assertTrue($tracker_replies, 'Num replies property and content attributes found on ' . $user . ' content.');
 
     // Need to query database directly to obtain last_activity_date because
     // it cannot be accessed via node_load().
@@ -661,7 +661,7 @@ class RdfTrackerAttributesTestCase exten
     }
     $isoDate = date('c', $expected_last_activity_date);
     $tracker_activity = $this->xpath('//tr[@about=:url]//td[@property="sioc:last_activity_date" and @datatype="xsd:dateTime" and @content=:date]', array(':url' => $url, ':date' => $isoDate));
-    $this->assertTrue(!empty($tracker_activity), t('Latest activity date found when there are comments on @user content. Latest activity date content is correct.', array('@user'=> $user)));
+    $this->assertTrue(!empty($tracker_activity), 'Latest activity date found when there are comments on ' . $user . ' content. Latest activity date content is correct.');
   }
 }
 
Index: modules/search/search.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.test,v
retrieving revision 1.65
diff -u -p -r1.65 search.test
--- modules/search/search.test	22 Jul 2010 16:16:42 -0000	1.65
+++ modules/search/search.test	5 Aug 2010 00:22:24 -0000
@@ -91,14 +91,14 @@ class SearchMatchTestCase extends Drupal
    */
   function _testQueries() {
     /*
-      Note: OR queries that include short words in OR groups are only accepted
-      if the ORed terms are ANDed with at least one long word in the rest of the query.
+     Note: OR queries that include short words in OR groups are only accepted
+     if the ORed terms are ANDed with at least one long word in the rest of the query.
 
-      e.g. enim dolore OR ut = enim (dolore OR ut) = (enim dolor) OR (enim ut) -> good
-      e.g. dolore OR ut = (dolore) OR (ut) -> bad
+     e.g. enim dolore OR ut = enim (dolore OR ut) = (enim dolor) OR (enim ut) -> good
+     e.g. dolore OR ut = (dolore) OR (ut) -> bad
 
-      This is a design limitation to avoid full table scans.
-    */
+     This is a design limitation to avoid full table scans.
+     */
     $queries = array(
       // Simple AND queries.
       'ipsum' => array(1),
@@ -396,7 +396,7 @@ class SearchRankingTestCase extends Drup
     variable_set('statistics_count_content_views', 1);
 
     // Then View one of the nodes a bunch of times.
-    for ($i = 0; $i < 5; $i ++) {
+    for ($i = 0; $i < 5; $i++) {
       $this->drupalGet('node/' . $nodes['views'][1]->nid);
     }
 
@@ -419,7 +419,7 @@ class SearchRankingTestCase extends Drup
   function testHTMLRankings() {
     // Login with sufficient privileges.
     $this->drupalLogin($this->drupalCreateUser(array('create page content')));
-    
+
     // Test HTML tags with different weights.
     $sorted_tags = array('h1', 'h2', 'h3', 'h4', 'a', 'h5', 'h6', 'notag');
     $shuffled_tags = $sorted_tags;
@@ -451,7 +451,7 @@ class SearchRankingTestCase extends Drup
 
     // Refresh variables after the treatment.
     $this->refreshVariables();
-    
+
     // Disable all other rankings.
     $node_ranks = array('sticky', 'promote', 'recent', 'comments', 'views');
     foreach ($node_ranks as $node_rank) {
@@ -464,7 +464,8 @@ class SearchRankingTestCase extends Drup
       // Assert the results.
       if ($tag == 'notag') {
         $this->assertEqual($set[$tag_rank]['node']->nid, $nodes[$tag]->nid, 'Search tag ranking for plain text order.');
-      } else {
+      }
+      else {
         $this->assertEqual($set[$tag_rank]['node']->nid, $nodes[$tag]->nid, 'Search tag ranking for "&lt;' . $sorted_tags[$tag_rank] . '&gt;" order.');
       }
     }
@@ -489,7 +490,7 @@ class SearchRankingTestCase extends Drup
 
       // Assert the results.
       $this->assertEqual($set[0]['node']->nid, $node->nid, 'Search tag ranking for "&lt;' . $tag . '&gt;" order.');
-      
+
       // Delete node so it doesn't show up in subsequent search results.
       node_delete($node->nid);
     }
@@ -506,8 +507,8 @@ class SearchRankingTestCase extends Drup
 
     // See testRankings() above - build a node that will rank high for sticky.
     $settings = array(
-      'type' => 'page', 
-      'title' => array(LANGUAGE_NONE => array(array('value' => 'Drupal rocks'))), 
+      'type' => 'page',
+      'title' => array(LANGUAGE_NONE => array(array('value' => 'Drupal rocks'))),
       'body' => array(LANGUAGE_NONE => array(array('value' => "Drupal's search rocks"))),
       'sticky' => 1,
     );
@@ -811,7 +812,7 @@ class SearchCommentTestCase extends Drup
     $this->setRolePermissions(DRUPAL_AUTHENTICATED_RID, TRUE, TRUE);
     $this->setRolePermissions($this->admin_role, TRUE, FALSE);
     $this->checkCommentAccess('Admin user has access comments permission and no search permission, but comments should be indexed because admin user inherits authenticated user\'s permission to search', TRUE);
-    
+
   }
 
   /**
@@ -848,9 +849,9 @@ class SearchCommentTestCase extends Drup
 
 /**
  * Tests that comment count display toggles properly on comment status of node
- * 
+ *
  * Issue 537278
- * 
+ *
  * - Nodes with comment status set to Open should always how comment counts
  * - Nodes with comment status set to Closed should show comment counts
  *     only when there are comments
@@ -859,7 +860,7 @@ class SearchCommentTestCase extends Drup
 class SearchCommentCountToggleTestCase extends DrupalWebTestCase {
   protected $searching_user;
   protected $searchable_nodes;
-  
+
   public static function getInfo() {
     return array(
       'name' => 'Comment count toggle',
@@ -876,23 +877,23 @@ class SearchCommentCountToggleTestCase e
 
     // Create initial nodes.
     $node_params = array('type' => 'article', 'body' => array(LANGUAGE_NONE => array(array('value' => 'SearchCommentToggleTestCase'))));
-    
+
     $this->searchable_nodes['1 comment'] = $this->drupalCreateNode($node_params);
     $this->searchable_nodes['0 comments'] = $this->drupalCreateNode($node_params);
-    
+
     // Login with sufficient privileges.
     $this->drupalLogin($this->searching_user);
-    
+
     // Create a comment array
     $edit_comment = array();
     $edit_comment['subject'] = $this->randomName();
     $edit_comment['comment_body[' . LANGUAGE_NONE . '][0][value]'] = $this->randomName();
     $filtered_html_format_id = db_query_range('SELECT format FROM {filter_format} WHERE name = :name', 0, 1, array(':name' => 'Filtered HTML'))->fetchField();
     $edit_comment['comment_body[' . LANGUAGE_NONE . '][0][format]'] = $filtered_html_format_id;
-    
+
     // Post comment to the test node with comment
     $this->drupalPost('comment/reply/' . $this->searchable_nodes['1 comment']->nid, $edit_comment, t('Save'));
-    
+
     // First update the index. This does the initial processing.
     node_update_index();
 
@@ -915,13 +916,13 @@ class SearchCommentCountToggleTestCase e
     $this->drupalPost('', $edit, t('Search'));
     $this->assertText(t('0 comments'), t('Empty comment count displays for nodes with comment status set to Open'));
     $this->assertText(t('1 comment'), t('Non-empty comment count displays for nodes with comment status set to Open'));
-    
+
     // Test comment count display for nodes with comment status set to Closed
     $this->searchable_nodes['0 comments']->comment = COMMENT_NODE_CLOSED;
     node_save($this->searchable_nodes['0 comments']);
     $this->searchable_nodes['1 comment']->comment = COMMENT_NODE_CLOSED;
     node_save($this->searchable_nodes['1 comment']);
-    
+
     $this->drupalPost('', $edit, t('Search'));
     $this->assertNoText(t('0 comments'), t('Empty comment count does not display for nodes with comment status set to Closed'));
     $this->assertText(t('1 comment'), t('Non-empty comment count displays for nodes with comment status set to Closed'));
@@ -930,8 +931,8 @@ class SearchCommentCountToggleTestCase e
     $this->searchable_nodes['0 comments']->comment = COMMENT_NODE_HIDDEN;
     node_save($this->searchable_nodes['0 comments']);
     $this->searchable_nodes['1 comment']->comment = COMMENT_NODE_HIDDEN;
-    node_save($this->searchable_nodes['1 comment']);    
-    
+    node_save($this->searchable_nodes['1 comment']);
+
     $this->drupalPost('', $edit, t('Search'));
     $this->assertNoText(t('0 comments'), t('Empty comment count does not display for nodes with comment status set to Hidden'));
     $this->assertNoText(t('1 comment'), t('Non-empty comment count does not display for nodes with comment status set to Hidden'));
Index: modules/shortcut/shortcut.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/shortcut/shortcut.test,v
retrieving revision 1.3
diff -u -p -r1.3 shortcut.test
--- modules/shortcut/shortcut.test	30 Jun 2010 15:12:59 -0000	1.3
+++ modules/shortcut/shortcut.test	5 Aug 2010 00:22:24 -0000
@@ -74,7 +74,7 @@ class ShortcutTestCase extends DrupalWeb
 
   /**
    * Extracts information from shortcut set links.
-   * 
+   *
    * @param object $set
    *   The shortcut set object to extract information from.
    * @param string $key
@@ -131,7 +131,7 @@ class ShortcutLinksTestCase extends Shor
       $this->assertResponse(200);
       $saved_set = shortcut_set_load($set->set_name);
       $paths = $this->getShortcutInformation($saved_set, 'link_path');
-      $this->assertTrue(in_array($test['path'], $paths), 'Shortcut created: '. $test['path']);
+      $this->assertTrue(in_array($test['path'], $paths), 'Shortcut created: ' . $test['path']);
       $this->assertLink($title, 0, 'Shortcut link found on the page.');
     }
   }
@@ -283,7 +283,7 @@ class ShortcutSetsTestCase extends Short
    */
   function testShortcutSetRename() {
     $set = $this->set;
-    
+
     $new_title = $this->randomName(10);
     $this->drupalPost('admin/config/user-interface/shortcut/' . $set->set_name . '/edit', array('title' => $new_title), t('Save'));
     $set = shortcut_set_load($set->set_name);
@@ -299,7 +299,7 @@ class ShortcutSetsTestCase extends Short
     $this->drupalPost('admin/config/user-interface/shortcut/' . $set->set_name . '/edit', array('title' => $existing_title), t('Save'));
     $this->assertRaw(t('The shortcut set %name already exists. Choose another name.', array('%name' => $existing_title)));
     $set = shortcut_set_load($set->set_name);
-    $this->assertNotEqual($set->title, $existing_title, t('The shortcut set %title cannot be renamed to %new-title because a shortcut set with that title already exists.', array('%title' => $set->title, '%new-title' => $existing_title)));
+    $this->assertNotEqual($set->title, $existing_title, 'The shortcut set ' . $set->title . ' cannot be renamed to ' . $existing_title . ' because a shortcut set with that title already exists.');
   }
 
   /**
Index: modules/simpletest/tests/actions.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/actions.test,v
retrieving revision 1.16
diff -u -p -r1.16 actions.test
--- modules/simpletest/tests/actions.test	26 May 2010 11:26:49 -0000	1.16
+++ modules/simpletest/tests/actions.test	5 Aug 2010 00:22:24 -0000
@@ -120,7 +120,7 @@ class ActionLoopTestCase extends DrupalW
     $loop_started = FALSE;
     foreach ($result as $row) {
       $expected_message = array_shift($expected);
-      $this->assertEqual($row->message, $expected_message, t('Expected message %expected, got %message.', array('%expected' => $expected_message, '%message' => $row->message)));
+      $this->assertEqual($row->message, $expected_message, 'Expected message ' . $expected_message . ', got ' . $row->message . '.');
     }
     $this->assertTrue(empty($expected), t('All expected messages found.'));
   }
Index: modules/simpletest/tests/ajax.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/ajax.test,v
retrieving revision 1.12
diff -u -p -r1.12 ajax.test
--- modules/simpletest/tests/ajax.test	30 Jul 2010 02:47:28 -0000	1.12
+++ modules/simpletest/tests/ajax.test	5 Aug 2010 00:22:24 -0000
@@ -192,7 +192,7 @@ class AJAXFormValuesTestCase extends AJA
    */
   function testSimpleAJAXFormValue() {
     // Verify form values of a select element.
-    foreach(array('red', 'green', 'blue') as $item) {
+    foreach (array('red', 'green', 'blue') as $item) {
       $edit = array(
         'select' => $item,
       );
@@ -202,7 +202,7 @@ class AJAXFormValuesTestCase extends AJA
     }
 
     // Verify form values of a checkbox element.
-    foreach(array(FALSE, TRUE) as $item) {
+    foreach (array(FALSE, TRUE) as $item) {
       $edit = array(
         'checkbox' => $item,
       );
@@ -282,12 +282,12 @@ class AJAXMultiFormTestCase extends AJAX
     preg_match('/jQuery\.extend\(Drupal\.settings, (.*?)\);/', $this->content, $matches);
     $settings = drupal_json_decode($matches[1]);
     foreach ($field_xpaths as $form_id => $field_xpath) {
-      for ($i=0; $i<2; $i++) {
+      for ($i = 0; $i < 2; $i++) {
         $button = $this->xpath($field_xpath . $button_xpath_suffix);
         $button_id = (string) $button[0]['id'];
         $commands = $this->drupalPostAJAX(NULL, array(), array($button_name => $button_value), 'system/ajax', array(), array(), $form_id, $settings['ajax'][$button_id]);
         $settings = array_merge_recursive($settings, $commands[0]['settings']);
-        $this->assert(count($this->xpath($field_xpath . $field_items_xpath_suffix)) == $i+2, t('Found the correct number of field items after an AJAX submission.'));
+        $this->assert(count($this->xpath($field_xpath . $field_items_xpath_suffix)) == $i + 2, t('Found the correct number of field items after an AJAX submission.'));
         $this->assertFieldByXPath($field_xpath . $button_xpath_suffix, NULL, t('Found the "add more" button after an AJAX submission.'));
         $this->assertNoDuplicateIds(t('Updated page contains unique IDs'), 'Other');
       }
Index: modules/simpletest/tests/batch.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/batch.test,v
retrieving revision 1.9
diff -u -p -r1.9 batch.test
--- modules/simpletest/tests/batch.test	6 May 2010 05:59:31 -0000	1.9
+++ modules/simpletest/tests/batch.test	5 Aug 2010 00:22:24 -0000
@@ -149,7 +149,7 @@ class BatchProcessingTestCase extends Dr
    *   TRUE on pass, FALSE on fail.
    */
   function assertBatchMessages($texts, $message) {
-    $pattern = '|' . implode('.*', $texts) .'|s';
+    $pattern = '|' . implode('.*', $texts) . '|s';
     return $this->assertPattern($pattern, $message);
   }
 
@@ -357,10 +357,10 @@ class BatchPercentagesUnitTestCase exten
       $current = $arguments['current'];
       $actual_result = _batch_api_percentage($total, $current);
       if ($actual_result === $expected_result) {
-        $this->pass(t('Expected the batch api percentage at the state @numerator/@denominator to be @expected%, and got @actual%.', array('@numerator' => $current, '@denominator' => $total, '@expected' => $expected_result, '@actual' => $actual_result)));
+        $this->pass('Expected the batch api percentage at the state ' . $current . '/' . $total . ' to be ' . $expected_result . '%, and got ' . $actual_result . '%.');
       }
       else {
-        $this->fail(t('Expected the batch api percentage at the state @numerator/@denominator to be @expected%, but got @actual%.', array('@numerator' => $current, '@denominator' => $total, '@expected' => $expected_result, '@actual' => $actual_result)));
+        $this->fail('Expected the batch api percentage at the state ' . $current . '/' . $total . ' to be ' . $expected_result . '%, but got ' . $actual_result . '%.');
       }
     }
   }
Index: modules/simpletest/tests/cache.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/cache.test,v
retrieving revision 1.10
diff -u -p -r1.10 cache.test
--- modules/simpletest/tests/cache.test	13 Sep 2009 17:49:51 -0000	1.10
+++ modules/simpletest/tests/cache.test	5 Aug 2010 00:22:24 -0000
@@ -135,7 +135,7 @@ class CacheSavingCase extends CacheTestC
    * Test the saving and restoring of an array.
    */
   function testArray() {
-    $this->checkVariable(array('drupal1', 'drupal2' => 'drupal3', 'drupal4' => array('drupal5', 'drupal6')));
+    $this->checkVariable(array('drupal1','drupal2' => 'drupal3', 'drupal4' => array('drupal5', 'drupal6')));
   }
 
   /**
@@ -145,7 +145,7 @@ class CacheSavingCase extends CacheTestC
     $test_object = new stdClass();
     $test_object->test1 = $this->randomName(100);
     $test_object->test2 = 100;
-    $test_object->test3 = array('drupal1', 'drupal2' => 'drupal3', 'drupal4' => array('drupal5', 'drupal6'));
+    $test_object->test3 = array('drupal1','drupal2' => 'drupal3', 'drupal4' => array('drupal5', 'drupal6'));
 
     cache_set('test_object', $test_object, 'cache');
     $cache = cache_get('test_object', 'cache');
@@ -158,7 +158,7 @@ class CacheSavingCase extends CacheTestC
   function checkVariable($var) {
     cache_set('test_var', $var, 'cache');
     $cache = cache_get('test_var', 'cache');
-    $this->assertTrue(isset($cache->data) && $cache->data === $var, t('@type is saved and restored properly.', array('@type' => ucfirst(gettype($var)))));
+    $this->assertTrue(isset($cache->data) && $cache->data === $var, ucfirst(gettype($var)) . ' is saved and restored properly.');
   }
 }
 
Index: modules/simpletest/tests/common.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/common.test,v
retrieving revision 1.117
diff -u -p -r1.117 common.test
--- modules/simpletest/tests/common.test	30 Jul 2010 02:47:28 -0000	1.117
+++ modules/simpletest/tests/common.test	5 Aug 2010 00:22:24 -0000
@@ -83,7 +83,7 @@ class CommonURLUnitTest extends DrupalWe
     $path = "<SCRIPT>alert('XSS')</SCRIPT>";
     $link = l($text, $path);
     $sanitized_path = check_url(url($path));
-    $this->assertTrue(strpos($link, $sanitized_path) !== FALSE, t('XSS attack @path was filtered', array('@path' => $path)));
+    $this->assertTrue(strpos($link, $sanitized_path) !== FALSE, 'XSS attack ' . $path . ' was filtered');
   }
 
   /*
@@ -91,7 +91,7 @@ class CommonURLUnitTest extends DrupalWe
    */
   function testLActiveClass() {
     $link = l($this->randomName(), $_GET['q']);
-    $this->assertTrue($this->hasClass($link, 'active'), t('Class @class is present on link to the current page', array('@class' => 'active')));
+    $this->assertTrue($this->hasClass($link, 'active'), 'Class ' . 'active' . ' is present on link to the current page');
   }
 
   /**
@@ -100,8 +100,8 @@ class CommonURLUnitTest extends DrupalWe
   function testLCustomClass() {
     $class = $this->randomName();
     $link = l($this->randomName(), $_GET['q'], array('attributes' => array('class' => array($class))));
-    $this->assertTrue($this->hasClass($link, $class), t('Custom class @class is present on link when requested', array('@class' => $class)));
-    $this->assertTrue($this->hasClass($link, 'active'), t('Class @class is present on link to the current page', array('@class' => 'active')));
+    $this->assertTrue($this->hasClass($link, $class), 'Custom class ' . $class . ' is present on link when requested');
+    $this->assertTrue($this->hasClass($link, 'active'), 'Class ' . 'active' . ' is present on link to the current page');
   }
 
   private function hasClass($link, $class) {
@@ -354,23 +354,23 @@ class CommonXssUnitTest extends DrupalUn
    * Check that invalid multi-byte sequences are rejected.
    */
   function testInvalidMultiByte() {
-     // Ignore PHP 5.3+ invalid multibyte sequence warning.
-     $text = @check_plain("Foo\xC0barbaz");
-     $this->assertEqual($text, '', 'check_plain() rejects invalid sequence "Foo\xC0barbaz"');
-     $text = check_plain("Fooÿñ");
-     $this->assertEqual($text, "Fooÿñ", 'check_plain() accepts valid sequence "Fooÿñ"');
-     $text = filter_xss("Foo\xC0barbaz");
-     $this->assertEqual($text, '', 'filter_xss() rejects invalid sequence "Foo\xC0barbaz"');
-     $text = filter_xss("Fooÿñ");
-     $this->assertEqual($text, "Fooÿñ", 'filter_xss() accepts valid sequence Fooÿñ');
+    // Ignore PHP 5.3+ invalid multibyte sequence warning.
+    $text = @check_plain("Foo\xC0barbaz");
+    $this->assertEqual($text, '', 'check_plain() rejects invalid sequence "Foo\xC0barbaz"');
+    $text = check_plain("Fooÿñ");
+    $this->assertEqual($text, "Fooÿñ", 'check_plain() accepts valid sequence "Fooÿñ"');
+    $text = filter_xss("Foo\xC0barbaz");
+    $this->assertEqual($text, '', 'filter_xss() rejects invalid sequence "Foo\xC0barbaz"');
+    $text = filter_xss("Fooÿñ");
+    $this->assertEqual($text, "Fooÿñ", 'filter_xss() accepts valid sequence Fooÿñ');
   }
 
   /**
    * Check that special characters are escaped.
    */
   function testEscaping() {
-     $text = check_plain("<script>");
-     $this->assertEqual($text, '&lt;script&gt;', 'check_plain() escapes &lt;script&gt;');
+    $text = check_plain("<script>");
+    $this->assertEqual($text, '&lt;script&gt;', 'check_plain() escapes &lt;script&gt;');
   }
 
   /**
@@ -533,11 +533,11 @@ class DrupalTagsHandlingTestCase extends
     $original = $this->validTags;
     foreach ($tags as $tag) {
       $key = array_search($tag, $original);
-      $this->assertTrue($key, t('Make sure tag %tag shows up in the final tags array (originally %original)', array('%tag' => $tag, '%original' => $key)));
+      $this->assertTrue($key, 'Make sure tag ' . $tag . ' shows up in the final tags array (originally ' . $key . ')');
       unset($original[$key]);
     }
     foreach ($original as $leftover) {
-      $this->fail(t('Leftover tag %leftover was left over.', array('%leftover' => $leftover)));
+      $this->fail('Leftover tag ' . $leftover . ' was left over.');
     }
   }
 }
@@ -841,11 +841,11 @@ class CascadingStylesheetsUnitTest exten
     foreach ($testfiles as $file) {
       $expected = file_get_contents("$path/$file.unoptimized.css");
       $unoptimized_output = drupal_load_stylesheet("$path/$file.unoptimized.css", FALSE);
-      $this->assertEqual($unoptimized_output, $expected, t('Unoptimized CSS file has expected contents (@file)', array('@file' => $file)));
+      $this->assertEqual($unoptimized_output, $expected, 'Unoptimized CSS file has expected contents (' . $file . ')');
 
       $expected = file_get_contents("$path/$file.optimized.css");
       $optimized_output = drupal_load_stylesheet("$path/$file", TRUE);
-      $this->assertEqual($optimized_output, $expected, t('Optimized CSS file has expected contents (@file)', array('@file' => $file)));
+      $this->assertEqual($optimized_output, $expected, 'Optimized CSS file has expected contents (' . $file . ')');
     }
   }
 }
@@ -886,7 +886,7 @@ class DrupalHTTPRequestTestCase extends 
 
     // 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->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"'));
 
@@ -903,7 +903,7 @@ class DrupalHTTPRequestTestCase extends 
       timer_start(__METHOD__);
       $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(1.8 < $time && $time < 5, 'Request timed out (' . $time . ' seconds).');
       $this->assertTrue($result->error, t('An error message was returned.'));
       $this->assertEqual($result->code, HTTP_REQUEST_TIMEOUT, t('Proper error code was returned.'));
     }
@@ -930,16 +930,16 @@ class DrupalHTTPRequestTestCase extends 
     $this->assertFalse(isset($redirect_301->redirect_code), t('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->code, -1002, t('301 redirect to invalid URL returned with error code !error.', array('!error' => $redirect_invalid->error)));
-    $this->assertEqual($redirect_invalid->error, 'missing schema', t('301 redirect to invalid URL returned with error message "!error".', array('!error' => $redirect_invalid->error)));
+    $this->assertEqual($redirect_invalid->code, -1002, '301 redirect to invalid URL returned with error code ' . $redirect_invalid->error . '.');
+    $this->assertEqual($redirect_invalid->error, 'missing schema', '301 redirect to invalid URL returned with error message "' . $redirect_invalid->error . '".');
 
     $redirect_invalid = drupal_http_request(url('system-test/redirect-noparse', array('absolute' => TRUE)), array('max_redirects' => 1));
-    $this->assertEqual($redirect_invalid->code, -1001, t('301 redirect to invalid URL returned with error message code "!error".', array('!error' => $redirect_invalid->error)));
-    $this->assertEqual($redirect_invalid->error, 'unable to parse URL', t('301 redirect to invalid URL returned with error message "!error".', array('!error' => $redirect_invalid->error)));
+    $this->assertEqual($redirect_invalid->code, -1001, '301 redirect to invalid URL returned with error message code "' . $redirect_invalid->error . '".');
+    $this->assertEqual($redirect_invalid->error, 'unable to parse URL', '301 redirect to invalid URL returned with error message "' . $redirect_invalid->error . '".');
 
     $redirect_invalid = drupal_http_request(url('system-test/redirect-invalid-scheme', array('absolute' => TRUE)), array('max_redirects' => 1));
-    $this->assertEqual($redirect_invalid->code, -1003, t('301 redirect to invalid URL returned with error code !error.', array('!error' => $redirect_invalid->error)));
-    $this->assertEqual($redirect_invalid->error, 'invalid schema ftp', t('301 redirect to invalid URL returned with error message "!error".', array('!error' => $redirect_invalid->error)));
+    $this->assertEqual($redirect_invalid->code, -1003, '301 redirect to invalid URL returned with error code ' . $redirect_invalid->error . '.');
+    $this->assertEqual($redirect_invalid->error, 'invalid schema ftp', '301 redirect to invalid URL returned with error message "' . $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.'));
@@ -990,13 +990,13 @@ class DrupalSetContentTestCase extends D
     // Ensure drupal_get_region_content returns expected results when fetching all regions.
     $content = drupal_get_region_content(NULL, $delimiter);
     foreach ($content as $region => $region_content) {
-      $this->assertEqual($region_content, $values[$region], t('@region region text verified when fetching all regions', array('@region' => $region)));
+      $this->assertEqual($region_content, $values[$region], $region . ' region text verified when fetching all regions');
     }
 
     // Ensure drupal_get_region_content returns expected results when fetching a single region.
     foreach ($block_regions as $region) {
       $region_content = drupal_get_region_content($region, $delimiter);
-      $this->assertEqual($region_content, $values[$region], t('@region region text verified when fetching single region.', array('@region' => $region)));
+      $this->assertEqual($region_content, $values[$region], $region . ' region text verified when fetching single region.');
     }
   }
 }
@@ -1479,7 +1479,7 @@ class ValidUrlTestCase extends DrupalUni
       foreach ($valid_absolute_urls as $url) {
         $test_url = $scheme . '://' . $url;
         $valid_url = valid_url($test_url, TRUE);
-        $this->assertTrue($valid_url, t('@url is a valid url.', array('@url' => $test_url)));
+        $this->assertTrue($valid_url, $test_url . ' is a valid url.');
       }
     }
   }
@@ -1499,7 +1499,7 @@ class ValidUrlTestCase extends DrupalUni
       foreach ($invalid_ablosule_urls as $url) {
         $test_url = $scheme . '://' . $url;
         $valid_url = valid_url($test_url, TRUE);
-        $this->assertFalse($valid_url, t('@url is NOT a valid url.', array('@url' => $test_url)));
+        $this->assertFalse($valid_url, $test_url . ' is NOT a valid url.');
       }
     }
   }
@@ -1520,7 +1520,7 @@ class ValidUrlTestCase extends DrupalUni
       foreach ($valid_relative_urls as $url) {
         $test_url = $front . $url;
         $valid_url = valid_url($test_url);
-        $this->assertTrue($valid_url, t('@url is a valid url.', array('@url' => $test_url)));
+        $this->assertTrue($valid_url, $test_url . ' is a valid url.');
       }
     }
   }
@@ -1539,7 +1539,7 @@ class ValidUrlTestCase extends DrupalUni
       foreach ($invalid_relative_urls as $url) {
         $test_url = $front . $url;
         $valid_url = valid_url($test_url);
-        $this->assertFALSE($valid_url, t('@url is NOT a valid url.', array('@url' => $test_url)));
+        $this->assertFALSE($valid_url, $test_url . ' is NOT a valid url.');
       }
     }
   }
@@ -1738,11 +1738,11 @@ class DrupalErrorCollectionUnitTest exte
    * Assert that a collected error matches what we are expecting.
    */
   function assertError($error, $group, $function, $file, $message = NULL) {
-    $this->assertEqual($error['group'], $group, t("Group was %group", array('%group' => $group)));
-    $this->assertEqual($error['caller']['function'], $function, t("Function was %function", array('%function' => $function)));
-    $this->assertEqual(basename($error['caller']['file']), $file, t("File was %file", array('%file' => $file)));
+    $this->assertEqual($error['group'], $group, "Group was " . $group . "");
+    $this->assertEqual($error['caller']['function'], $function, "Function was " . $function . "");
+    $this->assertEqual(basename($error['caller']['file']), $file, "File was " . $file . "");
     if (isset($message)) {
-      $this->assertEqual($error['message'], $message, t("Message was %message", array('%message' => $message)));
+      $this->assertEqual($error['message'], $message, "Message was " . $message . "");
     }
   }
 }
@@ -1919,7 +1919,7 @@ class DrupalJSONTest extends DrupalUnitT
     // Setup a string with the full ASCII table.
     // @todo: Add tests for non-ASCII characters and Unicode.
     $str = '';
-    for ($i=0; $i < 128; $i++) {
+    for ($i = 0; $i < 128; $i++) {
       $str .= chr($i);
     }
     // Characters that must be escaped.
@@ -1929,7 +1929,7 @@ class DrupalJSONTest extends DrupalUnitT
     // Verify there aren't character encoding problems with the source string.
     $this->assertIdentical(strlen($str), 128, t('A string with the full ASCII table has the correct length.'));
     foreach ($html_unsafe as $char) {
-      $this->assertTrue(strpos($str, $char) > 0, t('A string with the full ASCII table includes @s.', array('@s' => $char)));
+      $this->assertTrue(strpos($str, $char) > 0, 'A string with the full ASCII table includes ' . $char . '.');
     }
 
     // Verify that JSON encoding produces a string with all of the characters.
@@ -1945,11 +1945,11 @@ class DrupalJSONTest extends DrupalUnitT
     $source = array(TRUE, FALSE, 0, 1, '0', '1', $str, array('key1' => $str, 'key2' => array('nested' => TRUE)));
     $json = drupal_json_encode($source);
     foreach ($html_unsafe as $char) {
-      $this->assertTrue(strpos($json, $char) === FALSE, t('A JSON encoded string does not contain @s.', array('@s' => $char)));
+      $this->assertTrue(strpos($json, $char) === FALSE, 'A JSON encoded string does not contain ' . $char . '.');
     }
     // Verify that JSON encoding escapes the HTML unsafe characters
     foreach ($html_unsafe_escaped as $char) {
-      $this->assertTrue(strpos($json, $char) > 0, t('A JSON encoded string contains @s.', array('@s' => $char)));
+      $this->assertTrue(strpos($json, $char) > 0, 'A JSON encoded string contains ' . $char . '.');
     }
     $json_decoded = drupal_json_decode($json);
     $this->assertNotIdentical($source, $json, t('An array encoded in JSON is not identical to the source.'));
Index: modules/simpletest/tests/database_test.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/database_test.test,v
retrieving revision 1.95
diff -u -p -r1.95 database_test.test
--- modules/simpletest/tests/database_test.test	28 Jul 2010 10:52:12 -0000	1.95
+++ modules/simpletest/tests/database_test.test	5 Aug 2010 00:22:25 -0000
@@ -48,7 +48,7 @@ class DatabaseTestCase extends DrupalWeb
     }
 
     foreach ($schema as $name => $data) {
-      $this->assertTrue(db_table_exists($name), t('Table @name created successfully.', array('@name' => $name)));
+      $this->assertTrue(db_table_exists($name), 'Table ' . $name . ' created successfully.');
     }
   }
 
@@ -506,7 +506,7 @@ class DatabaseInsertTestCase extends Dat
       'name' => 'Larry',
       'age' => '30',
     ));
-    $query->execute();  // This should run the insert, but leave the fields intact.
+    $query->execute(); // This should run the insert, but leave the fields intact.
 
     // We should be able to specify values in any order if named.
     $query->values(array(
@@ -573,7 +573,7 @@ class DatabaseInsertTestCase extends Dat
     // re-ordered.
     $query->addExpression('tp.age', 'age');
     $query
-      ->fields('tp', array('name','job'))
+      ->fields('tp', array('name', 'job'))
       ->condition('tp.name', 'Meredith');
 
     // The resulting query should be equivalent to:
@@ -613,7 +613,7 @@ class DatabaseInsertLOBTestCase extends 
       ->fields(array('blob1' => $data))
       ->execute();
     $r = db_query('SELECT * FROM {test_one_blob} WHERE id = :id', array(':id' => $id))->fetchAssoc();
-    $this->assertTrue($r['blob1'] === $data, t('Can insert a blob: id @id, @data.', array('@id' => $id, '@data' => serialize($r))));
+    $this->assertTrue($r['blob1'] === $data, 'Can insert a blob: id ' . $id . ', ' . serialize($r) . '.');
   }
 
   /**
@@ -667,7 +667,8 @@ class DatabaseInsertDefaultsTestCase ext
       $result = db_insert('test')->execute();
       // This is only executed if no exception has been thrown.
       $this->fail(t('Expected exception NoFieldsException has not been thrown.'));
-    } catch (NoFieldsException $e) {
+    }
+    catch (NoFieldsException $e) {
       $this->pass(t('Expected exception NoFieldsException has been thrown.'));
     }
 
@@ -934,7 +935,7 @@ class DatabaseUpdateLOBTestCase extends 
       ->execute();
 
     $r = db_query('SELECT * FROM {test_one_blob} WHERE id = :id', array(':id' => $id))->fetchAssoc();
-    $this->assertTrue($r['blob1'] === $data, t('Can update a blob: id @id, @data.', array('@id' => $id, '@data' => serialize($r))));
+    $this->assertTrue($r['blob1'] === $data, 'Can update a blob: id ' . $id . ', ' . serialize($r) . '.');
   }
 
   /**
@@ -1287,7 +1288,7 @@ class DatabaseSelectTestCase extends Dat
       $num_records++;
     }
 
-    $query = (string)$query;
+    $query = (string) $query;
     $expected = "/* Testing query comments */ SELECT test.name AS name, test.age AS age\nFROM \n{test} test";
 
     $this->assertEqual($num_records, 4, t('Returned the correct number of rows.'));
@@ -1331,7 +1332,7 @@ class DatabaseSelectTestCase extends Dat
     // 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->$age_field, 27 * 2, t('Fetched age expression is correct.'));
   }
 
   /**
@@ -1352,8 +1353,8 @@ class DatabaseSelectTestCase extends Dat
     // 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->$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.'));
   }
 
   /**
@@ -1850,7 +1851,7 @@ class DatabaseSelectComplexTestCase exte
     );
 
     foreach ($correct_results as $task => $count) {
-      $this->assertEqual($records[$task], $count, t("Correct number of '@task' records found.", array('@task' => $task)));
+      $this->assertEqual($records[$task], $count, "Correct number of '" . $task . "' records found.");
     }
 
     $this->assertEqual($num_records, 6, t('Returned the correct number of total rows.'));
@@ -1884,7 +1885,7 @@ class DatabaseSelectComplexTestCase exte
     );
 
     foreach ($correct_results as $task => $count) {
-      $this->assertEqual($records[$task], $count, t("Correct number of '@task' records found.", array('@task' => $task)));
+      $this->assertEqual($records[$task], $count, "Correct number of '" . $task . "' records found.");
     }
 
     $this->assertEqual($num_records, 1, t('Returned the correct number of total rows.'));
@@ -2058,7 +2059,7 @@ class DatabaseSelectPagerDefaultTestCase
         $correct_number = $count - ($limit * $page);
       }
 
-      $this->assertEqual(count($data->names), $correct_number, t('Correct number of records returned by pager: @number', array('@number' => $correct_number)));
+      $this->assertEqual(count($data->names), $correct_number, 'Correct number of records returned by pager: ' . $correct_number);
     }
   }
 
@@ -2092,7 +2093,7 @@ class DatabaseSelectPagerDefaultTestCase
         $correct_number = $count - ($limit * $page);
       }
 
-      $this->assertEqual(count($data->names), $correct_number, t('Correct number of records returned by pager: @number', array('@number' => $correct_number)));
+      $this->assertEqual(count($data->names), $correct_number, 'Correct number of records returned by pager: ' . $correct_number);
     }
   }
 
@@ -2198,8 +2199,8 @@ class DatabaseSelectTableSortDefaultTest
       $first = array_shift($data->tasks);
       $last = array_pop($data->tasks);
 
-      $this->assertEqual($first->task, $sort['first'], t('Items appear in the correct order sorting by @field @sort.', array('@field' => $sort['field'], '@sort' => $sort['sort'])));
-      $this->assertEqual($last->task, $sort['last'], t('Items appear in the correct order sorting by @field @sort.', array('@field' => $sort['field'], '@sort' => $sort['sort'])));
+      $this->assertEqual($first->task, $sort['first'], 'Items appear in the correct order sorting by ' . $sort['field'] . ' ' . $sort['sort'] . '.');
+      $this->assertEqual($last->task, $sort['last'], 'Items appear in the correct order sorting by ' . $sort['field'] . ' ' . $sort['sort'] . '.');
     }
   }
 }
@@ -2401,7 +2402,7 @@ class DatabaseAlterTestCase extends Data
     $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->$age_field, 27 * 3, t('Fetched age expression is correct.'));
   }
 
   /**
@@ -2441,7 +2442,7 @@ class DatabaseAlterTestCase extends Data
 
     $record = $query->execute()->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->$age_field, 27 * 3, t('Fetched age expression is correct.'));
   }
 }
 
@@ -2566,7 +2567,7 @@ class DatabaseLoggingTestCase extends Da
 
     db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25))->fetchCol();
 
-    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'), array('target' => 'slave'));//->fetchCol();
+    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'), array('target' => 'slave')); //->fetchCol();
 
     $queries1 = Database::getLog('testing1');
 
Index: modules/simpletest/tests/error.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/error.test,v
retrieving revision 1.6
diff -u -p -r1.6 error.test
--- modules/simpletest/tests/error.test	17 Aug 2009 19:14:41 -0000	1.6
+++ modules/simpletest/tests/error.test	5 Aug 2010 00:22:25 -0000
@@ -95,10 +95,10 @@ class DrupalErrorHandlerUnitTest extends
     $this->assertTrue(strpos($this->drupalGetHeader(':status'), '500 Service unavailable (with message)'), t('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));
-    $this->assertText($error_pdo_exception['%message'], t('Found %message in error page.', $error_pdo_exception));
+    $this->assertText($error_pdo_exception['%type'], 'Found ' . $error_pdo_exception['%type'] . ' in error page.');
+    $this->assertText($error_pdo_exception['%message'], 'Found ' . $error_pdo_exception['%message'] . ' in error page.');
     $error_details = t('in %function (line %line of %file)', $error_pdo_exception);
-    $this->assertRaw($error_details, t("Found '!message' in error page.", array('!message' => $error_details)));
+    $this->assertRaw($error_details, "Found '" . $error_details . "' in error page.");
   }
 
   /**
@@ -106,7 +106,7 @@ class DrupalErrorHandlerUnitTest extends
    */
   function assertErrorMessage(array $error) {
     $message = t('%type: %message in %function (line %line of %file).', $error);
-    $this->assertRaw($message, t('Error !message found.', array('!message' => $message)));
+    $this->assertRaw($message, 'Error ' . $message . ' found.');
   }
 
   /**
@@ -114,7 +114,7 @@ class DrupalErrorHandlerUnitTest extends
    */
   function assertNoErrorMessage(array $error) {
     $message = t('%type: %message in %function (line %line of %file).', $error);
-    $this->assertNoRaw($message, t('Error !message not found.', array('!message' => $message)));
+    $this->assertNoRaw($message, 'Error ' . $message . ' not found.');
   }
 }
 
Index: modules/simpletest/tests/file.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/file.test,v
retrieving revision 1.59
diff -u -p -r1.59 file.test
--- modules/simpletest/tests/file.test	26 Jul 2010 03:04:29 -0000	1.59
+++ modules/simpletest/tests/file.test	5 Aug 2010 00:22:25 -0000
@@ -58,13 +58,13 @@ class FileTestCase extends DrupalWebTest
    *   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->uri, $after->uri, t('File path is the same: %file1 == %file2.', array('%file1' => $before->uri, '%file2' => $after->uri)), '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: ' . $before->fid . ' == ' . $after->fid . '.', 'File unchanged');
+    $this->assertEqual($before->uid, $after->uid, 'File owner is the same: ' . $before->uid . ' == ' . $after->uid . '.', 'File unchanged');
+    $this->assertEqual($before->filename, $after->filename, 'File name is the same: ' . $before->filename . ' == ' . $after->filename . '.', 'File unchanged');
+    $this->assertEqual($before->uri, $after->uri, 'File path is the same: ' . $before->uri . ' == ' . $after->uri . '.', 'File unchanged');
+    $this->assertEqual($before->filemime, $after->filemime, 'File MIME type is the same: ' . $before->filemime . ' == ' . $after->filemime . '.', 'File unchanged');
+    $this->assertEqual($before->filesize, $after->filesize, 'File size is the same: ' . $before->filesize . ' == ' . $after->filesize . '.', 'File unchanged');
+    $this->assertEqual($before->status, $after->status, 'File status is the same: ' . $before->status . ' == ' . $after->status . '.', 'File unchanged');
   }
 
   /**
@@ -76,8 +76,8 @@ class FileTestCase extends DrupalWebTest
    *   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->uri, $file2->uri, t('Files have different paths: %file1 != %file2.', array('%file1' => $file1->uri, '%file2' => $file2->uri)), 'Different file');
+    $this->assertNotEqual($file1->fid, $file2->fid, 'Files have different ids: ' . $file1->fid . ' != ' . $file2->fid . '.', 'Different file');
+    $this->assertNotEqual($file1->uri, $file2->uri, 'Files have different paths: ' . $file1->uri . ' != ' . $file2->uri . '.', 'Different file');
   }
 
   /**
@@ -89,8 +89,8 @@ class FileTestCase extends DrupalWebTest
    *   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->uri, $file2->uri, t('Files have the same path: %file1 == %file2.', array('%file1' => $file1->uri, '%file2' => $file2->uri)), 'Same file');
+    $this->assertEqual($file1->fid, $file2->fid, 'Files have the same ids: ' . $file1->fid . ' == %file2.', 'Same file');
+    $this->assertEqual($file1->uri, $file2->uri, 'Files have the same path: ' . $file1->uri . ' == ' . $file2->uri . '.', 'Same file');
   }
 
   /**
@@ -227,16 +227,16 @@ class FileHookTestCase extends FileTestC
     // Determine if there were any expected that were not called.
     $uncalled = array_diff($expected, $actual);
     if (count($uncalled)) {
-      $this->assertTrue(FALSE, t('Expected hooks %expected to be called but %uncalled was not called.', array('%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled))));
+      $this->assertTrue(FALSE, 'Expected hooks ' . implode(', ', $expected) . ' to be called but ' . implode(', ', $uncalled) . ' was not called.');
     }
     else {
-      $this->assertTrue(TRUE, t('All the expected hooks were called: %expected', array('%expected' => implode(', ', $expected))));
+      $this->assertTrue(TRUE, 'All the expected hooks were called: ' . implode(', ', $expected));
     }
 
     // Determine if there were any unexpected calls.
     $unexpected = array_diff($actual, $expected);
     if (count($unexpected)) {
-      $this->assertTrue(FALSE, t('Unexpected hooks were called: %unexpected.', array('%unexpected' => implode(', ', $unexpected))));
+      $this->assertTrue(FALSE, 'Unexpected hooks were called: ' . implode(', ', $unexpected) . '.');
     }
     else {
       $this->assertTrue(TRUE, t('No unexpected hooks were called.'));
@@ -903,7 +903,7 @@ class FileDirectoryTest extends FileTest
     // 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 ' . $temp . '.', 'File');
   }
 
   /**
@@ -917,14 +917,14 @@ class FileDirectoryTest extends FileTest
     $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 ' . $path . ' equals ' . $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 ' . $path . '.', 'File');
 
     // @TODO: Finally we copy a file into a directory several times, to ensure a properly iterating filename suffix.
   }
@@ -1440,7 +1440,7 @@ class FileMoveTest extends FileHookTestC
     $this->assertFileHooksCalled(array('move', 'update'));
 
     // Make sure we got the same file back.
-    $this->assertEqual($source->fid, $result->fid, t("Source file id's' %fid is unchanged after move.", array('%fid' => $source->fid)));
+    $this->assertEqual($source->fid, $result->fid, "Source file id's' " . $source->fid . " is unchanged after move.");
 
     // Reload the file from the database and check that the changes were
     // actually saved.
@@ -2076,7 +2076,7 @@ class FileDownloadTest extends FileTestC
     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->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.'));
 
     // Deny access to all downloads via a -1 header.
@@ -2177,7 +2177,7 @@ class FileURLRewritingTest extends FileT
   /**
    * Test the generating of rewritten shipped file URLs.
    */
-  function testShippedFileURL()  {
+  function testShippedFileURL() {
     // Test generating an URL to a shipped file (i.e. a file that is part of
     // Drupal core, a module or a theme, for example a JavaScript file).
 
@@ -2262,7 +2262,7 @@ class FileNameMungingTest extends FileTe
     $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->assertNotEqual($munged_name, $this->name, t('The new filename (%munged) has been modified from the original (%original)', array('%munged' => $munged_name, '%original' => $this->name)));
+    $this->assertNotEqual($munged_name, $this->name, 'The new filename (' . $munged_name . ') has been modified from the original (' . $this->name . ')');
   }
 
   /**
@@ -2272,7 +2272,7 @@ class FileNameMungingTest extends FileTe
   function testMungeIgnoreInsecure() {
     variable_set('allow_insecure_uploads', 1);
     $munged_name = file_munge_filename($this->name, '');
-    $this->assertIdentical($munged_name, $this->name, t('The original filename (%original) matches the munged filename (%munged) when insecure uploads are enabled.', array('%munged' => $munged_name, '%original' => $this->name)));
+    $this->assertIdentical($munged_name, $this->name, 'The original filename (' . $this->name . ') matches the munged filename (' . $munged_name . ') when insecure uploads are enabled.');
   }
 
   /**
@@ -2281,7 +2281,7 @@ class FileNameMungingTest extends FileTe
   function testMungeIgnoreWhitelisted() {
     // Declare our extension as whitelisted.
     $munged_name = file_munge_filename($this->name, $this->bad_extension);
-    $this->assertIdentical($munged_name, $this->name, t('The new filename (%munged) matches the original (%original) once the extension has been whitelisted.', array('%munged' => $munged_name, '%original' => $this->name)));
+    $this->assertIdentical($munged_name, $this->name, 'The new filename (' . $munged_name . ') matches the original (' . $this->name . ') once the extension has been whitelisted.');
   }
 
   /**
@@ -2338,11 +2338,11 @@ class FileMimeTypeTest extends DrupalWeb
     foreach ($test_case as $input => $expected) {
       // Test stream [URI].
       $output = file_get_mimetype($prefix . $input);
-      $this->assertIdentical($output, $expected, t('Mimetype for %input is %output (expected: %expected).', array('%input' => $input, '%output' => $output, '%expected' => $expected)));
+      $this->assertIdentical($output, $expected, 'Mimetype for ' . $input . ' is ' . $output . ' (expected: ' . $expected . ').');
 
       // Test normal path equivalent
       $output = file_get_mimetype($input);
-      $this->assertIdentical($output, $expected, t('Mimetype (using default mappings) for %input is %output (expected: %expected).', array('%input' => $input, '%output' => $output, '%expected' => $expected)));
+      $this->assertIdentical($output, $expected, 'Mimetype (using default mappings) for ' . $input . ' is ' . $output . ' (expected: ' . $expected . ').');
     }
 
     // Now test passing in the map.
@@ -2374,7 +2374,7 @@ class FileMimeTypeTest extends DrupalWeb
 
     foreach ($test_case as $input => $expected) {
       $output = file_get_mimetype($input, $mapping);
-      $this->assertIdentical($output, $expected, t('Mimetype (using passed-in mappings) for %input is %output (expected: %expected).', array('%input' => $input, '%output' => $output, '%expected' => $expected)));
+      $this->assertIdentical($output, $expected, 'Mimetype (using passed-in mappings) for ' . $input . ' is ' . $output . ' (expected: ' . $expected . ').');
     }
   }
 }
Index: modules/simpletest/tests/filetransfer.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/filetransfer.test,v
retrieving revision 1.6
diff -u -p -r1.6 filetransfer.test
--- modules/simpletest/tests/filetransfer.test	10 Nov 2009 17:27:53 -0000	1.6
+++ modules/simpletest/tests/filetransfer.test	5 Aug 2010 00:22:25 -0000
@@ -80,7 +80,7 @@ class FileTranferTest extends DrupalWebT
 
     $gotit = TRUE;
     try {
-      $this->testConnection->copyDirectory($source, DRUPAL_ROOT . '/'. file_directory_path());
+      $this->testConnection->copyDirectory($source, DRUPAL_ROOT . '/' . file_directory_path());
     }
     catch (FileTransferException $e) {
       $gotit = FALSE;
Index: modules/simpletest/tests/form.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/form.test,v
retrieving revision 1.57
diff -u -p -r1.57 form.test
--- modules/simpletest/tests/form.test	31 Jul 2010 04:01:51 -0000	1.57
+++ modules/simpletest/tests/form.test	5 Aug 2010 00:22:25 -0000
@@ -142,11 +142,7 @@ class FormsTestCase extends DrupalWebTes
       'zero_checkbox_off' => '',
     );
     foreach ($expected_values as $widget => $expected_value) {
-      $this->assertEqual($values[$widget], $expected_value, t('Checkbox %widget returns expected value (expected: %expected, got: %value)', array(
-        '%widget' => var_export($widget, TRUE),
-        '%expected' => var_export($expected_value, TRUE),
-        '%value' => var_export($values[$widget], TRUE),
-      )));
+      $this->assertEqual($values[$widget], $expected_value, 'Checkbox ' . var_export($widget, TRUE) . ' returns expected value (expected: ' . var_export($expected_value, TRUE) . ', got: ' . var_export($values[$widget], TRUE) . ')');
     }
   }
 
@@ -222,7 +218,7 @@ class FormsTestCase extends DrupalWebTes
           // Checkboxes values are not filtered out.
           $values[$key] = array_filter($values[$key]);
         }
-        $this->assertIdentical($expected_value, $values[$key], t('Default value for %type: expected %expected, returned %returned.', array('%type' => $key, '%expected' => var_export($expected_value, TRUE), '%returned' => var_export($values[$key], TRUE))));
+        $this->assertIdentical($expected_value, $values[$key], 'Default value for ' . $key . ': expected ' . var_export($expected_value, TRUE) . ', returned ' . var_export($values[$key], TRUE) . '.');
       }
 
       // Recurse children.
@@ -273,7 +269,7 @@ class FormsTestCase extends DrupalWebTes
         ':div-class' => $class,
         ':value' => isset($item['#value']) ? $item['#value'] : '',
       ));
-      $this->assertTrue(isset($element[0]), t('Disabled form element class found for #type %type.', array('%type' => $item['#type'])));
+      $this->assertTrue(isset($element[0]), 'Disabled form element class found for #type ' . $item['#type'] . '.');
     }
 
     // Verify special element #type text-format.
@@ -281,12 +277,12 @@ class FormsTestCase extends DrupalWebTes
       ':name' => 'text_format[value]',
       ':div-class' => 'form-disabled',
     ));
-    $this->assertTrue(isset($element[0]), t('Disabled form element class found for #type %type.', array('%type' => 'text_format[value]')));
+    $this->assertTrue(isset($element[0]), 'Disabled form element class found for #type ' . 'text_format[value]' . '.');
     $element = $this->xpath('//div[contains(@class, :div-class)]/descendant::select[@name=:name]', array(
       ':name' => 'text_format[format]',
       ':div-class' => 'form-disabled',
     ));
-    $this->assertTrue(isset($element[0]), t('Disabled form element class found for #type %type.', array('%type' => 'text_format[format]')));
+    $this->assertTrue(isset($element[0]), 'Disabled form element class found for #type ' . 'text_format[format]' . '.');
   }
 
   /**
@@ -518,7 +514,7 @@ class FormsElementsTableSelectFunctional
 
     $rows = array('row1', 'row2', 'row3');
     foreach ($rows as $row) {
-      $this->assertFieldByXPath('//input[@type="checkbox"]', $row, t('Checkbox for value @row.', array('@row' => $row)));
+      $this->assertFieldByXPath('//input[@type="checkbox"]', $row, 'Checkbox for value ' . $row . '.');
     }
   }
 
@@ -535,7 +531,7 @@ class FormsElementsTableSelectFunctional
 
     $rows = array('row1', 'row2', 'row3');
     foreach ($rows as $row) {
-      $this->assertFieldByXPath('//input[@type="radio"]', $row, t('Radio button for value @row.', array('@row' => $row)));
+      $this->assertFieldByXPath('//input[@type="radio"]', $row, 'Radio button for value ' . $row . '.');
     }
   }
 
@@ -824,7 +820,7 @@ class FormsFormStorageTestCase extends D
       array(),
       array('query' => array('cache' => 1)),
     );
-    foreach($run_options as $options) {
+    foreach ($run_options as $options) {
       $this->drupalPost('form-test/state-persist', array(), t('Submit'), $options);
       // The submit handler outputs the value in $form_state, assert it's there.
       $this->assertText('State persisted.');
@@ -898,16 +894,16 @@ class FormStateValuesCleanTestCase exten
     );
 
     // Verify that all internal Form API elements were removed.
-    $this->assertFalse(isset($values['form_id']), t('%element was removed.', array('%element' => 'form_id')));
-    $this->assertFalse(isset($values['form_token']), t('%element was removed.', array('%element' => 'form_token')));
-    $this->assertFalse(isset($values['form_build_id']), t('%element was removed.', array('%element' => 'form_build_id')));
-    $this->assertFalse(isset($values['op']), t('%element was removed.', array('%element' => 'op')));
+    $this->assertFalse(isset($values['form_id']), 'form_id' . ' was removed.');
+    $this->assertFalse(isset($values['form_token']), 'form_token' . ' was removed.');
+    $this->assertFalse(isset($values['form_build_id']), 'form_build_id' . ' was removed.');
+    $this->assertFalse(isset($values['op']), 'op' . ' was removed.');
 
     // Verify that all buttons were removed.
-    $this->assertFalse(isset($values['foo']), t('%element was removed.', array('%element' => 'foo')));
-    $this->assertFalse(isset($values['bar']), t('%element was removed.', array('%element' => 'bar')));
-    $this->assertFalse(isset($values['baz']['foo']), t('%element was removed.', array('%element' => 'foo')));
-    $this->assertFalse(isset($values['baz']['baz']), t('%element was removed.', array('%element' => 'baz')));
+    $this->assertFalse(isset($values['foo']), 'foo' . ' was removed.');
+    $this->assertFalse(isset($values['bar']), 'bar' . ' was removed.');
+    $this->assertFalse(isset($values['baz']['foo']), 'foo' . ' was removed.');
+    $this->assertFalse(isset($values['baz']['baz']), 'baz' . ' was removed.');
 
     // Verify that nested form value still exists.
     $this->assertTrue(isset($values['baz']['beer']), t('Nested form value still exists.'));
@@ -1034,7 +1030,7 @@ class FormsProgrammaticTestCase extends 
   function testSubmissionWorkflow() {
     // Backup the current batch status and reset it to avoid conflicts while
     // processing the dummy form submit handler.
-    $current_batch = $batch =& batch_get();
+    $current_batch = $batch = & batch_get();
     $batch = array();
 
     // Test that a programmatic form submission is rejected when a required
@@ -1077,7 +1073,7 @@ class FormsProgrammaticTestCase extends 
       '%values' => print_r($values, TRUE),
       '%errors' => $valid_form ? t('None') : implode(' ', $errors),
     );
-    $this->assertTrue($valid_input == $valid_form, t('Input values: %values<br/>Validation handler errors: %errors', $args));
+    $this->assertTrue($valid_input == $valid_form, 'Input values: ' . $args['%values'] . '<br/>Validation handler errors: ' . $args['%errors']);
 
     // We check submitted values only if we have a valid input.
     if ($valid_input) {
@@ -1085,7 +1081,7 @@ class FormsProgrammaticTestCase extends 
       // submission handler was properly executed.
       $stored_values = $form_state['storage']['programmatic_form_submit'];
       foreach ($values as $key => $value) {
-        $this->assertTrue(isset($stored_values[$key]) && $stored_values[$key] == $value, t('Submission handler correctly executed: %stored_key is %stored_value', array('%stored_key' => $key, '%stored_value' => print_r($value, TRUE))));
+        $this->assertTrue(isset($stored_values[$key]) && $stored_values[$key] == $value, 'Submission handler correctly executed: ' . $key . ' is ' . print_r($value, TRUE));
       }
     }
   }
Index: modules/simpletest/tests/graph.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/graph.test,v
retrieving revision 1.7
diff -u -p -r1.7 graph.test
--- modules/simpletest/tests/graph.test	18 May 2010 18:11:13 -0000	1.7
+++ modules/simpletest/tests/graph.test	5 Aug 2010 00:22:25 -0000
@@ -114,7 +114,7 @@ class GraphUnitTest extends DrupalUnitTe
       // Build an array with keys = $paths and values = TRUE.
       $expected = array_fill_keys($paths, TRUE);
       $result = isset($graph[$vertex]['paths']) ? $graph[$vertex]['paths'] : array();
-      $this->assertEqual($expected, $result, t('Expected paths for vertex @vertex: @expected-paths, got @paths', array('@vertex' => $vertex, '@expected-paths' => $this->displayArray($expected, TRUE), '@paths' => $this->displayArray($result, TRUE))));
+      $this->assertEqual($expected, $result, 'Expected paths for vertex ' . $vertex . ': ' . $this->displayArray($expected, TRUE) . ', got ' . $this->displayArray($result, TRUE));
     }
   }
 
@@ -132,7 +132,7 @@ class GraphUnitTest extends DrupalUnitTe
       // Build an array with keys = $paths and values = TRUE.
       $expected = array_fill_keys($paths, TRUE);
       $result = isset($graph[$vertex]['reverse_paths']) ? $graph[$vertex]['reverse_paths'] : array();
-      $this->assertEqual($expected, $result, t('Expected reverse paths for vertex @vertex: @expected-paths, got @paths', array('@vertex' => $vertex, '@expected-paths' => $this->displayArray($expected, TRUE), '@paths' => $this->displayArray($result, TRUE))));
+      $this->assertEqual($expected, $result, 'Expected reverse paths for vertex ' . $vertex . ': ' . $this->displayArray($expected, TRUE) . ', got ' . $this->displayArray($result, TRUE));
     }
   }
 
@@ -152,9 +152,9 @@ class GraphUnitTest extends DrupalUnitTe
         $result_components[] = $graph[$vertex]['component'];
         unset($unassigned_vertices[$vertex]);
       }
-      $this->assertEqual(1, count(array_unique($result_components)), t('Expected one unique component for vertices @vertices, got @components', array('@vertices' => $this->displayArray($component), '@components' => $this->displayArray($result_components))));
+      $this->assertEqual(1, count(array_unique($result_components)), 'Expected one unique component for vertices ' . $this->displayArray($component) . ', got ' . $this->displayArray($result_components));
     }
-    $this->assertEqual(array(), $unassigned_vertices, t('Vertices not assigned to a component: @vertices', array('@vertices' => $this->displayArray($unassigned_vertices, TRUE))));
+    $this->assertEqual(array(), $unassigned_vertices, 'Vertices not assigned to a component: ' . $this->displayArray($unassigned_vertices, TRUE));
   }
 
   /**
@@ -169,7 +169,7 @@ class GraphUnitTest extends DrupalUnitTe
     foreach ($expected_orders as $order) {
       $previous_vertex = array_shift($order);
       foreach ($order as $vertex) {
-        $this->assertTrue($graph[$previous_vertex]['weight'] < $graph[$vertex]['weight'], t('Weights of @previous-vertex and @vertex are correct relative to each other', array('@previous-vertex' => $previous_vertex, '@vertex' => $vertex)));
+        $this->assertTrue($graph[$previous_vertex]['weight'] < $graph[$vertex]['weight'], 'Weights of ' . $previous_vertex . ' and ' . $vertex . ' are correct relative to each other');
       }
     }
   }
Index: modules/simpletest/tests/image.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/image.test,v
retrieving revision 1.13
diff -u -p -r1.13 image.test
--- modules/simpletest/tests/image.test	23 Apr 2010 05:10:35 -0000	1.13
+++ modules/simpletest/tests/image.test	5 Aug 2010 00:22:25 -0000
@@ -50,16 +50,16 @@ class ImageToolkitTestCase extends Drupa
     // Determine if there were any expected that were not called.
     $uncalled = array_diff($expected, $actual);
     if (count($uncalled)) {
-      $this->assertTrue(FALSE, t('Expected operations %expected to be called but %uncalled was not called.', array('%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled))));
+      $this->assertTrue(FALSE, 'Expected operations ' . implode(', ', $expected) . ' to be called but ' . implode(', ', $uncalled) . ' was not called.');
     }
     else {
-      $this->assertTrue(TRUE, t('All the expected operations were called: %expected', array('%expected' => implode(', ', $expected))));
+      $this->assertTrue(TRUE, 'All the expected operations were called: ' . implode(', ', $expected));
     }
 
     // Determine if there were any unexpected calls.
     $unexpected = array_diff($actual, $expected);
     if (count($unexpected)) {
-      $this->assertTrue(FALSE, t('Unexpected operations were called: %unexpected.', array('%unexpected' => implode(', ', $unexpected))));
+      $this->assertTrue(FALSE, 'Unexpected operations were called: ' . implode(', ', $unexpected) . '.');
     }
     else {
       $this->assertTrue(TRUE, t('No unexpected operations were called.'));
@@ -125,7 +125,7 @@ class ImageToolkitUnitTest extends Image
    * Test the image_scale() function.
    */
   function testScale() {
-// TODO: need to test upscaling
+    // TODO: need to test upscaling
     $this->assertTrue(image_scale($this->image, 10, 10), t('Function returned the expected value.'));
     $this->assertToolkitOperationsCalled(array('resize'));
 
@@ -385,7 +385,7 @@ class ImageToolkitGdTestCase extends Dru
         // Load up a fresh image.
         $image = image_load(drupal_get_path('module', 'simpletest') . '/files/' . $file, 'gd');
         if (!$image) {
-          $this->fail(t('Could not load image %file.', array('%file' => $file)));
+          $this->fail('Could not load image ' . $file . '.');
           continue 2;
         }
 
@@ -448,11 +448,11 @@ class ImageToolkitGdTestCase extends Dru
         file_prepare_directory($directory, FILE_CREATE_DIRECTORY);
         image_save($image, $directory . '/' . $op . '.' . $image->info['extension']);
 
-        $this->assertTrue($correct_dimensions_real, t('Image %file after %action action has proper dimensions.', array('%file' => $file, '%action' => $op)));
-        $this->assertTrue($correct_dimensions_object, t('Image %file object after %action action is reporting the proper height and width values.', array('%file' => $file, '%action' => $op)));
+        $this->assertTrue($correct_dimensions_real, 'Image ' . $file . ' after ' . $op . ' action has proper dimensions.');
+        $this->assertTrue($correct_dimensions_object, 'Image ' . $file . ' object after ' . $op . ' action is reporting the proper height and width values.');
         // JPEG colors will always be messed up due to compression.
         if ($image->info['extension'] != 'jpg') {
-          $this->assertTrue($correct_colors, t('Image %file object after %action action has the correct color placement.', array('%file' => $file, '%action' => $op)));
+          $this->assertTrue($correct_colors, 'Image ' . $file . ' object after ' . $op . ' action has the correct color placement.');
         }
       }
     }
Index: modules/simpletest/tests/menu.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/menu.test,v
retrieving revision 1.31
diff -u -p -r1.31 menu.test
--- modules/simpletest/tests/menu.test	8 Jul 2010 03:41:27 -0000	1.31
+++ modules/simpletest/tests/menu.test	5 Aug 2010 00:22:25 -0000
@@ -248,7 +248,7 @@ class MenuRouterTestCase extends DrupalW
     $menu_names = menu_get_names();
     $this->pass(implode(' | ', $menu_names));
     for ($i = 0; $i < 3; $i++) {
-      $this->assertTrue(in_array('menu_test_' . $i, $menu_names), t('Expected menu name %expected is returned.', array('%expected' => 'menu_test_' . $i)));
+      $this->assertTrue(in_array('menu_test_' . $i, $menu_names), 'Expected menu name ' . 'menu_test_' . $i . ' is returned.');
     }
   }
 
@@ -302,40 +302,40 @@ class MenuRouterTestCase extends DrupalW
     $plid = $parent['mlid'];
 
     $link = $links['menu-test/hidden/menu/list'];
-    $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth)));
-    $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid)));
+    $this->assertEqual($link['depth'], $depth, $link['router_path'] . ' depth ' . $link['depth'] . ' is equal to ' . $depth . '.');
+    $this->assertEqual($link['plid'], $plid, $link['router_path'] . ' plid ' . $link['plid'] . ' is equal to ' . $plid . '.');
 
     $link = $links['menu-test/hidden/menu/add'];
-    $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth)));
-    $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid)));
+    $this->assertEqual($link['depth'], $depth, $link['router_path'] . ' depth ' . $link['depth'] . ' is equal to ' . $depth . '.');
+    $this->assertEqual($link['plid'], $plid, $link['router_path'] . ' plid ' . $link['plid'] . ' is equal to ' . $plid . '.');
 
     $link = $links['menu-test/hidden/menu/settings'];
-    $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth)));
-    $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid)));
+    $this->assertEqual($link['depth'], $depth, $link['router_path'] . ' depth ' . $link['depth'] . ' is equal to ' . $depth . '.');
+    $this->assertEqual($link['plid'], $plid, $link['router_path'] . ' plid ' . $link['plid'] . ' is equal to ' . $plid . '.');
 
     $link = $links['menu-test/hidden/menu/manage/%'];
-    $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth)));
-    $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid)));
+    $this->assertEqual($link['depth'], $depth, $link['router_path'] . ' depth ' . $link['depth'] . ' is equal to ' . $depth . '.');
+    $this->assertEqual($link['plid'], $plid, $link['router_path'] . ' plid ' . $link['plid'] . ' is equal to ' . $plid . '.');
 
     $parent = $links['menu-test/hidden/menu/manage/%'];
     $depth = $parent['depth'] + 1;
     $plid = $parent['mlid'];
 
     $link = $links['menu-test/hidden/menu/manage/%/list'];
-    $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth)));
-    $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid)));
+    $this->assertEqual($link['depth'], $depth, $link['router_path'] . ' depth ' . $link['depth'] . ' is equal to ' . $depth . '.');
+    $this->assertEqual($link['plid'], $plid, $link['router_path'] . ' plid ' . $link['plid'] . ' is equal to ' . $plid . '.');
 
     $link = $links['menu-test/hidden/menu/manage/%/add'];
-    $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth)));
-    $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid)));
+    $this->assertEqual($link['depth'], $depth, $link['router_path'] . ' depth ' . $link['depth'] . ' is equal to ' . $depth . '.');
+    $this->assertEqual($link['plid'], $plid, $link['router_path'] . ' plid ' . $link['plid'] . ' is equal to ' . $plid . '.');
 
     $link = $links['menu-test/hidden/menu/manage/%/edit'];
-    $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth)));
-    $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid)));
+    $this->assertEqual($link['depth'], $depth, $link['router_path'] . ' depth ' . $link['depth'] . ' is equal to ' . $depth . '.');
+    $this->assertEqual($link['plid'], $plid, $link['router_path'] . ' plid ' . $link['plid'] . ' is equal to ' . $plid . '.');
 
     $link = $links['menu-test/hidden/menu/manage/%/delete'];
-    $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth)));
-    $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid)));
+    $this->assertEqual($link['depth'], $depth, $link['router_path'] . ' depth ' . $link['depth'] . ' is equal to ' . $depth . '.');
+    $this->assertEqual($link['plid'], $plid, $link['router_path'] . ' plid ' . $link['plid'] . ' is equal to ' . $plid . '.');
 
     // Verify links for two dynamic arguments.
     $links = db_select('menu_links', 'ml')
@@ -350,28 +350,28 @@ class MenuRouterTestCase extends DrupalW
     $plid = $parent['mlid'];
 
     $link = $links['menu-test/hidden/block/list'];
-    $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth)));
-    $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid)));
+    $this->assertEqual($link['depth'], $depth, $link['router_path'] . ' depth ' . $link['depth'] . ' is equal to ' . $depth . '.');
+    $this->assertEqual($link['plid'], $plid, $link['router_path'] . ' plid ' . $link['plid'] . ' is equal to ' . $plid . '.');
 
     $link = $links['menu-test/hidden/block/add'];
-    $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth)));
-    $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid)));
+    $this->assertEqual($link['depth'], $depth, $link['router_path'] . ' depth ' . $link['depth'] . ' is equal to ' . $depth . '.');
+    $this->assertEqual($link['plid'], $plid, $link['router_path'] . ' plid ' . $link['plid'] . ' is equal to ' . $plid . '.');
 
     $link = $links['menu-test/hidden/block/manage/%/%'];
-    $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth)));
-    $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid)));
+    $this->assertEqual($link['depth'], $depth, $link['router_path'] . ' depth ' . $link['depth'] . ' is equal to ' . $depth . '.');
+    $this->assertEqual($link['plid'], $plid, $link['router_path'] . ' plid ' . $link['plid'] . ' is equal to ' . $plid . '.');
 
     $parent = $links['menu-test/hidden/block/manage/%/%'];
     $depth = $parent['depth'] + 1;
     $plid = $parent['mlid'];
 
     $link = $links['menu-test/hidden/block/manage/%/%/configure'];
-    $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth)));
-    $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid)));
+    $this->assertEqual($link['depth'], $depth, $link['router_path'] . ' depth ' . $link['depth'] . ' is equal to ' . $depth . '.');
+    $this->assertEqual($link['plid'], $plid, $link['router_path'] . ' plid ' . $link['plid'] . ' is equal to ' . $plid . '.');
 
     $link = $links['menu-test/hidden/block/manage/%/%/delete'];
-    $this->assertEqual($link['depth'], $depth, t('%path depth @link_depth is equal to @depth.', array('%path' => $link['router_path'], '@link_depth' => $link['depth'], '@depth' => $depth)));
-    $this->assertEqual($link['plid'], $plid, t('%path plid @link_plid is equal to @plid.', array('%path' => $link['router_path'], '@link_plid' => $link['plid'], '@plid' => $plid)));
+    $this->assertEqual($link['depth'], $depth, $link['router_path'] . ' depth ' . $link['depth'] . ' is equal to ' . $depth . '.');
+    $this->assertEqual($link['plid'], $plid, $link['router_path'] . ' plid ' . $link['plid'] . ' is equal to ' . $plid . '.');
   }
 
   /**
Index: modules/simpletest/tests/module.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/module.test,v
retrieving revision 1.21
diff -u -p -r1.21 module.test
--- modules/simpletest/tests/module.test	22 Apr 2010 18:56:31 -0000	1.21
+++ modules/simpletest/tests/module.test	5 Aug 2010 00:22:25 -0000
@@ -77,9 +77,9 @@ class ModuleUnitTest extends DrupalWebTe
    */
   protected function assertModuleList(Array $expected_values, $condition) {
     $expected_values = array_combine($expected_values, $expected_values);
-    $this->assertEqual($expected_values, module_list(), t('@condition: module_list() returns correct results', array('@condition' => $condition)));
+    $this->assertEqual($expected_values, module_list(), $condition . ': module_list() returns correct results');
     ksort($expected_values);
-    $this->assertIdentical($expected_values, module_list(FALSE, FALSE, TRUE), t('@condition: module_list() returns correctly sorted results', array('@condition' => $condition)));
+    $this->assertIdentical($expected_values, module_list(FALSE, FALSE, TRUE), $condition . ': module_list() returns correctly sorted results');
   }
 
   /**
Index: modules/simpletest/tests/path.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/path.test,v
retrieving revision 1.5
diff -u -p -r1.5 path.test
--- modules/simpletest/tests/path.test	6 Apr 2010 19:49:03 -0000	1.5
+++ modules/simpletest/tests/path.test	5 Aug 2010 00:22:25 -0000
@@ -42,7 +42,7 @@ class DrupalMatchPathTestCase extends Dr
     foreach ($tests as $patterns => $cases) {
       foreach ($cases as $path => $expected_result) {
         $actual_result = drupal_match_path($path, $patterns);
-        $this->assertIdentical($actual_result, $expected_result, t('Tried matching the path <code>@path</code> to the pattern <pre>@patterns</pre> - expected @expected, got @actual.', array('@path' => $path, '@patterns' => $patterns, '@expected' => var_export($expected_result, TRUE), '@actual' => var_export($actual_result, TRUE))));
+        $this->assertIdentical($actual_result, $expected_result, 'Tried matching the path <code>' . $path . '</code> to the pattern <pre>' . $patterns . '</pre> - expected ' . var_export($expected_result, TRUE) . ', got ' . var_export($actual_result, TRUE) . '.');
       }
     }
   }
@@ -216,7 +216,7 @@ class UrlAlterFunctionalTest extends Dru
     $result = url($original);
     $base_path = base_path() . (variable_get('clean_url', '0') ? '' : '?q=');
     $result = substr($result, strlen($base_path));
-    $this->assertIdentical($result, $final, t('Altered outbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result)));
+    $this->assertIdentical($result, $final, 'Altered outbound URL ' . $original . ', expected ' . $final . ', and got ' . $result . '.');
   }
 
   /**
@@ -233,6 +233,6 @@ class UrlAlterFunctionalTest extends Dru
   protected function assertUrlInboundAlter($original, $final) {
     // Test inbound altering.
     $result = drupal_get_normal_path($original);
-    $this->assertIdentical($result, $final, t('Altered inbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result)));
+    $this->assertIdentical($result, $final, 'Altered inbound URL ' . $original . ', expected ' . $final . ', and got ' . $result . '.');
   }
 }
Index: modules/simpletest/tests/registry.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/registry.test,v
retrieving revision 1.18
diff -u -p -r1.18 registry.test
--- modules/simpletest/tests/registry.test	10 Jul 2010 01:57:32 -0000	1.18
+++ modules/simpletest/tests/registry.test	5 Aug 2010 00:22:25 -0000
@@ -25,7 +25,7 @@ class RegistryParseFileTestCase extends 
     _registry_parse_file($this->fileName, $this->getFileContents());
     foreach (array('className', 'interfaceName') as $resource) {
       $foundName = db_query('SELECT name FROM {registry} WHERE name = :name', array(':name' => $this->$resource))->fetchField();
-      $this->assertTrue($this->$resource == $foundName, t('Resource "@resource" found.', array('@resource' => $this->$resource)));
+      $this->assertTrue($this->$resource == $foundName, 'Resource "' . $this->$resource . '" found.');
     }
   }
 
@@ -103,11 +103,11 @@ class RegistryParseFilesTestCase extends
       // Test that we have all the right resources.
       foreach (array('className', 'interfaceName') as $resource) {
         $foundName = db_query('SELECT name FROM {registry} WHERE name = :name', array(':name' => $this->$fileType->$resource))->fetchField();
-        $this->assertTrue($this->$fileType->$resource == $foundName, t('Resource "@resource" found.', array('@resource' => $this->$fileType->$resource)));
+        $this->assertTrue($this->$fileType->$resource == $foundName, 'Resource "' . $this->$fileType->$resource . '" found.');
       }
       // Test that we have the right hash.
       $hash = db_query('SELECT hash FROM {registry_file} WHERE filename = :filename', array(':filename' => $this->$fileType->fileName))->fetchField();
-      $this->assertTrue(hash('sha256', $this->$fileType->contents) == $hash, t('sha-256 for "@filename" matched.' . $fileType . $hash, array('@filename' => $this->$fileType->fileName)));
+      $this->assertTrue(hash('sha256', $this->$fileType->contents) == $hash, 'sha-256 for "' . $this->$fileType->fileName . '" matched.' . $fileType . $hash);
     }
   }
 
Index: modules/simpletest/tests/schema.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/schema.test,v
retrieving revision 1.19
diff -u -p -r1.19 schema.test
--- modules/simpletest/tests/schema.test	28 Mar 2010 11:45:11 -0000	1.19
+++ modules/simpletest/tests/schema.test	5 Aug 2010 00:22:25 -0000
@@ -116,7 +116,7 @@ class SchemaTestCase extends DrupalWebTe
 
   function tryInsert($table = 'test_table') {
     try {
-       db_insert($table)
+      db_insert($table)
          ->fields(array('id' => mt_rand(10, 20)))
          ->execute();
       return TRUE;
@@ -159,7 +159,7 @@ class SchemaTestCase extends DrupalWebTe
     // Now set up columns for the other types.
     $types = array('int', 'float', 'numeric');
     foreach ($types as $type) {
-      $column_spec = array('type' => $type, 'unsigned'=> TRUE);
+      $column_spec = array('type' => $type, 'unsigned' => TRUE);
       if ($type == 'numeric') {
         $column_spec += array('precision' => 10, 'scale' => 0);
       }
@@ -169,9 +169,9 @@ class SchemaTestCase extends DrupalWebTe
     }
 
     // Finally, check each column and try to insert invalid values into them.
-    foreach($table_spec['fields'] as $column_name => $column_spec) {
-      $this->assertTrue(db_field_exists($table_name, $column_name), t('Unsigned @type column was created.', array('@type' => $column_spec['type'])));
-      $this->assertFalse($this->tryUnsignedInsert($table_name, $column_name), t('Unsigned @type column rejected a negative value.', array('@type' => $column_spec['type'])));
+    foreach ($table_spec['fields'] as $column_name => $column_spec) {
+      $this->assertTrue(db_field_exists($table_name, $column_name), 'Unsigned ' . $column_spec['type'] . ' column was created.');
+      $this->assertFalse($this->tryUnsignedInsert($table_name, $column_name), 'Unsigned ' . $column_spec['type'] . ' column rejected a negative value.');
     }
   }
 
Index: modules/simpletest/tests/session.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/session.test,v
retrieving revision 1.29
diff -u -p -r1.29 session.test
--- modules/simpletest/tests/session.test	14 Jun 2010 12:31:46 -0000	1.29
+++ modules/simpletest/tests/session.test	5 Aug 2010 00:22:25 -0000
@@ -47,7 +47,7 @@ class SessionTestCase extends DrupalWebT
     $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]), t('Found session ID before logging in.'));
     $original_session = $matches[1];
 
     // We cannot use $this->drupalLogin($user); because we exit in
@@ -58,13 +58,13 @@ class SessionTestCase extends DrupalWebT
     );
     $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: ' . $user->name, t('User login'));
     $this->_logged_in = $pass;
 
     $this->drupalGet('session-test/id');
     $matches = array();
     preg_match('/\s*session_id:(.*)\n/', $this->drupalGetContent(), $matches);
-    $this->assertTrue(!empty($matches[1]) , t('Found session ID after logging in.'));
+    $this->assertTrue(!empty($matches[1]), t('Found session ID after logging in.'));
     $this->assertTrue($matches[1] != $original_session, t('Session ID changed after login.'));
   }
 
@@ -366,7 +366,7 @@ class SessionHttpsTestCase extends Drupa
       }
     }
 
-    // Test that session data saved before login is not available using the 
+    // Test that session data saved before login is not available using the
     // pre-login anonymous cookie.
     $this->cookies = array();
     $this->drupalGet('session-test/get', array('Cookie: ' . $anonymous_cookie));
Index: modules/simpletest/tests/theme.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/theme.test,v
retrieving revision 1.16
diff -u -p -r1.16 theme.test
--- modules/simpletest/tests/theme.test	29 Apr 2010 05:22:06 -0000	1.16
+++ modules/simpletest/tests/theme.test	5 Aug 2010 00:22:25 -0000
@@ -46,8 +46,8 @@ class ThemeUnitTest extends DrupalWebTes
   }
 
   /**
-  * Preprocess functions for the base hook should run even for suggestion implementations.
-  */
+   * Preprocess functions for the base hook should run even for suggestion implementations.
+   */
   function testPreprocessForSuggestions() {
     $this->drupalGet('theme-test/suggestion');
     $this->assertText('test_theme_breadcrumb__suggestion: 1', t('Theme hook suggestion ran with data available from a preprocess function for the base hook.'));
@@ -85,11 +85,11 @@ class ThemeTableUnitTest extends DrupalW
    */
   function testThemeTableStickyHeaders() {
     $header = array('one', 'two', 'three');
-    $rows = array(array(1,2,3), array(4,5,6), array(7,8,9));
+    $rows = array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9));
     $this->content = theme('table', array('header' => $header, 'rows' => $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->assertRaw('sticky-enabled',   t('Table has a class of sticky-enabled when $sticky = TRUE.'));
     drupal_static_reset('drupal_add_js');
   }
 
@@ -98,14 +98,14 @@ class ThemeTableUnitTest extends DrupalW
    */
   function testThemeTableNoStickyHeaders() {
     $header = array('one', 'two', 'three');
-    $rows = array(array(1,2,3), array(4,5,6), array(7,8,9));
+    $rows = array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9));
     $attributes = array();
     $caption = NULL;
     $colgroups = array();
     $this->content = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => $attributes, 'caption' => $caption, 'colgroups' => $colgroups, 'sticky' => 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->assertNoRaw('sticky-enabled',   t('Table does not have a class of sticky-enabled because $sticky = FALSE.'));
     drupal_static_reset('drupal_add_js');
   }
 
Index: modules/simpletest/tests/unicode.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/unicode.test,v
retrieving revision 1.6
diff -u -p -r1.6 unicode.test
--- modules/simpletest/tests/unicode.test	10 Jun 2010 15:20:48 -0000	1.6
+++ modules/simpletest/tests/unicode.test	5 Aug 2010 00:22:25 -0000
@@ -81,7 +81,7 @@ class UnicodeUnitTest extends DrupalWebT
     }
 
     foreach ($testcase as $input => $output) {
-      $this->assertEqual(drupal_strtolower($input), $output, t('%input is lowercased as %output', array('%input' => $input, '%output' => $output)));
+      $this->assertEqual(drupal_strtolower($input), $output, $input . ' is lowercased as ' . $output);
     }
   }
 
@@ -95,7 +95,7 @@ class UnicodeUnitTest extends DrupalWebT
     }
 
     foreach ($testcase as $input => $output) {
-      $this->assertEqual(drupal_strtoupper($input), $output, t('%input is uppercased as %output', array('%input' => $input, '%output' => $output)));
+      $this->assertEqual(drupal_strtoupper($input), $output, $input . ' is uppercased as ' . $output);
     }
   }
 
@@ -111,7 +111,7 @@ class UnicodeUnitTest extends DrupalWebT
     }
 
     foreach ($testcase as $input => $output) {
-      $this->assertEqual(drupal_ucfirst($input), $output, t('%input is ucfirst-ed as %output', array('%input' => $input, '%output' => $output)));
+      $this->assertEqual(drupal_ucfirst($input), $output, $input . ' is ucfirst-ed as ' . $output);
     }
   }
 
@@ -122,7 +122,7 @@ class UnicodeUnitTest extends DrupalWebT
     );
 
     foreach ($testcase as $input => $output) {
-      $this->assertEqual(drupal_strlen($input), $output, t('%input length is %output', array('%input' => $input, '%output' => $output)));
+      $this->assertEqual(drupal_strlen($input), $output, $input . ' length is ' . $output);
     }
   }
 
@@ -182,7 +182,7 @@ class UnicodeUnitTest extends DrupalWebT
     foreach ($testcase as $test) {
       list($input, $start, $length, $output) = $test;
       $result = drupal_substr($input, $start, $length);
-      $this->assertEqual($result, $output, t('%input substring at offset %offset for %length characters is %output (got %result)', array('%input' => $input, '%offset' => $start, '%length' => $length, '%output' => $output, '%result' => $result)));
+      $this->assertEqual($result, $output, $input . ' substring at offset ' . $start . ' for ' . $length . ' characters is ' . $output . ' (got ' . $result . ')');
     }
   }
 
@@ -214,7 +214,7 @@ class UnicodeUnitTest extends DrupalWebT
       '&euro;' => '€',
     );
     foreach ($testcase as $input => $output) {
-      $this->assertEqual(decode_entities($input), $output, t('Make sure the decoded entity of @input is @output', array('@input' => $input, '@output' => $output)));
+      $this->assertEqual(decode_entities($input), $output, 'Make sure the decoded entity of ' . $input . ' is ' . $output);
     }
   }
 
@@ -244,7 +244,7 @@ class UnicodeUnitTest extends DrupalWebT
     );
     $exclude = array('<', '&', '"');
     foreach ($testcase as $input => $output) {
-      $this->assertIdentical(decode_entities($input, $exclude), $output, t('Make sure the decoded entity of %input, excluding %excludes, is %output', array('%input' => $input, '%excludes' => implode(',', $exclude), '%output' => $output)));
+      $this->assertIdentical(decode_entities($input, $exclude), $output, 'Make sure the decoded entity of ' . $input . ', excluding ' . implode(',', $exclude) . ', is ' . $output);
     }
   }
 
@@ -330,7 +330,7 @@ class UnicodeUnitTest extends DrupalWebT
     foreach ($cases as $case) {
       list($input, $max_length, $expected) = $case;
       $output = truncate_utf8($input, $max_length, $wordsafe, $ellipsis);
-      $this->assertEqual($output, $expected, t('%input truncate to %length characters with %wordsafe, %ellipsis is %expected (got %output)', array('%input' => $input, '%length' => $max_length, '%output' => $output, '%expected' => $expected, '%wordsafe' => ($wordsafe ? 'word-safe' : 'not word-safe'), '%ellipsis' => ($ellipsis ? 'ellipsis' : 'not ellipsis'))));
+      $this->assertEqual($output, $expected, $input . ' truncate to ' . $max_length . ' characters with ' . ($wordsafe ? 'word-safe' : 'not word-safe') . ', ' . ($ellipsis ? 'ellipsis' : 'not ellipsis') . ' is ' . $expected . ' (got ' . $output . ')');
     }
   }
 }
Index: modules/simpletest/tests/xmlrpc.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/xmlrpc.test,v
retrieving revision 1.17
diff -u -p -r1.17 xmlrpc.test
--- modules/simpletest/tests/xmlrpc.test	6 May 2010 05:59:31 -0000	1.17
+++ modules/simpletest/tests/xmlrpc.test	5 Aug 2010 00:22:25 -0000
@@ -129,7 +129,7 @@ class XMLRPCValidator1IncTestCase extend
     $int_5     = mt_rand(-100, 100);
     $bool_5    = (($int_5 % 2) == 0);
     $string_5  = $this->randomName();
-    $double_5  = (double)(mt_rand(-1000, 1000) / 100);
+    $double_5  = (double) (mt_rand(-1000, 1000) / 100);
     $time_5    = REQUEST_TIME;
     $base64_5  = $this->randomName(100);
     $l_res_5 = xmlrpc_test_manyTypesTest($int_5, $bool_5, $string_5, $double_5, xmlrpc_date($time_5), $base64_5);
@@ -214,7 +214,7 @@ class XMLRPCMessagesTestCase extends Dru
       $xml_message_l = xmlrpc_test_message_sized_in_kb($size);
       $xml_message_r = xmlrpc($xml_url, 'messages.messageSizedInKB', $size);
 
-      $this->assertEqual($xml_message_l, $xml_message_r, t('XML-RPC messages.messageSizedInKB of %s Kb size received', array('%s' => $size)));
+      $this->assertEqual($xml_message_l, $xml_message_r, 'XML-RPC messages.messageSizedInKB of ' . $size . ' Kb size received');
     }
   }
 }
Index: modules/simpletest/tests/upgrade/upgrade.poll.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/upgrade/upgrade.poll.test,v
retrieving revision 1.1
diff -u -p -r1.1 upgrade.poll.test
--- modules/simpletest/tests/upgrade/upgrade.poll.test	30 Jul 2010 01:28:00 -0000	1.1
+++ modules/simpletest/tests/upgrade/upgrade.poll.test	5 Aug 2010 00:22:25 -0000
@@ -53,11 +53,13 @@ class PollUpgradePathTestCase extends Up
         $this->assertText("Choice $c for poll $i", t('Choice text is displayed correctly on result view'));
       }
 
-      $nbvotes = floor (($i % 4) + 5);
+      $nbvotes = floor(($i % 4) + 5);
       $elements = $this->xpath("//div[@class='percent']");
       for ($c = 0; $c < $nbchoices; $c++) {
         $votes = floor($nbvotes / $nbchoices);
-        if (($nbvotes % $nbchoices) > $c) $votes++;
+        if (($nbvotes % $nbchoices) > $c) {
+          $votes++;
+        }
         $this->assertTrue(preg_match("/$votes vote/", $elements[$c]), t('The number of votes is displayed correctly: expected ' . $votes . ', got ' . $elements[$c]));
       }
     }
Index: modules/simpletest/tests/upgrade/upgrade.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/upgrade/upgrade.test,v
retrieving revision 1.3
diff -u -p -r1.3 upgrade.test
--- modules/simpletest/tests/upgrade/upgrade.test	30 Jul 2010 01:28:00 -0000	1.3
+++ modules/simpletest/tests/upgrade/upgrade.test	5 Aug 2010 00:22:25 -0000
@@ -197,7 +197,8 @@ abstract class UpgradePathTestCase exten
     }
     // Since cache_bootstrap won't exist in a Drupal 6 site, ignore the
     // exception if the above fails.
-    catch (Exception $e) {}
+    catch (Exception $e) {
+    }
   }
 
   /**
Index: modules/statistics/statistics.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.test,v
retrieving revision 1.20
diff -u -p -r1.20 statistics.test
--- modules/statistics/statistics.test	8 Jul 2010 03:41:27 -0000	1.20
+++ modules/statistics/statistics.test	5 Aug 2010 00:22:25 -0000
@@ -415,7 +415,7 @@ class StatisticsTokenReplaceTestCase ext
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('node' => $node), array('language' => $language));
-      $this->assertFalse(strcmp($output, $expected), t('Statistics token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Statistics token ' . $input . ' replaced.');
     }
   }
 }
Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.134
diff -u -p -r1.134 system.test
--- modules/system/system.test	2 Aug 2010 18:55:17 -0000	1.134
+++ modules/system/system.test	5 Aug 2010 00:22:25 -0000
@@ -27,9 +27,9 @@ class ModuleTestCase extends DrupalWebTe
     $tables = db_find_tables(Database::getConnection()->prefixTables('{' . $base_table . '}') . '%');
 
     if ($count) {
-      return $this->assertTrue($tables, t('Tables matching "@base_table" found.', array('@base_table' => $base_table)));
+      return $this->assertTrue($tables, 'Tables matching "' . $base_table . '" found.');
     }
-    return $this->assertFalse($tables, t('Tables matching "@base_table" not found.', array('@base_table' => $base_table)));
+    return $this->assertFalse($tables, 'Tables matching "' . $base_table . '" not found.');
   }
 
   /**
@@ -49,7 +49,7 @@ class ModuleTestCase extends DrupalWebTe
       else {
         $message = 'Module "@module" is not enabled.';
       }
-      $this->assertEqual(module_exists($module), $enabled, t($message, array('@module' => $module)));
+      $this->assertEqual(module_exists($module), $enabled, $message);
     }
   }
 
@@ -84,7 +84,7 @@ class ModuleTestCase extends DrupalWebTe
       ->countQuery()
       ->execute()
       ->fetchField();
-    $this->assertTrue($count > 0, t('watchdog table contains @count rows for @message', array('@count' => $count, '@message' => $message)));
+    $this->assertTrue($count > 0, 'watchdog table contains ' . $count . ' rows for ' . $message);
   }
 }
 
@@ -372,7 +372,7 @@ class ModuleRequiredTestCase extends Mod
       if (!empty($info['required'])) {
         $field_name = "modules[{$info['package']}][$module][enable]";
         if (empty($info['hidden'])) {
-          $this->assertFieldByXPath("//input[@name='$field_name' and @disabled='disabled' and @checked='checked']", '', t('Field @name was disabled and checked.', array('@name' => $field_name)));
+          $this->assertFieldByXPath("//input[@name='$field_name' and @disabled='disabled' and @checked='checked']", '', 'Field ' . $field_name . ' was disabled and checked.');
         }
         else {
           $this->assertNoFieldByName($field_name);
@@ -453,11 +453,11 @@ class IPAddressBlockingTestCase extends 
     $this->assertRaw(t('The IP address %ip has been blocked.', array('%ip' => $submit_ip)), t('IP address was blocked.'));
 
     // Submit your own IP address. This fails, although it works when testing manually.
-     // TODO: on some systems this test fails due to a bug or inconsistency in cURL.
-     // $edit = array();
-     // $edit['ip'] = ip_address();
-     // $this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save'));
-     // $this->assertText(t('You may not block your own IP address.'));
+    // TODO: on some systems this test fails due to a bug or inconsistency in cURL.
+    // $edit = array();
+    // $edit['ip'] = ip_address();
+    // $this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save'));
+    // $this->assertText(t('You may not block your own IP address.'));
   }
 }
 
@@ -595,7 +595,7 @@ class AdminMetaTagTestCase extends Drupa
    * Verify that the meta tag HTML is generated correctly.
    */
   public function testMetaTag() {
-    list($version, ) = explode('.', VERSION);
+    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'));
@@ -813,7 +813,7 @@ class SiteMaintenanceTestCase extends Dr
     );
     $this->drupalPost('user/password', $edit, t('E-mail new password'));
     $mails = $this->drupalGetMails();
-    $start = strpos($mails[0]['body'], 'user/reset/'. $this->user->uid);
+    $start = strpos($mails[0]['body'], 'user/reset/' . $this->user->uid);
     $path = substr($mails[0]['body'], $start, 66 + strlen($this->user->uid));
 
     // Log in with temporary login link.
@@ -1455,13 +1455,13 @@ class TokenReplaceTestCase extends Drupa
     $node->title = '<blink>Blinking Text</blink>';
     global $user, $language;
 
-    $source  = '[node:title]';         // Title of the node we passed in
-    $source .= '[node:author:name]';   // Node author's name
+    $source  = '[node:title]'; // Title of the node we passed in
+    $source .= '[node:author:name]'; // Node author's name
     $source .= '[node:created:since]'; // Time since the node was created
-    $source .= '[current-user:name]';  // Current user's name
-    $source .= '[date:short]';         // Short date format of REQUEST_TIME
-    $source .= '[user:name]';          // No user passed in, should be untouched
-    $source .= '[bogus:token]';        // Non-existent token
+    $source .= '[current-user:name]'; // Current user's name
+    $source .= '[date:short]'; // Short date format of REQUEST_TIME
+    $source .= '[user:name]'; // No user passed in, should be untouched
+    $source .= '[bogus:token]'; // Non-existent token
 
     $target  = check_plain($node->title);
     $target .= check_plain($account->name);
@@ -1520,7 +1520,7 @@ class TokenReplaceTestCase extends Drupa
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array(), array('language' => $language));
-      $this->assertFalse(strcmp($output, $expected), t('Sanitized system site information token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Sanitized system site information token ' . $input . ' replaced.');
     }
 
     // Generate and test unsanitized tokens.
@@ -1529,7 +1529,7 @@ class TokenReplaceTestCase extends Drupa
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array(), array('language' => $language, 'sanitize' => FALSE));
-      $this->assertFalse(strcmp($output, $expected), t('Unsanitized system site information token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Unsanitized system site information token ' . $input . ' replaced.');
     }
   }
 
@@ -1556,7 +1556,7 @@ class TokenReplaceTestCase extends Drupa
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('date' => $date), array('language' => $language));
-      $this->assertFalse(strcmp($output, $expected), t('Date token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Date token ' . $input . ' replaced.');
     }
   }
 }
Index: modules/taxonomy/taxonomy.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.test,v
retrieving revision 1.85
diff -u -p -r1.85 taxonomy.test
--- modules/taxonomy/taxonomy.test	3 Aug 2010 02:17:18 -0000	1.85
+++ modules/taxonomy/taxonomy.test	5 Aug 2010 00:22:25 -0000
@@ -7,8 +7,8 @@
  */
 
 /**
-* Class with common helper methods.
-*/
+ * Class with common helper methods.
+ */
 class TaxonomyWebTestCase extends DrupalWebTestCase {
 
   /**
@@ -41,8 +41,8 @@ class TaxonomyWebTestCase extends Drupal
 }
 
 /**
-* Tests for the taxonomy vocabulary interface.
-*/
+ * Tests for the taxonomy vocabulary interface.
+ */
 class TaxonomyVocabularyFunctionalTest extends TaxonomyWebTestCase {
 
   public static function getInfo() {
@@ -156,7 +156,7 @@ class TaxonomyVocabularyFunctionalTest e
 
     // Check the created vocabulary.
     $vocabularies = taxonomy_get_vocabularies();
-    $vid = $vocabularies[count($vocabularies)-1]->vid;
+    $vid = $vocabularies[count($vocabularies) -1]->vid;
     entity_get_controller('taxonomy_vocabulary')->resetCache();
     $vocabulary = taxonomy_vocabulary_load($vid);
     $this->assertTrue($vocabulary, t('Vocabulary found in database'));
@@ -437,7 +437,7 @@ class TaxonomyTermTestCase extends Taxon
     $langcode = LANGUAGE_NONE;
     $edit["title"] = $this->randomName();
     $edit["body[$langcode][0][value]"] = $this->randomName();
-    $edit[$this->instance['field_name'] . '[' . $langcode .'][]'] = $term1->tid;
+    $edit[$this->instance['field_name'] . '[' . $langcode . '][]'] = $term1->tid;
     $this->drupalPost('node/add/article', $edit, t('Save'));
 
     // Check that the term is displayed when the node is viewed.
@@ -513,9 +513,9 @@ class TaxonomyTermTestCase extends Taxon
     $this->drupalGet('node/' . $node->nid);
 
     foreach ($term_names as $term_name) {
-      $this->assertText($term_name, t('The term %name appears on the node page after one term %deleted was deleted', array('%name' => $term_name, '%deleted' => $term1->name)));
+      $this->assertText($term_name, 'The term ' . $term_name . ' appears on the node page after one term ' . $term1->name . ' was deleted');
     }
-    $this->assertNoText($term1->name, t('The deleted term %name does not appear on the node page.', array('%name' => $term1->name)));
+    $this->assertNoText($term1->name, 'The deleted term ' . $term1->name . ' does not appear on the node page.');
   }
 
   /**
@@ -634,7 +634,7 @@ class TaxonomyTermTestCase extends Taxon
     $this->assertEqual($terms[0]->tid, $term1->tid, t('Term 1 was moved to back above term 2.'));
     $this->assertEqual($terms[1]->tid, $term2->tid, t('Term 2 was moved to back below term 1.'));
     $this->assertEqual($terms[2]->tid, $term3->tid, t('Term 3 is still below term 2.'));
-    $this->assertEqual($terms[2]->parents, array($term2->tid), t('Term 3 is still a child of term 2.').var_export($terms[1]->tid,1));
+    $this->assertEqual($terms[2]->parents, array($term2->tid), t('Term 3 is still a child of term 2.') . var_export($terms[1]->tid, 1));
   }
 
   /**
@@ -705,7 +705,7 @@ class TaxonomyLoadMultipleUnitTest exten
     // Load the terms from the vocabulary.
     $terms = taxonomy_term_load_multiple(NULL, array('vid' => $vocabulary->vid));
     $count = count($terms);
-    $this->assertTrue($count == 5, t('Correct number of terms were loaded. !count terms.', array('!count' => $count)));
+    $this->assertTrue($count == 5, 'Correct number of terms were loaded. ' . $count . ' terms.');
 
     // Load the same terms again by tid.
     $terms2 = taxonomy_term_load_multiple(array_keys($terms));
@@ -1014,10 +1014,10 @@ class TaxonomyTokenReplaceTestCase exten
     $tests['[term:node-count]'] = 0;
     $tests['[term:parent:name]'] = '[term:parent:name]';
     $tests['[term:vocabulary:name]'] = check_plain($this->vocabulary->name);
-    
+
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('term' => $term1), array('language' => $language));
-      $this->assertFalse(strcmp($output, $expected), t('Sanitized taxonomy term token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Sanitized taxonomy term token ' . $input . ' replaced.');
     }
 
     // Generate and test sanitized tokens for term2.
@@ -1035,7 +1035,7 @@ class TaxonomyTokenReplaceTestCase exten
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('term' => $term2), array('language' => $language));
-      $this->assertFalse(strcmp($output, $expected), t('Sanitized taxonomy term token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Sanitized taxonomy term token ' . $input . ' replaced.');
     }
 
     // Generate and test unsanitized tokens.
@@ -1046,7 +1046,7 @@ class TaxonomyTokenReplaceTestCase exten
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('term' => $term2), array('language' => $language, 'sanitize' => FALSE));
-      $this->assertFalse(strcmp($output, $expected), t('Unsanitized taxonomy term token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Unsanitized taxonomy term token ' . $input . ' replaced.');
     }
 
     // Generate and test sanitized tokens.
@@ -1062,7 +1062,7 @@ class TaxonomyTokenReplaceTestCase exten
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('vocabulary' => $this->vocabulary), array('language' => $language));
-      $this->assertFalse(strcmp($output, $expected), t('Sanitized taxonomy vocabulary token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Sanitized taxonomy vocabulary token ' . $input . ' replaced.');
     }
 
     // Generate and test unsanitized tokens.
@@ -1071,7 +1071,7 @@ class TaxonomyTokenReplaceTestCase exten
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('vocabulary' => $this->vocabulary), array('language' => $language, 'sanitize' => FALSE));
-      $this->assertFalse(strcmp($output, $expected), t('Unsanitized taxonomy vocabulary token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Unsanitized taxonomy vocabulary token ' . $input . ' replaced.');
     }
   }
 }
Index: modules/tracker/tracker.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.test,v
retrieving revision 1.18
diff -u -p -r1.18 tracker.test
--- modules/tracker/tracker.test	9 Jan 2010 21:54:01 -0000	1.18
+++ modules/tracker/tracker.test	5 Aug 2010 00:22:25 -0000
@@ -32,7 +32,7 @@ class TrackerTest extends DrupalWebTestC
     $this->drupalLogin($this->user);
 
     $unpublished = $this->drupalCreateNode(array(
-      'title' =>$this->randomName(8),
+      'title' => $this->randomName(8),
       'status' => 0,
     ));
     $published = $this->drupalCreateNode(array(
@@ -200,7 +200,7 @@ class TrackerTest extends DrupalWebTestC
 
     // Assert that all node titles are displayed.
     foreach ($nodes as $i => $node) {
-      $this->assertText($node->title, t('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
+      $this->assertText($node->title, 'Node ' . $i . ' is displayed on the tracker listing pages.');
     }
     $this->assertText('1 new', t('New comment is counted on the tracker listing pages.'));
     $this->assertText('updated', t('Node is listed as updated'));
@@ -211,7 +211,7 @@ class TrackerTest extends DrupalWebTestC
 
     // Assert that all node titles are displayed.
     foreach ($nodes as $i => $node) {
-      $this->assertText($node->title, t('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
+      $this->assertText($node->title, 'Node ' . $i . ' is displayed on the tracker listing pages.');
     }
     $this->assertText('1 new', t('New comment is counted on the tracker listing pages.'));
   }
Index: modules/trigger/trigger.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.test,v
retrieving revision 1.34
diff -u -p -r1.34 trigger.test
--- modules/trigger/trigger.test	1 Aug 2010 19:52:56 -0000	1.34
+++ modules/trigger/trigger.test	5 Aug 2010 00:22:25 -0000
@@ -81,7 +81,7 @@ class TriggerContentTestCase extends Tri
       $this->assertRaw(t('!post %title has been created.', array('!post' => 'Basic page', '%title' => $edit["title"])), t('Make sure the Basic 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'])));
+      $this->assertTrue($loaded_node->$info['property'] == $info['expected'], 'Make sure the ' . $info['name'] . ' action fired.');
       // Leave action assigned for next test
 
       // There should be an error when the action is assigned to the trigger
@@ -94,7 +94,7 @@ class TriggerContentTestCase extends Tri
 
       // The action should be able to be unassigned from a trigger.
       $this->drupalPost('admin/structure/trigger/unassign/node/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'])));
+      $this->assertRaw(t('Action %action has been unassigned.', array('%action' => ucfirst($info['name']))), 'Check to make sure the ' . $info['name'] . ' action can be unassigned from the trigger.');
       $assigned = db_query("SELECT COUNT(*) FROM {trigger_assignments} WHERE aid IN (:keys)", array(':keys' => $content_actions))->fetchField();
       $this->assertFalse($assigned, t('Check to make sure unassign worked properly at the database level.'));
     }
@@ -128,7 +128,7 @@ class TriggerContentTestCase extends Tri
     );
     $this->drupalPost('admin/content', $edit, t('Update'));
     $count = variable_get('trigger_test_generic_any_action', 0);
-    $this->assertTrue($count == 2, t('Action was triggered 2 times. Actual: %count', array('%count' => $count)));
+    $this->assertTrue($count == 2, 'Action was triggered 2 times. Actual: ' . $count);
   }
 
   /**
@@ -298,7 +298,7 @@ class TriggerActionTestCase extends Trig
         '@user_created' => isset($account->created) ? format_date($account->created, 'medium') : t('not yet created'),
         )
       );
-      return trim($message);
+    return trim($message);
   }
 
 
@@ -317,7 +317,7 @@ class TriggerActionTestCase extends Trig
     $trigger_type = preg_replace('/_.*/', '', $trigger);
     $this->drupalPost("admin/structure/trigger/$trigger_type", $edit, t('Assign'), array(), array(), $form_html_id);
     $actions = trigger_get_assigned_actions($trigger);
-    $this->assertTrue(!empty($actions[$action]), t('Simple action @action assigned to trigger @trigger', array('@action' => $action, '@trigger' => $trigger)));
+    $this->assertTrue(!empty($actions[$action]), 'Simple action ' . $action . ' assigned to trigger ' . $trigger);
   }
 
   /**
@@ -395,8 +395,7 @@ class TriggerActionTestCase extends Trig
    */
   function assertSystemMessageTokenReplacement($trigger, $account) {
     $expected = $this->generateTokenExpandedComparison($trigger, $account);
-    $this->assertText($expected,
-      t('Expected system message to contain token-replaced text "@expected" found in configured system message action', array('@expected' => $expected )) );
+    $this->assertText($expected, 'Expected system message to contain token-replaced text "' . $expected . '" found in configured system message action');
   }
 
 
@@ -523,7 +522,7 @@ class TriggerUserActionTestCase extends 
     // Our original comment will have been comment 1.
     $this->drupalPost("comment/1/edit", array('comment_body[und][0][value]' => t("my comment, updated"), 'subject' => t("my comment subject")), t('Save'));
     $comment_author_account = user_load($comment_author_uid, TRUE);
-    $this->assertTrue($comment_author_account->status == 0, t('Comment author account (uid=@uid) is blocked after update to comment', array('@uid' => $comment_author_uid)));
+    $this->assertTrue($comment_author_account->status == 0, 'Comment author account (uid=' . $comment_author_uid . ') is blocked after update to comment');
 
     // Verify that the comment was updated.
     $test_user = $this->drupalCreateUser(array('administer actions', 'create article content', 'access comments', 'administer comments', 'post comments without approval', 'edit own comments'));
@@ -606,7 +605,7 @@ class TriggerOtherTestCase extends Trigg
     $this->assertEqual($actions[$aid]['label'], $action_edit['actions_label'], t('Correct action label found.'));
 
     // User should get the configured message at login.
-    $contact_user = $this->drupalCreateUser(array('access site-wide contact form'));;
+    $contact_user = $this->drupalCreateUser(array('access site-wide contact form'));
     $this->drupalLogin($contact_user);
     $this->assertText($action_edit['message']);
   }
Index: modules/update/update.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/update/update.test,v
retrieving revision 1.14
diff -u -p -r1.14 update.test
--- modules/update/update.test	29 Jul 2010 02:27:43 -0000	1.14
+++ modules/update/update.test	5 Aug 2010 00:22:25 -0000
@@ -520,7 +520,7 @@ class UpdateTestUploadCase extends Updat
     );
     // This also checks that the correct archive extensions are allowed.
     $this->drupalPost('admin/modules/install', $edit, t('Install'));
-    $this->assertText(t('Only files with the following extensions are allowed: @archive_extensions.', array('@archive_extensions' => archiver_get_extensions())),'Only valid archives can be uploaded.');
+    $this->assertText(t('Only files with the following extensions are allowed: @archive_extensions.', array('@archive_extensions' => archiver_get_extensions())), 'Only valid archives can be uploaded.');
 
     // Check to ensure an existing module can't be reinstalled. Also checks that
     // the archive was extracted since we can't know if the module is already
Index: modules/user/user.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.test,v
retrieving revision 1.98
diff -u -p -r1.98 user.test
--- modules/user/user.test	4 Aug 2010 06:52:57 -0000	1.98
+++ modules/user/user.test	5 Aug 2010 00:22:26 -0000
@@ -1673,7 +1673,7 @@ class UserTokenReplaceTestCase extends D
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('user' => $account), array('language' => $language));
-      $this->assertFalse(strcmp($output, $expected), t('Sanitized user token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Sanitized user token ' . $input . ' replaced.');
     }
 
     // Generate and test unsanitized tokens.
@@ -1683,7 +1683,7 @@ class UserTokenReplaceTestCase extends D
 
     foreach ($tests as $input => $expected) {
       $output = token_replace($input, array('user' => $account), array('language' => $language, 'sanitize' => FALSE));
-      $this->assertFalse(strcmp($output, $expected), t('Unsanitized user token %token replaced.', array('%token' => $input)));
+      $this->assertFalse(strcmp($output, $expected), 'Unsanitized user token ' . $input . ' replaced.');
     }
   }
 }
@@ -1744,7 +1744,7 @@ class UserRolesAssignmentTestCase extend
    * Tests that a user can be assigned a role and that the role can be removed
    * again.
    */
-  function testAssignAndRemoveRole()  {
+  function testAssignAndRemoveRole() {
     $rid = $this->drupalCreateRole(array('administer content types'));
     $account = $this->drupalCreateUser();