-
-
-
';
$this->drupalPost('admin/config/content/formats/' . $filtered, $edit, t('Save configuration'));
- $this->assertFieldByName('filters[filter_html][settings][allowed_html]', $edit['filters[filter_html][settings][allowed_html]'], t('Allowed HTML tag added.'));
+ $this->assertFieldByName('filters[filter_html][settings][allowed_html]', $edit['filters[filter_html][settings][allowed_html]'], 'Allowed HTML tag added.');
$result = db_query('SELECT * FROM {cache_filter}')->fetchObject();
- $this->assertFalse($result, t('Cache cleared.'));
+ $this->assertFalse($result, 'Cache cleared.');
$elements = $this->xpath('//select[@name=:first]/following::select[@name=:second]', array(
':first' => 'filters[' . $first_filter . '][weight]',
':second' => 'filters[' . $second_filter . '][weight]',
));
- $this->assertTrue(!empty($elements), t('Order confirmed in admin interface.'));
+ $this->assertTrue(!empty($elements), 'Order confirmed in admin interface.');
// Reorder filters.
$edit = array();
$edit['filters[' . $second_filter . '][weight]'] = 1;
$edit['filters[' . $first_filter . '][weight]'] = 2;
$this->drupalPost(NULL, $edit, t('Save configuration'));
- $this->assertFieldByName('filters[' . $second_filter . '][weight]', 1, t('Order saved successfully.'));
- $this->assertFieldByName('filters[' . $first_filter . '][weight]', 2, t('Order saved successfully.'));
+ $this->assertFieldByName('filters[' . $second_filter . '][weight]', 1, 'Order saved successfully.');
+ $this->assertFieldByName('filters[' . $first_filter . '][weight]', 2, 'Order saved successfully.');
$elements = $this->xpath('//select[@name=:first]/following::select[@name=:second]', array(
':first' => 'filters[' . $second_filter . '][weight]',
':second' => 'filters[' . $first_filter . '][weight]',
));
- $this->assertTrue(!empty($elements), t('Reorder confirmed in admin interface.'));
+ $this->assertTrue(!empty($elements), 'Reorder confirmed in admin interface.');
$result = db_query('SELECT * FROM {filter} WHERE format = :format ORDER BY weight ASC', array(':format' => $filtered));
$filters = array();
@@ -159,7 +159,7 @@ class FilterAdminTest extends WebTestBase {
$filters[] = $filter;
}
}
- $this->assertTrue(($filters[0]->name == $second_filter && $filters[1]->name == $first_filter), t('Order confirmed in database.'));
+ $this->assertTrue(($filters[0]->name == $second_filter && $filters[1]->name == $first_filter), 'Order confirmed in database.');
// Add format.
$edit = array();
@@ -169,19 +169,19 @@ class FilterAdminTest extends WebTestBase {
$edit['filters[' . $second_filter . '][status]'] = TRUE;
$edit['filters[' . $first_filter . '][status]'] = TRUE;
$this->drupalPost('admin/config/content/formats/add', $edit, t('Save configuration'));
- $this->assertRaw(t('Added text format %format.', array('%format' => $edit['name'])), t('New filter created.'));
+ $this->assertRaw(t('Added text format %format.', array('%format' => $edit['name'])), 'New filter created.');
drupal_static_reset('filter_formats');
$format = filter_format_load($edit['format']);
- $this->assertNotNull($format, t('Format found in database.'));
+ $this->assertNotNull($format, 'Format found in database.');
- $this->assertFieldByName('roles[' . DRUPAL_AUTHENTICATED_RID . ']', '', t('Role found.'));
- $this->assertFieldByName('filters[' . $second_filter . '][status]', '', t('Line break filter found.'));
- $this->assertFieldByName('filters[' . $first_filter . '][status]', '', t('Url filter found.'));
+ $this->assertFieldByName('roles[' . DRUPAL_AUTHENTICATED_RID . ']', '', 'Role found.');
+ $this->assertFieldByName('filters[' . $second_filter . '][status]', '', 'Line break filter found.');
+ $this->assertFieldByName('filters[' . $first_filter . '][status]', '', 'Url filter found.');
// Disable new filter.
$this->drupalPost('admin/config/content/formats/' . $format->format . '/disable', array(), t('Disable'));
- $this->assertRaw(t('Disabled text format %format.', array('%format' => $edit['name'])), t('Format successfully disabled.'));
+ $this->assertRaw(t('Disabled text format %format.', array('%format' => $edit['name'])), 'Format successfully disabled.');
// Allow authenticated users on full HTML.
$format = filter_format_load($full);
@@ -189,14 +189,14 @@ class FilterAdminTest extends WebTestBase {
$edit['roles[' . DRUPAL_ANONYMOUS_RID . ']'] = 0;
$edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'] = 1;
$this->drupalPost('admin/config/content/formats/' . $full, $edit, t('Save configuration'));
- $this->assertRaw(t('The text format %format has been updated.', array('%format' => $format->name)), t('Full HTML format successfully updated.'));
+ $this->assertRaw(t('The text format %format has been updated.', array('%format' => $format->name)), 'Full HTML format successfully updated.');
// Switch user.
$this->drupalLogout();
$this->drupalLogin($this->web_user);
$this->drupalGet('node/add/page');
- $this->assertRaw('', t('Full HTML filter accessible.'));
+ $this->assertRaw('', 'Full HTML filter accessible.');
// Use filtered HTML and see if it removes tags that are not allowed.
$body = '' . $this->randomName() . '';
@@ -209,20 +209,20 @@ class FilterAdminTest extends WebTestBase {
$edit["body[$langcode][0][value]"] = $text;
$edit["body[$langcode][0][format]"] = $filtered;
$this->drupalPost('node/add/page', $edit, t('Save'));
- $this->assertRaw(t('Basic page %title has been created.', array('%title' => $edit["title"])), t('Filtered node created.'));
+ $this->assertRaw(t('Basic page %title has been created.', array('%title' => $edit["title"])), 'Filtered node created.');
$node = $this->drupalGetNodeByTitle($edit["title"]);
- $this->assertTrue($node, t('Node found in database.'));
+ $this->assertTrue($node, 'Node found in database.');
$this->drupalGet('node/' . $node->nid);
- $this->assertRaw($body . $extra_text, t('Filter removed invalid tag.'));
+ $this->assertRaw($body . $extra_text, 'Filter removed invalid tag.');
// Use plain text and see if it escapes all tags, whether allowed or not.
$edit = array();
$edit["body[$langcode][0][format]"] = $plain;
$this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
$this->drupalGet('node/' . $node->nid);
- $this->assertText(check_plain($text), t('The "Plain text" text format escapes all HTML tags.'));
+ $this->assertText(check_plain($text), 'The "Plain text" text format escapes all HTML tags.');
// Switch user.
$this->drupalLogout();
@@ -233,22 +233,22 @@ class FilterAdminTest extends WebTestBase {
$edit = array();
$edit['filters[filter_html][settings][allowed_html]'] = ' -
-
- ';
$this->drupalPost('admin/config/content/formats/' . $filtered, $edit, t('Save configuration'));
- $this->assertFieldByName('filters[filter_html][settings][allowed_html]', $edit['filters[filter_html][settings][allowed_html]'], t('Changes reverted.'));
+ $this->assertFieldByName('filters[filter_html][settings][allowed_html]', $edit['filters[filter_html][settings][allowed_html]'], 'Changes reverted.');
// Full HTML.
$edit = array();
$edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'] = FALSE;
$this->drupalPost('admin/config/content/formats/' . $full, $edit, t('Save configuration'));
- $this->assertRaw(t('The text format %format has been updated.', array('%format' => $format->name)), t('Full HTML format successfully reverted.'));
- $this->assertFieldByName('roles[' . DRUPAL_AUTHENTICATED_RID . ']', $edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'], t('Changes reverted.'));
+ $this->assertRaw(t('The text format %format has been updated.', array('%format' => $format->name)), 'Full HTML format successfully reverted.');
+ $this->assertFieldByName('roles[' . DRUPAL_AUTHENTICATED_RID . ']', $edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'], 'Changes reverted.');
// Filter order.
$edit = array();
$edit['filters[' . $second_filter . '][weight]'] = 2;
$edit['filters[' . $first_filter . '][weight]'] = 1;
$this->drupalPost('admin/config/content/formats/' . $filtered, $edit, t('Save configuration'));
- $this->assertFieldByName('filters[' . $second_filter . '][weight]', $edit['filters[' . $second_filter . '][weight]'], t('Changes reverted.'));
- $this->assertFieldByName('filters[' . $first_filter . '][weight]', $edit['filters[' . $first_filter . '][weight]'], t('Changes reverted.'));
+ $this->assertFieldByName('filters[' . $second_filter . '][weight]', $edit['filters[' . $second_filter . '][weight]'], 'Changes reverted.');
+ $this->assertFieldByName('filters[' . $first_filter . '][weight]', $edit['filters[' . $first_filter . '][weight]'], 'Changes reverted.');
}
/**
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterCrudTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterCrudTest.php
index 32c706b..5c5a34b 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterCrudTest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterCrudTest.php
@@ -72,9 +72,9 @@ class FilterCrudTest extends WebTestBase {
filter_format_disable($format);
$db_format = db_query("SELECT * FROM {filter_format} WHERE format = :format", array(':format' => $format->format))->fetchObject();
- $this->assertFalse($db_format->status, t('Database: Disabled text format is marked as disabled.'));
+ $this->assertFalse($db_format->status, 'Database: Disabled text format is marked as disabled.');
$formats = filter_formats();
- $this->assertTrue(!isset($formats[$format->format]), t('filter_formats: Disabled text format no longer exists.'));
+ $this->assertTrue(!isset($formats[$format->format]), 'filter_formats: Disabled text format no longer exists.');
}
/**
@@ -112,7 +112,7 @@ class FilterCrudTest extends WebTestBase {
break;
}
}
- $this->assertEqual($filter_format->cache, $cacheable, t('Text format contains proper cache property.'));
+ $this->assertEqual($filter_format->cache, $cacheable, 'Text format contains proper cache property.');
}
/**
@@ -139,7 +139,7 @@ class FilterCrudTest extends WebTestBase {
unset($format_filters[$name]);
}
// Verify that all filters have been processed.
- $this->assertTrue(empty($format_filters), t('Database contains values for all filters in the saved format.'));
+ $this->assertTrue(empty($format_filters), 'Database contains values for all filters in the saved format.');
// Verify filter_list_format().
$filters = filter_list_format($format->format);
@@ -161,6 +161,6 @@ class FilterCrudTest extends WebTestBase {
unset($format_filters[$name]);
}
// Verify that all filters have been processed.
- $this->assertTrue(empty($format_filters), t('filter_list_format: Loaded filters contain values for all filters in the saved format.'));
+ $this->assertTrue(empty($format_filters), 'filter_list_format: Loaded filters contain values for all filters in the saved format.');
}
}
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultFormatTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultFormatTest.php
index d4733bc..140a22b 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultFormatTest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultFormatTest.php
@@ -57,7 +57,7 @@ class FilterDefaultFormatTest extends WebTestBase {
$edit['formats[' . $second_format->format . '][weight]'] = $minimum_weight - 3;
$this->drupalPost('admin/config/content/formats', $edit, t('Save changes'));
$this->resetFilterCaches();
- $this->assertEqual(filter_default_format($first_user), filter_default_format($second_user), t('After the formats are reordered, both users have the same default format.'));
+ $this->assertEqual(filter_default_format($first_user), filter_default_format($second_user), 'After the formats are reordered, both users have the same default format.');
}
/**
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterFormatAccessTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterFormatAccessTest.php
index d6a08c6..32ba88d 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterFormatAccessTest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterFormatAccessTest.php
@@ -72,20 +72,20 @@ class FilterFormatAccessTest extends WebTestBase {
function testFormatPermissions() {
// Make sure that a regular user only has access to the text format they
// were granted access to, as well to the fallback format.
- $this->assertTrue(filter_access($this->allowed_format, $this->web_user), t('A regular user has access to a text format they were granted access to.'));
- $this->assertFalse(filter_access($this->disallowed_format, $this->web_user), t('A regular user does not have access to a text format they were not granted access to.'));
- $this->assertTrue(filter_access(filter_format_load(filter_fallback_format()), $this->web_user), t('A regular user has access to the fallback format.'));
+ $this->assertTrue(filter_access($this->allowed_format, $this->web_user), 'A regular user has access to a text format they were granted access to.');
+ $this->assertFalse(filter_access($this->disallowed_format, $this->web_user), 'A regular user does not have access to a text format they were not granted access to.');
+ $this->assertTrue(filter_access(filter_format_load(filter_fallback_format()), $this->web_user), 'A regular user has access to the fallback format.');
// Perform similar checks as above, but now against the entire list of
// available formats for this user.
- $this->assertTrue(in_array($this->allowed_format->format, array_keys(filter_formats($this->web_user))), t('The allowed format appears in the list of available formats for a regular user.'));
- $this->assertFalse(in_array($this->disallowed_format->format, array_keys(filter_formats($this->web_user))), t('The disallowed format does not appear in the list of available formats for a regular user.'));
- $this->assertTrue(in_array(filter_fallback_format(), array_keys(filter_formats($this->web_user))), t('The fallback format appears in the list of available formats for a regular user.'));
+ $this->assertTrue(in_array($this->allowed_format->format, array_keys(filter_formats($this->web_user))), 'The allowed format appears in the list of available formats for a regular user.');
+ $this->assertFalse(in_array($this->disallowed_format->format, array_keys(filter_formats($this->web_user))), 'The disallowed format does not appear in the list of available formats for a regular user.');
+ $this->assertTrue(in_array(filter_fallback_format(), array_keys(filter_formats($this->web_user))), 'The fallback format appears in the list of available formats for a regular user.');
// Make sure that a regular user only has permission to use the format
// they were granted access to.
- $this->assertTrue(user_access(filter_permission_name($this->allowed_format), $this->web_user), t('A regular user has permission to use the allowed text format.'));
- $this->assertFalse(user_access(filter_permission_name($this->disallowed_format), $this->web_user), t('A regular user does not have permission to use the disallowed text format.'));
+ $this->assertTrue(user_access(filter_permission_name($this->allowed_format), $this->web_user), 'A regular user has permission to use the allowed text format.');
+ $this->assertFalse(user_access(filter_permission_name($this->disallowed_format), $this->web_user), 'A regular user does not have permission to use the disallowed text format.');
// Make sure that the allowed format appears on the node form and that
// the disallowed format does not.
@@ -100,9 +100,9 @@ class FilterFormatAccessTest extends WebTestBase {
foreach ($elements as $element) {
$options[(string) $element['value']] = $element;
}
- $this->assertTrue(isset($options[$this->allowed_format->format]), t('The allowed text format appears as an option when adding a new node.'));
- $this->assertFalse(isset($options[$this->disallowed_format->format]), t('The disallowed text format does not appear as an option when adding a new node.'));
- $this->assertTrue(isset($options[filter_fallback_format()]), t('The fallback format appears as an option when adding a new node.'));
+ $this->assertTrue(isset($options[$this->allowed_format->format]), 'The allowed text format appears as an option when adding a new node.');
+ $this->assertFalse(isset($options[$this->disallowed_format->format]), 'The disallowed text format does not appear as an option when adding a new node.');
+ $this->assertTrue(isset($options[filter_fallback_format()]), 'The fallback format appears as an option when adding a new node.');
}
function testFormatRoles() {
@@ -114,17 +114,17 @@ class FilterFormatAccessTest extends WebTestBase {
// Check that this role appears in the list of roles that have access to an
// allowed text format, but does not appear in the list of roles that have
// access to a disallowed text format.
- $this->assertTrue(in_array($rid, array_keys(filter_get_roles_by_format($this->allowed_format))), t('A role which has access to a text format appears in the list of roles that have access to that format.'));
- $this->assertFalse(in_array($rid, array_keys(filter_get_roles_by_format($this->disallowed_format))), t('A role which does not have access to a text format does not appear in the list of roles that have access to that format.'));
+ $this->assertTrue(in_array($rid, array_keys(filter_get_roles_by_format($this->allowed_format))), 'A role which has access to a text format appears in the list of roles that have access to that format.');
+ $this->assertFalse(in_array($rid, array_keys(filter_get_roles_by_format($this->disallowed_format))), 'A role which does not have access to a text format does not appear in the list of roles that have access to that format.');
// Check that the correct text format appears in the list of formats
// available to that role.
- $this->assertTrue(in_array($this->allowed_format->format, array_keys(filter_get_formats_by_role($rid))), t('A text format which a role has access to appears in the list of formats available to that role.'));
- $this->assertFalse(in_array($this->disallowed_format->format, array_keys(filter_get_formats_by_role($rid))), t('A text format which a role does not have access to does not appear in the list of formats available to that role.'));
+ $this->assertTrue(in_array($this->allowed_format->format, array_keys(filter_get_formats_by_role($rid))), 'A text format which a role has access to appears in the list of formats available to that role.');
+ $this->assertFalse(in_array($this->disallowed_format->format, array_keys(filter_get_formats_by_role($rid))), 'A text format which a role does not have access to does not appear in the list of formats available to that role.');
// Check that the fallback format is always allowed.
- $this->assertEqual(filter_get_roles_by_format(filter_format_load(filter_fallback_format())), user_roles(), t('All roles have access to the fallback format.'));
- $this->assertTrue(in_array(filter_fallback_format(), array_keys(filter_get_formats_by_role($rid))), t('The fallback format appears in the list of allowed formats for any role.'));
+ $this->assertEqual(filter_get_roles_by_format(filter_format_load(filter_fallback_format())), user_roles(), 'All roles have access to the fallback format.');
+ $this->assertTrue(in_array(filter_fallback_format(), array_keys(filter_get_formats_by_role($rid))), 'The fallback format appears in the list of allowed formats for any role.');
}
/**
@@ -157,19 +157,19 @@ class FilterFormatAccessTest extends WebTestBase {
$this->clickLink(t('Edit'));
// Verify that body field is read-only and contains replacement value.
- $this->assertFieldByXPath("//textarea[@name='$body_value_key' and @disabled='disabled']", t('This field has been disabled because you do not have sufficient permissions to edit it.'), t('Text format access denied message found.'));
+ $this->assertFieldByXPath("//textarea[@name='$body_value_key' and @disabled='disabled']", t('This field has been disabled because you do not have sufficient permissions to edit it.'), 'Text format access denied message found.');
// Verify that title can be changed, but preview displays original body.
$new_edit = array();
$new_edit['title'] = $this->randomName(8);
$this->drupalPost(NULL, $new_edit, t('Preview'));
- $this->assertText($edit[$body_value_key], t('Old body found in preview.'));
+ $this->assertText($edit[$body_value_key], 'Old body found in preview.');
// Save and verify that only the title was changed.
$this->drupalPost(NULL, $new_edit, t('Save'));
- $this->assertNoText($edit['title'], t('Old title not found.'));
- $this->assertText($new_edit['title'], t('New title found.'));
- $this->assertText($edit[$body_value_key], t('Old body found.'));
+ $this->assertNoText($edit['title'], 'Old title not found.');
+ $this->assertText($new_edit['title'], 'New title found.');
+ $this->assertText($edit[$body_value_key], 'Old body found.');
// Check that even an administrator with "administer filters" permission
// cannot edit the body field if they do not have specific permission to
@@ -178,7 +178,7 @@ class FilterFormatAccessTest extends WebTestBase {
// else.)
$this->drupalLogin($this->filter_admin_user);
$this->drupalGet('node/' . $node->nid . '/edit');
- $this->assertFieldByXPath("//textarea[@name='$body_value_key' and @disabled='disabled']", t('This field has been disabled because you do not have sufficient permissions to edit it.'), t('Text format access denied message found.'));
+ $this->assertFieldByXPath("//textarea[@name='$body_value_key' and @disabled='disabled']", t('This field has been disabled because you do not have sufficient permissions to edit it.'), 'Text format access denied message found.');
// Disable the text format used above.
filter_format_disable($this->disallowed_format);
@@ -189,14 +189,14 @@ class FilterFormatAccessTest extends WebTestBase {
// edit content that does not have an assigned format.
$this->drupalLogin($this->web_user);
$this->drupalGet('node/' . $node->nid . '/edit');
- $this->assertFieldByXPath("//textarea[@name='$body_value_key' and @disabled='disabled']", t('This field has been disabled because you do not have sufficient permissions to edit it.'), t('Text format access denied message found.'));
+ $this->assertFieldByXPath("//textarea[@name='$body_value_key' and @disabled='disabled']", t('This field has been disabled because you do not have sufficient permissions to edit it.'), 'Text format access denied message found.');
// Log back in as the filter administrator and verify that the body field
// can be edited.
$this->drupalLogin($this->filter_admin_user);
$this->drupalGet('node/' . $node->nid . '/edit');
- $this->assertNoFieldByXPath("//textarea[@name='$body_value_key' and @disabled='disabled']", NULL, t('Text format access denied message not found.'));
- $this->assertFieldByXPath("//select[@name='$body_format_key']", NULL, t('Text format selector found.'));
+ $this->assertNoFieldByXPath("//textarea[@name='$body_value_key' and @disabled='disabled']", NULL, 'Text format access denied message not found.');
+ $this->assertFieldByXPath("//select[@name='$body_format_key']", NULL, 'Text format selector found.');
// Verify that trying to save the node without selecting a new text format
// produces an error message, and does not result in the node being saved.
@@ -204,17 +204,17 @@ class FilterFormatAccessTest extends WebTestBase {
$new_title = $this->randomName(8);
$edit = array('title' => $new_title);
$this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
- $this->assertText(t('!name field is required.', array('!name' => t('Text format'))), t('Error message is displayed.'));
+ $this->assertText(t('!name field is required.', array('!name' => t('Text format'))), 'Error message is displayed.');
$this->drupalGet('node/' . $node->nid);
- $this->assertText($old_title, t('Old title found.'));
- $this->assertNoText($new_title, t('New title not found.'));
+ $this->assertText($old_title, 'Old title found.');
+ $this->assertNoText($new_title, 'New title not found.');
// Now select a new text format and make sure the node can be saved.
$edit[$body_format_key] = filter_fallback_format();
$this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
$this->assertUrl('node/' . $node->nid);
- $this->assertText($new_title, t('New title found.'));
- $this->assertNoText($old_title, t('Old title not found.'));
+ $this->assertText($new_title, 'New title found.');
+ $this->assertNoText($old_title, 'Old title not found.');
// Switch the text format to a new one, then disable that format and all
// other formats on the site (leaving only the fallback format).
@@ -238,15 +238,15 @@ class FilterFormatAccessTest extends WebTestBase {
$new_title = $this->randomName(8);
$edit = array('title' => $new_title);
$this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
- $this->assertText(t('!name field is required.', array('!name' => t('Text format'))), t('Error message is displayed.'));
+ $this->assertText(t('!name field is required.', array('!name' => t('Text format'))), 'Error message is displayed.');
$this->drupalGet('node/' . $node->nid);
- $this->assertText($old_title, t('Old title found.'));
- $this->assertNoText($new_title, t('New title not found.'));
+ $this->assertText($old_title, 'Old title found.');
+ $this->assertNoText($new_title, 'New title not found.');
$edit[$body_format_key] = filter_fallback_format();
$this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
$this->assertUrl('node/' . $node->nid);
- $this->assertText($new_title, t('New title found.'));
- $this->assertNoText($old_title, t('Old title not found.'));
+ $this->assertText($new_title, 'New title found.');
+ $this->assertNoText($old_title, 'Old title not found.');
}
/**
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterHooksTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterHooksTest.php
index 2679132..d6bc113 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterHooksTest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterHooksTest.php
@@ -38,8 +38,8 @@ class FilterHooksTest extends WebTestBase {
$edit['name'] = $name;
$edit['roles[' . DRUPAL_ANONYMOUS_RID . ']'] = 1;
$this->drupalPost('admin/config/content/formats/add', $edit, t('Save configuration'));
- $this->assertRaw(t('Added text format %format.', array('%format' => $name)), t('New format created.'));
- $this->assertText('hook_filter_format_insert invoked.', t('hook_filter_format_insert was invoked.'));
+ $this->assertRaw(t('Added text format %format.', array('%format' => $name)), 'New format created.');
+ $this->assertText('hook_filter_format_insert invoked.', 'hook_filter_format_insert was invoked.');
$format_id = $edit['format'];
@@ -47,7 +47,7 @@ class FilterHooksTest extends WebTestBase {
$edit = array();
$edit['roles[' . DRUPAL_AUTHENTICATED_RID . ']'] = 1;
$this->drupalPost('admin/config/content/formats/' . $format_id, $edit, t('Save configuration'));
- $this->assertRaw(t('The text format %format has been updated.', array('%format' => $name)), t('Format successfully updated.'));
+ $this->assertRaw(t('The text format %format has been updated.', array('%format' => $name)), 'Format successfully updated.');
$this->assertText('hook_filter_format_update invoked.', t('hook_filter_format_update() was invoked.'));
// Add a new custom block.
@@ -58,15 +58,15 @@ class FilterHooksTest extends WebTestBase {
// Use the format created.
$custom_block['body[format]'] = $format_id;
$this->drupalPost('admin/structure/block/add', $custom_block, t('Save block'));
- $this->assertText(t('The block has been created.'), t('New block successfully created.'));
+ $this->assertText(t('The block has been created.'), 'New block successfully created.');
// Verify the new block is in the database.
$bid = db_query("SELECT bid FROM {block_custom} WHERE info = :info", array(':info' => $custom_block['info']))->fetchField();
- $this->assertNotNull($bid, t('New block found in database'));
+ $this->assertNotNull($bid, 'New block found in database');
// Disable the text format.
$this->drupalPost('admin/config/content/formats/' . $format_id . '/disable', array(), t('Disable'));
- $this->assertRaw(t('Disabled text format %format.', array('%format' => $name)), t('Format successfully disabled.'));
+ $this->assertRaw(t('Disabled text format %format.', array('%format' => $name)), 'Format successfully disabled.');
$this->assertText('hook_filter_format_disable invoked.', t('hook_filter_format_disable() was invoked.'));
}
}
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterNoFormatTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterNoFormatTest.php
index fa87f7c..b206993 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterNoFormatTest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterNoFormatTest.php
@@ -25,6 +25,6 @@ class FilterNoFormatTest extends WebTestBase {
// Make sure that when this text is run through check_markup() with no text
// format, it is filtered as though it is in the fallback format.
- $this->assertEqual(check_markup($text), check_markup($text, filter_fallback_format()), t('Text with no format is filtered the same as text in the fallback format.'));
+ $this->assertEqual(check_markup($text), check_markup($text, filter_fallback_format()), 'Text with no format is filtered the same as text in the fallback format.');
}
}
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterSecurityTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterSecurityTest.php
index 46bb7b6..9e2a988 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterSecurityTest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterSecurityTest.php
@@ -51,7 +51,7 @@ class FilterSecurityTest extends WebTestBase {
$body_raw = $node->body[LANGUAGE_NOT_SPECIFIED][0]['value'];
$format_id = $node->body[LANGUAGE_NOT_SPECIFIED][0]['format'];
$this->drupalGet('node/' . $node->nid);
- $this->assertText($body_raw, t('Node body found.'));
+ $this->assertText($body_raw, 'Node body found.');
// Enable the filter_test_replace filter.
$edit = array(
@@ -61,14 +61,14 @@ class FilterSecurityTest extends WebTestBase {
// Verify that filter_test_replace filter replaced the content.
$this->drupalGet('node/' . $node->nid);
- $this->assertNoText($body_raw, t('Node body not found.'));
- $this->assertText('Filter: Testing filter', t('Testing filter output found.'));
+ $this->assertNoText($body_raw, 'Node body not found.');
+ $this->assertText('Filter: Testing filter', 'Testing filter output found.');
// Disable the text format entirely.
$this->drupalPost('admin/config/content/formats/' . $format_id . '/disable', array(), t('Disable'));
// Verify that the content is empty, because the text format does not exist.
$this->drupalGet('node/' . $node->nid);
- $this->assertNoText($body_raw, t('Node body not found.'));
+ $this->assertNoText($body_raw, 'Node body not found.');
}
}
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterUnitTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterUnitTest.php
index 9daac0f..2b97485 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterUnitTest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterUnitTest.php
@@ -93,7 +93,7 @@ class FilterUnitTest extends UnitTestBase {
$limit = max(ini_get('pcre.backtrack_limit'), ini_get('pcre.recursion_limit'));
$source = $this->randomName($limit);
$result = _filter_autop($source);
- $success = $this->assertEqual($result, '
' . $source . "
\n", t('Line break filter can process very long strings.'));
+ $success = $this->assertEqual($result, '' . $source . "
\n", 'Line break filter can process very long strings.');
if (!$success) {
$this->verbose("\n" . $source . "\n
\n" . $result);
}
@@ -114,52 +114,52 @@ class FilterUnitTest extends UnitTestBase {
function testFilterXSS() {
// Tag stripping, different ways to work around removal of HTML tags.
$f = filter_xss('');
- $this->assertNoNormalized($f, 'script', t('HTML tag stripping -- simple script without special characters.'));
+ $this->assertNoNormalized($f, 'script', 'HTML tag stripping -- simple script without special characters.');
$f = filter_xss('');
- $this->assertNoNormalized($f, 'script', t('HTML tag stripping -- empty script with source.'));
+ $this->assertNoNormalized($f, 'script', 'HTML tag stripping -- empty script with source.');
$f = filter_xss('');
- $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- non whitespace character after tag name.'));
+ $this->assertNoNormalized($f, 'script', 'HTML tag stripping evasion -- non whitespace character after tag name.');
$f = filter_xss('');
- $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- no space between tag and attribute.'));
+ $this->assertNoNormalized($f, 'script', 'HTML tag stripping evasion -- no space between tag and attribute.');
// Null between < and tag name works at least with IE6.
$f = filter_xss("<\0scr\0ipt>alert(0)");
- $this->assertNoNormalized($f, 'ipt', t('HTML tag stripping evasion -- breaking HTML with nulls.'));
+ $this->assertNoNormalized($f, 'ipt', 'HTML tag stripping evasion -- breaking HTML with nulls.');
$f = filter_xss("");
- $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- filter just removing "script".'));
+ $this->assertNoNormalized($f, 'script', 'HTML tag stripping evasion -- filter just removing "script".');
$f = filter_xss('<');
- $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- double opening brackets.'));
+ $this->assertNoNormalized($f, 'script', 'HTML tag stripping evasion -- double opening brackets.');
$f = filter_xss('', array('img'));
- $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- a malformed image tag.'));
+ $this->assertNoNormalized($f, 'script', 'HTML tag stripping evasion -- a malformed image tag.');
$f = filter_xss('', array('blockquote'));
- $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- script in a blockqoute.'));
+ $this->assertNoNormalized($f, 'script', 'HTML tag stripping evasion -- script in a blockqoute.');
$f = filter_xss("");
- $this->assertNoNormalized($f, 'script', t('HTML tag stripping evasion -- script within a comment.'));
+ $this->assertNoNormalized($f, 'script', 'HTML tag stripping evasion -- script within a comment.');
// Dangerous attributes removal.
$f = filter_xss('', array('p'));
- $this->assertNoNormalized($f, 'onmouseover', t('HTML filter attributes removal -- events, no evasion.'));
+ $this->assertNoNormalized($f, 'onmouseover', 'HTML filter attributes removal -- events, no evasion.');
$f = filter_xss('
- ', array('li'));
- $this->assertNoNormalized($f, 'style', t('HTML filter attributes removal -- style, no evasion.'));
+ $this->assertNoNormalized($f, 'style', 'HTML filter attributes removal -- style, no evasion.');
$f = filter_xss('
![]()
', array('img'));
- $this->assertNoNormalized($f, 'onerror', t('HTML filter attributes removal evasion -- spaces before equals sign.'));
+ $this->assertNoNormalized($f, 'onerror', 'HTML filter attributes removal evasion -- spaces before equals sign.');
$f = filter_xss('![]()
', array('img'));
- $this->assertNoNormalized($f, 'onabort', t('HTML filter attributes removal evasion -- non alphanumeric characters before equals sign.'));
+ $this->assertNoNormalized($f, 'onabort', 'HTML filter attributes removal evasion -- non alphanumeric characters before equals sign.');
$f = filter_xss('![]()
', array('img'));
- $this->assertNoNormalized($f, 'onmediaerror', t('HTML filter attributes removal evasion -- varying case.'));
+ $this->assertNoNormalized($f, 'onmediaerror', 'HTML filter attributes removal evasion -- varying case.');
// Works at least with IE6.
$f = filter_xss("![]()
", array('img'));
- $this->assertNoNormalized($f, 'focus', t('HTML filter attributes removal evasion -- breaking with nulls.'));
+ $this->assertNoNormalized($f, 'focus', 'HTML filter attributes removal evasion -- breaking with nulls.');
// Only whitelisted scheme names allowed in attributes.
$f = filter_xss(')
', array('img'));
- $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing -- no evasion.'));
+ $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing -- no evasion.');
$f = filter_xss('', array('img'));
- $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing evasion -- no quotes.'));
+ $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing evasion -- no quotes.');
// A bit like CVE-2006-0070.
$f = filter_xss(')
', array('img'));
$this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing evasion -- no alert ;)'));
$f = filter_xss('`)
', array('img'));
- $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing evasion -- grave accents.'));
+ $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing evasion -- grave accents.');
$f = filter_xss('![]()
', array('img'));
- $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing -- rare attribute.'));
+ $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing -- rare attribute.');
$f = filter_xss('', array('table'));
- $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing -- another tag.'));
+ $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing -- another tag.');
$f = filter_xss(')
', array('img'));
- $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing evasion -- varying case.'));
+ $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing evasion -- varying case.');
$f = filter_xss('', array('img'));
- $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing evasion -- UTF-8 decimal encoding.'));
+ $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing evasion -- UTF-8 decimal encoding.');
$f = filter_xss('', array('img'));
- $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing evasion -- long UTF-8 encoding.'));
+ $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing evasion -- long UTF-8 encoding.');
$f = filter_xss('', array('img'));
- $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing evasion -- UTF-8 hex encoding.'));
+ $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing evasion -- UTF-8 hex encoding.');
$f = filter_xss("![](\"jav\tascript:alert(0)\")
", array('img'));
- $this->assertNoNormalized($f, 'script', t('HTML scheme clearing evasion -- an embedded tab.'));
+ $this->assertNoNormalized($f, 'script', 'HTML scheme clearing evasion -- an embedded tab.');
$f = filter_xss(')
', array('img'));
- $this->assertNoNormalized($f, 'script', t('HTML scheme clearing evasion -- an encoded, embedded tab.'));
+ $this->assertNoNormalized($f, 'script', 'HTML scheme clearing evasion -- an encoded, embedded tab.');
$f = filter_xss(')
', array('img'));
- $this->assertNoNormalized($f, 'script', t('HTML scheme clearing evasion -- an encoded, embedded newline.'));
+ $this->assertNoNormalized($f, 'script', 'HTML scheme clearing evasion -- an encoded, embedded newline.');
// With
this test would fail, but the entity gets turned into
// 
, so it's OK.
$f = filter_xss(')
', array('img'));
- $this->assertNoNormalized($f, 'script', t('HTML scheme clearing evasion -- an encoded, embedded carriage return.'));
+ $this->assertNoNormalized($f, 'script', 'HTML scheme clearing evasion -- an encoded, embedded carriage return.');
$f = filter_xss("![](\"\n\n\nj\na\nva\ns\ncript:alert(0)\")
", array('img'));
- $this->assertNoNormalized($f, 'cript', t('HTML scheme clearing evasion -- broken into many lines.'));
+ $this->assertNoNormalized($f, 'cript', 'HTML scheme clearing evasion -- broken into many lines.');
$f = filter_xss("![](\"jav\0a\0\0cript:alert(0)\")
", array('img'));
- $this->assertNoNormalized($f, 'cript', t('HTML scheme clearing evasion -- embedded nulls.'));
+ $this->assertNoNormalized($f, 'cript', 'HTML scheme clearing evasion -- embedded nulls.');
$f = filter_xss(')
', array('img'));
- $this->assertNoNormalized($f, 'javascript', t('HTML scheme clearing evasion -- spaces and metacharacters before scheme.'));
+ $this->assertNoNormalized($f, 'javascript', 'HTML scheme clearing evasion -- spaces and metacharacters before scheme.');
$f = filter_xss(')
', array('img'));
- $this->assertNoNormalized($f, 'vbscript', t('HTML scheme clearing evasion -- another scheme.'));
+ $this->assertNoNormalized($f, 'vbscript', 'HTML scheme clearing evasion -- another scheme.');
$f = filter_xss(')
', array('img'));
- $this->assertNoNormalized($f, 'nosuchscheme', t('HTML scheme clearing evasion -- unknown scheme.'));
+ $this->assertNoNormalized($f, 'nosuchscheme', 'HTML scheme clearing evasion -- unknown scheme.');
// Netscape 4.x javascript entities.
$f = filter_xss('
', array('br'));
- $this->assertNoNormalized($f, 'alert', t('Netscape 4.x javascript entities.'));
+ $this->assertNoNormalized($f, 'alert', 'Netscape 4.x javascript entities.');
// DRUPAL-SA-2008-006: Invalid UTF-8, these only work as reflected XSS with
// Internet Explorer 6.
$f = filter_xss("\" style=\"background-image: url(javascript:alert(0));\"\xe0
", array('p'));
- $this->assertNoNormalized($f, 'style', t('HTML filter -- invalid UTF-8.'));
+ $this->assertNoNormalized($f, 'style', 'HTML filter -- invalid UTF-8.');
$f = filter_xss("\xc0aaa");
- $this->assertEqual($f, '', t('HTML filter -- overlong UTF-8 sequences.'));
+ $this->assertEqual($f, '', 'HTML filter -- overlong UTF-8 sequences.');
$f = filter_xss("Who's Online");
- $this->assertNormalized($f, "who's online", t('HTML filter -- html entity number'));
+ $this->assertNormalized($f, "who's online", 'HTML filter -- html entity number');
$f = filter_xss("Who's Online");
- $this->assertNormalized($f, "who's online", t('HTML filter -- encoded html entity number'));
+ $this->assertNormalized($f, "who's online", 'HTML filter -- encoded html entity number');
$f = filter_xss("Who&#039; Online");
- $this->assertNormalized($f, "who' online", t('HTML filter -- double encoded html entity number'));
+ $this->assertNormalized($f, "who' online", 'HTML filter -- double encoded html entity number');
}
/**
@@ -308,34 +308,34 @@ class FilterUnitTest extends UnitTestBase {
// HTML filter is not able to secure some tags, these should never be
// allowed.
$f = _filter_html('', $filter);
- $this->assertNoNormalized($f, 'script', t('HTML filter should always remove script tags.'));
+ $this->assertNoNormalized($f, 'script', 'HTML filter should always remove script tags.');
$f = _filter_html('', $filter);
- $this->assertNoNormalized($f, 'iframe', t('HTML filter should always remove iframe tags.'));
+ $this->assertNoNormalized($f, 'iframe', 'HTML filter should always remove iframe tags.');
$f = _filter_html('', $filter);
- $this->assertNoNormalized($f, 'object', t('HTML filter should always remove object tags.'));
+ $this->assertNoNormalized($f, 'object', 'HTML filter should always remove object tags.');
$f = _filter_html('', $filter);
- $this->assertNoNormalized($f, 'style', t('HTML filter should always remove style tags.'));
+ $this->assertNoNormalized($f, 'style', 'HTML filter should always remove style tags.');
// Some tags make CSRF attacks easier, let the user take the risk herself.
$f = _filter_html('![]()
', $filter);
- $this->assertNoNormalized($f, 'img', t('HTML filter should remove img tags on default.'));
+ $this->assertNoNormalized($f, 'img', 'HTML filter should remove img tags on default.');
$f = _filter_html('', $filter);
- $this->assertNoNormalized($f, 'img', t('HTML filter should remove input tags on default.'));
+ $this->assertNoNormalized($f, 'img', 'HTML filter should remove input tags on default.');
// Filtering content of some attributes is infeasible, these shouldn't be
// allowed too.
$f = _filter_html('
', $filter);
- $this->assertNoNormalized($f, 'style', t('HTML filter should remove style attribute on default.'));
+ $this->assertNoNormalized($f, 'style', 'HTML filter should remove style attribute on default.');
$f = _filter_html('', $filter);
- $this->assertNoNormalized($f, 'onerror', t('HTML filter should remove on* attributes on default.'));
+ $this->assertNoNormalized($f, 'onerror', 'HTML filter should remove on* attributes on default.');
$f = _filter_html(' ', $filter);
- $this->assertNoNormalized($f, 'onerror', t('HTML filter should remove empty on* attributes on default.'));
+ $this->assertNoNormalized($f, 'onerror', 'HTML filter should remove empty on* attributes on default.');
}
/**
@@ -353,20 +353,20 @@ class FilterUnitTest extends UnitTestBase {
// Test if the rel="nofollow" attribute is added, even if we try to prevent
// it.
$f = _filter_html('text', $filter);
- $this->assertNormalized($f, 'rel="nofollow"', t('Spam deterrent -- no evasion.'));
+ $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent -- no evasion.');
$f = _filter_html('text', $filter);
- $this->assertNormalized($f, 'rel="nofollow"', t('Spam deterrent evasion -- capital A.'));
+ $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent evasion -- capital A.');
$f = _filter_html("text", $filter);
- $this->assertNormalized($f, 'rel="nofollow"', t('Spam deterrent evasion -- non whitespace character after tag name.'));
+ $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent evasion -- non whitespace character after tag name.');
$f = _filter_html("<\0a\0 href=\"http://www.example.com/\">text", $filter);
- $this->assertNormalized($f, 'rel="nofollow"', t('Spam deterrent evasion -- some nulls.'));
+ $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent evasion -- some nulls.');
$f = _filter_html('text', $filter);
- $this->assertNoNormalized($f, 'rel="follow"', t('Spam deterrent evasion -- with rel set - rel="follow" removed.'));
- $this->assertNormalized($f, 'rel="nofollow"', t('Spam deterrent evasion -- with rel set - rel="nofollow" added.'));
+ $this->assertNoNormalized($f, 'rel="follow"', 'Spam deterrent evasion -- with rel set - rel="follow" removed.');
+ $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent evasion -- with rel set - rel="nofollow" added.');
}
/**
@@ -375,13 +375,13 @@ class FilterUnitTest extends UnitTestBase {
function testFilterXSSAdmin() {
// DRUPAL-SA-2008-044
$f = filter_xss_admin('');
- $this->assertNoNormalized($f, 'object', t('Admin HTML filter -- should not allow object tag.'));
+ $this->assertNoNormalized($f, 'object', 'Admin HTML filter -- should not allow object tag.');
$f = filter_xss_admin('');
- $this->assertNoNormalized($f, 'script', t('Admin HTML filter -- should not allow script tag.'));
+ $this->assertNoNormalized($f, 'script', 'Admin HTML filter -- should not allow script tag.');
$f = filter_xss_admin('text');
- $this->assertEqual($f, '
text
', t('HTML corrector -- tag closing at the end of input.'));
+ $this->assertEqual($f, 'text
', 'HTML corrector -- tag closing at the end of input.');
$f = _filter_htmlcorrector('text
text');
- $this->assertEqual($f, '
text
text
', t('HTML corrector -- tag closing.'));
+ $this->assertEqual($f, 'text
text
', 'HTML corrector -- tag closing.');
$f = _filter_htmlcorrector("- e1
- e2");
- $this->assertEqual($f, "
- e1
- e2
", t('HTML corrector -- unclosed list tags.'));
+ $this->assertEqual($f, "- e1
- e2
", 'HTML corrector -- unclosed list tags.');
$f = _filter_htmlcorrector('content');
- $this->assertEqual($f, 'content', t('HTML corrector -- unclosed tag with attribute.'));
+ $this->assertEqual($f, 'content', 'HTML corrector -- unclosed tag with attribute.');
// XHTML slash for empty elements.
$f = _filter_htmlcorrector('
');
- $this->assertEqual($f, '
', t('HTML corrector -- XHTML closing slash.'));
+ $this->assertEqual($f, '
', 'HTML corrector -- XHTML closing slash.');
$f = _filter_htmlcorrector('test
');
- $this->assertEqual($f, 'test
', t('HTML corrector -- Convert uppercased tags to proper lowercased ones.'));
+ $this->assertEqual($f, 'test
', 'HTML corrector -- Convert uppercased tags to proper lowercased ones.');
$f = _filter_htmlcorrector('test
');
- $this->assertEqual($f, 'test
', t('HTML corrector -- Convert uppercased tags to proper lowercased ones.'));
+ $this->assertEqual($f, 'test
', 'HTML corrector -- Convert uppercased tags to proper lowercased ones.');
$f = _filter_htmlcorrector('test
');
- $this->assertEqual($f, 'test
', t('HTML corrector -- Let proper XHTML pass through.'));
+ $this->assertEqual($f, 'test
', 'HTML corrector -- Let proper XHTML pass through.');
$f = _filter_htmlcorrector('test
');
- $this->assertEqual($f, 'test
', t('HTML corrector -- Let proper XHTML pass through, but ensure there is a single space before the closing slash.'));
+ $this->assertEqual($f, 'test
', 'HTML corrector -- Let proper XHTML pass through, but ensure there is a single space before the closing slash.');
$f = _filter_htmlcorrector('test
');
- $this->assertEqual($f, 'test
', t('HTML corrector -- Let proper XHTML pass through, but ensure there are not too many spaces before the closing slash.'));
+ $this->assertEqual($f, 'test
', 'HTML corrector -- Let proper XHTML pass through, but ensure there are not too many spaces before the closing slash.');
$f = _filter_htmlcorrector('');
- $this->assertEqual($f, '', t('HTML corrector -- Convert XHTML that is properly formed but that would not be compatible with typical HTML user agents.'));
+ $this->assertEqual($f, '', 'HTML corrector -- Convert XHTML that is properly formed but that would not be compatible with typical HTML user agents.');
$f = _filter_htmlcorrector('test1
test2');
- $this->assertEqual($f, 'test1
test2', t('HTML corrector -- Automatically close single tags.'));
+ $this->assertEqual($f, 'test1
test2', 'HTML corrector -- Automatically close single tags.');
$f = _filter_htmlcorrector('line1
line2');
- $this->assertEqual($f, 'line1
line2', t('HTML corrector -- Automatically close single tags.'));
+ $this->assertEqual($f, 'line1
line2', 'HTML corrector -- Automatically close single tags.');
$f = _filter_htmlcorrector('line1
line2');
- $this->assertEqual($f, 'line1
line2', t('HTML corrector -- Automatically close single tags.'));
+ $this->assertEqual($f, 'line1
line2', 'HTML corrector -- Automatically close single tags.');
$f = _filter_htmlcorrector('
test');
- $this->assertEqual($f, 'test', t('HTML corrector -- Automatically close single tags.'));
+ $this->assertEqual($f, 'test', 'HTML corrector -- Automatically close single tags.');
$f = _filter_htmlcorrector('
');
$this->assertEqual($f, '
', t("HTML corrector -- Transform empty tags to a single closed tag if the tag's content model is EMPTY."));
@@ -823,22 +823,22 @@ www.example.com with a newline in comments -->
$this->assertEqual($f, '', t("HTML corrector -- Do not transform empty tags to a single closed tag if the tag's content model is not EMPTY."));
$f = _filter_htmlcorrector('line1
line2');
- $this->assertEqual($f, 'line1
line2', t('HTML corrector -- Move non-inline elements outside of inline containers.'));
+ $this->assertEqual($f, 'line1
line2', 'HTML corrector -- Move non-inline elements outside of inline containers.');
$f = _filter_htmlcorrector('line1
line2');
- $this->assertEqual($f, 'line1
line2', t('HTML corrector -- Move non-inline elements outside of inline containers.'));
+ $this->assertEqual($f, 'line1
line2', 'HTML corrector -- Move non-inline elements outside of inline containers.');
$f = _filter_htmlcorrector('test
test
\n');
- $this->assertEqual($f, 'test
test
\n', t('HTML corrector -- Auto-close improperly nested tags.'));
+ $this->assertEqual($f, 'test
test
\n', 'HTML corrector -- Auto-close improperly nested tags.');
$f = _filter_htmlcorrector('Line1
bold stuff');
- $this->assertEqual($f, 'Line1
bold stuff
', t('HTML corrector -- Properly close unclosed tags, and remove useless closing tags.'));
+ $this->assertEqual($f, 'Line1
bold stuff
', 'HTML corrector -- Properly close unclosed tags, and remove useless closing tags.');
$f = _filter_htmlcorrector('test ');
- $this->assertEqual($f, 'test ', t('HTML corrector -- Do not touch HTML comments.'));
+ $this->assertEqual($f, 'test ', 'HTML corrector -- Do not touch HTML comments.');
$f = _filter_htmlcorrector('test ');
- $this->assertEqual($f, 'test ', t('HTML corrector -- Do not touch HTML comments.'));
+ $this->assertEqual($f, 'test ', 'HTML corrector -- Do not touch HTML comments.');
$f = _filter_htmlcorrector('test
comment
-->', t('HTML corrector -- Do not touch HTML comments.'));
$f = _filter_htmlcorrector('test ');
- $this->assertEqual($f, 'test ', t('HTML corrector -- Do not touch HTML comments.'));
+ $this->assertEqual($f, 'test ', 'HTML corrector -- Do not touch HTML comments.');
$f = _filter_htmlcorrector('test ');
- $this->assertEqual($f, 'test ', t('HTML corrector -- Do not touch HTML comments.'));
+ $this->assertEqual($f, 'test ', 'HTML corrector -- Do not touch HTML comments.');
$f = _filter_htmlcorrector('test\n
\n');
- $this->assertEqual($f, 'test\n
\n', t('HTML corrector -- New-lines are accepted and kept as-is.'));
+ $this->assertEqual($f, 'test\n
\n', 'HTML corrector -- New-lines are accepted and kept as-is.');
$f = _filter_htmlcorrector('دروبال');
- $this->assertEqual($f, '
دروبال
', t('HTML corrector -- Encoding is correctly kept.'));
+ $this->assertEqual($f, 'دروبال
', 'HTML corrector -- Encoding is correctly kept.');
$f = _filter_htmlcorrector('');
$this->assertEqual($f, '';
$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.');
}
/**
@@ -118,8 +118,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.');
}
/**
@@ -138,13 +138,13 @@ class JavaScriptTest extends WebTestBase {
drupal_add_js(array('commonTestArray' => array('key' => 'commonTestNewValue')), 'setting');
$javascript = drupal_get_js('header');
- $this->assertTrue(strpos($javascript, 'basePath') > 0, t('Rendered JavaScript header returns basePath setting.'));
- $this->assertTrue(strpos($javascript, 'scriptPath') > 0, t('Rendered JavaScript header returns scriptPath setting.'));
- $this->assertTrue(strpos($javascript, 'pathPrefix') > 0, t('Rendered JavaScript header returns pathPrefix setting.'));
- $this->assertTrue(strpos($javascript, 'core/misc/jquery.js') > 0, t('Rendered JavaScript header includes jQuery.'));
+ $this->assertTrue(strpos($javascript, 'basePath') > 0, 'Rendered JavaScript header returns basePath setting.');
+ $this->assertTrue(strpos($javascript, 'scriptPath') > 0, 'Rendered JavaScript header returns scriptPath setting.');
+ $this->assertTrue(strpos($javascript, 'pathPrefix') > 0, 'Rendered JavaScript header returns pathPrefix setting.');
+ $this->assertTrue(strpos($javascript, 'core/misc/jquery.js') > 0, 'Rendered JavaScript header includes jQuery.');
// 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, 'commonTestShouldAppear') > 0, 'Rendered JavaScript header returns custom setting.');
$this->assertTrue(strpos($javascript, 'commonTestShouldNotAppear') === FALSE, t('drupal_add_js() correctly overrides a custom setting.'));
// Test whether drupal_add_js can be used to add numerically indexed values
@@ -164,7 +164,7 @@ class JavaScriptTest extends WebTestBase {
function testReset() {
drupal_add_js('core/misc/collapse.js');
drupal_static_reset('drupal_add_js');
- $this->assertEqual(array(), drupal_add_js(), t('Resetting the JavaScript correctly empties the cache.'));
+ $this->assertEqual(array(), drupal_add_js(), 'Resetting the JavaScript correctly empties the cache.');
}
/**
@@ -173,9 +173,9 @@ class JavaScriptTest extends WebTestBase {
function testAddInline() {
$inline = 'jQuery(function () { });';
$javascript = drupal_add_js($inline, array('type' => 'inline', 'scope' => 'footer'));
- $this->assertTrue(array_key_exists('core/misc/jquery.js', $javascript), t('jQuery is added when inline scripts are added.'));
+ $this->assertTrue(array_key_exists('core/misc/jquery.js', $javascript), 'jQuery is added when inline scripts are added.');
$data = end($javascript);
- $this->assertEqual($inline, $data['data'], t('Inline JavaScript is correctly added to the footer.'));
+ $this->assertEqual($inline, $data['data'], 'Inline JavaScript is correctly added to the footer.');
}
/**
@@ -186,7 +186,7 @@ class JavaScriptTest extends WebTestBase {
drupal_add_js($external, 'external');
$javascript = drupal_get_js();
// Local files have a base_path() prefix, external files should not.
- $this->assertTrue(strpos($javascript, 'src="' . $external) > 0, t('Rendering an external JavaScript file.'));
+ $this->assertTrue(strpos($javascript, 'src="' . $external) > 0, 'Rendering an external JavaScript file.');
}
/**
@@ -196,7 +196,7 @@ class JavaScriptTest extends WebTestBase {
$inline = 'jQuery(function () { });';
drupal_add_js($inline, array('type' => 'inline', 'scope' => 'footer'));
$javascript = drupal_get_js('footer');
- $this->assertTrue(strpos($javascript, $inline) > 0, t('Rendered JavaScript footer returns the inline code.'));
+ $this->assertTrue(strpos($javascript, $inline) > 0, 'Rendered JavaScript footer returns the inline code.');
}
/**
@@ -204,7 +204,7 @@ class JavaScriptTest extends WebTestBase {
*/
function testNoCache() {
$javascript = drupal_add_js('core/misc/collapse.js', array('cache' => FALSE));
- $this->assertFalse($javascript['core/misc/collapse.js']['preprocess'], t('Setting cache to FALSE sets proprocess to FALSE when adding JavaScript.'));
+ $this->assertFalse($javascript['core/misc/collapse.js']['preprocess'], 'Setting cache to FALSE sets proprocess to FALSE when adding JavaScript.');
}
/**
@@ -212,7 +212,7 @@ class JavaScriptTest extends WebTestBase {
*/
function testDifferentGroup() {
$javascript = drupal_add_js('core/misc/collapse.js', array('group' => JS_THEME));
- $this->assertEqual($javascript['core/misc/collapse.js']['group'], JS_THEME, t('Adding a JavaScript file with a different group caches the given group.'));
+ $this->assertEqual($javascript['core/misc/collapse.js']['group'], JS_THEME, 'Adding a JavaScript file with a different group caches the given group.');
}
/**
@@ -220,7 +220,7 @@ class JavaScriptTest extends WebTestBase {
*/
function testDifferentWeight() {
$javascript = drupal_add_js('core/misc/collapse.js', array('weight' => 2));
- $this->assertEqual($javascript['core/misc/collapse.js']['weight'], 2, t('Adding a JavaScript file with a different weight caches the given weight.'));
+ $this->assertEqual($javascript['core/misc/collapse.js']['weight'], 2, 'Adding a JavaScript file with a different weight caches the given weight.');
}
/**
@@ -238,8 +238,8 @@ class JavaScriptTest extends WebTestBase {
$expected_1 = "";
$expected_2 = "\n" . '' . "\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.');
}
/**
@@ -249,7 +249,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');
}
/**
@@ -273,7 +273,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.
@@ -291,7 +291,7 @@ class JavaScriptTest extends WebTestBase {
'',
'',
));
- $this->assertTrue(strpos($javascript, $expected) > 0, t('JavaScript is aggregated in the expected groups and order.'));
+ $this->assertTrue(strpos($javascript, $expected) > 0, 'JavaScript is aggregated in the expected groups and order.');
}
/**
@@ -375,7 +375,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.');
}
/**
@@ -387,7 +387,7 @@ class JavaScriptTest extends WebTestBase {
// weight, we need the other two options to be the same.
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.');
}
/**
@@ -404,7 +404,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.');
}
/**
@@ -412,11 +412,11 @@ class JavaScriptTest extends WebTestBase {
*/
function testLibraryRender() {
$result = drupal_add_library('system', 'farbtastic');
- $this->assertTrue($result !== FALSE, t('Library was added without errors.'));
+ $this->assertTrue($result !== FALSE, 'Library was added without errors.');
$scripts = drupal_get_js();
$styles = drupal_get_css();
- $this->assertTrue(strpos($scripts, '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.');
}
/**
@@ -427,12 +427,12 @@ class JavaScriptTest extends WebTestBase {
function testLibraryAlter() {
// Verify that common_test altered the title of Farbtastic.
$library = drupal_get_library('system', 'farbtastic');
- $this->assertEqual($library['title'], 'Farbtastic: Altered Library', t('Registered libraries were altered.'));
+ $this->assertEqual($library['title'], 'Farbtastic: Altered Library', 'Registered libraries were altered.');
// common_test_library_info_alter() also added a dependency on jQuery Form.
drupal_add_library('system', '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.');
}
/**
@@ -442,7 +442,7 @@ class JavaScriptTest extends WebTestBase {
*/
function testLibraryNameConflicts() {
$farbtastic = drupal_get_library('common_test', 'farbtastic');
- $this->assertEqual($farbtastic['title'], 'Custom Farbtastic Library', t('Alternative libraries can be added to the page.'));
+ $this->assertEqual($farbtastic['title'], 'Custom Farbtastic Library', 'Alternative libraries can be added to the page.');
}
/**
@@ -450,13 +450,13 @@ class JavaScriptTest extends WebTestBase {
*/
function testLibraryUnknown() {
$result = drupal_get_library('unknown', 'unknown');
- $this->assertFalse($result, t('Unknown library returned FALSE.'));
+ $this->assertFalse($result, 'Unknown library returned FALSE.');
drupal_static_reset('drupal_get_library');
$result = drupal_add_library('unknown', 'unknown');
- $this->assertFalse($result, t('Unknown library returned FALSE.'));
+ $this->assertFalse($result, 'Unknown library returned FALSE.');
$scripts = drupal_get_js();
- $this->assertTrue(strpos($scripts, 'unknown') === FALSE, t('Unknown library was not added to the page.'));
+ $this->assertTrue(strpos($scripts, 'unknown') === FALSE, 'Unknown library was not added to the page.');
}
/**
@@ -466,7 +466,7 @@ class JavaScriptTest extends WebTestBase {
$element['#attached']['library'][] = array('system', '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.');
}
/**
@@ -475,7 +475,7 @@ class JavaScriptTest extends WebTestBase {
function testGetLibrary() {
// Retrieve all libraries registered by a module.
$libraries = drupal_get_library('common_test');
- $this->assertTrue(isset($libraries['farbtastic']), t('Retrieved all module libraries.'));
+ $this->assertTrue(isset($libraries['farbtastic']), 'Retrieved all module libraries.');
// Retrieve all libraries for a module not implementing hook_library_info().
// Note: This test installs Locale module.
$libraries = drupal_get_library('locale');
@@ -483,10 +483,10 @@ class JavaScriptTest extends WebTestBase {
// Retrieve a specific library by module and name.
$farbtastic = drupal_get_library('common_test', '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.');
}
/**
@@ -496,6 +496,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..0713ce0 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/JsonUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/JsonUnitTest.php
@@ -38,23 +38,23 @@ 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)));
}
// 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[0] == '"', 'A JSON encoded string begins with ".');
+ $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.
@@ -68,7 +68,7 @@ class JsonUnitTest extends UnitTestBase {
$this->assertTrue(strpos($json, $char) > 0, t('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/RenderTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php
index 90d6229..fa1e478 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php
@@ -45,7 +45,7 @@ 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"));
@@ -54,8 +54,8 @@ class RenderTest extends WebTestBase {
// 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.
@@ -73,7 +73,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.');
}
/**
@@ -110,18 +110,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;
}
@@ -276,7 +276,7 @@ class RenderTest extends WebTestBase {
variable_set('error_level', ERROR_REPORTING_DISPLAY_ALL);
$this->drupalGet('common-test/drupal-render-invalid-keys');
- $this->assertResponse(200, t('Received expected HTTP status code.'));
+ $this->assertResponse(200, 'Received expected HTTP status code.');
$this->assertRaw($message, t('Found error message: !message.', array('!message' => $message)));
}
@@ -315,13 +315,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..97d7113 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.');
}
}
@@ -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 352d708..48101e0 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php
@@ -42,7 +42,7 @@ class SimpleTestErrorCollectorTest extends WebTestBase {
function testErrorCollect() {
$this->collectedErrors = array();
$this->drupalGet('error-test/generate-warnings-with-report');
- $this->assertEqual(count($this->collectedErrors), 3, t('Three errors were collected'));
+ $this->assertEqual(count($this->collectedErrors), 3, 'Three errors were collected');
if (count($this->collectedErrors) == 3) {
$this->assertError($this->collectedErrors[0], 'Notice', 'error_test_generate_warnings()', 'error_test.module', 'Undefined variable: bananas');
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..b4aeac3 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php
@@ -97,10 +97,10 @@ class UrlTest extends WebTestBase {
* 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,11 +130,11 @@ 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');
@@ -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/WriteRecordTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/WriteRecordTest.php
index 79f20a0..6694218 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/WriteRecordTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/WriteRecordTest.php
@@ -42,15 +42,15 @@ class WriteRecordTest extends WebTestBase {
$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->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';
@@ -61,9 +61,9 @@ class WriteRecordTest extends WebTestBase {
// 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();
@@ -73,9 +73,9 @@ class WriteRecordTest extends WebTestBase {
$insert_result = drupal_write_record('test', $person);
$this->assertTrue(isset($person->id), t('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();
@@ -84,52 +84,52 @@ class WriteRecordTest extends WebTestBase {
$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().'));
$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->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();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/AlterTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/AlterTest.php
index d31c21e..3324a35 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/AlterTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/AlterTest.php
@@ -38,7 +38,7 @@ class AlterTest extends DatabaseTestBase {
$num_records++;
}
- $this->assertEqual($num_records, 2, t('Returned the correct number of rows.'));
+ $this->assertEqual($num_records, 2, 'Returned the correct number of rows.');
}
/**
@@ -55,14 +55,14 @@ class AlterTest extends DatabaseTestBase {
$records = $result->fetchAll();
- $this->assertEqual(count($records), 2, t('Returned the correct number of rows.'));
+ $this->assertEqual(count($records), 2, 'Returned the correct number of rows.');
- $this->assertEqual($records[0]->name, 'George', t('Correct data retrieved.'));
- $this->assertEqual($records[0]->$tid_field, 4, t('Correct data retrieved.'));
- $this->assertEqual($records[0]->$task_field, 'sing', t('Correct data retrieved.'));
- $this->assertEqual($records[1]->name, 'George', t('Correct data retrieved.'));
- $this->assertEqual($records[1]->$tid_field, 5, t('Correct data retrieved.'));
- $this->assertEqual($records[1]->$task_field, 'sleep', t('Correct data retrieved.'));
+ $this->assertEqual($records[0]->name, 'George', 'Correct data retrieved.');
+ $this->assertEqual($records[0]->$tid_field, 4, 'Correct data retrieved.');
+ $this->assertEqual($records[0]->$task_field, 'sing', 'Correct data retrieved.');
+ $this->assertEqual($records[1]->name, 'George', 'Correct data retrieved.');
+ $this->assertEqual($records[1]->$tid_field, 5, 'Correct data retrieved.');
+ $this->assertEqual($records[1]->$task_field, 'sleep', 'Correct data retrieved.');
}
/**
@@ -83,11 +83,11 @@ class AlterTest extends DatabaseTestBase {
$records = $result->fetchAll();
- $this->assertEqual(count($records), 1, t('Returned the correct number of rows.'));
- $this->assertEqual($records[0]->$name_field, 'John', t('Correct data retrieved.'));
- $this->assertEqual($records[0]->$tid_field, 2, t('Correct data retrieved.'));
- $this->assertEqual($records[0]->$pid_field, 1, t('Correct data retrieved.'));
- $this->assertEqual($records[0]->$task_field, 'sleep', t('Correct data retrieved.'));
+ $this->assertEqual(count($records), 1, 'Returned the correct number of rows.');
+ $this->assertEqual($records[0]->$name_field, 'John', 'Correct data retrieved.');
+ $this->assertEqual($records[0]->$tid_field, 2, 'Correct data retrieved.');
+ $this->assertEqual($records[0]->$pid_field, 1, 'Correct data retrieved.');
+ $this->assertEqual($records[0]->$task_field, 'sleep', 'Correct data retrieved.');
}
/**
@@ -101,8 +101,8 @@ class AlterTest extends DatabaseTestBase {
$query->addTag('database_test_alter_change_fields');
$record = $query->execute()->fetch();
- $this->assertEqual($record->$name_field, 'George', t('Correct data retrieved.'));
- $this->assertFalse(isset($record->$age_field), t('Age field not found, as intended.'));
+ $this->assertEqual($record->$name_field, 'George', 'Correct data retrieved.');
+ $this->assertFalse(isset($record->$age_field), 'Age field not found, as intended.');
}
/**
@@ -119,8 +119,8 @@ class AlterTest extends DatabaseTestBase {
// Ensure that we got the right record.
$record = $result->fetch();
- $this->assertEqual($record->$name_field, 'George', t('Fetched name is correct.'));
- $this->assertEqual($record->$age_field, 27*3, t('Fetched age expression is correct.'));
+ $this->assertEqual($record->$name_field, 'George', 'Fetched name is correct.');
+ $this->assertEqual($record->$age_field, 27*3, 'Fetched age expression is correct.');
}
/**
@@ -135,7 +135,7 @@ class AlterTest extends DatabaseTestBase {
$num_records = count($query->execute()->fetchAll());
- $this->assertEqual($num_records, 4, t('Returned the correct number of rows.'));
+ $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
}
/**
@@ -159,7 +159,7 @@ class AlterTest extends DatabaseTestBase {
$name_field = $query->addField('pq', 'name');
$record = $query->execute()->fetch();
- $this->assertEqual($record->$name_field, 'George', t('Fetched name is correct.'));
- $this->assertEqual($record->$age_field, 27*3, t('Fetched age expression is correct.'));
+ $this->assertEqual($record->$name_field, 'George', 'Fetched name is correct.');
+ $this->assertEqual($record->$age_field, 27*3, 'Fetched age expression is correct.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/BasicSyntaxTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/BasicSyntaxTest.php
index d174853..f75502f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/BasicSyntaxTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/BasicSyntaxTest.php
@@ -34,7 +34,7 @@ class BasicSyntaxTest extends DatabaseTestBase {
':a4' => ' a ',
':a5' => 'test.',
));
- $this->assertIdentical($result->fetchField(), 'This is a test.', t('Basic CONCAT works.'));
+ $this->assertIdentical($result->fetchField(), 'This is a test.', 'Basic CONCAT works.');
}
/**
@@ -47,7 +47,7 @@ class BasicSyntaxTest extends DatabaseTestBase {
':a3' => '.',
':age' => 25,
));
- $this->assertIdentical($result->fetchField(), 'The age of John is 25.', t('Field CONCAT works.'));
+ $this->assertIdentical($result->fetchField(), 'The age of John is 25.', 'Field CONCAT works.');
}
/**
@@ -66,14 +66,14 @@ class BasicSyntaxTest extends DatabaseTestBase {
->countQuery()
->execute()
->fetchField();
- $this->assertIdentical($num_matches, '2', t('Found 2 records.'));
+ $this->assertIdentical($num_matches, '2', 'Found 2 records.');
// Match only "Ring_" using a LIKE expression with no wildcards.
$num_matches = db_select('test', 't')
->condition('name', db_like('Ring_'), 'LIKE')
->countQuery()
->execute()
->fetchField();
- $this->assertIdentical($num_matches, '1', t('Found 1 record.'));
+ $this->assertIdentical($num_matches, '1', 'Found 1 record.');
}
/**
@@ -97,13 +97,13 @@ class BasicSyntaxTest extends DatabaseTestBase {
->countQuery()
->execute()
->fetchField();
- $this->assertIdentical($num_matches, '2', t('Found 2 records.'));
+ $this->assertIdentical($num_matches, '2', 'Found 2 records.');
// Match only the former using a LIKE expression with no wildcards.
$num_matches = db_select('test', 't')
->condition('name', db_like('abc%\_'), 'LIKE')
->countQuery()
->execute()
->fetchField();
- $this->assertIdentical($num_matches, '1', t('Found 1 record.'));
+ $this->assertIdentical($num_matches, '1', 'Found 1 record.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/CaseSensitivityTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/CaseSensitivityTest.php
index 65a3854..2d97e03 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/CaseSensitivityTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/CaseSensitivityTest.php
@@ -34,8 +34,8 @@ class CaseSensitivityTest extends DatabaseTestBase {
->execute();
$num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
- $this->assertIdentical($num_records_before + 1, (int) $num_records_after, t('Record inserts correctly.'));
+ $this->assertIdentical($num_records_before + 1, (int) $num_records_after, 'Record inserts correctly.');
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'john'))->fetchField();
- $this->assertIdentical($saved_age, '2', t('Can retrieve after inserting.'));
+ $this->assertIdentical($saved_age, '2', 'Can retrieve after inserting.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/ConnectionTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/ConnectionTest.php
index 032309d..dca8215 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/ConnectionTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/ConnectionTest.php
@@ -35,9 +35,9 @@ class ConnectionTest extends DatabaseTestBase {
$db1 = Database::getConnection('default', 'default');
$db2 = Database::getConnection('slave', 'default');
- $this->assertNotNull($db1, t('default connection is a real connection object.'));
- $this->assertNotNull($db2, t('slave connection is a real connection object.'));
- $this->assertNotIdentical($db1, $db2, t('Each target refers to a different connection.'));
+ $this->assertNotNull($db1, 'default connection is a real connection object.');
+ $this->assertNotNull($db2, 'slave connection is a real connection object.');
+ $this->assertNotIdentical($db1, $db2, 'Each target refers to a different connection.');
// Try to open those targets another time, that should return the same objects.
$db1b = Database::getConnection('default', 'default');
@@ -48,8 +48,8 @@ class ConnectionTest extends DatabaseTestBase {
// Try to open an unknown target.
$unknown_target = $this->randomName();
$db3 = Database::getConnection($unknown_target, 'default');
- $this->assertNotNull($db3, t('Opening an unknown target returns a real connection object.'));
- $this->assertIdentical($db1, $db3, t('An unknown target opens the default connection.'));
+ $this->assertNotNull($db3, 'Opening an unknown target returns a real connection object.');
+ $this->assertIdentical($db1, $db3, 'An unknown target opens the default connection.');
// Try to open that unknown target another time, that should return the same object.
$db3b = Database::getConnection($unknown_target, 'default');
@@ -71,7 +71,7 @@ class ConnectionTest extends DatabaseTestBase {
$db1 = Database::getConnection('default', 'default');
$db2 = Database::getConnection('slave', 'default');
- $this->assertIdentical($db1, $db2, t('Both targets refer to the same connection.'));
+ $this->assertIdentical($db1, $db2, 'Both targets refer to the same connection.');
}
/**
@@ -86,7 +86,7 @@ class ConnectionTest extends DatabaseTestBase {
$db2 = Database::getConnection('default', 'default');
// Opening a connection after closing it should yield an object different than the original.
- $this->assertNotIdentical($db1, $db2, t('Opening the default connection after it is closed returns a new object.'));
+ $this->assertNotIdentical($db1, $db2, 'Opening the default connection after it is closed returns a new object.');
}
/**
@@ -101,8 +101,8 @@ class ConnectionTest extends DatabaseTestBase {
// In the MySQL driver, the port can be different, so check individual
// options.
- $this->assertEqual($connection_info['default']['driver'], $connectionOptions['driver'], t('The default connection info driver matches the current connection options driver.'));
- $this->assertEqual($connection_info['default']['database'], $connectionOptions['database'], t('The default connection info database matches the current connection options database.'));
+ $this->assertEqual($connection_info['default']['driver'], $connectionOptions['driver'], 'The default connection info driver matches the current connection options driver.');
+ $this->assertEqual($connection_info['default']['database'], $connectionOptions['database'], 'The default connection info database matches the current connection options database.');
// Set up identical slave and confirm connection options are identical.
Database::addConnectionInfo('default', 'slave', $connection_info['default']);
@@ -111,7 +111,7 @@ class ConnectionTest extends DatabaseTestBase {
// Get a fresh copy of the default connection options.
$connectionOptions = $db->getConnectionOptions();
- $this->assertIdentical($connectionOptions, $connectionOptions2, t('The default and slave connection options are identical.'));
+ $this->assertIdentical($connectionOptions, $connectionOptions2, 'The default and slave connection options are identical.');
// Set up a new connection with different connection info.
$test = $connection_info['default'];
@@ -121,6 +121,6 @@ class ConnectionTest extends DatabaseTestBase {
// Get a fresh copy of the default connection options.
$connectionOptions = $db->getConnectionOptions();
- $this->assertNotEqual($connection_info['default']['database'], $connectionOptions['database'], t('The test connection info database does not match the current connection options database.'));
+ $this->assertNotEqual($connection_info['default']['database'], $connectionOptions['database'], 'The test connection info database does not match the current connection options database.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/DeleteTruncateTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/DeleteTruncateTest.php
index cc41317..a5b9607 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/DeleteTruncateTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/DeleteTruncateTest.php
@@ -46,7 +46,7 @@ class DeleteTruncateTest extends DatabaseTestBase {
$this->assertEqual($num_deleted, 1, t("Deleted 1 record."));
$num_records_after = db_query('SELECT COUNT(*) FROM {test_task}')->fetchField();
- $this->assertEqual($num_records_before, $num_records_after + $num_deleted, t('Deletion adds up.'));
+ $this->assertEqual($num_records_before, $num_records_after + $num_deleted, 'Deletion adds up.');
}
/**
@@ -58,10 +58,10 @@ class DeleteTruncateTest extends DatabaseTestBase {
$num_deleted = db_delete('test')
->condition('id', 1)
->execute();
- $this->assertIdentical($num_deleted, 1, t('Deleted 1 record.'));
+ $this->assertIdentical($num_deleted, 1, 'Deleted 1 record.');
$num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
- $this->assertEqual($num_records_before, $num_records_after + $num_deleted, t('Deletion adds up.'));
+ $this->assertEqual($num_records_before, $num_records_after + $num_deleted, 'Deletion adds up.');
}
/**
@@ -73,6 +73,6 @@ class DeleteTruncateTest extends DatabaseTestBase {
db_truncate('test')->execute();
$num_records_after = db_query("SELECT COUNT(*) FROM {test}")->fetchField();
- $this->assertEqual(0, $num_records_after, t('Truncate really deletes everything.'));
+ $this->assertEqual(0, $num_records_after, 'Truncate really deletes everything.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/EmptyStatementTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/EmptyStatementTest.php
index 5c7925b..c475b12 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/EmptyStatementTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/EmptyStatementTest.php
@@ -29,8 +29,8 @@ class EmptyStatementTest extends WebTestBase {
function testEmpty() {
$result = new StatementEmpty();
- $this->assertTrue($result instanceof StatementInterface, t('Class implements expected interface'));
- $this->assertNull($result->fetchObject(), t('Null result returned.'));
+ $this->assertTrue($result instanceof StatementInterface, 'Class implements expected interface');
+ $this->assertNull($result->fetchObject(), 'Null result returned.');
}
/**
@@ -53,6 +53,6 @@ class EmptyStatementTest extends WebTestBase {
function testEmptyFetchAll() {
$result = new StatementEmpty();
- $this->assertEqual($result->fetchAll(), array(), t('Empty array returned from empty result set.'));
+ $this->assertEqual($result->fetchAll(), array(), 'Empty array returned from empty result set.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/FetchTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/FetchTest.php
index c6f647a..6cd29fd 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/FetchTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/FetchTest.php
@@ -31,14 +31,14 @@ class FetchTest extends DatabaseTestBase {
function testQueryFetchDefault() {
$records = array();
$result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25));
- $this->assertTrue($result instanceof StatementInterface, t('Result set is a Drupal statement object.'));
+ $this->assertTrue($result instanceof StatementInterface, 'Result set is a Drupal statement object.');
foreach ($result as $record) {
$records[] = $record;
- $this->assertTrue(is_object($record), t('Record is an object.'));
- $this->assertIdentical($record->name, 'John', t('25 year old is John.'));
+ $this->assertTrue(is_object($record), 'Record is an object.');
+ $this->assertIdentical($record->name, 'John', '25 year old is John.');
}
- $this->assertIdentical(count($records), 1, t('There is only one record.'));
+ $this->assertIdentical(count($records), 1, 'There is only one record.');
}
/**
@@ -49,11 +49,11 @@ class FetchTest extends DatabaseTestBase {
$result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => PDO::FETCH_OBJ));
foreach ($result as $record) {
$records[] = $record;
- $this->assertTrue(is_object($record), t('Record is an object.'));
- $this->assertIdentical($record->name, 'John', t('25 year old is John.'));
+ $this->assertTrue(is_object($record), 'Record is an object.');
+ $this->assertIdentical($record->name, 'John', '25 year old is John.');
}
- $this->assertIdentical(count($records), 1, t('There is only one record.'));
+ $this->assertIdentical(count($records), 1, 'There is only one record.');
}
/**
@@ -65,11 +65,11 @@ class FetchTest extends DatabaseTestBase {
foreach ($result as $record) {
$records[] = $record;
if ($this->assertTrue(is_array($record), t('Record is an array.'))) {
- $this->assertIdentical($record['name'], 'John', t('Record can be accessed associatively.'));
+ $this->assertIdentical($record['name'], 'John', 'Record can be accessed associatively.');
}
}
- $this->assertIdentical(count($records), 1, t('There is only one record.'));
+ $this->assertIdentical(count($records), 1, 'There is only one record.');
}
/**
@@ -83,11 +83,11 @@ class FetchTest extends DatabaseTestBase {
foreach ($result as $record) {
$records[] = $record;
if ($this->assertTrue($record instanceof FakeRecord, t('Record is an object of class FakeRecord.'))) {
- $this->assertIdentical($record->name, 'John', t('25 year old is John.'));
+ $this->assertIdentical($record->name, 'John', '25 year old is John.');
}
}
- $this->assertIdentical(count($records), 1, t('There is only one record.'));
+ $this->assertIdentical(count($records), 1, 'There is only one record.');
}
// Confirm that we can fetch a record into an indexed array explicitly.
@@ -97,7 +97,7 @@ class FetchTest extends DatabaseTestBase {
foreach ($result as $record) {
$records[] = $record;
if ($this->assertTrue(is_array($record), t('Record is an array.'))) {
- $this->assertIdentical($record[0], 'John', t('Record can be accessed numerically.'));
+ $this->assertIdentical($record[0], 'John', 'Record can be accessed numerically.');
}
}
@@ -113,12 +113,12 @@ class FetchTest extends DatabaseTestBase {
foreach ($result as $record) {
$records[] = $record;
if ($this->assertTrue(is_array($record), t('Record is an array.'))) {
- $this->assertIdentical($record[0], 'John', t('Record can be accessed numerically.'));
- $this->assertIdentical($record['name'], 'John', t('Record can be accessed associatively.'));
+ $this->assertIdentical($record[0], 'John', 'Record can be accessed numerically.');
+ $this->assertIdentical($record['name'], 'John', 'Record can be accessed associatively.');
}
}
- $this->assertIdentical(count($records), 1, t('There is only one record.'));
+ $this->assertIdentical(count($records), 1, 'There is only one record.');
}
/**
@@ -133,7 +133,7 @@ class FetchTest extends DatabaseTestBase {
$result = db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25));
$i = 0;
foreach ($result as $record) {
- $this->assertIdentical($record->name, $column[$i++], t('Column matches direct accesss.'));
+ $this->assertIdentical($record->name, $column[$i++], 'Column matches direct accesss.');
}
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InsertDefaultsTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/InsertDefaultsTest.php
index 20a620d..8398975 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/InsertDefaultsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/InsertDefaultsTest.php
@@ -32,7 +32,7 @@ class InsertDefaultsTest extends DatabaseTestBase {
$schema = drupal_get_schema('test');
$job = db_query('SELECT job FROM {test} WHERE id = :id', array(':id' => $id))->fetchField();
- $this->assertEqual($job, $schema['fields']['job']['default'], t('Default field value is set.'));
+ $this->assertEqual($job, $schema['fields']['job']['default'], 'Default field value is set.');
}
/**
@@ -50,7 +50,7 @@ class InsertDefaultsTest extends DatabaseTestBase {
}
$num_records_after = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
- $this->assertIdentical($num_records_before, $num_records_after, t('Do nothing as no fields are specified.'));
+ $this->assertIdentical($num_records_before, $num_records_after, 'Do nothing as no fields are specified.');
}
/**
@@ -65,6 +65,6 @@ class InsertDefaultsTest extends DatabaseTestBase {
$schema = drupal_get_schema('test');
$job = db_query('SELECT job FROM {test} WHERE id = :id', array(':id' => $id))->fetchField();
- $this->assertEqual($job, $schema['fields']['job']['default'], t('Default field value is set.'));
+ $this->assertEqual($job, $schema['fields']['job']['default'], 'Default field value is set.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php
index 96b98ee..bb89ae8 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php
@@ -25,7 +25,7 @@ class InsertLobTest extends DatabaseTestBase {
*/
function testInsertOneBlob() {
$data = "This is\000a test.";
- $this->assertTrue(strlen($data) === 15, t('Test data contains a NULL.'));
+ $this->assertTrue(strlen($data) === 15, 'Test data contains a NULL.');
$id = db_insert('test_one_blob')
->fields(array('blob1' => $data))
->execute();
@@ -44,6 +44,6 @@ class InsertLobTest extends DatabaseTestBase {
))
->execute();
$r = db_query('SELECT * FROM {test_two_blobs} WHERE id = :id', array(':id' => $id))->fetchAssoc();
- $this->assertTrue($r['blob1'] === 'This is' && $r['blob2'] === 'a test', t('Can insert multiple blobs per row.'));
+ $this->assertTrue($r['blob1'] === 'This is' && $r['blob2'] === 'a test', 'Can insert multiple blobs per row.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InsertTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/InsertTest.php
index 4cdac3f..dcf4c14 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/InsertTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/InsertTest.php
@@ -34,9 +34,9 @@ class InsertTest extends DatabaseTestBase {
$query->execute();
$num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
- $this->assertIdentical($num_records_before + 1, (int) $num_records_after, t('Record inserts correctly.'));
+ $this->assertIdentical($num_records_before + 1, (int) $num_records_after, 'Record inserts correctly.');
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Yoko'))->fetchField();
- $this->assertIdentical($saved_age, '29', t('Can retrieve after inserting.'));
+ $this->assertIdentical($saved_age, '29', 'Can retrieve after inserting.');
}
/**
@@ -63,13 +63,13 @@ class InsertTest extends DatabaseTestBase {
$query->execute();
$num_records_after = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
- $this->assertIdentical($num_records_before + 3, $num_records_after, t('Record inserts correctly.'));
+ $this->assertIdentical($num_records_before + 3, $num_records_after, 'Record inserts correctly.');
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Larry'))->fetchField();
- $this->assertIdentical($saved_age, '30', t('Can retrieve after inserting.'));
+ $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Curly'))->fetchField();
- $this->assertIdentical($saved_age, '31', t('Can retrieve after inserting.'));
+ $this->assertIdentical($saved_age, '31', 'Can retrieve after inserting.');
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Moe'))->fetchField();
- $this->assertIdentical($saved_age, '32', t('Can retrieve after inserting.'));
+ $this->assertIdentical($saved_age, '32', 'Can retrieve after inserting.');
}
/**
@@ -98,13 +98,13 @@ class InsertTest extends DatabaseTestBase {
$query->execute();
$num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
- $this->assertIdentical((int) $num_records_before + 3, (int) $num_records_after, t('Record inserts correctly.'));
+ $this->assertIdentical((int) $num_records_before + 3, (int) $num_records_after, 'Record inserts correctly.');
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Larry'))->fetchField();
- $this->assertIdentical($saved_age, '30', t('Can retrieve after inserting.'));
+ $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Curly'))->fetchField();
- $this->assertIdentical($saved_age, '31', t('Can retrieve after inserting.'));
+ $this->assertIdentical($saved_age, '31', 'Can retrieve after inserting.');
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Moe'))->fetchField();
- $this->assertIdentical($saved_age, '32', t('Can retrieve after inserting.'));
+ $this->assertIdentical($saved_age, '32', 'Can retrieve after inserting.');
}
/**
@@ -120,11 +120,11 @@ class InsertTest extends DatabaseTestBase {
->values(array('Moe', '32'))
->execute();
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Larry'))->fetchField();
- $this->assertIdentical($saved_age, '30', t('Can retrieve after inserting.'));
+ $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Curly'))->fetchField();
- $this->assertIdentical($saved_age, '31', t('Can retrieve after inserting.'));
+ $this->assertIdentical($saved_age, '31', 'Can retrieve after inserting.');
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Moe'))->fetchField();
- $this->assertIdentical($saved_age, '32', t('Can retrieve after inserting.'));
+ $this->assertIdentical($saved_age, '32', 'Can retrieve after inserting.');
}
/**
@@ -138,7 +138,7 @@ class InsertTest extends DatabaseTestBase {
))
->execute();
- $this->assertIdentical($id, '5', t('Auto-increment ID returned successfully.'));
+ $this->assertIdentical($id, '5', 'Auto-increment ID returned successfully.');
}
/**
@@ -164,6 +164,6 @@ class InsertTest extends DatabaseTestBase {
->execute();
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Meredith'))->fetchField();
- $this->assertIdentical($saved_age, '30', t('Can retrieve after inserting.'));
+ $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InvalidDataTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/InvalidDataTest.php
index a2230be..eb87991 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/InvalidDataTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/InvalidDataTest.php
@@ -72,7 +72,7 @@ class InvalidDataTest extends DatabaseTestBase {
->condition('age', array(17, 75), 'IN')
->execute()->fetchObject();
- $this->assertFalse($record, t('The rest of the insert aborted as expected.'));
+ $this->assertFalse($record, 'The rest of the insert aborted as expected.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/LoggingTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/LoggingTest.php
index 60d2a3c..6f2d363 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/LoggingTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/LoggingTest.php
@@ -33,10 +33,10 @@ class LoggingTest extends DatabaseTestBase {
$queries = Database::getLog('testing', 'default');
- $this->assertEqual(count($queries), 2, t('Correct number of queries recorded.'));
+ $this->assertEqual(count($queries), 2, 'Correct number of queries recorded.');
foreach ($queries as $query) {
- $this->assertEqual($query['caller']['function'], __FUNCTION__, t('Correct function in query log.'));
+ $this->assertEqual($query['caller']['function'], __FUNCTION__, 'Correct function in query log.');
}
}
@@ -55,8 +55,8 @@ class LoggingTest extends DatabaseTestBase {
$queries1 = Database::getLog('testing1');
$queries2 = Database::getLog('testing2');
- $this->assertEqual(count($queries1), 2, t('Correct number of queries recorded for log 1.'));
- $this->assertEqual(count($queries2), 1, t('Correct number of queries recorded for log 2.'));
+ $this->assertEqual(count($queries1), 2, 'Correct number of queries recorded for log 1.');
+ $this->assertEqual(count($queries2), 1, 'Correct number of queries recorded for log 2.');
}
/**
@@ -76,9 +76,9 @@ class LoggingTest extends DatabaseTestBase {
$queries1 = Database::getLog('testing1');
- $this->assertEqual(count($queries1), 2, t('Recorded queries from all targets.'));
- $this->assertEqual($queries1[0]['target'], 'default', t('First query used default target.'));
- $this->assertEqual($queries1[1]['target'], 'slave', t('Second query used slave target.'));
+ $this->assertEqual(count($queries1), 2, 'Recorded queries from all targets.');
+ $this->assertEqual($queries1[0]['target'], 'default', 'First query used default target.');
+ $this->assertEqual($queries1[1]['target'], 'slave', 'Second query used slave target.');
}
/**
@@ -102,9 +102,9 @@ class LoggingTest extends DatabaseTestBase {
$queries1 = Database::getLog('testing1');
- $this->assertEqual(count($queries1), 2, t('Recorded queries from all targets.'));
- $this->assertEqual($queries1[0]['target'], 'default', t('First query used default target.'));
- $this->assertEqual($queries1[1]['target'], 'default', t('Second query used default target as fallback.'));
+ $this->assertEqual(count($queries1), 2, 'Recorded queries from all targets.');
+ $this->assertEqual($queries1[0]['target'], 'default', 'First query used default target.');
+ $this->assertEqual($queries1[1]['target'], 'default', 'Second query used default target as fallback.');
}
/**
@@ -130,7 +130,7 @@ class LoggingTest extends DatabaseTestBase {
$queries1 = Database::getLog('testing1');
$queries2 = Database::getLog('testing1', 'test2');
- $this->assertEqual(count($queries1), 1, t('Correct number of queries recorded for first connection.'));
- $this->assertEqual(count($queries2), 1, t('Correct number of queries recorded for second connection.'));
+ $this->assertEqual(count($queries1), 1, 'Correct number of queries recorded for first connection.');
+ $this->assertEqual(count($queries2), 1, 'Correct number of queries recorded for second connection.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/MergeTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/MergeTest.php
index 4ec816e..ebe49d2 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/MergeTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/MergeTest.php
@@ -37,15 +37,15 @@ class MergeTest extends DatabaseTestBase {
))
->execute();
- $this->assertEqual($result, Merge::STATUS_INSERT, t('Insert status returned.'));
+ $this->assertEqual($result, Merge::STATUS_INSERT, 'Insert status returned.');
$num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
- $this->assertEqual($num_records_before + 1, $num_records_after, t('Merge inserted properly.'));
+ $this->assertEqual($num_records_before + 1, $num_records_after, 'Merge inserted properly.');
$person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Presenter'))->fetch();
- $this->assertEqual($person->name, 'Tiffany', t('Name set correctly.'));
- $this->assertEqual($person->age, 31, t('Age set correctly.'));
- $this->assertEqual($person->job, 'Presenter', t('Job set correctly.'));
+ $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
+ $this->assertEqual($person->age, 31, 'Age set correctly.');
+ $this->assertEqual($person->job, 'Presenter', 'Job set correctly.');
}
/**
@@ -62,15 +62,15 @@ class MergeTest extends DatabaseTestBase {
))
->execute();
- $this->assertEqual($result, Merge::STATUS_UPDATE, t('Update status returned.'));
+ $this->assertEqual($result, Merge::STATUS_UPDATE, 'Update status returned.');
$num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
- $this->assertEqual($num_records_before, $num_records_after, t('Merge updated properly.'));
+ $this->assertEqual($num_records_before, $num_records_after, 'Merge updated properly.');
$person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
- $this->assertEqual($person->name, 'Tiffany', t('Name set correctly.'));
- $this->assertEqual($person->age, 31, t('Age set correctly.'));
- $this->assertEqual($person->job, 'Speaker', t('Job set correctly.'));
+ $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
+ $this->assertEqual($person->age, 31, 'Age set correctly.');
+ $this->assertEqual($person->job, 'Speaker', 'Job set correctly.');
}
/**
@@ -86,12 +86,12 @@ class MergeTest extends DatabaseTestBase {
->execute();
$num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
- $this->assertEqual($num_records_before, $num_records_after, t('Merge updated properly.'));
+ $this->assertEqual($num_records_before, $num_records_after, 'Merge updated properly.');
$person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
- $this->assertEqual($person->name, 'Tiffany', t('Name set correctly.'));
- $this->assertEqual($person->age, 30, t('Age skipped correctly.'));
- $this->assertEqual($person->job, 'Speaker', t('Job set correctly.'));
+ $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
+ $this->assertEqual($person->age, 30, 'Age skipped correctly.');
+ $this->assertEqual($person->job, 'Speaker', 'Job set correctly.');
}
/**
@@ -112,12 +112,12 @@ class MergeTest extends DatabaseTestBase {
->execute();
$num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
- $this->assertEqual($num_records_before, $num_records_after, t('Merge updated properly.'));
+ $this->assertEqual($num_records_before, $num_records_after, 'Merge updated properly.');
$person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
- $this->assertEqual($person->name, 'Joe', t('Name set correctly.'));
- $this->assertEqual($person->age, 30, t('Age skipped correctly.'));
- $this->assertEqual($person->job, 'Speaker', t('Job set correctly.'));
+ $this->assertEqual($person->name, 'Joe', 'Name set correctly.');
+ $this->assertEqual($person->age, 30, 'Age skipped correctly.');
+ $this->assertEqual($person->job, 'Speaker', 'Job set correctly.');
}
/**
@@ -141,12 +141,12 @@ class MergeTest extends DatabaseTestBase {
->execute();
$num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
- $this->assertEqual($num_records_before, $num_records_after, t('Merge updated properly.'));
+ $this->assertEqual($num_records_before, $num_records_after, 'Merge updated properly.');
$person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
- $this->assertEqual($person->name, 'Tiffany', t('Name set correctly.'));
- $this->assertEqual($person->age, $age_before + 4, t('Age updated correctly.'));
- $this->assertEqual($person->job, 'Speaker', t('Job set correctly.'));
+ $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
+ $this->assertEqual($person->age, $age_before + 4, 'Age updated correctly.');
+ $this->assertEqual($person->job, 'Speaker', 'Job set correctly.');
}
/**
@@ -160,12 +160,12 @@ class MergeTest extends DatabaseTestBase {
->execute();
$num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
- $this->assertEqual($num_records_before + 1, $num_records_after, t('Merge inserted properly.'));
+ $this->assertEqual($num_records_before + 1, $num_records_after, 'Merge inserted properly.');
$person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Presenter'))->fetch();
- $this->assertEqual($person->name, '', t('Name set correctly.'));
- $this->assertEqual($person->age, 0, t('Age set correctly.'));
- $this->assertEqual($person->job, 'Presenter', t('Job set correctly.'));
+ $this->assertEqual($person->name, '', 'Name set correctly.');
+ $this->assertEqual($person->age, 0, 'Age set correctly.');
+ $this->assertEqual($person->job, 'Presenter', 'Job set correctly.');
}
/**
@@ -179,12 +179,12 @@ class MergeTest extends DatabaseTestBase {
->execute();
$num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
- $this->assertEqual($num_records_before, $num_records_after, t('Merge skipped properly.'));
+ $this->assertEqual($num_records_before, $num_records_after, 'Merge skipped properly.');
$person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
- $this->assertEqual($person->name, 'Meredith', t('Name skipped correctly.'));
- $this->assertEqual($person->age, 30, t('Age skipped correctly.'));
- $this->assertEqual($person->job, 'Speaker', t('Job skipped correctly.'));
+ $this->assertEqual($person->name, 'Meredith', 'Name skipped correctly.');
+ $this->assertEqual($person->age, 30, 'Age skipped correctly.');
+ $this->assertEqual($person->job, 'Speaker', 'Job skipped correctly.');
db_merge('test_people')
->key(array('job' => 'Speaker'))
@@ -192,12 +192,12 @@ class MergeTest extends DatabaseTestBase {
->execute();
$num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
- $this->assertEqual($num_records_before, $num_records_after, t('Merge skipped properly.'));
+ $this->assertEqual($num_records_before, $num_records_after, 'Merge skipped properly.');
$person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
- $this->assertEqual($person->name, 'Meredith', t('Name skipped correctly.'));
- $this->assertEqual($person->age, 30, t('Age skipped correctly.'));
- $this->assertEqual($person->job, 'Speaker', t('Job skipped correctly.'));
+ $this->assertEqual($person->name, 'Meredith', 'Name skipped correctly.');
+ $this->assertEqual($person->age, 30, 'Age skipped correctly.');
+ $this->assertEqual($person->job, 'Speaker', 'Job skipped correctly.');
}
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/NextIdTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/NextIdTest.php
index e375d43..db31a5c 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/NextIdTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/NextIdTest.php
@@ -30,8 +30,8 @@ class NextIdTest extends WebTestBase {
// We can test for exact increase in here because we know there is no
// other process operating on these tables -- normally we could only
// expect $second > $first.
- $this->assertEqual($first + 1, $second, t('The second call from a sequence provides a number increased by one.'));
+ $this->assertEqual($first + 1, $second, 'The second call from a sequence provides a number increased by one.');
$result = db_next_id(1000);
- $this->assertEqual($result, 1001, t('Sequence provides a larger number than the existing ID.'));
+ $this->assertEqual($result, 1001, 'Sequence provides a larger number than the existing ID.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/QueryTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/QueryTest.php
index 4f49ca6..034d7f3 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/QueryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/QueryTest.php
@@ -25,6 +25,6 @@ class QueryTest extends DatabaseTestBase {
function testArraySubstitution() {
$names = db_query('SELECT name FROM {test} WHERE age IN (:ages) ORDER BY age', array(':ages' => array(25, 26, 27)))->fetchAll();
- $this->assertEqual(count($names), 3, t('Correct number of names returned'));
+ $this->assertEqual(count($names), 3, 'Correct number of names returned');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/RangeQueryTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/RangeQueryTest.php
index 57bc025..9f8286a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/RangeQueryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/RangeQueryTest.php
@@ -31,11 +31,11 @@ class RangeQueryTest extends WebTestBase {
function testRangeQuery() {
// Test if return correct number of rows.
$range_rows = db_query_range("SELECT name FROM {system} ORDER BY name", 2, 3)->fetchAll();
- $this->assertEqual(count($range_rows), 3, t('Range query work and return correct number of rows.'));
+ $this->assertEqual(count($range_rows), 3, 'Range query work and return correct number of rows.');
// Test if return target data.
$raw_rows = db_query('SELECT name FROM {system} ORDER BY name')->fetchAll();
$raw_rows = array_slice($raw_rows, 2, 3);
- $this->assertEqual($range_rows, $raw_rows, t('Range query work and return target data.'));
+ $this->assertEqual($range_rows, $raw_rows, 'Range query work and return target data.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/RegressionTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/RegressionTest.php
index 0c36cb3..fc694d0 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/RegressionTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/RegressionTest.php
@@ -48,23 +48,23 @@ class RegressionTest extends DatabaseTestBase {
* Test the db_table_exists() function.
*/
function testDBTableExists() {
- $this->assertIdentical(TRUE, db_table_exists('node'), t('Returns true for existent table.'));
- $this->assertIdentical(FALSE, db_table_exists('nosuchtable'), t('Returns false for nonexistent table.'));
+ $this->assertIdentical(TRUE, db_table_exists('node'), 'Returns true for existent table.');
+ $this->assertIdentical(FALSE, db_table_exists('nosuchtable'), 'Returns false for nonexistent table.');
}
/**
* Test the db_field_exists() function.
*/
function testDBFieldExists() {
- $this->assertIdentical(TRUE, db_field_exists('node', 'nid'), t('Returns true for existent column.'));
- $this->assertIdentical(FALSE, db_field_exists('node', 'nosuchcolumn'), t('Returns false for nonexistent column.'));
+ $this->assertIdentical(TRUE, db_field_exists('node', 'nid'), 'Returns true for existent column.');
+ $this->assertIdentical(FALSE, db_field_exists('node', 'nosuchcolumn'), 'Returns false for nonexistent column.');
}
/**
* Test the db_index_exists() function.
*/
function testDBIndexExists() {
- $this->assertIdentical(TRUE, db_index_exists('node', 'node_created'), t('Returns true for existent index.'));
- $this->assertIdentical(FALSE, db_index_exists('node', 'nosuchindex'), t('Returns false for nonexistent index.'));
+ $this->assertIdentical(TRUE, db_index_exists('node', 'node_created'), 'Returns true for existent index.');
+ $this->assertIdentical(FALSE, db_index_exists('node', 'nosuchindex'), 'Returns false for nonexistent index.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectComplexTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/SelectComplexTest.php
index 8b8e6fd..b404259 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/SelectComplexTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/SelectComplexTest.php
@@ -41,12 +41,12 @@ class SelectComplexTest extends DatabaseTestBase {
$last_priority = 0;
foreach ($result as $record) {
$num_records++;
- $this->assertTrue($record->$priority_field >= $last_priority, t('Results returned in correct order.'));
- $this->assertNotEqual($record->$name_field, 'Ringo', t('Taskless person not selected.'));
+ $this->assertTrue($record->$priority_field >= $last_priority, 'Results returned in correct order.');
+ $this->assertNotEqual($record->$name_field, 'Ringo', 'Taskless person not selected.');
$last_priority = $record->$priority_field;
}
- $this->assertEqual($num_records, 7, t('Returned the correct number of rows.'));
+ $this->assertEqual($num_records, 7, 'Returned the correct number of rows.');
}
/**
@@ -67,11 +67,11 @@ class SelectComplexTest extends DatabaseTestBase {
foreach ($result as $record) {
$num_records++;
- $this->assertTrue(strcmp($record->$name_field, $last_name) >= 0, t('Results returned in correct order.'));
+ $this->assertTrue(strcmp($record->$name_field, $last_name) >= 0, 'Results returned in correct order.');
$last_priority = $record->$name_field;
}
- $this->assertEqual($num_records, 8, t('Returned the correct number of rows.'));
+ $this->assertEqual($num_records, 8, 'Returned the correct number of rows.');
}
/**
@@ -90,7 +90,7 @@ class SelectComplexTest extends DatabaseTestBase {
$records = array();
foreach ($result as $record) {
$num_records++;
- $this->assertTrue($record->$count_field >= $last_count, t('Results returned in correct order.'));
+ $this->assertTrue($record->$count_field >= $last_count, 'Results returned in correct order.');
$last_count = $record->$count_field;
$records[$record->$task_field] = $record->$count_field;
}
@@ -107,7 +107,7 @@ class SelectComplexTest extends DatabaseTestBase {
$this->assertEqual($records[$task], $count, t("Correct number of '@task' records found.", array('@task' => $task)));
}
- $this->assertEqual($num_records, 6, t('Returned the correct number of total rows.'));
+ $this->assertEqual($num_records, 6, 'Returned the correct number of total rows.');
}
/**
@@ -127,8 +127,8 @@ class SelectComplexTest extends DatabaseTestBase {
$records = array();
foreach ($result as $record) {
$num_records++;
- $this->assertTrue($record->$count_field >= 2, t('Record has the minimum count.'));
- $this->assertTrue($record->$count_field >= $last_count, t('Results returned in correct order.'));
+ $this->assertTrue($record->$count_field >= 2, 'Record has the minimum count.');
+ $this->assertTrue($record->$count_field >= $last_count, 'Results returned in correct order.');
$last_count = $record->$count_field;
$records[$record->$task_field] = $record->$count_field;
}
@@ -141,7 +141,7 @@ class SelectComplexTest extends DatabaseTestBase {
$this->assertEqual($records[$task], $count, t("Correct number of '@task' records found.", array('@task' => $task)));
}
- $this->assertEqual($num_records, 1, t('Returned the correct number of total rows.'));
+ $this->assertEqual($num_records, 1, 'Returned the correct number of total rows.');
}
/**
@@ -159,7 +159,7 @@ class SelectComplexTest extends DatabaseTestBase {
$num_records++;
}
- $this->assertEqual($num_records, 2, t('Returned the correct number of rows.'));
+ $this->assertEqual($num_records, 2, 'Returned the correct number of rows.');
}
/**
@@ -176,7 +176,7 @@ class SelectComplexTest extends DatabaseTestBase {
$num_records++;
}
- $this->assertEqual($num_records, 6, t('Returned the correct number of rows.'));
+ $this->assertEqual($num_records, 6, 'Returned the correct number of rows.');
}
/**
@@ -190,13 +190,13 @@ class SelectComplexTest extends DatabaseTestBase {
$count = $query->countQuery()->execute()->fetchField();
- $this->assertEqual($count, 4, t('Counted the correct number of records.'));
+ $this->assertEqual($count, 4, 'Counted the correct number of records.');
// Now make sure we didn't break the original query! We should still have
// all of the fields we asked for.
$record = $query->execute()->fetch();
- $this->assertEqual($record->$name_field, 'George', t('Correct data retrieved.'));
- $this->assertEqual($record->$age_field, 27, t('Correct data retrieved.'));
+ $this->assertEqual($record->$name_field, 'George', 'Correct data retrieved.');
+ $this->assertEqual($record->$age_field, 27, 'Correct data retrieved.');
}
function testHavingCountQuery() {
@@ -207,7 +207,7 @@ class SelectComplexTest extends DatabaseTestBase {
$query->addField('test', 'age');
$query->addExpression('age + 1');
$count = count($query->execute()->fetchCol());
- $this->assertEqual($count, 4, t('Counted the correct number of records.'));
+ $this->assertEqual($count, 4, 'Counted the correct number of records.');
}
/**
@@ -228,14 +228,14 @@ class SelectComplexTest extends DatabaseTestBase {
// Check that the ordering clause is handled properly.
$orderby = $query->getOrderBy();
- $this->assertEqual($orderby['name'], 'ASC', t('Query correctly sets ordering clause.'));
+ $this->assertEqual($orderby['name'], 'ASC', 'Query correctly sets ordering clause.');
$orderby = $count->getOrderBy();
- $this->assertFalse(isset($orderby['name']), t('Count query correctly unsets ordering caluse.'));
+ $this->assertFalse(isset($orderby['name']), 'Count query correctly unsets ordering caluse.');
// Make sure that the count query works.
$count = $count->execute()->fetchField();
- $this->assertEqual($count, 4, t('Counted the correct number of records.'));
+ $this->assertEqual($count, 4, 'Counted the correct number of records.');
}
@@ -250,11 +250,11 @@ class SelectComplexTest extends DatabaseTestBase {
// records in the {test} table).
$query = db_select('test');
$query->fields('test', array('fail'));
- $this->assertEqual(4, $query->countQuery()->execute()->fetchField(), t('Count Query removed fields'));
+ $this->assertEqual(4, $query->countQuery()->execute()->fetchField(), 'Count Query removed fields');
$query = db_select('test');
$query->addExpression('fail');
- $this->assertEqual(4, $query->countQuery()->execute()->fetchField(), t('Count Query removed expressions'));
+ $this->assertEqual(4, $query->countQuery()->execute()->fetchField(), 'Count Query removed expressions');
}
/**
@@ -267,7 +267,7 @@ class SelectComplexTest extends DatabaseTestBase {
$count = $query->countQuery()->execute()->fetchField();
- $this->assertEqual($count, 6, t('Counted the correct number of records.'));
+ $this->assertEqual($count, 6, 'Counted the correct number of records.');
}
/**
@@ -280,7 +280,7 @@ class SelectComplexTest extends DatabaseTestBase {
$count = $query->countQuery()->execute()->fetchField();
- $this->assertEqual($count, 3, t('Counted the correct number of records.'));
+ $this->assertEqual($count, 3, 'Counted the correct number of records.');
// Use a column alias as, without one, the query can succeed for the wrong
// reason.
@@ -292,7 +292,7 @@ class SelectComplexTest extends DatabaseTestBase {
$count = $query->countQuery()->execute()->fetchField();
- $this->assertEqual($count, 3, t('Counted the correct number of records.'));
+ $this->assertEqual($count, 3, 'Counted the correct number of records.');
}
/**
@@ -309,7 +309,7 @@ class SelectComplexTest extends DatabaseTestBase {
$query->condition(db_or()->condition('age', 26)->condition('age', 27));
$job = $query->execute()->fetchField();
- $this->assertEqual($job, 'Songwriter', t('Correct data retrieved.'));
+ $this->assertEqual($job, 'Songwriter', 'Correct data retrieved.');
}
/**
@@ -322,8 +322,8 @@ class SelectComplexTest extends DatabaseTestBase {
$query->addField($alias, 'job', 'otherjob');
$query->where("$alias.name <> test.name");
$crowded_job = $query->execute()->fetch();
- $this->assertEqual($crowded_job->job, $crowded_job->otherjob, t('Correctly joined same table twice.'));
- $this->assertNotEqual($crowded_job->name, $crowded_job->othername, t('Correctly joined same table twice.'));
+ $this->assertEqual($crowded_job->job, $crowded_job->otherjob, 'Correctly joined same table twice.');
+ $this->assertNotEqual($crowded_job->name, $crowded_job->othername, 'Correctly joined same table twice.');
}
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectOrderedTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/SelectOrderedTest.php
index d9b1088..4d0cab1 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/SelectOrderedTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/SelectOrderedTest.php
@@ -36,11 +36,11 @@ class SelectOrderedTest extends DatabaseTestBase {
$last_age = 0;
foreach ($result as $record) {
$num_records++;
- $this->assertTrue($record->age >= $last_age, t('Results returned in correct order.'));
+ $this->assertTrue($record->age >= $last_age, 'Results returned in correct order.');
$last_age = $record->age;
}
- $this->assertEqual($num_records, 4, t('Returned the correct number of rows.'));
+ $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
}
/**
@@ -67,11 +67,11 @@ class SelectOrderedTest extends DatabaseTestBase {
$num_records++;
foreach ($record as $kk => $col) {
if ($expected[$k][$kk] != $results[$k][$kk]) {
- $this->assertTrue(FALSE, t('Results returned in correct order.'));
+ $this->assertTrue(FALSE, 'Results returned in correct order.');
}
}
}
- $this->assertEqual($num_records, 4, t('Returned the correct number of rows.'));
+ $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
}
/**
@@ -88,10 +88,10 @@ class SelectOrderedTest extends DatabaseTestBase {
$last_age = 100000000;
foreach ($result as $record) {
$num_records++;
- $this->assertTrue($record->age <= $last_age, t('Results returned in correct order.'));
+ $this->assertTrue($record->age <= $last_age, 'Results returned in correct order.');
$last_age = $record->age;
}
- $this->assertEqual($num_records, 4, t('Returned the correct number of rows.'));
+ $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectPagerDefaultTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/SelectPagerDefaultTest.php
index 766013d..5954d0a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/SelectPagerDefaultTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/SelectPagerDefaultTest.php
@@ -107,7 +107,7 @@ class SelectPagerDefaultTest extends DatabaseTestBase {
$ages = $outer_query
->execute()
->fetchCol();
- $this->assertEqual($ages, array(25, 26, 27, 28), t('Inner pager query returned the correct ages.'));
+ $this->assertEqual($ages, array(25, 26, 27, 28), 'Inner pager query returned the correct ages.');
}
/**
@@ -128,7 +128,7 @@ class SelectPagerDefaultTest extends DatabaseTestBase {
$ages = $query
->execute()
->fetchCol();
- $this->assertEqual($ages, array('George', 'Ringo'), t('Pager query with having expression returned the correct ages.'));
+ $this->assertEqual($ages, array('George', 'Ringo'), 'Pager query with having expression returned the correct ages.');
}
/**
@@ -145,7 +145,7 @@ class SelectPagerDefaultTest extends DatabaseTestBase {
->limit(1)
->execute()
->fetchField();
- $this->assertEqual($name, 'Paul', t('Pager query #1 with a specified element ID returned the correct results.'));
+ $this->assertEqual($name, 'Paul', 'Pager query #1 with a specified element ID returned the correct results.');
// Setting an element smaller than the previous one
// should not overwrite the pager $maxElement with a smaller value.
@@ -157,7 +157,7 @@ class SelectPagerDefaultTest extends DatabaseTestBase {
->limit(1)
->execute()
->fetchField();
- $this->assertEqual($name, 'George', t('Pager query #2 with a specified element ID returned the correct results.'));
+ $this->assertEqual($name, 'George', 'Pager query #2 with a specified element ID returned the correct results.');
$name = db_select('test', 't')
->extend('Drupal\Core\Database\Query\PagerSelectExtender')
@@ -166,7 +166,7 @@ class SelectPagerDefaultTest extends DatabaseTestBase {
->limit(1)
->execute()
->fetchField();
- $this->assertEqual($name, 'John', t('Pager query #3 with a generated element ID returned the correct results.'));
+ $this->assertEqual($name, 'John', 'Pager query #3 with a generated element ID returned the correct results.');
unset($_GET['page']);
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectSubqueryTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/SelectSubqueryTest.php
index af87f8d..81fd018 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/SelectSubqueryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/SelectSubqueryTest.php
@@ -50,7 +50,7 @@ class SelectSubqueryTest extends DatabaseTestBase {
// WHERE tt.task = 'code'
$people = $select->execute()->fetchCol();
- $this->assertEqual(count($people), 1, t('Returned the correct number of rows.'));
+ $this->assertEqual(count($people), 1, 'Returned the correct number of rows.');
}
}
@@ -77,7 +77,7 @@ class SelectSubqueryTest extends DatabaseTestBase {
// INNER JOIN test t ON t.id=tt.pid
$people = $select->execute()->fetchCol();
- $this->assertEqual(count($people), 1, t('Returned the correct number of rows.'));
+ $this->assertEqual(count($people), 1, 'Returned the correct number of rows.');
}
/**
@@ -100,7 +100,7 @@ class SelectSubqueryTest extends DatabaseTestBase {
// FROM test tt2
// WHERE tt2.pid IN (SELECT tt.pid AS pid FROM test_task tt WHERE tt.priority=1)
$people = $select->execute()->fetchCol();
- $this->assertEqual(count($people), 5, t('Returned the correct number of rows.'));
+ $this->assertEqual(count($people), 5, 'Returned the correct number of rows.');
}
/**
@@ -124,7 +124,7 @@ class SelectSubqueryTest extends DatabaseTestBase {
// INNER JOIN (SELECT tt.pid AS pid FROM test_task tt WHERE priority=1) tt ON t.id=tt.pid
$people = $select->execute()->fetchCol();
- $this->assertEqual(count($people), 2, t('Returned the correct number of rows.'));
+ $this->assertEqual(count($people), 2, 'Returned the correct number of rows.');
}
/**
@@ -154,7 +154,7 @@ class SelectSubqueryTest extends DatabaseTestBase {
// Ensure that we got the right record.
$record = $result->fetch();
- $this->assertEqual($record->name, 'George', t('Fetched name is correct using EXISTS query.'));
+ $this->assertEqual($record->name, 'George', 'Fetched name is correct using EXISTS query.');
}
/**
@@ -184,6 +184,6 @@ class SelectSubqueryTest extends DatabaseTestBase {
// Ensure that we got the right number of records.
$people = $query->execute()->fetchCol();
- $this->assertEqual(count($people), 3, t('NOT EXISTS query returned the correct results.'));
+ $this->assertEqual(count($people), 3, 'NOT EXISTS query returned the correct results.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectTableSortDefaultTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/SelectTableSortDefaultTest.php
index bf1e81f..0488d1f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/SelectTableSortDefaultTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/SelectTableSortDefaultTest.php
@@ -43,8 +43,8 @@ class SelectTableSortDefaultTest extends DatabaseTestBase {
$first = array_shift($data->tasks);
$last = array_pop($data->tasks);
- $this->assertEqual($first->task, $sort['first'], t('Items appear in the correct order.'));
- $this->assertEqual($last->task, $sort['last'], t('Items appear in the correct order.'));
+ $this->assertEqual($first->task, $sort['first'], 'Items appear in the correct order.');
+ $this->assertEqual($last->task, $sort['last'], 'Items appear in the correct order.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php
index 9c9f434..d487ba2 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php
@@ -34,7 +34,7 @@ class SelectTest extends DatabaseTestBase {
$num_records++;
}
- $this->assertEqual($num_records, 4, t('Returned the correct number of rows.'));
+ $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
}
/**
@@ -54,8 +54,8 @@ class SelectTest extends DatabaseTestBase {
$query = (string)$query;
$expected = "/* Testing query comments */ SELECT test.name AS name, test.age AS age\nFROM \n{test} test";
- $this->assertEqual($num_records, 4, t('Returned the correct number of rows.'));
- $this->assertEqual($query, $expected, t('The flattened query contains the comment string.'));
+ $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
+ $this->assertEqual($query, $expected, 'The flattened query contains the comment string.');
}
/**
@@ -75,8 +75,8 @@ class SelectTest extends DatabaseTestBase {
$query = (string)$query;
$expected = "/* Testing query comments SELECT nid FROM {node}; -- */ SELECT test.name AS name, test.age AS age\nFROM \n{test} test";
- $this->assertEqual($num_records, 4, t('Returned the correct number of rows.'));
- $this->assertEqual($query, $expected, t('The flattened query contains the sanitised comment string.'));
+ $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
+ $this->assertEqual($query, $expected, 'The flattened query contains the sanitised comment string.');
}
/**
@@ -90,13 +90,13 @@ class SelectTest extends DatabaseTestBase {
$result = $query->execute();
// Check that the aliases are being created the way we want.
- $this->assertEqual($name_field, 'name', t('Name field alias is correct.'));
- $this->assertEqual($age_field, 'age', t('Age field alias is correct.'));
+ $this->assertEqual($name_field, 'name', 'Name field alias is correct.');
+ $this->assertEqual($age_field, 'age', 'Age field alias is correct.');
// Ensure that we got the right record.
$record = $result->fetch();
- $this->assertEqual($record->$name_field, 'George', t('Fetched name is correct.'));
- $this->assertEqual($record->$age_field, 27, t('Fetched age is correct.'));
+ $this->assertEqual($record->$name_field, 'George', 'Fetched name is correct.');
+ $this->assertEqual($record->$age_field, 27, 'Fetched age is correct.');
}
/**
@@ -110,13 +110,13 @@ class SelectTest extends DatabaseTestBase {
$result = $query->execute();
// Check that the aliases are being created the way we want.
- $this->assertEqual($name_field, 'name', t('Name field alias is correct.'));
- $this->assertEqual($age_field, 'double_age', t('Age field alias is correct.'));
+ $this->assertEqual($name_field, 'name', 'Name field alias is correct.');
+ $this->assertEqual($age_field, 'double_age', 'Age field alias is correct.');
// Ensure that we got the right record.
$record = $result->fetch();
- $this->assertEqual($record->$name_field, 'George', t('Fetched name is correct.'));
- $this->assertEqual($record->$age_field, 27*2, t('Fetched age expression is correct.'));
+ $this->assertEqual($record->$name_field, 'George', 'Fetched name is correct.');
+ $this->assertEqual($record->$age_field, 27*2, 'Fetched age expression is correct.');
}
/**
@@ -131,14 +131,14 @@ class SelectTest extends DatabaseTestBase {
$result = $query->execute();
// Check that the aliases are being created the way we want.
- $this->assertEqual($age_double_field, 'expression', t('Double age field alias is correct.'));
- $this->assertEqual($age_triple_field, 'expression_2', t('Triple age field alias is correct.'));
+ $this->assertEqual($age_double_field, 'expression', 'Double age field alias is correct.');
+ $this->assertEqual($age_triple_field, 'expression_2', 'Triple age field alias is correct.');
// Ensure that we got the right record.
$record = $result->fetch();
- $this->assertEqual($record->$name_field, 'George', t('Fetched name is correct.'));
- $this->assertEqual($record->$age_double_field, 27*2, t('Fetched double age expression is correct.'));
- $this->assertEqual($record->$age_triple_field, 27*3, t('Fetched triple age expression is correct.'));
+ $this->assertEqual($record->$name_field, 'George', 'Fetched name is correct.');
+ $this->assertEqual($record->$age_double_field, 27*2, 'Fetched double age expression is correct.');
+ $this->assertEqual($record->$age_triple_field, 27*3, 'Fetched triple age expression is correct.');
}
/**
@@ -151,17 +151,17 @@ class SelectTest extends DatabaseTestBase {
->execute()->fetchObject();
// Check that all fields we asked for are present.
- $this->assertNotNull($record->id, t('ID field is present.'));
- $this->assertNotNull($record->name, t('Name field is present.'));
- $this->assertNotNull($record->age, t('Age field is present.'));
- $this->assertNotNull($record->job, t('Job field is present.'));
+ $this->assertNotNull($record->id, 'ID field is present.');
+ $this->assertNotNull($record->name, 'Name field is present.');
+ $this->assertNotNull($record->age, 'Age field is present.');
+ $this->assertNotNull($record->job, 'Job field is present.');
// Ensure that we got the right record.
// Check that all fields we asked for are present.
- $this->assertEqual($record->id, 2, t('ID field has the correct value.'));
- $this->assertEqual($record->name, 'George', t('Name field has the correct value.'));
- $this->assertEqual($record->age, 27, t('Age field has the correct value.'));
- $this->assertEqual($record->job, 'Singer', t('Job field has the correct value.'));
+ $this->assertEqual($record->id, 2, 'ID field has the correct value.');
+ $this->assertEqual($record->name, 'George', 'Name field has the correct value.');
+ $this->assertEqual($record->age, 27, 'Age field has the correct value.');
+ $this->assertEqual($record->job, 'Singer', 'Job field has the correct value.');
}
/**
@@ -174,17 +174,17 @@ class SelectTest extends DatabaseTestBase {
->execute()->fetchObject();
// Check that all fields we asked for are present.
- $this->assertNotNull($record->id, t('ID field is present.'));
- $this->assertNotNull($record->name, t('Name field is present.'));
- $this->assertNotNull($record->age, t('Age field is present.'));
- $this->assertNotNull($record->job, t('Job field is present.'));
+ $this->assertNotNull($record->id, 'ID field is present.');
+ $this->assertNotNull($record->name, 'Name field is present.');
+ $this->assertNotNull($record->age, 'Age field is present.');
+ $this->assertNotNull($record->job, 'Job field is present.');
// Ensure that we got the right record.
// Check that all fields we asked for are present.
- $this->assertEqual($record->id, 2, t('ID field has the correct value.'));
- $this->assertEqual($record->name, 'George', t('Name field has the correct value.'));
- $this->assertEqual($record->age, 27, t('Age field has the correct value.'));
- $this->assertEqual($record->job, 'Singer', t('Job field has the correct value.'));
+ $this->assertEqual($record->id, 2, 'ID field has the correct value.');
+ $this->assertEqual($record->name, 'George', 'Name field has the correct value.');
+ $this->assertEqual($record->age, 27, 'Age field has the correct value.');
+ $this->assertEqual($record->job, 'Singer', 'Job field has the correct value.');
}
/**
@@ -198,7 +198,7 @@ class SelectTest extends DatabaseTestBase {
->condition('age', NULL)
->execute()->fetchCol();
- $this->assertEqual(count($names), 0, t('No records found when comparing to NULL.'));
+ $this->assertEqual(count($names), 0, 'No records found when comparing to NULL.');
}
/**
@@ -212,8 +212,8 @@ class SelectTest extends DatabaseTestBase {
->isNull('age')
->execute()->fetchCol();
- $this->assertEqual(count($names), 1, t('Correct number of records found with NULL age.'));
- $this->assertEqual($names[0], 'Fozzie', t('Correct record returned for NULL age.'));
+ $this->assertEqual(count($names), 1, 'Correct number of records found with NULL age.');
+ $this->assertEqual($names[0], 'Fozzie', 'Correct record returned for NULL age.');
}
/**
@@ -228,9 +228,9 @@ class SelectTest extends DatabaseTestBase {
->orderBy('name')
->execute()->fetchCol();
- $this->assertEqual(count($names), 2, t('Correct number of records found withNOT NULL age.'));
- $this->assertEqual($names[0], 'Gonzo', t('Correct record returned for NOT NULL age.'));
- $this->assertEqual($names[1], 'Kermit', t('Correct record returned for NOT NULL age.'));
+ $this->assertEqual(count($names), 2, 'Correct number of records found withNOT NULL age.');
+ $this->assertEqual($names[0], 'Gonzo', 'Correct record returned for NOT NULL age.');
+ $this->assertEqual($names[1], 'Kermit', 'Correct record returned for NOT NULL age.');
}
/**
@@ -251,10 +251,10 @@ class SelectTest extends DatabaseTestBase {
$names = $query_1->execute()->fetchCol();
// Ensure we only get 2 records.
- $this->assertEqual(count($names), 2, t('UNION correctly discarded duplicates.'));
+ $this->assertEqual(count($names), 2, 'UNION correctly discarded duplicates.');
- $this->assertEqual($names[0], 'George', t('First query returned correct name.'));
- $this->assertEqual($names[1], 'Ringo', t('Second query returned correct name.'));
+ $this->assertEqual($names[0], 'George', 'First query returned correct name.');
+ $this->assertEqual($names[1], 'Ringo', 'Second query returned correct name.');
}
/**
@@ -274,11 +274,11 @@ class SelectTest extends DatabaseTestBase {
$names = $query_1->execute()->fetchCol();
// Ensure we get all 3 records.
- $this->assertEqual(count($names), 3, t('UNION ALL correctly preserved duplicates.'));
+ $this->assertEqual(count($names), 3, 'UNION ALL correctly preserved duplicates.');
- $this->assertEqual($names[0], 'George', t('First query returned correct first name.'));
- $this->assertEqual($names[1], 'Ringo', t('Second query returned correct second name.'));
- $this->assertEqual($names[2], 'Ringo', t('Third query returned correct name.'));
+ $this->assertEqual($names[0], 'George', 'First query returned correct first name.');
+ $this->assertEqual($names[1], 'Ringo', 'Second query returned correct second name.');
+ $this->assertEqual($names[2], 'Ringo', 'Third query returned correct name.');
}
/**
@@ -313,7 +313,7 @@ class SelectTest extends DatabaseTestBase {
->orderBy('id')
->execute()
->fetchCol();
- $this->assertEqual($ordered_ids, $expected_ids, t('A query without random ordering returns IDs in the correct order.'));
+ $this->assertEqual($ordered_ids, $expected_ids, 'A query without random ordering returns IDs in the correct order.');
// Now perform the same query, but instead choose a random ordering. We
// expect this to contain a differently ordered version of the original
@@ -324,10 +324,10 @@ class SelectTest extends DatabaseTestBase {
->orderRandom()
->execute()
->fetchCol();
- $this->assertNotEqual($randomized_ids, $ordered_ids, t('A query with random ordering returns an unordered set of IDs.'));
+ $this->assertNotEqual($randomized_ids, $ordered_ids, 'A query with random ordering returns an unordered set of IDs.');
$sorted_ids = $randomized_ids;
sort($sorted_ids);
- $this->assertEqual($sorted_ids, $ordered_ids, t('After sorting the random list, the result matches the original query.'));
+ $this->assertEqual($sorted_ids, $ordered_ids, 'After sorting the random list, the result matches the original query.');
// Now perform the exact same query again, and make sure the order is
// different.
@@ -337,10 +337,10 @@ class SelectTest extends DatabaseTestBase {
->orderRandom()
->execute()
->fetchCol();
- $this->assertNotEqual($randomized_ids_second_set, $randomized_ids, t('Performing the query with random ordering a second time returns IDs in a different order.'));
+ $this->assertNotEqual($randomized_ids_second_set, $randomized_ids, 'Performing the query with random ordering a second time returns IDs in a different order.');
$sorted_ids_second_set = $randomized_ids_second_set;
sort($sorted_ids_second_set);
- $this->assertEqual($sorted_ids_second_set, $sorted_ids, t('After sorting the second random list, the result matches the sorted version of the first random list.'));
+ $this->assertEqual($sorted_ids_second_set, $sorted_ids, 'After sorting the second random list, the result matches the sorted version of the first random list.');
}
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SerializeQueryTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/SerializeQueryTest.php
index 848bbf5..df0ffad 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/SerializeQueryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/SerializeQueryTest.php
@@ -30,6 +30,6 @@ class SerializeQueryTest extends DatabaseTestBase {
// assertion.
$query = unserialize(serialize($query));
$results = $query->execute()->fetchCol();
- $this->assertEqual($results[0], 28, t('Query properly executed after unserialization.'));
+ $this->assertEqual($results[0], 28, 'Query properly executed after unserialization.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/TaggingTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/TaggingTest.php
index f341a40..e9cf45c 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/TaggingTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/TaggingTest.php
@@ -84,9 +84,9 @@ class TaggingTest extends DatabaseTestBase {
$query->addMetaData('test', $data);
$return = $query->getMetaData('test');
- $this->assertEqual($data, $return, t('Corect metadata returned.'));
+ $this->assertEqual($data, $return, 'Corect metadata returned.');
$return = $query->getMetaData('nothere');
- $this->assertNull($return, t('Non-existent key returned NULL.'));
+ $this->assertNull($return, 'Non-existent key returned NULL.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/TemporaryQueryTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/TemporaryQueryTest.php
index 784f2db..8e918e9 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/TemporaryQueryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/TemporaryQueryTest.php
@@ -39,8 +39,8 @@ class TemporaryQueryTest extends WebTestBase {
$this->drupalGet('database_test/db_query_temporary');
$data = json_decode($this->drupalGetContent());
if ($data) {
- $this->assertEqual($this->countTableRows("system"), $data->row_count, t('The temporary table contains the correct amount of rows.'));
- $this->assertFalse(db_table_exists($data->table_name), t('The temporary table is, indeed, temporary.'));
+ $this->assertEqual($this->countTableRows("system"), $data->row_count, 'The temporary table contains the correct amount of rows.');
+ $this->assertFalse(db_table_exists($data->table_name), 'The temporary table is, indeed, temporary.');
}
else {
$this->fail(t("The creation of the temporary table failed."));
@@ -50,7 +50,7 @@ class TemporaryQueryTest extends WebTestBase {
$table_name_system = db_query_temporary('SELECT status FROM {system}', array());
$table_name_users = db_query_temporary('SELECT uid FROM {users}', array());
- $this->assertEqual($this->countTableRows($table_name_system), $this->countTableRows("system"), t('A temporary table was created successfully in this request.'));
- $this->assertEqual($this->countTableRows($table_name_users), $this->countTableRows("users"), t('A second temporary table was created successfully in this request.'));
+ $this->assertEqual($this->countTableRows($table_name_system), $this->countTableRows("system"), 'A temporary table was created successfully in this request.');
+ $this->assertEqual($this->countTableRows($table_name_users), $this->countTableRows("users"), 'A second temporary table was created successfully in this request.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/TransactionTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/TransactionTest.php
index 9a6bc02..fb8b41e 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/TransactionTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/TransactionTest.php
@@ -76,13 +76,13 @@ class TransactionTest extends DatabaseTestBase {
))
->execute();
- $this->assertTrue($connection->inTransaction(), t('In transaction before calling nested transaction.'));
+ $this->assertTrue($connection->inTransaction(), 'In transaction before calling nested transaction.');
// We're already in a transaction, but we call ->transactionInnerLayer
// to nest another transaction inside the current one.
$this->transactionInnerLayer($suffix, $rollback, $ddl_statement);
- $this->assertTrue($connection->inTransaction(), t('In transaction after calling nested transaction.'));
+ $this->assertTrue($connection->inTransaction(), 'In transaction after calling nested transaction.');
if ($rollback) {
// Roll back the transaction, if requested.
@@ -114,7 +114,7 @@ class TransactionTest extends DatabaseTestBase {
$txn = db_transaction();
$depth2 = $connection->transactionDepth();
- $this->assertTrue($depth < $depth2, t('Transaction depth is has increased with new transaction.'));
+ $this->assertTrue($depth < $depth2, 'Transaction depth is has increased with new transaction.');
// Insert a single row into the testing table.
db_insert('test')
@@ -124,7 +124,7 @@ class TransactionTest extends DatabaseTestBase {
))
->execute();
- $this->assertTrue($connection->inTransaction(), t('In transaction inside nested transaction.'));
+ $this->assertTrue($connection->inTransaction(), 'In transaction inside nested transaction.');
if ($ddl_statement) {
$table = array(
@@ -139,7 +139,7 @@ class TransactionTest extends DatabaseTestBase {
);
db_create_table('database_test_1', $table);
- $this->assertTrue($connection->inTransaction(), t('In transaction inside nested transaction.'));
+ $this->assertTrue($connection->inTransaction(), 'In transaction inside nested transaction.');
}
if ($rollback) {
@@ -167,9 +167,9 @@ class TransactionTest extends DatabaseTestBase {
// Neither of the rows we inserted in the two transaction layers
// should be present in the tables post-rollback.
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DavidB'))->fetchField();
- $this->assertNotIdentical($saved_age, '24', t('Cannot retrieve DavidB row after commit.'));
+ $this->assertNotIdentical($saved_age, '24', 'Cannot retrieve DavidB row after commit.');
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DanielB'))->fetchField();
- $this->assertNotIdentical($saved_age, '19', t('Cannot retrieve DanielB row after commit.'));
+ $this->assertNotIdentical($saved_age, '19', 'Cannot retrieve DanielB row after commit.');
}
catch (Exception $e) {
$this->fail($e->getMessage());
@@ -193,9 +193,9 @@ class TransactionTest extends DatabaseTestBase {
// Because our current database claims to not support transactions,
// the inserted rows should be present despite the attempt to roll back.
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DavidB'))->fetchField();
- $this->assertIdentical($saved_age, '24', t('DavidB not rolled back, since transactions are not supported.'));
+ $this->assertIdentical($saved_age, '24', 'DavidB not rolled back, since transactions are not supported.');
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DanielB'))->fetchField();
- $this->assertIdentical($saved_age, '19', t('DanielB not rolled back, since transactions are not supported.'));
+ $this->assertIdentical($saved_age, '19', 'DanielB not rolled back, since transactions are not supported.');
}
catch (Exception $e) {
$this->fail($e->getMessage());
@@ -215,9 +215,9 @@ class TransactionTest extends DatabaseTestBase {
// Because we committed, both of the inserted rows should be present.
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DavidA'))->fetchField();
- $this->assertIdentical($saved_age, '24', t('Can retrieve DavidA row after commit.'));
+ $this->assertIdentical($saved_age, '24', 'Can retrieve DavidA row after commit.');
$saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DanielA'))->fetchField();
- $this->assertIdentical($saved_age, '19', t('Can retrieve DanielA row after commit.'));
+ $this->assertIdentical($saved_age, '19', 'Can retrieve DanielA row after commit.');
}
catch (Exception $e) {
$this->fail($e->getMessage());
@@ -402,10 +402,10 @@ class TransactionTest extends DatabaseTestBase {
$this->insertRow('inner');
// Pop the inner transaction.
unset($transaction2);
- $this->assertTrue($database->inTransaction(), t('Still in a transaction after popping the inner transaction'));
+ $this->assertTrue($database->inTransaction(), 'Still in a transaction after popping the inner transaction');
// Pop the outer transaction.
unset($transaction);
- $this->assertFalse($database->inTransaction(), t('Transaction closed after popping the outer transaction'));
+ $this->assertFalse($database->inTransaction(), 'Transaction closed after popping the outer transaction');
$this->assertRowPresent('outer');
$this->assertRowPresent('inner');
@@ -418,10 +418,10 @@ class TransactionTest extends DatabaseTestBase {
// Pop the outer transaction, nothing should happen.
unset($transaction);
$this->insertRow('inner-after-outer-commit');
- $this->assertTrue($database->inTransaction(), t('Still in a transaction after popping the outer transaction'));
+ $this->assertTrue($database->inTransaction(), 'Still in a transaction after popping the outer transaction');
// Pop the inner transaction, the whole transaction should commit.
unset($transaction2);
- $this->assertFalse($database->inTransaction(), t('Transaction closed after popping the inner transaction'));
+ $this->assertFalse($database->inTransaction(), 'Transaction closed after popping the inner transaction');
$this->assertRowPresent('outer');
$this->assertRowPresent('inner');
$this->assertRowPresent('inner-after-outer-commit');
@@ -435,11 +435,11 @@ class TransactionTest extends DatabaseTestBase {
// Now rollback the inner transaction.
$transaction2->rollback();
unset($transaction2);
- $this->assertTrue($database->inTransaction(), t('Still in a transaction after popping the outer transaction'));
+ $this->assertTrue($database->inTransaction(), 'Still in a transaction after popping the outer transaction');
// Pop the outer transaction, it should commit.
$this->insertRow('outer-after-inner-rollback');
unset($transaction);
- $this->assertFalse($database->inTransaction(), t('Transaction closed after popping the inner transaction'));
+ $this->assertFalse($database->inTransaction(), 'Transaction closed after popping the inner transaction');
$this->assertRowPresent('outer');
$this->assertRowAbsent('inner');
$this->assertRowPresent('outer-after-inner-rollback');
@@ -452,11 +452,11 @@ class TransactionTest extends DatabaseTestBase {
$this->insertRow('inner');
// Pop the outer transaction, nothing should happen.
unset($transaction);
- $this->assertTrue($database->inTransaction(), t('Still in a transaction after popping the outer transaction'));
+ $this->assertTrue($database->inTransaction(), 'Still in a transaction after popping the outer transaction');
// Now rollback the inner transaction, it should rollback.
$transaction2->rollback();
unset($transaction2);
- $this->assertFalse($database->inTransaction(), t('Transaction closed after popping the inner transaction'));
+ $this->assertFalse($database->inTransaction(), 'Transaction closed after popping the inner transaction');
$this->assertRowPresent('outer');
$this->assertRowAbsent('inner');
@@ -479,7 +479,7 @@ class TransactionTest extends DatabaseTestBase {
catch (TransactionOutOfOrderException $e) {
$this->pass(t('Rolling back the outer transaction while the inner transaction is active resulted in an exception.'));
}
- $this->assertFalse($database->inTransaction(), t('No more in a transaction after rolling back the outer transaction'));
+ $this->assertFalse($database->inTransaction(), 'No more in a transaction after rolling back the outer transaction');
// Try to commit one inner transaction.
unset($transaction3);
$this->pass(t('Trying to commit an inner transaction resulted in an exception.'));
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateComplexTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/UpdateComplexTest.php
index 2132585..585751f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateComplexTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/UpdateComplexTest.php
@@ -31,10 +31,10 @@ class UpdateComplexTest extends DatabaseTestBase {
->condition('name', 'Paul')
);
$num_updated = $update->execute();
- $this->assertIdentical($num_updated, 2, t('Updated 2 records.'));
+ $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
$num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
- $this->assertIdentical($num_matches, '2', t('Updated fields successfully.'));
+ $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
}
/**
@@ -45,10 +45,10 @@ class UpdateComplexTest extends DatabaseTestBase {
->fields(array('job' => 'Musician'))
->condition('name', array('John', 'Paul'), 'IN')
->execute();
- $this->assertIdentical($num_updated, 2, t('Updated 2 records.'));
+ $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
$num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
- $this->assertIdentical($num_matches, '2', t('Updated fields successfully.'));
+ $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
}
/**
@@ -61,10 +61,10 @@ class UpdateComplexTest extends DatabaseTestBase {
->fields(array('job' => 'Musician'))
->condition('name', array('John', 'Paul', 'George'), 'NoT IN')
->execute();
- $this->assertIdentical($num_updated, 1, t('Updated 1 record.'));
+ $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
$num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
- $this->assertIdentical($num_matches, '1', t('Updated fields successfully.'));
+ $this->assertIdentical($num_matches, '1', 'Updated fields successfully.');
}
/**
@@ -75,10 +75,10 @@ class UpdateComplexTest extends DatabaseTestBase {
->fields(array('job' => 'Musician'))
->condition('age', array(25, 26), 'BETWEEN')
->execute();
- $this->assertIdentical($num_updated, 2, t('Updated 2 records.'));
+ $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
$num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
- $this->assertIdentical($num_matches, '2', t('Updated fields successfully.'));
+ $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
}
/**
@@ -89,10 +89,10 @@ class UpdateComplexTest extends DatabaseTestBase {
->fields(array('job' => 'Musician'))
->condition('name', '%ge%', 'LIKE')
->execute();
- $this->assertIdentical($num_updated, 1, t('Updated 1 record.'));
+ $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
$num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
- $this->assertIdentical($num_matches, '1', t('Updated fields successfully.'));
+ $this->assertIdentical($num_matches, '1', 'Updated fields successfully.');
}
/**
@@ -106,15 +106,15 @@ class UpdateComplexTest extends DatabaseTestBase {
->fields(array('job' => 'Musician'))
->expression('age', 'age + :age', array(':age' => 4))
->execute();
- $this->assertIdentical($num_updated, 1, t('Updated 1 record.'));
+ $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
$num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
- $this->assertIdentical($num_matches, '1', t('Updated fields successfully.'));
+ $this->assertIdentical($num_matches, '1', 'Updated fields successfully.');
$person = db_query('SELECT * FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetch();
- $this->assertEqual($person->name, 'Ringo', t('Name set correctly.'));
- $this->assertEqual($person->age, $before_age + 4, t('Age set correctly.'));
- $this->assertEqual($person->job, 'Musician', t('Job set correctly.'));
+ $this->assertEqual($person->name, 'Ringo', 'Name set correctly.');
+ $this->assertEqual($person->age, $before_age + 4, 'Age set correctly.');
+ $this->assertEqual($person->job, 'Musician', 'Job set correctly.');
$GLOBALS['larry_test'] = 0;
}
@@ -127,9 +127,9 @@ class UpdateComplexTest extends DatabaseTestBase {
->condition('name', 'Ringo')
->expression('age', 'age + :age', array(':age' => 4))
->execute();
- $this->assertIdentical($num_updated, 1, t('Updated 1 record.'));
+ $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
$after_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
- $this->assertEqual($before_age + 4, $after_age, t('Age updated correctly'));
+ $this->assertEqual($before_age + 4, $after_age, 'Age updated correctly');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php
index 4d0b0c6..b37b1e7 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php
@@ -25,7 +25,7 @@ class UpdateLobTest extends DatabaseTestBase {
*/
function testUpdateOneBlob() {
$data = "This is\000a test.";
- $this->assertTrue(strlen($data) === 15, t('Test data contains a NULL.'));
+ $this->assertTrue(strlen($data) === 15, 'Test data contains a NULL.');
$id = db_insert('test_one_blob')
->fields(array('blob1' => $data))
->execute();
@@ -57,6 +57,6 @@ class UpdateLobTest extends DatabaseTestBase {
->execute();
$r = db_query('SELECT * FROM {test_two_blobs} WHERE id = :id', array(':id' => $id))->fetchAssoc();
- $this->assertTrue($r['blob1'] === 'and so' && $r['blob2'] === 'is this', t('Can update multiple blobs per row.'));
+ $this->assertTrue($r['blob1'] === 'and so' && $r['blob2'] === 'is this', 'Can update multiple blobs per row.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/UpdateTest.php
index a428383..97ec948 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Database/UpdateTest.php
@@ -28,10 +28,10 @@ class UpdateTest extends DatabaseTestBase {
->fields(array('name' => 'Tiffany'))
->condition('id', 1)
->execute();
- $this->assertIdentical($num_updated, 1, t('Updated 1 record.'));
+ $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
$saved_name = db_query('SELECT name FROM {test} WHERE id = :id', array(':id' => 1))->fetchField();
- $this->assertIdentical($saved_name, 'Tiffany', t('Updated name successfully.'));
+ $this->assertIdentical($saved_name, 'Tiffany', 'Updated name successfully.');
}
/**
@@ -43,10 +43,10 @@ class UpdateTest extends DatabaseTestBase {
->fields(array('age' => NULL))
->condition('name', 'Kermit')
->execute();
- $this->assertIdentical($num_updated, 1, t('Updated 1 record.'));
+ $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
$saved_age = db_query('SELECT age FROM {test_null} WHERE name = :name', array(':name' => 'Kermit'))->fetchField();
- $this->assertNull($saved_age, t('Updated name successfully.'));
+ $this->assertNull($saved_age, 'Updated name successfully.');
}
/**
@@ -57,10 +57,10 @@ class UpdateTest extends DatabaseTestBase {
->fields(array('job' => 'Musician'))
->condition('job', 'Singer')
->execute();
- $this->assertIdentical($num_updated, 2, t('Updated 2 records.'));
+ $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
$num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
- $this->assertIdentical($num_matches, '2', t('Updated fields successfully.'));
+ $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
}
/**
@@ -71,10 +71,10 @@ class UpdateTest extends DatabaseTestBase {
->fields(array('job' => 'Musician'))
->condition('age', 26, '>')
->execute();
- $this->assertIdentical($num_updated, 2, t('Updated 2 records.'));
+ $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
$num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
- $this->assertIdentical($num_matches, '2', t('Updated fields successfully.'));
+ $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
}
/**
@@ -85,10 +85,10 @@ class UpdateTest extends DatabaseTestBase {
->fields(array('job' => 'Musician'))
->where('age > :age', array(':age' => 26))
->execute();
- $this->assertIdentical($num_updated, 2, t('Updated 2 records.'));
+ $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
$num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
- $this->assertIdentical($num_matches, '2', t('Updated fields successfully.'));
+ $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
}
/**
@@ -100,10 +100,10 @@ class UpdateTest extends DatabaseTestBase {
->where('age > :age', array(':age' => 26))
->condition('name', 'Ringo');
$num_updated = $update->execute();
- $this->assertIdentical($num_updated, 1, t('Updated 1 record.'));
+ $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
$num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
- $this->assertIdentical($num_matches, '1', t('Updated fields successfully.'));
+ $this->assertIdentical($num_matches, '1', 'Updated fields successfully.');
}
/**
@@ -123,6 +123,6 @@ class UpdateTest extends DatabaseTestBase {
$num_rows = db_update('test')
->expression('age', 'age * age')
->execute();
- $this->assertIdentical($num_rows, 3, t('Number of affected rows are returned.'));
+ $this->assertIdentical($num_rows, 3, 'Number of affected rows are returned.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/CopyTest.php b/core/modules/system/lib/Drupal/system/Tests/File/CopyTest.php
index 70f7493..e34a203 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/CopyTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/CopyTest.php
@@ -32,16 +32,16 @@ class CopyTest extends FileHookTestBase {
$result = file_copy(clone $source, $desired_uri, FILE_EXISTS_ERROR);
// Check the return status and that the contents changed.
- $this->assertTrue($result, t('File copied successfully.'));
- $this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file were copied correctly.'));
+ $this->assertTrue($result, 'File copied successfully.');
+ $this->assertEqual($contents, file_get_contents($result->uri), 'Contents of file were copied correctly.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array('copy', 'insert'));
$this->assertDifferentFile($source, $result);
- $this->assertEqual($result->uri, $desired_uri, t('The copied file entity has the desired filepath.'));
- $this->assertTrue(file_exists($source->uri), t('The original file still exists.'));
- $this->assertTrue(file_exists($result->uri), t('The copied file exists.'));
+ $this->assertEqual($result->uri, $desired_uri, 'The copied file entity has the desired filepath.');
+ $this->assertTrue(file_exists($source->uri), 'The original file still exists.');
+ $this->assertTrue(file_exists($result->uri), 'The copied file exists.');
// Reload the file from the database and check that the changes were
// actually saved.
@@ -63,9 +63,9 @@ class CopyTest extends FileHookTestBase {
$result = file_copy(clone $source, $target->uri, FILE_EXISTS_RENAME);
// Check the return status and that the contents changed.
- $this->assertTrue($result, t('File copied successfully.'));
- $this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file were copied correctly.'));
- $this->assertNotEqual($result->uri, $source->uri, t('Returned file path has changed from the original.'));
+ $this->assertTrue($result, 'File copied successfully.');
+ $this->assertEqual($contents, file_get_contents($result->uri), 'Contents of file were copied correctly.');
+ $this->assertNotEqual($result->uri, $source->uri, 'Returned file path has changed from the original.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array('copy', 'insert'));
@@ -103,8 +103,8 @@ class CopyTest extends FileHookTestBase {
$result = file_copy(clone $source, $target->uri, FILE_EXISTS_REPLACE);
// Check the return status and that the contents changed.
- $this->assertTrue($result, t('File copied successfully.'));
- $this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file were overwritten.'));
+ $this->assertTrue($result, 'File copied successfully.');
+ $this->assertEqual($contents, file_get_contents($result->uri), 'Contents of file were overwritten.');
$this->assertDifferentFile($source, $result);
// Check that the correct hooks were called.
@@ -141,8 +141,8 @@ class CopyTest extends FileHookTestBase {
$result = file_copy(clone $source, $target->uri, FILE_EXISTS_ERROR);
// Check the return status and that the contents were not changed.
- $this->assertFalse($result, t('File copy failed.'));
- $this->assertEqual($contents, file_get_contents($target->uri), t('Contents of file were not altered.'));
+ $this->assertFalse($result, 'File copy failed.');
+ $this->assertEqual($contents, file_get_contents($target->uri), 'Contents of file were not altered.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array());
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/DeleteTest.php b/core/modules/system/lib/Drupal/system/Tests/File/DeleteTest.php
index 2691806..9d92960 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/DeleteTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/DeleteTest.php
@@ -26,11 +26,11 @@ class DeleteTest extends FileHookTestBase {
$file = $this->createFile();
// Check that deletion removes the file and database record.
- $this->assertTrue(is_file($file->uri), t('File exists.'));
+ $this->assertTrue(is_file($file->uri), 'File exists.');
$file->delete();
$this->assertFileHooksCalled(array('delete', 'load'));
- $this->assertFalse(file_exists($file->uri), t('Test file has actually been deleted.'));
- $this->assertFalse(file_load($file->fid), t('File was removed from the database.'));
+ $this->assertFalse(file_exists($file->uri), 'Test file has actually been deleted.');
+ $this->assertFalse(file_load($file->fid), 'File was removed from the database.');
}
/**
@@ -43,9 +43,9 @@ class DeleteTest extends FileHookTestBase {
file_usage_delete($file, 'testing', 'test', 1);
$usage = file_usage_list($file);
- $this->assertEqual($usage['testing']['test'], array(1 => 1), t('Test file is still in use.'));
- $this->assertTrue(file_exists($file->uri), t('File still exists on the disk.'));
- $this->assertTrue(file_load($file->fid), t('File still exists in the database.'));
+ $this->assertEqual($usage['testing']['test'], array(1 => 1), 'Test file is still in use.');
+ $this->assertTrue(file_exists($file->uri), 'File still exists on the disk.');
+ $this->assertTrue(file_load($file->fid), 'File still exists in the database.');
// Clear out the call to hook_file_load().
file_test_reset();
@@ -53,7 +53,7 @@ class DeleteTest extends FileHookTestBase {
file_usage_delete($file, 'testing', 'test', 1);
$usage = file_usage_list($file);
$this->assertFileHooksCalled(array('load', 'update'));
- $this->assertTrue(empty($usage), t('File usage data was removed.'));
+ $this->assertTrue(empty($usage), 'File usage data was removed.');
$this->assertTrue(file_exists($file->uri), 'File still exists on the disk.');
$file = file_load($file->fid);
$this->assertTrue($file, 'File still exists in the database.');
@@ -72,7 +72,7 @@ class DeleteTest extends FileHookTestBase {
// system_cron() loads
$this->assertFileHooksCalled(array('load', 'delete'));
- $this->assertFalse(file_exists($file->uri), t('File has been deleted after its last usage was removed.'));
- $this->assertFalse(file_load($file->fid), t('File was removed from the database.'));
+ $this->assertFalse(file_exists($file->uri), 'File has been deleted after its last usage was removed.');
+ $this->assertFalse(file_load($file->fid), 'File was removed from the database.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/DirectoryTest.php b/core/modules/system/lib/Drupal/system/Tests/File/DirectoryTest.php
index 5d57bdf..8054746 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/DirectoryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/DirectoryTest.php
@@ -25,7 +25,7 @@ class DirectoryTest extends FileTestBase {
function testFileCheckDirectoryHandling() {
// A directory to operate on.
$directory = file_default_scheme() . '://' . $this->randomName() . '/' . $this->randomName();
- $this->assertFalse(is_dir($directory), t('Directory does not exist prior to testing.'));
+ $this->assertFalse(is_dir($directory), 'Directory does not exist prior to testing.');
// Non-existent directory.
$this->assertFalse(file_prepare_directory($directory, 0), t('Error reported for non-existing directory.'), 'File');
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/DownloadTest.php b/core/modules/system/lib/Drupal/system/Tests/File/DownloadTest.php
index acfa062..4d96b27 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/DownloadTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/DownloadTest.php
@@ -35,17 +35,17 @@ class DownloadTest extends FileTestBase {
// URLs can't contain characters outside the ASCII set so $filename has to be
// encoded.
$filename = $GLOBALS['base_url'] . '/' . file_stream_wrapper_get_instance_by_scheme('public')->getDirectoryPath() . '/' . rawurlencode($file->filename);
- $this->assertEqual($filename, $url, t('Correctly generated a URL for a created file.'));
+ $this->assertEqual($filename, $url, 'Correctly generated a URL for a created file.');
$this->drupalHead($url);
- $this->assertResponse(200, t('Confirmed that the generated URL is correct by downloading the created file.'));
+ $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the created file.');
// Test generating an URL to a shipped file (i.e. a file that is part of
// Drupal core, a module or a theme, for example a JavaScript file).
$filepath = 'core/misc/jquery.js';
$url = file_create_url($filepath);
- $this->assertEqual($GLOBALS['base_url'] . '/' . $filepath, $url, t('Correctly generated a URL for a shipped file.'));
+ $this->assertEqual($GLOBALS['base_url'] . '/' . $filepath, $url, 'Correctly generated a URL for a shipped file.');
$this->drupalHead($url);
- $this->assertResponse(200, t('Confirmed that the generated URL is correct by downloading the shipped file.'));
+ $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the shipped file.');
}
/**
@@ -63,21 +63,21 @@ class DownloadTest extends FileTestBase {
file_test_set_return('download', array('x-foo' => 'Bar'));
$this->drupalGet($url);
$headers = $this->drupalGetHeaders();
- $this->assertEqual($headers['x-foo'], 'Bar', t('Found header set by file_test module on private download.'));
- $this->assertResponse(200, t('Correctly allowed access to a file when file_test provides headers.'));
+ $this->assertEqual($headers['x-foo'], 'Bar', 'Found header set by file_test module on private download.');
+ $this->assertResponse(200, 'Correctly allowed access to a file when file_test provides headers.');
// Test that the file transfered correctly.
- $this->assertEqual($contents, $this->content, t('Contents of the file are correct.'));
+ $this->assertEqual($contents, $this->content, 'Contents of the file are correct.');
// Deny access to all downloads via a -1 header.
file_test_set_return('download', -1);
$this->drupalHead($url);
- $this->assertResponse(403, t('Correctly denied access to a file when file_test sets the header to -1.'));
+ $this->assertResponse(403, 'Correctly denied access to a file when file_test sets the header to -1.');
// Try non-existent file.
$url = file_create_url('private://' . $this->randomName());
$this->drupalHead($url);
- $this->assertResponse(404, t('Correctly returned 404 response for a non-existent file.'));
+ $this->assertResponse(404, 'Correctly returned 404 response for a non-existent file.');
}
/**
@@ -134,7 +134,7 @@ class DownloadTest extends FileTestBase {
$file = $this->createFile($filepath, NULL, $scheme);
$url = file_create_url($file->uri);
- $this->assertEqual($url, $expected_url, t('Generated URL matches expected URL.'));
+ $this->assertEqual($url, $expected_url, 'Generated URL matches expected URL.');
if ($scheme == 'private') {
// Tell the implementation of hook_file_download() in file_test.module
@@ -144,7 +144,7 @@ class DownloadTest extends FileTestBase {
$this->drupalGet($url);
if ($this->assertResponse(200) == 'pass') {
- $this->assertRaw(file_get_contents($file->uri), t('Contents of the file are correct.'));
+ $this->assertRaw(file_get_contents($file->uri), 'Contents of the file are correct.');
}
$file->delete();
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/FileHookTestBase.php b/core/modules/system/lib/Drupal/system/Tests/File/FileHookTestBase.php
index 3c0673d..bf7b8e3 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/FileHookTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/FileHookTestBase.php
@@ -46,7 +46,7 @@ class FileHookTestBase extends FileTestBase {
$this->assertTrue(FALSE, t('Unexpected hooks were called: %unexpected.', array('%unexpected' => empty($unexpected) ? t('(none)') : implode(', ', $unexpected))));
}
else {
- $this->assertTrue(TRUE, t('No unexpected hooks were called.'));
+ $this->assertTrue(TRUE, 'No unexpected hooks were called.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/FileTestBase.php b/core/modules/system/lib/Drupal/system/Tests/File/FileTestBase.php
index 2c72383..aebe10d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/FileTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/FileTestBase.php
@@ -158,7 +158,7 @@ class FileTestBase extends WebTestBase {
if (!isset($path)) {
$path = file_default_scheme() . '://' . $this->randomName();
}
- $this->assertTrue(drupal_mkdir($path) && is_dir($path), t('Directory was created successfully.'));
+ $this->assertTrue(drupal_mkdir($path) && is_dir($path), 'Directory was created successfully.');
return $path;
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/MoveTest.php b/core/modules/system/lib/Drupal/system/Tests/File/MoveTest.php
index 64f12eb..f1517e1 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/MoveTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/MoveTest.php
@@ -32,9 +32,9 @@ class MoveTest extends FileHookTestBase {
$result = file_move(clone $source, $desired_filepath, FILE_EXISTS_ERROR);
// Check the return status and that the contents changed.
- $this->assertTrue($result, t('File moved successfully.'));
+ $this->assertTrue($result, 'File moved successfully.');
$this->assertFalse(file_exists($source->uri));
- $this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file correctly written.'));
+ $this->assertEqual($contents, file_get_contents($result->uri), 'Contents of file correctly written.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array('move', 'load', 'update'));
@@ -45,7 +45,7 @@ class MoveTest extends FileHookTestBase {
// Reload the file from the database and check that the changes were
// actually saved.
$loaded_file = file_load($result->fid, TRUE);
- $this->assertTrue($loaded_file, t('File can be loaded from the database.'));
+ $this->assertTrue($loaded_file, 'File can be loaded from the database.');
$this->assertFileUnchanged($result, $loaded_file);
}
@@ -64,9 +64,9 @@ class MoveTest extends FileHookTestBase {
$result = file_move(clone $source, $target->uri, FILE_EXISTS_RENAME);
// Check the return status and that the contents changed.
- $this->assertTrue($result, t('File moved successfully.'));
+ $this->assertTrue($result, 'File moved successfully.');
$this->assertFalse(file_exists($source->uri));
- $this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file correctly written.'));
+ $this->assertEqual($contents, file_get_contents($result->uri), 'Contents of file correctly written.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array('move', 'load', 'update'));
@@ -99,9 +99,9 @@ class MoveTest extends FileHookTestBase {
$result = file_move(clone $source, $target->uri, FILE_EXISTS_REPLACE);
// Look at the results.
- $this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file were overwritten.'));
+ $this->assertEqual($contents, file_get_contents($result->uri), 'Contents of file were overwritten.');
$this->assertFalse(file_exists($source->uri));
- $this->assertTrue($result, t('File moved successfully.'));
+ $this->assertTrue($result, 'File moved successfully.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array('move', 'update', 'delete', 'load'));
@@ -127,8 +127,8 @@ class MoveTest extends FileHookTestBase {
// Copy the file over itself. Clone the object so we don't have to worry
// about the function changing our reference copy.
$result = file_move(clone $source, $source->uri, FILE_EXISTS_REPLACE);
- $this->assertFalse($result, t('File move failed.'));
- $this->assertEqual($contents, file_get_contents($source->uri), t('Contents of file were not altered.'));
+ $this->assertFalse($result, 'File move failed.');
+ $this->assertEqual($contents, file_get_contents($source->uri), 'Contents of file were not altered.');
// Check that no hooks were called while failing.
$this->assertFileHooksCalled(array());
@@ -153,9 +153,9 @@ class MoveTest extends FileHookTestBase {
$result = file_move(clone $source, $target->uri, FILE_EXISTS_ERROR);
// Check the return status and that the contents did not change.
- $this->assertFalse($result, t('File move failed.'));
+ $this->assertFalse($result, 'File move failed.');
$this->assertTrue(file_exists($source->uri));
- $this->assertEqual($contents, file_get_contents($target->uri), t('Contents of file were not altered.'));
+ $this->assertEqual($contents, file_get_contents($target->uri), 'Contents of file were not altered.');
// Check that no hooks were called while failing.
$this->assertFileHooksCalled(array());
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/NameMungingTest.php b/core/modules/system/lib/Drupal/system/Tests/File/NameMungingTest.php
index 926a34a..5a0b554 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/NameMungingTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/NameMungingTest.php
@@ -33,7 +33,7 @@ class NameMungingTest extends FileTestBase {
variable_set('allow_insecure_uploads', 0);
$munged_name = file_munge_filename($this->name, '', TRUE);
$messages = drupal_get_messages();
- $this->assertTrue(in_array(t('For security reasons, your upload has been renamed to %filename.', array('%filename' => $munged_name)), $messages['status']), t('Alert properly set when a file is renamed.'));
+ $this->assertTrue(in_array(t('For security reasons, your upload has been renamed to %filename.', array('%filename' => $munged_name)), $messages['status']), 'Alert properly set when a file is renamed.');
$this->assertNotEqual($munged_name, $this->name, t('The new filename (%munged) has been modified from the original (%original)', array('%munged' => $munged_name, '%original' => $this->name)));
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/SaveDataTest.php b/core/modules/system/lib/Drupal/system/Tests/File/SaveDataTest.php
index a8de40d..9815ebc 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/SaveDataTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/SaveDataTest.php
@@ -26,12 +26,12 @@ class SaveDataTest extends FileHookTestBase {
$contents = $this->randomName(8);
$result = file_save_data($contents);
- $this->assertTrue($result, t('Unnamed file saved correctly.'));
+ $this->assertTrue($result, 'Unnamed file saved correctly.');
$this->assertEqual(file_default_scheme(), file_uri_scheme($result->uri), t("File was placed in Drupal's files directory."));
$this->assertEqual($result->filename, drupal_basename($result->uri), t("Filename was set to the file's basename."));
- $this->assertEqual($contents, file_get_contents($result->uri), t('Contents of the file are correct.'));
- $this->assertEqual($result->filemime, 'application/octet-stream', t('A MIME type was set.'));
+ $this->assertEqual($contents, file_get_contents($result->uri), 'Contents of the file are correct.');
+ $this->assertEqual($result->filemime, 'application/octet-stream', 'A MIME type was set.');
$this->assertEqual($result->status, FILE_STATUS_PERMANENT, t("The file's status was set to permanent."));
// Check that the correct hooks were called.
@@ -51,12 +51,12 @@ class SaveDataTest extends FileHookTestBase {
$filename = 'Текстовый файл.txt';
$result = file_save_data($contents, 'public://' . $filename);
- $this->assertTrue($result, t('Unnamed file saved correctly.'));
+ $this->assertTrue($result, 'Unnamed file saved correctly.');
$this->assertEqual('public', file_uri_scheme($result->uri), t("File was placed in Drupal's files directory."));
- $this->assertEqual($filename, drupal_basename($result->uri), t('File was named correctly.'));
- $this->assertEqual($contents, file_get_contents($result->uri), t('Contents of the file are correct.'));
- $this->assertEqual($result->filemime, 'text/plain', t('A MIME type was set.'));
+ $this->assertEqual($filename, drupal_basename($result->uri), 'File was named correctly.');
+ $this->assertEqual($contents, file_get_contents($result->uri), 'Contents of the file are correct.');
+ $this->assertEqual($result->filemime, 'text/plain', 'A MIME type was set.');
$this->assertEqual($result->status, FILE_STATUS_PERMANENT, t("The file's status was set to permanent."));
// Check that the correct hooks were called.
@@ -103,12 +103,12 @@ class SaveDataTest extends FileHookTestBase {
$contents = $this->randomName(8);
$result = file_save_data($contents, $existing->uri, FILE_EXISTS_REPLACE);
- $this->assertTrue($result, t('File saved successfully.'));
+ $this->assertTrue($result, 'File saved successfully.');
$this->assertEqual('public', file_uri_scheme($result->uri), t("File was placed in Drupal's files directory."));
- $this->assertEqual($result->filename, $existing->filename, t('Filename was set to the basename of the existing file, rather than preserving the original name.'));
- $this->assertEqual($contents, file_get_contents($result->uri), t('Contents of the file are correct.'));
- $this->assertEqual($result->filemime, 'application/octet-stream', t('A MIME type was set.'));
+ $this->assertEqual($result->filename, $existing->filename, 'Filename was set to the basename of the existing file, rather than preserving the original name.');
+ $this->assertEqual($contents, file_get_contents($result->uri), 'Contents of the file are correct.');
+ $this->assertEqual($result->filemime, 'application/octet-stream', 'A MIME type was set.');
$this->assertEqual($result->status, FILE_STATUS_PERMANENT, t("The file's status was set to permanent."));
// Check that the correct hooks were called.
@@ -130,8 +130,8 @@ class SaveDataTest extends FileHookTestBase {
// Check the overwrite error.
$result = file_save_data('asdf', $existing->uri, FILE_EXISTS_ERROR);
- $this->assertFalse($result, t('Overwriting a file fails when FILE_EXISTS_ERROR is specified.'));
- $this->assertEqual($contents, file_get_contents($existing->uri), t('Contents of existing file were unchanged.'));
+ $this->assertFalse($result, 'Overwriting a file fails when FILE_EXISTS_ERROR is specified.');
+ $this->assertEqual($contents, file_get_contents($existing->uri), 'Contents of existing file were unchanged.');
// Check that no hooks were called while failing.
$this->assertFileHooksCalled(array());
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/SaveUploadTest.php b/core/modules/system/lib/Drupal/system/Tests/File/SaveUploadTest.php
index 2cccaec..1b0bde4 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/SaveUploadTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/SaveUploadTest.php
@@ -56,8 +56,8 @@ class SaveUploadTest extends FileHookTestBase {
'files[file_test_upload]' => drupal_realpath($this->image->uri),
);
$this->drupalPost('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, t('Received a 200 response for posted test file.'));
- $this->assertRaw(t('You WIN!'), t('Found the success message.'));
+ $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertRaw(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called then clean out the hook
// counters.
@@ -70,9 +70,9 @@ class SaveUploadTest extends FileHookTestBase {
*/
function testNormal() {
$max_fid_after = db_query('SELECT MAX(fid) AS fid FROM {file_managed}')->fetchField();
- $this->assertTrue($max_fid_after > $this->maxFidBefore, t('A new file was created.'));
+ $this->assertTrue($max_fid_after > $this->maxFidBefore, 'A new file was created.');
$file1 = file_load($max_fid_after);
- $this->assertTrue($file1, t('Loaded the file.'));
+ $this->assertTrue($file1, 'Loaded the file.');
// MIME type of the uploaded image may be either image/jpeg or image/png.
$this->assertEqual(substr($file1->filemime, 0, 5), 'image', 'A MIME type was set.');
@@ -84,7 +84,7 @@ class SaveUploadTest extends FileHookTestBase {
$image2 = current($this->drupalGetTestFiles('image'));
$edit = array('files[file_test_upload]' => drupal_realpath($image2->uri));
$this->drupalPost('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, t('Received a 200 response for posted test file.'));
+ $this->assertResponse(200, 'Received a 200 response for posted test file.');
$this->assertRaw(t('You WIN!'));
$max_fid_after = db_query('SELECT MAX(fid) AS fid FROM {file_managed}')->fetchField();
@@ -98,8 +98,8 @@ class SaveUploadTest extends FileHookTestBase {
// Load both files using file_load_multiple().
$files = file_load_multiple(array($file1->fid, $file2->fid));
- $this->assertTrue(isset($files[$file1->fid]), t('File was loaded successfully'));
- $this->assertTrue(isset($files[$file2->fid]), t('File was loaded successfully'));
+ $this->assertTrue(isset($files[$file1->fid]), 'File was loaded successfully');
+ $this->assertTrue(isset($files[$file2->fid]), 'File was loaded successfully');
// Upload a third file to a subdirectory.
$image3 = current($this->drupalGetTestFiles('image'));
@@ -110,12 +110,12 @@ class SaveUploadTest extends FileHookTestBase {
'file_subdir' => $dir,
);
$this->drupalPost('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, t('Received a 200 response for posted test file.'));
+ $this->assertResponse(200, 'Received a 200 response for posted test file.');
$this->assertRaw(t('You WIN!'));
$this->assertTrue(is_file('temporary://' . $dir . '/' . trim(drupal_basename($image3_realpath))));
// Check that file_load_multiple() with no arguments returns FALSE.
- $this->assertFalse(file_load_multiple(), t('No files were loaded.'));
+ $this->assertFalse(file_load_multiple(), 'No files were loaded.');
}
/**
@@ -134,10 +134,10 @@ class SaveUploadTest extends FileHookTestBase {
);
$this->drupalPost('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, t('Received a 200 response for posted test file.'));
+ $this->assertResponse(200, 'Received a 200 response for posted test file.');
$message = t('Only files with the following extensions are allowed:') . ' ' . $extensions . '';
$this->assertRaw($message, t('Can\'t upload a disallowed extension'));
- $this->assertRaw(t('Epic upload FAIL!'), t('Found the failure message.'));
+ $this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array('validate'));
@@ -154,9 +154,9 @@ class SaveUploadTest extends FileHookTestBase {
);
$this->drupalPost('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, t('Received a 200 response for posted test file.'));
- $this->assertNoRaw(t('Only files with the following extensions are allowed:'), t('Can upload an allowed extension.'));
- $this->assertRaw(t('You WIN!'), t('Found the success message.'));
+ $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertNoRaw(t('Only files with the following extensions are allowed:'), 'Can upload an allowed extension.');
+ $this->assertRaw(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array('validate', 'load', 'update'));
@@ -171,9 +171,9 @@ class SaveUploadTest extends FileHookTestBase {
'allow_all_extensions' => TRUE,
);
$this->drupalPost('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, t('Received a 200 response for posted test file.'));
- $this->assertNoRaw(t('Only files with the following extensions are allowed:'), t('Can upload any extension.'));
- $this->assertRaw(t('You WIN!'), t('Found the success message.'));
+ $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertNoRaw(t('Only files with the following extensions are allowed:'), 'Can upload any extension.');
+ $this->assertRaw(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array('validate', 'load', 'update'));
@@ -193,11 +193,11 @@ class SaveUploadTest extends FileHookTestBase {
);
$this->drupalPost('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, t('Received a 200 response for posted test file.'));
+ $this->assertResponse(200, 'Received a 200 response for posted test file.');
$message = t('For security reasons, your upload has been renamed to') . ' ' . $this->phpfile->filename . '.txt' . '';
- $this->assertRaw($message, t('Dangerous file was renamed.'));
+ $this->assertRaw($message, 'Dangerous file was renamed.');
$this->assertRaw(t('File MIME type is text/plain.'), t('Dangerous file\'s MIME type was changed.'));
- $this->assertRaw(t('You WIN!'), t('Found the success message.'));
+ $this->assertRaw(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array('validate', 'insert'));
@@ -209,10 +209,10 @@ class SaveUploadTest extends FileHookTestBase {
file_test_reset();
$this->drupalPost('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, t('Received a 200 response for posted test file.'));
- $this->assertNoRaw(t('For security reasons, your upload has been renamed'), t('Found no security message.'));
- $this->assertRaw(t('File name is !filename', array('!filename' => $this->phpfile->filename)), t('Dangerous file was not renamed when insecure uploads is TRUE.'));
- $this->assertRaw(t('You WIN!'), t('Found the success message.'));
+ $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertNoRaw(t('For security reasons, your upload has been renamed'), 'Found no security message.');
+ $this->assertRaw(t('File name is !filename', array('!filename' => $this->phpfile->filename)), 'Dangerous file was not renamed when insecure uploads is TRUE.');
+ $this->assertRaw(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array('validate', 'insert'));
@@ -243,10 +243,10 @@ class SaveUploadTest extends FileHookTestBase {
$munged_filename .= '_.' . $this->image_extension;
$this->drupalPost('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, t('Received a 200 response for posted test file.'));
- $this->assertRaw(t('For security reasons, your upload has been renamed'), t('Found security message.'));
- $this->assertRaw(t('File name is !filename', array('!filename' => $munged_filename)), t('File was successfully munged.'));
- $this->assertRaw(t('You WIN!'), t('Found the success message.'));
+ $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertRaw(t('For security reasons, your upload has been renamed'), 'Found security message.');
+ $this->assertRaw(t('File name is !filename', array('!filename' => $munged_filename)), 'File was successfully munged.');
+ $this->assertRaw(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array('validate', 'insert'));
@@ -261,10 +261,10 @@ class SaveUploadTest extends FileHookTestBase {
);
$this->drupalPost('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, t('Received a 200 response for posted test file.'));
- $this->assertNoRaw(t('For security reasons, your upload has been renamed'), t('Found no security message.'));
- $this->assertRaw(t('File name is !filename', array('!filename' => $this->image->filename)), t('File was not munged when allowing any extension.'));
- $this->assertRaw(t('You WIN!'), t('Found the success message.'));
+ $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertNoRaw(t('For security reasons, your upload has been renamed'), 'Found no security message.');
+ $this->assertRaw(t('File name is !filename', array('!filename' => $this->image->filename)), 'File was not munged when allowing any extension.');
+ $this->assertRaw(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array('validate', 'insert'));
@@ -279,8 +279,8 @@ class SaveUploadTest extends FileHookTestBase {
'files[file_test_upload]' => drupal_realpath($this->image->uri)
);
$this->drupalPost('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, t('Received a 200 response for posted test file.'));
- $this->assertRaw(t('You WIN!'), t('Found the success message.'));
+ $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertRaw(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array('validate', 'insert'));
@@ -295,8 +295,8 @@ class SaveUploadTest extends FileHookTestBase {
'files[file_test_upload]' => drupal_realpath($this->image->uri)
);
$this->drupalPost('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, t('Received a 200 response for posted test file.'));
- $this->assertRaw(t('You WIN!'), t('Found the success message.'));
+ $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertRaw(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array('validate', 'load', 'update'));
@@ -311,8 +311,8 @@ class SaveUploadTest extends FileHookTestBase {
'files[file_test_upload]' => drupal_realpath($this->image->uri)
);
$this->drupalPost('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, t('Received a 200 response for posted test file.'));
- $this->assertRaw(t('Epic upload FAIL!'), t('Found the failure message.'));
+ $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
// Check that the no hooks were called while failing.
$this->assertFileHooksCalled(array());
@@ -323,6 +323,6 @@ class SaveUploadTest extends FileHookTestBase {
*/
function testNoUpload() {
$this->drupalPost('file-test/upload', array(), t('Submit'));
- $this->assertNoRaw(t('Epic upload FAIL!'), t('Failure message not found.'));
+ $this->assertNoRaw(t('Epic upload FAIL!'), 'Failure message not found.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/ScanDirectoryTest.php b/core/modules/system/lib/Drupal/system/Tests/File/ScanDirectoryTest.php
index dda40fd..f2f6503 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/ScanDirectoryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/ScanDirectoryTest.php
@@ -32,21 +32,21 @@ class ScanDirectoryTest extends FileTestBase {
// passed to the callback.
$all_files = file_scan_directory($this->path, '/^javascript-/');
ksort($all_files);
- $this->assertEqual(2, count($all_files), t('Found two, expected javascript files.'));
+ $this->assertEqual(2, count($all_files), 'Found two, expected javascript files.');
// Check the first file.
$file = reset($all_files);
- $this->assertEqual(key($all_files), $file->uri, t('Correct array key was used for the first returned file.'));
- $this->assertEqual($file->uri, $this->path . '/javascript-1.txt', t('First file name was set correctly.'));
- $this->assertEqual($file->filename, 'javascript-1.txt', t('First basename was set correctly'));
- $this->assertEqual($file->name, 'javascript-1', t('First name was set correctly.'));
+ $this->assertEqual(key($all_files), $file->uri, 'Correct array key was used for the first returned file.');
+ $this->assertEqual($file->uri, $this->path . '/javascript-1.txt', 'First file name was set correctly.');
+ $this->assertEqual($file->filename, 'javascript-1.txt', 'First basename was set correctly');
+ $this->assertEqual($file->name, 'javascript-1', 'First name was set correctly.');
// Check the second file.
$file = next($all_files);
- $this->assertEqual(key($all_files), $file->uri, t('Correct array key was used for the second returned file.'));
- $this->assertEqual($file->uri, $this->path . '/javascript-2.script', t('Second file name was set correctly.'));
- $this->assertEqual($file->filename, 'javascript-2.script', t('Second basename was set correctly'));
- $this->assertEqual($file->name, 'javascript-2', t('Second name was set correctly.'));
+ $this->assertEqual(key($all_files), $file->uri, 'Correct array key was used for the second returned file.');
+ $this->assertEqual($file->uri, $this->path . '/javascript-2.script', 'Second file name was set correctly.');
+ $this->assertEqual($file->filename, 'javascript-2.script', 'Second basename was set correctly');
+ $this->assertEqual($file->name, 'javascript-2', 'Second name was set correctly.');
}
/**
@@ -57,18 +57,18 @@ class ScanDirectoryTest extends FileTestBase {
// When nothing is matched nothing should be passed to the callback.
$all_files = file_scan_directory($this->path, '/^NONEXISTINGFILENAME/', array('callback' => 'file_test_file_scan_callback'));
- $this->assertEqual(0, count($all_files), t('No files were found.'));
+ $this->assertEqual(0, count($all_files), 'No files were found.');
$results = file_test_file_scan_callback();
file_test_file_scan_callback_reset();
- $this->assertEqual(0, count($results), t('No files were passed to the callback.'));
+ $this->assertEqual(0, count($results), 'No files were passed to the callback.');
// Grab a listing of all the JavaSscript files and check that they're
// passed to the callback.
$all_files = file_scan_directory($this->path, '/^javascript-/', array('callback' => 'file_test_file_scan_callback'));
- $this->assertEqual(2, count($all_files), t('Found two, expected javascript files.'));
+ $this->assertEqual(2, count($all_files), 'Found two, expected javascript files.');
$results = file_test_file_scan_callback();
file_test_file_scan_callback_reset();
- $this->assertEqual(2, count($results), t('Files were passed to the callback.'));
+ $this->assertEqual(2, count($results), 'Files were passed to the callback.');
}
/**
@@ -77,11 +77,11 @@ class ScanDirectoryTest extends FileTestBase {
function testOptionNoMask() {
// Grab a listing of all the JavaSscript files.
$all_files = file_scan_directory($this->path, '/^javascript-/');
- $this->assertEqual(2, count($all_files), t('Found two, expected javascript files.'));
+ $this->assertEqual(2, count($all_files), 'Found two, expected javascript files.');
// Now use the nomast parameter to filter out the .script file.
$filtered_files = file_scan_directory($this->path, '/^javascript-/', array('nomask' => '/.script$/'));
- $this->assertEqual(1, count($filtered_files), t('Filtered correctly.'));
+ $this->assertEqual(1, count($filtered_files), 'Filtered correctly.');
}
/**
@@ -92,25 +92,25 @@ class ScanDirectoryTest extends FileTestBase {
$expected = array($this->path . '/javascript-1.txt', $this->path . '/javascript-2.script');
$actual = array_keys(file_scan_directory($this->path, '/^javascript-/', array('key' => 'filepath')));
sort($actual);
- $this->assertEqual($expected, $actual, t('Returned the correct values for the filename key.'));
+ $this->assertEqual($expected, $actual, 'Returned the correct values for the filename key.');
// "basename", for the basename of the file.
$expected = array('javascript-1.txt', 'javascript-2.script');
$actual = array_keys(file_scan_directory($this->path, '/^javascript-/', array('key' => 'filename')));
sort($actual);
- $this->assertEqual($expected, $actual, t('Returned the correct values for the basename key.'));
+ $this->assertEqual($expected, $actual, 'Returned the correct values for the basename key.');
// "name" for the name of the file without an extension.
$expected = array('javascript-1', 'javascript-2');
$actual = array_keys(file_scan_directory($this->path, '/^javascript-/', array('key' => 'name')));
sort($actual);
- $this->assertEqual($expected, $actual, t('Returned the correct values for the name key.'));
+ $this->assertEqual($expected, $actual, 'Returned the correct values for the name key.');
// Invalid option that should default back to "filename".
$expected = array($this->path . '/javascript-1.txt', $this->path . '/javascript-2.script');
$actual = array_keys(file_scan_directory($this->path, '/^javascript-/', array('key' => 'INVALID')));
sort($actual);
- $this->assertEqual($expected, $actual, t('An invalid key defaulted back to the default.'));
+ $this->assertEqual($expected, $actual, 'An invalid key defaulted back to the default.');
}
/**
@@ -121,7 +121,7 @@ class ScanDirectoryTest extends FileTestBase {
$this->assertTrue(empty($files), t("Without recursion couldn't find javascript files."));
$files = file_scan_directory(drupal_get_path('module', 'simpletest'), '/^javascript-/', array('recurse' => TRUE));
- $this->assertEqual(2, count($files), t('With recursion we found the expected javascript files.'));
+ $this->assertEqual(2, count($files), 'With recursion we found the expected javascript files.');
}
@@ -131,7 +131,7 @@ class ScanDirectoryTest extends FileTestBase {
*/
function testOptionMinDepth() {
$files = file_scan_directory($this->path, '/^javascript-/', array('min_depth' => 0));
- $this->assertEqual(2, count($files), t('No minimum-depth gets files in current directory.'));
+ $this->assertEqual(2, count($files), 'No minimum-depth gets files in current directory.');
$files = file_scan_directory($this->path, '/^javascript-/', array('min_depth' => 1));
$this->assertTrue(empty($files), t("Minimum-depth of 1 successfully excludes files from current directory."));
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/StreamWrapperTest.php b/core/modules/system/lib/Drupal/system/Tests/File/StreamWrapperTest.php
index 5a4d58d..7748331 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/StreamWrapperTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/StreamWrapperTest.php
@@ -40,9 +40,9 @@ class StreamWrapperTest extends WebTestBase {
*/
function testGetClassName() {
// Check the dummy scheme.
- $this->assertEqual($this->classname, file_stream_wrapper_get_class($this->scheme), t('Got correct class name for dummy scheme.'));
+ $this->assertEqual($this->classname, file_stream_wrapper_get_class($this->scheme), 'Got correct class name for dummy scheme.');
// Check core's scheme.
- $this->assertEqual('Drupal\Core\StreamWrapper\PublicStream', file_stream_wrapper_get_class('public'), t('Got correct class name for public scheme.'));
+ $this->assertEqual('Drupal\Core\StreamWrapper\PublicStream', file_stream_wrapper_get_class('public'), 'Got correct class name for public scheme.');
}
/**
@@ -50,10 +50,10 @@ class StreamWrapperTest extends WebTestBase {
*/
function testGetInstanceByScheme() {
$instance = file_stream_wrapper_get_instance_by_scheme($this->scheme);
- $this->assertEqual($this->classname, get_class($instance), t('Got correct class type for dummy scheme.'));
+ $this->assertEqual($this->classname, get_class($instance), 'Got correct class type for dummy scheme.');
$instance = file_stream_wrapper_get_instance_by_scheme('public');
- $this->assertEqual('Drupal\Core\StreamWrapper\PublicStream', get_class($instance), t('Got correct class type for public scheme.'));
+ $this->assertEqual('Drupal\Core\StreamWrapper\PublicStream', get_class($instance), 'Got correct class type for public scheme.');
}
/**
@@ -61,31 +61,31 @@ class StreamWrapperTest extends WebTestBase {
*/
function testUriFunctions() {
$instance = file_stream_wrapper_get_instance_by_uri($this->scheme . '://foo');
- $this->assertEqual($this->classname, get_class($instance), t('Got correct class type for dummy URI.'));
+ $this->assertEqual($this->classname, get_class($instance), 'Got correct class type for dummy URI.');
$instance = file_stream_wrapper_get_instance_by_uri('public://foo');
- $this->assertEqual('Drupal\Core\StreamWrapper\PublicStream', get_class($instance), t('Got correct class type for public URI.'));
+ $this->assertEqual('Drupal\Core\StreamWrapper\PublicStream', get_class($instance), 'Got correct class type for public URI.');
// Test file_uri_target().
- $this->assertEqual(file_uri_target('public://foo/bar.txt'), 'foo/bar.txt', t('Got a valid stream target from public://foo/bar.txt.'));
- $this->assertFalse(file_uri_target('foo/bar.txt'), t('foo/bar.txt is not a valid stream.'));
+ $this->assertEqual(file_uri_target('public://foo/bar.txt'), 'foo/bar.txt', 'Got a valid stream target from public://foo/bar.txt.');
+ $this->assertFalse(file_uri_target('foo/bar.txt'), 'foo/bar.txt is not a valid stream.');
// Test file_build_uri() and
// Drupal\Core\StreamWrapper\LocalStream::getDirectoryPath().
- $this->assertEqual(file_build_uri('foo/bar.txt'), 'public://foo/bar.txt', t('Expected scheme was added.'));
- $this->assertEqual(file_stream_wrapper_get_instance_by_scheme('public')->getDirectoryPath(), variable_get('file_public_path'), t('Expected default directory path was returned.'));
- $this->assertEqual(file_stream_wrapper_get_instance_by_scheme('temporary')->getDirectoryPath(), variable_get('file_temporary_path'), t('Expected temporary directory path was returned.'));
+ $this->assertEqual(file_build_uri('foo/bar.txt'), 'public://foo/bar.txt', 'Expected scheme was added.');
+ $this->assertEqual(file_stream_wrapper_get_instance_by_scheme('public')->getDirectoryPath(), variable_get('file_public_path'), 'Expected default directory path was returned.');
+ $this->assertEqual(file_stream_wrapper_get_instance_by_scheme('temporary')->getDirectoryPath(), variable_get('file_temporary_path'), 'Expected temporary directory path was returned.');
variable_set('file_default_scheme', 'private');
- $this->assertEqual(file_build_uri('foo/bar.txt'), 'private://foo/bar.txt', t('Got a valid URI from foo/bar.txt.'));
+ $this->assertEqual(file_build_uri('foo/bar.txt'), 'private://foo/bar.txt', 'Got a valid URI from foo/bar.txt.');
}
/**
* Test the scheme functions.
*/
function testGetValidStreamScheme() {
- $this->assertEqual('foo', file_uri_scheme('foo://pork//chops'), t('Got the correct scheme from foo://asdf'));
- $this->assertTrue(file_stream_wrapper_valid_scheme(file_uri_scheme('public://asdf')), t('Got a valid stream scheme from public://asdf'));
- $this->assertFalse(file_stream_wrapper_valid_scheme(file_uri_scheme('foo://asdf')), t('Did not get a valid stream scheme from foo://asdf'));
+ $this->assertEqual('foo', file_uri_scheme('foo://pork//chops'), 'Got the correct scheme from foo://asdf');
+ $this->assertTrue(file_stream_wrapper_valid_scheme(file_uri_scheme('public://asdf')), 'Got a valid stream scheme from public://asdf');
+ $this->assertFalse(file_stream_wrapper_valid_scheme(file_uri_scheme('foo://asdf')), 'Did not get a valid stream scheme from foo://asdf');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedCopyTest.php b/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedCopyTest.php
index 5d5aa21..e6e052b 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedCopyTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedCopyTest.php
@@ -29,20 +29,20 @@ class UnmanagedCopyTest extends FileTestBase {
// Copying to a new name.
$desired_filepath = 'public://' . $this->randomName();
$new_filepath = file_unmanaged_copy($file->uri, $desired_filepath, FILE_EXISTS_ERROR);
- $this->assertTrue($new_filepath, t('Copy was successful.'));
- $this->assertEqual($new_filepath, $desired_filepath, t('Returned expected filepath.'));
- $this->assertTrue(file_exists($file->uri), t('Original file remains.'));
- $this->assertTrue(file_exists($new_filepath), t('New file exists.'));
+ $this->assertTrue($new_filepath, 'Copy was successful.');
+ $this->assertEqual($new_filepath, $desired_filepath, 'Returned expected filepath.');
+ $this->assertTrue(file_exists($file->uri), 'Original file remains.');
+ $this->assertTrue(file_exists($new_filepath), 'New file exists.');
$this->assertFilePermissions($new_filepath, variable_get('file_chmod_file', 0664));
// Copying with rename.
$desired_filepath = 'public://' . $this->randomName();
- $this->assertTrue(file_put_contents($desired_filepath, ' '), t('Created a file so a rename will have to happen.'));
+ $this->assertTrue(file_put_contents($desired_filepath, ' '), 'Created a file so a rename will have to happen.');
$newer_filepath = file_unmanaged_copy($file->uri, $desired_filepath, FILE_EXISTS_RENAME);
- $this->assertTrue($newer_filepath, t('Copy was successful.'));
- $this->assertNotEqual($newer_filepath, $desired_filepath, t('Returned expected filepath.'));
- $this->assertTrue(file_exists($file->uri), t('Original file remains.'));
- $this->assertTrue(file_exists($newer_filepath), t('New file exists.'));
+ $this->assertTrue($newer_filepath, 'Copy was successful.');
+ $this->assertNotEqual($newer_filepath, $desired_filepath, 'Returned expected filepath.');
+ $this->assertTrue(file_exists($file->uri), 'Original file remains.');
+ $this->assertTrue(file_exists($newer_filepath), 'New file exists.');
$this->assertFilePermissions($newer_filepath, variable_get('file_chmod_file', 0664));
// TODO: test copying to a directory (rather than full directory/file path)
@@ -57,7 +57,7 @@ class UnmanagedCopyTest extends FileTestBase {
$desired_filepath = $this->randomName();
$this->assertFalse(file_exists($desired_filepath), t("Randomly named file doesn't exists."));
$new_filepath = file_unmanaged_copy($desired_filepath, $this->randomName());
- $this->assertFalse($new_filepath, t('Copying a missing file fails.'));
+ $this->assertFalse($new_filepath, 'Copying a missing file fails.');
}
/**
@@ -69,28 +69,28 @@ class UnmanagedCopyTest extends FileTestBase {
// Copy the file onto itself with renaming works.
$new_filepath = file_unmanaged_copy($file->uri, $file->uri, FILE_EXISTS_RENAME);
- $this->assertTrue($new_filepath, t('Copying onto itself with renaming works.'));
- $this->assertNotEqual($new_filepath, $file->uri, t('Copied file has a new name.'));
- $this->assertTrue(file_exists($file->uri), t('Original file exists after copying onto itself.'));
- $this->assertTrue(file_exists($new_filepath), t('Copied file exists after copying onto itself.'));
+ $this->assertTrue($new_filepath, 'Copying onto itself with renaming works.');
+ $this->assertNotEqual($new_filepath, $file->uri, 'Copied file has a new name.');
+ $this->assertTrue(file_exists($file->uri), 'Original file exists after copying onto itself.');
+ $this->assertTrue(file_exists($new_filepath), 'Copied file exists after copying onto itself.');
$this->assertFilePermissions($new_filepath, variable_get('file_chmod_file', 0664));
// Copy the file onto itself without renaming fails.
$new_filepath = file_unmanaged_copy($file->uri, $file->uri, FILE_EXISTS_ERROR);
- $this->assertFalse($new_filepath, t('Copying onto itself without renaming fails.'));
- $this->assertTrue(file_exists($file->uri), t('File exists after copying onto itself.'));
+ $this->assertFalse($new_filepath, 'Copying onto itself without renaming fails.');
+ $this->assertTrue(file_exists($file->uri), 'File exists after copying onto itself.');
// Copy the file into same directory without renaming fails.
$new_filepath = file_unmanaged_copy($file->uri, drupal_dirname($file->uri), FILE_EXISTS_ERROR);
- $this->assertFalse($new_filepath, t('Copying onto itself fails.'));
- $this->assertTrue(file_exists($file->uri), t('File exists after copying onto itself.'));
+ $this->assertFalse($new_filepath, 'Copying onto itself fails.');
+ $this->assertTrue(file_exists($file->uri), 'File exists after copying onto itself.');
// Copy the file into same directory with renaming works.
$new_filepath = file_unmanaged_copy($file->uri, drupal_dirname($file->uri), FILE_EXISTS_RENAME);
- $this->assertTrue($new_filepath, t('Copying into same directory works.'));
- $this->assertNotEqual($new_filepath, $file->uri, t('Copied file has a new name.'));
- $this->assertTrue(file_exists($file->uri), t('Original file exists after copying onto itself.'));
- $this->assertTrue(file_exists($new_filepath), t('Copied file exists after copying onto itself.'));
+ $this->assertTrue($new_filepath, 'Copying into same directory works.');
+ $this->assertNotEqual($new_filepath, $file->uri, 'Copied file has a new name.');
+ $this->assertTrue(file_exists($file->uri), 'Original file exists after copying onto itself.');
+ $this->assertTrue(file_exists($new_filepath), 'Copied file exists after copying onto itself.');
$this->assertFilePermissions($new_filepath, variable_get('file_chmod_file', 0664));
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedDeleteRecursiveTest.php b/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedDeleteRecursiveTest.php
index 77fecb2..2a93ac6 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedDeleteRecursiveTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedDeleteRecursiveTest.php
@@ -28,8 +28,8 @@ class UnmanagedDeleteRecursiveTest extends FileTestBase {
file_put_contents($filepath, '');
// Delete the file.
- $this->assertTrue(file_unmanaged_delete_recursive($filepath), t('Function reported success.'));
- $this->assertFalse(file_exists($filepath), t('Test file has been deleted.'));
+ $this->assertTrue(file_unmanaged_delete_recursive($filepath), 'Function reported success.');
+ $this->assertFalse(file_exists($filepath), 'Test file has been deleted.');
}
/**
@@ -40,8 +40,8 @@ class UnmanagedDeleteRecursiveTest extends FileTestBase {
$directory = $this->createDirectory();
// Delete the directory.
- $this->assertTrue(file_unmanaged_delete_recursive($directory), t('Function reported success.'));
- $this->assertFalse(file_exists($directory), t('Directory has been deleted.'));
+ $this->assertTrue(file_unmanaged_delete_recursive($directory), 'Function reported success.');
+ $this->assertFalse(file_exists($directory), 'Directory has been deleted.');
}
/**
@@ -56,10 +56,10 @@ class UnmanagedDeleteRecursiveTest extends FileTestBase {
file_put_contents($filepathB, '');
// Delete the directory.
- $this->assertTrue(file_unmanaged_delete_recursive($directory), t('Function reported success.'));
- $this->assertFalse(file_exists($filepathA), t('Test file A has been deleted.'));
- $this->assertFalse(file_exists($filepathB), t('Test file B has been deleted.'));
- $this->assertFalse(file_exists($directory), t('Directory has been deleted.'));
+ $this->assertTrue(file_unmanaged_delete_recursive($directory), 'Function reported success.');
+ $this->assertFalse(file_exists($filepathA), 'Test file A has been deleted.');
+ $this->assertFalse(file_exists($filepathB), 'Test file B has been deleted.');
+ $this->assertFalse(file_exists($directory), 'Directory has been deleted.');
}
/**
@@ -75,10 +75,10 @@ class UnmanagedDeleteRecursiveTest extends FileTestBase {
file_put_contents($filepathB, '');
// Delete the directory.
- $this->assertTrue(file_unmanaged_delete_recursive($directory), t('Function reported success.'));
- $this->assertFalse(file_exists($filepathA), t('Test file A has been deleted.'));
- $this->assertFalse(file_exists($filepathB), t('Test file B has been deleted.'));
- $this->assertFalse(file_exists($subdirectory), t('Subdirectory has been deleted.'));
- $this->assertFalse(file_exists($directory), t('Directory has been deleted.'));
+ $this->assertTrue(file_unmanaged_delete_recursive($directory), 'Function reported success.');
+ $this->assertFalse(file_exists($filepathA), 'Test file A has been deleted.');
+ $this->assertFalse(file_exists($filepathB), 'Test file B has been deleted.');
+ $this->assertFalse(file_exists($subdirectory), 'Subdirectory has been deleted.');
+ $this->assertFalse(file_exists($directory), 'Directory has been deleted.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedDeleteTest.php b/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedDeleteTest.php
index 326bb5b..1f3d627 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedDeleteTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedDeleteTest.php
@@ -27,8 +27,8 @@ class UnmanagedDeleteTest extends FileTestBase {
$file = $this->createFile();
// Delete a regular file
- $this->assertTrue(file_unmanaged_delete($file->uri), t('Deleted worked.'));
- $this->assertFalse(file_exists($file->uri), t('Test file has actually been deleted.'));
+ $this->assertTrue(file_unmanaged_delete($file->uri), 'Deleted worked.');
+ $this->assertFalse(file_exists($file->uri), 'Test file has actually been deleted.');
}
/**
@@ -36,7 +36,7 @@ class UnmanagedDeleteTest extends FileTestBase {
*/
function testMissing() {
// Try to delete a non-existing file
- $this->assertTrue(file_unmanaged_delete(file_default_scheme() . '/' . $this->randomName()), t('Returns true when deleting a non-existent file.'));
+ $this->assertTrue(file_unmanaged_delete(file_default_scheme() . '/' . $this->randomName()), 'Returns true when deleting a non-existent file.');
}
/**
@@ -47,7 +47,7 @@ class UnmanagedDeleteTest extends FileTestBase {
$directory = $this->createDirectory();
// Try to delete a directory
- $this->assertFalse(file_unmanaged_delete($directory), t('Could not delete the delete directory.'));
- $this->assertTrue(file_exists($directory), t('Directory has not been deleted.'));
+ $this->assertFalse(file_unmanaged_delete($directory), 'Could not delete the delete directory.');
+ $this->assertTrue(file_exists($directory), 'Directory has not been deleted.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedMoveTest.php b/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedMoveTest.php
index 4e5c8c4..84d4ce1 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedMoveTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedMoveTest.php
@@ -29,21 +29,21 @@ class UnmanagedMoveTest extends FileTestBase {
// Moving to a new name.
$desired_filepath = 'public://' . $this->randomName();
$new_filepath = file_unmanaged_move($file->uri, $desired_filepath, FILE_EXISTS_ERROR);
- $this->assertTrue($new_filepath, t('Move was successful.'));
- $this->assertEqual($new_filepath, $desired_filepath, t('Returned expected filepath.'));
- $this->assertTrue(file_exists($new_filepath), t('File exists at the new location.'));
- $this->assertFalse(file_exists($file->uri), t('No file remains at the old location.'));
+ $this->assertTrue($new_filepath, 'Move was successful.');
+ $this->assertEqual($new_filepath, $desired_filepath, 'Returned expected filepath.');
+ $this->assertTrue(file_exists($new_filepath), 'File exists at the new location.');
+ $this->assertFalse(file_exists($file->uri), 'No file remains at the old location.');
$this->assertFilePermissions($new_filepath, variable_get('file_chmod_file', 0664));
// Moving with rename.
$desired_filepath = 'public://' . $this->randomName();
- $this->assertTrue(file_exists($new_filepath), t('File exists before moving.'));
- $this->assertTrue(file_put_contents($desired_filepath, ' '), t('Created a file so a rename will have to happen.'));
+ $this->assertTrue(file_exists($new_filepath), 'File exists before moving.');
+ $this->assertTrue(file_put_contents($desired_filepath, ' '), 'Created a file so a rename will have to happen.');
$newer_filepath = file_unmanaged_move($new_filepath, $desired_filepath, FILE_EXISTS_RENAME);
- $this->assertTrue($newer_filepath, t('Move was successful.'));
- $this->assertNotEqual($newer_filepath, $desired_filepath, t('Returned expected filepath.'));
- $this->assertTrue(file_exists($newer_filepath), t('File exists at the new location.'));
- $this->assertFalse(file_exists($new_filepath), t('No file remains at the old location.'));
+ $this->assertTrue($newer_filepath, 'Move was successful.');
+ $this->assertNotEqual($newer_filepath, $desired_filepath, 'Returned expected filepath.');
+ $this->assertTrue(file_exists($newer_filepath), 'File exists at the new location.');
+ $this->assertFalse(file_exists($new_filepath), 'No file remains at the old location.');
$this->assertFilePermissions($newer_filepath, variable_get('file_chmod_file', 0664));
// TODO: test moving to a directory (rather than full directory/file path)
@@ -56,7 +56,7 @@ class UnmanagedMoveTest extends FileTestBase {
function testMissing() {
// Move non-existent file.
$new_filepath = file_unmanaged_move($this->randomName(), $this->randomName());
- $this->assertFalse($new_filepath, t('Moving a missing file fails.'));
+ $this->assertFalse($new_filepath, 'Moving a missing file fails.');
}
/**
@@ -68,13 +68,13 @@ class UnmanagedMoveTest extends FileTestBase {
// Move the file onto itself without renaming shouldn't make changes.
$new_filepath = file_unmanaged_move($file->uri, $file->uri, FILE_EXISTS_REPLACE);
- $this->assertFalse($new_filepath, t('Moving onto itself without renaming fails.'));
- $this->assertTrue(file_exists($file->uri), t('File exists after moving onto itself.'));
+ $this->assertFalse($new_filepath, 'Moving onto itself without renaming fails.');
+ $this->assertTrue(file_exists($file->uri), 'File exists after moving onto itself.');
// Move the file onto itself with renaming will result in a new filename.
$new_filepath = file_unmanaged_move($file->uri, $file->uri, FILE_EXISTS_RENAME);
- $this->assertTrue($new_filepath, t('Moving onto itself with renaming works.'));
- $this->assertFalse(file_exists($file->uri), t('Original file has been removed.'));
- $this->assertTrue(file_exists($new_filepath), t('File exists after moving onto itself.'));
+ $this->assertTrue($new_filepath, 'Moving onto itself with renaming works.');
+ $this->assertFalse(file_exists($file->uri), 'Original file has been removed.');
+ $this->assertTrue(file_exists($new_filepath), 'File exists after moving onto itself.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedSaveDataTest.php b/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedSaveDataTest.php
index 6494b86..be9fa40 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedSaveDataTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedSaveDataTest.php
@@ -27,15 +27,15 @@ class UnmanagedSaveDataTest extends FileTestBase {
// No filename.
$filepath = file_unmanaged_save_data($contents);
- $this->assertTrue($filepath, t('Unnamed file saved correctly.'));
+ $this->assertTrue($filepath, 'Unnamed file saved correctly.');
$this->assertEqual(file_uri_scheme($filepath), file_default_scheme(), t("File was placed in Drupal's files directory."));
- $this->assertEqual($contents, file_get_contents($filepath), t('Contents of the file are correct.'));
+ $this->assertEqual($contents, file_get_contents($filepath), 'Contents of the file are correct.');
// Provide a filename.
$filepath = file_unmanaged_save_data($contents, 'public://asdf.txt', FILE_EXISTS_REPLACE);
- $this->assertTrue($filepath, t('Unnamed file saved correctly.'));
- $this->assertEqual('asdf.txt', drupal_basename($filepath), t('File was named correctly.'));
- $this->assertEqual($contents, file_get_contents($filepath), t('Contents of the file are correct.'));
+ $this->assertTrue($filepath, 'Unnamed file saved correctly.');
+ $this->assertEqual('asdf.txt', drupal_basename($filepath), 'File was named correctly.');
+ $this->assertEqual($contents, file_get_contents($filepath), 'Contents of the file are correct.');
$this->assertFilePermissions($filepath, variable_get('file_chmod_file', 0664));
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UrlRewritingTest.php b/core/modules/system/lib/Drupal/system/Tests/File/UrlRewritingTest.php
index eb0d99a..58c78e7 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/UrlRewritingTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/UrlRewritingTest.php
@@ -34,28 +34,28 @@ class UrlRewritingTest extends FileTestBase {
variable_set('file_test_hook_file_url_alter', 'cdn');
$filepath = 'core/misc/jquery.js';
$url = file_create_url($filepath);
- $this->assertEqual(FILE_URL_TEST_CDN_1 . '/' . $filepath, $url, t('Correctly generated a CDN URL for a shipped file.'));
+ $this->assertEqual(FILE_URL_TEST_CDN_1 . '/' . $filepath, $url, 'Correctly generated a CDN URL for a shipped file.');
$filepath = 'core/misc/favicon.ico';
$url = file_create_url($filepath);
- $this->assertEqual(FILE_URL_TEST_CDN_2 . '/' . $filepath, $url, t('Correctly generated a CDN URL for a shipped file.'));
+ $this->assertEqual(FILE_URL_TEST_CDN_2 . '/' . $filepath, $url, 'Correctly generated a CDN URL for a shipped file.');
// Test alteration of file URLs to use root-relative URLs.
variable_set('file_test_hook_file_url_alter', 'root-relative');
$filepath = 'core/misc/jquery.js';
$url = file_create_url($filepath);
- $this->assertEqual(base_path() . '/' . $filepath, $url, t('Correctly generated a root-relative URL for a shipped file.'));
+ $this->assertEqual(base_path() . '/' . $filepath, $url, 'Correctly generated a root-relative URL for a shipped file.');
$filepath = 'core/misc/favicon.ico';
$url = file_create_url($filepath);
- $this->assertEqual(base_path() . '/' . $filepath, $url, t('Correctly generated a root-relative URL for a shipped file.'));
+ $this->assertEqual(base_path() . '/' . $filepath, $url, 'Correctly generated a root-relative URL for a shipped file.');
// Test alteration of file URLs to use protocol-relative URLs.
variable_set('file_test_hook_file_url_alter', 'protocol-relative');
$filepath = 'core/misc/jquery.js';
$url = file_create_url($filepath);
- $this->assertEqual('/' . base_path() . '/' . $filepath, $url, t('Correctly generated a protocol-relative URL for a shipped file.'));
+ $this->assertEqual('/' . base_path() . '/' . $filepath, $url, 'Correctly generated a protocol-relative URL for a shipped file.');
$filepath = 'core/misc/favicon.ico';
$url = file_create_url($filepath);
- $this->assertEqual('/' . base_path() . '/' . $filepath, $url, t('Correctly generated a protocol-relative URL for a shipped file.'));
+ $this->assertEqual('/' . base_path() . '/' . $filepath, $url, 'Correctly generated a protocol-relative URL for a shipped file.');
}
/**
@@ -69,18 +69,18 @@ class UrlRewritingTest extends FileTestBase {
$file = $this->createFile();
$url = file_create_url($file->uri);
$public_directory_path = file_stream_wrapper_get_instance_by_scheme('public')->getDirectoryPath();
- $this->assertEqual(FILE_URL_TEST_CDN_2 . '/' . $public_directory_path . '/' . $file->filename, $url, t('Correctly generated a CDN URL for a created file.'));
+ $this->assertEqual(FILE_URL_TEST_CDN_2 . '/' . $public_directory_path . '/' . $file->filename, $url, 'Correctly generated a CDN URL for a created file.');
// Test alteration of file URLs to use root-relative URLs.
variable_set('file_test_hook_file_url_alter', 'root-relative');
$file = $this->createFile();
$url = file_create_url($file->uri);
- $this->assertEqual(base_path() . '/' . $public_directory_path . '/' . $file->filename, $url, t('Correctly generated a root-relative URL for a created file.'));
+ $this->assertEqual(base_path() . '/' . $public_directory_path . '/' . $file->filename, $url, 'Correctly generated a root-relative URL for a created file.');
// Test alteration of file URLs to use a protocol-relative URLs.
variable_set('file_test_hook_file_url_alter', 'protocol-relative');
$file = $this->createFile();
$url = file_create_url($file->uri);
- $this->assertEqual('/' . base_path() . '/' . $public_directory_path . '/' . $file->filename, $url, t('Correctly generated a protocol-relative URL for a created file.'));
+ $this->assertEqual('/' . base_path() . '/' . $public_directory_path . '/' . $file->filename, $url, 'Correctly generated a protocol-relative URL for a created file.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UsageTest.php b/core/modules/system/lib/Drupal/system/Tests/File/UsageTest.php
index 31f64da..9a8934f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/UsageTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/UsageTest.php
@@ -45,11 +45,11 @@ class UsageTest extends FileTestBase {
$usage = file_usage_list($file);
- $this->assertEqual(count($usage['testing']), 2, t('Returned the correct number of items.'));
- $this->assertTrue(isset($usage['testing']['foo'][1]), t('Returned the correct id.'));
- $this->assertTrue(isset($usage['testing']['bar'][2]), t('Returned the correct id.'));
- $this->assertEqual($usage['testing']['foo'][1], 1, t('Returned the correct count.'));
- $this->assertEqual($usage['testing']['bar'][2], 2, t('Returned the correct count.'));
+ $this->assertEqual(count($usage['testing']), 2, 'Returned the correct number of items.');
+ $this->assertTrue(isset($usage['testing']['foo'][1]), 'Returned the correct id.');
+ $this->assertTrue(isset($usage['testing']['bar'][2]), 'Returned the correct id.');
+ $this->assertEqual($usage['testing']['foo'][1], 1, 'Returned the correct count.');
+ $this->assertEqual($usage['testing']['bar'][2], 2, 'Returned the correct count.');
}
/**
@@ -68,13 +68,13 @@ class UsageTest extends FileTestBase {
->condition('f.fid', $file->fid)
->execute()
->fetchAllAssoc('id');
- $this->assertEqual(count($usage), 2, t('Created two records'));
- $this->assertEqual($usage[1]->module, 'testing', t('Correct module'));
- $this->assertEqual($usage[2]->module, 'testing', t('Correct module'));
- $this->assertEqual($usage[1]->type, 'foo', t('Correct type'));
- $this->assertEqual($usage[2]->type, 'bar', t('Correct type'));
- $this->assertEqual($usage[1]->count, 1, t('Correct count'));
- $this->assertEqual($usage[2]->count, 2, t('Correct count'));
+ $this->assertEqual(count($usage), 2, 'Created two records');
+ $this->assertEqual($usage[1]->module, 'testing', 'Correct module');
+ $this->assertEqual($usage[2]->module, 'testing', 'Correct module');
+ $this->assertEqual($usage[1]->type, 'foo', 'Correct type');
+ $this->assertEqual($usage[2]->type, 'bar', 'Correct type');
+ $this->assertEqual($usage[1]->count, 1, 'Correct count');
+ $this->assertEqual($usage[2]->count, 2, 'Correct count');
}
/**
@@ -99,7 +99,7 @@ class UsageTest extends FileTestBase {
->condition('f.fid', $file->fid)
->execute()
->fetchField();
- $this->assertEqual(2, $count, t('The count was decremented correctly.'));
+ $this->assertEqual(2, $count, 'The count was decremented correctly.');
// Multiple decrement and removal.
file_usage_delete($file, 'testing', 'bar', 2, 2);
@@ -108,7 +108,7 @@ class UsageTest extends FileTestBase {
->condition('f.fid', $file->fid)
->execute()
->fetchField();
- $this->assertIdentical(FALSE, $count, t('The count was removed entirely when empty.'));
+ $this->assertIdentical(FALSE, $count, 'The count was removed entirely when empty.');
// Non-existent decrement.
file_usage_delete($file, 'testing', 'bar', 2);
@@ -117,6 +117,6 @@ class UsageTest extends FileTestBase {
->condition('f.fid', $file->fid)
->execute()
->fetchField();
- $this->assertIdentical(FALSE, $count, t('Decrementing non-exist record complete.'));
+ $this->assertIdentical(FALSE, $count, 'Decrementing non-exist record complete.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/ValidateTest.php b/core/modules/system/lib/Drupal/system/Tests/File/ValidateTest.php
index 98d46e3..3acc883 100644
--- a/core/modules/system/lib/Drupal/system/Tests/File/ValidateTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/File/ValidateTest.php
@@ -26,7 +26,7 @@ class ValidateTest extends FileHookTestBase {
$file = $this->createFile();
// Empty validators.
- $this->assertEqual(file_validate($file, array()), array(), t('Validating an empty array works successfully.'));
+ $this->assertEqual(file_validate($file, array()), array(), 'Validating an empty array works successfully.');
$this->assertFileHooksCalled(array('validate'));
// Use the file_test.module's test validator to ensure that passing tests
@@ -34,14 +34,14 @@ class ValidateTest extends FileHookTestBase {
file_test_reset();
file_test_set_return('validate', array());
$passing = array('file_test_validator' => array(array()));
- $this->assertEqual(file_validate($file, $passing), array(), t('Validating passes.'));
+ $this->assertEqual(file_validate($file, $passing), array(), 'Validating passes.');
$this->assertFileHooksCalled(array('validate'));
// Now test for failures in validators passed in and by hook_validate.
file_test_reset();
file_test_set_return('validate', array('Epic fail'));
$failing = array('file_test_validator' => array(array('Failed', 'Badly')));
- $this->assertEqual(file_validate($file, $failing), array('Failed', 'Badly', 'Epic fail'), t('Validating returns errors.'));
+ $this->assertEqual(file_validate($file, $failing), array('Failed', 'Badly', 'Epic fail'), 'Validating returns errors.');
$this->assertFileHooksCalled(array('validate'));
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/AlterTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/AlterTest.php
index 6c6c44b..256f6e3 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/AlterTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/AlterTest.php
@@ -39,6 +39,6 @@ class AlterTest extends WebTestBase {
'system_form_form_test_alter_form_alter() executed.',
);
$content = preg_replace('/\s+/', ' ', filter_xss($this->content, array()));
- $this->assert(strpos($content, implode(' ', $expected)) !== FALSE, t('Form alter hooks executed in the expected order.'));
+ $this->assert(strpos($content, implode(' ', $expected)) !== FALSE, 'Form alter hooks executed in the expected order.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/CheckboxTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/CheckboxTest.php
index ad22954..e706fce 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/CheckboxTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/CheckboxTest.php
@@ -63,12 +63,12 @@ class CheckboxTest extends WebTestBase {
// Ensure that $form_state['values'] is populated correctly for a checkboxes
// group that includes a 0-indexed array of options.
$results = json_decode($this->drupalPost('form-test/checkboxes-zero', array(), 'Save'));
- $this->assertIdentical($results->checkbox_off, array(0, 0, 0), t('All three in checkbox_off are zeroes: off.'));
- $this->assertIdentical($results->checkbox_zero_default, array('0', 0, 0), t('The first choice is on in checkbox_zero_default'));
- $this->assertIdentical($results->checkbox_string_zero_default, array('0', 0, 0), t('The first choice is on in checkbox_string_zero_default'));
+ $this->assertIdentical($results->checkbox_off, array(0, 0, 0), 'All three in checkbox_off are zeroes: off.');
+ $this->assertIdentical($results->checkbox_zero_default, array('0', 0, 0), 'The first choice is on in checkbox_zero_default');
+ $this->assertIdentical($results->checkbox_string_zero_default, array('0', 0, 0), 'The first choice is on in checkbox_string_zero_default');
$edit = array('checkbox_off[0]' => '0');
$results = json_decode($this->drupalPost('form-test/checkboxes-zero', $edit, 'Save'));
- $this->assertIdentical($results->checkbox_off, array('0', 0, 0), t('The first choice is on in checkbox_off but the rest is not'));
+ $this->assertIdentical($results->checkbox_off, array('0', 0, 0), 'The first choice is on in checkbox_off but the rest is not');
// Ensure that each checkbox is rendered correctly for a checkboxes group
// that includes a 0-indexed array of options.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ElementTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/ElementTest.php
index cac8d2c..0f7bfc7 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/ElementTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/ElementTest.php
@@ -45,7 +45,7 @@ class ElementTest extends WebTestBase {
':id' => 'edit-textarea',
':expected' => $expected,
));
- $this->assertTrue(!empty($element), t('Placeholder text placed in textarea.'));
+ $this->assertTrue(!empty($element), 'Placeholder text placed in textarea.');
}
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ElementsTableSelectTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/ElementsTableSelectTest.php
index 2748836..f28479b 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/ElementsTableSelectTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/ElementsTableSelectTest.php
@@ -34,10 +34,10 @@ class ElementsTableSelectTest extends WebTestBase {
$this->drupalGet('form_test/tableselect/multiple-true');
- $this->assertNoText(t('Empty text.'), t('Empty text should not be displayed.'));
+ $this->assertNoText(t('Empty text.'), 'Empty text should not be displayed.');
// Test for the presence of the Select all rows tableheader.
- $this->assertFieldByXPath('//th[@class="select-all"]', NULL, t('Presence of the "Select all" checkbox.'));
+ $this->assertFieldByXPath('//th[@class="select-all"]', NULL, 'Presence of the "Select all" checkbox.');
$rows = array('row1', 'row2', 'row3');
foreach ($rows as $row) {
@@ -51,10 +51,10 @@ class ElementsTableSelectTest extends WebTestBase {
function testMultipleFalse() {
$this->drupalGet('form_test/tableselect/multiple-false');
- $this->assertNoText(t('Empty text.'), t('Empty text should not be displayed.'));
+ $this->assertNoText(t('Empty text.'), 'Empty text should not be displayed.');
// Test for the absence of the Select all rows tableheader.
- $this->assertNoFieldByXPath('//th[@class="select-all"]', '', t('Absence of the "Select all" checkbox.'));
+ $this->assertNoFieldByXPath('//th[@class="select-all"]', '', 'Absence of the "Select all" checkbox.');
$rows = array('row1', 'row2', 'row3');
foreach ($rows as $row) {
@@ -92,7 +92,7 @@ class ElementsTableSelectTest extends WebTestBase {
*/
function testEmptyText() {
$this->drupalGet('form_test/tableselect/empty-text');
- $this->assertText(t('Empty text.'), t('Empty text should be displayed.'));
+ $this->assertText(t('Empty text.'), 'Empty text should be displayed.');
}
/**
@@ -105,18 +105,18 @@ class ElementsTableSelectTest extends WebTestBase {
$edit['tableselect[row1]'] = TRUE;
$this->drupalPost('form_test/tableselect/multiple-true', $edit, 'Submit');
- $this->assertText(t('Submitted: row1 = row1'), t('Checked checkbox row1'));
- $this->assertText(t('Submitted: row2 = 0'), t('Unchecked checkbox row2.'));
- $this->assertText(t('Submitted: row3 = 0'), t('Unchecked checkbox row3.'));
+ $this->assertText(t('Submitted: row1 = row1'), 'Checked checkbox row1');
+ $this->assertText(t('Submitted: row2 = 0'), 'Unchecked checkbox row2.');
+ $this->assertText(t('Submitted: row3 = 0'), 'Unchecked checkbox row3.');
// Test a submission with multiple checkboxes checked.
$edit['tableselect[row1]'] = TRUE;
$edit['tableselect[row3]'] = TRUE;
$this->drupalPost('form_test/tableselect/multiple-true', $edit, 'Submit');
- $this->assertText(t('Submitted: row1 = row1'), t('Checked checkbox row1.'));
- $this->assertText(t('Submitted: row2 = 0'), t('Unchecked checkbox row2.'));
- $this->assertText(t('Submitted: row3 = row3'), t('Checked checkbox row3.'));
+ $this->assertText(t('Submitted: row1 = row1'), 'Checked checkbox row1.');
+ $this->assertText(t('Submitted: row2 = 0'), 'Unchecked checkbox row2.');
+ $this->assertText(t('Submitted: row3 = row3'), 'Checked checkbox row3.');
}
@@ -126,7 +126,7 @@ class ElementsTableSelectTest extends WebTestBase {
function testMultipleFalseSubmit() {
$edit['tableselect'] = 'row1';
$this->drupalPost('form_test/tableselect/multiple-false', $edit, 'Submit');
- $this->assertText(t('Submitted: row1'), t('Selected radio button'));
+ $this->assertText(t('Submitted: row1'), 'Selected radio button');
}
/**
@@ -135,18 +135,18 @@ class ElementsTableSelectTest extends WebTestBase {
function testAdvancedSelect() {
// When #multiple = TRUE a Select all checkbox should be displayed by default.
$this->drupalGet('form_test/tableselect/advanced-select/multiple-true-default');
- $this->assertFieldByXPath('//th[@class="select-all"]', NULL, t('Display a "Select all" checkbox by default when #multiple is TRUE.'));
+ $this->assertFieldByXPath('//th[@class="select-all"]', NULL, 'Display a "Select all" checkbox by default when #multiple is TRUE.');
// When #js_select is set to FALSE, a "Select all" checkbox should not be displayed.
$this->drupalGet('form_test/tableselect/advanced-select/multiple-true-no-advanced-select');
- $this->assertNoFieldByXPath('//th[@class="select-all"]', NULL, t('Do not display a "Select all" checkbox when #js_select is FALSE.'));
+ $this->assertNoFieldByXPath('//th[@class="select-all"]', NULL, 'Do not display a "Select all" checkbox when #js_select is FALSE.');
// A "Select all" checkbox never makes sense when #multiple = FALSE, regardless of the value of #js_select.
$this->drupalGet('form_test/tableselect/advanced-select/multiple-false-default');
- $this->assertNoFieldByXPath('//th[@class="select-all"]', NULL, t('Do not display a "Select all" checkbox when #multiple is FALSE.'));
+ $this->assertNoFieldByXPath('//th[@class="select-all"]', NULL, 'Do not display a "Select all" checkbox when #multiple is FALSE.');
$this->drupalGet('form_test/tableselect/advanced-select/multiple-false-advanced-select');
- $this->assertNoFieldByXPath('//th[@class="select-all"]', NULL, t('Do not display a "Select all" checkbox when #multiple is FALSE, even when #js_select is TRUE.'));
+ $this->assertNoFieldByXPath('//th[@class="select-all"]', NULL, 'Do not display a "Select all" checkbox when #multiple is FALSE, even when #js_select is TRUE.');
}
@@ -165,11 +165,11 @@ class ElementsTableSelectTest extends WebTestBase {
// Test with a valid value.
list($processed_form, $form_state, $errors) = $this->formSubmitHelper($form, array('tableselect' => array('row1' => 'row1')));
- $this->assertFalse(isset($errors['tableselect']), t('Option checker allows valid values for checkboxes.'));
+ $this->assertFalse(isset($errors['tableselect']), 'Option checker allows valid values for checkboxes.');
// Test with an invalid value.
list($processed_form, $form_state, $errors) = $this->formSubmitHelper($form, array('tableselect' => array('non_existing_value' => 'non_existing_value')));
- $this->assertTrue(isset($errors['tableselect']), t('Option checker disallows invalid values for checkboxes.'));
+ $this->assertTrue(isset($errors['tableselect']), 'Option checker disallows invalid values for checkboxes.');
}
@@ -190,11 +190,11 @@ class ElementsTableSelectTest extends WebTestBase {
// Test with a valid value.
list($processed_form, $form_state, $errors) = $this->formSubmitHelper($form, array('tableselect' => 'row1'));
- $this->assertFalse(isset($errors['tableselect']), t('Option checker allows valid values for radio buttons.'));
+ $this->assertFalse(isset($errors['tableselect']), 'Option checker allows valid values for radio buttons.');
// Test with an invalid value.
list($processed_form, $form_state, $errors) = $this->formSubmitHelper($form, array('tableselect' => 'non_existing_value'));
- $this->assertTrue(isset($errors['tableselect']), t('Option checker disallows invalid values for radio buttons.'));
+ $this->assertTrue(isset($errors['tableselect']), 'Option checker disallows invalid values for radio buttons.');
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ElementsVerticalTabsTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/ElementsVerticalTabsTest.php
index b517ffc..21e4c42 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/ElementsVerticalTabsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/ElementsVerticalTabsTest.php
@@ -35,6 +35,6 @@ class ElementsVerticalTabsTest extends WebTestBase {
$this->drupalGet('form_test/vertical-tabs');
$position1 = strpos($this->content, 'core/misc/vertical-tabs.js');
$position2 = strpos($this->content, 'core/misc/collapse.js');
- $this->assertTrue($position1 !== FALSE && $position2 !== FALSE && $position1 < $position2, t('vertical-tabs.js is included before collapse.js'));
+ $this->assertTrue($position1 !== FALSE && $position2 !== FALSE && $position1 < $position2, 'vertical-tabs.js is included before collapse.js');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php
index 6225bb9..8cbeb69 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php
@@ -219,7 +219,7 @@ class FormTest extends WebTestBase {
// First, try to submit without the required checkbox.
$edit = array();
$this->drupalPost('form-test/checkbox', $edit, t('Submit'));
- $this->assertRaw(t('!name field is required.', array('!name' => 'required_checkbox')), t('A required checkbox is actually mandatory'));
+ $this->assertRaw(t('!name field is required.', array('!name' => 'required_checkbox')), 'A required checkbox is actually mandatory');
// Now try to submit the form correctly.
$values = drupal_json_decode($this->drupalPost(NULL, array('required_checkbox' => 1), t('Submit')));
@@ -567,7 +567,7 @@ class FormTest extends WebTestBase {
$checkbox = $this->xpath('//input[@name="checkboxes[two]"]');
$checkbox[0]['value'] = 'FORGERY';
$this->drupalPost(NULL, array('checkboxes[one]' => TRUE, 'checkboxes[two]' => TRUE), t('Submit'));
- $this->assertText('An illegal choice has been detected.', t('Input forgery was detected.'));
+ $this->assertText('An illegal choice has been detected.', 'Input forgery was detected.');
}
/**
@@ -590,6 +590,6 @@ class FormTest extends WebTestBase {
':id' => 'edit-textarea',
':expected' => $expected,
));
- $this->assertTrue(!empty($element), t('The textarea has the proper required attribute.'));
+ $this->assertTrue(!empty($element), 'The textarea has the proper required attribute.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/RebuildTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/RebuildTest.php
index 93d3b21..9ac74a3 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/RebuildTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/RebuildTest.php
@@ -44,14 +44,14 @@ class RebuildTest extends WebTestBase {
$this->drupalPost('form-test/form-rebuild-preserve-values', $edit, 'Add more');
// Verify that initial elements retained their submitted values.
- $this->assertFieldChecked('edit-checkbox-1-default-off', t('A submitted checked checkbox retained its checked state during a rebuild.'));
- $this->assertNoFieldChecked('edit-checkbox-1-default-on', t('A submitted unchecked checkbox retained its unchecked state during a rebuild.'));
- $this->assertFieldById('edit-text-1', 'foo', t('A textfield retained its submitted value during a rebuild.'));
+ $this->assertFieldChecked('edit-checkbox-1-default-off', 'A submitted checked checkbox retained its checked state during a rebuild.');
+ $this->assertNoFieldChecked('edit-checkbox-1-default-on', 'A submitted unchecked checkbox retained its unchecked state during a rebuild.');
+ $this->assertFieldById('edit-text-1', 'foo', 'A textfield retained its submitted value during a rebuild.');
// Verify that newly added elements were initialized with their default values.
- $this->assertFieldChecked('edit-checkbox-2-default-on', t('A newly added checkbox was initialized with a default checked state.'));
- $this->assertNoFieldChecked('edit-checkbox-2-default-off', t('A newly added checkbox was initialized with a default unchecked state.'));
- $this->assertFieldById('edit-text-2', 'DEFAULT 2', t('A newly added textfield was initialized with its default value.'));
+ $this->assertFieldChecked('edit-checkbox-2-default-on', 'A newly added checkbox was initialized with a default checked state.');
+ $this->assertNoFieldChecked('edit-checkbox-2-default-off', 'A newly added checkbox was initialized with a default unchecked state.');
+ $this->assertFieldById('edit-text-2', 'DEFAULT 2', 'A newly added textfield was initialized with its default value.');
}
/**
@@ -85,7 +85,7 @@ class RebuildTest extends WebTestBase {
// field items in the field for which we just added an item.
$this->drupalGet('node/add/page');
$this->drupalPostAJAX(NULL, array(), array('field_ajax_test_add_more' => t('Add another item')), 'system/ajax', array(), array(), 'page-node-form');
- $this->assert(count($this->xpath('//div[contains(@class, "field-name-field-ajax-test")]//input[@type="text"]')) == 2, t('AJAX submission succeeded.'));
+ $this->assert(count($this->xpath('//div[contains(@class, "field-name-field-ajax-test")]//input[@type="text"]')) == 2, 'AJAX submission succeeded.');
// Submit the form with the non-Ajax "Save" button, leaving the title field
// blank to trigger a validation error, and ensure that a validation error
@@ -93,14 +93,14 @@ class RebuildTest extends WebTestBase {
// re-rendered without being re-built, which is what happens when there's
// a validation error.
$this->drupalPost(NULL, array(), t('Save'));
- $this->assertText('Title field is required.', t('Non-AJAX submission correctly triggered a validation error.'));
+ $this->assertText('Title field is required.', 'Non-AJAX submission correctly triggered a validation error.');
// Ensure that the form contains two items in the multi-valued field, so we
// know we're testing a form that was correctly retrieved from cache.
- $this->assert(count($this->xpath('//form[contains(@id, "page-node-form")]//div[contains(@class, "form-item-field-ajax-test")]//input[@type="text"]')) == 2, t('Form retained its state from cache.'));
+ $this->assert(count($this->xpath('//form[contains(@id, "page-node-form")]//div[contains(@class, "form-item-field-ajax-test")]//input[@type="text"]')) == 2, 'Form retained its state from cache.');
// Ensure that the form's action is correct.
$forms = $this->xpath('//form[contains(@class, "node-page-form")]');
- $this->assert(count($forms) == 1 && $forms[0]['action'] == url('node/add/page'), t('Re-rendered form contains the correct action value.'));
+ $this->assert(count($forms) == 1 && $forms[0]['action'] == url('node/add/page'), 'Re-rendered form contains the correct action value.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanAdvancedTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanAdvancedTest.php
index ef3694e..0a509af 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanAdvancedTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanAdvancedTest.php
@@ -49,7 +49,7 @@ class StateValuesCleanAdvancedTest extends WebTestBase {
$this->drupalPost('form_test/form-state-values-clean-advanced', $edit, t('Submit'));
// Expecting a 200 HTTP code.
- $this->assertResponse(200, t('Received a 200 response for posted test file.'));
- $this->assertRaw(t('You WIN!'), t('Found the success message.'));
+ $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertRaw(t('You WIN!'), 'Found the success message.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanTest.php
index 15a6952..d941387 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanTest.php
@@ -50,9 +50,9 @@ class StateValuesCleanTest extends WebTestBase {
$this->assertFalse(isset($values['baz']['baz']), t('%element was removed.', array('%element' => 'baz')));
// Verify that nested form value still exists.
- $this->assertTrue(isset($values['baz']['beer']), t('Nested form value still exists.'));
+ $this->assertTrue(isset($values['baz']['beer']), 'Nested form value still exists.');
// Verify that actual form values equal resulting form values.
- $this->assertEqual($values, $result, t('Expected form values equal actual form values.'));
+ $this->assertEqual($values, $result, 'Expected form values equal actual form values.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/StorageTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/StorageTest.php
index f51838a..04c9651 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/StorageTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/StorageTest.php
@@ -58,7 +58,7 @@ class StorageTest extends WebTestBase {
$this->drupalPost(NULL, $edit, 'Save');
$this->assertText('Form constructions: 4');
- $this->assertText('Title: new', t('The form storage has stored the values.'));
+ $this->assertText('Title: new', 'The form storage has stored the values.');
}
/**
@@ -82,7 +82,7 @@ class StorageTest extends WebTestBase {
$this->drupalPost(NULL, $edit, 'Save');
$this->assertText('Form constructions: 3');
- $this->assertText('Title: new', t('The form storage has stored the values.'));
+ $this->assertText('Title: new', 'The form storage has stored the values.');
}
/**
@@ -90,7 +90,7 @@ class StorageTest extends WebTestBase {
*/
function testValidation() {
$this->drupalPost('form_test/form-storage', array('title' => '', 'value' => 'value_is_set'), 'Continue submit');
- $this->assertPattern('/value_is_set/', t('The input values have been kept.'));
+ $this->assertPattern('/value_is_set/', 'The input values have been kept.');
}
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/TriggeringElementTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/TriggeringElementTest.php
index 99b1f6d..23cfb28 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/TriggeringElementTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/TriggeringElementTest.php
@@ -41,7 +41,7 @@ class TriggeringElementTest extends WebTestBase {
// running.
$this->drupalPost($path, $edit, NULL, array(), array(), $form_html_id);
$this->assertText('There is no clicked button.', t('$form_state[\'triggering_element\'] set to NULL.'));
- $this->assertNoText('Submit handler for form_test_clicked_button executed.', t('Form submit handler did not execute.'));
+ $this->assertNoText('Submit handler for form_test_clicked_button executed.', 'Form submit handler did not execute.');
// Ensure submitting a form with one or more submit buttons results in
// $form_state['triggering_element'] being set to the first one the user has
@@ -49,15 +49,15 @@ class TriggeringElementTest extends WebTestBase {
// (#access=FALSE) button.
$this->drupalPost($path . '/s', $edit, NULL, array(), array(), $form_html_id);
$this->assertText('The clicked button is button1.', t('$form_state[\'triggering_element\'] set to only button.'));
- $this->assertText('Submit handler for form_test_clicked_button executed.', t('Form submit handler executed.'));
+ $this->assertText('Submit handler for form_test_clicked_button executed.', 'Form submit handler executed.');
$this->drupalPost($path . '/s/s', $edit, NULL, array(), array(), $form_html_id);
$this->assertText('The clicked button is button1.', t('$form_state[\'triggering_element\'] set to first button.'));
- $this->assertText('Submit handler for form_test_clicked_button executed.', t('Form submit handler executed.'));
+ $this->assertText('Submit handler for form_test_clicked_button executed.', 'Form submit handler executed.');
$this->drupalPost($path . '/rs/s', $edit, NULL, array(), array(), $form_html_id);
$this->assertText('The clicked button is button2.', t('$form_state[\'triggering_element\'] set to first available button.'));
- $this->assertText('Submit handler for form_test_clicked_button executed.', t('Form submit handler executed.'));
+ $this->assertText('Submit handler for form_test_clicked_button executed.', 'Form submit handler executed.');
// Ensure submitting a form with buttons of different types results in
// $form_state['triggering_element'] being set to the first button,
@@ -66,15 +66,15 @@ class TriggeringElementTest extends WebTestBase {
// 'i'(mage_button).
$this->drupalPost($path . '/s/b/i', $edit, NULL, array(), array(), $form_html_id);
$this->assertText('The clicked button is button1.', t('$form_state[\'triggering_element\'] set to first button.'));
- $this->assertText('Submit handler for form_test_clicked_button executed.', t('Form submit handler executed.'));
+ $this->assertText('Submit handler for form_test_clicked_button executed.', 'Form submit handler executed.');
$this->drupalPost($path . '/b/s/i', $edit, NULL, array(), array(), $form_html_id);
$this->assertText('The clicked button is button1.', t('$form_state[\'triggering_element\'] set to first button.'));
- $this->assertNoText('Submit handler for form_test_clicked_button executed.', t('Form submit handler did not execute.'));
+ $this->assertNoText('Submit handler for form_test_clicked_button executed.', 'Form submit handler did not execute.');
$this->drupalPost($path . '/i/s/b', $edit, NULL, array(), array(), $form_html_id);
$this->assertText('The clicked button is button1.', t('$form_state[\'triggering_element\'] set to first button.'));
- $this->assertText('Submit handler for form_test_clicked_button executed.', t('Form submit handler executed.'));
+ $this->assertText('Submit handler for form_test_clicked_button executed.', 'Form submit handler executed.');
}
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ValidationTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/ValidationTest.php
index 2386a8e..2d6f52f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/ValidationTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/ValidationTest.php
@@ -36,8 +36,8 @@ class ValidationTest extends WebTestBase {
'name' => 'element_validate',
);
$this->drupalPost(NULL, $edit, 'Save');
- $this->assertFieldByName('name', '#value changed by #element_validate', t('Form element #value was altered.'));
- $this->assertText('Name value: value changed by form_set_value() in #element_validate', t('Form element value in $form_state was altered.'));
+ $this->assertFieldByName('name', '#value changed by #element_validate', 'Form element #value was altered.');
+ $this->assertText('Name value: value changed by form_set_value() in #element_validate', 'Form element value in $form_state was altered.');
// Verify that #validate handlers can alter the form and submitted
// form values.
@@ -45,8 +45,8 @@ class ValidationTest extends WebTestBase {
'name' => 'validate',
);
$this->drupalPost(NULL, $edit, 'Save');
- $this->assertFieldByName('name', '#value changed by #validate', t('Form element #value was altered.'));
- $this->assertText('Name value: value changed by form_set_value() in #validate', t('Form element value in $form_state was altered.'));
+ $this->assertFieldByName('name', '#value changed by #validate', 'Form element #value was altered.');
+ $this->assertText('Name value: value changed by form_set_value() in #validate', 'Form element value in $form_state was altered.');
// Verify that #element_validate handlers can make form elements
// inaccessible, but values persist.
@@ -54,13 +54,13 @@ class ValidationTest extends WebTestBase {
'name' => 'element_validate_access',
);
$this->drupalPost(NULL, $edit, 'Save');
- $this->assertNoFieldByName('name', t('Form element was hidden.'));
- $this->assertText('Name value: element_validate_access', t('Value for inaccessible form element exists.'));
+ $this->assertNoFieldByName('name', 'Form element was hidden.');
+ $this->assertText('Name value: element_validate_access', 'Value for inaccessible form element exists.');
// Verify that value for inaccessible form element persists.
$this->drupalPost(NULL, array(), 'Save');
- $this->assertNoFieldByName('name', t('Form element was hidden.'));
- $this->assertText('Name value: element_validate_access', t('Value for inaccessible form element exists.'));
+ $this->assertNoFieldByName('name', 'Form element was hidden.');
+ $this->assertText('Name value: element_validate_access', 'Value for inaccessible form element exists.');
}
/**
@@ -91,7 +91,7 @@ class ValidationTest extends WebTestBase {
$element = $this->xpath('//input[@id=:id and not(@formnovalidate)]', array(
':id' => 'edit-full',
));
- $this->assertTrue(!empty($element), t('The button with full server-side validation does not have the formnovalidate attribute.'));
+ $this->assertTrue(!empty($element), 'The button with full server-side validation does not have the formnovalidate attribute.');
// Submit the form by pressing the 'Partial validate' button (uses
// #limit_validation_errors) and ensure that the title field is not
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/WrapperTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/WrapperTest.php
index 794e8f7..c1b4e68 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/WrapperTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/WrapperTest.php
@@ -30,7 +30,7 @@ class WrapperTest extends WebTestBase {
*/
function testWrapperCallback() {
$this->drupalGet('form_test/wrapper-callback');
- $this->assertText('Form wrapper callback element output.', t('The form contains form wrapper elements.'));
- $this->assertText('Form builder element output.', t('The form contains form builder elements.'));
+ $this->assertText('Form wrapper callback element output.', 'The form contains form wrapper elements.');
+ $this->assertText('Form builder element output.', 'The form contains form builder elements.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Graph/GraphUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Graph/GraphUnitTest.php
index e1fa8da..6318dbf 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Graph/GraphUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Graph/GraphUnitTest.php
@@ -72,7 +72,7 @@ class GraphUnitTest extends UnitTestBase {
$this->assertReversePaths($graph, $expected_reverse_paths);
// Assert that DFS didn't created "missing" vertexes automatically.
- $this->assertFALSE(isset($graph[6]), t('Vertex 6 has not been created'));
+ $this->assertFALSE(isset($graph[6]), 'Vertex 6 has not been created');
$expected_components = array(
array(1, 2, 3, 4, 5, 7),
diff --git a/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitTest.php b/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitTest.php
index 091fc5a..3e5aadd 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitTest.php
@@ -25,8 +25,8 @@ class ToolkitTest extends ToolkitTestBase {
*/
function testGetAvailableToolkits() {
$toolkits = image_get_available_toolkits();
- $this->assertTrue(isset($toolkits['test']), t('The working toolkit was returned.'));
- $this->assertFalse(isset($toolkits['broken']), t('The toolkit marked unavailable was not returned'));
+ $this->assertTrue(isset($toolkits['test']), 'The working toolkit was returned.');
+ $this->assertFalse(isset($toolkits['broken']), 'The toolkit marked unavailable was not returned');
$this->assertToolkitOperationsCalled(array());
}
@@ -35,8 +35,8 @@ class ToolkitTest extends ToolkitTestBase {
*/
function testLoad() {
$image = image_load($this->file, $this->toolkit);
- $this->assertTrue(is_object($image), t('Returned an object.'));
- $this->assertEqual($this->toolkit, $image->toolkit, t('Image had toolkit set.'));
+ $this->assertTrue(is_object($image), 'Returned an object.');
+ $this->assertEqual($this->toolkit, $image->toolkit, 'Image had toolkit set.');
$this->assertToolkitOperationsCalled(array('load', 'get_info'));
}
@@ -44,7 +44,7 @@ class ToolkitTest extends ToolkitTestBase {
* Test the image_save() function.
*/
function testSave() {
- $this->assertFalse(image_save($this->image), t('Function returned the expected value.'));
+ $this->assertFalse(image_save($this->image), 'Function returned the expected value.');
$this->assertToolkitOperationsCalled(array('save'));
}
@@ -52,13 +52,13 @@ class ToolkitTest extends ToolkitTestBase {
* Test the image_resize() function.
*/
function testResize() {
- $this->assertTrue(image_resize($this->image, 1, 2), t('Function returned the expected value.'));
+ $this->assertTrue(image_resize($this->image, 1, 2), 'Function returned the expected value.');
$this->assertToolkitOperationsCalled(array('resize'));
// Check the parameters.
$calls = image_test_get_all_calls();
- $this->assertEqual($calls['resize'][0][1], 1, t('Width was passed correctly'));
- $this->assertEqual($calls['resize'][0][2], 2, t('Height was passed correctly'));
+ $this->assertEqual($calls['resize'][0][1], 1, 'Width was passed correctly');
+ $this->assertEqual($calls['resize'][0][2], 2, 'Height was passed correctly');
}
/**
@@ -66,68 +66,68 @@ class ToolkitTest extends ToolkitTestBase {
*/
function testScale() {
// TODO: need to test upscaling
- $this->assertTrue(image_scale($this->image, 10, 10), t('Function returned the expected value.'));
+ $this->assertTrue(image_scale($this->image, 10, 10), 'Function returned the expected value.');
$this->assertToolkitOperationsCalled(array('resize'));
// Check the parameters.
$calls = image_test_get_all_calls();
- $this->assertEqual($calls['resize'][0][1], 10, t('Width was passed correctly'));
- $this->assertEqual($calls['resize'][0][2], 5, t('Height was based off aspect ratio and passed correctly'));
+ $this->assertEqual($calls['resize'][0][1], 10, 'Width was passed correctly');
+ $this->assertEqual($calls['resize'][0][2], 5, 'Height was based off aspect ratio and passed correctly');
}
/**
* Test the image_scale_and_crop() function.
*/
function testScaleAndCrop() {
- $this->assertTrue(image_scale_and_crop($this->image, 5, 10), t('Function returned the expected value.'));
+ $this->assertTrue(image_scale_and_crop($this->image, 5, 10), 'Function returned the expected value.');
$this->assertToolkitOperationsCalled(array('resize', 'crop'));
// Check the parameters.
$calls = image_test_get_all_calls();
- $this->assertEqual($calls['crop'][0][1], 7.5, t('X was computed and passed correctly'));
- $this->assertEqual($calls['crop'][0][2], 0, t('Y was computed and passed correctly'));
- $this->assertEqual($calls['crop'][0][3], 5, t('Width was computed and passed correctly'));
- $this->assertEqual($calls['crop'][0][4], 10, t('Height was computed and passed correctly'));
+ $this->assertEqual($calls['crop'][0][1], 7.5, 'X was computed and passed correctly');
+ $this->assertEqual($calls['crop'][0][2], 0, 'Y was computed and passed correctly');
+ $this->assertEqual($calls['crop'][0][3], 5, 'Width was computed and passed correctly');
+ $this->assertEqual($calls['crop'][0][4], 10, 'Height was computed and passed correctly');
}
/**
* Test the image_rotate() function.
*/
function testRotate() {
- $this->assertTrue(image_rotate($this->image, 90, 1), t('Function returned the expected value.'));
+ $this->assertTrue(image_rotate($this->image, 90, 1), 'Function returned the expected value.');
$this->assertToolkitOperationsCalled(array('rotate'));
// Check the parameters.
$calls = image_test_get_all_calls();
- $this->assertEqual($calls['rotate'][0][1], 90, t('Degrees were passed correctly'));
- $this->assertEqual($calls['rotate'][0][2], 1, t('Background color was passed correctly'));
+ $this->assertEqual($calls['rotate'][0][1], 90, 'Degrees were passed correctly');
+ $this->assertEqual($calls['rotate'][0][2], 1, 'Background color was passed correctly');
}
/**
* Test the image_crop() function.
*/
function testCrop() {
- $this->assertTrue(image_crop($this->image, 1, 2, 3, 4), t('Function returned the expected value.'));
+ $this->assertTrue(image_crop($this->image, 1, 2, 3, 4), 'Function returned the expected value.');
$this->assertToolkitOperationsCalled(array('crop'));
// Check the parameters.
$calls = image_test_get_all_calls();
- $this->assertEqual($calls['crop'][0][1], 1, t('X was passed correctly'));
- $this->assertEqual($calls['crop'][0][2], 2, t('Y was passed correctly'));
- $this->assertEqual($calls['crop'][0][3], 3, t('Width was passed correctly'));
- $this->assertEqual($calls['crop'][0][4], 4, t('Height was passed correctly'));
+ $this->assertEqual($calls['crop'][0][1], 1, 'X was passed correctly');
+ $this->assertEqual($calls['crop'][0][2], 2, 'Y was passed correctly');
+ $this->assertEqual($calls['crop'][0][3], 3, 'Width was passed correctly');
+ $this->assertEqual($calls['crop'][0][4], 4, 'Height was passed correctly');
}
/**
* Test the image_desaturate() function.
*/
function testDesaturate() {
- $this->assertTrue(image_desaturate($this->image), t('Function returned the expected value.'));
+ $this->assertTrue(image_desaturate($this->image), 'Function returned the expected value.');
$this->assertToolkitOperationsCalled(array('desaturate'));
// Check the parameters.
$calls = image_test_get_all_calls();
- $this->assertEqual(count($calls['desaturate'][0]), 1, t('Only the image was passed.'));
+ $this->assertEqual(count($calls['desaturate'][0]), 1, 'Only the image was passed.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitTestBase.php
index 53d723c..211faa9 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitTestBase.php
@@ -66,7 +66,7 @@ class ToolkitTestBase extends WebTestBase {
$this->assertTrue(FALSE, t('Unexpected operations were called: %unexpected.', array('%unexpected' => implode(', ', $unexpected))));
}
else {
- $this->assertTrue(TRUE, t('No unexpected operations were called.'));
+ $this->assertTrue(TRUE, 'No unexpected operations were called.');
}
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Lock/LockFunctionalTest.php b/core/modules/system/lib/Drupal/system/Tests/Lock/LockFunctionalTest.php
index 9eb7780..f53e26a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Lock/LockFunctionalTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Lock/LockFunctionalTest.php
@@ -80,34 +80,34 @@ class LockFunctionalTest extends WebTestBase {
public function testLockAcquire() {
$lock_acquired = 'TRUE: Lock successfully acquired in system_test_lock_acquire()';
$lock_not_acquired = 'FALSE: Lock not acquired in system_test_lock_acquire()';
- $this->assertTrue(lock_acquire('system_test_lock_acquire'), t('Lock acquired by this request.'), t('Lock'));
- $this->assertTrue(lock_acquire('system_test_lock_acquire'), t('Lock extended by this request.'), t('Lock'));
+ $this->assertTrue(lock_acquire('system_test_lock_acquire'), t('Lock acquired by this request.'), 'Lock');
+ $this->assertTrue(lock_acquire('system_test_lock_acquire'), t('Lock extended by this request.'), 'Lock');
lock_release('system_test_lock_acquire');
// Cause another request to acquire the lock.
$this->drupalGet('system-test/lock-acquire');
- $this->assertText($lock_acquired, t('Lock acquired by the other request.'), t('Lock'));
+ $this->assertText($lock_acquired, t('Lock acquired by the other request.'), 'Lock');
// The other request has finished, thus it should have released its lock.
- $this->assertTrue(lock_acquire('system_test_lock_acquire'), t('Lock acquired by this request.'), t('Lock'));
+ $this->assertTrue(lock_acquire('system_test_lock_acquire'), t('Lock acquired by this request.'), 'Lock');
// This request holds the lock, so the other request cannot acquire it.
$this->drupalGet('system-test/lock-acquire');
- $this->assertText($lock_not_acquired, t('Lock not acquired by the other request.'), t('Lock'));
+ $this->assertText($lock_not_acquired, t('Lock not acquired by the other request.'), 'Lock');
lock_release('system_test_lock_acquire');
// Try a very short timeout and lock breaking.
- $this->assertTrue(lock_acquire('system_test_lock_acquire', 0.5), t('Lock acquired by this request.'), t('Lock'));
+ $this->assertTrue(lock_acquire('system_test_lock_acquire', 0.5), t('Lock acquired by this request.'), 'Lock');
sleep(1);
// The other request should break our lock.
$this->drupalGet('system-test/lock-acquire');
- $this->assertText($lock_acquired, t('Lock acquired by the other request, breaking our lock.'), t('Lock'));
+ $this->assertText($lock_acquired, t('Lock acquired by the other request, breaking our lock.'), 'Lock');
// We cannot renew it, since the other thread took it.
- $this->assertFalse(lock_acquire('system_test_lock_acquire'), t('Lock cannot be extended by this request.'), t('Lock'));
+ $this->assertFalse(lock_acquire('system_test_lock_acquire'), t('Lock cannot be extended by this request.'), 'Lock');
// Check the shut-down function.
$lock_acquired_exit = 'TRUE: Lock successfully acquired in system_test_lock_exit()';
$lock_not_acquired_exit = 'FALSE: Lock not acquired in system_test_lock_exit()';
$this->drupalGet('system-test/lock-exit');
- $this->assertText($lock_acquired_exit, t('Lock acquired by the other request before exit.'), t('Lock'));
- $this->assertTrue(lock_acquire('system_test_lock_exit'), t('Lock acquired by this request after the other request exits.'), t('Lock'));
+ $this->assertText($lock_acquired_exit, t('Lock acquired by the other request before exit.'), 'Lock');
+ $this->assertTrue(lock_acquire('system_test_lock_exit'), t('Lock acquired by this request after the other request exits.'), 'Lock');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php b/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php
index d4eceba..63be54a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php
@@ -47,7 +47,7 @@ class MailTest extends WebTestBase implements MailInterface {
$message = drupal_mail('simpletest', 'mail_test', 'testing@example.com', $language_interface);
// Assert whether the message was sent through the send function.
- $this->assertEqual(self::$sent_message['to'], 'testing@example.com', t('Pluggable mail system is extendable.'));
+ $this->assertEqual(self::$sent_message['to'], 'testing@example.com', 'Pluggable mail system is extendable.');
}
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
index 5c7e12f..0d4941b 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
@@ -371,7 +371,7 @@ class BreadcrumbTest extends MenuTestBase {
// Verify breadcrumb on user pages (without menu link) for anonymous user.
$trail = $home;
- $this->assertBreadcrumb('user', $trail, t('User account'));
+ $this->assertBreadcrumb('user', $trail, 'User account');
$this->assertBreadcrumb('user/' . $this->admin_user->uid, $trail, $this->admin_user->name);
// Verify breadcrumb on user pages (without menu link) for registered users.
@@ -488,14 +488,14 @@ class BreadcrumbTest extends MenuTestBase {
// page title, and that the breadcrumb is empty (because the user is not
// able to access "Administer", so the trail cannot recurse into it).
$trail = array();
- $this->assertBreadcrumb('admin', $trail, t('Access denied'));
+ $this->assertBreadcrumb('admin', $trail, 'Access denied');
$this->assertResponse(403);
$trail = $home;
- $this->assertBreadcrumb('admin/reports', $trail, t('Reports'));
+ $this->assertBreadcrumb('admin/reports', $trail, 'Reports');
$this->assertNoResponse(403);
- $this->assertBreadcrumb('admin/reports/dblog', $trail, t('Recent log messages'));
+ $this->assertBreadcrumb('admin/reports/dblog', $trail, 'Recent log messages');
$this->assertNoResponse(403);
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuTestBase.php
index ec8210c..175fcec 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/MenuTestBase.php
@@ -83,7 +83,7 @@ class MenuTestBase extends WebTestBase {
$i++;
}
$elements = $this->xpath($xpath);
- $this->assertTrue(!empty($elements), t('Active trail to current page was found in menu tree.'));
+ $this->assertTrue(!empty($elements), 'Active trail to current page was found in menu tree.');
// Append prefix for active link asserted below.
$xpath .= '/following-sibling::ul/descendant::';
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/RouterTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/RouterTest.php
index 05c0024..05eebd2 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/RouterTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/RouterTest.php
@@ -55,8 +55,8 @@ class RouterTest extends WebTestBase {
*/
function testTitleCallbackFalse() {
$this->drupalGet('node');
- $this->assertText('A title with @placeholder', t('Raw text found on the page'));
- $this->assertNoText(t('A title with @placeholder', array('@placeholder' => 'some other text')), t('Text with placeholder substitutions not found.'));
+ $this->assertText('A title with @placeholder', 'Raw text found on the page');
+ $this->assertNoText(t('A title with @placeholder', array('@placeholder' => 'some other text')), 'Text with placeholder substitutions not found.');
}
/**
@@ -76,7 +76,7 @@ class RouterTest extends WebTestBase {
*/
function testThemeCallbackAdministrative() {
$this->drupalGet('menu-test/theme-callback/use-admin-theme');
- $this->assertText('Custom theme: seven. Actual theme: seven.', t('The administrative theme can be correctly set in a theme callback.'));
+ $this->assertText('Custom theme: seven. Actual theme: seven.', 'The administrative theme can be correctly set in a theme callback.');
$this->assertRaw('seven/style.css', t("The administrative theme's CSS appears on the page."));
}
@@ -85,7 +85,7 @@ class RouterTest extends WebTestBase {
*/
function testThemeCallbackInheritance() {
$this->drupalGet('menu-test/theme-callback/use-admin-theme/inheritance');
- $this->assertText('Custom theme: seven. Actual theme: seven. Theme callback inheritance is being tested.', t('Theme callback inheritance correctly uses the administrative theme.'));
+ $this->assertText('Custom theme: seven. Actual theme: seven. Theme callback inheritance is being tested.', 'Theme callback inheritance correctly uses the administrative theme.');
$this->assertRaw('seven/style.css', t("The administrative theme's CSS appears on the page."));
}
@@ -95,7 +95,7 @@ class RouterTest extends WebTestBase {
*/
function testFileInheritance() {
$this->drupalGet('admin/config/development/file-inheritance');
- $this->assertText('File inheritance test description', t('File inheritance works.'));
+ $this->assertText('File inheritance test description', 'File inheritance works.');
}
/**
@@ -124,7 +124,7 @@ class RouterTest extends WebTestBase {
$admin_user = $this->drupalCreateUser(array('access site in maintenance mode'));
$this->drupalLogin($admin_user);
$this->drupalGet('menu-test/theme-callback/use-admin-theme');
- $this->assertText('Custom theme: seven. Actual theme: seven.', t('The theme callback system is correctly triggered for an administrator when the site is in maintenance mode.'));
+ $this->assertText('Custom theme: seven. Actual theme: seven.', 'The theme callback system is correctly triggered for an administrator when the site is in maintenance mode.');
$this->assertRaw('seven/style.css', t("The administrative theme's CSS appears on the page."));
}
@@ -166,13 +166,13 @@ class RouterTest extends WebTestBase {
function testThemeCallbackOptionalTheme() {
// Request a theme that is not enabled.
$this->drupalGet('menu-test/theme-callback/use-stark-theme');
- $this->assertText('Custom theme: NONE. Actual theme: bartik.', t('The theme callback system falls back on the default theme when a theme that is not enabled is requested.'));
+ $this->assertText('Custom theme: NONE. Actual theme: bartik.', 'The theme callback system falls back on the default theme when a theme that is not enabled is requested.');
$this->assertRaw('bartik/css/style.css', t("The default theme's CSS appears on the page."));
// Now enable the theme and request it again.
theme_enable(array('stark'));
$this->drupalGet('menu-test/theme-callback/use-stark-theme');
- $this->assertText('Custom theme: stark. Actual theme: stark.', t('The theme callback system uses an optional theme once it has been enabled.'));
+ $this->assertText('Custom theme: stark. Actual theme: stark.', 'The theme callback system uses an optional theme once it has been enabled.');
$this->assertRaw('stark/css/layout.css', t("The optional theme's CSS appears on the page."));
}
@@ -181,7 +181,7 @@ class RouterTest extends WebTestBase {
*/
function testThemeCallbackFakeTheme() {
$this->drupalGet('menu-test/theme-callback/use-fake-theme');
- $this->assertText('Custom theme: NONE. Actual theme: bartik.', t('The theme callback system falls back on the default theme when a theme that does not exist is requested.'));
+ $this->assertText('Custom theme: NONE. Actual theme: bartik.', 'The theme callback system falls back on the default theme when a theme that does not exist is requested.');
$this->assertRaw('bartik/css/style.css', t("The default theme's CSS appears on the page."));
}
@@ -190,7 +190,7 @@ class RouterTest extends WebTestBase {
*/
function testThemeCallbackNoThemeRequested() {
$this->drupalGet('menu-test/theme-callback/no-theme-requested');
- $this->assertText('Custom theme: NONE. Actual theme: bartik.', t('The theme callback system falls back on the default theme when no theme is requested.'));
+ $this->assertText('Custom theme: NONE. Actual theme: bartik.', 'The theme callback system falls back on the default theme when no theme is requested.');
$this->assertRaw('bartik/css/style.css', t("The default theme's CSS appears on the page."));
}
@@ -281,7 +281,7 @@ class RouterTest extends WebTestBase {
$sql = "SELECT menu_name FROM {menu_links} WHERE router_path = 'menu_name_test'";
$name = db_query($sql)->fetchField();
- $this->assertEqual($name, 'original', t('Menu name is "original".'));
+ $this->assertEqual($name, 'original', 'Menu name is "original".');
// Change the menu_name parameter in menu_test.module, then force a menu
// rebuild.
@@ -290,7 +290,7 @@ class RouterTest extends WebTestBase {
$sql = "SELECT menu_name FROM {menu_links} WHERE router_path = 'menu_name_test'";
$name = db_query($sql)->fetchField();
- $this->assertEqual($name, 'changed', t('Menu name was successfully changed after rebuild.'));
+ $this->assertEqual($name, 'changed', 'Menu name was successfully changed after rebuild.');
}
/**
@@ -301,8 +301,8 @@ class RouterTest extends WebTestBase {
$child_link = db_query('SELECT * FROM {menu_links} WHERE link_path = :link_path', array(':link_path' => 'menu-test/hierarchy/parent/child'))->fetchAssoc();
$unattached_child_link = db_query('SELECT * FROM {menu_links} WHERE link_path = :link_path', array(':link_path' => 'menu-test/hierarchy/parent/child2/child'))->fetchAssoc();
- $this->assertEqual($child_link['plid'], $parent_link['mlid'], t('The parent of a directly attached child is correct.'));
- $this->assertEqual($unattached_child_link['plid'], $parent_link['mlid'], t('The parent of a non-directly attached child is correct.'));
+ $this->assertEqual($child_link['plid'], $parent_link['mlid'], 'The parent of a directly attached child is correct.');
+ $this->assertEqual($unattached_child_link['plid'], $parent_link['mlid'], 'The parent of a non-directly attached child is correct.');
}
/**
@@ -456,8 +456,8 @@ class RouterTest extends WebTestBase {
// Load front page.
$this->drupalGet('node');
- $this->assertRaw('title="Test title attribute"', t('Title attribute of a menu link renders.'));
- $this->assertRaw('testparam=testvalue', t('Query parameter added to menu link.'));
+ $this->assertRaw('title="Test title attribute"', 'Title attribute of a menu link renders.');
+ $this->assertRaw('testparam=testvalue', 'Query parameter added to menu link.');
}
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeDataUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeDataUnitTest.php
index 5788e95..4a013ea 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeDataUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeDataUnitTest.php
@@ -39,12 +39,12 @@ class TreeDataUnitTest extends UnitTestBase {
$tree = menu_tree_data($this->links);
// Validate that parent items #1, #2, and #5 exist on the root level.
- $this->assertSameLink($this->links[1], $tree[1]['link'], t('Parent item #1 exists.'));
- $this->assertSameLink($this->links[2], $tree[2]['link'], t('Parent item #2 exists.'));
- $this->assertSameLink($this->links[5], $tree[5]['link'], t('Parent item #5 exists.'));
+ $this->assertSameLink($this->links[1], $tree[1]['link'], 'Parent item #1 exists.');
+ $this->assertSameLink($this->links[2], $tree[2]['link'], 'Parent item #2 exists.');
+ $this->assertSameLink($this->links[5], $tree[5]['link'], 'Parent item #5 exists.');
// Validate that child item #4 exists at the correct location in the hierarchy.
- $this->assertSameLink($this->links[4], $tree[2]['below'][3]['below'][4]['link'], t('Child item #4 exists in the hierarchy.'));
+ $this->assertSameLink($this->links[4], $tree[2]['below'][3]['below'][4]['link'], 'Child item #4 exists in the hierarchy.');
}
/**
@@ -60,6 +60,6 @@ class TreeDataUnitTest extends UnitTestBase {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertSameLink($link1, $link2, $message = '') {
- return $this->assert($link1['mlid'] == $link2['mlid'], $message ? $message : t('First link is identical to second link'));
+ return $this->assert($link1['mlid'] == $link2['mlid'], $message ? $message : 'First link is identical to second link');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php
index e74b820..e1b46ad 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php
@@ -54,15 +54,15 @@ class TreeOutputTest extends WebTestBase {
$output = menu_tree_output($this->tree_data);
// Validate that the - in main-menu is changed into an underscore
- $this->assertEqual( $output['1']['#theme'], 'menu_link__main_menu', t('Hyphen is changed to a dash on menu_link'));
- $this->assertEqual( $output['#theme_wrappers'][0], 'menu_tree__main_menu', t('Hyphen is changed to a dash on menu_tree wrapper'));
+ $this->assertEqual( $output['1']['#theme'], 'menu_link__main_menu', 'Hyphen is changed to a dash on menu_link');
+ $this->assertEqual( $output['#theme_wrappers'][0], 'menu_tree__main_menu', 'Hyphen is changed to a dash on menu_tree wrapper');
// Looking for child items in the data
- $this->assertEqual( $output['1']['#below']['2']['#href'], 'a/b', t('Checking the href on a child item'));
- $this->assertTrue( in_array('active-trail',$output['1']['#below']['2']['#attributes']['class']) , t('Checking the active trail class'));
+ $this->assertEqual( $output['1']['#below']['2']['#href'], 'a/b', 'Checking the href on a child item');
+ $this->assertTrue( in_array('active-trail',$output['1']['#below']['2']['#attributes']['class']) , 'Checking the active trail class');
// Validate that the hidden and no access items are missing
- $this->assertFalse( isset($output['5']), t('Hidden item should be missing'));
- $this->assertFalse( isset($output['6']), t('False access should be missing'));
+ $this->assertFalse( isset($output['5']), 'Hidden item should be missing');
+ $this->assertFalse( isset($output['6']), 'False access should be missing');
// Item 7 is after a couple hidden items. Just to make sure that 5 and 6 are skipped and 7 still included
- $this->assertTrue( isset($output['7']), t('Item after hidden items is present'));
+ $this->assertTrue( isset($output['7']), 'Item after hidden items is present');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ClassLoaderTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/ClassLoaderTest.php
index aa74dcf..df59ea0 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/ClassLoaderTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/ClassLoaderTest.php
@@ -32,7 +32,7 @@ class ClassLoaderTest extends WebTestBase {
// Check twice to test an unprimed and primed system_list() cache.
for ($i=0; $i<2; $i++) {
$this->drupalGet('module-test/class-loading');
- $this->assertText($expected, t('Autoloader loads classes from an enabled module.'));
+ $this->assertText($expected, 'Autoloader loads classes from an enabled module.');
}
module_disable(array('module_autoload_test'), FALSE);
@@ -40,7 +40,7 @@ class ClassLoaderTest extends WebTestBase {
// Check twice to test an unprimed and primed system_list() cache.
for ($i=0; $i<2; $i++) {
$this->drupalGet('module-test/class-loading');
- $this->assertNoText($expected, t('Autoloader does not load classes from a disabled module.'));
+ $this->assertNoText($expected, 'Autoloader does not load classes from a disabled module.');
}
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php
index 7e0c5e9..88dab0d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php
@@ -27,7 +27,7 @@ class DependencyTest extends ModuleTestBase {
$edit = array();
$edit['modules[Core][translation][enable]'] = 'translation';
$this->drupalPost('admin/modules', $edit, t('Save configuration'));
- $this->assertText(t('Some required modules must be enabled'), t('Dependency required.'));
+ $this->assertText(t('Some required modules must be enabled'), 'Dependency required.');
$this->assertModules(array('translation', 'locale', 'language'), FALSE);
@@ -35,7 +35,7 @@ class DependencyTest extends ModuleTestBase {
$this->assertTableCount('language', FALSE);
$this->drupalPost(NULL, NULL, t('Continue'));
- $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
+ $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.');
$this->assertModules(array('translation', 'language'), TRUE);
@@ -50,9 +50,9 @@ class DependencyTest extends ModuleTestBase {
// Test that the system_dependencies_test module is marked
// as missing a dependency.
$this->drupalGet('admin/modules');
- $this->assertRaw(t('@module (missing)', array('@module' => drupal_ucfirst('_missing_dependency'))), t('A module with missing dependencies is marked as such.'));
+ $this->assertRaw(t('@module (missing)', array('@module' => drupal_ucfirst('_missing_dependency'))), 'A module with missing dependencies is marked as such.');
$checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[Testing][system_dependencies_test][enable]"]');
- $this->assert(count($checkbox) == 1, t('Checkbox for the module is disabled.'));
+ $this->assert(count($checkbox) == 1, 'Checkbox for the module is disabled.');
// Force enable the system_dependencies_test module.
module_enable(array('system_dependencies_test'), FALSE);
@@ -60,7 +60,7 @@ class DependencyTest extends ModuleTestBase {
// Verify that the module is forced to be disabled when submitting
// the module page.
$this->drupalPost('admin/modules', array(), t('Save configuration'));
- $this->assertText(t('The @module module is missing, so the following module will be disabled: @depends.', array('@module' => '_missing_dependency', '@depends' => 'system_dependencies_test')), t('The module missing dependencies will be disabled.'));
+ $this->assertText(t('The @module module is missing, so the following module will be disabled: @depends.', array('@module' => '_missing_dependency', '@depends' => 'system_dependencies_test')), 'The module missing dependencies will be disabled.');
// Confirm.
$this->drupalPost(NULL, NULL, t('Continue'));
@@ -81,7 +81,7 @@ class DependencyTest extends ModuleTestBase {
'@version' => '1.0',
)), 'A module that depends on an incompatible version of a module is marked as such.');
$checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[Testing][system_incompatible_module_version_dependencies_test][enable]"]');
- $this->assert(count($checkbox) == 1, t('Checkbox for the module is disabled.'));
+ $this->assert(count($checkbox) == 1, 'Checkbox for the module is disabled.');
}
/**
@@ -95,7 +95,7 @@ class DependencyTest extends ModuleTestBase {
'@module' => 'System incompatible core version test',
)), 'A module that depends on a module with an incompatible core version is marked as such.');
$checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[Testing][system_incompatible_core_version_dependencies_test][enable]"]');
- $this->assert(count($checkbox) == 1, t('Checkbox for the module is disabled.'));
+ $this->assert(count($checkbox) == 1, 'Checkbox for the module is disabled.');
}
/**
@@ -114,7 +114,7 @@ class DependencyTest extends ModuleTestBase {
$this->drupalPost('admin/modules', $edit, t('Save configuration'));
// Makes sure the modules were NOT installed.
- $this->assertText(t('Requirements 1 Test failed requirements'), t('Modules status has been updated.'));
+ $this->assertText(t('Requirements 1 Test failed requirements'), 'Modules status has been updated.');
$this->assertModules(array('requirements1_test'), FALSE);
$this->assertModules(array('requirements2_test'), FALSE);
@@ -180,17 +180,17 @@ class DependencyTest extends ModuleTestBase {
// Check that the taxonomy module cannot be uninstalled.
$this->drupalGet('admin/modules/uninstall');
$checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="uninstall[comment]"]');
- $this->assert(count($checkbox) == 1, t('Checkbox for uninstalling the comment module is disabled.'));
+ $this->assert(count($checkbox) == 1, 'Checkbox for uninstalling the comment module is disabled.');
// Uninstall the forum module, and check that taxonomy now can also be
// uninstalled.
$edit = array('uninstall[forum]' => 'forum');
$this->drupalPost('admin/modules/uninstall', $edit, t('Uninstall'));
$this->drupalPost(NULL, NULL, t('Uninstall'));
- $this->assertText(t('The selected modules have been uninstalled.'), t('Modules status has been updated.'));
+ $this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
$edit = array('uninstall[comment]' => 'comment');
$this->drupalPost('admin/modules/uninstall', $edit, t('Uninstall'));
$this->drupalPost(NULL, NULL, t('Uninstall'));
- $this->assertText(t('The selected modules have been uninstalled.'), t('Modules status has been updated.'));
+ $this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/EnableDisableTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/EnableDisableTest.php
index 8afe33b..ee57de4 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/EnableDisableTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/EnableDisableTest.php
@@ -95,7 +95,7 @@ class EnableDisableTest extends ModuleTestBase {
if (count($modules_to_enable) > 1) {
$this->drupalPost(NULL, array(), t('Continue'));
}
- $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
+ $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.');
// Check that hook_modules_installed() and hook_modules_enabled() were
// invoked with the expected list of modules, that each module's
@@ -162,7 +162,7 @@ class EnableDisableTest extends ModuleTestBase {
$edit['modules[Core][' . $name . '][enable]'] = $name;
}
$this->drupalPost('admin/modules', $edit, t('Save configuration'));
- $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
+ $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.');
}
/**
@@ -176,7 +176,7 @@ class EnableDisableTest extends ModuleTestBase {
$edit = array();
$edit['modules[Core][' . $module . '][enable]'] = FALSE;
$this->drupalPost('admin/modules', $edit, t('Save configuration'));
- $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
+ $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.');
$this->assertModules(array($module), FALSE);
// Check that the appropriate hook was fired and the appropriate log
@@ -194,7 +194,7 @@ class EnableDisableTest extends ModuleTestBase {
$edit['uninstall[' . $module . ']'] = $module;
$this->drupalPost('admin/modules/uninstall', $edit, t('Uninstall'));
$this->drupalPost(NULL, NULL, t('Uninstall'));
- $this->assertText(t('The selected modules have been uninstalled.'), t('Modules status has been updated.'));
+ $this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
$this->assertModules(array($module), FALSE);
// Check that the appropriate hook was fired and the appropriate log
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/HookRequirementsTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/HookRequirementsTest.php
index 6e71f1f..1572f5d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/HookRequirementsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/HookRequirementsTest.php
@@ -31,7 +31,7 @@ class HookRequirementsTest extends ModuleTestBase {
$this->drupalPost('admin/modules', $edit, t('Save configuration'));
// Makes sure the module was NOT installed.
- $this->assertText(t('Requirements 1 Test failed requirements'), t('Modules status has been updated.'));
+ $this->assertText(t('Requirements 1 Test failed requirements'), 'Modules status has been updated.');
$this->assertModules(array('requirements1_test'), FALSE);
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php
index 8468185..ea1d0f8 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php
@@ -40,13 +40,13 @@ class ModuleApiTest extends WebTestBase {
// to match, since all default profile modules have a weight equal to 0
// (except for block.module, which has a lower weight but comes first in
// the alphabet anyway).
- $this->assertModuleList($module_list, t('Standard profile'));
+ $this->assertModuleList($module_list, 'Standard profile');
// Try to install a new module.
module_enable(array('contact'));
$module_list[] = 'contact';
sort($module_list);
- $this->assertModuleList($module_list, t('After adding a module'));
+ $this->assertModuleList($module_list, 'After adding a module');
// Try to mess with the module weights.
db_update('system')
@@ -59,7 +59,7 @@ class ModuleApiTest extends WebTestBase {
// Move contact to the end of the array.
unset($module_list[array_search('contact', $module_list)]);
$module_list[] = 'contact';
- $this->assertModuleList($module_list, t('After changing weights'));
+ $this->assertModuleList($module_list, 'After changing weights');
// Test the fixed list feature.
$fixed_list = array(
@@ -68,11 +68,11 @@ class ModuleApiTest extends WebTestBase {
);
module_list(NULL, $fixed_list);
$new_module_list = array_combine(array_keys($fixed_list), array_keys($fixed_list));
- $this->assertModuleList($new_module_list, t('When using a fixed list'));
+ $this->assertModuleList($new_module_list, 'When using a fixed list');
// Reset the module list.
module_list_reset();
- $this->assertModuleList($module_list, t('After reset'));
+ $this->assertModuleList($module_list, 'After reset');
}
/**
@@ -92,16 +92,16 @@ class ModuleApiTest extends WebTestBase {
function testModuleImplements() {
// Clear the cache.
cache('bootstrap')->delete('module_implements');
- $this->assertFalse(cache('bootstrap')->get('module_implements'), t('The module implements cache is empty.'));
+ $this->assertFalse(cache('bootstrap')->get('module_implements'), 'The module implements cache is empty.');
$this->drupalGet('');
- $this->assertTrue(cache('bootstrap')->get('module_implements'), t('The module implements cache is populated after requesting a page.'));
+ $this->assertTrue(cache('bootstrap')->get('module_implements'), 'The module implements cache is populated after requesting a page.');
// Test again with an authenticated user.
$this->user = $this->drupalCreateUser();
$this->drupalLogin($this->user);
cache('bootstrap')->delete('module_implements');
$this->drupalGet('');
- $this->assertTrue(cache('bootstrap')->get('module_implements'), t('The module implements cache is populated after requesting a page.'));
+ $this->assertTrue(cache('bootstrap')->get('module_implements'), 'The module implements cache is populated after requesting a page.');
// Make sure group include files are detected properly even when the file is
// already loaded when the cache is rebuilt.
@@ -156,10 +156,10 @@ class ModuleApiTest extends WebTestBase {
// are not already enabled. (If they were, the tests below would not work
// correctly.)
module_enable(array('module_test'), FALSE);
- $this->assertTrue(module_exists('module_test'), t('Test module is enabled.'));
- $this->assertFalse(module_exists('forum'), t('Forum module is disabled.'));
- $this->assertFalse(module_exists('poll'), t('Poll module is disabled.'));
- $this->assertFalse(module_exists('php'), t('PHP module is disabled.'));
+ $this->assertTrue(module_exists('module_test'), 'Test module is enabled.');
+ $this->assertFalse(module_exists('forum'), 'Forum module is disabled.');
+ $this->assertFalse(module_exists('poll'), 'Poll module is disabled.');
+ $this->assertFalse(module_exists('php'), 'PHP module is disabled.');
// First, create a fake missing dependency. Forum depends on poll, which
// depends on a made-up module, foo. Nothing should be installed.
@@ -178,7 +178,7 @@ class ModuleApiTest extends WebTestBase {
// Verify that the fake dependency chain was installed.
$this->assertTrue(module_exists('poll') && module_exists('php'), t('Dependency chain was installed by module_enable().'));
// Verify that the original module was installed.
- $this->assertTrue(module_exists('forum'), t('Module installation with unlisted dependencies succeeded.'));
+ $this->assertTrue(module_exists('forum'), 'Module installation with unlisted dependencies succeeded.');
// Finally, verify that the modules were enabled in the correct order.
$this->assertEqual(variable_get('test_module_enable_order', array()), array('php', 'poll', 'forum'), t('Modules were enabled in the correct order by module_enable().'));
@@ -186,7 +186,7 @@ class ModuleApiTest extends WebTestBase {
// well, in the correct order.
module_disable(array('php'));
$this->assertTrue(!module_exists('forum') && !module_exists('poll'), t('Depedency chain was disabled by module_disable().'));
- $this->assertFalse(module_exists('php'), t('Disabling a module with unlisted dependents succeeded.'));
+ $this->assertFalse(module_exists('php'), 'Disabling a module with unlisted dependents succeeded.');
$this->assertEqual(variable_get('test_module_disable_order', array()), array('forum', 'poll', 'php'), t('Modules were disabled in the correct order by module_disable().'));
// Disable a module that is listed as a dependency by the install profile.
@@ -194,13 +194,13 @@ class ModuleApiTest extends WebTestBase {
// modules to be disabled.
$profile = drupal_get_profile();
$info = install_profile_info($profile);
- $this->assertTrue(in_array('comment', $info['dependencies']), t('Comment module is listed as a dependency of the install profile.'));
- $this->assertTrue(module_exists('comment'), t('Comment module is enabled.'));
+ $this->assertTrue(in_array('comment', $info['dependencies']), 'Comment module is listed as a dependency of the install profile.');
+ $this->assertTrue(module_exists('comment'), 'Comment module is enabled.');
module_disable(array('comment'));
- $this->assertFalse(module_exists('comment'), t('Comment module was disabled.'));
+ $this->assertFalse(module_exists('comment'), 'Comment module was disabled.');
$disabled_modules = variable_get('test_module_disable_order', array());
- $this->assertTrue(in_array('comment', $disabled_modules), t('Comment module is in the list of disabled modules.'));
- $this->assertFalse(in_array($profile, $disabled_modules), t('The installation profile is not in the list of disabled modules.'));
+ $this->assertTrue(in_array('comment', $disabled_modules), 'Comment module is in the list of disabled modules.');
+ $this->assertFalse(in_array($profile, $disabled_modules), 'The installation profile is not in the list of disabled modules.');
// Try to uninstall the PHP module by itself. This should be rejected,
// since the modules which it depends on need to be uninstalled first, and
@@ -225,10 +225,10 @@ class ModuleApiTest extends WebTestBase {
// itself is not on the list of dependent modules to be uninstalled.
$result = module_uninstall(array('comment'));
$this->assertTrue($result, t('module_uninstall() returns the correct value.'));
- $this->assertEqual(drupal_get_installed_schema_version('comment'), SCHEMA_UNINSTALLED, t('Comment module was uninstalled.'));
+ $this->assertEqual(drupal_get_installed_schema_version('comment'), SCHEMA_UNINSTALLED, 'Comment module was uninstalled.');
$uninstalled_modules = variable_get('test_module_uninstall_order', array());
- $this->assertTrue(in_array('comment', $uninstalled_modules), t('Comment module is in the list of uninstalled modules.'));
- $this->assertFalse(in_array($profile, $uninstalled_modules), t('The installation profile is not in the list of uninstalled modules.'));
+ $this->assertTrue(in_array('comment', $uninstalled_modules), 'Comment module is in the list of uninstalled modules.');
+ $this->assertFalse(in_array($profile, $uninstalled_modules), 'The installation profile is not in the list of uninstalled modules.');
// Enable forum module again, which should enable both the poll module and
// php module. But, this time do it with poll module declaring a dependency
@@ -241,7 +241,7 @@ class ModuleApiTest extends WebTestBase {
// Verify that the fake dependency chain was installed.
$this->assertTrue(module_exists('poll') && module_exists('php'), t('Dependency chain was installed by module_enable().'));
// Verify that the original module was installed.
- $this->assertTrue(module_exists('forum'), t('Module installation with version dependencies succeeded.'));
+ $this->assertTrue(module_exists('forum'), 'Module installation with version dependencies succeeded.');
// Finally, verify that the modules were enabled in the correct order.
$enable_order = variable_get('test_module_enable_order', array());
$php_position = array_search('php', $enable_order);
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/UninstallTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/UninstallTest.php
index 98bed37..a7e4f4f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/UninstallTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/UninstallTest.php
@@ -36,6 +36,6 @@ class UninstallTest extends WebTestBase {
// Are the perms defined by module_test removed from {role_permission}.
$count = db_query("SELECT COUNT(rid) FROM {role_permission} WHERE permission = :perm", array(':perm' => 'module_test perm'))->fetchField();
- $this->assertEqual(0, $count, t('Permissions were all removed.'));
+ $this->assertEqual(0, $count, 'Permissions were all removed.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/LookupTest.php b/core/modules/system/lib/Drupal/system/Tests/Path/LookupTest.php
index a90b5f4..418b90d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Path/LookupTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Path/LookupTest.php
@@ -36,8 +36,8 @@ class LookupTest extends WebTestBase {
'alias' => 'foo',
);
path_save($path);
- $this->assertEqual(drupal_lookup_path('alias', $path['source']), $path['alias'], t('Basic alias lookup works.'));
- $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], t('Basic source lookup works.'));
+ $this->assertEqual(drupal_lookup_path('alias', $path['source']), $path['alias'], 'Basic alias lookup works.');
+ $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], 'Basic source lookup works.');
// Create a language specific alias for the default language (English).
$path = array(
@@ -46,8 +46,8 @@ class LookupTest extends WebTestBase {
'langcode' => 'en',
);
path_save($path);
- $this->assertEqual(drupal_lookup_path('alias', $path['source']), $path['alias'], t('English alias overrides language-neutral alias.'));
- $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], t('English source overrides language-neutral source.'));
+ $this->assertEqual(drupal_lookup_path('alias', $path['source']), $path['alias'], 'English alias overrides language-neutral alias.');
+ $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], 'English source overrides language-neutral source.');
// Create a language-neutral alias for the same path, again.
$path = array(
@@ -55,7 +55,7 @@ class LookupTest extends WebTestBase {
'alias' => 'bar',
);
path_save($path);
- $this->assertEqual(drupal_lookup_path('alias', $path['source']), "users/$name", t('English alias still returned after entering a language-neutral alias.'));
+ $this->assertEqual(drupal_lookup_path('alias', $path['source']), "users/$name", 'English alias still returned after entering a language-neutral alias.');
// Create a language-specific (xx-lolspeak) alias for the same path.
$path = array(
@@ -64,7 +64,7 @@ class LookupTest extends WebTestBase {
'langcode' => 'xx-lolspeak',
);
path_save($path);
- $this->assertEqual(drupal_lookup_path('alias', $path['source']), "users/$name", t('English alias still returned after entering a LOLspeak alias.'));
+ $this->assertEqual(drupal_lookup_path('alias', $path['source']), "users/$name", 'English alias still returned after entering a LOLspeak alias.');
// The LOLspeak alias should be returned if we really want LOLspeak.
$this->assertEqual(drupal_lookup_path('alias', $path['source'], 'xx-lolspeak'), 'LOL', t('LOLspeak alias returned if we specify xx-lolspeak to drupal_lookup_path().'));
@@ -76,8 +76,8 @@ class LookupTest extends WebTestBase {
'langcode' => 'en',
);
path_save($path);
- $this->assertEqual(drupal_lookup_path('alias', $path['source']), $path['alias'], t('Recently created English alias returned.'));
- $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], t('Recently created English source returned.'));
+ $this->assertEqual(drupal_lookup_path('alias', $path['source']), $path['alias'], 'Recently created English alias returned.');
+ $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], 'Recently created English source returned.');
// Remove the English aliases, which should cause a fallback to the most
// recently created language-neutral alias, 'bar'.
@@ -85,7 +85,7 @@ class LookupTest extends WebTestBase {
->condition('langcode', 'en')
->execute();
drupal_clear_path_cache();
- $this->assertEqual(drupal_lookup_path('alias', $path['source']), 'bar', t('Path lookup falls back to recently created language-neutral alias.'));
+ $this->assertEqual(drupal_lookup_path('alias', $path['source']), 'bar', 'Path lookup falls back to recently created language-neutral alias.');
// Test the situation where the alias and language are the same, but
// the source differs. The newer alias record should be returned.
@@ -95,6 +95,6 @@ class LookupTest extends WebTestBase {
'alias' => 'bar',
);
path_save($path);
- $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], t('Newer alias record is returned when comparing two LANGUAGE_NOT_SPECIFIED paths with the same alias.'));
+ $this->assertEqual(drupal_lookup_path('source', $path['alias']), $path['source'], 'Newer alias record is returned when comparing two LANGUAGE_NOT_SPECIFIED paths with the same alias.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/SaveTest.php b/core/modules/system/lib/Drupal/system/Tests/Path/SaveTest.php
index a34b384..7014df8 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Path/SaveTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Path/SaveTest.php
@@ -50,7 +50,7 @@ class SaveTest extends WebTestBase {
// Test to see if the original alias is available to modules during
// hook_path_update().
$results = variable_get('path_test_results', array());
- $this->assertIdentical($results['hook_path_update']['original']['alias'], $path_original['alias'], t('Old path alias available to modules during hook_path_update.'));
- $this->assertIdentical($results['hook_path_update']['original']['source'], $path_original['source'], t('Old path alias available to modules during hook_path_update.'));
+ $this->assertIdentical($results['hook_path_update']['original']['alias'], $path_original['alias'], 'Old path alias available to modules during hook_path_update.');
+ $this->assertIdentical($results['hook_path_update']['original']['source'], $path_original['source'], 'Old path alias available to modules during hook_path_update.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Queue/QueueTest.php b/core/modules/system/lib/Drupal/system/Tests/Queue/QueueTest.php
index 9e824dc..5767587 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Queue/QueueTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Queue/QueueTest.php
@@ -79,14 +79,14 @@ class QueueTest extends WebTestBase {
$new_items[] = $item->data;
// First two dequeued items should match the first two items we queued.
- $this->assertEqual($this->queueScore($data, $new_items), 2, t('Two items matched'));
+ $this->assertEqual($this->queueScore($data, $new_items), 2, 'Two items matched');
// Add two more items.
$queue1->createItem($data[2]);
$queue1->createItem($data[3]);
- $this->assertTrue($queue1->numberOfItems(), t('Queue 1 is not empty after adding items.'));
- $this->assertFalse($queue2->numberOfItems(), t('Queue 2 is empty while Queue 1 has items'));
+ $this->assertTrue($queue1->numberOfItems(), 'Queue 1 is not empty after adding items.');
+ $this->assertFalse($queue2->numberOfItems(), 'Queue 2 is empty while Queue 1 has items');
$items[] = $item = $queue1->claimItem();
$new_items[] = $item->data;
@@ -96,10 +96,10 @@ class QueueTest extends WebTestBase {
// All dequeued items should match the items we queued exactly once,
// therefore the score must be exactly 4.
- $this->assertEqual($this->queueScore($data, $new_items), 4, t('Four items matched'));
+ $this->assertEqual($this->queueScore($data, $new_items), 4, 'Four items matched');
// There should be no duplicate items.
- $this->assertEqual($this->queueScore($new_items, $new_items), 4, t('Four items matched'));
+ $this->assertEqual($this->queueScore($new_items, $new_items), 4, 'Four items matched');
// Delete all items from queue1.
foreach ($items as $item) {
@@ -107,8 +107,8 @@ class QueueTest extends WebTestBase {
}
// Check that both queues are empty.
- $this->assertFalse($queue1->numberOfItems(), t('Queue 1 is empty'));
- $this->assertFalse($queue2->numberOfItems(), t('Queue 2 is empty'));
+ $this->assertFalse($queue1->numberOfItems(), 'Queue 1 is empty');
+ $this->assertFalse($queue2->numberOfItems(), 'Queue 2 is empty');
}
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Session/SessionTest.php b/core/modules/system/lib/Drupal/system/Tests/Session/SessionTest.php
index 02cb8ae..4d72a6f 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Session/SessionTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Session/SessionTest.php
@@ -26,11 +26,11 @@ class SessionTest extends WebTestBase {
* Tests for drupal_save_session() and drupal_session_regenerate().
*/
function testSessionSaveRegenerate() {
- $this->assertFalse(drupal_save_session(), t('drupal_save_session() correctly returns FALSE (inside of testing framework) when initially called with no arguments.'), t('Session'));
- $this->assertFalse(drupal_save_session(FALSE), t('drupal_save_session() correctly returns FALSE when called with FALSE.'), t('Session'));
- $this->assertFalse(drupal_save_session(), t('drupal_save_session() correctly returns FALSE when saving has been disabled.'), t('Session'));
- $this->assertTrue(drupal_save_session(TRUE), t('drupal_save_session() correctly returns TRUE when called with TRUE.'), t('Session'));
- $this->assertTrue(drupal_save_session(), t('drupal_save_session() correctly returns TRUE when saving has been enabled.'), t('Session'));
+ $this->assertFalse(drupal_save_session(), t('drupal_save_session() correctly returns FALSE (inside of testing framework) when initially called with no arguments.'), 'Session');
+ $this->assertFalse(drupal_save_session(FALSE), t('drupal_save_session() correctly returns FALSE when called with FALSE.'), 'Session');
+ $this->assertFalse(drupal_save_session(), t('drupal_save_session() correctly returns FALSE when saving has been disabled.'), 'Session');
+ $this->assertTrue(drupal_save_session(TRUE), t('drupal_save_session() correctly returns TRUE when called with TRUE.'), 'Session');
+ $this->assertTrue(drupal_save_session(), t('drupal_save_session() correctly returns TRUE when saving has been enabled.'), 'Session');
// Test session hardening code from SA-2008-044.
$user = $this->drupalCreateUser(array('access content'));
@@ -40,7 +40,7 @@ class SessionTest extends WebTestBase {
// Make sure the session cookie is set as HttpOnly.
$this->drupalLogin($user);
- $this->assertTrue(preg_match('/HttpOnly/i', $this->drupalGetHeader('Set-Cookie', TRUE)), t('Session cookie is set as HttpOnly.'));
+ $this->assertTrue(preg_match('/HttpOnly/i', $this->drupalGetHeader('Set-Cookie', TRUE)), 'Session cookie is set as HttpOnly.');
$this->drupalLogout();
// Verify that the session is regenerated if a module calls exit
@@ -50,7 +50,7 @@ class SessionTest extends WebTestBase {
$this->drupalGet('session-test/id');
$matches = array();
preg_match('/\s*session_id:(.*)\n/', $this->drupalGetContent(), $matches);
- $this->assertTrue(!empty($matches[1]) , t('Found session ID before logging in.'));
+ $this->assertTrue(!empty($matches[1]) , 'Found session ID before logging in.');
$original_session = $matches[1];
// We cannot use $this->drupalLogin($user); because we exit in
@@ -61,14 +61,14 @@ class SessionTest extends WebTestBase {
);
$this->drupalPost('user', $edit, t('Log in'));
$this->drupalGet('user');
- $pass = $this->assertText($user->name, t('Found name: %name', array('%name' => $user->name)), t('User login'));
+ $pass = $this->assertText($user->name, t('Found name: %name', array('%name' => $user->name)), 'User login');
$this->_logged_in = $pass;
$this->drupalGet('session-test/id');
$matches = array();
preg_match('/\s*session_id:(.*)\n/', $this->drupalGetContent(), $matches);
- $this->assertTrue(!empty($matches[1]) , t('Found session ID after logging in.'));
- $this->assertTrue($matches[1] != $original_session, t('Session ID changed after login.'));
+ $this->assertTrue(!empty($matches[1]) , 'Found session ID after logging in.');
+ $this->assertTrue($matches[1] != $original_session, 'Session ID changed after login.');
}
/**
@@ -84,48 +84,48 @@ class SessionTest extends WebTestBase {
$value_1 = $this->randomName();
$this->drupalGet('session-test/set/' . $value_1);
- $this->assertText($value_1, t('The session value was stored.'), t('Session'));
+ $this->assertText($value_1, t('The session value was stored.'), 'Session');
$this->drupalGet('session-test/get');
- $this->assertText($value_1, t('Session correctly returned the stored data for an authenticated user.'), t('Session'));
+ $this->assertText($value_1, t('Session correctly returned the stored data for an authenticated user.'), 'Session');
// Attempt to write over val_1. If drupal_save_session(FALSE) is working.
// properly, val_1 will still be set.
$value_2 = $this->randomName();
$this->drupalGet('session-test/no-set/' . $value_2);
- $this->assertText($value_2, t('The session value was correctly passed to session-test/no-set.'), t('Session'));
+ $this->assertText($value_2, t('The session value was correctly passed to session-test/no-set.'), 'Session');
$this->drupalGet('session-test/get');
- $this->assertText($value_1, t('Session data is not saved for drupal_save_session(FALSE).'), t('Session'));
+ $this->assertText($value_1, t('Session data is not saved for drupal_save_session(FALSE).'), 'Session');
// Switch browser cookie to anonymous user, then back to user 1.
$this->sessionReset();
$this->sessionReset($user->uid);
- $this->assertText($value_1, t('Session data persists through browser close.'), t('Session'));
+ $this->assertText($value_1, t('Session data persists through browser close.'), 'Session');
// Logout the user and make sure the stored value no longer persists.
$this->drupalLogout();
$this->sessionReset();
$this->drupalGet('session-test/get');
- $this->assertNoText($value_1, t("After logout, previous user's session data is not available."), t('Session'));
+ $this->assertNoText($value_1, t("After logout, previous user's session data is not available."), 'Session');
// Now try to store some data as an anonymous user.
$value_3 = $this->randomName();
$this->drupalGet('session-test/set/' . $value_3);
- $this->assertText($value_3, t('Session data stored for anonymous user.'), t('Session'));
+ $this->assertText($value_3, t('Session data stored for anonymous user.'), 'Session');
$this->drupalGet('session-test/get');
- $this->assertText($value_3, t('Session correctly returned the stored data for an anonymous user.'), t('Session'));
+ $this->assertText($value_3, t('Session correctly returned the stored data for an anonymous user.'), 'Session');
// Try to store data when drupal_save_session(FALSE).
$value_4 = $this->randomName();
$this->drupalGet('session-test/no-set/' . $value_4);
- $this->assertText($value_4, t('The session value was correctly passed to session-test/no-set.'), t('Session'));
+ $this->assertText($value_4, t('The session value was correctly passed to session-test/no-set.'), 'Session');
$this->drupalGet('session-test/get');
- $this->assertText($value_3, t('Session data is not saved for drupal_save_session(FALSE).'), t('Session'));
+ $this->assertText($value_3, t('Session data is not saved for drupal_save_session(FALSE).'), 'Session');
// Login, the data should persist.
$this->drupalLogin($user);
$this->sessionReset($user->uid);
$this->drupalGet('session-test/get');
- $this->assertNoText($value_1, t('Session has persisted for an authenticated user after logging out and then back in.'), t('Session'));
+ $this->assertNoText($value_1, t('Session has persisted for an authenticated user after logging out and then back in.'), 'Session');
// Change session and create another user.
$user2 = $this->drupalCreateUser(array('access content'));
@@ -149,29 +149,29 @@ class SessionTest extends WebTestBase {
$this->drupalGet('');
$this->assertSessionCookie(FALSE);
$this->assertSessionEmpty(TRUE);
- $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', t('Page was not cached.'));
+ $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', 'Page was not cached.');
// Start a new session by setting a message.
$this->drupalGet('session-test/set-message');
$this->assertSessionCookie(TRUE);
- $this->assertTrue($this->drupalGetHeader('Set-Cookie'), t('New session was started.'));
+ $this->assertTrue($this->drupalGetHeader('Set-Cookie'), 'New session was started.');
// Display the message, during the same request the session is destroyed
// and the session cookie is unset.
$this->drupalGet('');
$this->assertSessionCookie(FALSE);
$this->assertSessionEmpty(FALSE);
- $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), t('Caching was bypassed.'));
- $this->assertText(t('This is a dummy message.'), t('Message was displayed.'));
- $this->assertTrue(preg_match('/SESS\w+=deleted/', $this->drupalGetHeader('Set-Cookie')), t('Session cookie was deleted.'));
+ $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), 'Caching was bypassed.');
+ $this->assertText(t('This is a dummy message.'), 'Message was displayed.');
+ $this->assertTrue(preg_match('/SESS\w+=deleted/', $this->drupalGetHeader('Set-Cookie')), 'Session cookie was deleted.');
// Verify that session was destroyed.
$this->drupalGet('');
$this->assertSessionCookie(FALSE);
$this->assertSessionEmpty(TRUE);
- $this->assertNoText(t('This is a dummy message.'), t('Message was not cached.'));
- $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', t('Page was cached.'));
- $this->assertFalse($this->drupalGetHeader('Set-Cookie'), t('New session was not started.'));
+ $this->assertNoText(t('This is a dummy message.'), 'Message was not cached.');
+ $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.');
+ $this->assertFalse($this->drupalGetHeader('Set-Cookie'), 'New session was not started.');
// Verify that no session is created if drupal_save_session(FALSE) is called.
$this->drupalGet('session-test/set-message-but-dont-save');
@@ -182,7 +182,7 @@ class SessionTest extends WebTestBase {
$this->drupalGet('');
$this->assertSessionCookie(FALSE);
$this->assertSessionEmpty(TRUE);
- $this->assertNoText(t('This is a dummy message.'), t('The message was not saved.'));
+ $this->assertNoText(t('This is a dummy message.'), 'The message was not saved.');
}
/**
@@ -202,29 +202,29 @@ class SessionTest extends WebTestBase {
sleep(1);
$this->drupalGet('session-test/set/foo');
$times2 = db_query($sql, array(':uid' => $user->uid))->fetchObject();
- $this->assertEqual($times2->access, $times1->access, t('Users table was not updated.'));
- $this->assertNotEqual($times2->timestamp, $times1->timestamp, t('Sessions table was updated.'));
+ $this->assertEqual($times2->access, $times1->access, 'Users table was not updated.');
+ $this->assertNotEqual($times2->timestamp, $times1->timestamp, 'Sessions table was updated.');
// Write the same value again, i.e. do not modify the session.
sleep(1);
$this->drupalGet('session-test/set/foo');
$times3 = db_query($sql, array(':uid' => $user->uid))->fetchObject();
- $this->assertEqual($times3->access, $times1->access, t('Users table was not updated.'));
- $this->assertEqual($times3->timestamp, $times2->timestamp, t('Sessions table was not updated.'));
+ $this->assertEqual($times3->access, $times1->access, 'Users table was not updated.');
+ $this->assertEqual($times3->timestamp, $times2->timestamp, 'Sessions table was not updated.');
// Do not change the session.
sleep(1);
$this->drupalGet('');
$times4 = db_query($sql, array(':uid' => $user->uid))->fetchObject();
- $this->assertEqual($times4->access, $times3->access, t('Users table was not updated.'));
- $this->assertEqual($times4->timestamp, $times3->timestamp, t('Sessions table was not updated.'));
+ $this->assertEqual($times4->access, $times3->access, 'Users table was not updated.');
+ $this->assertEqual($times4->timestamp, $times3->timestamp, 'Sessions table was not updated.');
// Force updating of users and sessions table once per second.
variable_set('session_write_interval', 0);
$this->drupalGet('');
$times5 = db_query($sql, array(':uid' => $user->uid))->fetchObject();
- $this->assertNotEqual($times5->access, $times4->access, t('Users table was updated.'));
- $this->assertNotEqual($times5->timestamp, $times4->timestamp, t('Sessions table was updated.'));
+ $this->assertNotEqual($times5->access, $times4->access, 'Users table was updated.');
+ $this->assertNotEqual($times5->timestamp, $times4->timestamp, 'Sessions table was updated.');
}
/**
@@ -234,7 +234,7 @@ class SessionTest extends WebTestBase {
$user = $this->drupalCreateUser(array('access content'));
$this->drupalLogin($user);
$this->drupalGet('session-test/is-logged-in');
- $this->assertResponse(200, t('User is logged in.'));
+ $this->assertResponse(200, 'User is logged in.');
// Reset the sid in {sessions} to a blank string. This may exist in the
// wild in some cases, although we normally prevent it from happening.
@@ -245,10 +245,10 @@ class SessionTest extends WebTestBase {
$this->curlClose();
$this->additionalCurlOptions[CURLOPT_COOKIE] = rawurlencode($this->session_name) . '=;';
$this->drupalGet('session-test/id-from-cookie');
- $this->assertRaw("session_id:\n", t('Session ID is blank as sent from cookie header.'));
+ $this->assertRaw("session_id:\n", 'Session ID is blank as sent from cookie header.');
// Assert that we have an anonymous session now.
$this->drupalGet('session-test/is-logged-in');
- $this->assertResponse(403, t('An empty session ID is not allowed.'));
+ $this->assertResponse(403, 'An empty session ID is not allowed.');
}
/**
@@ -266,7 +266,7 @@ class SessionTest extends WebTestBase {
$this->additionalCurlOptions[CURLOPT_COOKIEFILE] = $this->cookieFile;
$this->additionalCurlOptions[CURLOPT_COOKIESESSION] = TRUE;
$this->drupalGet('session-test/get');
- $this->assertResponse(200, t('Session test module is correctly enabled.'), t('Session'));
+ $this->assertResponse(200, t('Session test module is correctly enabled.'), 'Session');
}
/**
@@ -274,10 +274,10 @@ class SessionTest extends WebTestBase {
*/
function assertSessionCookie($sent) {
if ($sent) {
- $this->assertNotNull($this->session_id, t('Session cookie was sent.'));
+ $this->assertNotNull($this->session_id, 'Session cookie was sent.');
}
else {
- $this->assertNull($this->session_id, t('Session cookie was not sent.'));
+ $this->assertNull($this->session_id, 'Session cookie was not sent.');
}
}
@@ -286,10 +286,10 @@ class SessionTest extends WebTestBase {
*/
function assertSessionEmpty($empty) {
if ($empty) {
- $this->assertIdentical($this->drupalGetHeader('X-Session-Empty'), '1', t('Session was empty.'));
+ $this->assertIdentical($this->drupalGetHeader('X-Session-Empty'), '1', 'Session was empty.');
}
else {
- $this->assertIdentical($this->drupalGetHeader('X-Session-Empty'), '0', t('Session was not empty.'));
+ $this->assertIdentical($this->drupalGetHeader('X-Session-Empty'), '0', 'Session was not empty.');
}
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/AccessDeniedTest.php b/core/modules/system/lib/Drupal/system/Tests/System/AccessDeniedTest.php
index f278f60..19a8548 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/AccessDeniedTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/AccessDeniedTest.php
@@ -35,7 +35,7 @@ class AccessDeniedTest extends WebTestBase {
function testAccessDenied() {
$this->drupalGet('admin');
- $this->assertText(t('Access denied'), t('Found the default 403 page'));
+ $this->assertText(t('Access denied'), 'Found the default 403 page');
$this->assertResponse(403);
// Use a custom 403 page.
@@ -54,8 +54,8 @@ class AccessDeniedTest extends WebTestBase {
// Logout and check that the user login block is shown on custom 403 pages.
$this->drupalLogout();
$this->drupalGet('admin');
- $this->assertText($this->admin_user->name, t('Found the custom 403 page'));
- $this->assertText(t('User login'), t('Blocks are shown on the custom 403 page'));
+ $this->assertText($this->admin_user->name, 'Found the custom 403 page');
+ $this->assertText(t('User login'), 'Blocks are shown on the custom 403 page');
// Log back in and remove the custom 403 page.
$this->drupalLogin($this->admin_user);
@@ -67,9 +67,9 @@ class AccessDeniedTest extends WebTestBase {
// Logout and check that the user login block is shown on default 403 pages.
$this->drupalLogout();
$this->drupalGet('admin');
- $this->assertText(t('Access denied'), t('Found the default 403 page'));
+ $this->assertText(t('Access denied'), 'Found the default 403 page');
$this->assertResponse(403);
- $this->assertText(t('User login'), t('Blocks are shown on the default 403 page'));
+ $this->assertText(t('User login'), 'Blocks are shown on the default 403 page');
// Log back in, set the custom 403 page to /user and remove the block
$this->drupalLogin($this->admin_user);
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/AdminMetaTagTest.php b/core/modules/system/lib/Drupal/system/Tests/System/AdminMetaTagTest.php
index ea07456..ff91eb9 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/AdminMetaTagTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/AdminMetaTagTest.php
@@ -28,6 +28,6 @@ class AdminMetaTagTest extends WebTestBase {
list($version, ) = explode('.', VERSION);
$string = '';
$this->drupalGet('node');
- $this->assertRaw($string, t('Fingerprinting meta tag generated correctly.'), t('System'));
+ $this->assertRaw($string, t('Fingerprinting meta tag generated correctly.'), 'System');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/AdminTest.php b/core/modules/system/lib/Drupal/system/Tests/System/AdminTest.php
index 4e8d49a..23a53ed 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/AdminTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/AdminTest.php
@@ -107,17 +107,17 @@ class AdminTest extends WebTestBase {
*/
function testCompactMode() {
$this->drupalGet('admin/compact/on');
- $this->assertTrue($this->cookies['Drupal.visitor.admin_compact_mode']['value'], t('Compact mode turns on.'));
+ $this->assertTrue($this->cookies['Drupal.visitor.admin_compact_mode']['value'], 'Compact mode turns on.');
$this->drupalGet('admin/compact/on');
- $this->assertTrue($this->cookies['Drupal.visitor.admin_compact_mode']['value'], t('Compact mode remains on after a repeat call.'));
+ $this->assertTrue($this->cookies['Drupal.visitor.admin_compact_mode']['value'], 'Compact mode remains on after a repeat call.');
$this->drupalGet('');
- $this->assertTrue($this->cookies['Drupal.visitor.admin_compact_mode']['value'], t('Compact mode persists on new requests.'));
+ $this->assertTrue($this->cookies['Drupal.visitor.admin_compact_mode']['value'], 'Compact mode persists on new requests.');
$this->drupalGet('admin/compact/off');
- $this->assertEqual($this->cookies['Drupal.visitor.admin_compact_mode']['value'], 'deleted', t('Compact mode turns off.'));
+ $this->assertEqual($this->cookies['Drupal.visitor.admin_compact_mode']['value'], 'deleted', 'Compact mode turns off.');
$this->drupalGet('admin/compact/off');
- $this->assertEqual($this->cookies['Drupal.visitor.admin_compact_mode']['value'], 'deleted', t('Compact mode remains off after a repeat call.'));
+ $this->assertEqual($this->cookies['Drupal.visitor.admin_compact_mode']['value'], 'deleted', 'Compact mode remains off after a repeat call.');
$this->drupalGet('');
- $this->assertTrue($this->cookies['Drupal.visitor.admin_compact_mode']['value'], t('Compact mode persists on new requests.'));
+ $this->assertTrue($this->cookies['Drupal.visitor.admin_compact_mode']['value'], 'Compact mode persists on new requests.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/CronRunTest.php b/core/modules/system/lib/Drupal/system/Tests/System/CronRunTest.php
index 601c5a8..0444725 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/CronRunTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/CronRunTest.php
@@ -59,14 +59,14 @@ class CronRunTest extends WebTestBase {
->set('cron_safe_threshold', $cron_safe_threshold)
->save();
$this->drupalGet('');
- $this->assertTrue($cron_last == variable_get('cron_last', NULL), t('Cron does not run when the cron threshold is not passed.'));
+ $this->assertTrue($cron_last == variable_get('cron_last', NULL), 'Cron does not run when the cron threshold is not passed.');
// Test if cron runs when the cron threshold was passed.
$cron_last = time() - 200;
variable_set('cron_last', $cron_last);
$this->drupalGet('');
sleep(1);
- $this->assertTrue($cron_last < variable_get('cron_last', NULL), t('Cron runs when the cron threshold is passed.'));
+ $this->assertTrue($cron_last < variable_get('cron_last', NULL), 'Cron runs when the cron threshold is passed.');
// Disable the cron threshold through the interface.
$admin_user = $this->drupalCreateUser(array('administer site configuration'));
@@ -79,7 +79,7 @@ class CronRunTest extends WebTestBase {
$cron_last = time() - 200;
variable_set('cron_last', $cron_last);
$this->drupalGet('');
- $this->assertTrue($cron_last == variable_get('cron_last', NULL), t('Cron does not run when the cron threshold is disabled.'));
+ $this->assertTrue($cron_last == variable_get('cron_last', NULL), 'Cron does not run when the cron threshold is disabled.');
}
/**
@@ -98,7 +98,7 @@ class CronRunTest extends WebTestBase {
))
->condition('fid', $temp_old->fid)
->execute();
- $this->assertTrue(file_exists($temp_old->uri), t('Old temp file was created correctly.'));
+ $this->assertTrue(file_exists($temp_old->uri), 'Old temp file was created correctly.');
// Temporary file that is less than DRUPAL_MAXIMUM_TEMP_FILE_AGE.
$temp_new = file_save_data('');
@@ -106,7 +106,7 @@ class CronRunTest extends WebTestBase {
->fields(array('status' => 0))
->condition('fid', $temp_new->fid)
->execute();
- $this->assertTrue(file_exists($temp_new->uri), t('New temp file was created correctly.'));
+ $this->assertTrue(file_exists($temp_new->uri), 'New temp file was created correctly.');
// Permanent file that is older than DRUPAL_MAXIMUM_TEMP_FILE_AGE.
$perm_old = file_save_data('');
@@ -114,18 +114,18 @@ class CronRunTest extends WebTestBase {
->fields(array('timestamp' => 1))
->condition('fid', $temp_old->fid)
->execute();
- $this->assertTrue(file_exists($perm_old->uri), t('Old permanent file was created correctly.'));
+ $this->assertTrue(file_exists($perm_old->uri), 'Old permanent file was created correctly.');
// Permanent file that is newer than DRUPAL_MAXIMUM_TEMP_FILE_AGE.
$perm_new = file_save_data('');
- $this->assertTrue(file_exists($perm_new->uri), t('New permanent file was created correctly.'));
+ $this->assertTrue(file_exists($perm_new->uri), 'New permanent file was created correctly.');
// Run cron and then ensure that only the old, temp file was deleted.
$this->cronRun();
- $this->assertFalse(file_exists($temp_old->uri), t('Old temp file was correctly removed.'));
- $this->assertTrue(file_exists($temp_new->uri), t('New temp file was correctly ignored.'));
- $this->assertTrue(file_exists($perm_old->uri), t('Old permanent file was correctly ignored.'));
- $this->assertTrue(file_exists($perm_new->uri), t('New permanent file was correctly ignored.'));
+ $this->assertFalse(file_exists($temp_old->uri), 'Old temp file was correctly removed.');
+ $this->assertTrue(file_exists($temp_new->uri), 'New temp file was correctly ignored.');
+ $this->assertTrue(file_exists($perm_old->uri), 'Old permanent file was correctly ignored.');
+ $this->assertTrue(file_exists($perm_new->uri), 'New permanent file was correctly ignored.');
}
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php b/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php
index 5f86c6e..69ec901 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php
@@ -74,9 +74,9 @@ class DateFormatsLanguageTest extends WebTestBase {
// Configure format for the node posted date changes with the language.
$this->drupalGet('node/' . $node->nid);
$english_date = format_date($node->created, 'custom', 'j M Y');
- $this->assertText($english_date, t('English date format appears'));
+ $this->assertText($english_date, 'English date format appears');
$this->drupalGet('fr/node/' . $node->nid);
$french_date = format_date($node->created, 'custom', 'd.m.Y');
- $this->assertText($french_date, t('French date format appears'));
+ $this->assertText($french_date, 'French date format appears');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php b/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php
index 84bd7c6..932a7d7 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php
@@ -47,18 +47,18 @@ class DateTimeTest extends WebTestBase {
// Confirm date format and time zone.
$this->drupalGet("node/$node1->nid");
- $this->assertText('2007-01-31 21:00:00 -1000', t('Date should be identical, with GMT offset of -10 hours.'));
+ $this->assertText('2007-01-31 21:00:00 -1000', 'Date should be identical, with GMT offset of -10 hours.');
$this->drupalGet("node/$node2->nid");
- $this->assertText('2007-07-31 21:00:00 -1000', t('Date should be identical, with GMT offset of -10 hours.'));
+ $this->assertText('2007-07-31 21:00:00 -1000', 'Date should be identical, with GMT offset of -10 hours.');
// Set time zone to Los Angeles time.
variable_set('date_default_timezone', 'America/Los_Angeles');
// Confirm date format and time zone.
$this->drupalGet("node/$node1->nid");
- $this->assertText('2007-01-31 23:00:00 -0800', t('Date should be two hours ahead, with GMT offset of -8 hours.'));
+ $this->assertText('2007-01-31 23:00:00 -0800', 'Date should be two hours ahead, with GMT offset of -8 hours.');
$this->drupalGet("node/$node2->nid");
- $this->assertText('2007-08-01 00:00:00 -0700', t('Date should be three hours ahead, with GMT offset of -7 hours.'));
+ $this->assertText('2007-08-01 00:00:00 -0700', 'Date should be three hours ahead, with GMT offset of -7 hours.');
}
/**
@@ -81,7 +81,7 @@ class DateTimeTest extends WebTestBase {
'date_format' => $date_format,
);
$this->drupalPost('admin/config/regional/date-time/types/add', $edit, t('Add date type'));
- $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time', array('absolute' => TRUE)), t('Correct page redirection.'));
+ $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time', array('absolute' => TRUE)), 'Correct page redirection.');
$this->assertText(t('New date type added successfully.'), 'Date type added confirmation message appears.');
$this->assertText($date_type, 'Custom date type appears in the date type list.');
$this->assertText(t('delete'), 'Delete link for custom date type appears.');
@@ -89,7 +89,7 @@ class DateTimeTest extends WebTestBase {
// Delete custom date type.
$this->clickLink(t('delete'));
$this->drupalPost('admin/config/regional/date-time/types/' . $machine_name . '/delete', array(), t('Remove'));
- $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time', array('absolute' => TRUE)), t('Correct page redirection.'));
+ $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time', array('absolute' => TRUE)), 'Correct page redirection.');
$this->assertText(t('Removed date type ' . $date_type), 'Custom date type removed.');
}
@@ -107,7 +107,7 @@ class DateTimeTest extends WebTestBase {
'date_format' => 'Y',
);
$this->drupalPost('admin/config/regional/date-time/formats/add', $edit, t('Add format'));
- $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time/formats', array('absolute' => TRUE)), t('Correct page redirection.'));
+ $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.');
$this->assertNoText(t('No custom date formats available.'), 'No custom date formats message does not appear.');
$this->assertText(t('Custom date format added.'), 'Custom date format added.');
@@ -122,13 +122,13 @@ class DateTimeTest extends WebTestBase {
'date_format' => 'Y m',
);
$this->drupalPost($this->getUrl(), $edit, t('Save format'));
- $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time/formats', array('absolute' => TRUE)), t('Correct page redirection.'));
+ $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.');
$this->assertText(t('Custom date format updated.'), 'Custom date format successfully updated.');
// Delete custom date format.
$this->clickLink(t('delete'));
$this->drupalPost($this->getUrl(), array(), t('Remove'));
- $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time/formats', array('absolute' => TRUE)), t('Correct page redirection.'));
+ $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time/formats', array('absolute' => TRUE)), 'Correct page redirection.');
$this->assertText(t('Removed date format'), 'Custom date format removed successfully.');
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DefaultMobileMetaTagsTest.php b/core/modules/system/lib/Drupal/system/Tests/System/DefaultMobileMetaTagsTest.php
index 1fe8564..5cdd87a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/DefaultMobileMetaTagsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/DefaultMobileMetaTagsTest.php
@@ -34,7 +34,7 @@ class DefaultMobileMetaTagsTest extends WebTestBase {
public function testDefaultMetaTagsExist() {
$this->drupalGet('');
foreach ($this->default_metatags as $name => $metatag) {
- $this->assertRaw($metatag, 'Default Mobile meta tag "' . $name . '" displayed properly.', t('System'));
+ $this->assertRaw($metatag, 'Default Mobile meta tag "' . $name . '" displayed properly.', 'System');
}
}
@@ -45,7 +45,7 @@ class DefaultMobileMetaTagsTest extends WebTestBase {
module_enable(array('system_module_test'));
$this->drupalGet('');
foreach ($this->default_metatags as $name => $metatag) {
- $this->assertNoRaw($metatag, 'Default Mobile meta tag "' . $name . '" removed properly.', t('System'));
+ $this->assertNoRaw($metatag, 'Default Mobile meta tag "' . $name . '" removed properly.', 'System');
}
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/ErrorHandlerTest.php b/core/modules/system/lib/Drupal/system/Tests/System/ErrorHandlerTest.php
index 0d40b08..6b0da32 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/ErrorHandlerTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/ErrorHandlerTest.php
@@ -51,7 +51,7 @@ class ErrorHandlerTest extends WebTestBase {
// Set error reporting to collect notices.
variable_set('error_level', ERROR_REPORTING_DISPLAY_ALL);
$this->drupalGet('error-test/generate-warnings');
- $this->assertResponse(200, t('Received expected HTTP status code.'));
+ $this->assertResponse(200, 'Received expected HTTP status code.');
$this->assertErrorMessage($error_notice);
$this->assertErrorMessage($error_warning);
$this->assertErrorMessage($error_user_notice);
@@ -59,7 +59,7 @@ class ErrorHandlerTest extends WebTestBase {
// Set error reporting to not collect notices.
variable_set('error_level', ERROR_REPORTING_DISPLAY_SOME);
$this->drupalGet('error-test/generate-warnings');
- $this->assertResponse(200, t('Received expected HTTP status code.'));
+ $this->assertResponse(200, 'Received expected HTTP status code.');
$this->assertNoErrorMessage($error_notice);
$this->assertErrorMessage($error_warning);
$this->assertErrorMessage($error_user_notice);
@@ -67,7 +67,7 @@ class ErrorHandlerTest extends WebTestBase {
// Set error reporting to not show any errors.
variable_set('error_level', ERROR_REPORTING_HIDE);
$this->drupalGet('error-test/generate-warnings');
- $this->assertResponse(200, t('Received expected HTTP status code.'));
+ $this->assertResponse(200, 'Received expected HTTP status code.');
$this->assertNoErrorMessage($error_notice);
$this->assertNoErrorMessage($error_warning);
$this->assertNoErrorMessage($error_user_notice);
@@ -93,11 +93,11 @@ class ErrorHandlerTest extends WebTestBase {
);
$this->drupalGet('error-test/trigger-exception');
- $this->assertTrue(strpos($this->drupalGetHeader(':status'), '500 Service unavailable (with message)'), t('Received expected HTTP status line.'));
+ $this->assertTrue(strpos($this->drupalGetHeader(':status'), '500 Service unavailable (with message)'), 'Received expected HTTP status line.');
$this->assertErrorMessage($error_exception);
$this->drupalGet('error-test/trigger-pdo-exception');
- $this->assertTrue(strpos($this->drupalGetHeader(':status'), '500 Service unavailable (with message)'), t('Received expected HTTP status line.'));
+ $this->assertTrue(strpos($this->drupalGetHeader(':status'), '500 Service unavailable (with message)'), 'Received expected HTTP status line.');
// We cannot use assertErrorMessage() since the extact error reported
// varies from database to database. Check that the SQL string is displayed.
$this->assertText($error_pdo_exception['%type'], t('Found %type in error page.', $error_pdo_exception));
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/FrontPageTest.php b/core/modules/system/lib/Drupal/system/Tests/System/FrontPageTest.php
index 2323a07..3d9c4bd 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/FrontPageTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/FrontPageTest.php
@@ -41,11 +41,11 @@ class FrontPageTest extends WebTestBase {
*/
function testDrupalIsFrontPage() {
$this->drupalGet('');
- $this->assertText(t('On front page.'), t('Path is the front page.'));
+ $this->assertText(t('On front page.'), 'Path is the front page.');
$this->drupalGet('node');
- $this->assertText(t('On front page.'), t('Path is the front page.'));
+ $this->assertText(t('On front page.'), 'Path is the front page.');
$this->drupalGet($this->node_path);
- $this->assertNoText(t('On front page.'), t('Path is not the front page.'));
+ $this->assertNoText(t('On front page.'), 'Path is not the front page.');
// Change the front page to an invalid path.
$edit = array('site_frontpage' => 'kittens');
@@ -55,13 +55,13 @@ class FrontPageTest extends WebTestBase {
// Change the front page to a valid path.
$edit['site_frontpage'] = $this->node_path;
$this->drupalPost('admin/config/system/site-information', $edit, t('Save configuration'));
- $this->assertText(t('The configuration options have been saved.'), t('The front page path has been saved.'));
+ $this->assertText(t('The configuration options have been saved.'), 'The front page path has been saved.');
$this->drupalGet('');
- $this->assertText(t('On front page.'), t('Path is the front page.'));
+ $this->assertText(t('On front page.'), 'Path is the front page.');
$this->drupalGet('node');
- $this->assertNoText(t('On front page.'), t('Path is not the front page.'));
+ $this->assertNoText(t('On front page.'), 'Path is not the front page.');
$this->drupalGet($this->node_path);
- $this->assertText(t('On front page.'), t('Path is the front page.'));
+ $this->assertText(t('On front page.'), 'Path is the front page.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/IndexPhpTest.php b/core/modules/system/lib/Drupal/system/Tests/System/IndexPhpTest.php
index 0ab7ddf..a442ecb 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/IndexPhpTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/IndexPhpTest.php
@@ -32,7 +32,7 @@ class IndexPhpTest extends WebTestBase {
$index_php = $GLOBALS['base_url'] . '/index.php';
$this->drupalGet($index_php, array('external' => TRUE));
- $this->assertResponse(200, t('Make sure index.php returns a valid page.'));
+ $this->assertResponse(200, 'Make sure index.php returns a valid page.');
$this->drupalGet($index_php .'/user', array('external' => TRUE));
$this->assertResponse(200, t("Make sure index.php/user returns a valid page."));
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/InfoAlterTest.php b/core/modules/system/lib/Drupal/system/Tests/System/InfoAlterTest.php
index 9bdeac4..697ec91 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/InfoAlterTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/InfoAlterTest.php
@@ -31,10 +31,10 @@ class InfoAlterTest extends WebTestBase {
// thing necessary to use the rebuilt {system}.info.
module_enable(array('module_test'), FALSE);
$this->resetAll();
- $this->assertTrue(module_exists('module_test'), t('Test module is enabled.'));
+ $this->assertTrue(module_exists('module_test'), 'Test module is enabled.');
$info = $this->getSystemInfo('seven', 'theme');
- $this->assertTrue(isset($info['regions']['test_region']), t('Altered theme info was added to {system}.info.'));
+ $this->assertTrue(isset($info['regions']['test_region']), 'Altered theme info was added to {system}.info.');
$seven_regions = system_region_list('seven');
$this->assertTrue(isset($seven_regions['test_region']), t('Altered theme info was returned by system_region_list().'));
$system_list_themes = system_list('theme');
@@ -46,10 +46,10 @@ class InfoAlterTest extends WebTestBase {
// Disable the module and verify that {system}.info is rebuilt without it.
module_disable(array('module_test'), FALSE);
$this->resetAll();
- $this->assertFalse(module_exists('module_test'), t('Test module is disabled.'));
+ $this->assertFalse(module_exists('module_test'), 'Test module is disabled.');
$info = $this->getSystemInfo('seven', 'theme');
- $this->assertFalse(isset($info['regions']['test_region']), t('Altered theme info was removed from {system}.info.'));
+ $this->assertFalse(isset($info['regions']['test_region']), 'Altered theme info was removed from {system}.info.');
$seven_regions = system_region_list('seven');
$this->assertFalse(isset($seven_regions['test_region']), t('Altered theme info was not returned by system_region_list().'));
$system_list_themes = system_list('theme');
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/InfoFileParserUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/System/InfoFileParserUnitTest.php
index 05f36da..4f7a1c9 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/InfoFileParserUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/InfoFileParserUnitTest.php
@@ -68,14 +68,14 @@ array_space[a b] = Value';
$parsed = drupal_parse_info_format($config);
- $this->assertEqual($parsed['simple'], $expected['simple'], t('Set a simple value.'));
- $this->assertEqual($parsed['quoted'], $expected['quoted'], t('Set a simple value in quotes.'));
- $this->assertEqual($parsed['multiline'], $expected['multiline'], t('Set a multiline value.'));
- $this->assertEqual($parsed['array'], $expected['array'], t('Set a simple array.'));
- $this->assertEqual($parsed['array_assoc'], $expected['array_assoc'], t('Set an associative array.'));
- $this->assertEqual($parsed['array_deep'], $expected['array_deep'], t('Set a nested array.'));
- $this->assertEqual($parsed['array_deep_assoc'], $expected['array_deep_assoc'], t('Set a nested associative array.'));
- $this->assertEqual($parsed['array_space'], $expected['array_space'], t('Set an array with a whitespace in the key.'));
- $this->assertEqual($parsed, $expected, t('Entire parsed .info string and expected array are identical.'));
+ $this->assertEqual($parsed['simple'], $expected['simple'], 'Set a simple value.');
+ $this->assertEqual($parsed['quoted'], $expected['quoted'], 'Set a simple value in quotes.');
+ $this->assertEqual($parsed['multiline'], $expected['multiline'], 'Set a multiline value.');
+ $this->assertEqual($parsed['array'], $expected['array'], 'Set a simple array.');
+ $this->assertEqual($parsed['array_assoc'], $expected['array_assoc'], 'Set an associative array.');
+ $this->assertEqual($parsed['array_deep'], $expected['array_deep'], 'Set a nested array.');
+ $this->assertEqual($parsed['array_deep_assoc'], $expected['array_deep_assoc'], 'Set a nested associative array.');
+ $this->assertEqual($parsed['array_space'], $expected['array_space'], 'Set an array with a whitespace in the key.');
+ $this->assertEqual($parsed, $expected, 'Entire parsed .info string and expected array are identical.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/IpAddressBlockingTest.php b/core/modules/system/lib/Drupal/system/Tests/System/IpAddressBlockingTest.php
index 6d752a2..60c5fb4 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/IpAddressBlockingTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/IpAddressBlockingTest.php
@@ -45,8 +45,8 @@ class IpAddressBlockingTest extends WebTestBase {
$edit['ip'] = '192.168.1.1';
$this->drupalPost('admin/config/people/ip-blocking', $edit, t('Add'));
$ip = db_query("SELECT iid from {blocked_ips} WHERE ip = :ip", array(':ip' => $edit['ip']))->fetchField();
- $this->assertTrue($ip, t('IP address found in database.'));
- $this->assertRaw(t('The IP address %ip has been blocked.', array('%ip' => $edit['ip'])), t('IP address was blocked.'));
+ $this->assertTrue($ip, 'IP address found in database.');
+ $this->assertRaw(t('The IP address %ip has been blocked.', array('%ip' => $edit['ip'])), 'IP address was blocked.');
// Try to block an IP address that's already blocked.
$edit = array();
@@ -76,8 +76,8 @@ class IpAddressBlockingTest extends WebTestBase {
$submit_ip = '1.2.3.4';
$this->drupalPost('admin/config/people/ip-blocking/' . $submit_ip, NULL, t('Add'));
$ip = db_query("SELECT iid from {blocked_ips} WHERE ip = :ip", array(':ip' => $submit_ip))->fetchField();
- $this->assertTrue($ip, t('IP address found in database'));
- $this->assertRaw(t('The IP address %ip has been blocked.', array('%ip' => $submit_ip)), t('IP address was blocked.'));
+ $this->assertTrue($ip, 'IP address found in database');
+ $this->assertRaw(t('The IP address %ip has been blocked.', array('%ip' => $submit_ip)), 'IP address was blocked.');
// Submit your own IP address. This fails, although it works when testing manually.
// TODO: on some systems this test fails due to a bug or inconsistency in cURL.
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php b/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php
index 4709cdc..8b396f2 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php
@@ -47,42 +47,42 @@ class MainContentFallbackTest extends WebTestBase {
// Disable the block module.
$edit['modules[Core][block][enable]'] = FALSE;
$this->drupalPost('admin/modules', $edit, t('Save configuration'));
- $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
+ $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.');
drupal_static_reset('system_list');
- $this->assertFalse(module_exists('block'), t('Block module disabled.'));
+ $this->assertFalse(module_exists('block'), 'Block module disabled.');
// At this point, no region is filled and fallback should be triggered.
$this->drupalGet('admin/config/system/site-information');
- $this->assertField('site_name', t('Admin interface still available.'));
+ $this->assertField('site_name', 'Admin interface still available.');
// Fallback should not trigger when another module is handling content.
$this->drupalGet('system-test/main-content-handling');
- $this->assertRaw('id="system-test-content"', t('Content handled by another module'));
- $this->assertText(t('Content to test main content fallback'), t('Main content still displayed.'));
+ $this->assertRaw('id="system-test-content"', 'Content handled by another module');
+ $this->assertText(t('Content to test main content fallback'), 'Main content still displayed.');
// Fallback should trigger when another module
// indicates that it is not handling the content.
$this->drupalGet('system-test/main-content-fallback');
- $this->assertText(t('Content to test main content fallback'), t('Main content fallback properly triggers.'));
+ $this->assertText(t('Content to test main content fallback'), 'Main content fallback properly triggers.');
// Fallback should not trigger when another module is handling content.
// Note that this test ensures that no duplicate
// content gets created by the fallback.
$this->drupalGet('system-test/main-content-duplication');
- $this->assertNoText(t('Content to test main content fallback'), t('Main content not duplicated.'));
+ $this->assertNoText(t('Content to test main content fallback'), 'Main content not duplicated.');
// Request a user* page and see if it is displayed.
$this->drupalLogin($this->web_user);
$this->drupalGet('user/' . $this->web_user->uid . '/edit');
- $this->assertField('mail', t('User interface still available.'));
+ $this->assertField('mail', 'User interface still available.');
// Enable the block module again.
$this->drupalLogin($this->admin_user);
$edit = array();
$edit['modules[Core][block][enable]'] = 'block';
$this->drupalPost('admin/modules', $edit, t('Save configuration'));
- $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
+ $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.');
drupal_static_reset('system_list');
- $this->assertTrue(module_exists('block'), t('Block module re-enabled.'));
+ $this->assertTrue(module_exists('block'), 'Block module re-enabled.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/PageNotFoundTest.php b/core/modules/system/lib/Drupal/system/Tests/System/PageNotFoundTest.php
index c8bee66..dde1822 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/PageNotFoundTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/PageNotFoundTest.php
@@ -33,7 +33,7 @@ class PageNotFoundTest extends WebTestBase {
function testPageNotFound() {
$this->drupalLogin($this->admin_user);
$this->drupalGet($this->randomName(10));
- $this->assertText(t('Page not found'), t('Found the default 404 page'));
+ $this->assertText(t('Page not found'), 'Found the default 404 page');
// Use a custom 404 page.
$edit = array(
@@ -42,6 +42,6 @@ class PageNotFoundTest extends WebTestBase {
$this->drupalPost('admin/config/system/site-information', $edit, t('Save configuration'));
$this->drupalGet($this->randomName(10));
- $this->assertText($this->admin_user->name, t('Found the custom 404 page'));
+ $this->assertText($this->admin_user->name, 'Found the custom 404 page');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/PageTitleFilteringTest.php b/core/modules/system/lib/Drupal/system/Tests/System/PageTitleFilteringTest.php
index 9ee0101..1d4b175 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/PageTitleFilteringTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/PageTitleFilteringTest.php
@@ -55,11 +55,11 @@ class PageTitleFilteringTest extends WebTestBase {
// drupal_set_title's $filter is CHECK_PLAIN by default, so the title should be
// returned with check_plain().
drupal_set_title($title, CHECK_PLAIN);
- $this->assertTrue(strpos(drupal_get_title(), '') === FALSE, t('Tags in title converted to entities when $output is CHECK_PLAIN.'));
+ $this->assertTrue(strpos(drupal_get_title(), '') === FALSE, 'Tags in title converted to entities when $output is CHECK_PLAIN.');
// drupal_set_title's $filter is passed as PASS_THROUGH, so the title should be
// returned with HTML.
drupal_set_title($title, PASS_THROUGH);
- $this->assertTrue(strpos(drupal_get_title(), '') !== FALSE, t('Tags in title are not converted to entities when $output is PASS_THROUGH.'));
+ $this->assertTrue(strpos(drupal_get_title(), '') !== FALSE, 'Tags in title are not converted to entities when $output is PASS_THROUGH.');
// Generate node content.
$langcode = LANGUAGE_NOT_SPECIFIED;
$edit = array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/PasswordHashingTest.php b/core/modules/system/lib/Drupal/system/Tests/System/PasswordHashingTest.php
index c48633e..eb9c634 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/PasswordHashingTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/PasswordHashingTest.php
@@ -37,26 +37,26 @@ class PasswordHashingTest extends WebTestBase {
$password = 'baz';
$account = (object) array('name' => 'foo', 'pass' => md5($password));
// The md5 password should be flagged as needing an update.
- $this->assertTrue(user_needs_new_hash($account), t('User with md5 password needs a new hash.'));
+ $this->assertTrue(user_needs_new_hash($account), 'User with md5 password needs a new hash.');
// Re-hash the password.
$old_hash = $account->pass;
$account->pass = user_hash_password($password);
- $this->assertIdentical(_password_get_count_log2($account->pass), DRUPAL_MIN_HASH_COUNT, t('Re-hashed password has the minimum number of log2 iterations.'));
- $this->assertTrue($account->pass != $old_hash, t('Password hash changed.'));
- $this->assertTrue(user_check_password($password, $account), t('Password check succeeds.'));
+ $this->assertIdentical(_password_get_count_log2($account->pass), DRUPAL_MIN_HASH_COUNT, 'Re-hashed password has the minimum number of log2 iterations.');
+ $this->assertTrue($account->pass != $old_hash, 'Password hash changed.');
+ $this->assertTrue(user_check_password($password, $account), 'Password check succeeds.');
// Since the log2 setting hasn't changed and the user has a valid password,
// user_needs_new_hash() should return FALSE.
- $this->assertFalse(user_needs_new_hash($account), t('User does not need a new hash.'));
+ $this->assertFalse(user_needs_new_hash($account), 'User does not need a new hash.');
// Increment the log2 iteration to MIN + 1.
variable_set('password_count_log2', DRUPAL_MIN_HASH_COUNT + 1);
- $this->assertTrue(user_needs_new_hash($account), t('User needs a new hash after incrementing the log2 count.'));
+ $this->assertTrue(user_needs_new_hash($account), 'User needs a new hash after incrementing the log2 count.');
// Re-hash the password.
$old_hash = $account->pass;
$account->pass = user_hash_password($password);
- $this->assertIdentical(_password_get_count_log2($account->pass), DRUPAL_MIN_HASH_COUNT + 1, t('Re-hashed password has the correct number of log2 iterations.'));
- $this->assertTrue($account->pass != $old_hash, t('Password hash changed again.'));
+ $this->assertIdentical(_password_get_count_log2($account->pass), DRUPAL_MIN_HASH_COUNT + 1, 'Re-hashed password has the correct number of log2 iterations.');
+ $this->assertTrue($account->pass != $old_hash, 'Password hash changed again.');
// Now the hash should be OK.
- $this->assertFalse(user_needs_new_hash($account), t('Re-hashed password does not need a new hash.'));
- $this->assertTrue(user_check_password($password, $account), t('Password check succeeds with re-hashed password.'));
+ $this->assertFalse(user_needs_new_hash($account), 'Re-hashed password does not need a new hash.');
+ $this->assertTrue(user_check_password($password, $account), 'Password check succeeds with re-hashed password.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/RetrieveFileTest.php b/core/modules/system/lib/Drupal/system/Tests/System/RetrieveFileTest.php
index 1c977ca..5798667 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/RetrieveFileTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/RetrieveFileTest.php
@@ -30,7 +30,7 @@ class RetrieveFileTest extends WebTestBase {
$filename = 'Файл для тестирования ' . $this->randomName();
$url = file_create_url($sourcedir . '/' . $filename);
$retrieved_file = system_retrieve_file($url);
- $this->assertFalse($retrieved_file, t('Non-existent file not fetched.'));
+ $this->assertFalse($retrieved_file, 'Non-existent file not fetched.');
// Actually create that file, download it via HTTP and test the returned path.
file_put_contents($sourcedir . '/' . $filename, 'testing');
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php b/core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php
index 7788c67..6f2ce12 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php
@@ -51,7 +51,7 @@ class SiteMaintenanceTest extends WebTestBase {
$offline_message = t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => config('system.site')->get('name')));
$this->drupalGet('');
- $this->assertRaw($admin_message, t('Found the site maintenance mode message.'));
+ $this->assertRaw($admin_message, 'Found the site maintenance mode message.');
// Logout and verify that offline message is displayed.
$this->drupalLogout();
@@ -81,7 +81,7 @@ class SiteMaintenanceTest extends WebTestBase {
$this->drupalLogout();
$this->drupalLogin($this->admin_user);
$this->drupalGet('admin/config/development/maintenance');
- $this->assertNoRaw($admin_message, t('Site maintenance mode message not displayed.'));
+ $this->assertNoRaw($admin_message, 'Site maintenance mode message not displayed.');
$offline_message = 'Sorry, not online.';
$edit = array(
@@ -92,11 +92,11 @@ class SiteMaintenanceTest extends WebTestBase {
// Logout and verify that custom site offline message is displayed.
$this->drupalLogout();
$this->drupalGet('');
- $this->assertRaw($offline_message, t('Found the site offline message.'));
+ $this->assertRaw($offline_message, 'Found the site offline message.');
// Verify that custom site offline message is not displayed on user/password.
$this->drupalGet('user/password');
- $this->assertText(t('Username or e-mail address'), t('Anonymous users can access user/password'));
+ $this->assertText(t('Username or e-mail address'), 'Anonymous users can access user/password');
// Submit password reset form.
$edit = array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/ThemeTest.php b/core/modules/system/lib/Drupal/system/Tests/System/ThemeTest.php
index 30d8422..3f3e649 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/ThemeTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/ThemeTest.php
@@ -174,16 +174,16 @@ class ThemeTest extends WebTestBase {
$this->drupalPost('admin/appearance', $edit, t('Save configuration'));
$this->drupalGet('admin/config');
- $this->assertRaw('core/themes/seven', t('Administration theme used on an administration page.'));
+ $this->assertRaw('core/themes/seven', 'Administration theme used on an administration page.');
$this->drupalGet('node/' . $this->node->nid);
- $this->assertRaw('core/themes/stark', t('Site default theme used on node page.'));
+ $this->assertRaw('core/themes/stark', 'Site default theme used on node page.');
$this->drupalGet('node/add');
- $this->assertRaw('core/themes/seven', t('Administration theme used on the add content page.'));
+ $this->assertRaw('core/themes/seven', 'Administration theme used on the add content page.');
$this->drupalGet('node/' . $this->node->nid . '/edit');
- $this->assertRaw('core/themes/seven', t('Administration theme used on the edit content page.'));
+ $this->assertRaw('core/themes/seven', 'Administration theme used on the edit content page.');
// Disable the admin theme on the node admin pages.
$edit = array(
@@ -192,10 +192,10 @@ class ThemeTest extends WebTestBase {
$this->drupalPost('admin/appearance', $edit, t('Save configuration'));
$this->drupalGet('admin/config');
- $this->assertRaw('core/themes/seven', t('Administration theme used on an administration page.'));
+ $this->assertRaw('core/themes/seven', 'Administration theme used on an administration page.');
$this->drupalGet('node/add');
- $this->assertRaw('core/themes/stark', t('Site default theme used on the add content page.'));
+ $this->assertRaw('core/themes/stark', 'Site default theme used on the add content page.');
// Reset to the default theme settings.
variable_set('theme_default', 'bartik');
@@ -206,10 +206,10 @@ class ThemeTest extends WebTestBase {
$this->drupalPost('admin/appearance', $edit, t('Save configuration'));
$this->drupalGet('admin');
- $this->assertRaw('core/themes/bartik', t('Site default theme used on administration page.'));
+ $this->assertRaw('core/themes/bartik', 'Site default theme used on administration page.');
$this->drupalGet('node/add');
- $this->assertRaw('core/themes/bartik', t('Site default theme used on the add content page.'));
+ $this->assertRaw('core/themes/bartik', 'Site default theme used on the add content page.');
}
/**
@@ -224,11 +224,11 @@ class ThemeTest extends WebTestBase {
// Test the default theme on the secondary links (blocks admin page).
$this->drupalGet('admin/structure/block');
- $this->assertText('Bartik(' . t('active tab') . ')', t('Default local task on blocks admin page is the default theme.'));
+ $this->assertText('Bartik(' . t('active tab') . ')', 'Default local task on blocks admin page is the default theme.');
// Switch back to Stark and test again to test that the menu cache is cleared.
$this->drupalGet('admin/appearance');
$this->clickLink(t('Set default'), 0);
$this->drupalGet('admin/structure/block');
- $this->assertText('Stark(' . t('active tab') . ')', t('Default local task on blocks admin page has changed.'));
+ $this->assertText('Stark(' . t('active tab') . ')', 'Default local task on blocks admin page has changed.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/TokenReplaceTest.php b/core/modules/system/lib/Drupal/system/Tests/System/TokenReplaceTest.php
index c329b96..d97c392 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/TokenReplaceTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/TokenReplaceTest.php
@@ -62,10 +62,10 @@ class TokenReplaceTest extends WebTestBase {
// token, [node:title].
$raw_tokens = array('title' => '[node:title]');
$generated = token_generate('node', $raw_tokens, array('node' => $node));
- $this->assertEqual($generated['[node:title]'], check_plain($node->title), t('Token sanitized.'));
+ $this->assertEqual($generated['[node:title]'], check_plain($node->title), 'Token sanitized.');
$generated = token_generate('node', $raw_tokens, array('node' => $node), array('sanitize' => FALSE));
- $this->assertEqual($generated['[node:title]'], $node->title, t('Unsanitized token generated properly.'));
+ $this->assertEqual($generated['[node:title]'], $node->title, 'Unsanitized token generated properly.');
// Test token replacement when the string contains no tokens.
$this->assertEqual(token_replace('No tokens here.'), 'No tokens here.');
@@ -126,7 +126,7 @@ class TokenReplaceTest extends WebTestBase {
$tests['[site:login-url]'] = url('user', $url_options);
// Test to make sure that we generated something for each token.
- $this->assertFalse(in_array(0, array_map('strlen', $tests)), t('No empty tokens generated.'));
+ $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
foreach ($tests as $input => $expected) {
$output = token_replace($input, array(), array('language' => $language_interface));
@@ -162,7 +162,7 @@ class TokenReplaceTest extends WebTestBase {
$tests['[date:raw]'] = filter_xss($date);
// Test to make sure that we generated something for each token.
- $this->assertFalse(in_array(0, array_map('strlen', $tests)), t('No empty tokens generated.'));
+ $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
foreach ($tests as $input => $expected) {
$output = token_replace($input, array('date' => $date), array('language' => $language_interface));
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/FastTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/FastTest.php
index c4a71ff..eebc0e6 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/FastTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/FastTest.php
@@ -32,6 +32,6 @@ class FastTest extends WebTestBase {
function testUserAutocomplete() {
$this->drupalLogin($this->account);
$this->drupalGet('user/autocomplete/' . $this->account->name);
- $this->assertText('registry not initialized', t('The registry was not initialized'));
+ $this->assertText('registry not initialized', 'The registry was not initialized');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php
index a8a66f6..15bf654 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php
@@ -232,14 +232,14 @@ class FunctionsTest extends WebTestBase {
$html = drupal_render($render_array);
$dom = new DOMDocument();
$dom->loadHTML($html);
- $this->assertEqual($dom->getElementsByTagName('ul')->length, 1, t('One "ul" tag found in the rendered HTML.'));
+ $this->assertEqual($dom->getElementsByTagName('ul')->length, 1, 'One "ul" tag found in the rendered HTML.');
$list_elements = $dom->getElementsByTagName('li');
- $this->assertEqual($list_elements->length, 3, t('Three "li" tags found in the rendered HTML.'));
- $this->assertEqual($list_elements->item(0)->nodeValue, 'Parent link original', t('First expected link found.'));
- $this->assertEqual($list_elements->item(1)->nodeValue, 'First child link', t('Second expected link found.'));
- $this->assertEqual($list_elements->item(2)->nodeValue, 'Second child link', t('Third expected link found.'));
- $this->assertIdentical(strpos($html, 'Parent link copy'), FALSE, t('"Parent link copy" link not found.'));
- $this->assertIdentical(strpos($html, 'Third child link'), FALSE, t('"Third child link" link not found.'));
+ $this->assertEqual($list_elements->length, 3, 'Three "li" tags found in the rendered HTML.');
+ $this->assertEqual($list_elements->item(0)->nodeValue, 'Parent link original', 'First expected link found.');
+ $this->assertEqual($list_elements->item(1)->nodeValue, 'First child link', 'Second expected link found.');
+ $this->assertEqual($list_elements->item(2)->nodeValue, 'Second child link', 'Third expected link found.');
+ $this->assertIdentical(strpos($html, 'Parent link copy'), FALSE, '"Parent link copy" link not found.');
+ $this->assertIdentical(strpos($html, 'Third child link'), FALSE, '"Third child link" link not found.');
// Now render 'first_child', followed by the rest of the links, and make
// sure we get two separate 's with the appropriate links contained
@@ -250,20 +250,20 @@ class FunctionsTest extends WebTestBase {
// First check the child HTML.
$dom = new DOMDocument();
$dom->loadHTML($child_html);
- $this->assertEqual($dom->getElementsByTagName('ul')->length, 1, t('One "ul" tag found in the rendered child HTML.'));
+ $this->assertEqual($dom->getElementsByTagName('ul')->length, 1, 'One "ul" tag found in the rendered child HTML.');
$list_elements = $dom->getElementsByTagName('li');
- $this->assertEqual($list_elements->length, 2, t('Two "li" tags found in the rendered child HTML.'));
- $this->assertEqual($list_elements->item(0)->nodeValue, 'Parent link copy', t('First expected link found.'));
- $this->assertEqual($list_elements->item(1)->nodeValue, 'First child link', t('Second expected link found.'));
+ $this->assertEqual($list_elements->length, 2, 'Two "li" tags found in the rendered child HTML.');
+ $this->assertEqual($list_elements->item(0)->nodeValue, 'Parent link copy', 'First expected link found.');
+ $this->assertEqual($list_elements->item(1)->nodeValue, 'First child link', 'Second expected link found.');
// Then check the parent HTML.
$dom = new DOMDocument();
$dom->loadHTML($parent_html);
- $this->assertEqual($dom->getElementsByTagName('ul')->length, 1, t('One "ul" tag found in the rendered parent HTML.'));
+ $this->assertEqual($dom->getElementsByTagName('ul')->length, 1, 'One "ul" tag found in the rendered parent HTML.');
$list_elements = $dom->getElementsByTagName('li');
- $this->assertEqual($list_elements->length, 2, t('Two "li" tags found in the rendered parent HTML.'));
- $this->assertEqual($list_elements->item(0)->nodeValue, 'Parent link original', t('First expected link found.'));
- $this->assertEqual($list_elements->item(1)->nodeValue, 'Second child link', t('Second expected link found.'));
- $this->assertIdentical(strpos($parent_html, 'First child link'), FALSE, t('"First child link" link not found.'));
- $this->assertIdentical(strpos($parent_html, 'Third child link'), FALSE, t('"Third child link" link not found.'));
+ $this->assertEqual($list_elements->length, 2, 'Two "li" tags found in the rendered parent HTML.');
+ $this->assertEqual($list_elements->item(0)->nodeValue, 'Parent link original', 'First expected link found.');
+ $this->assertEqual($list_elements->item(1)->nodeValue, 'Second child link', 'Second expected link found.');
+ $this->assertIdentical(strpos($parent_html, 'First child link'), FALSE, '"First child link" link not found.');
+ $this->assertIdentical(strpos($parent_html, 'Third child link'), FALSE, '"Third child link" link not found.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTagUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTagUnitTest.php
index d359038..b8c6ffb 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTagUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTagUnitTest.php
@@ -27,10 +27,10 @@ class HtmlTagUnitTest extends UnitTestBase {
function testThemeHtmlTag() {
// Test auto-closure meta tag generation
$tag['element'] = array('#tag' => 'meta', '#attributes' => array('name' => 'description', 'content' => 'Drupal test'));
- $this->assertEqual(''."\n", theme_html_tag($tag), t('Test auto-closure meta tag generation.'));
+ $this->assertEqual(''."\n", theme_html_tag($tag), 'Test auto-closure meta tag generation.');
// Test title tag generation
$tag['element'] = array('#tag' => 'title', '#value' => 'title test');
- $this->assertEqual('title test '."\n", theme_html_tag($tag), t('Test title tag generation.'));
+ $this->assertEqual('title test '."\n", theme_html_tag($tag), 'Test title tag generation.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php
index ef51f4e..392959d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php
@@ -29,8 +29,8 @@ class TableTest extends WebTestBase {
$rows = array(array(1,2,3), array(4,5,6), array(7,8,9));
$this->content = theme('table', array('header' => $header, 'rows' => $rows));
$js = drupal_add_js();
- $this->assertTrue(isset($js['core/misc/tableheader.js']), t('tableheader.js was included when $sticky = TRUE.'));
- $this->assertRaw('sticky-enabled', t('Table has a class of sticky-enabled when $sticky = TRUE.'));
+ $this->assertTrue(isset($js['core/misc/tableheader.js']), 'tableheader.js was included when $sticky = TRUE.');
+ $this->assertRaw('sticky-enabled', 'Table has a class of sticky-enabled when $sticky = TRUE.');
drupal_static_reset('drupal_add_js');
}
@@ -45,8 +45,8 @@ class TableTest extends WebTestBase {
$colgroups = array();
$this->content = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => $attributes, 'caption' => $caption, 'colgroups' => $colgroups, 'sticky' => FALSE));
$js = drupal_add_js();
- $this->assertFalse(isset($js['core/misc/tableheader.js']), t('tableheader.js was not included because $sticky = FALSE.'));
- $this->assertNoRaw('sticky-enabled', t('Table does not have a class of sticky-enabled because $sticky = FALSE.'));
+ $this->assertFalse(isset($js['core/misc/tableheader.js']), 'tableheader.js was not included because $sticky = FALSE.');
+ $this->assertNoRaw('sticky-enabled', 'Table does not have a class of sticky-enabled because $sticky = FALSE.');
drupal_static_reset('drupal_add_js');
}
@@ -63,7 +63,7 @@ class TableTest extends WebTestBase {
),
);
$this->content = theme('table', array('header' => $header, 'rows' => array(), 'empty' => t('No strings available.')));
- $this->assertRaw('', t('Correct colspan was set on empty message.'));
- $this->assertRaw('Header 1 ', t('Table header was printed.'));
+ $this->assertRaw('', 'Correct colspan was set on empty message.');
+ $this->assertRaw('Header 1 ', 'Table header was printed.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTest.php
index 4be9dd5..fe53b49 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTest.php
@@ -36,22 +36,22 @@ class ThemeTest extends WebTestBase {
config('system.site')->set('page.front', 'nobody-home')->save();
$args = array('node', '1', 'edit');
$suggestions = theme_get_suggestions($args, 'page');
- $this->assertEqual($suggestions, array('page__node', 'page__node__%', 'page__node__1', 'page__node__edit'), t('Found expected node edit page suggestions'));
+ $this->assertEqual($suggestions, array('page__node', 'page__node__%', 'page__node__1', 'page__node__edit'), 'Found expected node edit page suggestions');
// Check attack vectors.
$args = array('node', '\\1');
$suggestions = theme_get_suggestions($args, 'page');
- $this->assertEqual($suggestions, array('page__node', 'page__node__%', 'page__node__1'), t('Removed invalid \\ from suggestions'));
+ $this->assertEqual($suggestions, array('page__node', 'page__node__%', 'page__node__1'), 'Removed invalid \\ from suggestions');
$args = array('node', '1/');
$suggestions = theme_get_suggestions($args, 'page');
- $this->assertEqual($suggestions, array('page__node', 'page__node__%', 'page__node__1'), t('Removed invalid / from suggestions'));
+ $this->assertEqual($suggestions, array('page__node', 'page__node__%', 'page__node__1'), 'Removed invalid / from suggestions');
$args = array('node', "1\0");
$suggestions = theme_get_suggestions($args, 'page');
- $this->assertEqual($suggestions, array('page__node', 'page__node__%', 'page__node__1'), t('Removed invalid \\0 from suggestions'));
+ $this->assertEqual($suggestions, array('page__node', 'page__node__%', 'page__node__1'), 'Removed invalid \\0 from suggestions');
// Define path with hyphens to be used to generate suggestions.
$args = array('node', '1', 'hyphen-path');
$result = array('page__node', 'page__node__%', 'page__node__1', 'page__node__hyphen_path');
$suggestions = theme_get_suggestions($args, 'page');
- $this->assertEqual($suggestions, $result, t('Found expected page suggestions for paths containing hyphens.'));
+ $this->assertEqual($suggestions, $result, 'Found expected page suggestions for paths containing hyphens.');
}
/**
@@ -82,7 +82,7 @@ class ThemeTest extends WebTestBase {
$suggestions = theme_get_suggestions(array('node'), 'page');
// Set it back to not annoy the batch runner.
_current_path($original_path);
- $this->assertTrue(in_array('page__front', $suggestions), t('Front page template was suggested.'));
+ $this->assertTrue(in_array('page__front', $suggestions), 'Front page template was suggested.');
}
/**
@@ -90,7 +90,7 @@ class ThemeTest extends WebTestBase {
*/
function testAlter() {
$this->drupalGet('theme-test/alter');
- $this->assertText('The altered data is test_theme_theme_test_alter_alter was invoked.', t('The theme was able to implement an alter hook during page building before anything was rendered.'));
+ $this->assertText('The altered data is test_theme_theme_test_alter_alter was invoked.', 'The theme was able to implement an alter hook during page building before anything was rendered.');
}
/**
@@ -135,9 +135,9 @@ class ThemeTest extends WebTestBase {
function testListThemes() {
$themes = list_themes();
// Check if drupal_theme_access() retrieves enabled themes properly from list_themes().
- $this->assertTrue(drupal_theme_access('test_theme'), t('Enabled theme detected'));
+ $this->assertTrue(drupal_theme_access('test_theme'), 'Enabled theme detected');
// Check if list_themes() returns disabled themes.
- $this->assertTrue(array_key_exists('test_basetheme', $themes), t('Disabled theme detected'));
+ $this->assertTrue(array_key_exists('test_basetheme', $themes), 'Disabled theme detected');
// Check for base theme and subtheme lists.
$base_theme_list = array('test_basetheme' => 'Theme test base theme');
$sub_theme_list = array('test_subtheme' => 'Theme test subtheme');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Update/DependencyHookInvocationTest.php b/core/modules/system/lib/Drupal/system/Tests/Update/DependencyHookInvocationTest.php
index 8ec1fca..06a322a 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Update/DependencyHookInvocationTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Update/DependencyHookInvocationTest.php
@@ -31,8 +31,8 @@ class DependencyHookInvocationTest extends WebTestBase {
*/
function testHookUpdateDependencies() {
$update_dependencies = update_retrieve_dependencies();
- $this->assertTrue($update_dependencies['system'][8000]['update_test_1'] == 8000, t('An update function that has a dependency on two separate modules has the first dependency recorded correctly.'));
- $this->assertTrue($update_dependencies['system'][8000]['update_test_2'] == 8001, t('An update function that has a dependency on two separate modules has the second dependency recorded correctly.'));
- $this->assertTrue($update_dependencies['system'][8001]['update_test_1'] == 8002, t('An update function that depends on more than one update from the same module only has the dependency on the higher-numbered update function recorded.'));
+ $this->assertTrue($update_dependencies['system'][8000]['update_test_1'] == 8000, 'An update function that has a dependency on two separate modules has the first dependency recorded correctly.');
+ $this->assertTrue($update_dependencies['system'][8000]['update_test_2'] == 8001, 'An update function that has a dependency on two separate modules has the second dependency recorded correctly.');
+ $this->assertTrue($update_dependencies['system'][8001]['update_test_1'] == 8002, 'An update function that depends on more than one update from the same module only has the dependency on the higher-numbered update function recorded.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Update/DependencyOrderingTest.php b/core/modules/system/lib/Drupal/system/Tests/Update/DependencyOrderingTest.php
index 099b36b..3afb2d2 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Update/DependencyOrderingTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Update/DependencyOrderingTest.php
@@ -39,7 +39,7 @@ class DependencyOrderingTest extends WebTestBase {
'update_test_1_update_8002',
);
$actual_updates = array_keys(update_resolve_dependencies($starting_updates));
- $this->assertEqual($expected_updates, $actual_updates, t('Updates within a single module run in the correct order.'));
+ $this->assertEqual($expected_updates, $actual_updates, 'Updates within a single module run in the correct order.');
}
/**
@@ -53,8 +53,8 @@ class DependencyOrderingTest extends WebTestBase {
$update_order = array_keys(update_resolve_dependencies($starting_updates));
// Make sure that each dependency is satisfied.
$first_dependency_satisfied = array_search('update_test_2_update_8000', $update_order) < array_search('update_test_3_update_8000', $update_order);
- $this->assertTrue($first_dependency_satisfied, t('The dependency of the second module on the first module is respected by the update function order.'));
+ $this->assertTrue($first_dependency_satisfied, 'The dependency of the second module on the first module is respected by the update function order.');
$second_dependency_satisfied = array_search('update_test_3_update_8000', $update_order) < array_search('update_test_2_update_8001', $update_order);
- $this->assertTrue($second_dependency_satisfied, t('The dependency of the first module on the second module is respected by the update function order.'));
+ $this->assertTrue($second_dependency_satisfied, 'The dependency of the first module on the second module is respected by the update function order.');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php b/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php
index b39cfb8..23bec83 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php
@@ -71,7 +71,7 @@ class UpdateScriptTest extends WebTestBase {
// go through the update process uninterrupted.
$this->drupalGet($this->update_url, array('external' => TRUE));
$this->drupalPost(NULL, array(), t('Continue'));
- $this->assertText(t('No pending updates.'), t('End of update process was reached.'));
+ $this->assertText(t('No pending updates.'), 'End of update process was reached.');
// Confirm that all caches were cleared.
$this->assertText(t('hook_cache_flush() invoked for update_script_test.module.'), 'Caches were cleared when there were no requirements warnings or errors.');
@@ -89,7 +89,7 @@ class UpdateScriptTest extends WebTestBase {
$this->assertNoText('This is a requirements warning provided by the update_script_test module.');
$this->drupalPost(NULL, array(), t('Continue'));
$this->drupalPost(NULL, array(), t('Apply pending updates'));
- $this->assertText(t('The update_script_test_update_8000() update was executed successfully.'), t('End of update process was reached.'));
+ $this->assertText(t('The update_script_test_update_8000() update was executed successfully.'), 'End of update process was reached.');
// Confirm that all caches were cleared.
$this->assertText(t('hook_cache_flush() invoked for update_script_test.module.'), 'Caches were cleared after resolving a requirements warning and applying updates.');
@@ -99,7 +99,7 @@ class UpdateScriptTest extends WebTestBase {
$this->clickLink('try again');
$this->assertNoText('This is a requirements warning provided by the update_script_test module.');
$this->drupalPost(NULL, array(), t('Continue'));
- $this->assertText(t('No pending updates.'), t('End of update process was reached.'));
+ $this->assertText(t('No pending updates.'), 'End of update process was reached.');
// Confirm that all caches were cleared.
$this->assertText(t('hook_cache_flush() invoked for update_script_test.module.'), 'Caches were cleared after applying updates and re-running the script.');
@@ -124,7 +124,7 @@ class UpdateScriptTest extends WebTestBase {
$this->drupalLogin($this->update_user);
$this->drupalGet($this->update_url, array('external' => TRUE));
$final_theme_data = db_query("SELECT * FROM {system} WHERE type = 'theme' ORDER BY name")->fetchAll();
- $this->assertEqual($original_theme_data, $final_theme_data, t('Visiting update.php does not alter the information about themes stored in the database.'));
+ $this->assertEqual($original_theme_data, $final_theme_data, 'Visiting update.php does not alter the information about themes stored in the database.');
}
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalUpgradePathTest.php
index 5956394..b0cd437 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalUpgradePathTest.php
@@ -36,7 +36,7 @@ class BareMinimalUpgradePathTest extends UpgradePathTestBase {
* Tests a successful major version release upgrade.
*/
public function testBasicMinimalUpgrade() {
- $this->assertTrue($this->performUpgrade(), t('The upgrade was completed successfully.'));
+ $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.');
// Ensure that the new Entity module is enabled after upgrade.
$this->assertTrue(module_exists('entity'), 'Entity module enabled after upgrade.');
@@ -48,7 +48,7 @@ class BareMinimalUpgradePathTest extends UpgradePathTestBase {
// Verify that we are still logged in.
$this->drupalGet('user');
$this->clickLink(t('Edit'));
- $this->assertEqual($this->getUrl(), url('user/1/edit', array('absolute' => TRUE)), t('We are still logged in as admin at the end of the upgrade.'));
+ $this->assertEqual($this->getUrl(), url('user/1/edit', array('absolute' => TRUE)), 'We are still logged in as admin at the end of the upgrade.');
// Logout and verify that we can login back in with our initial password.
$this->drupalLogout();
@@ -68,7 +68,7 @@ class BareMinimalUpgradePathTest extends UpgradePathTestBase {
));
// Test that the site name is correctly displayed.
- $this->assertText('drupal', t('The site name is correctly displayed.'));
+ $this->assertText('drupal', 'The site name is correctly displayed.');
// Verify that the main admin sections are available.
$this->drupalGet('admin');
@@ -82,6 +82,6 @@ class BareMinimalUpgradePathTest extends UpgradePathTestBase {
// Confirm that no {menu_links} entry exists for user/autocomplete.
$result = db_query('SELECT COUNT(*) FROM {menu_links} WHERE link_path = :user_autocomplete', array(':user_autocomplete' => 'user/autocomplete'))->fetchField();
- $this->assertFalse($result, t('No {menu_links} entry exists for user/autocomplete'));
+ $this->assertFalse($result, 'No {menu_links} entry exists for user/autocomplete');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareStandardUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareStandardUpgradePathTest.php
index 1ac554c..f8487cd 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareStandardUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareStandardUpgradePathTest.php
@@ -37,7 +37,7 @@ class BareStandardUpgradePathTest extends UpgradePathTestBase {
* Tests a successful major version release upgrade.
*/
public function testBasicStandardUpgrade() {
- $this->assertTrue($this->performUpgrade(), t('The upgrade was completed successfully.'));
+ $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.');
// Ensure that the new Entity module is enabled after upgrade.
$this->assertTrue(module_exists('entity'), 'Entity module enabled after upgrade.');
@@ -49,7 +49,7 @@ class BareStandardUpgradePathTest extends UpgradePathTestBase {
// Verify that we are still logged in.
$this->drupalGet('user');
$this->clickLink(t('Edit'));
- $this->assertEqual($this->getUrl(), url('user/1/edit', array('absolute' => TRUE)), t('We are still logged in as admin at the end of the upgrade.'));
+ $this->assertEqual($this->getUrl(), url('user/1/edit', array('absolute' => TRUE)), 'We are still logged in as admin at the end of the upgrade.');
// Logout and verify that we can login back in with our initial password.
$this->drupalLogout();
@@ -69,7 +69,7 @@ class BareStandardUpgradePathTest extends UpgradePathTestBase {
));
// Test that the site name is correctly displayed.
- $this->assertText('drupal', t('The site name is correctly displayed.'));
+ $this->assertText('drupal', 'The site name is correctly displayed.');
// Verify that the main admin sections are available.
$this->drupalGet('admin');
@@ -83,7 +83,7 @@ class BareStandardUpgradePathTest extends UpgradePathTestBase {
// Confirm that no {menu_links} entry exists for user/autocomplete.
$result = db_query('SELECT COUNT(*) FROM {menu_links} WHERE link_path = :user_autocomplete', array(':user_autocomplete' => 'user/autocomplete'))->fetchField();
- $this->assertFalse($result, t('No {menu_links} entry exists for user/autocomplete'));
+ $this->assertFalse($result, 'No {menu_links} entry exists for user/autocomplete');
// Verify that the blog node type has been assigned to node module.
$blog_type = node_type_load('blog');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledMinimalUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledMinimalUpgradePathTest.php
index bd74caa..1b6e000 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledMinimalUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledMinimalUpgradePathTest.php
@@ -36,7 +36,7 @@ class FilledMinimalUpgradePathTest extends UpgradePathTestBase {
* Tests a successful point release update.
*/
public function testFilledMinimalUpgrade() {
- $this->assertTrue($this->performUpgrade(), t('The upgrade was completed successfully.'));
+ $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.');
// Ensure that the new Entity module is enabled after upgrade.
$this->assertTrue(module_exists('entity'), 'Entity module enabled after upgrade.');
@@ -48,7 +48,7 @@ class FilledMinimalUpgradePathTest extends UpgradePathTestBase {
// Verify that we are still logged in.
$this->drupalGet('user');
$this->clickLink(t('Edit'));
- $this->assertEqual($this->getUrl(), url('user/1/edit', array('absolute' => TRUE)), t('We are still logged in as admin at the end of the upgrade.'));
+ $this->assertEqual($this->getUrl(), url('user/1/edit', array('absolute' => TRUE)), 'We are still logged in as admin at the end of the upgrade.');
// Logout and verify that we can login back in with our initial password.
$this->drupalLogout();
@@ -68,7 +68,7 @@ class FilledMinimalUpgradePathTest extends UpgradePathTestBase {
));
// Test that the site name is correctly displayed.
- $this->assertText('drupal', t('The site name is correctly displayed.'));
+ $this->assertText('drupal', 'The site name is correctly displayed.');
// Verify that the main admin sections are available.
$this->drupalGet('admin');
@@ -82,6 +82,6 @@ class FilledMinimalUpgradePathTest extends UpgradePathTestBase {
// Confirm that no {menu_links} entry exists for user/autocomplete.
$result = db_query('SELECT COUNT(*) FROM {menu_links} WHERE link_path = :user_autocomplete', array(':user_autocomplete' => 'user/autocomplete'))->fetchField();
- $this->assertFalse($result, t('No {menu_links} entry exists for user/autocomplete'));
+ $this->assertFalse($result, 'No {menu_links} entry exists for user/autocomplete');
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledStandardUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledStandardUpgradePathTest.php
index 0242830..bbdcce3 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledStandardUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledStandardUpgradePathTest.php
@@ -37,7 +37,7 @@ class FilledStandardUpgradePathTest extends UpgradePathTestBase {
* Tests a successful point release update.
*/
public function testFilledStandardUpgrade() {
- $this->assertTrue($this->performUpgrade(), t('The upgrade was completed successfully.'));
+ $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.');
// Ensure that the new Entity module is enabled after upgrade.
$this->assertTrue(module_exists('entity'), 'Entity module enabled after upgrade.');
@@ -49,7 +49,7 @@ class FilledStandardUpgradePathTest extends UpgradePathTestBase {
// Verify that we are still logged in.
$this->drupalGet('user');
$this->clickLink(t('Edit'));
- $this->assertEqual($this->getUrl(), url('user/1/edit', array('absolute' => TRUE)), t('We are still logged in as admin at the end of the upgrade.'));
+ $this->assertEqual($this->getUrl(), url('user/1/edit', array('absolute' => TRUE)), 'We are still logged in as admin at the end of the upgrade.');
// Logout and verify that we can login back in with our initial password.
$this->drupalLogout();
@@ -69,7 +69,7 @@ class FilledStandardUpgradePathTest extends UpgradePathTestBase {
));
// Test that the site name is correctly displayed.
- $this->assertText('drupal', t('The site name is correctly displayed.'));
+ $this->assertText('drupal', 'The site name is correctly displayed.');
// Verify that the main admin sections are available.
$this->drupalGet('admin');
@@ -83,7 +83,7 @@ class FilledStandardUpgradePathTest extends UpgradePathTestBase {
// Confirm that no {menu_links} entry exists for user/autocomplete.
$result = db_query('SELECT COUNT(*) FROM {menu_links} WHERE link_path = :user_autocomplete', array(':user_autocomplete' => 'user/autocomplete'))->fetchField();
- $this->assertFalse($result, t('No {menu_links} entry exists for user/autocomplete'));
+ $this->assertFalse($result, 'No {menu_links} entry exists for user/autocomplete');
// Verify that the blog node type has been assigned to node module.
$blog_type = node_type_load('blog');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/LanguageUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/LanguageUpgradePathTest.php
index 489fe90..4ea5368 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/LanguageUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/LanguageUpgradePathTest.php
@@ -36,10 +36,10 @@ class LanguageUpgradePathTest extends UpgradePathTestBase {
*/
public function testLanguageUpgrade() {
db_update('users')->fields(array('language' => 'ca'))->condition('uid', '1')->execute();
- $this->assertTrue($this->performUpgrade(), t('The upgrade was completed successfully.'));
+ $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.');
// Ensure Catalan was properly upgraded to be the new default language.
- $this->assertTrue(language_default()->langcode == 'ca', t('Catalan is the default language'));
+ $this->assertTrue(language_default()->langcode == 'ca', 'Catalan is the default language');
$languages = language_list(LANGUAGE_ALL);
foreach ($languages as $language) {
$this->assertTrue($language->default == ($language->langcode == 'ca'), t('@language default property properly set', array('@language' => $language->name)));
@@ -47,18 +47,18 @@ class LanguageUpgradePathTest extends UpgradePathTestBase {
// Check that both comments display on the node.
$this->drupalGet('node/50');
- $this->assertText('Node title 50', t('Node 50 displayed after update.'));
- $this->assertText('First test comment', t('Comment 1 displayed after update.'));
- $this->assertText('Reply to first test comment', t('Comment 2 displayed after update.'));
+ $this->assertText('Node title 50', 'Node 50 displayed after update.');
+ $this->assertText('First test comment', 'Comment 1 displayed after update.');
+ $this->assertText('Reply to first test comment', 'Comment 2 displayed after update.');
// Directly check the comment language property on the first comment.
$comment = db_query('SELECT * FROM {comment} WHERE cid = :cid', array(':cid' => 1))->fetchObject();
- $this->assertTrue($comment->langcode == 'und', t('Comment 1 language code found.'));
+ $this->assertTrue($comment->langcode == 'und', 'Comment 1 language code found.');
// Ensure that the language switcher has been correctly upgraded. We need to
// assert the expected HTML id because the block might appear even if the
// language negotiation settings are not properly upgraded.
- $this->assertTrue($this->xpath('//div[@id="block-language-language-interface"]'), t('The language switcher block is being correctly showed.'));
+ $this->assertTrue($this->xpath('//div[@id="block-language-language-interface"]'), 'The language switcher block is being correctly showed.');
// Test that the 'language' property was properly renamed to 'langcode'.
$language_none_nid = 50;
@@ -111,7 +111,7 @@ class LanguageUpgradePathTest extends UpgradePathTestBase {
// Check that locale_language_providers_weight_language is correctly
// renamed.
$current_weights = variable_get('language_negotiation_methods_weight_language_interface', array());
- $this->assertTrue(serialize($expected_weights) == serialize($current_weights), t('Language negotiation method weights upgraded.'));
+ $this->assertTrue(serialize($expected_weights) == serialize($current_weights), 'Language negotiation method weights upgraded.');
// Look up migrated plural string.
$source_string = db_query('SELECT * FROM {locales_source} WHERE lid = 22')->fetchObject();
@@ -139,11 +139,11 @@ class LanguageUpgradePathTest extends UpgradePathTestBase {
db_update('languages')->fields(array('domain' => 'http://' . $language_domain . ':8888'))->condition('language', 'ca')->execute();
variable_set('locale_language_negotiation_url_part', 1);
- $this->assertTrue($this->performUpgrade(), t('The upgrade was completed successfully.'));
+ $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.');
language_negotiation_include();
$domains = language_negotiation_url_domains();
- $this->assertTrue($domains['ca'] == $language_domain, t('Language domain for Catalan properly upgraded.'));
+ $this->assertTrue($domains['ca'] == $language_domain, 'Language domain for Catalan properly upgraded.');
}
/**
@@ -153,10 +153,10 @@ class LanguageUpgradePathTest extends UpgradePathTestBase {
// Remove all plural translations from the database.
db_delete('locales_target')->condition('plural', 0, '<>')->execute();
- $this->assertTrue($this->performUpgrade(), t('The upgrade was completed successfully.'));
+ $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.');
// Check if locale_update_8005() is succesfully completed by checking
// whether index 'plural' has been removed.
- $this->assertFalse(db_index_exists('locales_target', 'plural'), t('Translations without plurals upgraded.'));
+ $this->assertFalse(db_index_exists('locales_target', 'plural'), 'Translations without plurals upgraded.');
}
}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
index d63f176..83033b6 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
@@ -138,6 +138,6 @@ class VocabularyTest extends TaxonomyTestBase {
$this->drupalPost(NULL, NULL, t('Delete'));
$this->assertRaw(t('Deleted vocabulary %name.', array('%name' => $vocabulary->name)), 'Vocabulary deleted.');
entity_get_controller('taxonomy_vocabulary')->resetCache();
- $this->assertFalse(taxonomy_vocabulary_load($vid), t('Vocabulary is not found in the database'));
+ $this->assertFalse(taxonomy_vocabulary_load($vid), 'Vocabulary is not found in the database');
}
}
diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php b/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php
index 2706d3b..72db23b 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php
@@ -65,14 +65,14 @@ class TrackerTest extends WebTestBase {
));
$this->drupalGet('tracker');
- $this->assertNoText($unpublished->title, t('Unpublished node do not show up in the tracker listing.'));
- $this->assertText($published->title, t('Published node show up in the tracker listing.'));
- $this->assertLink(t('My recent content'), 0, t('User tab shows up on the global tracker page.'));
+ $this->assertNoText($unpublished->title, 'Unpublished node do not show up in the tracker listing.');
+ $this->assertText($published->title, 'Published node show up in the tracker listing.');
+ $this->assertLink(t('My recent content'), 0, 'User tab shows up on the global tracker page.');
// Delete a node and ensure it no longer appears on the tracker.
node_delete($published->nid);
$this->drupalGet('tracker');
- $this->assertNoText($published->title, t('Deleted node do not show up in the tracker listing.'));
+ $this->assertNoText($published->title, 'Deleted node do not show up in the tracker listing.');
}
/**
@@ -134,19 +134,19 @@ class TrackerTest extends WebTestBase {
$node = $this->drupalCreateNode($edit);
$title = $edit['title'];
$this->drupalGet('tracker');
- $this->assertPattern('/' . $title . '.*new/', t('New nodes are flagged as such in the tracker listing.'));
+ $this->assertPattern('/' . $title . '.*new/', 'New nodes are flagged as such in the tracker listing.');
$this->drupalGet('node/' . $node->nid);
$this->drupalGet('tracker');
- $this->assertNoPattern('/' . $title . '.*new/', t('Visited nodes are not flagged as new.'));
+ $this->assertNoPattern('/' . $title . '.*new/', 'Visited nodes are not flagged as new.');
$this->drupalLogin($this->other_user);
$this->drupalGet('tracker');
- $this->assertPattern('/' . $title . '.*new/', t('For another user, new nodes are flagged as such in the tracker listing.'));
+ $this->assertPattern('/' . $title . '.*new/', 'For another user, new nodes are flagged as such in the tracker listing.');
$this->drupalGet('node/' . $node->nid);
$this->drupalGet('tracker');
- $this->assertNoPattern('/' . $title . '.*new/', t('For another user, visited nodes are not flagged as new.'));
+ $this->assertNoPattern('/' . $title . '.*new/', 'For another user, visited nodes are not flagged as new.');
}
/**
@@ -170,7 +170,7 @@ class TrackerTest extends WebTestBase {
$this->drupalLogin($this->other_user);
$this->drupalGet('tracker');
- $this->assertText('1 new', t('New comments are counted on the tracker listing pages.'));
+ $this->assertText('1 new', 'New comments are counted on the tracker listing pages.');
$this->drupalGet('node/' . $node->nid);
// Add another comment as other_user.
@@ -185,7 +185,7 @@ class TrackerTest extends WebTestBase {
$this->drupalLogin($this->user);
$this->drupalGet('tracker');
- $this->assertText('1 new', t('New comments are counted on the tracker listing pages.'));
+ $this->assertText('1 new', 'New comments are counted on the tracker listing pages.');
}
/**
@@ -232,8 +232,8 @@ class TrackerTest extends WebTestBase {
foreach ($nodes as $i => $node) {
$this->assertText($node->title, t('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
}
- $this->assertText('1 new', t('New comment is counted on the tracker listing pages.'));
- $this->assertText('updated', t('Node is listed as updated'));
+ $this->assertText('1 new', 'New comment is counted on the tracker listing pages.');
+ $this->assertText('updated', 'Node is listed as updated');
// Fetch the site-wide tracker.
$this->drupalGet('tracker');
@@ -242,7 +242,7 @@ class TrackerTest extends WebTestBase {
foreach ($nodes as $i => $node) {
$this->assertText($node->title, t('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
}
- $this->assertText('1 new', t('New comment is counted on the tracker listing pages.'));
+ $this->assertText('1 new', 'New comment is counted on the tracker listing pages.');
}
/**
@@ -259,7 +259,7 @@ class TrackerTest extends WebTestBase {
// Assert that the node is displayed.
$this->drupalGet('tracker');
- $this->assertText($node->title, t('Node is displayed on the tracker listing pages.'));
+ $this->assertText($node->title, 'Node is displayed on the tracker listing pages.');
// Unpublish the node and ensure that it's no longer displayed.
$edit = array(
@@ -269,6 +269,6 @@ class TrackerTest extends WebTestBase {
$this->drupalPost('admin/content', $edit, t('Update'));
$this->drupalGet('tracker');
- $this->assertText(t('No content available.'), t('Node is displayed on the tracker listing pages.'));
+ $this->assertText(t('No content available.'), 'Node is displayed on the tracker listing pages.');
}
}
diff --git a/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php b/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php
index 2c2a4d2..270b8ea 100644
--- a/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php
+++ b/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php
@@ -44,7 +44,7 @@ class TranslationTest extends WebTestBase {
$this->drupalGet('admin/structure/types/manage/page');
$edit = array('node_type_language_hidden' => FALSE, 'node_type_language_translation_enabled' => TRUE);
$this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type'));
- $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), t('Basic page content type has been updated.'));
+ $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), 'Basic page content type has been updated.');
// Enable the language switcher block.
$language_type = LANGUAGE_TYPE_INTERFACE;
@@ -93,7 +93,7 @@ class TranslationTest extends WebTestBase {
// Attempt to submit a duplicate translation by visiting the node/add page
// with identical query string.
$this->drupalGet('node/add/page', array('query' => array('translation' => $node->nid, 'target' => 'es')));
- $this->assertRaw(t('A translation of %title in %language already exists', array('%title' => $node_title, '%language' => $languages['es']->name)), t('Message regarding attempted duplicate translation is displayed.'));
+ $this->assertRaw(t('A translation of %title in %language already exists', array('%title' => $node_title, '%language' => $languages['es']->name)), 'Message regarding attempted duplicate translation is displayed.');
// Attempt a resubmission of the form - this emulates using the back button
// to return to the page then resubmitting the form without a refresh.
@@ -103,7 +103,7 @@ class TranslationTest extends WebTestBase {
$edit["body[$langcode][0][value]"] = $this->randomName();
$this->drupalPost('node/add/page', $edit, t('Save'), array('query' => array('translation' => $node->nid, 'language' => 'es')));
$duplicate = $this->drupalGetNodeByTitle($edit["title"]);
- $this->assertEqual($duplicate->tnid, 0, t('The node does not have a tnid.'));
+ $this->assertEqual($duplicate->tnid, 0, 'The node does not have a tnid.');
// Update original and mark translation as outdated.
$node_body = $this->randomName();
@@ -112,25 +112,25 @@ class TranslationTest extends WebTestBase {
$edit["body[$langcode][0][value]"] = $node_body;
$edit['translation[retranslate]'] = TRUE;
$this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
- $this->assertRaw(t('Basic page %title has been updated.', array('%title' => $node_title)), t('Original node updated.'));
+ $this->assertRaw(t('Basic page %title has been updated.', array('%title' => $node_title)), 'Original node updated.');
// Check to make sure that interface shows translation as outdated.
$this->drupalGet('node/' . $node->nid . '/translate');
- $this->assertRaw('' . t('outdated') . '', t('Translation marked as outdated.'));
+ $this->assertRaw('' . t('outdated') . '', 'Translation marked as outdated.');
// Update translation and mark as updated.
$edit = array();
$edit["body[$langcode][0][value]"] = $this->randomName();
$edit['translation[status]'] = FALSE;
$this->drupalPost('node/' . $node_translation->nid . '/edit', $edit, t('Save'));
- $this->assertRaw(t('Basic page %title has been updated.', array('%title' => $node_translation_title)), t('Translated node updated.'));
+ $this->assertRaw(t('Basic page %title has been updated.', array('%title' => $node_translation_title)), 'Translated node updated.');
// Confirm that language neutral is an option for translators when there are
// disabled languages.
$this->drupalGet('node/add/page');
- $this->assertFieldByXPath('//select[@name="langcode"]//option', LANGUAGE_NOT_SPECIFIED, t('Language neutral is available in language selection with disabled languages.'));
+ $this->assertFieldByXPath('//select[@name="langcode"]//option', LANGUAGE_NOT_SPECIFIED, 'Language neutral is available in language selection with disabled languages.');
$node2 = $this->createPage($this->randomName(), $this->randomName(), LANGUAGE_NOT_SPECIFIED);
- $this->assertRaw($node2->body[LANGUAGE_NOT_SPECIFIED][0]['value'], t('Language neutral content created with disabled languages available.'));
+ $this->assertRaw($node2->body[LANGUAGE_NOT_SPECIFIED][0]['value'], 'Language neutral content created with disabled languages available.');
// Leave just one language installed and check that the translation overview
// page is still accessible.
@@ -138,7 +138,7 @@ class TranslationTest extends WebTestBase {
$this->drupalPost('admin/config/regional/language/delete/es', array(), t('Delete'));
$this->drupalLogin($this->translator);
$this->drupalGet('node/' . $node->nid . '/translate');
- $this->assertRaw(t('Translations of %title', array('%title' => $node->title)), t('Translation overview page available with only one language enabled.'));
+ $this->assertRaw(t('Translations of %title', array('%title' => $node->title)), 'Translation overview page available with only one language enabled.');
}
/**
@@ -282,10 +282,10 @@ class TranslationTest extends WebTestBase {
// Make sure we are not using a stale list.
drupal_static_reset('language_list');
$languages = language_list();
- $this->assertTrue(array_key_exists($language_code, $languages), t('Language was installed successfully.'));
+ $this->assertTrue(array_key_exists($language_code, $languages), 'Language was installed successfully.');
if (array_key_exists($language_code, $languages)) {
- $this->assertRaw(t('The language %language has been created and can now be used.', array('%language' => $languages[$language_code]->name)), t('Language has been created.'));
+ $this->assertRaw(t('The language %language has been created and can now be used.', array('%language' => $languages[$language_code]->name)), 'Language has been created.');
}
}
else {
@@ -316,11 +316,11 @@ class TranslationTest extends WebTestBase {
$edit['langcode'] = $langcode;
}
$this->drupalPost('node/add/page', $edit, t('Save'));
- $this->assertRaw(t('Basic page %title has been created.', array('%title' => $title)), t('Basic page created.'));
+ $this->assertRaw(t('Basic page %title has been created.', array('%title' => $title)), 'Basic page created.');
// Check to make sure the node was created.
$node = $this->drupalGetNodeByTitle($title);
- $this->assertTrue($node, t('Node found in database.'));
+ $this->assertTrue($node, 'Node found in database.');
return $node;
}
@@ -352,12 +352,12 @@ class TranslationTest extends WebTestBase {
$edit["title"] = $title;
$edit[$body_key] = $body;
$this->drupalPost(NULL, $edit, t('Save'));
- $this->assertRaw(t('Basic page %title has been created.', array('%title' => $title)), t('Translation created.'));
+ $this->assertRaw(t('Basic page %title has been created.', array('%title' => $title)), 'Translation created.');
// Check to make sure that translation was successful.
$translation = $this->drupalGetNodeByTitle($title);
- $this->assertTrue($translation, t('Node found in database.'));
- $this->assertTrue($translation->tnid == $node->nid, t('Translation set id correctly stored.'));
+ $this->assertTrue($translation, 'Node found in database.');
+ $this->assertTrue($translation->tnid == $node->nid, 'Translation set id correctly stored.');
return $translation;
}
diff --git a/core/modules/update/lib/Drupal/update/Tests/UpdateContribTest.php b/core/modules/update/lib/Drupal/update/Tests/UpdateContribTest.php
index 73df9a1..052c2aa 100644
--- a/core/modules/update/lib/Drupal/update/Tests/UpdateContribTest.php
+++ b/core/modules/update/lib/Drupal/update/Tests/UpdateContribTest.php
@@ -79,7 +79,7 @@ class UpdateContribTest extends UpdateTestBase {
$this->assertText(t('Up to date'));
$this->assertRaw('' . t('Modules') . '
');
$this->assertNoText(t('Update available'));
- $this->assertRaw(l(t('AAA Update test'), 'http://example.com/project/aaa_update_test'), t('Link to aaa_update_test project appears.'));
+ $this->assertRaw(l(t('AAA Update test'), 'http://example.com/project/aaa_update_test'), 'Link to aaa_update_test project appears.');
}
/**
@@ -140,10 +140,10 @@ class UpdateContribTest extends UpdateTestBase {
$this->assertText(t('CCC Update test'));
// We want aaa_update_test included in the ccc_update_test project, not as
// its own project on the report.
- $this->assertNoRaw(l(t('AAA Update test'), 'http://example.com/project/aaa_update_test'), t('Link to aaa_update_test project does not appear.'));
+ $this->assertNoRaw(l(t('AAA Update test'), 'http://example.com/project/aaa_update_test'), 'Link to aaa_update_test project does not appear.');
// The other two should be listed as projects.
- $this->assertRaw(l(t('BBB Update test'), 'http://example.com/project/bbb_update_test'), t('Link to bbb_update_test project appears.'));
- $this->assertRaw(l(t('CCC Update test'), 'http://example.com/project/ccc_update_test'), t('Link to bbb_update_test project appears.'));
+ $this->assertRaw(l(t('BBB Update test'), 'http://example.com/project/bbb_update_test'), 'Link to bbb_update_test project appears.');
+ $this->assertRaw(l(t('CCC Update test'), 'http://example.com/project/ccc_update_test'), 'Link to bbb_update_test project appears.');
// We want to make sure we see the BBB project before the CCC project.
// Instead of just searching for 'BBB Update test' or something, we want
@@ -192,7 +192,7 @@ class UpdateContribTest extends UpdateTestBase {
);
$this->refreshUpdateStatus($xml_mapping);
$this->assertText(t('Security update required!'));
- $this->assertRaw(l(t('Update test base theme'), 'http://example.com/project/update_test_basetheme'), t('Link to the Update test base theme project appears.'));
+ $this->assertRaw(l(t('Update test base theme'), 'http://example.com/project/update_test_basetheme'), 'Link to the Update test base theme project appears.');
}
/**
@@ -245,13 +245,13 @@ class UpdateContribTest extends UpdateTestBase {
$this->assertNoText(t('Themes'));
if ($check_disabled) {
$this->assertText(t('Disabled themes'));
- $this->assertRaw($base_theme_project_link, t('Link to the Update test base theme project appears.'));
- $this->assertRaw($sub_theme_project_link, t('Link to the Update test subtheme project appears.'));
+ $this->assertRaw($base_theme_project_link, 'Link to the Update test base theme project appears.');
+ $this->assertRaw($sub_theme_project_link, 'Link to the Update test subtheme project appears.');
}
else {
$this->assertNoText(t('Disabled themes'));
- $this->assertNoRaw($base_theme_project_link, t('Link to the Update test base theme project does not appear.'));
- $this->assertNoRaw($sub_theme_project_link, t('Link to the Update test subtheme project does not appear.'));
+ $this->assertNoRaw($base_theme_project_link, 'Link to the Update test base theme project does not appear.');
+ $this->assertNoRaw($sub_theme_project_link, 'Link to the Update test subtheme project does not appear.');
}
}
}
@@ -300,16 +300,16 @@ class UpdateContribTest extends UpdateTestBase {
// We need to check that this string is found as part of a project row,
// not just in the "Failed to get available update data for ..." message
// at the top of the page.
- $this->assertRaw('' . t('Failed to get available update data'));
+ $this->assertRaw('' . 'Failed to get available update data');
// We should see the output messages from fetching manually.
$this->assertUniqueText(t('Checked available update data for 3 projects.'));
$this->assertUniqueText(t('Failed to get available update data for one project.'));
// The other two should be listed as projects.
- $this->assertRaw(l(t('AAA Update test'), 'http://example.com/project/aaa_update_test'), t('Link to aaa_update_test project appears.'));
- $this->assertNoRaw(l(t('BBB Update test'), 'http://example.com/project/bbb_update_test'), t('Link to bbb_update_test project does not appear.'));
- $this->assertRaw(l(t('CCC Update test'), 'http://example.com/project/ccc_update_test'), t('Link to bbb_update_test project appears.'));
+ $this->assertRaw(l(t('AAA Update test'), 'http://example.com/project/aaa_update_test'), 'Link to aaa_update_test project appears.');
+ $this->assertNoRaw(l(t('BBB Update test'), 'http://example.com/project/bbb_update_test'), 'Link to bbb_update_test project does not appear.');
+ $this->assertRaw(l(t('CCC Update test'), 'http://example.com/project/ccc_update_test'), 'Link to bbb_update_test project appears.');
}
/**
@@ -351,7 +351,7 @@ class UpdateContribTest extends UpdateTestBase {
$this->drupalGet('admin/reports/updates');
$this->assertRaw('' . t('Modules') . '
');
$this->assertText(t('Security update required!'));
- $this->assertRaw(l(t('AAA Update test'), 'http://example.com/project/aaa_update_test'), t('Link to aaa_update_test project appears.'));
+ $this->assertRaw(l(t('AAA Update test'), 'http://example.com/project/aaa_update_test'), 'Link to aaa_update_test project appears.');
// Visit the reports page again without the altering and make sure the
// status is back to normal.
@@ -359,7 +359,7 @@ class UpdateContribTest extends UpdateTestBase {
$this->drupalGet('admin/reports/updates');
$this->assertRaw('' . t('Modules') . '
');
$this->assertNoText(t('Security update required!'));
- $this->assertRaw(l(t('AAA Update test'), 'http://example.com/project/aaa_update_test'), t('Link to aaa_update_test project appears.'));
+ $this->assertRaw(l(t('AAA Update test'), 'http://example.com/project/aaa_update_test'), 'Link to aaa_update_test project appears.');
// Turn the altering back on and visit the Update manager UI.
variable_set('update_test_update_status', $update_status);
diff --git a/core/modules/update/lib/Drupal/update/Tests/UpdateCoreTest.php b/core/modules/update/lib/Drupal/update/Tests/UpdateCoreTest.php
index 0679f88..6628f4a 100644
--- a/core/modules/update/lib/Drupal/update/Tests/UpdateCoreTest.php
+++ b/core/modules/update/lib/Drupal/update/Tests/UpdateCoreTest.php
@@ -48,9 +48,9 @@ class UpdateCoreTest extends UpdateTestBase {
$this->assertNoText(t('Up to date'));
$this->assertText(t('Update available'));
$this->assertNoText(t('Security update required!'));
- $this->assertRaw(l('7.1', 'http://example.com/drupal-7-1-release'), t('Link to release appears.'));
- $this->assertRaw(l(t('Download'), 'http://example.com/drupal-7-1.tar.gz'), t('Link to download appears.'));
- $this->assertRaw(l(t('Release notes'), 'http://example.com/drupal-7-1-release'), t('Link to release notes appears.'));
+ $this->assertRaw(l('7.1', 'http://example.com/drupal-7-1-release'), 'Link to release appears.');
+ $this->assertRaw(l(t('Download'), 'http://example.com/drupal-7-1.tar.gz'), 'Link to download appears.');
+ $this->assertRaw(l(t('Release notes'), 'http://example.com/drupal-7-1-release'), 'Link to release notes appears.');
}
/**
@@ -63,9 +63,9 @@ class UpdateCoreTest extends UpdateTestBase {
$this->assertNoText(t('Up to date'));
$this->assertNoText(t('Update available'));
$this->assertText(t('Security update required!'));
- $this->assertRaw(l('7.2', 'http://example.com/drupal-7-2-release'), t('Link to release appears.'));
- $this->assertRaw(l(t('Download'), 'http://example.com/drupal-7-2.tar.gz'), t('Link to download appears.'));
- $this->assertRaw(l(t('Release notes'), 'http://example.com/drupal-7-2-release'), t('Link to release notes appears.'));
+ $this->assertRaw(l('7.2', 'http://example.com/drupal-7-2-release'), 'Link to release appears.');
+ $this->assertRaw(l(t('Download'), 'http://example.com/drupal-7-2.tar.gz'), 'Link to download appears.');
+ $this->assertRaw(l(t('Release notes'), 'http://example.com/drupal-7-2-release'), 'Link to release notes appears.');
}
/**
@@ -164,7 +164,7 @@ class UpdateCoreTest extends UpdateTestBase {
// We're expecting "There is a security update..." inside the status report
// itself, but the drupal_set_message() appears as an li so we can prefix
// with that and search for the raw HTML.
- $this->assertNoRaw('- ' . t('There is a security update available for your version of Drupal.'));
+ $this->assertNoRaw('
- ' . 'There is a security update available for your version of Drupal.');
$this->drupalGet('admin/reports/updates');
$this->assertNoText(t('There is a security update available for your version of Drupal.'));
diff --git a/core/modules/update/lib/Drupal/update/Tests/UpdateTestBase.php b/core/modules/update/lib/Drupal/update/Tests/UpdateTestBase.php
index fe603e2..13fabe6 100644
--- a/core/modules/update/lib/Drupal/update/Tests/UpdateTestBase.php
+++ b/core/modules/update/lib/Drupal/update/Tests/UpdateTestBase.php
@@ -55,7 +55,7 @@ class UpdateTestBase extends WebTestBase {
*/
protected function standardTests() {
$this->assertRaw('
' . t('Drupal core') . '
');
- $this->assertRaw(l(t('Drupal'), 'http://example.com/project/drupal'), t('Link to the Drupal project appears.'));
+ $this->assertRaw(l(t('Drupal'), 'http://example.com/project/drupal'), 'Link to the Drupal project appears.');
$this->assertNoText(t('No available releases found'));
}
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php b/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php
index c0bed11..14347de 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php
@@ -35,14 +35,14 @@ class UserAdminTest extends WebTestBase {
$admin_user = $this->drupalCreateUser(array('administer users'));
$this->drupalLogin($admin_user);
$this->drupalGet('admin/people');
- $this->assertText($user_a->name, t('Found user A on admin users page'));
- $this->assertText($user_b->name, t('Found user B on admin users page'));
- $this->assertText($user_c->name, t('Found user C on admin users page'));
- $this->assertText($admin_user->name, t('Found Admin user on admin users page'));
+ $this->assertText($user_a->name, 'Found user A on admin users page');
+ $this->assertText($user_b->name, 'Found user B on admin users page');
+ $this->assertText($user_c->name, 'Found user C on admin users page');
+ $this->assertText($admin_user->name, 'Found Admin user on admin users page');
// Test for existence of edit link in table.
$link = l(t('edit'), "user/$user_a->uid/edit", array('query' => array('destination' => 'admin/people')));
- $this->assertRaw($link, t('Found user A edit link on admin users page'));
+ $this->assertRaw($link, 'Found user A edit link on admin users page');
// Filter the users by permission 'administer taxonomy'.
$edit = array();
@@ -50,9 +50,9 @@ class UserAdminTest extends WebTestBase {
$this->drupalPost('admin/people', $edit, t('Filter'));
// Check if the correct users show up.
- $this->assertNoText($user_a->name, t('User A not on filtered by perm admin users page'));
- $this->assertText($user_b->name, t('Found user B on filtered by perm admin users page'));
- $this->assertText($user_c->name, t('Found user C on filtered by perm admin users page'));
+ $this->assertNoText($user_a->name, 'User A not on filtered by perm admin users page');
+ $this->assertText($user_b->name, 'Found user B on filtered by perm admin users page');
+ $this->assertText($user_c->name, 'Found user C on filtered by perm admin users page');
// Filter the users by role. Grab the system-generated role name for User C.
$roles = $user_c->roles;
@@ -61,9 +61,9 @@ class UserAdminTest extends WebTestBase {
$this->drupalPost('admin/people', $edit, t('Refine'));
// Check if the correct users show up when filtered by role.
- $this->assertNoText($user_a->name, t('User A not on filtered by role on admin users page'));
- $this->assertNoText($user_b->name, t('User B not on filtered by role on admin users page'));
- $this->assertText($user_c->name, t('User C on filtered by role on admin users page'));
+ $this->assertNoText($user_a->name, 'User A not on filtered by role on admin users page');
+ $this->assertNoText($user_b->name, 'User B not on filtered by role on admin users page');
+ $this->assertText($user_c->name, 'User C on filtered by role on admin users page');
// Test blocking of a user.
$account = user_load($user_c->uid);
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAutocompleteTest.php b/core/modules/user/lib/Drupal/user/Tests/UserAutocompleteTest.php
index d5f1d8a..8f058f3 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserAutocompleteTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserAutocompleteTest.php
@@ -36,15 +36,15 @@ class UserAutocompleteTest extends WebTestBase {
// Check access from unprivileged user, should be denied.
$this->drupalLogin($this->unprivileged_user);
$this->drupalGet('user/autocomplete/' . $this->unprivileged_user->name[0]);
- $this->assertResponse(403, t('Autocompletion access denied to user without permission.'));
+ $this->assertResponse(403, 'Autocompletion access denied to user without permission.');
// Check access from privileged user.
$this->drupalLogout();
$this->drupalLogin($this->privileged_user);
$this->drupalGet('user/autocomplete/' . $this->unprivileged_user->name[0]);
- $this->assertResponse(200, t('Autocompletion access allowed.'));
+ $this->assertResponse(200, 'Autocompletion access allowed.');
// Using first letter of the user's name, make sure the user's full name is in the results.
- $this->assertRaw($this->unprivileged_user->name, t('User name found in autocompletion results.'));
+ $this->assertRaw($this->unprivileged_user->name, 'User name found in autocompletion results.');
}
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php b/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php
index 8e69750..04cee22 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php
@@ -53,23 +53,23 @@ class UserBlocksTests extends WebTestBase {
$edit['name'] = $user->name;
$edit['pass'] = $user->pass_raw;
$this->drupalPost('admin/people/permissions', $edit, t('Log in'));
- $this->assertNoText(t('User login'), t('Logged in.'));
+ $this->assertNoText(t('User login'), 'Logged in.');
// Check that we are still on the same page.
- $this->assertEqual(url('admin/people/permissions', array('absolute' => TRUE)), $this->getUrl(), t('Still on the same page after login for access denied page'));
+ $this->assertEqual(url('admin/people/permissions', array('absolute' => TRUE)), $this->getUrl(), 'Still on the same page after login for access denied page');
// Now, log out and repeat with a non-403 page.
$this->drupalLogout();
$this->drupalPost('filter/tips', $edit, t('Log in'));
- $this->assertNoText(t('User login'), t('Logged in.'));
- $this->assertPattern('!!', t('Still on the same page after login for allowed page'));
+ $this->assertNoText(t('User login'), 'Logged in.');
+ $this->assertPattern('!!', 'Still on the same page after login for allowed page');
// Check that the user login block is not vulnerable to information
// disclosure to third party sites.
$this->drupalLogout();
$this->drupalPost('http://example.com/', $edit, t('Log in'), array('external' => FALSE));
// Check that we remain on the site after login.
- $this->assertEqual(url('user/' . $user->uid, array('absolute' => TRUE)), $this->getUrl(), t('Redirected to user profile page after login from the frontpage'));
+ $this->assertEqual(url('user/' . $user->uid, array('absolute' => TRUE)), $this->getUrl(), 'Redirected to user profile page after login from the frontpage');
}
/**
@@ -80,12 +80,12 @@ class UserBlocksTests extends WebTestBase {
$user1 = $this->drupalCreateUser(array());
$user2 = $this->drupalCreateUser(array());
$user3 = $this->drupalCreateUser(array());
- $this->assertEqual(db_query("SELECT COUNT(*) FROM {sessions}")->fetchField(), 0, t('Sessions table is empty.'));
+ $this->assertEqual(db_query("SELECT COUNT(*) FROM {sessions}")->fetchField(), 0, 'Sessions table is empty.');
// Insert a user with two sessions.
$this->insertSession(array('uid' => $user1->uid));
$this->insertSession(array('uid' => $user1->uid));
- $this->assertEqual(db_query("SELECT COUNT(*) FROM {sessions} WHERE uid = :uid", array(':uid' => $user1->uid))->fetchField(), 2, t('Duplicate user session has been inserted.'));
+ $this->assertEqual(db_query("SELECT COUNT(*) FROM {sessions} WHERE uid = :uid", array(':uid' => $user1->uid))->fetchField(), 2, 'Duplicate user session has been inserted.');
// Insert a user with only one session.
$this->insertSession(array('uid' => $user2->uid, 'timestamp' => REQUEST_TIME + 1));
@@ -101,10 +101,10 @@ class UserBlocksTests extends WebTestBase {
$block = user_block_view('online');
$this->drupalSetContent($block['content']);
$this->assertRaw(t('2 users'), t('Correct number of online users (2 users).'));
- $this->assertText($user1->name, t('Active user 1 found in online list.'));
- $this->assertText($user2->name, t('Active user 2 found in online list.'));
+ $this->assertText($user1->name, 'Active user 1 found in online list.');
+ $this->assertText($user2->name, 'Active user 2 found in online list.');
$this->assertNoText($user3->name, t("Inactive user not found in online list."));
- $this->assertTrue(strpos($this->drupalGetContent(), $user1->name) > strpos($this->drupalGetContent(), $user2->name), t('Online users are ordered correctly.'));
+ $this->assertTrue(strpos($this->drupalGetContent(), $user1->name) > strpos($this->drupalGetContent(), $user2->name), 'Online users are ordered correctly.');
}
/**
@@ -120,6 +120,6 @@ class UserBlocksTests extends WebTestBase {
db_insert('sessions')
->fields($fields)
->execute();
- $this->assertEqual(db_query("SELECT COUNT(*) FROM {sessions} WHERE uid = :uid AND sid = :sid AND timestamp = :timestamp", array(':uid' => $fields['uid'], ':sid' => $fields['sid'], ':timestamp' => $fields['timestamp']))->fetchField(), 1, t('Session record inserted.'));
+ $this->assertEqual(db_query("SELECT COUNT(*) FROM {sessions} WHERE uid = :uid AND sid = :sid AND timestamp = :timestamp", array(':uid' => $fields['uid'], ':sid' => $fields['sid'], ':timestamp' => $fields['timestamp']))->fetchField(), 1, 'Session record inserted.');
}
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
index 4e6a0d5..17c5262 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
@@ -44,18 +44,18 @@ class UserCancelTest extends WebTestBase {
// Attempt to cancel account.
$this->drupalGet('user/' . $account->uid . '/edit');
- $this->assertNoRaw(t('Cancel account'), t('No cancel account button displayed.'));
+ $this->assertNoRaw(t('Cancel account'), 'No cancel account button displayed.');
// Attempt bogus account cancellation request confirmation.
$timestamp = $account->login;
$this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
- $this->assertResponse(403, t('Bogus cancelling request rejected.'));
+ $this->assertResponse(403, 'Bogus cancelling request rejected.');
$account = user_load($account->uid);
- $this->assertTrue($account->status == 1, t('User account was not canceled.'));
+ $this->assertTrue($account->status == 1, 'User account was not canceled.');
// Confirm user's content has not been altered.
$test_node = node_load($node->nid, NULL, TRUE);
- $this->assertTrue(($test_node->uid == $account->uid && $test_node->status == 1), t('Node of the user has not been altered.'));
+ $this->assertTrue(($test_node->uid == $account->uid && $test_node->status == 1), 'Node of the user has not been altered.');
}
/**
@@ -94,7 +94,7 @@ class UserCancelTest extends WebTestBase {
// Verify that uid 1's account was not cancelled.
$user1 = user_load(1, TRUE);
- $this->assertEqual($user1->status, 1, t('User #1 still exists and is not blocked.'));
+ $this->assertEqual($user1->status, 1, 'User #1 still exists and is not blocked.');
}
/**
@@ -118,25 +118,25 @@ class UserCancelTest extends WebTestBase {
// Confirm account cancellation.
$timestamp = time();
$this->drupalPost(NULL, NULL, t('Cancel account'));
- $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), t('Account cancellation request mailed message displayed.'));
+ $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), 'Account cancellation request mailed message displayed.');
// Attempt bogus account cancellation request confirmation.
$bogus_timestamp = $timestamp + 60;
$this->drupalGet("user/$account->uid/cancel/confirm/$bogus_timestamp/" . user_pass_rehash($account->pass, $bogus_timestamp, $account->login));
- $this->assertText(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'), t('Bogus cancelling request rejected.'));
+ $this->assertText(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'), 'Bogus cancelling request rejected.');
$account = user_load($account->uid);
- $this->assertTrue($account->status == 1, t('User account was not canceled.'));
+ $this->assertTrue($account->status == 1, 'User account was not canceled.');
// Attempt expired account cancellation request confirmation.
$bogus_timestamp = $timestamp - 86400 - 60;
$this->drupalGet("user/$account->uid/cancel/confirm/$bogus_timestamp/" . user_pass_rehash($account->pass, $bogus_timestamp, $account->login));
- $this->assertText(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'), t('Expired cancel account request rejected.'));
+ $this->assertText(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'), 'Expired cancel account request rejected.');
$accounts = user_load_multiple(array($account->uid), array('status' => 1));
- $this->assertTrue(reset($accounts), t('User account was not canceled.'));
+ $this->assertTrue(reset($accounts), 'User account was not canceled.');
// Confirm user's content has not been altered.
$test_node = node_load($node->nid, NULL, TRUE);
- $this->assertTrue(($test_node->uid == $account->uid && $test_node->status == 1), t('Node of the user has not been altered.'));
+ $this->assertTrue(($test_node->uid == $account->uid && $test_node->status == 1), 'Node of the user has not been altered.');
}
/**
@@ -155,23 +155,23 @@ class UserCancelTest extends WebTestBase {
// Attempt to cancel account.
$this->drupalGet('user/' . $account->uid . '/edit');
$this->drupalPost(NULL, NULL, t('Cancel account'));
- $this->assertText(t('Are you sure you want to cancel your account?'), t('Confirmation form to cancel account displayed.'));
- $this->assertText(t('Your account will be blocked and you will no longer be able to log in. All of your content will remain attributed to your user name.'), t('Informs that all content will be remain as is.'));
- $this->assertNoText(t('Select the method to cancel the account above.'), t('Does not allow user to select account cancellation method.'));
+ $this->assertText(t('Are you sure you want to cancel your account?'), 'Confirmation form to cancel account displayed.');
+ $this->assertText(t('Your account will be blocked and you will no longer be able to log in. All of your content will remain attributed to your user name.'), 'Informs that all content will be remain as is.');
+ $this->assertNoText(t('Select the method to cancel the account above.'), 'Does not allow user to select account cancellation method.');
// Confirm account cancellation.
$timestamp = time();
$this->drupalPost(NULL, NULL, t('Cancel account'));
- $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), t('Account cancellation request mailed message displayed.'));
+ $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), 'Account cancellation request mailed message displayed.');
// Confirm account cancellation request.
$this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
$account = user_load($account->uid, TRUE);
- $this->assertTrue($account->status == 0, t('User has been blocked.'));
+ $this->assertTrue($account->status == 0, 'User has been blocked.');
// Confirm user is logged out.
- $this->assertNoText($account->name, t('Logged out.'));
+ $this->assertNoText($account->name, 'Logged out.');
}
/**
@@ -195,27 +195,27 @@ class UserCancelTest extends WebTestBase {
// Attempt to cancel account.
$this->drupalGet('user/' . $account->uid . '/edit');
$this->drupalPost(NULL, NULL, t('Cancel account'));
- $this->assertText(t('Are you sure you want to cancel your account?'), t('Confirmation form to cancel account displayed.'));
- $this->assertText(t('Your account will be blocked and you will no longer be able to log in. All of your content will be hidden from everyone but administrators.'), t('Informs that all content will be unpublished.'));
+ $this->assertText(t('Are you sure you want to cancel your account?'), 'Confirmation form to cancel account displayed.');
+ $this->assertText(t('Your account will be blocked and you will no longer be able to log in. All of your content will be hidden from everyone but administrators.'), 'Informs that all content will be unpublished.');
// Confirm account cancellation.
$timestamp = time();
$this->drupalPost(NULL, NULL, t('Cancel account'));
- $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), t('Account cancellation request mailed message displayed.'));
+ $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), 'Account cancellation request mailed message displayed.');
// Confirm account cancellation request.
$this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
$account = user_load($account->uid, TRUE);
- $this->assertTrue($account->status == 0, t('User has been blocked.'));
+ $this->assertTrue($account->status == 0, 'User has been blocked.');
// Confirm user's content has been unpublished.
$test_node = node_load($node->nid, NULL, TRUE);
- $this->assertTrue($test_node->status == 0, t('Node of the user has been unpublished.'));
+ $this->assertTrue($test_node->status == 0, 'Node of the user has been unpublished.');
$test_node = node_load($node->nid, $node->vid, TRUE);
- $this->assertTrue($test_node->status == 0, t('Node revision of the user has been unpublished.'));
+ $this->assertTrue($test_node->status == 0, 'Node revision of the user has been unpublished.');
// Confirm user is logged out.
- $this->assertNoText($account->name, t('Logged out.'));
+ $this->assertNoText($account->name, 'Logged out.');
}
/**
@@ -245,28 +245,28 @@ class UserCancelTest extends WebTestBase {
// Attempt to cancel account.
$this->drupalGet('user/' . $account->uid . '/edit');
$this->drupalPost(NULL, NULL, t('Cancel account'));
- $this->assertText(t('Are you sure you want to cancel your account?'), t('Confirmation form to cancel account displayed.'));
- $this->assertRaw(t('Your account will be removed and all account information deleted. All of your content will be assigned to the %anonymous-name user.', array('%anonymous-name' => variable_get('anonymous', t('Anonymous')))), t('Informs that all content will be attributed to anonymous account.'));
+ $this->assertText(t('Are you sure you want to cancel your account?'), 'Confirmation form to cancel account displayed.');
+ $this->assertRaw(t('Your account will be removed and all account information deleted. All of your content will be assigned to the %anonymous-name user.', array('%anonymous-name' => variable_get('anonymous', t('Anonymous')))), 'Informs that all content will be attributed to anonymous account.');
// Confirm account cancellation.
$timestamp = time();
$this->drupalPost(NULL, NULL, t('Cancel account'));
- $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), t('Account cancellation request mailed message displayed.'));
+ $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), 'Account cancellation request mailed message displayed.');
// Confirm account cancellation request.
$this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
- $this->assertFalse(user_load($account->uid, TRUE), t('User is not found in the database.'));
+ $this->assertFalse(user_load($account->uid, TRUE), 'User is not found in the database.');
// Confirm that user's content has been attributed to anonymous user.
$test_node = node_load($node->nid, NULL, TRUE);
- $this->assertTrue(($test_node->uid == 0 && $test_node->status == 1), t('Node of the user has been attributed to anonymous user.'));
+ $this->assertTrue(($test_node->uid == 0 && $test_node->status == 1), 'Node of the user has been attributed to anonymous user.');
$test_node = node_load($revision_node->nid, $revision, TRUE);
- $this->assertTrue(($test_node->revision_uid == 0 && $test_node->status == 1), t('Node revision of the user has been attributed to anonymous user.'));
+ $this->assertTrue(($test_node->revision_uid == 0 && $test_node->status == 1), 'Node revision of the user has been attributed to anonymous user.');
$test_node = node_load($revision_node->nid, NULL, TRUE);
$this->assertTrue(($test_node->uid != 0 && $test_node->status == 1), t("Current revision of the user's node was not attributed to anonymous user."));
// Confirm that user is logged out.
- $this->assertNoText($account->name, t('Logged out.'));
+ $this->assertNoText($account->name, 'Logged out.');
}
/**
@@ -295,7 +295,7 @@ class UserCancelTest extends WebTestBase {
$this->assertText(t('Your comment has been posted.'));
$comments = comment_load_multiple(FALSE, array('subject' => $edit['subject']));
$comment = reset($comments);
- $this->assertTrue($comment->cid, t('Comment found.'));
+ $this->assertTrue($comment->cid, 'Comment found.');
// Create a node with two revisions, the initial one belonging to the
// cancelling user.
@@ -309,26 +309,26 @@ class UserCancelTest extends WebTestBase {
// Attempt to cancel account.
$this->drupalGet('user/' . $account->uid . '/edit');
$this->drupalPost(NULL, NULL, t('Cancel account'));
- $this->assertText(t('Are you sure you want to cancel your account?'), t('Confirmation form to cancel account displayed.'));
- $this->assertText(t('Your account will be removed and all account information deleted. All of your content will also be deleted.'), t('Informs that all content will be deleted.'));
+ $this->assertText(t('Are you sure you want to cancel your account?'), 'Confirmation form to cancel account displayed.');
+ $this->assertText(t('Your account will be removed and all account information deleted. All of your content will also be deleted.'), 'Informs that all content will be deleted.');
// Confirm account cancellation.
$timestamp = time();
$this->drupalPost(NULL, NULL, t('Cancel account'));
- $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), t('Account cancellation request mailed message displayed.'));
+ $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), 'Account cancellation request mailed message displayed.');
// Confirm account cancellation request.
$this->drupalGet("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login));
- $this->assertFalse(user_load($account->uid, TRUE), t('User is not found in the database.'));
+ $this->assertFalse(user_load($account->uid, TRUE), 'User is not found in the database.');
// Confirm that user's content has been deleted.
- $this->assertFalse(node_load($node->nid, NULL, TRUE), t('Node of the user has been deleted.'));
- $this->assertFalse(node_load($node->nid, $revision, TRUE), t('Node revision of the user has been deleted.'));
+ $this->assertFalse(node_load($node->nid, NULL, TRUE), 'Node of the user has been deleted.');
+ $this->assertFalse(node_load($node->nid, $revision, TRUE), 'Node revision of the user has been deleted.');
$this->assertTrue(node_load($revision_node->nid, NULL, TRUE), t("Current revision of the user's node was not deleted."));
- $this->assertFalse(comment_load($comment->cid), t('Comment of the user has been deleted.'));
+ $this->assertFalse(comment_load($comment->cid), 'Comment of the user has been deleted.');
// Confirm that user is logged out.
- $this->assertNoText($account->name, t('Logged out.'));
+ $this->assertNoText($account->name, 'Logged out.');
}
/**
@@ -347,13 +347,13 @@ class UserCancelTest extends WebTestBase {
// Delete regular user.
$this->drupalGet('user/' . $account->uid . '/edit');
$this->drupalPost(NULL, NULL, t('Cancel account'));
- $this->assertRaw(t('Are you sure you want to cancel the account %name?', array('%name' => $account->name)), t('Confirmation form to cancel account displayed.'));
- $this->assertText(t('Select the method to cancel the account above.'), t('Allows to select account cancellation method.'));
+ $this->assertRaw(t('Are you sure you want to cancel the account %name?', array('%name' => $account->name)), 'Confirmation form to cancel account displayed.');
+ $this->assertText(t('Select the method to cancel the account above.'), 'Allows to select account cancellation method.');
// Confirm deletion.
$this->drupalPost(NULL, NULL, t('Cancel account'));
- $this->assertRaw(t('%name has been deleted.', array('%name' => $account->name)), t('User deleted.'));
- $this->assertFalse(user_load($account->uid), t('User is not found in the database.'));
+ $this->assertRaw(t('%name has been deleted.', array('%name' => $account->name)), 'User deleted.');
+ $this->assertFalse(user_load($account->uid), 'User is not found in the database.');
}
/**
@@ -375,13 +375,13 @@ class UserCancelTest extends WebTestBase {
// Delete regular user without e-mail address.
$this->drupalGet('user/' . $account->uid . '/edit');
$this->drupalPost(NULL, NULL, t('Cancel account'));
- $this->assertRaw(t('Are you sure you want to cancel the account %name?', array('%name' => $account->name)), t('Confirmation form to cancel account displayed.'));
- $this->assertText(t('Select the method to cancel the account above.'), t('Allows to select account cancellation method.'));
+ $this->assertRaw(t('Are you sure you want to cancel the account %name?', array('%name' => $account->name)), 'Confirmation form to cancel account displayed.');
+ $this->assertText(t('Select the method to cancel the account above.'), 'Allows to select account cancellation method.');
// Confirm deletion.
$this->drupalPost(NULL, NULL, t('Cancel account'));
- $this->assertRaw(t('%name has been deleted.', array('%name' => $account->name)), t('User deleted.'));
- $this->assertFalse(user_load($account->uid), t('User is not found in the database.'));
+ $this->assertRaw(t('%name has been deleted.', array('%name' => $account->name)), 'User deleted.');
+ $this->assertFalse(user_load($account->uid), 'User is not found in the database.');
}
/**
@@ -413,10 +413,10 @@ class UserCancelTest extends WebTestBase {
// Also try to cancel uid 1.
$edit['accounts[1]'] = TRUE;
$this->drupalPost('admin/people', $edit, t('Update'));
- $this->assertText(t('Are you sure you want to cancel these user accounts?'), t('Confirmation form to cancel accounts displayed.'));
- $this->assertText(t('When cancelling these accounts'), t('Allows to select account cancellation method.'));
- $this->assertText(t('Require e-mail confirmation to cancel account.'), t('Allows to send confirmation mail.'));
- $this->assertText(t('Notify user when account is canceled.'), t('Allows to send notification mail.'));
+ $this->assertText(t('Are you sure you want to cancel these user accounts?'), 'Confirmation form to cancel accounts displayed.');
+ $this->assertText(t('When cancelling these accounts'), 'Allows to select account cancellation method.');
+ $this->assertText(t('Require e-mail confirmation to cancel account.'), 'Allows to send confirmation mail.');
+ $this->assertText(t('Notify user when account is canceled.'), 'Allows to send notification mail.');
// Confirm deletion.
$this->drupalPost(NULL, NULL, t('Cancel accounts'));
@@ -425,15 +425,15 @@ class UserCancelTest extends WebTestBase {
$status = $status && (strpos($this->content, t('%name has been deleted.', array('%name' => $account->name))) !== FALSE);
$status = $status && !user_load($account->uid, TRUE);
}
- $this->assertTrue($status, t('Users deleted and not found in the database.'));
+ $this->assertTrue($status, 'Users deleted and not found in the database.');
// Ensure that admin account was not cancelled.
- $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), t('Account cancellation request mailed message displayed.'));
+ $this->assertText(t('A confirmation request to cancel your account has been sent to your e-mail address.'), 'Account cancellation request mailed message displayed.');
$admin_user = user_load($admin_user->uid);
- $this->assertTrue($admin_user->status == 1, t('Administrative user is found in the database and enabled.'));
+ $this->assertTrue($admin_user->status == 1, 'Administrative user is found in the database and enabled.');
// Verify that uid 1's account was not cancelled.
$user1 = user_load(1, TRUE);
- $this->assertEqual($user1->status, 1, t('User #1 still exists and is not blocked.'));
+ $this->assertEqual($user1->status, 1, 'User #1 still exists and is not blocked.');
}
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEditTest.php b/core/modules/user/lib/Drupal/user/Tests/UserEditTest.php
index 6bf60bc..ea78e03 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserEditTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserEditTest.php
@@ -47,12 +47,12 @@ class UserEditTest extends WebTestBase {
$edit['pass[pass1]'] = '';
$edit['pass[pass2]'] = $this->randomName();
$this->drupalPost("user/$user1->uid/edit", $edit, t('Save'));
- $this->assertText(t("The specified passwords do not match."), t('Typing mismatched passwords displays an error message.'));
+ $this->assertText(t("The specified passwords do not match."), 'Typing mismatched passwords displays an error message.');
$edit['pass[pass1]'] = $this->randomName();
$edit['pass[pass2]'] = '';
$this->drupalPost("user/$user1->uid/edit", $edit, t('Save'));
- $this->assertText(t("The specified passwords do not match."), t('Typing mismatched passwords displays an error message.'));
+ $this->assertText(t("The specified passwords do not match."), 'Typing mismatched passwords displays an error message.');
// Test that the error message appears when attempting to change the mail or
// pass without the current password.
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEntityCallbacksTest.php b/core/modules/user/lib/Drupal/user/Tests/UserEntityCallbacksTest.php
index dc85ade..a38fe5d 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserEntityCallbacksTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserEntityCallbacksTest.php
@@ -32,12 +32,12 @@ class UserEntityCallbacksTest extends WebTestBase {
* Test label callback.
*/
function testLabelCallback() {
- $this->assertEqual($this->account->label(), $this->account->name, t('The username should be used as label'));
+ $this->assertEqual($this->account->label(), $this->account->name, 'The username should be used as label');
// Setup a random anonymous name to be sure the name is used.
$name = $this->randomName();
variable_set('anonymous', $name);
- $this->assertEqual($this->anonymous->label(), $name, t('The variable anonymous should be used for name of uid 0'));
+ $this->assertEqual($this->anonymous->label(), $name, 'The variable anonymous should be used for name of uid 0');
}
/**
@@ -45,6 +45,6 @@ class UserEntityCallbacksTest extends WebTestBase {
*/
function testUriCallback() {
$uri = entity_uri('user', $this->account);
- $this->assertEqual('user/' . $this->account->uid, $uri['path'], t('Correct user URI.'));
+ $this->assertEqual('user/' . $this->account->uid, $uri['path'], 'Correct user URI.');
}
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserLanguageCreationTest.php b/core/modules/user/lib/Drupal/user/Tests/UserLanguageCreationTest.php
index dce7d0b..f6200e7 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserLanguageCreationTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserLanguageCreationTest.php
@@ -41,20 +41,20 @@ class UserLanguageCreationTest extends WebTestBase {
'predefined_langcode' => 'fr',
);
$this->drupalPost('admin/config/regional/language/add', $edit, t('Add language'));
- $this->assertText('French', t('Language added successfully.'));
- $this->assertEqual($this->getUrl(), url('admin/config/regional/language', array('absolute' => TRUE)), t('Correct page redirection.'));
+ $this->assertText('French', 'Language added successfully.');
+ $this->assertEqual($this->getUrl(), url('admin/config/regional/language', array('absolute' => TRUE)), 'Correct page redirection.');
// Set language negotiation.
$edit = array(
'language_interface[enabled][language-url]' => TRUE,
);
$this->drupalPost('admin/config/regional/language/detection', $edit, t('Save settings'));
- $this->assertText(t('Language negotiation configuration saved.'), t('Set language negotiation.'));
+ $this->assertText(t('Language negotiation configuration saved.'), 'Set language negotiation.');
// Check if the language selector is available on admin/people/create and
// set to the currently active language.
$this->drupalGet($langcode . '/admin/people/create');
- $this->assertFieldChecked("edit-preferred-langcode-$langcode", t('Global language set in the language selector.'));
+ $this->assertFieldChecked("edit-preferred-langcode-$langcode", 'Global language set in the language selector.');
// Create a user with the admin/people/create form and check if the correct
// language is set.
@@ -69,14 +69,14 @@ class UserLanguageCreationTest extends WebTestBase {
$this->drupalPost($langcode . '/admin/people/create', $edit, t('Create new account'));
$user = user_load_by_name($username);
- $this->assertEqual($user->preferred_langcode, $langcode, t('New user has correct preferred language set.'));
- $this->assertEqual($user->langcode, $langcode, t('New user has correct profile language set.'));
+ $this->assertEqual($user->preferred_langcode, $langcode, 'New user has correct preferred language set.');
+ $this->assertEqual($user->langcode, $langcode, 'New user has correct profile language set.');
// Register a new user and check if the language selector is hidden.
$this->drupalLogout();
$this->drupalGet($langcode . '/user/register');
- $this->assertNoFieldByName('language[fr]', t('Language selector is not accessible.'));
+ $this->assertNoFieldByName('language[fr]', 'Language selector is not accessible.');
$username = $this->randomName(10);
$edit = array(
@@ -87,8 +87,8 @@ class UserLanguageCreationTest extends WebTestBase {
$this->drupalPost($langcode . '/user/register', $edit, t('Create new account'));
$user = user_load_by_name($username);
- $this->assertEqual($user->preferred_langcode, $langcode, t('New user has correct preferred language set.'));
- $this->assertEqual($user->langcode, $langcode, t('New user has correct profile language set.'));
+ $this->assertEqual($user->preferred_langcode, $langcode, 'New user has correct preferred language set.');
+ $this->assertEqual($user->langcode, $langcode, 'New user has correct profile language set.');
// Test if the admin can use the language selector and if the
// correct language is was saved.
@@ -96,7 +96,7 @@ class UserLanguageCreationTest extends WebTestBase {
$this->drupalLogin($admin_user);
$this->drupalGet($user_edit);
- $this->assertFieldChecked("edit-preferred-langcode-$langcode", t('Language selector is accessible and correct language is selected.'));
+ $this->assertFieldChecked("edit-preferred-langcode-$langcode", 'Language selector is accessible and correct language is selected.');
// Set pass_raw so we can login the new user.
$user->pass_raw = $this->randomName(10);
@@ -109,6 +109,6 @@ class UserLanguageCreationTest extends WebTestBase {
$this->drupalLogin($user);
$this->drupalGet($user_edit);
- $this->assertFieldChecked("edit-preferred-langcode-$langcode", t('Language selector is accessible and correct language is selected.'));
+ $this->assertFieldChecked("edit-preferred-langcode-$langcode", 'Language selector is accessible and correct language is selected.');
}
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserLanguageTest.php b/core/modules/user/lib/Drupal/user/Tests/UserLanguageTest.php
index 41084c3..55f4417 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserLanguageTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserLanguageTest.php
@@ -56,19 +56,19 @@ class UserLanguageTest extends WebTestBase {
$path = 'user/' . $web_user->uid . '/edit';
$this->drupalGet($path);
// Ensure language settings fieldset is available.
- $this->assertText(t('Language'), t('Language selector available.'));
+ $this->assertText(t('Language'), 'Language selector available.');
// Ensure custom language is present.
- $this->assertText($name, t('Language present on form.'));
+ $this->assertText($name, 'Language present on form.');
// Switch to our custom language.
$edit = array(
'preferred_langcode' => $langcode,
);
$this->drupalPost($path, $edit, t('Save'));
// Ensure form was submitted successfully.
- $this->assertText(t('The changes have been saved.'), t('Changes were saved.'));
+ $this->assertText(t('The changes have been saved.'), 'Changes were saved.');
// Check if language was changed.
$elements = $this->xpath('//input[@id=:id]', array(':id' => 'edit-preferred-langcode-' . $langcode));
- $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), t('Default language successfully updated.'));
+ $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), 'Default language successfully updated.');
$this->drupalLogout();
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php b/core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php
index b5e8882..304111e 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php
@@ -136,7 +136,7 @@ class UserLoginTest extends WebTestBase {
'pass' => $account->pass_raw,
);
$this->drupalPost('user', $edit, t('Log in'));
- $this->assertNoFieldByXPath("//input[@name='pass' and @value!='']", NULL, t('Password value attribute is blank.'));
+ $this->assertNoFieldByXPath("//input[@name='pass' and @value!='']", NULL, 'Password value attribute is blank.');
if (isset($flood_trigger)) {
if ($flood_trigger == 'user') {
$this->assertRaw(format_plural(variable_get('user_failed_login_user_limit', 5), 'Sorry, there has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or request a new password.', 'Sorry, there have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or request a new password.', array('@url' => url('user/password'))));
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php b/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php
index 58fdf6b..9cbb4dc 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php
@@ -41,24 +41,24 @@ class UserPermissionsTest extends WebTestBase {
$account = $this->admin_user;
// Add a permission.
- $this->assertFalse(user_access('administer nodes', $account), t('User does not have "administer nodes" permission.'));
+ $this->assertFalse(user_access('administer nodes', $account), 'User does not have "administer nodes" permission.');
$edit = array();
$edit[$rid . '[administer nodes]'] = TRUE;
$this->drupalPost('admin/people/permissions', $edit, t('Save permissions'));
- $this->assertText(t('The changes have been saved.'), t('Successful save message displayed.'));
+ $this->assertText(t('The changes have been saved.'), 'Successful save message displayed.');
drupal_static_reset('user_access');
drupal_static_reset('user_role_permissions');
- $this->assertTrue(user_access('administer nodes', $account), t('User now has "administer nodes" permission.'));
+ $this->assertTrue(user_access('administer nodes', $account), 'User now has "administer nodes" permission.');
// Remove a permission.
- $this->assertTrue(user_access('access user profiles', $account), t('User has "access user profiles" permission.'));
+ $this->assertTrue(user_access('access user profiles', $account), 'User has "access user profiles" permission.');
$edit = array();
$edit[$rid . '[access user profiles]'] = FALSE;
$this->drupalPost('admin/people/permissions', $edit, t('Save permissions'));
- $this->assertText(t('The changes have been saved.'), t('Successful save message displayed.'));
+ $this->assertText(t('The changes have been saved.'), 'Successful save message displayed.');
drupal_static_reset('user_access');
drupal_static_reset('user_role_permissions');
- $this->assertFalse(user_access('access user profiles', $account), t('User no longer has "access user profiles" permission.'));
+ $this->assertFalse(user_access('access user profiles', $account), 'User no longer has "access user profiles" permission.');
}
/**
@@ -78,7 +78,7 @@ class UserPermissionsTest extends WebTestBase {
$edit = array();
$edit['modules[Core][aggregator][enable]'] = TRUE;
$this->drupalPost('admin/modules', $edit, t('Save configuration'));
- $this->assertTrue(user_access('administer news feeds', $this->admin_user), t('The permission was automatically assigned to the administrator role'));
+ $this->assertTrue(user_access('administer news feeds', $this->admin_user), 'The permission was automatically assigned to the administrator role');
}
/**
@@ -89,9 +89,9 @@ class UserPermissionsTest extends WebTestBase {
$account = $this->admin_user;
// Verify current permissions.
- $this->assertFalse(user_access('administer nodes', $account), t('User does not have "administer nodes" permission.'));
- $this->assertTrue(user_access('access user profiles', $account), t('User has "access user profiles" permission.'));
- $this->assertTrue(user_access('administer site configuration', $account), t('User has "administer site configuration" permission.'));
+ $this->assertFalse(user_access('administer nodes', $account), 'User does not have "administer nodes" permission.');
+ $this->assertTrue(user_access('access user profiles', $account), 'User has "access user profiles" permission.');
+ $this->assertTrue(user_access('administer site configuration', $account), 'User has "administer site configuration" permission.');
// Change permissions.
$permissions = array(
@@ -101,8 +101,8 @@ class UserPermissionsTest extends WebTestBase {
user_role_change_permissions($rid, $permissions);
// Verify proper permission changes.
- $this->assertTrue(user_access('administer nodes', $account), t('User now has "administer nodes" permission.'));
- $this->assertFalse(user_access('access user profiles', $account), t('User no longer has "access user profiles" permission.'));
- $this->assertTrue(user_access('administer site configuration', $account), t('User still has "administer site configuration" permission.'));
+ $this->assertTrue(user_access('administer nodes', $account), 'User now has "administer nodes" permission.');
+ $this->assertFalse(user_access('access user profiles', $account), 'User no longer has "access user profiles" permission.');
+ $this->assertTrue(user_access('administer site configuration', $account), 'User still has "administer site configuration" permission.');
}
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPictureTest.php b/core/modules/user/lib/Drupal/user/Tests/UserPictureTest.php
index e57cc42..8c3c9e4 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserPictureTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserPictureTest.php
@@ -52,7 +52,7 @@ class UserPictureTest extends WebTestBase {
// Try to upload a file that is not an image for the user picture.
$not_an_image = current($this->drupalGetTestFiles('html'));
$this->saveUserPicture($not_an_image);
- $this->assertRaw(t('Only JPEG, PNG and GIF images are allowed.'), t('Non-image files are not accepted.'));
+ $this->assertRaw(t('Only JPEG, PNG and GIF images are allowed.'), 'Non-image files are not accepted.');
}
/**
@@ -78,7 +78,7 @@ class UserPictureTest extends WebTestBase {
// Check that the image was resized and is being displayed on the
// user's profile page.
$text = t('The image was resized to fit within the maximum allowed dimensions of %dimensions pixels.', array('%dimensions' => $test_dim));
- $this->assertRaw($text, t('Image was resized.'));
+ $this->assertRaw($text, 'Image was resized.');
$alt = t("@user's picture", array('@user' => user_format_name($this->user)));
$style = variable_get('user_picture_style', '');
$this->assertRaw(image_style_url($style, $pic_path), t("Image is displayed in user's edit page"));
@@ -115,12 +115,12 @@ class UserPictureTest extends WebTestBase {
// Test that the upload failed and that the correct reason was cited.
$text = t('The specified file %filename could not be uploaded.', array('%filename' => $image->filename));
- $this->assertRaw($text, t('Upload failed.'));
+ $this->assertRaw($text, 'Upload failed.');
$text = t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => format_size(filesize($image->uri)), '%maxsize' => format_size($test_size * 1024)));
- $this->assertRaw($text, t('File size cited as reason for failure.'));
+ $this->assertRaw($text, 'File size cited as reason for failure.');
// Check if file is not uploaded.
- $this->assertFalse(is_file($pic_path), t('File was not uploaded.'));
+ $this->assertFalse(is_file($pic_path), 'File was not uploaded.');
}
}
@@ -147,12 +147,12 @@ class UserPictureTest extends WebTestBase {
// Test that the upload failed and that the correct reason was cited.
$text = t('The specified file %filename could not be uploaded.', array('%filename' => $image->filename));
- $this->assertRaw($text, t('Upload failed.'));
+ $this->assertRaw($text, 'Upload failed.');
$text = t('The image is too large; the maximum dimensions are %dimensions pixels.', array('%dimensions' => $test_dim));
$this->assertRaw($text, t('Checking response on invalid image (dimensions).'));
// Check if file is not uploaded.
- $this->assertFalse(is_file($pic_path), t('File was not uploaded.'));
+ $this->assertFalse(is_file($pic_path), 'File was not uploaded.');
}
}
@@ -180,12 +180,12 @@ class UserPictureTest extends WebTestBase {
// Test that the upload failed and that the correct reason was cited.
$text = t('The specified file %filename could not be uploaded.', array('%filename' => $image->filename));
- $this->assertRaw($text, t('Upload failed.'));
+ $this->assertRaw($text, 'Upload failed.');
$text = t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => format_size(filesize($image->uri)), '%maxsize' => format_size($test_size * 1024)));
- $this->assertRaw($text, t('File size cited as reason for failure.'));
+ $this->assertRaw($text, 'File size cited as reason for failure.');
// Check if file is not uploaded.
- $this->assertFalse(is_file($pic_path), t('File was not uploaded.'));
+ $this->assertFalse(is_file($pic_path), 'File was not uploaded.');
}
}
@@ -214,14 +214,14 @@ class UserPictureTest extends WebTestBase {
$this->assertRaw(file_uri_target($pic_path), t("Image is displayed in user's profile page"));
// Check if file is located in proper directory.
- $this->assertTrue(is_file($pic_path), t('File is located in proper directory'));
+ $this->assertTrue(is_file($pic_path), 'File is located in proper directory');
// Set new picture dimensions.
$test_dim = ($info['width'] + 5) . 'x' . ($info['height'] + 5);
variable_set('user_picture_dimensions', $test_dim);
$pic_path2 = $this->saveUserPicture($image);
- $this->assertNotEqual($pic_path, $pic_path2, t('Filename of second picture is different.'));
+ $this->assertNotEqual($pic_path, $pic_path2, 'Filename of second picture is different.');
}
}
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php b/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php
index 56ad9a0..746c8a4 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php
@@ -29,7 +29,7 @@ class UserRegistrationTest extends WebTestBase {
// Set registration to administrator only.
variable_set('user_register', USER_REGISTER_ADMINISTRATORS_ONLY);
$this->drupalGet('user/register');
- $this->assertResponse(403, t('Registration page is inaccessible when only administrators can create accounts.'));
+ $this->assertResponse(403, 'Registration page is inaccessible when only administrators can create accounts.');
// Allow registration by site visitors without administrator approval.
variable_set('user_register', USER_REGISTER_VISITORS);
@@ -37,10 +37,10 @@ class UserRegistrationTest extends WebTestBase {
$edit['name'] = $name = $this->randomName();
$edit['mail'] = $mail = $edit['name'] . '@example.com';
$this->drupalPost('user/register', $edit, t('Create new account'));
- $this->assertText(t('A welcome message with further instructions has been sent to your e-mail address.'), t('User registered successfully.'));
+ $this->assertText(t('A welcome message with further instructions has been sent to your e-mail address.'), 'User registered successfully.');
$accounts = user_load_multiple(array(), array('name' => $name, 'mail' => $mail));
$new_user = reset($accounts);
- $this->assertTrue($new_user->status, t('New account is active after registration.'));
+ $this->assertTrue($new_user->status, 'New account is active after registration.');
// Allow registration by site visitors, but require administrator approval.
variable_set('user_register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL);
@@ -50,7 +50,7 @@ class UserRegistrationTest extends WebTestBase {
$this->drupalPost('user/register', $edit, t('Create new account'));
$accounts = user_load_multiple(array(), array('name' => $name, 'mail' => $mail));
$new_user = reset($accounts);
- $this->assertFalse($new_user->status, t('New account is blocked until approved by an administrator.'));
+ $this->assertFalse($new_user->status, 'New account is blocked until approved by an administrator.');
}
function testRegistrationWithoutEmailVerification() {
@@ -67,7 +67,7 @@ class UserRegistrationTest extends WebTestBase {
$edit['pass[pass1]'] = '99999.0';
$edit['pass[pass2]'] = '99999';
$this->drupalPost('user/register', $edit, t('Create new account'));
- $this->assertText(t('The specified passwords do not match.'), t('Typing mismatched passwords displays an error message.'));
+ $this->assertText(t('The specified passwords do not match.'), 'Typing mismatched passwords displays an error message.');
// Enter a correct password.
$edit['pass[pass1]'] = $new_pass = $this->randomName();
@@ -75,7 +75,7 @@ class UserRegistrationTest extends WebTestBase {
$this->drupalPost('user/register', $edit, t('Create new account'));
$accounts = user_load_multiple(array(), array('name' => $name, 'mail' => $mail));
$new_user = reset($accounts);
- $this->assertText(t('Registration successful. You are now logged in.'), t('Users are logged in after registering.'));
+ $this->assertText(t('Registration successful. You are now logged in.'), 'Users are logged in after registering.');
$this->drupalLogout();
// Allow registration by site visitors, but require administrator approval.
@@ -86,7 +86,7 @@ class UserRegistrationTest extends WebTestBase {
$edit['pass[pass1]'] = $pass = $this->randomName();
$edit['pass[pass2]'] = $pass;
$this->drupalPost('user/register', $edit, t('Create new account'));
- $this->assertText(t('Thank you for applying for an account. Your account is currently pending approval by the site administrator.'), t('Users are notified of pending approval'));
+ $this->assertText(t('Thank you for applying for an account. Your account is currently pending approval by the site administrator.'), 'Users are notified of pending approval');
// Try to login before administrator approval.
$auth = array(
@@ -94,7 +94,7 @@ class UserRegistrationTest extends WebTestBase {
'pass' => $pass,
);
$this->drupalPost('user/login', $auth, t('Log in'));
- $this->assertText(t('The username @name has not been activated or is blocked.', array('@name' => $name)), t('User cannot login yet.'));
+ $this->assertText(t('The username @name has not been activated or is blocked.', array('@name' => $name)), 'User cannot login yet.');
// Activate the new account.
$accounts = user_load_multiple(array(), array('name' => $name, 'mail' => $mail));
@@ -109,7 +109,7 @@ class UserRegistrationTest extends WebTestBase {
// Login after administrator approval.
$this->drupalPost('user/login', $auth, t('Log in'));
- $this->assertText(t('Member for'), t('User can log in after administrator approval.'));
+ $this->assertText(t('Member for'), 'User can log in after administrator approval.');
}
function testRegistrationEmailDuplicates() {
@@ -128,13 +128,13 @@ class UserRegistrationTest extends WebTestBase {
// Attempt to create a new account using an existing e-mail address.
$this->drupalPost('user/register', $edit, t('Create new account'));
- $this->assertText(t('The e-mail address @email is already registered.', array('@email' => $duplicate_user->mail)), t('Supplying an exact duplicate email address displays an error message'));
+ $this->assertText(t('The e-mail address @email is already registered.', array('@email' => $duplicate_user->mail)), 'Supplying an exact duplicate email address displays an error message');
// Attempt to bypass duplicate email registration validation by adding spaces.
$edit['mail'] = ' ' . $duplicate_user->mail . ' ';
$this->drupalPost('user/register', $edit, t('Create new account'));
- $this->assertText(t('The e-mail address @email is already registered.', array('@email' => $duplicate_user->mail)), t('Supplying a duplicate email address with added whitespace displays an error message'));
+ $this->assertText(t('The e-mail address @email is already registered.', array('@email' => $duplicate_user->mail)), 'Supplying a duplicate email address with added whitespace displays an error message');
}
function testRegistrationDefaultValues() {
@@ -151,7 +151,7 @@ class UserRegistrationTest extends WebTestBase {
// Check that the account information fieldset's options are not displayed
// is a fieldset if there is not more than one fieldset in the form.
$this->drupalGet('user/register');
- $this->assertNoRaw('