? .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 4 Aug 2010 04:30:00 -0000 @@ -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.'), t('Block successfully moved to %region_name region.', array('%region_name' => $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.')); 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 4 Aug 2010 04:30:00 -0000 @@ -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.'), t('Block successfully moved to %region_name region.', array('%region_name' => $region))); // Confirm that the block is being displayed. $this->drupalGet('node'); 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 4 Aug 2010 04:30:00 -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 4 Aug 2010 04:30:00 -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; 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 4 Aug 2010 04:30:00 -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 4 Aug 2010 04:30:00 -0000 @@ -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; } 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 4 Aug 2010 04:30:00 -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'); 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 4 Aug 2010 04:30:00 -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 4 Aug 2010 04:30:00 -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 & unescaped markup', 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 4 Aug 2010 04:30:00 -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); } } 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 4 Aug 2010 04:30:00 -0000 @@ -169,7 +169,7 @@ 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'], t('Current revision: expected value %delta was found.', array('%delta' => $delta))); // 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))); } @@ -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,7 +1616,7 @@ 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) { + foreach ($this->values as $delta => $value) { $this->assertText($setting . '|' . $value['value'], t('Value @delta was displayed with expected setting.', array('@delta' => $delta))); } @@ -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.')); @@ -1661,7 +1661,7 @@ 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) { + foreach ($this->values as $delta => $value) { $this->assertText($setting . '|' . $value['value'], t('Value @delta was displayed with expected setting.', array('@delta' => $delta))); } @@ -1671,7 +1671,7 @@ 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) { + foreach ($this->values as $delta => $value) { $this->assertText($setting . '|' . $value['value'], t('Value @delta was displayed with expected setting.', array('@delta' => $delta))); } } @@ -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. } @@ -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']); } @@ -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 4 Aug 2010 04:30:00 -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; } /** @@ -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); @@ -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/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 4 Aug 2010 04:30:01 -0000 @@ -913,7 +913,7 @@ class FilterUnitTestCase extends DrupalU $f = _filter_html('

', $filter); $this->assertNoNormalized($f, 'onerror', t('HTML filter should remove on* attributes on default.')); - $f = _filter_html(' ', $filter); + $f = _filter_html(' ', $filter); $this->assertNoNormalized($f, 'onerror', t('HTML filter should remove empty on* attributes on default.')); } 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 4 Aug 2010 04:30:01 -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.')); 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 4 Aug 2010 04:30:01 -0000 @@ -68,7 +68,7 @@ class HelpTestCase extends DrupalWebTest if ($response == 200) { $this->assertTitle($name . ' | Drupal', t('[' . $module . '] Title was displayed')); $this->assertRaw('

' . t($name) . '

', t('[' . $module . '] Heading was displayed')); - } + } } } 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 4 Aug 2010 04:30:01 -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. @@ -382,7 +382,7 @@ class LocaleTranslationFunctionalTest ex $key = $this->randomName(16); $bad_translations[$key] = '<' . $key; $key = $this->randomName(16); - $bad_translations[$key] ="" . $key; + $bad_translations[$key] = "" . $key; // Add custom language. $edit = array( @@ -1096,7 +1096,7 @@ class LocaleUninstallFunctionalTest exte // 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, t('Multilingual workflow option: %status', array('%status' => t($multilingual ? 'enabled' : 'disabled')))); // Check JavaScript translations directory. $locale_js_directory = variable_get('locale_js_directory', 'languages'); @@ -1104,7 +1104,7 @@ class LocaleUninstallFunctionalTest exte // 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, t('String caching: %status', array('%status' => 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 4 Aug 2010 04:30:01 -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 4 Aug 2010 04:30:01 -0000 @@ -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')); @@ -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 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(); 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 4 Aug 2010 04:30:01 -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 4 Aug 2010 04:30:01 -0000 @@ -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 4 Aug 2010 04:30:01 -0000 @@ -50,7 +50,7 @@ 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, t('Found form named @name', array('@name' => $form_name))); } // Checking name. @@ -97,7 +97,7 @@ 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, t('Found form named @name', array('@name' => $form_name))); } // Checking name. @@ -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 4 Aug 2010 04:30:01 -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), t('About attribute found on table row for @user content.', array('@user' => $user))); // 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), t('Title property attribute found on @user content.', array('@user' => $user))); // 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), t('Typeof and name property attributes found on @user.', array('@user' => $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), t('No about attribute is present on @user.', array('@user' => $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), t('About attribute is present on @user.', array('@user' => $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, t('Num replies property and content attributes found on @user content.', array('@user' => $user))); // 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), 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))); // 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, t('Num replies property and content attributes found on @user content.', array('@user' => $user))); // 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), t('Latest activity date found when there are comments on @user content. Latest activity date content is correct.', array('@user' => $user))); } } 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 4 Aug 2010 04:30:01 -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 "<' . $sorted_tags[$tag_rank] . '>" order.'); } } @@ -489,7 +490,7 @@ class SearchRankingTestCase extends Drup // Assert the results. $this->assertEqual($set[0]['node']->nid, $node->nid, 'Search tag ranking for "<' . $tag . '>" 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 4 Aug 2010 04:30:01 -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); 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 4 Aug 2010 04:30:01 -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 4 Aug 2010 04:30:01 -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); } 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 4 Aug 2010 04:30:01 -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'); 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 4 Aug 2010 04:30:02 -0000 @@ -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, '<script>', 'check_plain() escapes <script>'); + $text = check_plain("<script>"); + $this->assertEqual($text, '<script>', 'check_plain() escapes <script>'); } /** @@ -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"')); @@ -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. 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 4 Aug 2010 04:30:02 -0000 @@ -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: @@ -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.')); } @@ -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.')); } /** @@ -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/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 4 Aug 2010 04:30:02 -0000 @@ -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). 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 4 Aug 2010 04:30:02 -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 4 Aug 2010 04:30:02 -0000 @@ -824,7 +824,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.'); @@ -1034,7 +1034,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 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 4 Aug 2010 04:30:02 -0000 @@ -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')); 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 4 Aug 2010 04:30:02 -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,7 +169,7 @@ 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) { + 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']))); } 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 4 Aug 2010 04:30:02 -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 @@ -64,7 +64,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 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 4 Aug 2010 04:30:02 -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/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 4 Aug 2010 04:30:02 -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); 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 4 Aug 2010 04:30:02 -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 4 Aug 2010 04:30:02 -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/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 4 Aug 2010 04:30:02 -0000 @@ -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); 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 4 Aug 2010 04:30:02 -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. @@ -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)); } /** @@ -1014,7 +1014,7 @@ 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))); 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 4 Aug 2010 04:30:02 -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( 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 4 Aug 2010 04:30:03 -0000 @@ -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); } @@ -606,7 +606,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 4 Aug 2010 04:30:03 -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.97 diff -u -p -r1.97 user.test --- modules/user/user.test 22 Jul 2010 23:41:51 -0000 1.97 +++ modules/user/user.test 4 Aug 2010 04:30:03 -0000 @@ -1735,7 +1735,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();