diff options
author | David Rothstein <drothstein@gmail.com> | 2013-12-30 16:14:55 -0500 |
---|---|---|
committer | David Rothstein <drothstein@gmail.com> | 2013-12-30 16:14:55 -0500 |
commit | 25875f96defc2f138470895ed9d56d17c05f58cf (patch) | |
tree | b0addb40f5b876e437ede307d01ae40510a623aa | |
parent | 4ed2cfc39e1d5a00b67e4776b3ff22b9bc2aa937 (diff) | |
download | brdo-25875f96defc2f138470895ed9d56d17c05f58cf.tar.gz brdo-25875f96defc2f138470895ed9d56d17c05f58cf.tar.bz2 |
Issue #1798066 by boztek, dcam, larowlan | Anonymous: Clean up CommentTestBase::setCommentSettings().
-rw-r--r-- | modules/comment/comment.test | 32 | ||||
-rw-r--r-- | modules/rdf/rdf.test | 2 |
2 files changed, 17 insertions, 17 deletions
diff --git a/modules/comment/comment.test b/modules/comment/comment.test index 30bff7140..9e69ba628 100644 --- a/modules/comment/comment.test +++ b/modules/comment/comment.test @@ -155,7 +155,7 @@ class CommentHelperCase extends DrupalWebTestCase { $mode_text = 'required'; break; } - $this->setCommentSettings('comment_preview', $mode, 'Comment preview ' . $mode_text . '.'); + $this->setCommentSettings('comment_preview', $mode, format_string('Comment preview @mode_text.', array('@mode_text' => $mode_text))); } /** @@ -175,7 +175,7 @@ class CommentHelperCase extends DrupalWebTestCase { * Anonymous level. */ function setCommentAnonymous($level) { - $this->setCommentSettings('comment_anonymous', $level, 'Anonymous commenting set to level ' . $level . '.'); + $this->setCommentSettings('comment_anonymous', $level, format_string('Anonymous commenting set to level @level.', array('@level' => $level))); } /** @@ -185,7 +185,7 @@ class CommentHelperCase extends DrupalWebTestCase { * Comments per page value. */ function setCommentsPerPage($number) { - $this->setCommentSettings('comment_default_per_page', $number, 'Number of comments per page set to ' . $number . '.'); + $this->setCommentSettings('comment_default_per_page', $number, format_string('Number of comments per page set to @number.', array('@number' => $number))); } /** @@ -201,7 +201,7 @@ class CommentHelperCase extends DrupalWebTestCase { function setCommentSettings($name, $value, $message) { variable_set($name . '_article', $value); // Display status message. - $this->assertTrue(TRUE, $message); + $this->pass($message); } /** @@ -273,7 +273,7 @@ class CommentInterfaceTest extends CommentHelperCase { $this->setCommentPreview(DRUPAL_DISABLED); $this->setCommentForm(TRUE); $this->setCommentSubject(FALSE); - $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, t('Comment paging changed.')); + $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, 'Comment paging changed.'); $this->drupalLogout(); // Post comment #1 without subject or preview. @@ -583,7 +583,7 @@ class CommentInterfaceTest extends CommentHelperCase { $this->setCommentPreview(DRUPAL_DISABLED); $this->setCommentForm(TRUE); $this->setCommentSubject(FALSE); - $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, t('Comment paging changed.')); + $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, 'Comment paging changed.'); $this->drupalLogout(); // Creates a second user to post comments. @@ -954,7 +954,7 @@ class CommentPreviewTest extends CommentHelperCase { $this->setCommentPreview(DRUPAL_OPTIONAL); $this->setCommentForm(TRUE); $this->setCommentSubject(TRUE); - $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, t('Comment paging changed.')); + $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, 'Comment paging changed.'); $this->drupalLogout(); // Login as web user and add a signature and a user picture. @@ -1000,7 +1000,7 @@ class CommentPreviewTest extends CommentHelperCase { $this->setCommentPreview(DRUPAL_OPTIONAL); $this->setCommentForm(TRUE); $this->setCommentSubject(TRUE); - $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, t('Comment paging changed.')); + $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, 'Comment paging changed.'); $edit = array(); $edit['subject'] = $this->randomName(8); @@ -1238,7 +1238,7 @@ class CommentPagerTest extends CommentHelperCase { $comments[] = $this->postComment($node, $this->randomName(), $this->randomName(), TRUE); $comments[] = $this->postComment($node, $this->randomName(), $this->randomName(), TRUE); - $this->setCommentSettings('comment_default_mode', COMMENT_MODE_FLAT, t('Comment paging changed.')); + $this->setCommentSettings('comment_default_mode', COMMENT_MODE_FLAT, 'Comment paging changed.'); // Set comments to one per page so that we are able to test paging without // needing to insert large numbers of comments. @@ -1279,7 +1279,7 @@ class CommentPagerTest extends CommentHelperCase { // If we switch to threaded mode, the replies on the oldest comment // should be bumped to the first page and comment 6 should be bumped // to the second page. - $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, t('Switched to threaded mode.')); + $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, 'Switched to threaded mode.'); $this->drupalGet('node/' . $node->nid, array('query' => array('page' => 0))); $this->assertTrue($this->commentExists($reply, TRUE), 'In threaded mode, reply appears on page 1.'); $this->assertFalse($this->commentExists($comments[1]), 'In threaded mode, comment 2 has been bumped off of page 1.'); @@ -1339,7 +1339,7 @@ class CommentPagerTest extends CommentHelperCase { // - 2 // - 5 - $this->setCommentSettings('comment_default_mode', COMMENT_MODE_FLAT, t('Comment paging changed.')); + $this->setCommentSettings('comment_default_mode', COMMENT_MODE_FLAT, 'Comment paging changed.'); $expected_order = array( 0, @@ -1353,7 +1353,7 @@ class CommentPagerTest extends CommentHelperCase { $this->drupalGet('node/' . $node->nid); $this->assertCommentOrder($comments, $expected_order); - $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, t('Switched to threaded mode.')); + $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, 'Switched to threaded mode.'); $expected_order = array( 0, @@ -1435,7 +1435,7 @@ class CommentPagerTest extends CommentHelperCase { // - 2 // - 5 - $this->setCommentSettings('comment_default_mode', COMMENT_MODE_FLAT, t('Comment paging changed.')); + $this->setCommentSettings('comment_default_mode', COMMENT_MODE_FLAT, 'Comment paging changed.'); $expected_pages = array( 1 => 5, // Page of comment 5 @@ -1453,7 +1453,7 @@ class CommentPagerTest extends CommentHelperCase { $this->assertIdentical($expected_page, $returned_page, format_string('Flat mode, @new replies: expected page @expected, returned page @returned.', array('@new' => $new_replies, '@expected' => $expected_page, '@returned' => $returned_page))); } - $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, t('Switched to threaded mode.')); + $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, 'Switched to threaded mode.'); $expected_pages = array( 1 => 5, // Page of comment 5 @@ -1509,7 +1509,7 @@ class CommentNodeAccessTest extends CommentHelperCase { $this->setCommentPreview(DRUPAL_DISABLED); $this->setCommentForm(TRUE); $this->setCommentSubject(TRUE); - $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, t('Comment paging changed.')); + $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, 'Comment paging changed.'); $this->drupalLogout(); // Post comment. @@ -2126,7 +2126,7 @@ class CommentThreadingTestCase extends CommentHelperCase { $this->setCommentPreview(DRUPAL_DISABLED); $this->setCommentForm(TRUE); $this->setCommentSubject(TRUE); - $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, t('Comment paging changed.')); + $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, 'Comment paging changed.'); $this->drupalLogout(); // Create a node. diff --git a/modules/rdf/rdf.test b/modules/rdf/rdf.test index 0d1b023a4..370dbb256 100644 --- a/modules/rdf/rdf.test +++ b/modules/rdf/rdf.test @@ -441,7 +441,7 @@ class RdfCommentAttributesTestCase extends CommentHelperCase { $this->setCommentPreview(DRUPAL_OPTIONAL); $this->setCommentForm(TRUE); $this->setCommentSubject(TRUE); - $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, t('Comment paging changed.')); + $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, 'Comment paging changed.'); // Creates the nodes on which the test comments will be posted. $this->drupalLogin($this->web_user); |