diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
index 6370033..e67dd2a 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
@@ -315,7 +315,7 @@ protected function getAssertionCall() {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertTrue($value, $message = '', $group = 'Other') {
- return $this->assert((bool) $value, $message ? $message : t('Value @value is TRUE.', array('@value' => var_export($value, TRUE))), $group);
+ return $this->assert((bool) $value, $message ? $message : format_string('Value @value is TRUE.', array('@value' => var_export($value, TRUE))), $group);
}
/**
@@ -331,7 +331,7 @@ protected function assertTrue($value, $message = '', $group = 'Other') {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertFalse($value, $message = '', $group = 'Other') {
- return $this->assert(!$value, $message ? $message : t('Value @value is FALSE.', array('@value' => var_export($value, TRUE))), $group);
+ return $this->assert(!$value, $message ? $message : format_string('Value @value is FALSE.', array('@value' => var_export($value, TRUE))), $group);
}
/**
@@ -347,7 +347,7 @@ protected function assertFalse($value, $message = '', $group = 'Other') {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertNull($value, $message = '', $group = 'Other') {
- return $this->assert(!isset($value), $message ? $message : t('Value @value is NULL.', array('@value' => var_export($value, TRUE))), $group);
+ return $this->assert(!isset($value), $message ? $message : format_string('Value @value is NULL.', array('@value' => var_export($value, TRUE))), $group);
}
/**
@@ -363,7 +363,7 @@ protected function assertNull($value, $message = '', $group = 'Other') {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertNotNull($value, $message = '', $group = 'Other') {
- return $this->assert(isset($value), $message ? $message : t('Value @value is not NULL.', array('@value' => var_export($value, TRUE))), $group);
+ return $this->assert(isset($value), $message ? $message : format_string('Value @value is not NULL.', array('@value' => var_export($value, TRUE))), $group);
}
/**
@@ -381,7 +381,7 @@ protected function assertNotNull($value, $message = '', $group = 'Other') {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertEqual($first, $second, $message = '', $group = 'Other') {
- return $this->assert($first == $second, $message ? $message : t('Value @first is equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
+ return $this->assert($first == $second, $message ? $message : format_string('Value @first is equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
}
/**
@@ -399,7 +399,7 @@ protected function assertEqual($first, $second, $message = '', $group = 'Other')
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertNotEqual($first, $second, $message = '', $group = 'Other') {
- return $this->assert($first != $second, $message ? $message : t('Value @first is not equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
+ return $this->assert($first != $second, $message ? $message : format_string('Value @first is not equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
}
/**
@@ -417,7 +417,7 @@ protected function assertNotEqual($first, $second, $message = '', $group = 'Othe
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertIdentical($first, $second, $message = '', $group = 'Other') {
- return $this->assert($first === $second, $message ? $message : t('Value @first is identical to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
+ return $this->assert($first === $second, $message ? $message : format_string('Value @first is identical to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
}
/**
@@ -435,7 +435,7 @@ protected function assertIdentical($first, $second, $message = '', $group = 'Oth
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertNotIdentical($first, $second, $message = '', $group = 'Other') {
- return $this->assert($first !== $second, $message ? $message : t('Value @first is not identical to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
+ return $this->assert($first !== $second, $message ? $message : format_string('Value @first is not identical to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE))), $group);
}
/**
@@ -511,7 +511,7 @@ protected function verbose($message) {
$url = file_create_url($this->originalFileDirectory . '/simpletest/verbose/' . $this->verboseClassName . '-' . $this->verboseId . '.html');
// Not using l() to avoid invoking the theme system, so that unit tests
// can use verbose() as well.
- $url = '' . t('Verbose message') . '';
+ $url = '' . 'Verbose message' . '';
$this->error($url, 'User notice');
}
$this->verboseId++;
@@ -580,7 +580,7 @@ public function run(array $methods = array()) {
'line' => $method_info->getStartLine(),
'function' => $class . '->' . $method . '()',
);
- $completion_check_id = TestBase::insertAssert($this->testId, $class, FALSE, t('The test did not complete due to a fatal error.'), 'Completion check', $caller);
+ $completion_check_id = TestBase::insertAssert($this->testId, $class, FALSE, 'The test did not complete due to a fatal error.', 'Completion check', $caller);
$this->setUp();
if ($this->setup) {
try {
@@ -797,7 +797,7 @@ protected function tearDown() {
$emailCount = count(variable_get('drupal_test_email_collector', array()));
if ($emailCount) {
$message = format_plural($emailCount, '1 e-mail was sent during this test.', '@count e-mails were sent during this test.');
- $this->pass($message, t('E-mail'));
+ $this->pass($message, 'E-mail');
}
// Delete temporary files directory.
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index 24bf1f2..d95ec5b 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -289,7 +289,7 @@ protected function drupalCreateContentType($settings = array()) {
menu_router_rebuild();
node_add_body_field($type);
- $this->assertEqual($saved_type, SAVED_NEW, t('Created content type %type.', array('%type' => $type->type)));
+ $this->assertEqual($saved_type, SAVED_NEW, format_string('Created content type %type.', array('%type' => $type->type)));
// Reset permissions so that permissions for this content type are available.
$this->checkPermissions(array(), TRUE);
@@ -401,7 +401,7 @@ protected function drupalCreateUser(array $permissions = array()) {
$account = entity_create('user', $edit);
$account->save();
- $this->assertTrue(!empty($account->uid), t('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), t('User login'));
+ $this->assertTrue(!empty($account->uid), format_string('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), 'User login');
if (empty($account->uid)) {
return FALSE;
}
@@ -445,10 +445,10 @@ protected function drupalCreateRole(array $permissions, $rid = NULL, $name = NUL
$role->name = $name;
$result = user_role_save($role);
- $this->assertIdentical($result, SAVED_NEW, t('Created role ID @rid with name @name.', array(
+ $this->assertIdentical($result, SAVED_NEW, format_string('Created role ID @rid with name @name.', array(
'@name' => var_export($role->name, TRUE),
'@rid' => var_export($role->rid, TRUE),
- )), t('Role'));
+ )), 'Role');
if ($result === SAVED_NEW) {
// Grant the specified permissions to the role, if any.
@@ -458,10 +458,10 @@ protected function drupalCreateRole(array $permissions, $rid = NULL, $name = NUL
$assigned_permissions = db_query('SELECT permission FROM {role_permission} WHERE rid = :rid', array(':rid' => $role->rid))->fetchCol();
$missing_permissions = array_diff($permissions, $assigned_permissions);
if (!$missing_permissions) {
- $this->pass(t('Created permissions: @perms', array('@perms' => implode(', ', $permissions))), t('Role'));
+ $this->pass(format_string('Created permissions: @perms', array('@perms' => implode(', ', $permissions))), 'Role');
}
else {
- $this->fail(t('Failed to create permissions: @perms', array('@perms' => implode(', ', $missing_permissions))), t('Role'));
+ $this->fail(format_string('Failed to create permissions: @perms', array('@perms' => implode(', ', $missing_permissions))), 'Role');
}
}
return $role->rid;
@@ -491,7 +491,7 @@ protected function checkPermissions(array $permissions, $reset = FALSE) {
$valid = TRUE;
foreach ($permissions as $permission) {
if (!in_array($permission, $available)) {
- $this->fail(t('Invalid permission %permission.', array('%permission' => $permission)), t('Role'));
+ $this->fail(format_string('Invalid permission %permission.', array('%permission' => $permission)), 'Role');
$valid = FALSE;
}
}
@@ -538,7 +538,7 @@ protected function drupalLogin($user) {
// If a "log out" link appears on the page, it is almost certainly because
// the login was successful.
- $pass = $this->assertLink(t('Log out'), 0, t('User %name successfully logged in.', array('%name' => $user->name)), t('User login'));
+ $pass = $this->assertLink(t('Log out'), 0, format_string('User %name successfully logged in.', array('%name' => $user->name)), 'User login');
if ($pass) {
$this->loggedInUser = $user;
@@ -561,9 +561,9 @@ protected function drupalLogout() {
// idea being if you were properly logged out you should be seeing a login
// screen.
$this->drupalGet('user/logout', array('query' => array('destination' => 'user')));
- $this->assertResponse(200, t('User was logged out.'));
- $pass = $this->assertField('name', t('Username field found.'), t('Logout'));
- $pass = $pass && $this->assertField('pass', t('Password field found.'), t('Logout'));
+ $this->assertResponse(200, 'User was logged out.');
+ $pass = $this->assertField('name', 'Username field found.', 'Logout');
+ $pass = $pass && $this->assertField('pass', 'Password field found.', 'Logout');
if ($pass) {
$this->loggedInUser = FALSE;
@@ -715,7 +715,7 @@ protected function setUp() {
}
if ($modules) {
$success = module_enable($modules, TRUE);
- $this->assertTrue($success, t('Enabled modules: %modules', array('%modules' => implode(', ', $modules))));
+ $this->assertTrue($success, format_string('Enabled modules: %modules', array('%modules' => implode(', ', $modules))));
}
// Create a new DrupalKernel for testing purposes, now that all required
@@ -955,8 +955,8 @@ protected function curlExec($curl_options, $redirect = FALSE) {
'@status' => $status,
'!length' => format_size(strlen($this->drupalGetContent()))
);
- $message = t('!method @url returned @status (!length).', $message_vars);
- $this->assertTrue($this->drupalGetContent() !== FALSE, $message, t('Browser'));
+ $message = format_string('!method @url returned @status (!length).', $message_vars);
+ $this->assertTrue($this->drupalGetContent() !== FALSE, $message, 'Browser');
return $this->drupalGetContent();
}
@@ -1033,14 +1033,14 @@ protected function parse() {
$htmlDom = new DOMDocument();
@$htmlDom->loadHTML('' . $this->drupalGetContent());
if ($htmlDom) {
- $this->pass(t('Valid HTML found on "@path"', array('@path' => $this->getUrl())), t('Browser'));
+ $this->pass(format_string('Valid HTML found on "@path"', array('@path' => $this->getUrl())), 'Browser');
// It's much easier to work with simplexml than DOM, luckily enough
// we can just simply import our DOM tree.
$this->elements = simplexml_import_dom($htmlDom);
}
}
if (!$this->elements) {
- $this->fail(t('Parsed page successfully.'), t('Browser'));
+ $this->fail(format_string('Parsed page successfully.'), 'Browser');
}
return $this->elements;
@@ -1234,9 +1234,9 @@ protected function drupalPost($path, $edit, $submit, array $options = array(), a
$this->fail(t('Failed to set field @name to @value', array('@name' => $name, '@value' => $value)));
}
if (!$ajax && isset($submit)) {
- $this->assertTrue($submit_matches, t('Found the @submit button', array('@submit' => $submit)));
+ $this->assertTrue($submit_matches, format_string('Found the @submit button', array('@submit' => $submit)));
}
- $this->fail(t('Found the requested form fields at @path', array('@path' => $path)));
+ $this->fail(format_string('Found the requested form fields at @path', array('@path' => $path)));
}
}
@@ -1745,7 +1745,7 @@ protected function getAllOptions(SimpleXMLElement $element) {
*/
protected function assertLink($label, $index = 0, $message = '', $group = 'Other') {
$links = $this->xpath('//a[normalize-space(text())=:label]', array(':label' => $label));
- $message = ($message ? $message : t('Link with label %label found.', array('%label' => $label)));
+ $message = ($message ? $message : format_string('Link with label %label found.', array('%label' => $label)));
return $this->assert(isset($links[$index]), $message, $group);
}
@@ -1765,7 +1765,7 @@ protected function assertLink($label, $index = 0, $message = '', $group = 'Other
*/
protected function assertNoLink($label, $message = '', $group = 'Other') {
$links = $this->xpath('//a[normalize-space(text())=:label]', array(':label' => $label));
- $message = ($message ? $message : t('Link with label %label not found.', array('%label' => $label)));
+ $message = ($message ? $message : format_string('Link with label %label not found.', array('%label' => $label)));
return $this->assert(empty($links), $message, $group);
}
@@ -1786,7 +1786,7 @@ protected function assertNoLink($label, $message = '', $group = 'Other') {
*/
protected function assertLinkByHref($href, $index = 0, $message = '', $group = 'Other') {
$links = $this->xpath('//a[contains(@href, :href)]', array(':href' => $href));
- $message = ($message ? $message : t('Link containing href %href found.', array('%href' => $href)));
+ $message = ($message ? $message : format_string('Link containing href %href found.', array('%href' => $href)));
return $this->assert(isset($links[$index]), $message, $group);
}
@@ -1805,7 +1805,7 @@ protected function assertLinkByHref($href, $index = 0, $message = '', $group = '
*/
protected function assertNoLinkByHref($href, $message = '', $group = 'Other') {
$links = $this->xpath('//a[contains(@href, :href)]', array(':href' => $href));
- $message = ($message ? $message : t('No link containing href %href found.', array('%href' => $href)));
+ $message = ($message ? $message : format_string('No link containing href %href found.', array('%href' => $href)));
return $this->assert(empty($links), $message, $group);
}
@@ -1832,7 +1832,7 @@ protected function clickLink($label, $index = 0) {
$url_target = $this->getAbsoluteUrl($urls[$index]['href']);
}
- $this->assertTrue(isset($urls[$index]), t('Clicked link %label (@url_target) from @url_before', array('%label' => $label, '@url_target' => $url_target, '@url_before' => $url_before)), t('Browser'));
+ $this->assertTrue(isset($urls[$index]), format_string('Clicked link %label (@url_target) from @url_before', array('%label' => $label, '@url_target' => $url_target, '@url_before' => $url_before)), 'Browser');
if (isset($url_target)) {
return $this->drupalGet($url_target);
@@ -2067,7 +2067,7 @@ protected function createTypedData($definition, $value = NULL, $context = array(
*/
protected function assertUrl($path, array $options = array(), $message = '', $group = 'Other') {
if (!$message) {
- $message = t('Current URL is @url.', array(
+ $message = format_string('Current URL is @url.', array(
'@url' => var_export(url($path, $options), TRUE),
));
}
@@ -2090,7 +2090,7 @@ protected function assertUrl($path, array $options = array(), $message = '', $gr
*/
protected function assertRaw($raw, $message = '', $group = 'Other') {
if (!$message) {
- $message = t('Raw "@raw" found', array('@raw' => $raw));
+ $message = format_string('Raw "@raw" found', array('@raw' => $raw));
}
return $this->assert(strpos($this->drupalGetContent(), $raw) !== FALSE, $message, $group);
}
@@ -2110,7 +2110,7 @@ protected function assertRaw($raw, $message = '', $group = 'Other') {
*/
protected function assertNoRaw($raw, $message = '', $group = 'Other') {
if (!$message) {
- $message = t('Raw "@raw" not found', array('@raw' => $raw));
+ $message = format_string('Raw "@raw" not found', array('@raw' => $raw));
}
return $this->assert(strpos($this->drupalGetContent(), $raw) === FALSE, $message, $group);
}
@@ -2172,7 +2172,7 @@ protected function assertTextHelper($text, $message = '', $group, $not_exists) {
$this->plainTextContent = filter_xss($this->drupalGetContent(), array());
}
if (!$message) {
- $message = !$not_exists ? t('"@text" found', array('@text' => $text)) : t('"@text" not found', array('@text' => $text));
+ $message = !$not_exists ? format_string('"@text" found', array('@text' => $text)) : format_string('"@text" not found', array('@text' => $text));
}
return $this->assert($not_exists == (strpos($this->plainTextContent, $text) === FALSE), $message, $group);
}
@@ -2263,7 +2263,7 @@ protected function assertUniqueTextHelper($text, $message = '', $group, $be_uniq
*/
protected function assertPattern($pattern, $message = '', $group = 'Other') {
if (!$message) {
- $message = t('Pattern "@pattern" found', array('@pattern' => $pattern));
+ $message = format_string('Pattern "@pattern" found', array('@pattern' => $pattern));
}
return $this->assert((bool) preg_match($pattern, $this->drupalGetContent()), $message, $group);
}
@@ -2282,7 +2282,7 @@ protected function assertPattern($pattern, $message = '', $group = 'Other') {
*/
protected function assertNoPattern($pattern, $message = '', $group = 'Other') {
if (!$message) {
- $message = t('Pattern "@pattern" not found', array('@pattern' => $pattern));
+ $message = format_string('Pattern "@pattern" not found', array('@pattern' => $pattern));
}
return $this->assert(!preg_match($pattern, $this->drupalGetContent()), $message, $group);
}
@@ -2302,7 +2302,7 @@ protected function assertNoPattern($pattern, $message = '', $group = 'Other') {
protected function assertTitle($title, $message = '', $group = 'Other') {
$actual = (string) current($this->xpath('//title'));
if (!$message) {
- $message = t('Page title @actual is equal to @expected.', array(
+ $message = format_string('Page title @actual is equal to @expected.', array(
'@actual' => var_export($actual, TRUE),
'@expected' => var_export($title, TRUE),
));
@@ -2325,7 +2325,7 @@ protected function assertTitle($title, $message = '', $group = 'Other') {
protected function assertNoTitle($title, $message = '', $group = 'Other') {
$actual = (string) current($this->xpath('//title'));
if (!$message) {
- $message = t('Page title @actual is not equal to @unexpected.', array(
+ $message = format_string('Page title @actual is not equal to @unexpected.', array(
'@actual' => var_export($actual, TRUE),
'@unexpected' => var_export($title, TRUE),
));
@@ -2485,18 +2485,18 @@ protected function assertNoFieldByXPath($xpath, $value = NULL, $message = '', $g
protected function assertFieldByName($name, $value = NULL, $message = NULL) {
if (!isset($message)) {
if (!isset($value)) {
- $message = t('Found field with name @name', array(
+ $message = format_string('Found field with name @name', array(
'@name' => var_export($name, TRUE),
));
}
else {
- $message = t('Found field with name @name and value @value', array(
+ $message = format_string('Found field with name @name and value @value', array(
'@name' => var_export($name, TRUE),
'@value' => var_export($value, TRUE),
));
}
}
- return $this->assertFieldByXPath($this->constructFieldXpath('name', $name), $value, $message, t('Browser'));
+ return $this->assertFieldByXPath($this->constructFieldXpath('name', $name), $value, $message, 'Browser');
}
/**
@@ -2514,7 +2514,7 @@ protected function assertFieldByName($name, $value = NULL, $message = NULL) {
* TRUE on pass, FALSE on fail.
*/
protected function assertNoFieldByName($name, $value = '', $message = '') {
- return $this->assertNoFieldByXPath($this->constructFieldXpath('name', $name), $value, $message ? $message : t('Did not find field by name @name', array('@name' => $name)), t('Browser'));
+ return $this->assertNoFieldByXPath($this->constructFieldXpath('name', $name), $value, $message ? $message : format_string('Did not find field by name @name', array('@name' => $name)), 'Browser');
}
/**
@@ -2532,7 +2532,7 @@ protected function assertNoFieldByName($name, $value = '', $message = '') {
* TRUE on pass, FALSE on fail.
*/
protected function assertFieldById($id, $value = '', $message = '') {
- return $this->assertFieldByXPath($this->constructFieldXpath('id', $id), $value, $message ? $message : t('Found field by id @id', array('@id' => $id)), t('Browser'));
+ return $this->assertFieldByXPath($this->constructFieldXpath('id', $id), $value, $message ? $message : format_string('Found field by id @id', array('@id' => $id)), 'Browser');
}
/**
@@ -2550,7 +2550,7 @@ protected function assertFieldById($id, $value = '', $message = '') {
* TRUE on pass, FALSE on fail.
*/
protected function assertNoFieldById($id, $value = '', $message = '') {
- return $this->assertNoFieldByXPath($this->constructFieldXpath('id', $id), $value, $message ? $message : t('Did not find field by id @id', array('@id' => $id)), t('Browser'));
+ return $this->assertNoFieldByXPath($this->constructFieldXpath('id', $id), $value, $message ? $message : format_string('Did not find field by id @id', array('@id' => $id)), 'Browser');
}
/**
@@ -2565,7 +2565,7 @@ protected function assertNoFieldById($id, $value = '', $message = '') {
*/
protected function assertFieldChecked($id, $message = '') {
$elements = $this->xpath('//input[@id=:id]', array(':id' => $id));
- return $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), $message ? $message : t('Checkbox field @id is checked.', array('@id' => $id)), t('Browser'));
+ return $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), $message ? $message : format_string('Checkbox field @id is checked.', array('@id' => $id)), 'Browser');
}
/**
@@ -2580,7 +2580,7 @@ protected function assertFieldChecked($id, $message = '') {
*/
protected function assertNoFieldChecked($id, $message = '') {
$elements = $this->xpath('//input[@id=:id]', array(':id' => $id));
- return $this->assertTrue(isset($elements[0]) && empty($elements[0]['checked']), $message ? $message : t('Checkbox field @id is not checked.', array('@id' => $id)), t('Browser'));
+ return $this->assertTrue(isset($elements[0]) && empty($elements[0]['checked']), $message ? $message : format_string('Checkbox field @id is not checked.', array('@id' => $id)), 'Browser');
}
/**
@@ -2597,7 +2597,7 @@ protected function assertNoFieldChecked($id, $message = '') {
*/
protected function assertOption($id, $option, $message = '') {
$options = $this->xpath('//select[@id=:id]/option[@value=:option]', array(':id' => $id, ':option' => $option));
- return $this->assertTrue(isset($options[0]), $message ? $message : t('Option @option for field @id exists.', array('@option' => $option, '@id' => $id)), t('Browser'));
+ return $this->assertTrue(isset($options[0]), $message ? $message : format_string('Option @option for field @id exists.', array('@option' => $option, '@id' => $id)), 'Browser');
}
/**
@@ -2615,7 +2615,7 @@ protected function assertOption($id, $option, $message = '') {
protected function assertNoOption($id, $option, $message = '') {
$selects = $this->xpath('//select[@id=:id]', array(':id' => $id));
$options = $this->xpath('//select[@id=:id]/option[@value=:option]', array(':id' => $id, ':option' => $option));
- return $this->assertTrue(isset($selects[0]) && !isset($options[0]), $message ? $message : t('Option @option for field @id does not exist.', array('@option' => $option, '@id' => $id)), t('Browser'));
+ return $this->assertTrue(isset($selects[0]) && !isset($options[0]), $message ? $message : format_string('Option @option for field @id does not exist.', array('@option' => $option, '@id' => $id)), 'Browser');
}
/**
@@ -2634,7 +2634,7 @@ protected function assertNoOption($id, $option, $message = '') {
*/
protected function assertOptionSelected($id, $option, $message = '') {
$elements = $this->xpath('//select[@id=:id]//option[@value=:option]', array(':id' => $id, ':option' => $option));
- return $this->assertTrue(isset($elements[0]) && !empty($elements[0]['selected']), $message ? $message : t('Option @option for field @id is selected.', array('@option' => $option, '@id' => $id)), t('Browser'));
+ return $this->assertTrue(isset($elements[0]) && !empty($elements[0]['selected']), $message ? $message : format_string('Option @option for field @id is selected.', array('@option' => $option, '@id' => $id)), 'Browser');
}
/**
@@ -2651,7 +2651,7 @@ protected function assertOptionSelected($id, $option, $message = '') {
*/
protected function assertNoOptionSelected($id, $option, $message = '') {
$elements = $this->xpath('//select[@id=:id]//option[@value=:option]', array(':id' => $id, ':option' => $option));
- return $this->assertTrue(isset($elements[0]) && empty($elements[0]['selected']), $message ? $message : t('Option @option for field @id is not selected.', array('@option' => $option, '@id' => $id)), t('Browser'));
+ return $this->assertTrue(isset($elements[0]) && empty($elements[0]['selected']), $message ? $message : format_string('Option @option for field @id is not selected.', array('@option' => $option, '@id' => $id)), 'Browser');
}
/**
@@ -2745,7 +2745,7 @@ protected function constructFieldXpath($attribute, $value) {
protected function assertResponse($code, $message = '') {
$curl_code = curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE);
$match = is_array($code) ? in_array($curl_code, $code) : $curl_code == $code;
- return $this->assertTrue($match, $message ? $message : t('HTTP response expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), t('Browser'));
+ return $this->assertTrue($match, $message ? $message : format_string('HTTP response expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), 'Browser');
}
/**
@@ -2763,7 +2763,7 @@ protected function assertResponse($code, $message = '') {
protected function assertNoResponse($code, $message = '') {
$curl_code = curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE);
$match = is_array($code) ? in_array($curl_code, $code) : $curl_code == $code;
- return $this->assertFalse($match, $message ? $message : t('HTTP response not expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), t('Browser'));
+ return $this->assertFalse($match, $message ? $message : format_string('HTTP response not expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), 'Browser');
}
/**
@@ -2784,7 +2784,7 @@ protected function assertNoResponse($code, $message = '') {
protected function assertMail($name, $value = '', $message = '') {
$captured_emails = variable_get('drupal_test_email_collector', array());
$email = end($captured_emails);
- return $this->assertTrue($email && isset($email[$name]) && $email[$name] == $value, $message, t('E-mail'));
+ return $this->assertTrue($email && isset($email[$name]) && $email[$name] == $value, $message, 'E-mail');
}
/**
@@ -2814,7 +2814,7 @@ protected function assertMailString($field_name, $string, $email_depth) {
break;
}
}
- return $this->assertTrue($string_found, t('Expected text found in @field of email message: "@expected".', array('@field' => $field_name, '@expected' => $string)));
+ return $this->assertTrue($string_found, format_string('Expected text found in @field of email message: "@expected".', array('@field' => $field_name, '@expected' => $string)));
}
/**
@@ -2832,7 +2832,7 @@ protected function assertMailPattern($field_name, $regex, $message) {
$mails = $this->drupalGetMails();
$mail = end($mails);
$regex_found = preg_match("/$regex/", $mail[$field_name]);
- return $this->assertTrue($regex_found, t('Expected text found in @field of email message: "@expected".', array('@field' => $field_name, '@expected' => $regex)));
+ return $this->assertTrue($regex_found, format_string('Expected text found in @field of email message: "@expected".', array('@field' => $field_name, '@expected' => $regex)));
}
/**