summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-09-14 19:05:06 +0000
committerDries Buytaert <dries@buytaert.net>2009-09-14 19:05:06 +0000
commit6ab2b28d57b913145d76e27b60ebdc9e0f49c871 (patch)
treeab7d99eeb725bef4ea9ebbb108f0543f5817de78
parent7e7edd8fb9168999bfecbfa023ecc7cb2efe7f43 (diff)
downloadbrdo-6ab2b28d57b913145d76e27b60ebdc9e0f49c871.tar.gz
brdo-6ab2b28d57b913145d76e27b60ebdc9e0f49c871.tar.bz2
- Patch #572564 by boombatower | Gábor Hojtsy: Fixed Assertion message generator double escapes data.
-rw-r--r--modules/simpletest/drupal_web_test_case.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index f9789fe2f..24b173251 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -902,7 +902,7 @@ class DrupalWebTestCase extends DrupalTestCase {
$role->name = $name;
user_role_save($role);
user_role_set_permissions($role->name, $permissions);
-
+
$this->assertTrue(isset($role->rid), t('Created role of name: @name, id: @rid', array('@name' => $name, '@rid' => (isset($role->rid) ? $role->rid : t('-n/a-')))), t('Role'));
if ($role && !empty($role->rid)) {
$count = db_query('SELECT COUNT(*) FROM {role_permission} WHERE rid = :rid', array(':rid' => $role->rid))->fetchField();
@@ -1969,7 +1969,7 @@ class DrupalWebTestCase extends DrupalTestCase {
*/
protected function assertRaw($raw, $message = '', $group = 'Other') {
if (!$message) {
- $message = t('Raw "@raw" found', array('@raw' => check_plain($raw)));
+ $message = t('Raw "@raw" found', array('@raw' => $raw));
}
return $this->assert(strpos($this->content, $raw) !== FALSE, $message, $group);
}
@@ -1989,7 +1989,7 @@ class DrupalWebTestCase extends DrupalTestCase {
*/
protected function assertNoRaw($raw, $message = '', $group = 'Other') {
if (!$message) {
- $message = t('Raw "@raw" not found', array('@raw' => check_plain($raw)));
+ $message = t('Raw "@raw" not found', array('@raw' => $raw));
}
return $this->assert(strpos($this->content, $raw) === FALSE, $message, $group);
}