<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[27055] trunk: Add Unit Tests for `get_comment_pages_count()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27055">27055</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-01-29 05:16:58 +0000 (Wed, 29 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add Unit Tests for `get_comment_pages_count()`. Fix a notice caused when `$wp_query->comments` is not set in that function.
Props mdbitz, markjaquith.
Fixes <a href="http://core.trac.wordpress.org/ticket/20633">#20633</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestscommentgetCommentsPagesCountphp">trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/comment.php (27054 => 27055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/comment.php 2014-01-29 04:44:31 UTC (rev 27054)
+++ trunk/src/wp-includes/comment.php 2014-01-29 05:16:58 UTC (rev 27055)
</span><span class="lines">@@ -909,7 +909,7 @@
</span><span class="cx"> if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) )
</span><span class="cx"> return $wp_query->max_num_comment_pages;
</span><span class="cx">
</span><del>- if ( !$comments || !is_array($comments) )
</del><ins>+ if ( ( ! $comments || ! is_array( $comments ) ) && ! empty( $wp_query->comments ) )
</ins><span class="cx"> $comments = $wp_query->comments;
</span><span class="cx">
</span><span class="cx"> if ( empty($comments) )
</span></span></pre></div>
<a id="trunktestsphpunittestscommentgetCommentsPagesCountphp"></a>
<div class="addfile"><h4>Added: trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php (0 => 27055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php (rev 0)
+++ trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php 2014-01-29 05:16:58 UTC (rev 27055)
</span><span class="lines">@@ -0,0 +1,170 @@
</span><ins>+<?php
+/**
+ * Validate the logic of get_comments_pages_count
+ * @group comment
+ */
+class Tests_Comment_GetCommentsPagesCount extends WP_UnitTestCase {
+ protected $option_page_comments;
+ protected $option_comments_per_page;
+ protected $option_thread_comments;
+ protected $option_posts_per_rss;
+
+ /**
+ * setUp options
+ */
+ function setUp() {
+ parent::setUp();
+ $this->option_page_comments = get_option( 'page_comments' );
+ $this->option_page_comments = get_option( 'comments_per_page' );
+ $this->option_page_comments = get_option( 'thread_comments' );
+ $this->option_posts_per_rss = get_option( 'posts_per_rss' );
+
+ update_option( 'page_comments', true );
+ }
+
+ /**
+ * tearDown options
+ */
+ function tearDown() {
+ parent::tearDown();
+ update_option( 'page_comments', $this->option_page_comments );
+ update_option( 'comments_per_page', $this->option_page_comments );
+ update_option( 'thread_comments', $this->option_page_comments );
+ update_option( 'posts_per_rss', $this->option_posts_per_rss );
+ }
+
+ /**
+ * Validate get_comments_pages_count for empty comments
+ */
+ function test_empty() {
+ //setup post and comments
+ $post_id = $this->factory->post->create( array( 'post_title' => 'comment--post', 'post_type' => 'post' ) );
+ $this->go_to( '/?p=' . $post_id );
+
+ global $wp_query;
+ unset( $wp_query->comments );
+
+ $comments = get_comments( array( 'post_id' => $post_id ) );
+
+ $this->assertEquals( 0, get_comment_pages_count( $comments, 10, false ) );
+ $this->assertEquals( 0, get_comment_pages_count( $comments, 1, false ) );
+ $this->assertEquals( 0, get_comment_pages_count( $comments, 0, false ) );
+ $this->assertEquals( 0, get_comment_pages_count( $comments, 10, true ) );
+ $this->assertEquals( 0, get_comment_pages_count( $comments, 5 ) );
+ $this->assertEquals( 0, get_comment_pages_count( $comments ) );
+ $this->assertequals( 0, get_comment_pages_count( null, 1 ) );
+ }
+
+ /**
+ * Validate get_comments_pages_count for treaded comments
+ */
+ function test_threaded_comments( ) {
+ //setup post and comments
+ $post = $this->factory->post->create_and_get( array( 'post_title' => 'comment--post', 'post_type' => 'post' ) );
+ $comments = $this->factory->comment->create_post_comments( $post->ID, 15 );
+ $this->factory->comment->create_post_comments( $post->ID, 6, array( 'comment_parent' => $comments[0] ) );
+ $comments = get_comments( array( 'post_id' => $post->ID ) );
+
+ $this->assertEquals( 3, get_comment_pages_count( $comments, 10, false ) );
+ $this->assertEquals( 2, get_comment_pages_count( $comments, 10, true ) );
+ $this->assertEquals( 4, get_comment_pages_count( $comments, 4, true ) );
+ }
+
+ /**
+ * Validate get_comments_pages_count for option page_comments
+ */
+ function test_option_page_comments() {
+ //setup post and comments
+ $post = $this->factory->post->create_and_get( array( 'post_title' => 'comment--post', 'post_type' => 'post' ) );
+ $comments = $this->factory->comment->create_post_comments( $post->ID, 15 );
+
+ // comment paging disabled
+ update_option( 'page_comments', false );
+
+ $this->assertEquals( 1, get_comment_pages_count( $comments, 10, false ) );
+ $this->assertEquals( 1, get_comment_pages_count( $comments, 0, true ) );
+ $this->assertEquals( 1, get_comment_pages_count( $comments, 2, true ) );
+
+ // comment paging enabled
+ update_option( 'page_comments', true );
+
+ $this->assertEquals( 2, get_comment_pages_count( $comments, 10, false ) );
+ $this->assertEquals( 3, get_comment_pages_count( $comments, 5, false ) );
+ }
+
+ /**
+ * Validate get_comments_pages_count for option tread_comments
+ */
+ function test_option_thread_comments() {
+
+ //setup post and comments
+ $post = $this->factory->post->create_and_get( array( 'post_title' => 'comment--post', 'post_type' => 'post' ) );
+ $comments = $this->factory->comment->create_post_comments( $post->ID, 15 );
+ $this->factory->comment->create_post_comments( $post->ID, 6, array('comment_parent' => $comments[0] ) );
+ $comments = get_comments( array( 'post_id' => $post->ID ) );
+
+ update_option( 'thread_comments', false );
+
+ $this->assertEquals( 3, get_comment_pages_count( $comments, 10, false ) );
+ $this->assertEquals( 2, get_comment_pages_count( $comments, 10, true ) );
+ $this->assertEquals( 3, get_comment_pages_count( $comments, 10, null ) );
+ $this->assertEquals( 3, get_comment_pages_count( $comments, 10 ) );
+
+ update_option( 'thread_comments', true );
+
+ $this->assertEquals( 3, get_comment_pages_count( $comments, 10, false ) );
+ $this->assertEquals( 2, get_comment_pages_count( $comments, 10, true ) );
+ $this->assertEquals( 2, get_comment_pages_count( $comments, 10, null ) );
+ $this->assertEquals( 2, get_comment_pages_count( $comments, 10 ) );
+ }
+
+ /**
+ * Validate $wp_query logic of get_comment_pages_count
+ */
+ function test_wp_query_comments_per_page() {
+ global $wp_query;
+
+ update_option( 'posts_per_rss', 100 );
+
+ $post = $this->factory->post->create_and_get( array( 'post_title' => 'comment-post', 'post_type' => 'post' ) );
+ $comments = $this->factory->comment->create_post_comments( $post->ID, 25 );
+
+ $wp_query = new WP_Query( array( 'p' => $post->ID, 'comments_per_page' => 10, 'feed' =>'comments-' ) );
+
+ update_option( 'comments_per_page', 25 );
+
+ $this->assertEquals( 3, get_comment_pages_count() );
+ $this->assertEquals( 2, get_comment_pages_count( null, 20 ) );
+
+ $wp_query = new WP_Query( array( 'p' => $post->ID,'comments_per_page' => null, 'feed' =>'comments-' ) );
+
+ $this->assertEquals( 1, get_comment_pages_count() );
+ $this->assertEquals( 5, get_comment_pages_count( null, 5 ) );
+
+ $wp_query->query_vars['comments_per_page'] = null;
+
+ update_option( 'comments_per_page', 5 );
+
+ $this->assertEquals( 5, get_comment_pages_count() );
+ $this->assertEquals( 3, get_comment_pages_count( null, 11 ) );
+ $this->assertEquals( 5, get_comment_pages_count( null, 0 ) );
+ }
+
+ /**
+ * Validate max_num_comment_pages logic of get_comment_pages_count
+ */
+ function test_max_num_comment_pages() {
+ global $wp_query;
+ $wp_query = new WP_Query();
+
+ $org_max_num_comment_pages = $wp_query->max_num_comment_pages;
+
+ $wp_query->max_num_comment_pages = 7;
+
+ $this->assertEquals( 7, get_comment_pages_count() );
+ $this->assertEquals( 7, get_comment_pages_count( null, null, null ) );
+ $this->assertEquals( 0, get_comment_pages_count( array(), null, null ) );
+
+ $wp_query->max_num_comment_pages = $org_max_num_comment_pages;
+ }
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>