From 74bced908dac083cf7127c727ab345611998fc1d Mon Sep 17 00:00:00 2001 From: Lars Toomre Date: Thu, 27 Sep 2012 15:22:53 -0400 Subject: [PATCH] Remove t() from assertions in A-C include tests. --- .../system/Tests/Ajax/ElementValidationTest.php | 4 +- .../lib/Drupal/system/Tests/Ajax/FrameworkTest.php | 28 ++++---- .../lib/Drupal/system/Tests/Ajax/MultiFormTest.php | 8 +- .../lib/Drupal/system/Tests/Batch/PageTest.php | 2 +- .../system/Tests/Batch/PercentagesUnitTest.php | 4 +- .../Drupal/system/Tests/Batch/ProcessingTest.php | 68 +++++++++--------- .../system/Tests/Bootstrap/GetFilenameUnitTest.php | 10 ++-- .../system/Tests/Bootstrap/HookBootExitTest.php | 20 +++--- .../system/Tests/Bootstrap/IpAddressTest.php | 22 +++--- .../Drupal/system/Tests/Bootstrap/MiscUnitTest.php | 2 +- .../system/Tests/Bootstrap/PageCacheTest.php | 70 +++++++++--------- .../Tests/Bootstrap/ResettableStaticUnitTest.php | 8 +- .../system/Tests/Bootstrap/TimerUnitTest.php | 10 ++-- .../Drupal/system/Tests/Bootstrap/VariableTest.php | 10 ++-- .../lib/Drupal/system/Tests/Bundle/BundleTest.php | 4 +- .../lib/Drupal/system/Tests/Cache/ClearTest.php | 2 +- .../lib/Drupal/system/Tests/Common/AddFeedTest.php | 2 +- .../lib/Drupal/system/Tests/Common/AlterTest.php | 12 ++-- .../system/Tests/Common/AttributesUnitTest.php | 12 ++-- .../Tests/Common/AutocompleteTagsUnitTest.php | 4 +- .../Tests/Common/CascadingStylesheetsTest.php | 36 +++++----- .../Tests/Common/CascadingStylesheetsUnitTest.php | 8 +- .../Drupal/system/Tests/Common/FormatDateTest.php | 48 ++++++------ .../lib/Drupal/system/Tests/Common/GotoTest.php | 24 +++--- .../system/Tests/Common/HtmlIdentifierUnitTest.php | 18 +++--- .../Drupal/system/Tests/Common/HttpRequestTest.php | 62 ++++++++-------- .../system/Tests/Common/InstallerLanguageTest.php | 4 +- .../Drupal/system/Tests/Common/JavaScriptTest.php | 74 ++++++++++---------- .../Drupal/system/Tests/Common/JsonUnitTest.php | 20 +++--- .../system/Tests/Common/ParseInfoFileUnitTest.php | 6 +- .../system/Tests/Common/RegionContentTest.php | 4 +- .../lib/Drupal/system/Tests/Common/RenderTest.php | 32 ++++---- .../lib/Drupal/system/Tests/Common/SchemaTest.php | 48 ++++++------ .../Tests/Common/SimpleTestErrorCollectorTest.php | 8 +- .../system/Tests/Common/SystemListingTest.php | 4 +- .../Tests/Common/TableSortExtenderUnitTest.php | 12 ++-- .../lib/Drupal/system/Tests/Common/UrlTest.php | 42 ++++++------ .../system/Tests/Common/ValidUrlUnitTest.php | 8 +- .../Drupal/system/Tests/Common/WriteRecordTest.php | 66 +++++++++--------- .../lib/Drupal/system/Tests/Common/XssUnitTest.php | 4 +- 40 files changed, 415 insertions(+), 415 deletions(-) diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/ElementValidationTest.php b/core/modules/system/lib/Drupal/system/Tests/Ajax/ElementValidationTest.php index fcc8bc1..89c1809 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Ajax/ElementValidationTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Ajax/ElementValidationTest.php @@ -34,7 +34,7 @@ class ElementValidationTest extends AjaxTestBase { // Post with 'drivertext' as the triggering element. $post_result = $this->drupalPostAJAX('ajax_validation_test', $edit, 'drivertext'); // Look for a validation failure in the resultant JSON. - $this->assertNoText(t('Error message'), t("No error message in resultant JSON")); - $this->assertText('ajax_forms_test_validation_form_callback invoked', t('The correct callback was invoked')); + $this->assertNoText(t('Error message'), 'No error message in resultant JSON'); + $this->assertText('ajax_forms_test_validation_form_callback invoked', 'The correct callback was invoked'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/FrameworkTest.php b/core/modules/system/lib/Drupal/system/Tests/Ajax/FrameworkTest.php index d8748bc..bd5e5ce 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Ajax/FrameworkTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Ajax/FrameworkTest.php @@ -35,7 +35,7 @@ class FrameworkTest extends AjaxTestBase { 'command' => 'settings', 'settings' => array('ajax' => 'test'), ); - $this->assertCommand($commands, $expected, t('ajax_render() loads settings added with drupal_add_js().')); + $this->assertCommand($commands, $expected, 'ajax_render() loads settings added with drupal_add_js().'); // Verify that Ajax settings are loaded for #type 'link'. $this->drupalGet('ajax-test/link'); @@ -54,7 +54,7 @@ class FrameworkTest extends AjaxTestBase { 'command' => 'alert', 'text' => t('An error occurred while handling the request: The server received invalid input.'), ); - $this->assertCommand($commands, $expected, t('ajax_render_error() invokes alert command.')); + $this->assertCommand($commands, $expected, 'ajax_render_error() invokes alert command.'); // Verify custom error message. $edit = array( @@ -65,7 +65,7 @@ class FrameworkTest extends AjaxTestBase { 'command' => 'alert', 'text' => $edit['message'], ); - $this->assertCommand($commands, $expected, t('Custom error message is output.')); + $this->assertCommand($commands, $expected, 'Custom error message is output.'); } /** @@ -99,16 +99,16 @@ class FrameworkTest extends AjaxTestBase { // Verify that the base page doesn't have the settings and files that are to // be lazy loaded as part of the next requests. - $this->assertTrue(!isset($original_settings[$expected['setting_name']]), t('Page originally lacks the %setting, as expected.', array('%setting' => $expected['setting_name']))); - $this->assertTrue(!isset($original_settings[$expected['css']]), t('Page originally lacks the %css file, as expected.', array('%css' => $expected['css']))); - $this->assertTrue(!isset($original_settings[$expected['js']]), t('Page originally lacks the %js file, as expected.', array('%js' => $expected['js']))); + $this->assertTrue(!isset($original_settings[$expected['setting_name']]), format_string('Page originally lacks the %setting, as expected.', array('%setting' => $expected['setting_name']))); + $this->assertTrue(!isset($original_settings[$expected['css']]), format_string('Page originally lacks the %css file, as expected.', array('%css' => $expected['css']))); + $this->assertTrue(!isset($original_settings[$expected['js']]), format_string('Page originally lacks the %js file, as expected.', array('%js' => $expected['js']))); // Submit the AJAX request without triggering files getting added. $commands = $this->drupalPostAJAX(NULL, array('add_files' => FALSE), array('op' => t('Submit'))); $new_settings = $this->drupalGetSettings(); // Verify the setting was not added when not expected. - $this->assertTrue(!isset($new_settings['setting_name']), t('Page still lacks the %setting, as expected.', array('%setting' => $expected['setting_name']))); + $this->assertTrue(!isset($new_settings['setting_name']), format_string('Page still lacks the %setting, as expected.', array('%setting' => $expected['setting_name']))); // Verify a settings command does not add CSS or scripts to Drupal.settings // and no command inserts the corresponding tags on the page. $found_settings_command = FALSE; @@ -121,8 +121,8 @@ class FrameworkTest extends AjaxTestBase { $found_markup_command = TRUE; } } - $this->assertFalse($found_settings_command, t('Page state still lacks the %css and %js files, as expected.', array('%css' => $expected['css'], '%js' => $expected['js']))); - $this->assertFalse($found_markup_command, t('Page still lacks the %css and %js files, as expected.', array('%css' => $expected['css'], '%js' => $expected['js']))); + $this->assertFalse($found_settings_command, format_string('Page state still lacks the %css and %js files, as expected.', array('%css' => $expected['css'], '%js' => $expected['js']))); + $this->assertFalse($found_markup_command, format_string('Page still lacks the %css and %js files, as expected.', array('%css' => $expected['css'], '%js' => $expected['js']))); // Submit the AJAX request and trigger adding files. $commands = $this->drupalPostAJAX(NULL, array('add_files' => TRUE), array('op' => t('Submit'))); @@ -131,20 +131,20 @@ class FrameworkTest extends AjaxTestBase { $new_js = $new_settings['ajaxPageState']['js']; // Verify the expected setting was added. - $this->assertIdentical($new_settings[$expected['setting_name']], $expected['setting_value'], t('Page now has the %setting.', array('%setting' => $expected['setting_name']))); + $this->assertIdentical($new_settings[$expected['setting_name']], $expected['setting_value'], format_string('Page now has the %setting.', array('%setting' => $expected['setting_name']))); // Verify the expected CSS file was added, both to Drupal.settings, and as // an AJAX command for inclusion into the HTML. - $this->assertEqual($new_css, $original_css + array($expected['css'] => 1), t('Page state now has the %css file.', array('%css' => $expected['css']))); - $this->assertCommand($commands, array('data' => $expected_css_html), t('Page now has the %css file.', array('%css' => $expected['css']))); + $this->assertEqual($new_css, $original_css + array($expected['css'] => 1), format_string('Page state now has the %css file.', array('%css' => $expected['css']))); + $this->assertCommand($commands, array('data' => $expected_css_html), format_string('Page now has the %css file.', array('%css' => $expected['css']))); // Verify the expected JS file was added, both to Drupal.settings, and as // an AJAX command for inclusion into the HTML. By testing for an exact HTML // string containing the SCRIPT tag, we also ensure that unexpected // JavaScript code, such as a jQuery.extend() that would potentially clobber // rather than properly merge settings, didn't accidentally get added. - $this->assertEqual($new_js, $original_js + array($expected['js'] => 1), t('Page state now has the %js file.', array('%js' => $expected['js']))); - $this->assertCommand($commands, array('data' => $expected_js_html), t('Page now has the %js file.', array('%js' => $expected['js']))); + $this->assertEqual($new_js, $original_js + array($expected['js'] => 1), format_string('Page state now has the %js file.', array('%js' => $expected['js']))); + $this->assertCommand($commands, array('data' => $expected_js_html), format_string('Page now has the %js file.', array('%js' => $expected['js']))); } /** diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php b/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php index dd4700c..cffa6b7 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php @@ -74,8 +74,8 @@ class MultiFormTest extends AjaxTestBase { // each form. $this->drupalGet('form-test/two-instances-of-same-form'); foreach ($field_xpaths as $form_html_id => $field_xpath) { - $this->assert(count($this->xpath($field_xpath . $field_items_xpath_suffix)) == 1, t('Found the correct number of field items on the initial page.')); - $this->assertFieldByXPath($field_xpath . $button_xpath_suffix, NULL, t('Found the "add more" button on the initial page.')); + $this->assert(count($this->xpath($field_xpath . $field_items_xpath_suffix)) == 1, 'Found the correct number of field items on the initial page.'); + $this->assertFieldByXPath($field_xpath . $button_xpath_suffix, NULL, 'Found the "add more" button on the initial page.'); } $this->assertNoDuplicateIds(t('Initial page contains unique IDs'), 'Other'); @@ -84,8 +84,8 @@ class MultiFormTest extends AjaxTestBase { foreach ($field_xpaths as $form_html_id => $field_xpath) { for ($i = 0; $i < 2; $i++) { $this->drupalPostAJAX(NULL, array(), array($button_name => $button_value), 'system/ajax', array(), array(), $form_html_id); - $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->assert(count($this->xpath($field_xpath . $field_items_xpath_suffix)) == $i+2, 'Found the correct number of field items after an AJAX submission.'); + $this->assertFieldByXPath($field_xpath . $button_xpath_suffix, NULL, 'Found the "add more" button after an AJAX submission.'); $this->assertNoDuplicateIds(t('Updated page contains unique IDs'), 'Other'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Batch/PageTest.php b/core/modules/system/lib/Drupal/system/Tests/Batch/PageTest.php index 9db8518..69dee9c 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Batch/PageTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Batch/PageTest.php @@ -48,6 +48,6 @@ class PageTest extends WebTestBase { $this->drupalGet('admin/batch-test/test-theme'); // The stack should contain the name of the theme used on the progress // page. - $this->assertEqual(batch_test_stack(), array('seven'), t('A progressive batch correctly uses the theme of the page that started the batch.')); + $this->assertEqual(batch_test_stack(), array('seven'), 'A progressive batch correctly uses the theme of the page that started the batch.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Batch/PercentagesUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Batch/PercentagesUnitTest.php index a992626..8ba9f79 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Batch/PercentagesUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Batch/PercentagesUnitTest.php @@ -92,10 +92,10 @@ class PercentagesUnitTest extends UnitTestBase { $current = $arguments['current']; $actual_result = _batch_api_percentage($total, $current); if ($actual_result === $expected_result) { - $this->pass(t('Expected the batch api percentage at the state @numerator/@denominator to be @expected%, and got @actual%.', array('@numerator' => $current, '@denominator' => $total, '@expected' => $expected_result, '@actual' => $actual_result))); + $this->pass(format_string('Expected the batch api percentage at the state @numerator/@denominator to be @expected%, and got @actual%.', array('@numerator' => $current, '@denominator' => $total, '@expected' => $expected_result, '@actual' => $actual_result))); } else { - $this->fail(t('Expected the batch api percentage at the state @numerator/@denominator to be @expected%, but got @actual%.', array('@numerator' => $current, '@denominator' => $total, '@expected' => $expected_result, '@actual' => $actual_result))); + $this->fail(format_string('Expected the batch api percentage at the state @numerator/@denominator to be @expected%, but got @actual%.', array('@numerator' => $current, '@denominator' => $total, '@expected' => $expected_result, '@actual' => $actual_result))); } } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Batch/ProcessingTest.php b/core/modules/system/lib/Drupal/system/Tests/Batch/ProcessingTest.php index af0a1de..bad7d95 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Batch/ProcessingTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Batch/ProcessingTest.php @@ -35,9 +35,9 @@ class ProcessingTest extends WebTestBase { function testBatchNoForm() { // Displaying the page triggers batch 1. $this->drupalGet('batch-test/no-form'); - $this->assertBatchMessages($this->_resultMessages(1), t('Batch for step 2 performed successfully.')); - $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_1'), t('Execution order was correct.')); - $this->assertText('Redirection successful.', t('Redirection after batch execution is correct.')); + $this->assertBatchMessages($this->_resultMessages(1), 'Batch for step 2 performed successfully.'); + $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_1'), 'Execution order was correct.'); + $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.'); } /** @@ -47,36 +47,36 @@ class ProcessingTest extends WebTestBase { // Batch 0: no operation. $edit = array('batch' => 'batch_0'); $this->drupalPost('batch-test/simple', $edit, 'Submit'); - $this->assertBatchMessages($this->_resultMessages('batch_0'), t('Batch with no operation performed successfully.')); - $this->assertText('Redirection successful.', t('Redirection after batch execution is correct.')); + $this->assertBatchMessages($this->_resultMessages('batch_0'), 'Batch with no operation performed successfully.'); + $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.'); // Batch 1: several simple operations. $edit = array('batch' => 'batch_1'); $this->drupalPost('batch-test/simple', $edit, 'Submit'); - $this->assertBatchMessages($this->_resultMessages('batch_1'), t('Batch with simple operations performed successfully.')); - $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_1'), t('Execution order was correct.')); - $this->assertText('Redirection successful.', t('Redirection after batch execution is correct.')); + $this->assertBatchMessages($this->_resultMessages('batch_1'), 'Batch with simple operations performed successfully.'); + $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_1'), 'Execution order was correct.'); + $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.'); // Batch 2: one multistep operation. $edit = array('batch' => 'batch_2'); $this->drupalPost('batch-test/simple', $edit, 'Submit'); - $this->assertBatchMessages($this->_resultMessages('batch_2'), t('Batch with multistep operation performed successfully.')); - $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_2'), t('Execution order was correct.')); - $this->assertText('Redirection successful.', t('Redirection after batch execution is correct.')); + $this->assertBatchMessages($this->_resultMessages('batch_2'), 'Batch with multistep operation performed successfully.'); + $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_2'), 'Execution order was correct.'); + $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.'); // Batch 3: simple + multistep combined. $edit = array('batch' => 'batch_3'); $this->drupalPost('batch-test/simple', $edit, 'Submit'); - $this->assertBatchMessages($this->_resultMessages('batch_3'), t('Batch with simple and multistep operations performed successfully.')); - $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_3'), t('Execution order was correct.')); - $this->assertText('Redirection successful.', t('Redirection after batch execution is correct.')); + $this->assertBatchMessages($this->_resultMessages('batch_3'), 'Batch with simple and multistep operations performed successfully.'); + $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_3'), 'Execution order was correct.'); + $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.'); // Batch 4: nested batch. $edit = array('batch' => 'batch_4'); $this->drupalPost('batch-test/simple', $edit, 'Submit'); - $this->assertBatchMessages($this->_resultMessages('batch_4'), t('Nested batch performed successfully.')); - $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_4'), t('Execution order was correct.')); - $this->assertText('Redirection successful.', t('Redirection after batch execution is correct.')); + $this->assertBatchMessages($this->_resultMessages('batch_4'), 'Nested batch performed successfully.'); + $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_4'), 'Execution order was correct.'); + $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.'); } /** @@ -84,19 +84,19 @@ class ProcessingTest extends WebTestBase { */ function testBatchFormMultistep() { $this->drupalGet('batch-test/multistep'); - $this->assertText('step 1', t('Form is displayed in step 1.')); + $this->assertText('step 1', 'Form is displayed in step 1.'); // First step triggers batch 1. $this->drupalPost(NULL, array(), 'Submit'); - $this->assertBatchMessages($this->_resultMessages('batch_1'), t('Batch for step 1 performed successfully.')); - $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_1'), t('Execution order was correct.')); - $this->assertText('step 2', t('Form is displayed in step 2.')); + $this->assertBatchMessages($this->_resultMessages('batch_1'), 'Batch for step 1 performed successfully.'); + $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_1'), 'Execution order was correct.'); + $this->assertText('step 2', 'Form is displayed in step 2.'); // Second step triggers batch 2. $this->drupalPost(NULL, array(), 'Submit'); - $this->assertBatchMessages($this->_resultMessages('batch_2'), t('Batch for step 2 performed successfully.')); - $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_2'), t('Execution order was correct.')); - $this->assertText('Redirection successful.', t('Redirection after batch execution is correct.')); + $this->assertBatchMessages($this->_resultMessages('batch_2'), 'Batch for step 2 performed successfully.'); + $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_2'), 'Execution order was correct.'); + $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.'); } /** @@ -109,11 +109,11 @@ class ProcessingTest extends WebTestBase { $edit = array('value' => $value); $this->drupalPost('batch-test/chained', $edit, 'Submit'); // Check that result messages are present and in the correct order. - $this->assertBatchMessages($this->_resultMessages('chained'), t('Batches defined in separate submit handlers performed successfully.')); + $this->assertBatchMessages($this->_resultMessages('chained'), 'Batches defined in separate submit handlers performed successfully.'); // The stack contains execution order of batch callbacks and submit // hanlders and logging of corresponding $form_state[{values']. - $this->assertEqual(batch_test_stack(), $this->_resultStack('chained', $value), t('Execution order was correct, and $form_state is correctly persisted.')); - $this->assertText('Redirection successful.', t('Redirection after batch execution is correct.')); + $this->assertEqual(batch_test_stack(), $this->_resultStack('chained', $value), 'Execution order was correct, and $form_state is correctly persisted.'); + $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.'); } /** @@ -127,11 +127,11 @@ class ProcessingTest extends WebTestBase { $value = rand(0, 255); $this->drupalGet('batch-test/programmatic/' . $value); // Check that result messages are present and in the correct order. - $this->assertBatchMessages($this->_resultMessages('chained'), t('Batches defined in separate submit handlers performed successfully.')); + $this->assertBatchMessages($this->_resultMessages('chained'), 'Batches defined in separate submit handlers performed successfully.'); // The stack contains execution order of batch callbacks and submit // hanlders and logging of corresponding $form_state[{values']. - $this->assertEqual(batch_test_stack(), $this->_resultStack('chained', $value), t('Execution order was correct, and $form_state is correctly persisted.')); - $this->assertText('Got out of a programmatic batched form.', t('Page execution continues normally.')); + $this->assertEqual(batch_test_stack(), $this->_resultStack('chained', $value), 'Execution order was correct, and $form_state is correctly persisted.'); + $this->assertText('Got out of a programmatic batched form.', 'Page execution continues normally.'); } /** @@ -142,7 +142,7 @@ class ProcessingTest extends WebTestBase { // form. $value = rand(0, 255); $this->drupalGet('batch-test/nested-programmatic/' . $value); - $this->assertEqual(batch_test_stack(), array('mock form submitted with value = ' . $value), t('drupal_form_submit() ran successfully within a batch operation.')); + $this->assertEqual(batch_test_stack(), array('mock form submitted with value = ' . $value), 'drupal_form_submit() ran successfully within a batch operation.'); } /** @@ -152,9 +152,9 @@ class ProcessingTest extends WebTestBase { function testBatchLargePercentage() { // Displaying the page triggers batch 5. $this->drupalGet('batch-test/large-percentage'); - $this->assertBatchMessages($this->_resultMessages(1), t('Batch for step 2 performed successfully.')); - $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_5'), t('Execution order was correct.')); - $this->assertText('Redirection successful.', t('Redirection after batch execution is correct.')); + $this->assertBatchMessages($this->_resultMessages(1), 'Batch for step 2 performed successfully.'); + $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_5'), 'Execution order was correct.'); + $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.'); } diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php index f707a02..82bdfc4 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php @@ -31,17 +31,17 @@ class GetFilenameUnitTest extends UnitTestBase { drupal_static_reset('drupal_get_filename'); // Retrieving the location of a module. - $this->assertIdentical(drupal_get_filename('module', 'php'), 'core/modules/php/php.module', t('Retrieve module location.')); + $this->assertIdentical(drupal_get_filename('module', 'php'), 'core/modules/php/php.module', 'Retrieve module location.'); // Retrieving the location of a theme. - $this->assertIdentical(drupal_get_filename('theme', 'stark'), 'core/themes/stark/stark.info', t('Retrieve theme location.')); + $this->assertIdentical(drupal_get_filename('theme', 'stark'), 'core/themes/stark/stark.info', 'Retrieve theme location.'); // Retrieving the location of a theme engine. - $this->assertIdentical(drupal_get_filename('theme_engine', 'phptemplate'), 'core/themes/engines/phptemplate/phptemplate.engine', t('Retrieve theme engine location.')); + $this->assertIdentical(drupal_get_filename('theme_engine', 'phptemplate'), 'core/themes/engines/phptemplate/phptemplate.engine', 'Retrieve theme engine location.'); // Retrieving the location of a profile. Profiles are a special case with // a fixed location and naming. - $this->assertIdentical(drupal_get_filename('profile', 'standard'), 'core/profiles/standard/standard.profile', t('Retrieve install profile location.')); + $this->assertIdentical(drupal_get_filename('profile', 'standard'), 'core/profiles/standard/standard.profile', 'Retrieve install profile location.'); // When a file is not found in the database cache, drupal_get_filename() // searches several locations on the filesystem, including the core/ @@ -50,6 +50,6 @@ class GetFilenameUnitTest extends UnitTestBase { // Since there is already a core/scripts directory, drupal_get_filename() // will automatically check there for 'script' files, just as it does // for (e.g.) 'module' files in core/modules. - $this->assertIdentical(drupal_get_filename('script', 'test'), 'core/scripts/test.script', t('Retrieve test script location.')); + $this->assertIdentical(drupal_get_filename('script', 'test'), 'core/scripts/test.script', 'Retrieve test script location.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/HookBootExitTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/HookBootExitTest.php index 3c43487..b90370c 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/HookBootExitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/HookBootExitTest.php @@ -40,29 +40,29 @@ class HookBootExitTest extends WebTestBase { $this->drupalGet(''); $calls = 1; - $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot called with disabled cache.')); - $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit called with disabled cache.')); + $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, 'hook_boot called with disabled cache.'); + $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, 'hook_exit called with disabled cache.'); // Test with normal cache. Boot and exit should be called. $config->set('cache.page.enabled', 1); $config->save(); $this->drupalGet(''); $calls++; - $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot called with normal cache.')); - $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit called with normal cache.')); + $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, 'hook_boot called with normal cache.'); + $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, 'hook_exit called with normal cache.'); // Boot and exit should not fire since the page is cached. variable_set('page_cache_invoke_hooks', FALSE); - $this->assertTrue(cache('page')->get(url('', array('absolute' => TRUE))), t('Page has been cached.')); + $this->assertTrue(cache('page')->get(url('', array('absolute' => TRUE))), 'Page has been cached.'); $this->drupalGet(''); - $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot not called with aggressive cache and a cached page.')); - $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit not called with aggressive cache and a cached page.')); + $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, 'hook_boot not called with aggressive cache and a cached page.'); + $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, 'hook_exit not called with aggressive cache and a cached page.'); // Test with page cache cleared, boot and exit should be called. - $this->assertTrue(db_delete('cache_page')->execute(), t('Page cache cleared.')); + $this->assertTrue(db_delete('cache_page')->execute(), 'Page cache cleared.'); $this->drupalGet(''); $calls++; - $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot called with aggressive cache and no cached page.')); - $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit called with aggressive cache and no cached page.')); + $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, 'hook_boot called with aggressive cache and no cached page.'); + $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, 'hook_exit called with aggressive cache and no cached page.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php index b4d77c4..7668949 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php @@ -54,14 +54,14 @@ class IpAddressTest extends WebTestBase { // Test the normal IP address. $this->assertTrue( ip_address() == $this->remote_ip, - t('Got remote IP address.') + 'Got remote IP address.' ); // Proxy forwarding on but no proxy addresses defined. variable_set('reverse_proxy', 1); $this->assertTrue( ip_address() == $this->remote_ip, - t('Proxy forwarding without trusted proxies got remote IP address.') + 'Proxy forwarding without trusted proxies got remote IP address.' ); // Proxy forwarding on and proxy address not trusted. @@ -70,7 +70,7 @@ class IpAddressTest extends WebTestBase { $_SERVER['REMOTE_ADDR'] = $this->untrusted_ip; $this->assertTrue( ip_address() == $this->untrusted_ip, - t('Proxy forwarding with untrusted proxy got remote IP address.') + 'Proxy forwarding with untrusted proxy got remote IP address.' ); // Proxy forwarding on and proxy address trusted. @@ -79,7 +79,7 @@ class IpAddressTest extends WebTestBase { drupal_static_reset('ip_address'); $this->assertTrue( ip_address() == $this->forwarded_ip, - t('Proxy forwarding with trusted proxy got forwarded IP address.') + 'Proxy forwarding with trusted proxy got forwarded IP address.' ); // Multi-tier architecture with comma separated values in header. @@ -88,7 +88,7 @@ class IpAddressTest extends WebTestBase { drupal_static_reset('ip_address'); $this->assertTrue( ip_address() == $this->forwarded_ip, - t('Proxy forwarding with trusted 2-tier proxy got forwarded IP address.') + 'Proxy forwarding with trusted 2-tier proxy got forwarded IP address.' ); // Custom client-IP header. @@ -97,15 +97,15 @@ class IpAddressTest extends WebTestBase { drupal_static_reset('ip_address'); $this->assertTrue( ip_address() == $this->cluster_ip, - t('Cluster environment got cluster client IP.') + 'Cluster environment got cluster client IP.' ); // Verifies that drupal_valid_http_host() prevents invalid characters. - $this->assertFalse(drupal_valid_http_host('security/.drupal.org:80'), t('HTTP_HOST with / is invalid')); - $this->assertFalse(drupal_valid_http_host('security\\.drupal.org:80'), t('HTTP_HOST with \\ is invalid')); - $this->assertFalse(drupal_valid_http_host('security<.drupal.org:80'), t('HTTP_HOST with < is invalid')); - $this->assertFalse(drupal_valid_http_host('security..drupal.org:80'), t('HTTP_HOST with .. is invalid')); + $this->assertFalse(drupal_valid_http_host('security/.drupal.org:80'), 'HTTP_HOST with / is invalid'); + $this->assertFalse(drupal_valid_http_host('security\\.drupal.org:80'), 'HTTP_HOST with \\ is invalid'); + $this->assertFalse(drupal_valid_http_host('security<.drupal.org:80'), 'HTTP_HOST with < is invalid'); + $this->assertFalse(drupal_valid_http_host('security..drupal.org:80'), 'HTTP_HOST with .. is invalid'); // IPv6 loopback address - $this->assertTrue(drupal_valid_http_host('[::1]:80'), t('HTTP_HOST containing IPv6 loopback is valid')); + $this->assertTrue(drupal_valid_http_host('[::1]:80'), 'HTTP_HOST containing IPv6 loopback is valid'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/MiscUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/MiscUnitTest.php index daa7d59..18e8925 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/MiscUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/MiscUnitTest.php @@ -30,7 +30,7 @@ class MiscUnitTest extends UnitTestBase { $link_options_1 = array('fragment' => 'x', 'attributes' => array('title' => 'X', 'class' => array('a', 'b')), 'language' => 'en'); $link_options_2 = array('fragment' => 'y', 'attributes' => array('title' => 'Y', 'class' => array('c', 'd')), 'html' => TRUE); $expected = array('fragment' => 'y', 'attributes' => array('title' => 'Y', 'class' => array('a', 'b', 'c', 'd')), 'language' => 'en', 'html' => TRUE); - $this->assertIdentical(drupal_array_merge_deep($link_options_1, $link_options_2), $expected, t('drupal_array_merge_deep() returned a properly merged array.')); + $this->assertIdentical(drupal_array_merge_deep($link_options_1, $link_options_2), $expected, 'drupal_array_merge_deep() returned a properly merged array.'); } /** diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php index d4c1a3b..d283785 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php @@ -52,34 +52,34 @@ class PageCacheTest extends WebTestBase { $this->assertNoPattern('#drupalHead(''); - $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', t('Page was cached.')); + $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.'); $etag = $this->drupalGetHeader('ETag'); $last_modified = $this->drupalGetHeader('Last-Modified'); $this->drupalGet('', array(), array('If-Modified-Since: ' . $last_modified, 'If-None-Match: ' . $etag)); - $this->assertResponse(304, t('Conditional request returned 304 Not Modified.')); + $this->assertResponse(304, 'Conditional request returned 304 Not Modified.'); $this->drupalGet('', array(), array('If-Modified-Since: ' . gmdate(DATE_RFC822, strtotime($last_modified)), 'If-None-Match: ' . $etag)); - $this->assertResponse(304, t('Conditional request with obsolete If-Modified-Since date returned 304 Not Modified.')); + $this->assertResponse(304, 'Conditional request with obsolete If-Modified-Since date returned 304 Not Modified.'); $this->drupalGet('', array(), array('If-Modified-Since: ' . gmdate(DATE_RFC850, strtotime($last_modified)), 'If-None-Match: ' . $etag)); - $this->assertResponse(304, t('Conditional request with obsolete If-Modified-Since date returned 304 Not Modified.')); + $this->assertResponse(304, 'Conditional request with obsolete If-Modified-Since date returned 304 Not Modified.'); $this->drupalGet('', array(), array('If-Modified-Since: ' . $last_modified)); // Verify the page is not printed twice when the cache is warm. $this->assertNoPattern('#assertResponse(200, t('Conditional request without If-None-Match returned 200 OK.')); - $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', t('Page was cached.')); + $this->assertResponse(200, 'Conditional request without If-None-Match returned 200 OK.'); + $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.'); $this->drupalGet('', array(), array('If-Modified-Since: ' . gmdate(DATE_RFC1123, strtotime($last_modified) + 1), 'If-None-Match: ' . $etag)); - $this->assertResponse(200, t('Conditional request with new a If-Modified-Since date newer than Last-Modified returned 200 OK.')); - $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', t('Page was cached.')); + $this->assertResponse(200, 'Conditional request with new a If-Modified-Since date newer than Last-Modified returned 200 OK.'); + $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.'); $user = $this->drupalCreateUser(); $this->drupalLogin($user); $this->drupalGet('', array(), array('If-Modified-Since: ' . $last_modified, 'If-None-Match: ' . $etag)); - $this->assertResponse(200, t('Conditional request returned 200 OK for authenticated user.')); - $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), t('Absense of Page was not cached.')); + $this->assertResponse(200, 'Conditional request returned 200 OK for authenticated user.'); + $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), 'Absense of Page was not cached.'); } /** @@ -92,35 +92,35 @@ class PageCacheTest extends WebTestBase { // Fill the cache. $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Foo', 'value' => 'bar'))); - $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', t('Page was not cached.')); - $this->assertEqual($this->drupalGetHeader('Vary'), 'Cookie,Accept-Encoding', t('Vary header was sent.')); - $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'public, max-age=0', t('Cache-Control header was sent.')); - $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', t('Expires header was sent.')); - $this->assertEqual($this->drupalGetHeader('Foo'), 'bar', t('Custom header was sent.')); + $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', 'Page was not cached.'); + $this->assertEqual($this->drupalGetHeader('Vary'), 'Cookie,Accept-Encoding', 'Vary header was sent.'); + $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'public, max-age=0', 'Cache-Control header was sent.'); + $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.'); + $this->assertEqual($this->drupalGetHeader('Foo'), 'bar', 'Custom header was sent.'); // Check cache. $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Foo', 'value' => 'bar'))); - $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', t('Page was cached.')); - $this->assertEqual($this->drupalGetHeader('Vary'), 'Cookie,Accept-Encoding', t('Vary: Cookie header was sent.')); - $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'public, max-age=0', t('Cache-Control header was sent.')); - $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', t('Expires header was sent.')); - $this->assertEqual($this->drupalGetHeader('Foo'), 'bar', t('Custom header was sent.')); + $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.'); + $this->assertEqual($this->drupalGetHeader('Vary'), 'Cookie,Accept-Encoding', 'Vary: Cookie header was sent.'); + $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'public, max-age=0', 'Cache-Control header was sent.'); + $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.'); + $this->assertEqual($this->drupalGetHeader('Foo'), 'bar', 'Custom header was sent.'); // Check replacing default headers. $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Expires', 'value' => 'Fri, 19 Nov 2008 05:00:00 GMT'))); - $this->assertEqual($this->drupalGetHeader('Expires'), 'Fri, 19 Nov 2008 05:00:00 GMT', t('Default header was replaced.')); + $this->assertEqual($this->drupalGetHeader('Expires'), 'Fri, 19 Nov 2008 05:00:00 GMT', 'Default header was replaced.'); $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Vary', 'value' => 'User-Agent'))); - $this->assertEqual($this->drupalGetHeader('Vary'), 'User-Agent,Accept-Encoding', t('Default header was replaced.')); + $this->assertEqual($this->drupalGetHeader('Vary'), 'User-Agent,Accept-Encoding', 'Default header was replaced.'); // Check that authenticated users bypass the cache. $user = $this->drupalCreateUser(); $this->drupalLogin($user); $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Foo', 'value' => 'bar'))); - $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), t('Caching was bypassed.')); - $this->assertTrue(strpos($this->drupalGetHeader('Vary'), 'Cookie') === FALSE, t('Vary: Cookie header was not sent.')); - $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'must-revalidate, no-cache, post-check=0, pre-check=0, private', t('Cache-Control header was sent.')); - $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', t('Expires header was sent.')); - $this->assertEqual($this->drupalGetHeader('Foo'), 'bar', t('Custom header was sent.')); + $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), 'Caching was bypassed.'); + $this->assertTrue(strpos($this->drupalGetHeader('Vary'), 'Cookie') === FALSE, 'Vary: Cookie header was not sent.'); + $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'must-revalidate, no-cache, post-check=0, pre-check=0, private', 'Cache-Control header was sent.'); + $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.'); + $this->assertEqual($this->drupalGetHeader('Foo'), 'bar', 'Custom header was sent.'); } @@ -138,22 +138,22 @@ class PageCacheTest extends WebTestBase { // Fill the cache and verify that output is compressed. $this->drupalGet('', array(), array('Accept-Encoding: gzip,deflate')); - $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', t('Page was not cached.')); + $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', 'Page was not cached.'); $this->drupalSetContent(gzinflate(substr($this->drupalGetContent(), 10, -8))); - $this->assertRaw('', t('Page was gzip compressed.')); + $this->assertRaw('', 'Page was gzip compressed.'); // Verify that cached output is compressed. $this->drupalGet('', array(), array('Accept-Encoding: gzip,deflate')); - $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', t('Page was cached.')); - $this->assertEqual($this->drupalGetHeader('Content-Encoding'), 'gzip', t('A Content-Encoding header was sent.')); + $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.'); + $this->assertEqual($this->drupalGetHeader('Content-Encoding'), 'gzip', 'A Content-Encoding header was sent.'); $this->drupalSetContent(gzinflate(substr($this->drupalGetContent(), 10, -8))); - $this->assertRaw('', t('Page was gzip compressed.')); + $this->assertRaw('', 'Page was gzip compressed.'); // Verify that a client without compression support gets an uncompressed page. $this->drupalGet(''); - $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', t('Page was cached.')); - $this->assertFalse($this->drupalGetHeader('Content-Encoding'), t('A Content-Encoding header was not sent.')); + $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.'); + $this->assertFalse($this->drupalGetHeader('Content-Encoding'), 'A Content-Encoding header was not sent.'); $this->assertTitle(t('Welcome to @site-name | @site-name', array('@site-name' => config('system.site')->get('name'))), t('Site title matches.')); - $this->assertRaw('', t('Page was not compressed.')); + $this->assertRaw('', 'Page was not compressed.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/ResettableStaticUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/ResettableStaticUnitTest.php index 611f1cb..8024486 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/ResettableStaticUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/ResettableStaticUnitTest.php @@ -35,15 +35,15 @@ class ResettableStaticUnitTest extends UnitTestBase { // multiple resets can be issued without odd side effects. $var = 'bar'; drupal_static_reset($name); - $this->assertEqual($var, 'foo', t('Variable was reset after first invocation of name-specific reset.')); + $this->assertEqual($var, 'foo', 'Variable was reset after first invocation of name-specific reset.'); $var = 'bar'; drupal_static_reset($name); - $this->assertEqual($var, 'foo', t('Variable was reset after second invocation of name-specific reset.')); + $this->assertEqual($var, 'foo', 'Variable was reset after second invocation of name-specific reset.'); $var = 'bar'; drupal_static_reset(); - $this->assertEqual($var, 'foo', t('Variable was reset after first invocation of global reset.')); + $this->assertEqual($var, 'foo', 'Variable was reset after first invocation of global reset.'); $var = 'bar'; drupal_static_reset(); - $this->assertEqual($var, 'foo', t('Variable was reset after second invocation of global reset.')); + $this->assertEqual($var, 'foo', 'Variable was reset after second invocation of global reset.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/TimerUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/TimerUnitTest.php index c67abb0..e41fc17 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/TimerUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/TimerUnitTest.php @@ -30,16 +30,16 @@ class TimerUnitTest extends UnitTestBase { function testTimer() { timer_start('test'); sleep(1); - $this->assertTrue(timer_read('test') >= 1000, t('Timer measured 1 second of sleeping while running.')); + $this->assertTrue(timer_read('test') >= 1000, 'Timer measured 1 second of sleeping while running.'); sleep(1); timer_stop('test'); - $this->assertTrue(timer_read('test') >= 2000, t('Timer measured 2 seconds of sleeping after being stopped.')); + $this->assertTrue(timer_read('test') >= 2000, 'Timer measured 2 seconds of sleeping after being stopped.'); timer_start('test'); sleep(1); - $this->assertTrue(timer_read('test') >= 3000, t('Timer measured 3 seconds of sleeping after being restarted.')); + $this->assertTrue(timer_read('test') >= 3000, 'Timer measured 3 seconds of sleeping after being restarted.'); sleep(1); $timer = timer_stop('test'); - $this->assertTrue(timer_read('test') >= 4000, t('Timer measured 4 seconds of sleeping after being stopped for a second time.')); - $this->assertEqual($timer['count'], 2, t('Timer counted 2 instances of being started.')); + $this->assertTrue(timer_read('test') >= 4000, 'Timer measured 4 seconds of sleeping after being stopped for a second time.'); + $this->assertEqual($timer['count'], 2, 'Timer counted 2 instances of being started.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/VariableTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/VariableTest.php index 9350243..137f2a5 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/VariableTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/VariableTest.php @@ -36,17 +36,17 @@ class VariableTest extends WebTestBase { // Setting and retrieving values. $variable = $this->randomName(); variable_set('simpletest_bootstrap_variable_test', $variable); - $this->assertIdentical($variable, variable_get('simpletest_bootstrap_variable_test'), t('Setting and retrieving values')); + $this->assertIdentical($variable, variable_get('simpletest_bootstrap_variable_test'), 'Setting and retrieving values'); // Make sure the variable persists across multiple requests. $this->drupalGet('system-test/variable-get'); - $this->assertText($variable, t('Variable persists across multiple requests')); + $this->assertText($variable, 'Variable persists across multiple requests'); // Deleting variables. $default_value = $this->randomName(); variable_del('simpletest_bootstrap_variable_test'); $variable = variable_get('simpletest_bootstrap_variable_test', $default_value); - $this->assertIdentical($variable, $default_value, t('Deleting variables')); + $this->assertIdentical($variable, $default_value, 'Deleting variables'); } /** @@ -54,10 +54,10 @@ class VariableTest extends WebTestBase { */ function testVariableDefaults() { // Tests passing nothing through to the default. - $this->assertIdentical(NULL, variable_get('simpletest_bootstrap_variable_test'), t('Variables are correctly defaulting to NULL.')); + $this->assertIdentical(NULL, variable_get('simpletest_bootstrap_variable_test'), 'Variables are correctly defaulting to NULL.'); // Tests passing 5 to the default parameter. - $this->assertIdentical(5, variable_get('simpletest_bootstrap_variable_test', 5), t('The default variable parameter is passed through correctly.')); + $this->assertIdentical(5, variable_get('simpletest_bootstrap_variable_test', 5), 'The default variable parameter is passed through correctly.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Bundle/BundleTest.php b/core/modules/system/lib/Drupal/system/Tests/Bundle/BundleTest.php index 3177687..c8cd2ef 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Bundle/BundleTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Bundle/BundleTest.php @@ -33,11 +33,11 @@ class BundleTest extends WebTestBase { * Test that services provided by module bundles get registered to the DIC. */ function testBundleRegistration() { - $this->assertTrue(drupal_container()->has('bundle_test_class'), t('The bundle_test_class service has been registered to the DIC')); + $this->assertTrue(drupal_container()->has('bundle_test_class'), 'The bundle_test_class service has been registered to the DIC'); // The event subscriber method in the test class calls drupal_set_message with // a message saying it has fired. This will fire on every page request so it // should show up on the front page. $this->drupalGet(''); - $this->assertText(t('The bundle_test event subscriber fired!'), t('The bundle_test event subscriber fired')); + $this->assertText(t('The bundle_test event subscriber fired!'), 'The bundle_test event subscriber fired'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/ClearTest.php b/core/modules/system/lib/Drupal/system/Tests/Cache/ClearTest.php index 4f7cfca..c91f1db 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Cache/ClearTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Cache/ClearTest.php @@ -45,7 +45,7 @@ class ClearTest extends CacheTestBase { foreach ($bins as $id => $bin) { $cid = 'test_cid_clear' . $id; - $this->assertFalse($this->checkCacheExists($cid, $this->default_value, $bin), t('All cache entries removed from @bin.', array('@bin' => $bin))); + $this->assertFalse($this->checkCacheExists($cid, $this->default_value, $bin), format_string('All cache entries removed from @bin.', array('@bin' => $bin))); } } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/AddFeedTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/AddFeedTest.php index 0f06b22..a1f543e 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/AddFeedTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/AddFeedTest.php @@ -76,7 +76,7 @@ class AddFeedTest extends WebTestBase { $this->drupalSetContent(drupal_get_html_head()); foreach ($urls as $description => $feed_info) { - $this->assertPattern($this->urlToRSSLinkPattern($feed_info['output_url'], $feed_info['title']), t('Found correct feed header for %description', array('%description' => $description))); + $this->assertPattern($this->urlToRSSLinkPattern($feed_info['output_url'], $feed_info['title']), format_string('Found correct feed header for %description', array('%description' => $description))); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/AlterTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/AlterTest.php index b8a498c..9f73153 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/AlterTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/AlterTest.php @@ -45,13 +45,13 @@ class AlterTest extends WebTestBase { $array_copy = $array; $array_expected = array('foo' => 'Drupal theme'); drupal_alter('drupal_alter', $array_copy); - $this->assertEqual($array_copy, $array_expected, t('Single array was altered.')); + $this->assertEqual($array_copy, $array_expected, 'Single array was altered.'); $entity_copy = clone $entity; $entity_expected = clone $entity; $entity_expected->foo = 'Drupal theme'; drupal_alter('drupal_alter', $entity_copy); - $this->assertEqual($entity_copy, $entity_expected, t('Single object was altered.')); + $this->assertEqual($entity_copy, $entity_expected, 'Single object was altered.'); // Verify alteration of multiple arguments. $array_copy = $array; @@ -62,9 +62,9 @@ class AlterTest extends WebTestBase { $array2_copy = $array; $array2_expected = array('foo' => 'Drupal theme'); drupal_alter('drupal_alter', $array_copy, $entity_copy, $array2_copy); - $this->assertEqual($array_copy, $array_expected, t('First argument to drupal_alter() was altered.')); - $this->assertEqual($entity_copy, $entity_expected, t('Second argument to drupal_alter() was altered.')); - $this->assertEqual($array2_copy, $array2_expected, t('Third argument to drupal_alter() was altered.')); + $this->assertEqual($array_copy, $array_expected, 'First argument to drupal_alter() was altered.'); + $this->assertEqual($entity_copy, $entity_expected, 'Second argument to drupal_alter() was altered.'); + $this->assertEqual($array2_copy, $array2_expected, 'Third argument to drupal_alter() was altered.'); // Verify alteration order when passing an array of types to drupal_alter(). // common_test_module_implements_alter() places 'block' implementation after @@ -72,6 +72,6 @@ class AlterTest extends WebTestBase { $array_copy = $array; $array_expected = array('foo' => 'Drupal block theme'); drupal_alter(array('drupal_alter', 'drupal_alter_foo'), $array_copy); - $this->assertEqual($array_copy, $array_expected, t('hook_TYPE_alter() implementations ran in correct order.')); + $this->assertEqual($array_copy, $array_expected, 'hook_TYPE_alter() implementations ran in correct order.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/AttributesUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/AttributesUnitTest.php index 22ae4ed..894e0ab 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/AttributesUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/AttributesUnitTest.php @@ -27,15 +27,15 @@ class AttributesUnitTest extends UnitTestBase { */ function testDrupalAttributes() { // Verify that special characters are HTML encoded. - $this->assertIdentical((string) new Attribute(array('title' => '&"\'<>')), ' title="&"'<>"', t('HTML encode attribute values.')); + $this->assertIdentical((string) new Attribute(array('title' => '&"\'<>')), ' title="&"'<>"', 'HTML encode attribute values.'); // Verify multi-value attributes are concatenated with spaces. $attributes = array('class' => array('first', 'last')); - $this->assertIdentical((string) new Attribute(array('class' => array('first', 'last'))), ' class="first last"', t('Concatenate multi-value attributes.')); + $this->assertIdentical((string) new Attribute(array('class' => array('first', 'last'))), ' class="first last"', 'Concatenate multi-value attributes.'); // Verify empty attribute values are rendered. - $this->assertIdentical((string) new Attribute(array('alt' => '')), ' alt=""', t('Empty attribute value #1.')); - $this->assertIdentical((string) new Attribute(array('alt' => NULL)), ' alt=""', t('Empty attribute value #2.')); + $this->assertIdentical((string) new Attribute(array('alt' => '')), ' alt=""', 'Empty attribute value #1.'); + $this->assertIdentical((string) new Attribute(array('alt' => NULL)), ' alt=""', 'Empty attribute value #2.'); // Verify multiple attributes are rendered. $attributes = array( @@ -43,9 +43,9 @@ class AttributesUnitTest extends UnitTestBase { 'class' => array('first', 'last'), 'alt' => 'Alternate', ); - $this->assertIdentical((string) new Attribute($attributes), ' id="id-test" class="first last" alt="Alternate"', t('Multiple attributes.')); + $this->assertIdentical((string) new Attribute($attributes), ' id="id-test" class="first last" alt="Alternate"', 'Multiple attributes.'); // Verify empty attributes array is rendered. - $this->assertIdentical((string) new Attribute(array()), '', t('Empty attributes array.')); + $this->assertIdentical((string) new Attribute(array()), '', 'Empty attributes array.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/AutocompleteTagsUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/AutocompleteTagsUnitTest.php index 0f9d72f..5124405 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/AutocompleteTagsUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/AutocompleteTagsUnitTest.php @@ -57,11 +57,11 @@ class AutocompleteTagsUnitTest extends UnitTestBase { $original = $this->validTags; foreach ($tags as $tag) { $key = array_search($tag, $original); - $this->assertTrue($key, t('Make sure tag %tag shows up in the final tags array (originally %original)', array('%tag' => $tag, '%original' => $key))); + $this->assertTrue($key, format_string('Make sure tag %tag shows up in the final tags array (originally %original)', array('%tag' => $tag, '%original' => $key))); unset($original[$key]); } foreach ($original as $leftover) { - $this->fail(t('Leftover tag %leftover was left over.', array('%leftover' => $leftover))); + $this->fail(format_string('Leftover tag %leftover was left over.', array('%leftover' => $leftover))); } } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsTest.php index 9421682..0268756 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsTest.php @@ -39,7 +39,7 @@ class CascadingStylesheetsTest extends WebTestBase { * Check default stylesheets as empty. */ function testDefault() { - $this->assertEqual(array(), drupal_add_css(), t('Default CSS is empty.')); + $this->assertEqual(array(), drupal_add_css(), 'Default CSS is empty.'); } /** @@ -69,7 +69,7 @@ class CascadingStylesheetsTest extends WebTestBase { function testAddFile() { $path = drupal_get_path('module', 'simpletest') . '/simpletest.css'; $css = drupal_add_css($path); - $this->assertEqual($css[$path]['data'], $path, t('Adding a CSS file caches it properly.')); + $this->assertEqual($css[$path]['data'], $path, 'Adding a CSS file caches it properly.'); } /** @@ -78,7 +78,7 @@ class CascadingStylesheetsTest extends WebTestBase { function testAddExternal() { $path = 'http://example.com/style.css'; $css = drupal_add_css($path, 'external'); - $this->assertEqual($css[$path]['type'], 'external', t('Adding an external CSS file caches it properly.')); + $this->assertEqual($css[$path]['type'], 'external', 'Adding an external CSS file caches it properly.'); } /** @@ -86,7 +86,7 @@ class CascadingStylesheetsTest extends WebTestBase { */ function testReset() { drupal_static_reset('drupal_add_css'); - $this->assertEqual(array(), drupal_add_css(), t('Resetting the CSS empties the cache.')); + $this->assertEqual(array(), drupal_add_css(), 'Resetting the CSS empties the cache.'); } /** @@ -96,11 +96,11 @@ class CascadingStylesheetsTest extends WebTestBase { $css = drupal_get_path('module', 'simpletest') . '/simpletest.css'; drupal_add_css($css); $styles = drupal_get_css(); - $this->assertTrue(strpos($styles, $css) > 0, t('Rendered CSS includes the added stylesheet.')); + $this->assertTrue(strpos($styles, $css) > 0, 'Rendered CSS includes the added stylesheet.'); // Verify that newlines are properly added inside style tags. $query_string = variable_get('css_js_query_string', '0'); $css_processed = ""; - $this->assertEqual(trim($styles), $css_processed, t('Rendered CSS includes newlines inside style tags for JavaScript use.')); + $this->assertEqual(trim($styles), $css_processed, 'Rendered CSS includes newlines inside style tags for JavaScript use.'); } /** @@ -112,7 +112,7 @@ class CascadingStylesheetsTest extends WebTestBase { $styles = drupal_get_css(); // Stylesheet URL may be the href of a LINK tag or in an @import statement // of a STYLE tag. - $this->assertTrue(strpos($styles, 'href="' . $css) > 0 || strpos($styles, '@import url("' . $css . '")') > 0, t('Rendering an external CSS file.')); + $this->assertTrue(strpos($styles, 'href="' . $css) > 0 || strpos($styles, '@import url("' . $css . '")') > 0, 'Rendering an external CSS file.'); } /** @@ -123,7 +123,7 @@ class CascadingStylesheetsTest extends WebTestBase { $css_preprocessed = ''; drupal_add_css($css, array('type' => 'inline')); $styles = drupal_get_css(); - $this->assertEqual(trim($styles), $css_preprocessed, t('Rendering preprocessed inline CSS adds it to the page.')); + $this->assertEqual(trim($styles), $css_preprocessed, 'Rendering preprocessed inline CSS adds it to the page.'); } /** @@ -133,7 +133,7 @@ class CascadingStylesheetsTest extends WebTestBase { $css = 'body { padding: 0px; }'; drupal_add_css($css, array('type' => 'inline', 'preprocess' => FALSE)); $styles = drupal_get_css(); - $this->assertTrue(strpos($styles, $css) > 0, t('Rendering non-preprocessed inline CSS adds it to the page.')); + $this->assertTrue(strpos($styles, $css) > 0, 'Rendering non-preprocessed inline CSS adds it to the page.'); } /** @@ -168,7 +168,7 @@ class CascadingStylesheetsTest extends WebTestBase { // Fetch the page. $this->drupalGet('node/' . $node->nid); - $this->assertRaw($expected, t('Inline stylesheets appear in the full page rendering.')); + $this->assertRaw($expected, 'Inline stylesheets appear in the full page rendering.'); } /** @@ -199,7 +199,7 @@ class CascadingStylesheetsTest extends WebTestBase { $result = array(); } - $this->assertIdentical($result, $expected, t('The CSS files are in the expected order.')); + $this->assertIdentical($result, $expected, 'The CSS files are in the expected order.'); } /** @@ -213,16 +213,16 @@ class CascadingStylesheetsTest extends WebTestBase { // The dummy stylesheet should be the only one included. $styles = drupal_get_css(); - $this->assert(strpos($styles, $system . '/tests/system.base.css') !== FALSE, t('The overriding CSS file is output.')); - $this->assert(strpos($styles, $system . '/system.base.css') === FALSE, t('The overridden CSS file is not output.')); + $this->assert(strpos($styles, $system . '/tests/system.base.css') !== FALSE, 'The overriding CSS file is output.'); + $this->assert(strpos($styles, $system . '/system.base.css') === FALSE, 'The overridden CSS file is not output.'); drupal_add_css($system . '/tests/system.base.css'); drupal_add_css($system . '/system.base.css'); // The standard stylesheet should be the only one included. $styles = drupal_get_css(); - $this->assert(strpos($styles, $system . '/system.base.css') !== FALSE, t('The overriding CSS file is output.')); - $this->assert(strpos($styles, $system . '/tests/system.base.css') === FALSE, t('The overridden CSS file is not output.')); + $this->assert(strpos($styles, $system . '/system.base.css') !== FALSE, 'The overriding CSS file is output.'); + $this->assert(strpos($styles, $system . '/tests/system.base.css') === FALSE, 'The overridden CSS file is not output.'); } /** @@ -237,7 +237,7 @@ class CascadingStylesheetsTest extends WebTestBase { // Check to see if system.base-rtl.css was also added. $styles = drupal_get_css(); - $this->assert(strpos($styles, $path . '/system.base-rtl.css') !== FALSE, t('CSS is alterable as right to left overrides are added.')); + $this->assert(strpos($styles, $path . '/system.base-rtl.css') !== FALSE, 'CSS is alterable as right to left overrides are added.'); // Change the language back to left to right. $language_interface->direction = LANGUAGE_LTR; @@ -250,7 +250,7 @@ class CascadingStylesheetsTest extends WebTestBase { function testAddCssFileWithQueryString() { $this->drupalGet('common-test/query-string'); $query_string = variable_get('css_js_query_string', '0'); - $this->assertRaw(drupal_get_path('module', 'node') . '/node.admin.css?' . $query_string, t('Query string was appended correctly to css.')); - $this->assertRaw(drupal_get_path('module', 'node') . '/node-fake.css?arg1=value1&arg2=value2', t('Query string not escaped on a URI.')); + $this->assertRaw(drupal_get_path('module', 'node') . '/node.admin.css?' . $query_string, 'Query string was appended correctly to css.'); + $this->assertRaw(drupal_get_path('module', 'node') . '/node-fake.css?arg1=value1&arg2=value2', 'Query string not escaped on a URI.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsUnitTest.php index 5c7a059..15376a3 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsUnitTest.php @@ -43,20 +43,20 @@ class CascadingStylesheetsUnitTest extends UnitTestBase { foreach ($testfiles as $file) { $expected = file_get_contents("$path/$file.unoptimized.css"); $unoptimized_output = drupal_load_stylesheet("$path/$file.unoptimized.css", FALSE); - $this->assertEqual($unoptimized_output, $expected, t('Unoptimized CSS file has expected contents (@file)', array('@file' => $file))); + $this->assertEqual($unoptimized_output, $expected, format_string('Unoptimized CSS file has expected contents (@file)', array('@file' => $file))); $expected = file_get_contents("$path/$file.optimized.css"); $optimized_output = drupal_load_stylesheet("$path/$file", TRUE); - $this->assertEqual($optimized_output, $expected, t('Optimized CSS file has expected contents (@file)', array('@file' => $file))); + $this->assertEqual($optimized_output, $expected, format_string('Optimized CSS file has expected contents (@file)', array('@file' => $file))); // Repeat the tests by accessing the stylesheets by URL. $expected = file_get_contents("$path/$file.unoptimized.css"); $unoptimized_output_url = drupal_load_stylesheet($GLOBALS['base_url'] . "/$path/$file.unoptimized.css", FALSE); - $this->assertEqual($unoptimized_output, $expected, t('Unoptimized CSS file (loaded from an URL) has expected contents (@file)', array('@file' => $file))); + $this->assertEqual($unoptimized_output, $expected, format_string('Unoptimized CSS file (loaded from an URL) has expected contents (@file)', array('@file' => $file))); $expected = file_get_contents("$path/$file.optimized.css"); $optimized_output = drupal_load_stylesheet($GLOBALS['base_url'] . "/$path/$file", TRUE); - $this->assertEqual($optimized_output, $expected, t('Optimized CSS file (loaded from an URL) has expected contents (@file)', array('@file' => $file))); + $this->assertEqual($optimized_output, $expected, format_string('Optimized CSS file (loaded from an URL) has expected contents (@file)', array('@file' => $file))); } } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php index 9639758..b61987e 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php @@ -58,7 +58,7 @@ class FormatDateTest extends WebTestBase { // Add new date format. $admin_date_format = 'j M y'; $edit = array('date_format' => $admin_date_format); - $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format')); + $this->drupalPost('admin/config/regional/date-time/formats/add', $edit, 'Add format'); // Add new date type. $edit = array( @@ -66,11 +66,11 @@ class FormatDateTest extends WebTestBase { 'machine_name' => 'example_style', 'date_format' => $admin_date_format, ); - $this->drupalPost('admin/config/regional/date-time/types/add', $edit, t('Add date type')); + $this->drupalPost('admin/config/regional/date-time/types/add', $edit, 'Add date type'); $timestamp = strtotime('2007-03-10T00:00:00+00:00'); - $this->assertIdentical(format_date($timestamp, 'example_style', '', 'America/Los_Angeles'), '9 Mar 07', t('Test format_date() using an admin-defined date type.')); - $this->assertIdentical(format_date($timestamp, 'undefined_style'), format_date($timestamp, 'medium'), t('Test format_date() defaulting to medium when $type not found.')); + $this->assertIdentical(format_date($timestamp, 'example_style', '', 'America/Los_Angeles'), '9 Mar 07', 'Test format_date() using an admin-defined date type.'); + $this->assertIdentical(format_date($timestamp, 'undefined_style'), format_date($timestamp, 'medium'), 'Test format_date() defaulting to medium when $type not found.'); } /** @@ -82,12 +82,12 @@ class FormatDateTest extends WebTestBase { $language_interface = language(LANGUAGE_TYPE_INTERFACE); $timestamp = strtotime('2007-03-26T00:00:00+00:00'); - $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', 'en'), 'Sunday, 25-Mar-07 17:00:00 PDT', t('Test all parameters.')); - $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), 'domingo, 25-Mar-07 17:00:00 PDT', t('Test translated format.')); - $this->assertIdentical(format_date($timestamp, 'custom', '\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), 'l, 25-Mar-07 17:00:00 PDT', t('Test an escaped format string.')); - $this->assertIdentical(format_date($timestamp, 'custom', '\\\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), '\\domingo, 25-Mar-07 17:00:00 PDT', t('Test format containing backslash character.')); - $this->assertIdentical(format_date($timestamp, 'custom', '\\\\\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), '\\l, 25-Mar-07 17:00:00 PDT', t('Test format containing backslash followed by escaped format string.')); - $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'Europe/London', 'en'), 'Monday, 26-Mar-07 01:00:00 BST', t('Test a different time zone.')); + $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', 'en'), 'Sunday, 25-Mar-07 17:00:00 PDT', 'Test all parameters.'); + $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), 'domingo, 25-Mar-07 17:00:00 PDT', 'Test translated format.'); + $this->assertIdentical(format_date($timestamp, 'custom', '\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), 'l, 25-Mar-07 17:00:00 PDT', 'Test an escaped format string.'); + $this->assertIdentical(format_date($timestamp, 'custom', '\\\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), '\\domingo, 25-Mar-07 17:00:00 PDT', 'Test format containing backslash character.'); + $this->assertIdentical(format_date($timestamp, 'custom', '\\\\\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), '\\l, 25-Mar-07 17:00:00 PDT', 'Test format containing backslash followed by escaped format string.'); + $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'Europe/London', 'en'), 'Monday, 26-Mar-07 01:00:00 BST', 'Test a different time zone.'); // Create an admin user and add Spanish language. $admin_user = $this->drupalCreateUser(array('administer languages')); @@ -120,21 +120,21 @@ class FormatDateTest extends WebTestBase { // Simulate a Drupal bootstrap with the logged-in user. date_default_timezone_set(drupal_get_user_timezone()); - $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', 'en'), 'Sunday, 25-Mar-07 17:00:00 PDT', t('Test a different language.')); - $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'Europe/London'), 'Monday, 26-Mar-07 01:00:00 BST', t('Test a different time zone.')); - $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T'), 'domingo, 25-Mar-07 17:00:00 PDT', t('Test custom date format.')); - $this->assertIdentical(format_date($timestamp, 'long'), 'domingo, 25. marzo 2007 - 17:00', t('Test long date format.')); - $this->assertIdentical(format_date($timestamp, 'medium'), '25. marzo 2007 - 17:00', t('Test medium date format.')); - $this->assertIdentical(format_date($timestamp, 'short'), '2007 Mar 25 - 5:00pm', t('Test short date format.')); - $this->assertIdentical(format_date($timestamp), '25. marzo 2007 - 17:00', t('Test default date format.')); + $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', 'en'), 'Sunday, 25-Mar-07 17:00:00 PDT', 'Test a different language.'); + $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'Europe/London'), 'Monday, 26-Mar-07 01:00:00 BST', 'Test a different time zone.'); + $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T'), 'domingo, 25-Mar-07 17:00:00 PDT', 'Test custom date format.'); + $this->assertIdentical(format_date($timestamp, 'long'), 'domingo, 25. marzo 2007 - 17:00', 'Test long date format.'); + $this->assertIdentical(format_date($timestamp, 'medium'), '25. marzo 2007 - 17:00', 'Test medium date format.'); + $this->assertIdentical(format_date($timestamp, 'short'), '2007 Mar 25 - 5:00pm', 'Test short date format.'); + $this->assertIdentical(format_date($timestamp), '25. marzo 2007 - 17:00', 'Test default date format.'); // Test HTML time element formats. - $this->assertIdentical(format_date($timestamp, 'html_datetime'), '2007-03-25T17:00:00-0700', t('Test html_datetime date format.')); - $this->assertIdentical(format_date($timestamp, 'html_date'), '2007-03-25', t('Test html_date date format.')); - $this->assertIdentical(format_date($timestamp, 'html_time'), '17:00:00', t('Test html_time date format.')); - $this->assertIdentical(format_date($timestamp, 'html_yearless_date'), '03-25', t('Test html_yearless_date date format.')); - $this->assertIdentical(format_date($timestamp, 'html_week'), '2007-W12', t('Test html_week date format.')); - $this->assertIdentical(format_date($timestamp, 'html_month'), '2007-03', t('Test html_month date format.')); - $this->assertIdentical(format_date($timestamp, 'html_year'), '2007', t('Test html_year date format.')); + $this->assertIdentical(format_date($timestamp, 'html_datetime'), '2007-03-25T17:00:00-0700', 'Test html_datetime date format.'); + $this->assertIdentical(format_date($timestamp, 'html_date'), '2007-03-25', 'Test html_date date format.'); + $this->assertIdentical(format_date($timestamp, 'html_time'), '17:00:00', 'Test html_time date format.'); + $this->assertIdentical(format_date($timestamp, 'html_yearless_date'), '03-25', 'Test html_yearless_date date format.'); + $this->assertIdentical(format_date($timestamp, 'html_week'), '2007-W12', 'Test html_week date format.'); + $this->assertIdentical(format_date($timestamp, 'html_month'), '2007-03', 'Test html_month date format.'); + $this->assertIdentical(format_date($timestamp, 'html_year'), '2007', 'Test html_year date format.'); // Restore the original user and language, and enable session saving. $user = $real_user; diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/GotoTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/GotoTest.php index f1c4fbe..c00af03 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/GotoTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/GotoTest.php @@ -36,23 +36,23 @@ class GotoTest extends WebTestBase { $this->drupalGet('common-test/drupal_goto/redirect'); $headers = $this->drupalGetHeaders(TRUE); list(, $status) = explode(' ', $headers[0][':status'], 3); - $this->assertEqual($status, 302, t('Expected response code was sent.')); - $this->assertText('drupal_goto', t('Drupal goto redirect succeeded.')); - $this->assertEqual($this->getUrl(), url('common-test/drupal_goto', array('absolute' => TRUE)), t('Drupal goto redirected to expected URL.')); + $this->assertEqual($status, 302, 'Expected response code was sent.'); + $this->assertText('drupal_goto', 'Drupal goto redirect succeeded.'); + $this->assertEqual($this->getUrl(), url('common-test/drupal_goto', array('absolute' => TRUE)), 'Drupal goto redirected to expected URL.'); $this->drupalGet('common-test/drupal_goto/redirect_advanced'); $headers = $this->drupalGetHeaders(TRUE); list(, $status) = explode(' ', $headers[0][':status'], 3); - $this->assertEqual($status, 301, t('Expected response code was sent.')); - $this->assertText('drupal_goto', t('Drupal goto redirect succeeded.')); - $this->assertEqual($this->getUrl(), url('common-test/drupal_goto', array('query' => array('foo' => '123'), 'absolute' => TRUE)), t('Drupal goto redirected to expected URL.')); + $this->assertEqual($status, 301, 'Expected response code was sent.'); + $this->assertText('drupal_goto', 'Drupal goto redirect succeeded.'); + $this->assertEqual($this->getUrl(), url('common-test/drupal_goto', array('query' => array('foo' => '123'), 'absolute' => TRUE)), 'Drupal goto redirected to expected URL.'); // Test that drupal_goto() respects ?destination=xxx. Use an complicated URL // to test that the path is encoded and decoded properly. $destination = 'common-test/drupal_goto/destination?foo=%2525&bar=123'; $this->drupalGet('common-test/drupal_goto/redirect', array('query' => array('destination' => $destination))); - $this->assertText('drupal_goto', t('Drupal goto redirect with destination succeeded.')); - $this->assertEqual($this->getUrl(), url('common-test/drupal_goto/destination', array('query' => array('foo' => '%25', 'bar' => '123'), 'absolute' => TRUE)), t('Drupal goto redirected to given query string destination.')); + $this->assertText('drupal_goto', 'Drupal goto redirect with destination succeeded.'); + $this->assertEqual($this->getUrl(), url('common-test/drupal_goto/destination', array('query' => array('foo' => '%25', 'bar' => '123'), 'absolute' => TRUE)), 'Drupal goto redirected to given query string destination.'); } /** @@ -61,8 +61,8 @@ class GotoTest extends WebTestBase { function testDrupalGotoAlter() { $this->drupalGet('common-test/drupal_goto/redirect_fail'); - $this->assertNoText(t("Drupal goto failed to stop program"), t("Drupal goto stopped program.")); - $this->assertNoText('drupal_goto_fail', t("Drupal goto redirect failed.")); + $this->assertNoText(t("Drupal goto failed to stop program"), 'Drupal goto stopped program.'); + $this->assertNoText('drupal_goto_fail', 'Drupal goto redirect failed.'); } /** @@ -73,11 +73,11 @@ class GotoTest extends WebTestBase { // Verify that a 'destination' query string is used as destination. $this->drupalGet('common-test/destination', array('query' => array('destination' => $query))); - $this->assertText('The destination: ' . $query, t('The given query string destination is determined as destination.')); + $this->assertText('The destination: ' . $query, 'The given query string destination is determined as destination.'); // Verify that the current path is used as destination. $this->drupalGet('common-test/destination', array('query' => array($query => NULL))); $url = 'common-test/destination?' . $query; - $this->assertText('The destination: ' . $url, t('The current path is determined as destination.')); + $this->assertText('The destination: ' . $url, 'The current path is determined as destination.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/HtmlIdentifierUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/HtmlIdentifierUnitTest.php index ee34df8..55d8b16 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/HtmlIdentifierUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/HtmlIdentifierUnitTest.php @@ -27,14 +27,14 @@ class HtmlIdentifierUnitTest extends UnitTestBase { function testDrupalCleanCSSIdentifier() { // Verify that no valid ASCII characters are stripped from the identifier. $identifier = 'abcdefghijklmnopqrstuvwxyz_ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789'; - $this->assertIdentical(drupal_clean_css_identifier($identifier, array()), $identifier, t('Verify valid ASCII characters pass through.')); + $this->assertIdentical(drupal_clean_css_identifier($identifier, array()), $identifier, 'Verify valid ASCII characters pass through.'); // Verify that valid UTF-8 characters are not stripped from the identifier. $identifier = '¡¢£¤¥'; - $this->assertIdentical(drupal_clean_css_identifier($identifier, array()), $identifier, t('Verify valid UTF-8 characters pass through.')); + $this->assertIdentical(drupal_clean_css_identifier($identifier, array()), $identifier, 'Verify valid UTF-8 characters pass through.'); // Verify that invalid characters (including non-breaking space) are stripped from the identifier. - $this->assertIdentical(drupal_clean_css_identifier('invalid !"#$%&\'()*+,./:;<=>?@[\\]^`{|}~ identifier', array()), 'invalididentifier', t('Strip invalid characters.')); + $this->assertIdentical(drupal_clean_css_identifier('invalid !"#$%&\'()*+,./:;<=>?@[\\]^`{|}~ identifier', array()), 'invalididentifier', 'Strip invalid characters.'); } /** @@ -51,20 +51,20 @@ class HtmlIdentifierUnitTest extends UnitTestBase { function testDrupalHTMLId() { // Verify that letters, digits, and hyphens are not stripped from the ID. $id = 'abcdefghijklmnopqrstuvwxyz-0123456789'; - $this->assertIdentical(drupal_html_id($id), $id, t('Verify valid characters pass through.')); + $this->assertIdentical(drupal_html_id($id), $id, 'Verify valid characters pass through.'); // Verify that invalid characters are stripped from the ID. - $this->assertIdentical(drupal_html_id('invalid,./:@\\^`{Üidentifier'), 'invalididentifier', t('Strip invalid characters.')); + $this->assertIdentical(drupal_html_id('invalid,./:@\\^`{Üidentifier'), 'invalididentifier', 'Strip invalid characters.'); // Verify Drupal coding standards are enforced. - $this->assertIdentical(drupal_html_id('ID NAME_[1]'), 'id-name-1', t('Enforce Drupal coding standards.')); + $this->assertIdentical(drupal_html_id('ID NAME_[1]'), 'id-name-1', 'Enforce Drupal coding standards.'); // Reset the static cache so we can ensure the unique id count is at zero. drupal_static_reset('drupal_html_id'); // Clean up IDs with invalid starting characters. - $this->assertIdentical(drupal_html_id('test-unique-id'), 'test-unique-id', t('Test the uniqueness of IDs #1.')); - $this->assertIdentical(drupal_html_id('test-unique-id'), 'test-unique-id--2', t('Test the uniqueness of IDs #2.')); - $this->assertIdentical(drupal_html_id('test-unique-id'), 'test-unique-id--3', t('Test the uniqueness of IDs #3.')); + $this->assertIdentical(drupal_html_id('test-unique-id'), 'test-unique-id', 'Test the uniqueness of IDs #1.'); + $this->assertIdentical(drupal_html_id('test-unique-id'), 'test-unique-id--2', 'Test the uniqueness of IDs #2.'); + $this->assertIdentical(drupal_html_id('test-unique-id'), 'test-unique-id--3', 'Test the uniqueness of IDs #3.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/HttpRequestTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/HttpRequestTest.php index b4f5c5d..818b3ef 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/HttpRequestTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/HttpRequestTest.php @@ -34,25 +34,25 @@ class HttpRequestTest extends WebTestBase { global $is_https; // Parse URL schema. - $missing_scheme = drupal_http_request('example.com/path'); - $this->assertEqual($missing_scheme->code, -1002, t('Returned with "-1002" error code.')); - $this->assertEqual($missing_scheme->error, 'missing schema', t('Returned with "missing schema" error message.')); +b $missing_scheme = drupal_http_request('example.com/path'); + $this->assertEqual($missing_scheme->code, -1002, 'Returned with "-1002" error code.'); + $this->assertEqual($missing_scheme->error, 'missing schema', 'Returned with "missing schema" error message.'); $unable_to_parse = drupal_http_request('http:///path'); - $this->assertEqual($unable_to_parse->code, -1001, t('Returned with "-1001" error code.')); - $this->assertEqual($unable_to_parse->error, 'unable to parse URL', t('Returned with "unable to parse URL" error message.')); + $this->assertEqual($unable_to_parse->code, -1001, 'Returned with "-1001" error code.'); + $this->assertEqual($unable_to_parse->error, 'unable to parse URL', 'Returned with "unable to parse URL" error message.'); // Fetch page. $result = drupal_http_request(url('node', array('absolute' => TRUE))); - $this->assertEqual($result->code, 200, t('Fetched page successfully.')); + $this->assertEqual($result->code, 200, 'Fetched page successfully.'); $this->drupalSetContent($result->data); - $this->assertTitle(t('Welcome to @site-name | @site-name', array('@site-name' => config('system.site')->get('name'))), t('Site title matches.')); + $this->assertTitle(t('Welcome to @site-name | @site-name', array('@site-name' => config('system.site')->get('name'))), 'Site title matches.'); // Test that code and status message is returned. $result = drupal_http_request(url('pagedoesnotexist', array('absolute' => TRUE))); - $this->assertTrue(!empty($result->protocol), t('Result protocol is returned.')); - $this->assertEqual($result->code, '404', t('Result code is 404')); - $this->assertEqual($result->status_message, 'Not Found', t('Result status message is "Not Found"')); + $this->assertTrue(!empty($result->protocol), 'Result protocol is returned.'); + $this->assertEqual($result->code, '404', 'Result code is 404'); + $this->assertEqual($result->status_message, 'Not Found', 'Result status message is "Not Found"'); // Skip the timeout tests when the testing environment is HTTPS because // stream_set_timeout() does not work for SSL connections. @@ -67,9 +67,9 @@ class HttpRequestTest extends WebTestBase { timer_start(__METHOD__); $result = drupal_http_request(url('system-test/sleep/10', array('absolute' => TRUE)), array('timeout' => 2)); $time = timer_read(__METHOD__) / 1000; - $this->assertTrue(1.8 < $time && $time < 5, t('Request timed out (%time seconds).', array('%time' => $time))); - $this->assertTrue($result->error, t('An error message was returned.')); - $this->assertEqual($result->code, HTTP_REQUEST_TIMEOUT, t('Proper error code was returned.')); + $this->assertTrue(1.8 < $time && $time < 5, format_string('Request timed out (%time seconds).', array('%time' => $time))); + $this->assertTrue($result->error, 'An error message was returned.'); + $this->assertEqual($result->code, HTTP_REQUEST_TIMEOUT, 'Proper error code was returned.'); } } @@ -82,47 +82,47 @@ class HttpRequestTest extends WebTestBase { $result = drupal_http_request($auth); $this->drupalSetContent($result->data); - $this->assertRaw($username, t('$_SERVER["PHP_AUTH_USER"] is passed correctly.')); - $this->assertRaw($password, t('$_SERVER["PHP_AUTH_PW"] is passed correctly.')); + $this->assertRaw($username, '$_SERVER["PHP_AUTH_USER"] is passed correctly.'); + $this->assertRaw($password, '$_SERVER["PHP_AUTH_PW"] is passed correctly.'); } function testDrupalHTTPRequestRedirect() { $redirect_301 = drupal_http_request(url('system-test/redirect/301', array('absolute' => TRUE)), array('max_redirects' => 1)); - $this->assertEqual($redirect_301->redirect_code, 301, t('drupal_http_request follows the 301 redirect.')); + $this->assertEqual($redirect_301->redirect_code, 301, 'drupal_http_request follows the 301 redirect.'); $redirect_301 = drupal_http_request(url('system-test/redirect/301', array('absolute' => TRUE)), array('max_redirects' => 0)); - $this->assertFalse(isset($redirect_301->redirect_code), t('drupal_http_request does not follow 301 redirect if max_redirects = 0.')); + $this->assertFalse(isset($redirect_301->redirect_code), 'drupal_http_request does not follow 301 redirect if max_redirects = 0.'); $redirect_invalid = drupal_http_request(url('system-test/redirect-noscheme', array('absolute' => TRUE)), array('max_redirects' => 1)); - $this->assertEqual($redirect_invalid->code, -1002, t('301 redirect to invalid URL returned with error code !error.', array('!error' => $redirect_invalid->error))); - $this->assertEqual($redirect_invalid->error, 'missing schema', t('301 redirect to invalid URL returned with error message "!error".', array('!error' => $redirect_invalid->error))); + $this->assertEqual($redirect_invalid->code, -1002, format_string('301 redirect to invalid URL returned with error code !error.', array('!error' => $redirect_invalid->error))); + $this->assertEqual($redirect_invalid->error, 'missing schema', format_string('301 redirect to invalid URL returned with error message "!error".', array('!error' => $redirect_invalid->error))); $redirect_invalid = drupal_http_request(url('system-test/redirect-noparse', array('absolute' => TRUE)), array('max_redirects' => 1)); - $this->assertEqual($redirect_invalid->code, -1001, t('301 redirect to invalid URL returned with error message code "!error".', array('!error' => $redirect_invalid->error))); - $this->assertEqual($redirect_invalid->error, 'unable to parse URL', t('301 redirect to invalid URL returned with error message "!error".', array('!error' => $redirect_invalid->error))); + $this->assertEqual($redirect_invalid->code, -1001, format_string('301 redirect to invalid URL returned with error message code "!error".', array('!error' => $redirect_invalid->error))); + $this->assertEqual($redirect_invalid->error, 'unable to parse URL', format_string('301 redirect to invalid URL returned with error message "!error".', array('!error' => $redirect_invalid->error))); $redirect_invalid = drupal_http_request(url('system-test/redirect-invalid-scheme', array('absolute' => TRUE)), array('max_redirects' => 1)); - $this->assertEqual($redirect_invalid->code, -1003, t('301 redirect to invalid URL returned with error code !error.', array('!error' => $redirect_invalid->error))); - $this->assertEqual($redirect_invalid->error, 'invalid schema ftp', t('301 redirect to invalid URL returned with error message "!error".', array('!error' => $redirect_invalid->error))); + $this->assertEqual($redirect_invalid->code, -1003, format_string('301 redirect to invalid URL returned with error code !error.', array('!error' => $redirect_invalid->error))); + $this->assertEqual($redirect_invalid->error, 'invalid schema ftp', format_string('301 redirect to invalid URL returned with error message "!error".', array('!error' => $redirect_invalid->error))); $redirect_302 = drupal_http_request(url('system-test/redirect/302', array('absolute' => TRUE)), array('max_redirects' => 1)); - $this->assertEqual($redirect_302->redirect_code, 302, t('drupal_http_request follows the 302 redirect.')); + $this->assertEqual($redirect_302->redirect_code, 302, 'drupal_http_request follows the 302 redirect.'); $redirect_302 = drupal_http_request(url('system-test/redirect/302', array('absolute' => TRUE)), array('max_redirects' => 0)); - $this->assertFalse(isset($redirect_302->redirect_code), t('drupal_http_request does not follow 302 redirect if $retry = 0.')); + $this->assertFalse(isset($redirect_302->redirect_code), 'drupal_http_request does not follow 302 redirect if $retry = 0.'); $redirect_307 = drupal_http_request(url('system-test/redirect/307', array('absolute' => TRUE)), array('max_redirects' => 1)); - $this->assertEqual($redirect_307->redirect_code, 307, t('drupal_http_request follows the 307 redirect.')); + $this->assertEqual($redirect_307->redirect_code, 307, 'drupal_http_request follows the 307 redirect.'); $redirect_307 = drupal_http_request(url('system-test/redirect/307', array('absolute' => TRUE)), array('max_redirects' => 0)); - $this->assertFalse(isset($redirect_307->redirect_code), t('drupal_http_request does not follow 307 redirect if max_redirects = 0.')); + $this->assertFalse(isset($redirect_307->redirect_code), 'drupal_http_request does not follow 307 redirect if max_redirects = 0.'); $multiple_redirect_final_url = url('system-test/multiple-redirects/0', array('absolute' => TRUE)); $multiple_redirect_1 = drupal_http_request(url('system-test/multiple-redirects/1', array('absolute' => TRUE)), array('max_redirects' => 1)); - $this->assertEqual($multiple_redirect_1->redirect_url, $multiple_redirect_final_url, t('redirect_url contains the final redirection location after 1 redirect.')); + $this->assertEqual($multiple_redirect_1->redirect_url, $multiple_redirect_final_url, 'redirect_url contains the final redirection location after 1 redirect.'); $multiple_redirect_3 = drupal_http_request(url('system-test/multiple-redirects/3', array('absolute' => TRUE)), array('max_redirects' => 3)); - $this->assertEqual($multiple_redirect_3->redirect_url, $multiple_redirect_final_url, t('redirect_url contains the final redirection location after 3 redirects.')); + $this->assertEqual($multiple_redirect_3->redirect_url, $multiple_redirect_final_url, 'redirect_url contains the final redirection location after 3 redirects.'); } /** @@ -131,7 +131,7 @@ class HttpRequestTest extends WebTestBase { function testDrupalHTTPRequestHeaders() { // Check the default header. $request = drupal_http_request(url('', array('absolute' => TRUE))); - $this->assertEqual($request->headers['content-language'], 'en', t('Content-Language HTTP header is English.')); + $this->assertEqual($request->headers['content-language'], 'en', 'Content-Language HTTP header is English.'); // Add French language. $language = new Language(array( @@ -142,6 +142,6 @@ class HttpRequestTest extends WebTestBase { // Request front page in French and check for matching Content-language. $request = drupal_http_request(url('', array('absolute' => TRUE, 'language' => $language))); - $this->assertEqual($request->headers['content-language'], 'fr', t('Content-Language HTTP header is French.')); + $this->assertEqual($request->headers['content-language'], 'fr', 'Content-Language HTTP header is French.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/InstallerLanguageTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/InstallerLanguageTest.php index 18636b5..9960d4c 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/InstallerLanguageTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/InstallerLanguageTest.php @@ -44,9 +44,9 @@ class InstallerLanguageTest extends WebTestBase { foreach ($expected_translation_files as $langcode => $files_expected) { $files_found = install_find_translation_files($langcode); - $this->assertTrue(count($files_found) == count($files_expected), t('@count installer languages found.', array('@count' => count($files_expected)))); + $this->assertTrue(count($files_found) == count($files_expected), format_string('@count installer languages found.', array('@count' => count($files_expected)))); foreach ($files_found as $file) { - $this->assertTrue(in_array($file->filename, $files_expected), t('@file found.', array('@file' => $file->filename))); + $this->assertTrue(in_array($file->filename, $files_expected), format_string('@file found.', array('@file' => $file->filename))); } } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php index d2f39bb..9507e3b 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php @@ -60,7 +60,7 @@ class JavaScriptTest extends WebTestBase { * Test default JavaScript is empty. */ function testDefault() { - $this->assertEqual(array(), drupal_add_js(), t('Default JavaScript is empty.')); + $this->assertEqual(array(), drupal_add_js(), 'Default JavaScript is empty.'); } /** @@ -68,7 +68,7 @@ class JavaScriptTest extends WebTestBase { */ function testAddFile() { $javascript = drupal_add_js('core/misc/collapse.js'); - $this->assertTrue(array_key_exists('core/misc/collapse.js', $javascript), t('JavaScript files are correctly added.')); + $this->assertTrue(array_key_exists('core/misc/collapse.js', $javascript), 'JavaScript files are correctly added.'); } /** @@ -93,7 +93,7 @@ class JavaScriptTest extends WebTestBase { function testAddExternal() { $path = 'http://example.com/script.js'; $javascript = drupal_add_js($path, 'external'); - $this->assertTrue(array_key_exists('http://example.com/script.js', $javascript), t('Added an external JavaScript file.')); + $this->assertTrue(array_key_exists('http://example.com/script.js', $javascript), 'Added an external JavaScript file.'); } /** @@ -110,8 +110,8 @@ class JavaScriptTest extends WebTestBase { $expected_1 = ''; $expected_2 = ''; - $this->assertTrue(strpos($javascript, $expected_1) > 0, t('Rendered external JavaScript with correct async attribute.')); - $this->assertTrue(strpos($javascript, $expected_2) > 0, t('Rendered internal JavaScript with correct async attribute.')); + $this->assertTrue(strpos($javascript, $expected_1) > 0, 'Rendered external JavaScript with correct async attribute.'); + $this->assertTrue(strpos($javascript, $expected_2) > 0, 'Rendered internal JavaScript with correct async attribute.'); } /** @@ -128,8 +128,8 @@ class JavaScriptTest extends WebTestBase { $expected_1 = ''; $expected_2 = ''; - $this->assertTrue(strpos($javascript, $expected_1) > 0, t('Rendered external JavaScript with correct defer attribute.')); - $this->assertTrue(strpos($javascript, $expected_2) > 0, t('Rendered internal JavaScript with correct defer attribute.')); + $this->assertTrue(strpos($javascript, $expected_1) > 0, 'Rendered external JavaScript with correct defer attribute.'); + $this->assertTrue(strpos($javascript, $expected_2) > 0, 'Rendered internal JavaScript with correct defer attribute.'); } /** @@ -157,18 +157,18 @@ class JavaScriptTest extends WebTestBase { $javascript = drupal_get_js('header'); // Test whether drupal_add_js can be used to override a previous setting. - $this->assertTrue(strpos($javascript, 'commonTestShouldAppear') > 0, t('Rendered JavaScript header returns custom setting.')); - $this->assertTrue(strpos($javascript, 'commonTestShouldNotAppear') === FALSE, t('drupal_add_js() correctly overrides a custom setting.')); + $this->assertTrue(strpos($javascript, 'commonTestShouldAppear') > 0, 'Rendered JavaScript header returns custom setting.'); + $this->assertTrue(strpos($javascript, 'commonTestShouldNotAppear') === FALSE, 'drupal_add_js() correctly overrides a custom setting.'); // Test whether drupal_add_js can be used to add numerically indexed values // to an array. $array_values_appear = strpos($javascript, 'commonTestValue0') > 0 && strpos($javascript, 'commonTestValue1') > 0 && strpos($javascript, 'commonTestValue2') > 0; - $this->assertTrue($array_values_appear, t('drupal_add_js() correctly adds settings to the end of an indexed array.')); + $this->assertTrue($array_values_appear, 'drupal_add_js() correctly adds settings to the end of an indexed array.'); // Test whether drupal_add_js can be used to override the entry for an // existing key in an associative array. $associative_array_override = strpos($javascript, 'commonTestNewValue') > 0 && strpos($javascript, 'commonTestOldValue') === FALSE; - $this->assertTrue($associative_array_override, t('drupal_add_js() correctly overrides settings within an associative array.')); + $this->assertTrue($associative_array_override, 'drupal_add_js() correctly overrides settings within an associative array.'); // Check in a rendered page. $this->drupalGet('common-test/query-string'); $this->assertPattern('@' . "\n"; - $this->assertTrue(strpos($javascript, $expected_1) > 0, t('Rendered JavaScript within downlevel-hidden conditional comments.')); - $this->assertTrue(strpos($javascript, $expected_2) > 0, t('Rendered JavaScript within downlevel-revealed conditional comments.')); + $this->assertTrue(strpos($javascript, $expected_1) > 0, 'Rendered JavaScript within downlevel-hidden conditional comments.'); + $this->assertTrue(strpos($javascript, $expected_2) > 0, 'Rendered JavaScript within downlevel-revealed conditional comments.'); } /** @@ -277,7 +277,7 @@ class JavaScriptTest extends WebTestBase { drupal_add_js('core/misc/collapse.js', array('version' => 'foo')); drupal_add_js('core/misc/ajax.js', array('version' => 'bar')); $javascript = drupal_get_js(); - $this->assertTrue(strpos($javascript, 'core/misc/collapse.js?v=foo') > 0 && strpos($javascript, 'core/misc/ajax.js?v=bar') > 0 , t('JavaScript version identifiers correctly appended to URLs')); + $this->assertTrue(strpos($javascript, 'core/misc/collapse.js?v=foo') > 0 && strpos($javascript, 'core/misc/ajax.js?v=bar') > 0 , 'JavaScript version identifiers correctly appended to URLs'); } /** @@ -302,7 +302,7 @@ class JavaScriptTest extends WebTestBase { '', '', )); - $this->assertTrue(strpos($javascript, $expected) > 0, t('Unaggregated JavaScript is added in the expected group order.')); + $this->assertTrue(strpos($javascript, $expected) > 0, 'Unaggregated JavaScript is added in the expected group order.'); // Now ensure that with aggregation on, one file is made for the // 'every_page' files, and one file is made for the others. @@ -321,7 +321,7 @@ class JavaScriptTest extends WebTestBase { '', '', )); - $this->assertTrue(strpos($javascript, $expected) !== FALSE, t('JavaScript is aggregated in the expected groups and order.')); + $this->assertTrue(strpos($javascript, $expected) !== FALSE, 'JavaScript is aggregated in the expected groups and order.'); } /** @@ -407,7 +407,7 @@ class JavaScriptTest extends WebTestBase { else { $result = array(); } - $this->assertIdentical($result, $expected, t('JavaScript is added in the expected weight order.')); + $this->assertIdentical($result, $expected, 'JavaScript is added in the expected weight order.'); } /** @@ -420,7 +420,7 @@ class JavaScriptTest extends WebTestBase { drupal_add_library('system', 'jquery'); drupal_add_js('core/misc/collapse.js', array('group' => JS_LIBRARY, 'every_page' => TRUE, 'weight' => -21)); $javascript = drupal_get_js(); - $this->assertTrue(strpos($javascript, 'core/misc/collapse.js') < strpos($javascript, 'core/misc/jquery.js'), t('Rendering a JavaScript file above jQuery.')); + $this->assertTrue(strpos($javascript, 'core/misc/collapse.js') < strpos($javascript, 'core/misc/jquery.js'), 'Rendering a JavaScript file above jQuery.'); } /** @@ -437,7 +437,7 @@ class JavaScriptTest extends WebTestBase { // tableselect.js. See simpletest_js_alter() to see where this alteration // takes place. $javascript = drupal_get_js(); - $this->assertTrue(strpos($javascript, 'simpletest.js') < strpos($javascript, 'core/misc/tableselect.js'), t('Altering JavaScript weight through the alter hook.')); + $this->assertTrue(strpos($javascript, 'simpletest.js') < strpos($javascript, 'core/misc/tableselect.js'), 'Altering JavaScript weight through the alter hook.'); } /** @@ -448,8 +448,8 @@ class JavaScriptTest extends WebTestBase { $this->assertTrue($result !== FALSE, t('Library was added without errors.')); $scripts = drupal_get_js(); $styles = drupal_get_css(); - $this->assertTrue(strpos($scripts, 'core/misc/farbtastic/farbtastic.js'), t('JavaScript of library was added to the page.')); - $this->assertTrue(strpos($styles, 'core/misc/farbtastic/farbtastic.css'), t('Stylesheet of library was added to the page.')); + $this->assertTrue(strpos($scripts, 'core/misc/farbtastic/farbtastic.js'), 'JavaScript of library was added to the page.'); + $this->assertTrue(strpos($styles, 'core/misc/farbtastic/farbtastic.css'), 'Stylesheet of library was added to the page.'); } /** @@ -465,7 +465,7 @@ class JavaScriptTest extends WebTestBase { // common_test_library_info_alter() also added a dependency on jQuery Form. drupal_add_library('system', 'jquery.farbtastic'); $scripts = drupal_get_js(); - $this->assertTrue(strpos($scripts, 'core/misc/jquery.form.js'), t('Altered library dependencies are added to the page.')); + $this->assertTrue(strpos($scripts, 'core/misc/jquery.form.js'), 'Altered library dependencies are added to the page.'); } /** @@ -475,7 +475,7 @@ class JavaScriptTest extends WebTestBase { */ function testLibraryNameConflicts() { $farbtastic = drupal_get_library('common_test', 'jquery.farbtastic'); - $this->assertEqual($farbtastic['title'], 'Custom Farbtastic Library', t('Alternative libraries can be added to the page.')); + $this->assertEqual($farbtastic['title'], 'Custom Farbtastic Library', 'Alternative libraries can be added to the page.'); } /** @@ -489,7 +489,7 @@ class JavaScriptTest extends WebTestBase { $result = drupal_add_library('unknown', 'unknown'); $this->assertFalse($result, t('Unknown library returned FALSE.')); $scripts = drupal_get_js(); - $this->assertTrue(strpos($scripts, 'unknown') === FALSE, t('Unknown library was not added to the page.')); + $this->assertTrue(strpos($scripts, 'unknown') === FALSE, 'Unknown library was not added to the page.'); } /** @@ -499,7 +499,7 @@ class JavaScriptTest extends WebTestBase { $element['#attached']['library'][] = array('system', 'jquery.farbtastic'); drupal_render($element); $scripts = drupal_get_js(); - $this->assertTrue(strpos($scripts, 'core/misc/farbtastic/farbtastic.js'), t('The attached_library property adds the additional libraries.')); + $this->assertTrue(strpos($scripts, 'core/misc/farbtastic/farbtastic.js'), 'The attached_library property adds the additional libraries.'); } /** @@ -508,18 +508,18 @@ class JavaScriptTest extends WebTestBase { function testGetLibrary() { // Retrieve all libraries registered by a module. $libraries = drupal_get_library('common_test'); - $this->assertTrue(isset($libraries['jquery.farbtastic']), t('Retrieved all module libraries.')); + $this->assertTrue(isset($libraries['jquery.farbtastic']), 'Retrieved all module libraries.'); // Retrieve all libraries for a module not implementing hook_library_info(). // Note: This test installs language module. $libraries = drupal_get_library('language'); - $this->assertEqual($libraries, array(), t('Retrieving libraries from a module not implementing hook_library_info() returns an emtpy array.')); + $this->assertEqual($libraries, array(), 'Retrieving libraries from a module not implementing hook_library_info() returns an emtpy array.'); // Retrieve a specific library by module and name. $farbtastic = drupal_get_library('common_test', 'jquery.farbtastic'); - $this->assertEqual($farbtastic['version'], '5.3', t('Retrieved a single library.')); + $this->assertEqual($farbtastic['version'], '5.3', 'Retrieved a single library.'); // Retrieve a non-existing library by module and name. $farbtastic = drupal_get_library('common_test', 'foo'); - $this->assertIdentical($farbtastic, FALSE, t('Retrieving a non-existing library returns FALSE.')); + $this->assertIdentical($farbtastic, FALSE, 'Retrieving a non-existing library returns FALSE.'); } /** @@ -529,6 +529,6 @@ class JavaScriptTest extends WebTestBase { function testAddJsFileWithQueryString() { $this->drupalGet('common-test/query-string'); $query_string = variable_get('css_js_query_string', '0'); - $this->assertRaw(drupal_get_path('module', 'node') . '/node.js?' . $query_string, t('Query string was appended correctly to js.')); + $this->assertRaw(drupal_get_path('module', 'node') . '/node.js?' . $query_string, 'Query string was appended correctly to js.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/JsonUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/JsonUnitTest.php index 9deb56b..9f205e6 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/JsonUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/JsonUnitTest.php @@ -38,37 +38,37 @@ class JsonUnitTest extends UnitTestBase { $html_unsafe_escaped = array('\u003C', '\u003E', '\u0027', '\u0026', '\u0022'); // Verify there aren't character encoding problems with the source string. - $this->assertIdentical(strlen($str), 128, t('A string with the full ASCII table has the correct length.')); + $this->assertIdentical(strlen($str), 128, 'A string with the full ASCII table has the correct length.'); foreach ($html_unsafe as $char) { - $this->assertTrue(strpos($str, $char) > 0, t('A string with the full ASCII table includes @s.', array('@s' => $char))); + $this->assertTrue(strpos($str, $char) > 0, format_string('A string with the full ASCII table includes @s.', array('@s' => $char))); } // Verify that JSON encoding produces a string with all of the characters. $json = drupal_json_encode($str); - $this->assertTrue(strlen($json) > strlen($str), t('A JSON encoded string is larger than the source string.')); + $this->assertTrue(strlen($json) > strlen($str), 'A JSON encoded string is larger than the source string.'); // The first and last characters should be ", and no others. $this->assertTrue($json[0] == '"', t('A JSON encoded string begins with ".')); - $this->assertTrue($json[strlen($json) - 1] == '"', t('A JSON encoded string ends with ".')); - $this->assertTrue(substr_count($json, '"') == 2, t('A JSON encoded string contains exactly two ".')); + $this->assertTrue($json[strlen($json) - 1] == '"', 'A JSON encoded string ends with ".'); + $this->assertTrue(substr_count($json, '"') == 2, 'A JSON encoded string contains exactly two ".'); // Verify that encoding/decoding is reversible. $json_decoded = drupal_json_decode($json); - $this->assertIdentical($str, $json_decoded, t('Encoding a string to JSON and decoding back results in the original string.')); + $this->assertIdentical($str, $json_decoded, 'Encoding a string to JSON and decoding back results in the original string.'); // Verify reversibility for structured data. Also verify that necessary // characters are escaped. $source = array(TRUE, FALSE, 0, 1, '0', '1', $str, array('key1' => $str, 'key2' => array('nested' => TRUE))); $json = drupal_json_encode($source); foreach ($html_unsafe as $char) { - $this->assertTrue(strpos($json, $char) === FALSE, t('A JSON encoded string does not contain @s.', array('@s' => $char))); + $this->assertTrue(strpos($json, $char) === FALSE, format_string('A JSON encoded string does not contain @s.', array('@s' => $char))); } // Verify that JSON encoding escapes the HTML unsafe characters foreach ($html_unsafe_escaped as $char) { - $this->assertTrue(strpos($json, $char) > 0, t('A JSON encoded string contains @s.', array('@s' => $char))); + $this->assertTrue(strpos($json, $char) > 0, format_string('A JSON encoded string contains @s.', array('@s' => $char))); } $json_decoded = drupal_json_decode($json); - $this->assertNotIdentical($source, $json, t('An array encoded in JSON is not identical to the source.')); - $this->assertIdentical($source, $json_decoded, t('Encoding structured data to JSON and decoding back results in the original data.')); + $this->assertNotIdentical($source, $json, 'An array encoded in JSON is not identical to the source.'); + $this->assertIdentical($source, $json_decoded, 'Encoding structured data to JSON and decoding back results in the original data.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/ParseInfoFileUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/ParseInfoFileUnitTest.php index e6041d8..0b211a2 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/ParseInfoFileUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/ParseInfoFileUnitTest.php @@ -26,8 +26,8 @@ class ParseInfoFileUnitTest extends UnitTestBase { */ function testParseInfoFile() { $info_values = drupal_parse_info_file(drupal_get_path('module', 'system') . '/tests/common_test_info.txt'); - $this->assertEqual($info_values['simple_string'], 'A simple string', t('Simple string value was parsed correctly.'), t('System')); - $this->assertEqual($info_values['simple_constant'], WATCHDOG_INFO, t('Constant value was parsed correctly.'), t('System')); - $this->assertEqual($info_values['double_colon'], 'dummyClassName::', t('Value containing double-colon was parsed correctly.'), t('System')); + $this->assertEqual($info_values['simple_string'], 'A simple string', t('Simple string value was parsed correctly.'), 'System'); + $this->assertEqual($info_values['simple_constant'], WATCHDOG_INFO, t('Constant value was parsed correctly.'), 'System'); + $this->assertEqual($info_values['double_colon'], 'dummyClassName::', t('Value containing double-colon was parsed correctly.'), 'System'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/RegionContentTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/RegionContentTest.php index 62b2ad4..a64dfc4 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/RegionContentTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/RegionContentTest.php @@ -43,13 +43,13 @@ class RegionContentTest extends WebTestBase { // Ensure drupal_get_region_content returns expected results when fetching all regions. $content = drupal_get_region_content(NULL, $delimiter); foreach ($content as $region => $region_content) { - $this->assertEqual($region_content, $values[$region], t('@region region text verified when fetching all regions', array('@region' => $region))); + $this->assertEqual($region_content, $values[$region], format_string('@region region text verified when fetching all regions', array('@region' => $region))); } // Ensure drupal_get_region_content returns expected results when fetching a single region. foreach ($block_regions as $region) { $region_content = drupal_get_region_content($region, $delimiter); - $this->assertEqual($region_content, $values[$region], t('@region region text verified when fetching single region.', array('@region' => $region))); + $this->assertEqual($region_content, $values[$region], format_string('@region region text verified when fetching single region.', array('@region' => $region))); } } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php index ec3d95b..14241e0 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php @@ -49,17 +49,17 @@ class RenderTest extends WebTestBase { $output = drupal_render($elements); // The lowest weight element should appear last in $output. - $this->assertTrue(strpos($output, $second) > strpos($output, $first), t('Elements were sorted correctly by weight.')); + $this->assertTrue(strpos($output, $second) > strpos($output, $first), 'Elements were sorted correctly by weight.'); // Confirm that the $elements array has '#sorted' set to TRUE. - $this->assertTrue($elements['#sorted'], t("'#sorted' => TRUE was added to the array")); + $this->assertTrue($elements['#sorted'], "'#sorted' => TRUE was added to the array"); // Pass $elements through element_children() and ensure it remains // sorted in the correct order. drupal_render() will return an empty string // if used on the same array in the same request. $children = element_children($elements); - $this->assertTrue(array_shift($children) == 'first', t('Child found in the correct order.')); - $this->assertTrue(array_shift($children) == 'second', t('Child found in the correct order.')); + $this->assertTrue(array_shift($children) == 'first', 'Child found in the correct order.'); + $this->assertTrue(array_shift($children) == 'second', 'Child found in the correct order.'); // The same array structure again, but with #sorted set to TRUE. @@ -77,7 +77,7 @@ class RenderTest extends WebTestBase { $output = drupal_render($elements); // The elements should appear in output in the same order as the array. - $this->assertTrue(strpos($output, $second) < strpos($output, $first), t('Elements were not sorted.')); + $this->assertTrue(strpos($output, $second) < strpos($output, $first), 'Elements were not sorted.'); } /** @@ -114,18 +114,18 @@ class RenderTest extends WebTestBase { // Render the element and verify the presence of #attached JavaScript. drupal_render($element); $scripts = drupal_get_js(); - $this->assertTrue(strpos($scripts, $parent_js), t('The element #attached JavaScript was included.')); - $this->assertTrue(strpos($scripts, $child_js), t('The child #attached JavaScript was included.')); - $this->assertTrue(strpos($scripts, $subchild_js), t('The subchild #attached JavaScript was included.')); + $this->assertTrue(strpos($scripts, $parent_js), 'The element #attached JavaScript was included.'); + $this->assertTrue(strpos($scripts, $child_js), 'The child #attached JavaScript was included.'); + $this->assertTrue(strpos($scripts, $subchild_js), 'The subchild #attached JavaScript was included.'); // Load the element from cache and verify the presence of the #attached // JavaScript. drupal_static_reset('drupal_add_js'); - $this->assertTrue(drupal_render_cache_get($element), t('The element was retrieved from cache.')); + $this->assertTrue(drupal_render_cache_get($element), 'The element was retrieved from cache.'); $scripts = drupal_get_js(); - $this->assertTrue(strpos($scripts, $parent_js), t('The element #attached JavaScript was included when loading from cache.')); - $this->assertTrue(strpos($scripts, $child_js), t('The child #attached JavaScript was included when loading from cache.')); - $this->assertTrue(strpos($scripts, $subchild_js), t('The subchild #attached JavaScript was included when loading from cache.')); + $this->assertTrue(strpos($scripts, $parent_js), 'The element #attached JavaScript was included when loading from cache.'); + $this->assertTrue(strpos($scripts, $child_js), 'The child #attached JavaScript was included when loading from cache.'); + $this->assertTrue(strpos($scripts, $subchild_js), 'The subchild #attached JavaScript was included when loading from cache.'); $_SERVER['REQUEST_METHOD'] = $request_method; } @@ -280,8 +280,8 @@ class RenderTest extends WebTestBase { config('system.logging')->set('error_level', ERROR_REPORTING_DISPLAY_ALL)->save(); $this->drupalGet('common-test/drupal-render-invalid-keys'); - $this->assertResponse(200, t('Received expected HTTP status code.')); - $this->assertRaw($message, t('Found error message: !message.', array('!message' => $message))); + $this->assertResponse(200, 'Received expected HTTP status code.'); + $this->assertRaw($message, format_string('Found error message: !message.', array('!message' => $message))); } protected function assertRenderedElement(array $element, $xpath, array $xpath_args = array()) { @@ -319,13 +319,13 @@ class RenderTest extends WebTestBase { // process (which will set $element['#printed']). $element = $test_element; drupal_render($element); - $this->assertTrue(isset($element['#printed']), t('No cache hit')); + $this->assertTrue(isset($element['#printed']), 'No cache hit'); // Render the element again and confirm that it is retrieved from the cache // instead (so $element['#printed'] will not be set). $element = $test_element; drupal_render($element); - $this->assertFalse(isset($element['#printed']), t('Cache hit')); + $this->assertFalse(isset($element['#printed']), 'Cache hit'); // Restore the previous request method. $_SERVER['REQUEST_METHOD'] = $request_method; diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/SchemaTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/SchemaTest.php index 060a2b2..c33d59a 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/SchemaTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/SchemaTest.php @@ -51,7 +51,7 @@ class SchemaTest extends WebTestBase { db_create_table('test_table', $table_specification); // Assert that the table exists. - $this->assertTrue(db_table_exists('test_table'), t('The table exists.')); + $this->assertTrue(db_table_exists('test_table'), 'The table exists.'); // Assert that the table comment has been set. $this->checkSchemaComment($table_specification['description'], 'test_table'); @@ -60,46 +60,46 @@ class SchemaTest extends WebTestBase { $this->checkSchemaComment($table_specification['fields']['test_field']['description'], 'test_table', 'test_field'); // An insert without a value for the column 'test_table' should fail. - $this->assertFalse($this->tryInsert(), t('Insert without a default failed.')); + $this->assertFalse($this->tryInsert(), 'Insert without a default failed.'); // Add a default value to the column. db_field_set_default('test_table', 'test_field', 0); // The insert should now succeed. - $this->assertTrue($this->tryInsert(), t('Insert with a default succeeded.')); + $this->assertTrue($this->tryInsert(), 'Insert with a default succeeded.'); // Remove the default. db_field_set_no_default('test_table', 'test_field'); // The insert should fail again. - $this->assertFalse($this->tryInsert(), t('Insert without a default failed.')); + $this->assertFalse($this->tryInsert(), 'Insert without a default failed.'); // Test for fake index and test for the boolean result of indexExists(). $index_exists = Database::getConnection()->schema()->indexExists('test_table', 'test_field'); - $this->assertIdentical($index_exists, FALSE, t('Fake index does not exists')); + $this->assertIdentical($index_exists, FALSE, 'Fake index does not exists'); // Add index. db_add_index('test_table', 'test_field', array('test_field')); // Test for created index and test for the boolean result of indexExists(). $index_exists = Database::getConnection()->schema()->indexExists('test_table', 'test_field'); - $this->assertIdentical($index_exists, TRUE, t('Index created.')); + $this->assertIdentical($index_exists, TRUE, 'Index created.'); // Rename the table. db_rename_table('test_table', 'test_table2'); // Index should be renamed. $index_exists = Database::getConnection()->schema()->indexExists('test_table2', 'test_field'); - $this->assertTrue($index_exists, t('Index was renamed.')); + $this->assertTrue($index_exists, 'Index was renamed.'); // We need the default so that we can insert after the rename. db_field_set_default('test_table2', 'test_field', 0); - $this->assertFalse($this->tryInsert(), t('Insert into the old table failed.')); - $this->assertTrue($this->tryInsert('test_table2'), t('Insert into the new table succeeded.')); + $this->assertFalse($this->tryInsert(), 'Insert into the old table failed.'); + $this->assertTrue($this->tryInsert('test_table2'), 'Insert into the new table succeeded.'); // We should have successfully inserted exactly two rows. $count = db_query('SELECT COUNT(*) FROM {test_table2}')->fetchField(); - $this->assertEqual($count, 2, t('Two fields were successfully inserted.')); + $this->assertEqual($count, 2, 'Two fields were successfully inserted.'); // Try to drop the table. db_drop_table('test_table2'); - $this->assertFalse(db_table_exists('test_table2'), t('The dropped table does not exist.')); + $this->assertFalse(db_table_exists('test_table2'), 'The dropped table does not exist.'); // Recreate the table. db_create_table('test_table', $table_specification); @@ -115,14 +115,14 @@ class SchemaTest extends WebTestBase { // Assert that the column comment has been set. $this->checkSchemaComment('Changed column description.', 'test_table', 'test_serial'); - $this->assertTrue($this->tryInsert(), t('Insert with a serial succeeded.')); + $this->assertTrue($this->tryInsert(), 'Insert with a serial succeeded.'); $max1 = db_query('SELECT MAX(test_serial) FROM {test_table}')->fetchField(); - $this->assertTrue($this->tryInsert(), t('Insert with a serial succeeded.')); + $this->assertTrue($this->tryInsert(), 'Insert with a serial succeeded.'); $max2 = db_query('SELECT MAX(test_serial) FROM {test_table}')->fetchField(); - $this->assertTrue($max2 > $max1, t('The serial is monotone.')); + $this->assertTrue($max2 > $max1, 'The serial is monotone.'); $count = db_query('SELECT COUNT(*) FROM {test_table}')->fetchField(); - $this->assertEqual($count, 2, t('There were two rows.')); + $this->assertEqual($count, 2, 'There were two rows.'); // Use database specific data type and ensure that table is created. $table_specification = array( @@ -141,7 +141,7 @@ class SchemaTest extends WebTestBase { db_create_table('test_timestamp', $table_specification); } catch (Exception $e) {} - $this->assertTrue(db_table_exists('test_timestamp'), t('Table with database specific datatype was created.')); + $this->assertTrue(db_table_exists('test_timestamp'), 'Table with database specific datatype was created.'); } function tryInsert($table = 'test_table') { @@ -169,7 +169,7 @@ class SchemaTest extends WebTestBase { function checkSchemaComment($description, $table, $column = NULL) { if (method_exists(Database::getConnection()->schema(), 'getComment')) { $comment = Database::getConnection()->schema()->getComment($table, $column); - $this->assertEqual($comment, $description, t('The comment matches the schema description.')); + $this->assertEqual($comment, $description, 'The comment matches the schema description.'); } } @@ -200,8 +200,8 @@ class SchemaTest extends WebTestBase { // Finally, check each column and try to insert invalid values into them. foreach ($table_spec['fields'] as $column_name => $column_spec) { - $this->assertTrue(db_field_exists($table_name, $column_name), t('Unsigned @type column was created.', array('@type' => $column_spec['type']))); - $this->assertFalse($this->tryUnsignedInsert($table_name, $column_name), t('Unsigned @type column rejected a negative value.', array('@type' => $column_spec['type']))); + $this->assertTrue(db_field_exists($table_name, $column_name), format_string('Unsigned @type column was created.', array('@type' => $column_spec['type']))); + $this->assertFalse($this->tryUnsignedInsert($table_name, $column_name), format_string('Unsigned @type column rejected a negative value.', array('@type' => $column_spec['type']))); } } @@ -319,7 +319,7 @@ class SchemaTest extends WebTestBase { 'primary key' => array('serial_column'), ); db_create_table($table_name, $table_spec); - $this->pass(t('Table %table created.', array('%table' => $table_name))); + $this->pass(format_string('Table %table created.', array('%table' => $table_name))); // Check the characteristics of the field. $this->assertFieldCharacteristics($table_name, 'test_field', $field_spec); @@ -336,7 +336,7 @@ class SchemaTest extends WebTestBase { 'primary key' => array('serial_column'), ); db_create_table($table_name, $table_spec); - $this->pass(t('Table %table created.', array('%table' => $table_name))); + $this->pass(format_string('Table %table created.', array('%table' => $table_name))); // Insert some rows to the table to test the handling of initial values. for ($i = 0; $i < 3; $i++) { @@ -346,7 +346,7 @@ class SchemaTest extends WebTestBase { } db_add_field($table_name, 'test_field', $field_spec); - $this->pass(t('Column %column created.', array('%column' => 'test_field'))); + $this->pass(format_string('Column %column created.', array('%column' => 'test_field'))); // Check the characteristics of the field. $this->assertFieldCharacteristics($table_name, 'test_field', $field_spec); @@ -369,7 +369,7 @@ class SchemaTest extends WebTestBase { ->countQuery() ->execute() ->fetchField(); - $this->assertEqual($count, 0, t('Initial values filled out.')); + $this->assertEqual($count, 0, 'Initial values filled out.'); } // Check that the default value has been registered. @@ -383,7 +383,7 @@ class SchemaTest extends WebTestBase { ->condition('serial_column', $id) ->execute() ->fetchField(); - $this->assertEqual($field_value, $field_spec['default'], t('Default value registered.')); + $this->assertEqual($field_value, $field_spec['default'], 'Default value registered.'); } db_drop_field($table_name, $field_name); diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php index 2233374..6e41753 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php @@ -94,11 +94,11 @@ class SimpleTestErrorCollectorTest extends WebTestBase { * Assert that a collected error matches what we are expecting. */ function assertError($error, $group, $function, $file, $message = NULL) { - $this->assertEqual($error['group'], $group, t("Group was %group", array('%group' => $group))); - $this->assertEqual($error['caller']['function'], $function, t("Function was %function", array('%function' => $function))); - $this->assertEqual(drupal_basename($error['caller']['file']), $file, t("File was %file", array('%file' => $file))); + $this->assertEqual($error['group'], $group, format_string("Group was %group", array('%group' => $group))); + $this->assertEqual($error['caller']['function'], $function, format_string("Function was %function", array('%function' => $function))); + $this->assertEqual(drupal_basename($error['caller']['file']), $file, format_string("File was %file", array('%file' => $file))); if (isset($message)) { - $this->assertEqual($error['message'], $message, t("Message was %message", array('%message' => $message))); + $this->assertEqual($error['message'], $message, format_string("Message was %message", array('%message' => $message))); } } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/SystemListingTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/SystemListingTest.php index ad4266c..5c57009 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/SystemListingTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/SystemListingTest.php @@ -49,7 +49,7 @@ class SystemListingTest extends WebTestBase { foreach ($expected_directories as $module => $directories) { foreach ($directories as $directory) { $filename = "$directory/$module/$module.module"; - $this->assertTrue(file_exists(DRUPAL_ROOT . '/' . $filename), t('@filename exists.', array('@filename' => $filename))); + $this->assertTrue(file_exists(DRUPAL_ROOT . '/' . $filename), format_string('@filename exists.', array('@filename' => $filename))); } } @@ -59,7 +59,7 @@ class SystemListingTest extends WebTestBase { foreach ($expected_directories as $module => $directories) { $expected_directory = array_shift($directories); $expected_filename = "$expected_directory/$module/$module.module"; - $this->assertEqual($files[$module]->uri, $expected_filename, t('Module @module was found at @filename.', array('@module' => $module, '@filename' => $expected_filename))); + $this->assertEqual($files[$module]->uri, $expected_filename, format_string('Module @module was found at @filename.', array('@module' => $module, '@filename' => $expected_filename))); } } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/TableSortExtenderUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/TableSortExtenderUnitTest.php index dbb7d7b..9a39cfc 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/TableSortExtenderUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/TableSortExtenderUnitTest.php @@ -62,7 +62,7 @@ class TableSortExtenderUnitTest extends UnitTestBase { ); $ts = tablesort_init($headers); $this->verbose(strtr('$ts: 
!ts
', array('!ts' => check_plain(var_export($ts, TRUE))))); - $this->assertEqual($ts, $expected_ts, t('Simple table headers sorted correctly.')); + $this->assertEqual($ts, $expected_ts, 'Simple table headers sorted correctly.'); // Test with simple table headers plus $_GET parameters that should _not_ // override the default. @@ -74,7 +74,7 @@ class TableSortExtenderUnitTest extends UnitTestBase { ); $ts = tablesort_init($headers); $this->verbose(strtr('$ts: 
!ts
', array('!ts' => check_plain(var_export($ts, TRUE))))); - $this->assertEqual($ts, $expected_ts, t('Simple table headers plus non-overriding $_GET parameters sorted correctly.')); + $this->assertEqual($ts, $expected_ts, 'Simple table headers plus non-overriding $_GET parameters sorted correctly.'); // Test with simple table headers plus $_GET parameters that _should_ // override the default. @@ -89,7 +89,7 @@ class TableSortExtenderUnitTest extends UnitTestBase { $expected_ts['query'] = array('alpha' => 'beta'); $ts = tablesort_init($headers); $this->verbose(strtr('$ts: 
!ts
', array('!ts' => check_plain(var_export($ts, TRUE))))); - $this->assertEqual($ts, $expected_ts, t('Simple table headers plus $_GET parameters sorted correctly.')); + $this->assertEqual($ts, $expected_ts, 'Simple table headers plus $_GET parameters sorted correctly.'); // Test complex table headers. @@ -119,7 +119,7 @@ class TableSortExtenderUnitTest extends UnitTestBase { 'query' => array(), ); $this->verbose(strtr('$ts: 
!ts
', array('!ts' => check_plain(var_export($ts, TRUE))))); - $this->assertEqual($ts, $expected_ts, t('Complex table headers sorted correctly.')); + $this->assertEqual($ts, $expected_ts, 'Complex table headers sorted correctly.'); // Test complex table headers plus $_GET parameters that should _not_ // override the default. @@ -137,7 +137,7 @@ class TableSortExtenderUnitTest extends UnitTestBase { 'query' => array(), ); $this->verbose(strtr('$ts: 
!ts
', array('!ts' => check_plain(var_export($ts, TRUE))))); - $this->assertEqual($ts, $expected_ts, t('Complex table headers plus non-overriding $_GET parameters sorted correctly.')); + $this->assertEqual($ts, $expected_ts, 'Complex table headers plus non-overriding $_GET parameters sorted correctly.'); unset($_GET['sort'], $_GET['order'], $_GET['alpha']); // Test complex table headers plus $_GET parameters that _should_ @@ -158,7 +158,7 @@ class TableSortExtenderUnitTest extends UnitTestBase { ); $ts = tablesort_init($headers); $this->verbose(strtr('$ts: 
!ts
', array('!ts' => check_plain(var_export($ts, TRUE))))); - $this->assertEqual($ts, $expected_ts, t('Complex table headers plus $_GET parameters sorted correctly.')); + $this->assertEqual($ts, $expected_ts, 'Complex table headers plus $_GET parameters sorted correctly.'); unset($_GET['sort'], $_GET['order'], $_GET['alpha']); } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php index 131ce25..d178709 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php @@ -32,7 +32,7 @@ class UrlTest extends WebTestBase { $path = ""; $link = l($text, $path); $sanitized_path = check_url(url($path)); - $this->assertTrue(strpos($link, $sanitized_path) !== FALSE, t('XSS attack @path was filtered', array('@path' => $path))); + $this->assertTrue(strpos($link, $sanitized_path) !== FALSE, format_string('XSS attack @path was filtered', array('@path' => $path))); } /* @@ -40,7 +40,7 @@ class UrlTest extends WebTestBase { */ function testLActiveClass() { $link = l($this->randomName(), current_path()); - $this->assertTrue($this->hasClass($link, 'active'), t('Class @class is present on link to the current page', array('@class' => 'active'))); + $this->assertTrue($this->hasClass($link, 'active'), format_string('Class @class is present on link to the current page', array('@class' => 'active'))); } /** @@ -49,8 +49,8 @@ class UrlTest extends WebTestBase { function testLCustomClass() { $class = $this->randomName(); $link = l($this->randomName(), current_path(), array('attributes' => array('class' => array($class)))); - $this->assertTrue($this->hasClass($link, $class), t('Custom class @class is present on link when requested', array('@class' => $class))); - $this->assertTrue($this->hasClass($link, 'active'), t('Class @class is present on link to the current page', array('@class' => 'active'))); + $this->assertTrue($this->hasClass($link, $class), format_string('Custom class @class is present on link when requested', array('@class' => $class))); + $this->assertTrue($this->hasClass($link, 'active'), format_string('Class @class is present on link to the current page', array('@class' => 'active'))); } private function hasClass($link, $class) { @@ -75,32 +75,32 @@ class UrlTest extends WebTestBase { // First-level exclusion. $result = $original; unset($result['b']); - $this->assertEqual(drupal_get_query_parameters($original, array('b')), $result, t("'b' was removed.")); + $this->assertEqual(drupal_get_query_parameters($original, array('b')), $result, "'b' was removed."); // Second-level exclusion. $result = $original; unset($result['b']['d']); - $this->assertEqual(drupal_get_query_parameters($original, array('b[d]')), $result, t("'b[d]' was removed.")); + $this->assertEqual(drupal_get_query_parameters($original, array('b[d]')), $result, "'b[d]' was removed."); // Third-level exclusion. $result = $original; unset($result['b']['e']['f']); - $this->assertEqual(drupal_get_query_parameters($original, array('b[e][f]')), $result, t("'b[e][f]' was removed.")); + $this->assertEqual(drupal_get_query_parameters($original, array('b[e][f]')), $result, "'b[e][f]' was removed."); // Multiple exclusions. $result = $original; unset($result['a'], $result['b']['e'], $result['c']); - $this->assertEqual(drupal_get_query_parameters($original, array('a', 'b[e]', 'c')), $result, t("'a', 'b[e]', 'c' were removed.")); + $this->assertEqual(drupal_get_query_parameters($original, array('a', 'b[e]', 'c')), $result, "'a', 'b[e]', 'c' were removed."); } /** * Test drupal_http_build_query(). */ function testDrupalHttpBuildQuery() { - $this->assertEqual(drupal_http_build_query(array('a' => ' &#//+%20@۞')), 'a=%20%26%23//%2B%2520%40%DB%9E', t('Value was properly encoded.')); - $this->assertEqual(drupal_http_build_query(array(' &#//+%20@۞' => 'a')), '%20%26%23%2F%2F%2B%2520%40%DB%9E=a', t('Key was properly encoded.')); - $this->assertEqual(drupal_http_build_query(array('a' => '1', 'b' => '2', 'c' => '3')), 'a=1&b=2&c=3', t('Multiple values were properly concatenated.')); - $this->assertEqual(drupal_http_build_query(array('a' => array('b' => '2', 'c' => '3'), 'd' => 'foo')), 'a[b]=2&a[c]=3&d=foo', t('Nested array was properly encoded.')); + $this->assertEqual(drupal_http_build_query(array('a' => ' &#//+%20@۞')), 'a=%20%26%23//%2B%2520%40%DB%9E', 'Value was properly encoded.'); + $this->assertEqual(drupal_http_build_query(array(' &#//+%20@۞' => 'a')), '%20%26%23%2F%2F%2B%2520%40%DB%9E=a', 'Key was properly encoded.'); + $this->assertEqual(drupal_http_build_query(array('a' => '1', 'b' => '2', 'c' => '3')), 'a=1&b=2&c=3', 'Multiple values were properly concatenated.'); + $this->assertEqual(drupal_http_build_query(array('a' => array('b' => '2', 'c' => '3'), 'd' => 'foo')), 'a[b]=2&a[c]=3&d=foo', 'Nested array was properly encoded.'); } /** @@ -118,7 +118,7 @@ class UrlTest extends WebTestBase { 'query' => array('foo' => 'bar', 'bar' => 'baz', 'baz' => ''), 'fragment' => 'foo', ); - $this->assertEqual(drupal_parse_url($url), $expected, t('URL parsed correctly.')); + $this->assertEqual(drupal_parse_url($url), $expected, 'URL parsed correctly.'); } } } @@ -130,15 +130,15 @@ class UrlTest extends WebTestBase { 'query' => array(), 'fragment' => '', ); - $this->assertEqual(drupal_parse_url($url), $result, t('Relative URL parsed correctly.')); + $this->assertEqual(drupal_parse_url($url), $result, 'Relative URL parsed correctly.'); // Test that drupal can recognize an absolute URL. Used to prevent attack vectors. $url = 'http://drupal.org/foo/bar?foo=bar&bar=baz&baz#foo'; - $this->assertTrue(url_is_external($url), t('Correctly identified an external URL.')); + $this->assertTrue(url_is_external($url), 'Correctly identified an external URL.'); // Test that drupal_parse_url() does not allow spoofing a URL to force a malicious redirect. $parts = drupal_parse_url('forged:http://cwe.mitre.org/data/definitions/601.html'); - $this->assertFalse(valid_url($parts['path'], TRUE), t('drupal_parse_url() correctly parsed a forged URL.')); + $this->assertFalse(valid_url($parts['path'], TRUE), 'drupal_parse_url() correctly parsed a forged URL.'); } /** @@ -192,29 +192,29 @@ class UrlTest extends WebTestBase { // Verify external URL can contain a fragment. $url = $test_url . '#drupal'; $result = url($url); - $this->assertEqual($url, $result, t('External URL with fragment works without a fragment in $options.')); + $this->assertEqual($url, $result, 'External URL with fragment works without a fragment in $options.'); // Verify fragment can be overidden in an external URL. $url = $test_url . '#drupal'; $fragment = $this->randomName(10); $result = url($url, array('fragment' => $fragment)); - $this->assertEqual($test_url . '#' . $fragment, $result, t('External URL fragment is overidden with a custom fragment in $options.')); + $this->assertEqual($test_url . '#' . $fragment, $result, 'External URL fragment is overidden with a custom fragment in $options.'); // Verify external URL can contain a query string. $url = $test_url . '?drupal=awesome'; $result = url($url); - $this->assertEqual($url, $result, t('External URL with query string works without a query string in $options.')); + $this->assertEqual($url, $result, 'External URL with query string works without a query string in $options.'); // Verify external URL can be extended with a query string. $url = $test_url; $query = array($this->randomName(5) => $this->randomName(5)); $result = url($url, array('query' => $query)); - $this->assertEqual($url . '?' . http_build_query($query, '', '&'), $result, t('External URL can be extended with a query string in $options.')); + $this->assertEqual($url . '?' . http_build_query($query, '', '&'), $result, 'External URL can be extended with a query string in $options.'); // Verify query string can be extended in an external URL. $url = $test_url . '?drupal=awesome'; $query = array($this->randomName(5) => $this->randomName(5)); $result = url($url, array('query' => $query)); - $this->assertEqual($url . '&' . http_build_query($query, '', '&'), $result, t('External URL query string can be extended with a custom query string in $options.')); + $this->assertEqual($url . '&' . http_build_query($query, '', '&'), $result, 'External URL query string can be extended with a custom query string in $options.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/ValidUrlUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/ValidUrlUnitTest.php index 27d0061..bc9b6a9 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/ValidUrlUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/ValidUrlUnitTest.php @@ -51,7 +51,7 @@ class ValidUrlUnitTest extends UnitTestBase { foreach ($valid_absolute_urls as $url) { $test_url = $scheme . '://' . $url; $valid_url = valid_url($test_url, TRUE); - $this->assertTrue($valid_url, t('@url is a valid URL.', array('@url' => $test_url))); + $this->assertTrue($valid_url, format_string('@url is a valid URL.', array('@url' => $test_url))); } } } @@ -71,7 +71,7 @@ class ValidUrlUnitTest extends UnitTestBase { foreach ($invalid_ablosule_urls as $url) { $test_url = $scheme . '://' . $url; $valid_url = valid_url($test_url, TRUE); - $this->assertFalse($valid_url, t('@url is NOT a valid URL.', array('@url' => $test_url))); + $this->assertFalse($valid_url, format_string('@url is NOT a valid URL.', array('@url' => $test_url))); } } } @@ -92,7 +92,7 @@ class ValidUrlUnitTest extends UnitTestBase { foreach ($valid_relative_urls as $url) { $test_url = $front . $url; $valid_url = valid_url($test_url); - $this->assertTrue($valid_url, t('@url is a valid URL.', array('@url' => $test_url))); + $this->assertTrue($valid_url, format_string('@url is a valid URL.', array('@url' => $test_url))); } } } @@ -111,7 +111,7 @@ class ValidUrlUnitTest extends UnitTestBase { foreach ($invalid_relative_urls as $url) { $test_url = $front . $url; $valid_url = valid_url($test_url); - $this->assertFALSE($valid_url, t('@url is NOT a valid URL.', array('@url' => $test_url))); + $this->assertFALSE($valid_url, format_string('@url is NOT a valid URL.', array('@url' => $test_url))); } } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/WriteRecordTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/WriteRecordTest.php index e032437..8aee0ef 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/WriteRecordTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/WriteRecordTest.php @@ -37,37 +37,37 @@ class WriteRecordTest extends WebTestBase { // Insert a record with no columns populated. $record = array(); $insert_result = drupal_write_record('test', $record); - $this->assertTrue($insert_result == SAVED_NEW, t('Correct value returned when an empty record is inserted with drupal_write_record().')); + $this->assertTrue($insert_result == SAVED_NEW, 'Correct value returned when an empty record is inserted with drupal_write_record().'); // Insert a record - no columns allow NULL values. $person = new stdClass(); $person->name = 'John'; $person->unknown_column = 123; $insert_result = drupal_write_record('test', $person); - $this->assertTrue($insert_result == SAVED_NEW, t('Correct value returned when a record is inserted with drupal_write_record() for a table with a single-field primary key.')); - $this->assertTrue(isset($person->id), t('Primary key is set on record created with drupal_write_record().')); - $this->assertIdentical($person->age, 0, t('Age field set to default value.')); - $this->assertIdentical($person->job, 'Undefined', t('Job field set to default value.')); + $this->assertTrue($insert_result == SAVED_NEW, 'Correct value returned when a record is inserted with drupal_write_record() for a table with a single-field primary key.'); + $this->assertTrue(isset($person->id), 'Primary key is set on record created with drupal_write_record().'); + $this->assertIdentical($person->age, 0, 'Age field set to default value.'); + $this->assertIdentical($person->job, 'Undefined', 'Job field set to default value.'); // Verify that the record was inserted. $result = db_query("SELECT * FROM {test} WHERE id = :id", array(':id' => $person->id))->fetchObject(); - $this->assertIdentical($result->name, 'John', t('Name field set.')); - $this->assertIdentical($result->age, '0', t('Age field set to default value.')); - $this->assertIdentical($result->job, 'Undefined', t('Job field set to default value.')); - $this->assertFalse(isset($result->unknown_column), t('Unknown column was ignored.')); + $this->assertIdentical($result->name, 'John', 'Name field set.'); + $this->assertIdentical($result->age, '0', 'Age field set to default value.'); + $this->assertIdentical($result->job, 'Undefined', 'Job field set to default value.'); + $this->assertFalse(isset($result->unknown_column), 'Unknown column was ignored.'); // Update the newly created record. $person->name = 'Peter'; $person->age = 27; $person->job = NULL; $update_result = drupal_write_record('test', $person, array('id')); - $this->assertTrue($update_result == SAVED_UPDATED, t('Correct value returned when a record updated with drupal_write_record() for table with single-field primary key.')); + $this->assertTrue($update_result == SAVED_UPDATED, 'Correct value returned when a record updated with drupal_write_record() for table with single-field primary key.'); // Verify that the record was updated. $result = db_query("SELECT * FROM {test} WHERE id = :id", array(':id' => $person->id))->fetchObject(); - $this->assertIdentical($result->name, 'Peter', t('Name field set.')); - $this->assertIdentical($result->age, '27', t('Age field set.')); - $this->assertIdentical($result->job, '', t('Job field set and cast to string.')); + $this->assertIdentical($result->name, 'Peter', 'Name field set.'); + $this->assertIdentical($result->age, '27', 'Age field set.'); + $this->assertIdentical($result->job, '', 'Job field set and cast to string.'); // Try to insert NULL in columns that does not allow this. $person = new stdClass(); @@ -75,65 +75,65 @@ class WriteRecordTest extends WebTestBase { $person->age = NULL; $person->job = NULL; $insert_result = drupal_write_record('test', $person); - $this->assertTrue(isset($person->id), t('Primary key is set on record created with drupal_write_record().')); + $this->assertTrue(isset($person->id), 'Primary key is set on record created with drupal_write_record().'); $result = db_query("SELECT * FROM {test} WHERE id = :id", array(':id' => $person->id))->fetchObject(); - $this->assertIdentical($result->name, 'Ringo', t('Name field set.')); - $this->assertIdentical($result->age, '0', t('Age field set.')); - $this->assertIdentical($result->job, '', t('Job field set.')); + $this->assertIdentical($result->name, 'Ringo', 'Name field set.'); + $this->assertIdentical($result->age, '0', 'Age field set.'); + $this->assertIdentical($result->job, '', 'Job field set.'); // Insert a record - the "age" column allows NULL. $person = new stdClass(); $person->name = 'Paul'; $person->age = NULL; $insert_result = drupal_write_record('test_null', $person); - $this->assertTrue(isset($person->id), t('Primary key is set on record created with drupal_write_record().')); + $this->assertTrue(isset($person->id), 'Primary key is set on record created with drupal_write_record().'); $result = db_query("SELECT * FROM {test_null} WHERE id = :id", array(':id' => $person->id))->fetchObject(); - $this->assertIdentical($result->name, 'Paul', t('Name field set.')); - $this->assertIdentical($result->age, NULL, t('Age field set.')); + $this->assertIdentical($result->name, 'Paul', 'Name field set.'); + $this->assertIdentical($result->age, NULL, 'Age field set.'); // Insert a record - do not specify the value of a column that allows NULL. $person = new stdClass(); $person->name = 'Meredith'; $insert_result = drupal_write_record('test_null', $person); - $this->assertTrue(isset($person->id), t('Primary key is set on record created with drupal_write_record().')); - $this->assertIdentical($person->age, 0, t('Age field set to default value.')); + $this->assertTrue(isset($person->id), 'Primary key is set on record created with drupal_write_record().'); + $this->assertIdentical($person->age, 0, 'Age field set to default value.'); $result = db_query("SELECT * FROM {test_null} WHERE id = :id", array(':id' => $person->id))->fetchObject(); - $this->assertIdentical($result->name, 'Meredith', t('Name field set.')); - $this->assertIdentical($result->age, '0', t('Age field set to default value.')); + $this->assertIdentical($result->name, 'Meredith', 'Name field set.'); + $this->assertIdentical($result->age, '0', 'Age field set to default value.'); // Update the newly created record. $person->name = 'Mary'; $person->age = NULL; $update_result = drupal_write_record('test_null', $person, array('id')); $result = db_query("SELECT * FROM {test_null} WHERE id = :id", array(':id' => $person->id))->fetchObject(); - $this->assertIdentical($result->name, 'Mary', t('Name field set.')); - $this->assertIdentical($result->age, NULL, t('Age field set.')); + $this->assertIdentical($result->name, 'Mary', 'Name field set.'); + $this->assertIdentical($result->age, NULL, 'Age field set.'); // Insert a record - the "data" column should be serialized. $person = new stdClass(); $person->name = 'Dave'; $update_result = drupal_write_record('test_serialized', $person); $result = db_query("SELECT * FROM {test_serialized} WHERE id = :id", array(':id' => $person->id))->fetchObject(); - $this->assertIdentical($result->name, 'Dave', t('Name field set.')); - $this->assertIdentical($result->info, NULL, t('Info field set.')); + $this->assertIdentical($result->name, 'Dave', 'Name field set.'); + $this->assertIdentical($result->info, NULL, 'Info field set.'); $person->info = array(); $update_result = drupal_write_record('test_serialized', $person, array('id')); $result = db_query("SELECT * FROM {test_serialized} WHERE id = :id", array(':id' => $person->id))->fetchObject(); - $this->assertIdentical(unserialize($result->info), array(), t('Info field updated.')); + $this->assertIdentical(unserialize($result->info), array(), 'Info field updated.'); // Update the serialized record. $data = array('foo' => 'bar', 1 => 2, 'empty' => '', 'null' => NULL); $person->info = $data; $update_result = drupal_write_record('test_serialized', $person, array('id')); $result = db_query("SELECT * FROM {test_serialized} WHERE id = :id", array(':id' => $person->id))->fetchObject(); - $this->assertIdentical(unserialize($result->info), $data, t('Info field updated.')); + $this->assertIdentical(unserialize($result->info), $data, 'Info field updated.'); // Run an update query where no field values are changed. The database // layer should return zero for number of affected rows, but // db_write_record() should still return SAVED_UPDATED. $update_result = drupal_write_record('test_null', $person, array('id')); - $this->assertTrue($update_result == SAVED_UPDATED, t('Correct value returned when a valid update is run without changing any values.')); + $this->assertTrue($update_result == SAVED_UPDATED, 'Correct value returned when a valid update is run without changing any values.'); // Insert an object record for a table with a multi-field primary key. $node_access = new stdClass(); @@ -141,11 +141,11 @@ class WriteRecordTest extends WebTestBase { $node_access->gid = mt_rand(); $node_access->realm = $this->randomName(); $insert_result = drupal_write_record('node_access', $node_access); - $this->assertTrue($insert_result == SAVED_NEW, t('Correct value returned when a record is inserted with drupal_write_record() for a table with a multi-field primary key.')); + $this->assertTrue($insert_result == SAVED_NEW, 'Correct value returned when a record is inserted with drupal_write_record() for a table with a multi-field primary key.'); // Update the record. $update_result = drupal_write_record('node_access', $node_access, array('nid', 'gid', 'realm')); - $this->assertTrue($update_result == SAVED_UPDATED, t('Correct value returned when a record is updated with drupal_write_record() for a table with a multi-field primary key.')); + $this->assertTrue($update_result == SAVED_UPDATED, 'Correct value returned when a record is updated with drupal_write_record() for a table with a multi-field primary key.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/XssUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/XssUnitTest.php index df30fa2..008491d 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/XssUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/XssUnitTest.php @@ -76,7 +76,7 @@ class XssUnitTest extends UnitTestBase { $url = 'javascript:http://www.example.com/?x=1&y=2'; $expected_plain = 'http://www.example.com/?x=1&y=2'; $expected_html = 'http://www.example.com/?x=1&y=2'; - $this->assertIdentical(check_url($url), $expected_html, t('check_url() filters a URL and encodes it for HTML.')); - $this->assertIdentical(drupal_strip_dangerous_protocols($url), $expected_plain, t('drupal_strip_dangerous_protocols() filters a URL and returns plain text.')); + $this->assertIdentical(check_url($url), $expected_html, 'check_url() filters a URL and encodes it for HTML.'); + $this->assertIdentical(drupal_strip_dangerous_protocols($url), $expected_plain, 'drupal_strip_dangerous_protocols() filters a URL and returns plain text.'); } } -- 1.7.6.msysgit.0