diff --git a/action_example/action_example.test b/action_example/action_example.test index 875f003..dfc44b0 100644 --- a/action_example/action_example.test +++ b/action_example/action_example.test @@ -52,7 +52,7 @@ class ActionExampleTestCase extends TriggerWebTestCase { $normal_user = $this->drupalCreateUser(); user_save($normal_user, array('status' => 0)); // Blocked user. $normal_user = user_load($normal_user->uid, TRUE); - $this->assertFalse($normal_user->status, t('Normal user status has been set to blocked')); + $this->assertFalse($normal_user->status, 'Normal user status has been set to blocked'); $hash = drupal_hash_base64('action_example_unblock_user_action'); $edit = array('aid' => $hash); @@ -60,7 +60,7 @@ class ActionExampleTestCase extends TriggerWebTestCase { $this->drupalGet("user/$normal_user->uid"); $normal_user = user_load($normal_user->uid, TRUE); - $this->assertTrue($normal_user->status, t('Normal user status has been set to unblocked')); + $this->assertTrue($normal_user->status, 'Normal user status has been set to unblocked'); $this->assertRaw(t('Unblocked user %name', array('%name' => $normal_user->name))); // 3. Create a user whose posts are always to be stickied. @@ -78,6 +78,6 @@ class ActionExampleTestCase extends TriggerWebTestCase { $this->drupalLogout(); $this->drupalLogin($sticky_user); $node = $this->drupalCreateNode(); - $this->assertTrue($node->sticky, t('Node was set to sticky on creation')); + $this->assertTrue($node->sticky, 'Node was set to sticky on creation'); } } diff --git a/ajax_example/ajax_example.test b/ajax_example/ajax_example.test index 10fef2f..8b30002 100644 --- a/ajax_example/ajax_example.test +++ b/ajax_example/ajax_example.test @@ -51,7 +51,7 @@ class AjaxExampleTestCase extends DrupalWebTestCase { // Submit the initial form. $edit = array('question_type_select' => t($style)); $this->drupalPost($path, $edit, t('Choose')); - $this->assertResponse(200, t('Question style "@style" selected.', array('@style' => t($style)))); + $this->assertResponse(200, format_string('Question style "@style" selected.', array('@style' => t($style)))); // For convenience, make variables out of the entries in $QandA. extract($QandA); // Check for the expected input field. @@ -59,7 +59,7 @@ class AjaxExampleTestCase extends DrupalWebTestCase { // Now, submit the dynamically generated form. $edit = array('question' => t($answer)); $this->drupalPost(NULL, $edit, t('Submit your answer')); - $this->assertRaw(t($response), t('Dynamic form has been submitted.')); + $this->assertRaw(t($response), 'Dynamic form has been submitted.'); } } diff --git a/block_example/block_example.test b/block_example/block_example.test index 34fb799..1e88972 100644 --- a/block_example/block_example.test +++ b/block_example/block_example.test @@ -34,25 +34,25 @@ class BlockExampleTestCase extends DrupalWebTestCase { // Find the blocks in the settings page. $this->drupalGet('admin/structure/block'); - $this->assertRaw(t('Example: configurable text string'), t('Block configurable-string found.')); - $this->assertRaw(t('Example: empty block'), t('Block empty-block found.')); + $this->assertRaw(t('Example: configurable text string'), 'Block configurable-string found.'); + $this->assertRaw(t('Example: empty block'), 'Block empty-block found.'); // Verify the default settings for block are processed. - $this->assertFieldByName('blocks[block_example_example_empty][region]', 'sidebar_first', t('Empty block is enabled in first sidebar successfully verified.') ); - $this->assertFieldByName('blocks[block_example_example_configurable_text][region]', -1, t('Configurable text block is disabled in first sidebar successfully verified.') ); + $this->assertFieldByName('blocks[block_example_example_empty][region]', 'sidebar_first', 'Empty block is enabled in first sidebar successfully verified.'); + $this->assertFieldByName('blocks[block_example_example_configurable_text][region]', -1, 'Configurable text block is disabled in first sidebar successfully verified.'); // Verify that blocks are not shown $this->drupalGet('/'); - $this->assertNoRaw( t('Title of first block (example_configurable_text)'), t('Block configurable test not found.')); - $this->assertNoRaw( t('Title of second block (example_empty)'), t('Block empty not found.')); + $this->assertNoRaw(t('Title of first block (example_configurable_text)'), 'Block configurable test not found.'); + $this->assertNoRaw(t('Title of second block (example_empty)'), 'Block empty not found.'); // Enable the Configurable text block and verify $this->drupalPost('admin/structure/block', array('blocks[block_example_example_configurable_text][region]' => 'sidebar_first'), t('Save blocks')); - $this->assertFieldByName('blocks[block_example_example_configurable_text][region]', 'sidebar_first', t('Configurable text block is enabled in first sidebar successfully verified.') ); + $this->assertFieldByName('blocks[block_example_example_configurable_text][region]', 'sidebar_first', 'Configurable text block is enabled in first sidebar successfully verified.'); // Verify that blocks are there. Empty block will not be shown, because it is empty $this->drupalGet('/'); - $this->assertRaw( t('Title of first block (example_configurable_text)'), t('Block configurable text found.')); + $this->assertRaw(t('Title of first block (example_configurable_text)'), 'Block configurable text found.'); // Change content of configurable text block $string = $this->randomName(); @@ -60,7 +60,7 @@ class BlockExampleTestCase extends DrupalWebTestCase { // Verify that new content is shown $this->drupalGet('/'); - $this->assertRaw( $string, t('Content of configurable text block successfully verified.')); + $this->assertRaw($string, 'Content of configurable text block successfully verified.'); // Make sure our example uppercased block is shown as altered by the // hook_block_view_alter(). @@ -91,6 +91,6 @@ class BlockExampleTestCase extends DrupalWebTestCase { // search block if it was successfully pushed to the bottom. $this->drupalGet('/'); $this->clickLink('Configure block', 4); - $this->assertText(t("'@search' block", array('@search' => t('Search form'))), t('hook_block_info_alter successfully verified.') ); + $this->assertText(t("'@search' block", array('@search' => t('Search form'))), 'hook_block_info_alter successfully verified.'); } } diff --git a/dbtng_example/dbtng_example.test b/dbtng_example/dbtng_example.test index 2f7ae56..57f6acd 100644 --- a/dbtng_example/dbtng_example.test +++ b/dbtng_example/dbtng_example.test @@ -29,7 +29,7 @@ class DBTNGExampleUnitTestCase extends DrupalWebTestCase { $this->assertEqual( count($result), 2, - t('Found two entries in the table after installing the module.') + 'Found two entries in the table after installing the module.' ); } @@ -40,7 +40,7 @@ class DBTNGExampleUnitTestCase extends DrupalWebTestCase { function testUI() { // Test the basic list. $this->drupalGet('examples/dbtng'); - $this->assertPattern("/John[td\/<>\w]+Doe/", t("Text 'John Doe' found in table")); + $this->assertPattern("/John[td\/<>\w]+Doe/", "Text 'John Doe' found in table"); //Test the add tab. // Add the new entry. @@ -48,7 +48,7 @@ class DBTNGExampleUnitTestCase extends DrupalWebTestCase { array('name' => 'Some', 'surname' => 'Anonymous', 'age' => 33), t('Add')); // Now find the new entry. $this->drupalGet('examples/dbtng'); - $this->assertPattern("/Some[td\/<>\w]+Anonymous/", t("Text 'Some Anonymous' found in table")); + $this->assertPattern("/Some[td\/<>\w]+Anonymous/", "Text 'Some Anonymous' found in table"); // Try the update tab. @@ -58,7 +58,7 @@ class DBTNGExampleUnitTestCase extends DrupalWebTestCase { $this->assertEqual( count($result), 1, - t('Found one entry in the table with surname = "Anonymous".') + 'Found one entry in the table with surname = "Anonymous".' ); $entry = $result[0]; unset($entry->uid); @@ -67,12 +67,12 @@ class DBTNGExampleUnitTestCase extends DrupalWebTestCase { (array)$entry, t('Update')); // Now find the new entry. $this->drupalGet('examples/dbtng'); - $this->assertPattern("/NewFirstName[td\/<>\w]+Anonymous/", t("Text 'NewFirstName Anonymous' found in table")); + $this->assertPattern("/NewFirstName[td\/<>\w]+Anonymous/", "Text 'NewFirstName Anonymous' found in table"); // Try the advanced tab. $this->drupalGet('examples/dbtng/advanced'); $rows = $this->xpath("//*[@id='block-system-main']/div/table[1]/tbody/tr"); - $this->assertEqual(count($rows), 1, t("One row found in advanced view")); + $this->assertEqual(count($rows), 1, "One row found in advanced view"); $this->assertFieldByXPath("//*[@id='block-system-main']/div/table[1]/tbody/tr/td[4]", "Roe", "Name 'Roe' Exists in advanced list"); } @@ -101,7 +101,7 @@ class DBTNGExampleUnitTestCase extends DrupalWebTestCase { $this->assertEqual( count($result), 4, - t('Found a total of four entries in the table after creating two additional entries.') + 'Found a total of four entries in the table after creating two additional entries.' ); // Verify 2 of these records have 'Doe' as surname @@ -109,7 +109,7 @@ class DBTNGExampleUnitTestCase extends DrupalWebTestCase { $this->assertEqual( count($result), 2, - t('Found two entries in the table with surname = "Doe".') + 'Found two entries in the table with surname = "Doe".' ); // Now find our not-Doe entry. @@ -117,7 +117,7 @@ class DBTNGExampleUnitTestCase extends DrupalWebTestCase { $this->assertEqual( count($result), 1, - t('Found one entry in the table with surname "NotDoe')); + 'Found one entry in the table with surname "NotDoe'); // Our NotDoe will be changed to "NowDoe". $entry = $result[0]; $entry->surname = "NowDoe"; @@ -127,14 +127,14 @@ class DBTNGExampleUnitTestCase extends DrupalWebTestCase { $this->assertEqual( count($result), 1, - t("Found renamed 'NowDoe' surname")); + "Found renamed 'NowDoe' surname"); // Read only John Doe entry. $result = dbtng_example_entry_load(array('name' => 'John', 'surname' => 'Doe')); $this->assertEqual( count($result), 1, - t('Found one entry for John Doe.') + 'Found one entry for John Doe.' ); // Get the entry $entry = (array) end($result); @@ -149,7 +149,7 @@ class DBTNGExampleUnitTestCase extends DrupalWebTestCase { $this->assertEqual( count($result), 1, - t('Found one entry with surname = Nowdoe.') + 'Found one entry with surname = Nowdoe.' ); // Verify it is Jane NowDoe. @@ -157,12 +157,12 @@ class DBTNGExampleUnitTestCase extends DrupalWebTestCase { $this->assertEqual( $entry['name'], 'Jane', - t('The name Jane is found in the entry') + 'The name Jane is found in the entry' ); $this->assertEqual( $entry['surname'], 'NowDoe', - t('The surname NowDoe is found in the entry') + 'The surname NowDoe is found in the entry' ); // Delete the entry. @@ -173,7 +173,7 @@ class DBTNGExampleUnitTestCase extends DrupalWebTestCase { $this->assertEqual( count($result), 3, - t('Found only three records, a record was deleted.') + 'Found only three records, a record was deleted.' ); } } diff --git a/email_example/email_example.test b/email_example/email_example.test index b2a32e5..d242018 100644 --- a/email_example/email_example.test +++ b/email_example/email_example.test @@ -45,16 +45,16 @@ class EmailExampleTestCase extends DrupalWebTestCase { $result = $this->drupalPost('example/email_example', $email_options, t('Submit')); // Verify that email address is invalid and email was not sent. - $this->assertText(t('That e-mail address is not valid.'), t('Options were validated and form submitted.')); - $this->assertTrue(!count($this->drupalGetMails()), t('No email was sent.')); + $this->assertText(t('That e-mail address is not valid.'), 'Options were validated and form submitted.'); + $this->assertTrue(!count($this->drupalGetMails()), 'No email was sent.'); // Now try with a valid email address. $email_options['email'] = $this->randomName() . '@' . $this->randomName() . '.drupal'; $result = $this->drupalPost('example/email_example', $email_options, t('Submit')); // Verify that email address is valid and email was sent. - // $this->assertText(t('Your message has been sent.'), t('Options were validated and form submitted.')); - $this->assertTrue(count($this->drupalGetMails()), t('An email has been sent.')); + // $this->assertText(t('Your message has been sent.'), 'Options were validated and form submitted.'); + $this->assertTrue(count($this->drupalGetMails()), 'An email has been sent.'); // Validate sent email. $email = $this->drupalGetMails(); @@ -65,14 +65,14 @@ class EmailExampleTestCase extends DrupalWebTestCase { $this->assertEqual( $email['to'], $email_options['email'], - t('Email recipient successfully verified.') + 'Email recipient successfully verified.' ); // Verify email subject. $this->assertEqual( $email['subject'], t('E-mail sent from @site-name', array('@site-name' => variable_get('site_name', 'Drupal')), $t_options), - t('Email subject successfully verified.') + 'Email subject successfully verified.' ); // Verify email body. @@ -81,7 +81,7 @@ class EmailExampleTestCase extends DrupalWebTestCase { $email['body'], t('@name sent you the following message:', array('@name' => $account->name), $t_options) ), - t('Email body successfully verified.') + 'Email body successfully verified.' ); // Verify that signature is attached. @@ -90,7 +90,7 @@ class EmailExampleTestCase extends DrupalWebTestCase { $email['body'], t("--\nMail altered by email_example module.", array(), $t_options) ), - t('Email signature successfully verified.') + 'Email signature successfully verified.' ); } } diff --git a/entity_example/entity_example.test b/entity_example/entity_example.test index 3be2ef3..5663a0d 100644 --- a/entity_example/entity_example.test +++ b/entity_example/entity_example.test @@ -77,7 +77,7 @@ class EntityExampleTestCase extends DrupalWebTestCase { // delete entity 5 $this->drupalPost('examples/entity_example/basic/5/edit' , $edit[5], 'Delete'); $this->drupalGet('examples/entity_example/basic/5'); - $this->assertResponse(404, t('Deleted entity 5 no longer exists')); + $this->assertResponse(404, 'Deleted entity 5 no longer exists'); unset($edit[5]); // Update entity 2 and verify the update. @@ -114,7 +114,7 @@ class EntityExampleTestCase extends DrupalWebTestCase { $this->drupalPost('examples/entity_example/basic/10/edit' , $edit[10], 'Save'); $this->assertResponse(200); $this->assertText('item_description=' . $edit[10]['item_description']); - $this->assertText($edit[10]['field_new_junk_field[und][0][value]'], t('Custom field updated successfully')); + $this->assertText($edit[10]['field_new_junk_field[und][0][value]'], 'Custom field updated successfully'); // Create and login user without view access. $account = $this->drupalCreateUser(array('access content')); @@ -122,27 +122,27 @@ class EntityExampleTestCase extends DrupalWebTestCase { $this->drupalGet('admin/structure/entity_example_basic/manage'); $this->assertResponse(403); $this->drupalGet('examples/entity_example/basic/2'); - $this->assertResponse(403, t('User does not have permission to view entity')); + $this->assertResponse(403, 'User does not have permission to view entity'); // Create and login user with view access but no edit access. $account = $this->drupalCreateUser(array('access content', 'view any entity_example_basic entity')); $this->drupalLogin($account); $this->drupalGet('admin/structure/entity_example_basic/manage'); - $this->assertResponse(403, t('Denied access to admin manage page')); + $this->assertResponse(403, 'Denied access to admin manage page'); $this->drupalGet('examples/entity_example/basic/2'); - $this->assertResponse(200, t('User has permission to view entity')); + $this->assertResponse(200, 'User has permission to view entity'); $this->drupalGet('examples/entity_example/basic/2/edit'); - $this->assertResponse(403, t('User is denied edit privileges')); + $this->assertResponse(403, 'User is denied edit privileges'); // Create and login user with view and edit but no manage privs. $account = $this->drupalCreateUser(array('access content', 'view any entity_example_basic entity', 'edit any entity_example_basic entity')); $this->drupalLogin($account); $this->drupalGet('admin/structure/entity_example_basic/manage'); - $this->assertResponse(403, t('Denied access to admin manage page')); + $this->assertResponse(403, 'Denied access to admin manage page'); $this->drupalGet('examples/entity_example/basic/2'); - $this->assertResponse(200, t('User has permission to view entity')); + $this->assertResponse(200, 'User has permission to view entity'); $this->drupalGet('examples/entity_example/basic/2/edit'); - $this->assertResponse(200, t('User has edit privileges')); + $this->assertResponse(200, 'User has edit privileges'); } diff --git a/field_example/field_example.test b/field_example/field_example.test index f94dbc6..1d561f8 100644 --- a/field_example/field_example.test +++ b/field_example/field_example.test @@ -124,11 +124,11 @@ class FieldExampleTest extends DrupalWebTestCase { $output_strings = $this->xpath("//div[contains(@class,'field-type-field-example-rgb')]/div/div/p/text()"); - $this->assertEqual((string)$output_strings[0], t("The color code in this field is #000001")); - $this->assertEqual((string)$output_strings[1], t("The color code in this field is #000002")); - $this->assertEqual((string)$output_strings[2], t("The color code in this field is #000003")); - $this->assertEqual((string)$output_strings[3], t("The color code in this field is #000004")); - $this->assertEqual((string)$output_strings[4], t("The color code in this field is #000005")); + $this->assertEqual((string)$output_strings[0], "The color code in this field is #000001"); + $this->assertEqual((string)$output_strings[1], "The color code in this field is #000002"); + $this->assertEqual((string)$output_strings[2], "The color code in this field is #000003"); + $this->assertEqual((string)$output_strings[3], "The color code in this field is #000004"); + $this->assertEqual((string)$output_strings[4], "The color code in this field is #000005"); } /** diff --git a/file_example/file_example.test b/file_example/file_example.test index 86d5ee6..c57521e 100644 --- a/file_example/file_example.test +++ b/file_example/file_example.test @@ -45,13 +45,13 @@ class FileExampleTest extends DrupalWebTestCase { 'directory_name' => $dirname, ); $this->drupalPost('examples/file_example/fileapi', $edit, t('Check to see if directory exists')); - $this->assertRaw(t('Directory %dirname does not exist', array('%dirname' => $dirname)), t('Verify that directory does not exist.')); + $this->assertRaw(t('Directory %dirname does not exist', array('%dirname' => $dirname)), 'Verify that directory does not exist.'); $this->drupalPost('examples/file_example/fileapi', $edit, t('Create directory')); $this->assertRaw(t('Directory %dirname is ready for use', array('%dirname' => $dirname))); $this->drupalPost('examples/file_example/fileapi', $edit, t('Check to see if directory exists')); - $this->assertRaw(t('Directory %dirname exists', array('%dirname' => $dirname)), t('Verify that directory now does exist.')); + $this->assertRaw(t('Directory %dirname exists', array('%dirname' => $dirname)), 'Verify that directory now does exist.'); // Create a file in the directory we created. $content = $this->randomName(30); @@ -62,7 +62,7 @@ class FileExampleTest extends DrupalWebTestCase { 'fileops_file' => $filename, ); $this->drupalPost('examples/file_example/fileapi', $edit, t('Check to see if file exists')); - $this->assertRaw(t('The file %filename does not exist', array('%filename' => $filename)), t('Verify that file does not yet exist.')); + $this->assertRaw(t('The file %filename does not exist', array('%filename' => $filename)), 'Verify that file does not yet exist.'); debug(t('Processing button=%button, scheme=%scheme, dir=%dirname, file=%filename', array('%button' => $button, '%scheme' => $scheme, '%filename' => $filename, '%dirname' => $dirname))); $edit = array( @@ -91,7 +91,7 @@ class FileExampleTest extends DrupalWebTestCase { 'fileops_file' => $filename, ); $this->drupalPost('examples/file_example/fileapi', $edit, t('Check to see if file exists')); - $this->assertRaw(t('The file %filename exists', array('%filename' => $filename)), t('Verify that file now exists.')); + $this->assertRaw(t('The file %filename exists', array('%filename' => $filename)), 'Verify that file now exists.'); // Now read the file that got written above and verify that we can use // the writing tools. @@ -108,14 +108,14 @@ class FileExampleTest extends DrupalWebTestCase { $this->drupalPost('examples/file_example/fileapi', $edit, t('Delete file')); $this->assertText(t('Successfully deleted')); $this->drupalPost('examples/file_example/fileapi', $edit, t('Check to see if file exists')); - $this->assertRaw(t('The file %filename does not exist', array('%filename' => $filename)), t('Verify file has been deleted.')); + $this->assertRaw(t('The file %filename does not exist', array('%filename' => $filename)), 'Verify file has been deleted.'); $edit = array( 'directory_name' => $dirname, ); $this->drupalPost('examples/file_example/fileapi', $edit, t('Delete directory')); $this->drupalPost('examples/file_example/fileapi', $edit, t('Check to see if directory exists')); - $this->assertRaw(t('Directory %dirname does not exist', array('%dirname' => $dirname)), t('Verify that directory does not exist after deletion.')); + $this->assertRaw(t('Directory %dirname does not exist', array('%dirname' => $dirname)), 'Verify that directory does not exist after deletion.'); } } } diff --git a/filter_example/filter_example.test b/filter_example/filter_example.test index 6587511..2fb6575 100644 --- a/filter_example/filter_example.test +++ b/filter_example/filter_example.test @@ -91,6 +91,6 @@ class FilterExampleTestCase extends DrupalWebTestCase { $this->assertResponse(200); // Only foo filter is enabled - $this->assertRaw("What " . $replacement . " is it", t('Foo filter successfully verified.')); + $this->assertRaw("What " . $replacement . " is it", 'Foo filter successfully verified.'); } } diff --git a/image_example/image_example.test b/image_example/image_example.test index 0f7ef4b..b9ceab4 100644 --- a/image_example/image_example.test +++ b/image_example/image_example.test @@ -37,17 +37,17 @@ class ImageExampleTestCase extends DrupalWebTestCase { // Verify that the default style added by // image_example_image_default_styles() is in the list of image styles. $image_styles = image_styles(); - $this->assertTrue(isset($image_styles['image_example_style']), t('The default style image_example_style is in the list of image styles.')); + $this->assertTrue(isset($image_styles['image_example_style']), 'The default style image_example_style is in the list of image styles.'); // Verify that the effect added to the default 'thumbnail' style by // image_example_image_styles_alter() is present. - $this->assertTrue((isset($image_styles['thumbnail']['effects'][1]['name']) && $image_styles['thumbnail']['effects'][1]['name'] == 'image_example_colorize'), t('Effect added to the thumbnail style via hook_image_styles_alter() is present.')); + $this->assertTrue((isset($image_styles['thumbnail']['effects'][1]['name']) && $image_styles['thumbnail']['effects'][1]['name'] == 'image_example_colorize'), 'Effect added to the thumbnail style via hook_image_styles_alter() is present.'); // Create a new image style and add the effect provided by // image_example_effect_info(). $new_style = array('name' => drupal_strtolower($this->randomName())); $new_style = image_style_save($new_style); - $this->assertTrue(isset($new_style['isid']), t('Image style @style_name created.', array('@style_name' => $new_style['name']))); + $this->assertTrue(isset($new_style['isid']), format_string('Image style @style_name created.', array('@style_name' => $new_style['name']))); $edit = array( 'new' => 'image_example_colorize', @@ -56,12 +56,12 @@ class ImageExampleTestCase extends DrupalWebTestCase { // Verify the 'color' field provided by image_example_colorize_form() // appears on the effect configuration page. And that we can fill it out. - $this->assertField('data[color]', t('Color field provided by image_example_effect_colorize_form is present on effect configuration page.')); + $this->assertField('data[color]', 'Color field provided by image_example_effect_colorize_form is present on effect configuration page.'); $edit = array( 'data[color]' => '#000000', ); $this->drupalPost(NULL, $edit, t('Add effect')); - $this->assertText(t('The image effect was successfully applied.'), t('Colorize effect added to @style_name.', array('@style_name' => $new_style['name']))); + $this->assertText(t('The image effect was successfully applied.'), format_string('Colorize effect added to @style_name.', array('@style_name' => $new_style['name']))); // Set the variable 'image_example_style_name' to the name of our new style // then rename the style and ensure the variable name is changed. @@ -73,7 +73,7 @@ class ImageExampleTestCase extends DrupalWebTestCase { $style['name'] = drupal_strtolower($this->randomName()); $style = image_style_save($style); $variable = variable_get('image_example_style_name', ''); - $this->assertTrue(($variable == $style['name']), t('Variable image_example_style_name successfully updated when renaming image style.')); + $this->assertTrue(($variable == $style['name']), 'Variable image_example_style_name successfully updated when renaming image style.'); } } @@ -92,12 +92,12 @@ class ImageExampleTestCase extends DrupalWebTestCase { 'image_example_style_name' => 'image_example_style', ); $this->drupalPost('image_example/styles', $edit, t('Save')); - $this->assertText(t('The image @image_name was uploaded', array('@image_name' => $images[0]->filename)), t('Image uploaded to image block.')); + $this->assertText(t('The image @image_name was uploaded', array('@image_name' => $images[0]->filename)), 'Image uploaded to image block.'); // Verify the image is displayed. $this->drupalGet('image_example/styles'); $fid = variable_get('image_example_image_fid', FALSE); $image = isset($fid) ? file_load($fid) : NULL; - $this->assertRaw(file_uri_target($image->uri), t('Image is displayed')); + $this->assertRaw(file_uri_target($image->uri), 'Image is displayed'); } } diff --git a/menu_example/menu_example.test b/menu_example/menu_example.test index 43a6e6a..018d0d4 100644 --- a/menu_example/menu_example.test +++ b/menu_example/menu_example.test @@ -81,7 +81,7 @@ class MenuExampleTestCase extends DrupalWebTestCase { // Check that our title callback changing /user dynamically is working. // Using ' because of the format_username function. - $this->assertRaw(t("@name's account", array('@name' => format_username($web_user))), t('Title successfully changed to account name: %name.', array('%name' => $web_user->name))); + $this->assertRaw(t("@name's account", array('@name' => format_username($web_user))), format_string('Title successfully changed to account name: %name.', array('%name' => $web_user->name))); // Now start testing other menu entries. $this->drupalGet('examples/menu_example'); diff --git a/node_access_example/node_access_example.test b/node_access_example/node_access_example.test index edb7c05..ec0d329 100644 --- a/node_access_example/node_access_example.test +++ b/node_access_example/node_access_example.test @@ -71,7 +71,7 @@ class NodeAccessExampleTestCase extends DrupalWebTestCase { $nid = db_query('SELECT nid FROM {node} WHERE title = :title', array(':title' => $edit['title']))->fetchField(); $this->assertText(t('New node @nid was created and private=@private', array('@nid' => $nid, '@private' => $is_private))); $private_status = db_query('SELECT private FROM {node_access_example} where nid = :nid', array(':nid' => $nid))->fetchField(); - $this->assertTrue($is_private == $private_status, t('Node was properly set to private or not private in node_access_example table.')); + $this->assertTrue($is_private == $private_status, 'Node was properly set to private or not private in node_access_example table.'); if ($is_private) { $private_nodes[] = $nid; } @@ -92,7 +92,7 @@ class NodeAccessExampleTestCase extends DrupalWebTestCase { foreach ($nodes_by_user[$uid] as $nid => $is_private) { $this->drupalGet('node/' . $nid); $this->assertResponse(200); - $this->assertTitle($titles[$nid] . ' | Drupal', t('Correct title for node found')); + $this->assertTitle($titles[$nid] . ' | Drupal', 'Correct title for node found'); } } else { @@ -100,9 +100,9 @@ class NodeAccessExampleTestCase extends DrupalWebTestCase { // but we should be able to read non-private nodes. foreach ($nodes_by_user[$uid] as $nid => $is_private) { $this->drupalGet('node/' . $nid); - $this->assertResponse($is_private ? 403 : 200, t('Node @nid by user @uid should get a @response for this user (@web_user_uid)', array('@nid' => $nid, '@uid' => $uid, '@response' => $is_private ? 403 : 200, '@web_user_uid' => $web_user->uid))); + $this->assertResponse($is_private ? 403 : 200, format_string('Node @nid by user @uid should get a @response for this user (@web_user_uid)', array('@nid' => $nid, '@uid' => $uid, '@response' => $is_private ? 403 : 200, '@web_user_uid' => $web_user->uid))); if (!$is_private) { - $this->assertTitle($titles[$nid] . ' | Drupal', t('Correct title for node was found')); + $this->assertTitle($titles[$nid] . ' | Drupal', 'Correct title for node was found'); } } } @@ -111,9 +111,9 @@ class NodeAccessExampleTestCase extends DrupalWebTestCase { // Check to see that the correct nodes are shown on examples/node_access. $this->drupalGet('examples/node_access'); $accessible = $this->xpath("//tr[contains(@class,'accessible')]"); - $this->assertEqual(count($accessible), 1, t('One private item accessible')); + $this->assertEqual(count($accessible), 1, 'One private item accessible'); foreach ($accessible as $row) { - $this->assertEqual($row->td[2], $web_user->uid, t('Accessible row owned by this user')); + $this->assertEqual($row->td[2], $web_user->uid, 'Accessible row owned by this user'); } } @@ -160,7 +160,7 @@ class NodeAccessExampleTestCase extends DrupalWebTestCase { $body = $this->randomName(); $edit = array('body[und][0][value]' => $body); $this->drupalPost('node/' . $nid . '/edit', $edit, t('Save')); - $this->assertText(t('has been updated'), t('Node was updated by "foobar" user')); + $this->assertText(t('has been updated'), 'Node was updated by "foobar" user'); } // Test that a privileged user can edit and delete private content. @@ -191,6 +191,6 @@ class NodeAccessExampleTestCase extends DrupalWebTestCase { function checkSearchResults($search_query, $expected_result_count) { $this->drupalPost('search/node', array('keys' => $search_query), t('Search')); $search_results = $this->xpath("//ol[contains(@class, 'search-results')]/li"); - $this->assertEqual(count($search_results), $expected_result_count, t('Found the expected number of search results')); + $this->assertEqual(count($search_results), $expected_result_count, 'Found the expected number of search results'); } } diff --git a/nodeapi_example/nodeapi_example.test b/nodeapi_example/nodeapi_example.test index d36d2eb..a182b2c 100644 --- a/nodeapi_example/nodeapi_example.test +++ b/nodeapi_example/nodeapi_example.test @@ -64,8 +64,8 @@ class NodeApiExampleTestCase extends DrupalWebTestCase { $this->assertResponse(200); // Check if the new Rating options appear in the settings page - $this->assertText(t('NodeAPI Example Rating'), t('Rating options found in content type.')); - $this->assertFieldByName('nodeapi_example_node_type', 1, t('Rating is Disabled by default.')); + $this->assertText(t('NodeAPI Example Rating'), 'Rating options found in content type.'); + $this->assertFieldByName('nodeapi_example_node_type', 1, 'Rating is Disabled by default.'); // Disable the rating for this content type: 0 for Disabled, 1 for Enabled. $content_settings = array( @@ -73,7 +73,7 @@ class NodeApiExampleTestCase extends DrupalWebTestCase { ); $this->drupalPost('admin/structure/types/manage/' . $type, $content_settings, t('Save content type')); $this->assertResponse(200); - $this->assertRaw(' has been updated.', t('Settings modified successfully for content type.')); + $this->assertRaw(' has been updated.', 'Settings modified successfully for content type.'); // Create an example node $langcode = LANGUAGE_NONE; @@ -84,7 +84,7 @@ class NodeApiExampleTestCase extends DrupalWebTestCase { $this->assertResponse(200); // Check that the rating is not shown, as we have not yet enabled it - $this->assertNoRaw('Rating: ', t('Extended rating information is not shown.')); + $this->assertNoRaw('Rating: ', 'Extended rating information is not shown.'); // Save current current url (we are viewing the new node) $node_url = $this->getUrl(); @@ -95,12 +95,12 @@ class NodeApiExampleTestCase extends DrupalWebTestCase { ); $this->drupalPost('admin/structure/types/manage/' . $type, $content_settings, t('Save content type')); $this->assertResponse(200); - $this->assertRaw(' has been updated.', t('Settings modified successfully for content type.')); + $this->assertRaw(' has been updated.', 'Settings modified successfully for content type.'); // Check previously create node. It should be not rated $this->drupalGet($node_url); $this->assertResponse(200); - $this->assertRaw(t('Rating: %rating', array('%rating' => t('Unrated'))), t('Content is not rated.')); + $this->assertRaw(t('Rating: %rating', array('%rating' => t('Unrated'))), 'Content is not rated.'); // Rate the content, 4 is for "Good" $rate = array( @@ -110,7 +110,7 @@ class NodeApiExampleTestCase extends DrupalWebTestCase { $this->assertResponse(200); // Check that content has been rated - $this->assertRaw(t('Rating: %rating', array('%rating' => t('Good'))), t('Content is successfully rated.')); + $this->assertRaw(t('Rating: %rating', array('%rating' => t('Good'))), 'Content is successfully rated.'); } @@ -132,8 +132,8 @@ class NodeApiExampleTestCase extends DrupalWebTestCase { $this->assertResponse(200); // Check if the new Rating options appear in the settings page - $this->assertText(t('NodeAPI Example Rating'), t('Rating options found in content type.')); - $this->assertFieldByName('nodeapi_example_node_type', 1, t('Rating is Disabled by default.')); + $this->assertText(t('NodeAPI Example Rating'), 'Rating options found in content type.'); + $this->assertFieldByName('nodeapi_example_node_type', 1, 'Rating is Disabled by default.'); // Disable the rating for this content type: 0 for Disabled, 1 for Enabled. $content_settings = array( @@ -141,7 +141,7 @@ class NodeApiExampleTestCase extends DrupalWebTestCase { ); $this->drupalPost('admin/structure/types/manage/' . $type, $content_settings, t('Save content type')); $this->assertResponse(200); - $this->assertRaw(' has been updated.', t('Settings modified successfully for content type.')); + $this->assertRaw(' has been updated.', 'Settings modified successfully for content type.'); // Create an example node $langcode = LANGUAGE_NONE; @@ -152,7 +152,7 @@ class NodeApiExampleTestCase extends DrupalWebTestCase { $this->assertResponse(200); // Check that the rating is not shown, as we have not yet enabled it - $this->assertNoRaw('Rating: ', t('Extended rating information is not shown.')); + $this->assertNoRaw('Rating: ', 'Extended rating information is not shown.'); // Save current current url (we are viewing the new node) $node_url = $this->getUrl(); @@ -163,12 +163,12 @@ class NodeApiExampleTestCase extends DrupalWebTestCase { ); $this->drupalPost('admin/structure/types/manage/' . $type, $content_settings, t('Save content type')); $this->assertResponse(200); - $this->assertRaw(' has been updated.', t('Settings modified successfully for content type.')); + $this->assertRaw(' has been updated.', 'Settings modified successfully for content type.'); // Check previously create node. It should be not rated $this->drupalGet($node_url); $this->assertResponse(200); - $this->assertRaw(t('Rating: %rating', array('%rating' => t('Unrated'))), t('Content is not rated.')); + $this->assertRaw(t('Rating: %rating', array('%rating' => t('Unrated'))), 'Content is not rated.'); // Rate the content, 4 is for "Good" $rate = array( @@ -178,7 +178,7 @@ class NodeApiExampleTestCase extends DrupalWebTestCase { $this->assertResponse(200); // Check that content has been rated - $this->assertRaw(t('Rating: %rating', array('%rating' => t('Good'))), t('Content is successfully rated.')); + $this->assertRaw(t('Rating: %rating', array('%rating' => t('Good'))), 'Content is successfully rated.'); // Rate the content to poor using a new revision, 1 is for "Poor" $rate = array( @@ -189,7 +189,7 @@ class NodeApiExampleTestCase extends DrupalWebTestCase { $this->assertResponse(200); // Check that content has been rated - $this->assertRaw(t('Rating: %rating', array('%rating' => t('Poor'))), t('Content is successfully rated.')); + $this->assertRaw(t('Rating: %rating', array('%rating' => t('Poor'))), 'Content is successfully rated.'); //Now switch back to previous revision of the node. $this->drupalGet($node_url . '/revisions'); @@ -203,7 +203,7 @@ class NodeApiExampleTestCase extends DrupalWebTestCase { $this->assertResponse(200); // Check that content has been rated - $this->assertRaw(t('Rating: %rating', array('%rating' => t('Good'))), t('Content rating matches reverted revision.')); + $this->assertRaw(t('Rating: %rating', array('%rating' => t('Good'))), 'Content rating matches reverted revision.'); } diff --git a/page_example/page_example.test b/page_example/page_example.test index a806a43..37a6fd3 100644 --- a/page_example/page_example.test +++ b/page_example/page_example.test @@ -79,8 +79,8 @@ class PageExampleTestCase extends DrupalWebTestCase { // Verify that user can access simple content $this->drupalGet('examples/page_example/simple'); - $this->assertResponse(200, t('simple content successfully accessed.')); - $this->assertText(t('The quick brown fox jumps over the lazy dog.'), t('Simple content successfully verified.')); + $this->assertResponse(200, 'simple content successfully accessed.'); + $this->assertText(t('The quick brown fox jumps over the lazy dog.'), 'Simple content successfully verified.'); // Check if user can't access arguments page $this->pageExampleVerifyNoAccess('examples/page_example/arguments/1/2'); @@ -95,11 +95,11 @@ class PageExampleTestCase extends DrupalWebTestCase { $first = $this->randomNumber(3); $second = $this->randomNumber(3); $this->drupalGet('examples/page_example/arguments/' . $first . '/' . $second); - $this->assertResponse(200, t('arguments content successfully accessed.')); + $this->assertResponse(200, 'arguments content successfully accessed.'); // Verify argument usage - $this->assertRaw(t("First number was @number.", array('@number' => $first)), t('arguments first argument successfully verified.')); - $this->assertRaw(t("Second number was @number.", array('@number' => $second)), t('arguments second argument successfully verified.')); - $this->assertRaw(t('The total was @number.', array('@number' => $first + $second)), t('arguments content successfully verified.')); + $this->assertRaw(t("First number was @number.", array('@number' => $first)), 'arguments first argument successfully verified.'); + $this->assertRaw(t("Second number was @number.", array('@number' => $second)), 'arguments second argument successfully verified.'); + $this->assertRaw(t('The total was @number.', array('@number' => $first + $second)), 'arguments content successfully verified.'); // Verify incomplete argument call to arguments content $this->drupalGet('examples/page_example/arguments/' . $first . '/'); @@ -107,11 +107,11 @@ class PageExampleTestCase extends DrupalWebTestCase { // Verify invalid argument call to arguments content $this->drupalGet('examples/page_example/arguments/' . $first . '/' . $this->randomString()); - $this->assertResponse(403, t('Invalid argument for arguments content successfully verified')); + $this->assertResponse(403, 'Invalid argument for arguments content successfully verified'); // Verify invalid argument call to arguments content $this->drupalGet('examples/page_example/arguments/' . $this->randomString() . '/' . $second); - $this->assertResponse(403, t('Invalid argument for arguments content successfully verified')); + $this->assertResponse(403, 'Invalid argument for arguments content successfully verified'); // Check if user can't access simple page $this->pageExampleVerifyNoAccess('examples/page_example/simple'); diff --git a/rdf_example/rdf_example.test b/rdf_example/rdf_example.test index ccd60a4..1e47ae3 100644 --- a/rdf_example/rdf_example.test +++ b/rdf_example/rdf_example.test @@ -34,11 +34,11 @@ class RdfExampleRdfaMarkupTestCase extends DrupalWebTestCase { // The title is mapped to dc:title and v:name and is exposed in a meta tag // in the header. $recipe_title = $this->xpath("//meta[contains(@property, 'dc:title') and contains(@property, 'v:name') and @content='$node->title']"); - $this->assertTrue(!empty($recipe_title), t('Title is exposed with dc:title and v:name in meta element.')); + $this->assertTrue(!empty($recipe_title), 'Title is exposed with dc:title and v:name in meta element.'); // Test that the type is applied and that the default mapping for date is // used. $recipe_meta = $this->xpath("//div[(@about='$url') and (@typeof='v:Recipe')]//span[contains(@property, 'dc:date') and contains(@property, 'dc:created') and @datatype='xsd:dateTime' and @content='$isoDate']"); - $this->assertTrue(!empty($recipe_meta), t('RDF type is present on post. Properties dc:date and dc:created are present on post date.')); + $this->assertTrue(!empty($recipe_meta), 'RDF type is present on post. Properties dc:date and dc:created are present on post date.'); } } \ No newline at end of file diff --git a/render_example/render_example.test b/render_example/render_example.test index 6bc1c06..de664a1 100644 --- a/render_example/render_example.test +++ b/render_example/render_example.test @@ -31,7 +31,7 @@ class RenderExampleTestCase extends DrupalWebTestCase { function assertRenderResults($xpath_array) { foreach ($xpath_array as $xpath) { $result = $this->xpath($xpath); - $this->assertTrue(!empty($result), t('Found xpath %xpath', array('%xpath' => $xpath))); + $this->assertTrue(!empty($result), format_string('Found xpath %xpath', array('%xpath' => $xpath))); } } @@ -46,7 +46,7 @@ class RenderExampleTestCase extends DrupalWebTestCase { function assertRenderedText($xpath_array) { foreach ($xpath_array as $xpath => $text) { $result = $this->xpath($xpath); - $this->assertTrue((string)$result[0][0] == $text, t('%ary selects text %text', array('%ary' => $xpath, '%text' => $text))); + $this->assertTrue((string)$result[0][0] == $text, format_string('%ary selects text %text', array('%ary' => $xpath, '%text' => $text))); } } diff --git a/simpletest_example/simpletest_example.test b/simpletest_example/simpletest_example.test index 805706d..32b9184 100644 --- a/simpletest_example/simpletest_example.test +++ b/simpletest_example/simpletest_example.test @@ -71,7 +71,7 @@ class SimpletestExampleTestCase extends DrupalWebTestCase { debug('We are not running on the PIFR testing server, so will go ahead and catch the failure.'); $this->drupalGet("node/{$node->nid}/edit"); // Make sure we don't get a 401 unauthorized response: - $this->assertResponse(200, t('User is allowed to edit the content.')); + $this->assertResponse(200, 'User is allowed to edit the content.'); // Looking for title text in the page to determine whether we were // successful opening edit form. @@ -126,19 +126,21 @@ class SimpletestUnitTestExampleTestCase extends DrupalUnitTestCase { */ public function testSimpletestUnitTestExampleFunction() { $result = simpletest_example_empty_mysql_date(NULL); - $message = t('A NULL value should return TRUE.'); + // Note that test assertion messages should never be translated, so + // this string is not wrapped in t(). + $message = 'A NULL value should return TRUE.'; $this->assertTrue($result, $message); $result = simpletest_example_empty_mysql_date(''); - $message = t('An empty string should return TRUE.'); + $message = 'An empty string should return TRUE.'; $this->assertTrue($result, $message); $result = simpletest_example_empty_mysql_date('0000-00-00'); - $message = t('An "empty" MySQL DATE should return TRUE.'); + $message = 'An "empty" MySQL DATE should return TRUE.'; $this->assertTrue($result, $message); $result = simpletest_example_empty_mysql_date(date('Y-m-d')); - $message = t('A valid date should return FALSE.'); + $message = 'A valid date should return FALSE.'; $this->assertFalse($result, $message); } } diff --git a/tablesort_example/tablesort_example.test b/tablesort_example/tablesort_example.test index 48e27d4..ce8124b 100644 --- a/tablesort_example/tablesort_example.test +++ b/tablesort_example/tablesort_example.test @@ -29,28 +29,28 @@ class TableSortExampleTestCase extends DrupalWebTestCase { // no need to login for this test $this->drupalGet('examples/tablesort_example', array('query' => array('sort' => 'desc', 'order' => 'Numbers'))); $this->assertRaw(' - 7et982hkv ', t('Ordered by Number decending')); + 7et982hkv ', 'Ordered by Number decending'); $this->drupalGet('examples/tablesort_example', array('query' => array('sort' => 'asc', 'order' => 'Numbers'))); $this->assertRaw(' - 1e912cv21 ', t('Ordered by Number ascending')); + 1e912cv21 ', 'Ordered by Number ascending'); //Sort by Letters $this->drupalGet('examples/tablesort_example', array('query' => array('sort' => 'desc', 'order' => 'Letters'))); $this->assertRaw(' - 4w80jsv772 ', t('Ordered by Letters decending')); + 4w80jsv772 ', 'Ordered by Letters decending'); $this->drupalGet('examples/tablesort_example', array('query' => array('sort' => 'asc', 'order' => 'Letters'))); $this->assertRaw(' - 2a0kuykuh ', t('Ordered by Letters ascending')); + 2a0kuykuh ', 'Ordered by Letters ascending'); //Sort by Mixture $this->drupalGet('examples/tablesort_example', array('query' => array('sort' => 'desc', 'order' => 'Mixture'))); $this->assertRaw(' - 7et982hkv ', t('Ordered by Mixture decending')); + 7et982hkv ', 'Ordered by Mixture decending'); $this->drupalGet('examples/tablesort_example', array('query' => array('sort' => 'asc', 'order' => 'Mixture'))); $this->assertRaw(' - 2a0kuykuh ', t('Ordered by Mixture ascending')); + 2a0kuykuh ', 'Ordered by Mixture ascending'); } } diff --git a/trigger_example/trigger_example.test b/trigger_example/trigger_example.test index adac43b..d20f7d1 100644 --- a/trigger_example/trigger_example.test +++ b/trigger_example/trigger_example.test @@ -49,7 +49,7 @@ class TriggerExampleTestCase extends DrupalWebTestCase { // Request triggersomething form and submit. $this->drupalPost('examples/trigger_example', array(), t('Run triggersomething event')); // Verify the message is shown to the user. - $this->assertText($action_label, t('The triggersomething event executed the action.')); + $this->assertText($action_label, 'The triggersomething event executed the action.'); } function testUserLogin() { diff --git a/xmlrpc_example/xmlrpc_example.test b/xmlrpc_example/xmlrpc_example.test index de09083..fc84c6a 100644 --- a/xmlrpc_example/xmlrpc_example.test +++ b/xmlrpc_example/xmlrpc_example.test @@ -32,10 +32,10 @@ class XmlrpcExampleTestCase extends DrupalWebTestCase { function testXmlrpcExampleBasic() { // Unit test functionality. $result = xmlrpc($this->xmlrpc_url, array('xmlrpc_example.add' => array(3, 4))); - $this->assertEqual($result, 7, t('Successfully added 3+4 = 7')); + $this->assertEqual($result, 7, 'Successfully added 3+4 = 7'); $result = xmlrpc($this->xmlrpc_url, array('xmlrpc_example.subtract' => array(4, 3))); - $this->assertEqual($result, 1, t('Successfully subtracted 4-3 = 1')); + $this->assertEqual($result, 1, 'Successfully subtracted 4-3 = 1'); // Make a multicall request $options = array( @@ -44,14 +44,14 @@ class XmlrpcExampleTestCase extends DrupalWebTestCase { ); $expected = array(7, 3); $result = xmlrpc($this->xmlrpc_url, $options); - $this->assertEqual($result, $expected, t('Successfully called multicall request')); + $this->assertEqual($result, $expected, 'Successfully called multicall request'); // Verify default limits $result = xmlrpc($this->xmlrpc_url, array('xmlrpc_example.subtract' => array(3, 4))); - $this->assertEqual(xmlrpc_errno(), 10002, t('Results below minimum return custom error: 10002')); + $this->assertEqual(xmlrpc_errno(), 10002, 'Results below minimum return custom error: 10002'); $result = xmlrpc($this->xmlrpc_url, array('xmlrpc_example.add' => array(7, 4))); - $this->assertEqual(xmlrpc_errno(), 10001, t('Results beyond maximum return custom error: 10001')); + $this->assertEqual(xmlrpc_errno(), 10001, 'Results beyond maximum return custom error: 10001'); } /** @@ -69,15 +69,15 @@ class XmlrpcExampleTestCase extends DrupalWebTestCase { $this->assertText(t('The XML-RPC server returned this response: @num', array('@num' => 5))); // Request available methods. $this->drupalPost('examples/xmlrpc/client', $edit, t('Request methods')); - $this->assertText('xmlrpc_example.add', t('The XML-RPC Add method was found.')); - $this->assertText('xmlrpc_example.subtract', t('The XML-RPC Subtract method was found.')); + $this->assertText('xmlrpc_example.add', 'The XML-RPC Add method was found.'); + $this->assertText('xmlrpc_example.subtract', 'The XML-RPC Subtract method was found.'); // Before testing multicall, verify that method exists - $this->assertText('system.multicall', t('The XML-RPC Multicall method was found.')); + $this->assertText('system.multicall', 'The XML-RPC Multicall method was found.'); // Verify multicall request $edit = array('num1' => 5, 'num2' => 2); $this->drupalPost('examples/xmlrpc/client', $edit, t('Add and Subtract')); - $this->assertText('[0] => 7', t('The XML-RPC server returned the addition result.')); - $this->assertText('[1] => 3', t('The XML-RPC server returned the subtraction result.')); + $this->assertText('[0] => 7', 'The XML-RPC server returned the addition result.'); + $this->assertText('[1] => 3', 'The XML-RPC server returned the subtraction result.'); } /** @@ -87,20 +87,20 @@ class XmlrpcExampleTestCase extends DrupalWebTestCase { // Set different minimum and maxmimum valuesI. $options = array('xmlrpc_example_server_min' => 3, 'xmlrpc_example_server_max' => 7); $this->drupalPost('examples/xmlrpc/server', $options, t('Save configuration')); - $this->assertText(t('The configuration options have been saved'), t('Results limited to >= 3 and <= 7')); + $this->assertText(t('The configuration options have been saved'), 'Results limited to >= 3 and <= 7'); $edit = array('num1' => 8, 'num2' => 3); $this->drupalPost('examples/xmlrpc/client', $edit, t('Subtract the integers')); $this->assertText(t('The XML-RPC server returned this response: @num', array('@num' => 5))); $result = xmlrpc($this->xmlrpc_url, array('xmlrpc_example.add' => array(3, 4))); - $this->assertEqual($result, 7, t('Successfully added 3+4 = 7')); + $this->assertEqual($result, 7, 'Successfully added 3+4 = 7'); $result = xmlrpc($this->xmlrpc_url, array('xmlrpc_example.subtract' => array(4, 3))); - $this->assertEqual(xmlrpc_errno(), 10002, t('subtracting 4-3 = 1 returns custom error: 10002')); + $this->assertEqual(xmlrpc_errno(), 10002, 'subtracting 4-3 = 1 returns custom error: 10002'); $result = xmlrpc($this->xmlrpc_url, array('xmlrpc_example.add' => array(7, 4))); - $this->assertEqual(xmlrpc_errno(), 10001, t('Adding 7 + 4 = 11 returns custom error: 10001')); + $this->assertEqual(xmlrpc_errno(), 10001, 'Adding 7 + 4 = 11 returns custom error: 10001'); } /** @@ -111,7 +111,7 @@ class XmlrpcExampleTestCase extends DrupalWebTestCase { // Enable XML-RPC service altering functionality. $options = array('xmlrpc_example_alter_enabled' => TRUE); $this->drupalPost('examples/xmlrpc/alter', $options, t('Save configuration')); - $this->assertText(t('The configuration options have been saved'), t('Results are not limited due to methods alteration')); + $this->assertText(t('The configuration options have been saved'), 'Results are not limited due to methods alteration'); // After altering the functionality, the add and subtract methods have no // limits and should not return any error. @@ -120,9 +120,9 @@ class XmlrpcExampleTestCase extends DrupalWebTestCase { $this->assertText(t('The XML-RPC server returned this response: @num', array('@num' => 77))); $result = xmlrpc($this->xmlrpc_url, array('xmlrpc_example.add' => array(30, 4))); - $this->assertEqual($result, 34, t('Successfully added 30+4 = 34')); + $this->assertEqual($result, 34, 'Successfully added 30+4 = 34'); $result = xmlrpc($this->xmlrpc_url, array('xmlrpc_example.subtract' => array(4, 30))); - $this->assertEqual($result, -26, t('Successfully substracted 4-30 = -26')); + $this->assertEqual($result, -26, 'Successfully subtracted 4-30 = -26'); } }