<!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>[34713] trunk/tests/phpunit/tests/comment/commentsTemplate.php: Fix logical errors in some comment pagination tests.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/34713">34713</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/34713","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-30 03:06:22 +0000 (Wed, 30 Sep 2015)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Fix logical errors in some comment pagination tests.

The tests included in <a href="https://core.trac.wordpress.org/changeset/34669">[34669]</a> contained a couple of problems:

* Comments were not always created in the expected order, due to the incorrect use of 'comment_date_gmt'.
* 'asc'/'desc' and 'older'/'newer' were confused.
* 'default_comments_page=newest' ('last') didn't properly account for the cpage=1 offset.

The code itself powering this pagination was correct; it's only the tests that
were wrong.

See <a href="https://core.trac.wordpress.org/ticket/8071">#8071</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestscommentcommentsTemplatephp">trunk/tests/phpunit/tests/comment/commentsTemplate.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestscommentcommentsTemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment/commentsTemplate.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/commentsTemplate.php    2015-09-30 02:41:49 UTC (rev 34712)
+++ trunk/tests/phpunit/tests/comment/commentsTemplate.php      2015-09-30 03:06:22 UTC (rev 34713)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,12 +15,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_1 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_2 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'comment_order', 'asc' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $comments = preg_match_all( '/id="comment-([0-9]+)"/', $found, $matches );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $found_cids = array_map( 'intval', $matches[1] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( array( $comment_1, $comment_2 ), $found_cids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $comment_2, $comment_1 ), $found_cids );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,12 +45,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_1 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_2 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'comment_order', 'desc' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $comments = preg_match_all( '/id="comment-([0-9]+)"/', $found, $matches );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $found_cids = array_map( 'intval', $matches[1] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( array( $comment_2, $comment_1 ), $found_cids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $comment_1, $comment_2 ), $found_cids );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,12 +75,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_1 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_2 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'comment_order', 'asc' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $comments = preg_match_all( '/id="comment-([0-9]+)"/', $found, $matches );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $found_cids = array_map( 'intval', $matches[1] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( array( $comment_1, $comment_2 ), $found_cids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $comment_2, $comment_1 ), $found_cids );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,12 +105,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_1 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_2 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'comment_order', 'desc' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $comments = preg_match_all( '/id="comment-([0-9]+)"/', $found, $matches );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $found_cids = array_map( 'intval', $matches[1] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( array( $comment_2, $comment_1 ), $found_cids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $comment_1, $comment_2 ), $found_cids );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,35 +135,50 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_1 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_2 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_3 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '3',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_4 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '4',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $comment_5 = $this->factory->comment->create( array(
+                       'comment_post_ID' => $p,
+                       'comment_content' => '3',
+                       'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 500 ),
+               ) );
+               $comment_6 = $this->factory->comment->create( array(
+                       'comment_post_ID' => $p,
+                       'comment_content' => '4',
+                       'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 600 ),
+               ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'comment_order', 'asc' );
</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'default_comments_page', 'newest' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->go_to( get_permalink( $p ) . '?cpage=2&comments_per_page=2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $link = add_query_arg( array(
+                       'cpage' => 2,
+                       'comments_per_page' => 2,
+               ), get_permalink( $p ) );
+
+               $this->go_to( $link );
</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = get_echo( 'comments_template' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Life in the fast lane.
</span><span class="cx" style="display: block; padding: 0 10px">                $comments = preg_match_all( '/id="comment-([0-9]+)"/', $found, $matches );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $found_cids = array_map( 'intval', $matches[1] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( array( $comment_3, $comment_4 ), $found_cids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $comment_4, $comment_3 ), $found_cids );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,35 +190,50 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_1 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_2 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_3 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '3',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_4 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '4',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $comment_5 = $this->factory->comment->create( array(
+                       'comment_post_ID' => $p,
+                       'comment_content' => '3',
+                       'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 500 ),
+               ) );
+               $comment_6 = $this->factory->comment->create( array(
+                       'comment_post_ID' => $p,
+                       'comment_content' => '4',
+                       'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 600 ),
+               ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'comment_order', 'desc' );
</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'default_comments_page', 'newest' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->go_to( get_permalink( $p ) . '?cpage=2&comments_per_page=2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $link = add_query_arg( array(
+                       'cpage' => 2,
+                       'comments_per_page' => 2,
+               ), get_permalink( $p ) );
+
+               $this->go_to( $link );
</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = get_echo( 'comments_template' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Life in the fast lane.
</span><span class="cx" style="display: block; padding: 0 10px">                $comments = preg_match_all( '/id="comment-([0-9]+)"/', $found, $matches );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $found_cids = array_map( 'intval', $matches[1] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( array( $comment_4, $comment_3 ), $found_cids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $comment_3, $comment_4 ), $found_cids );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -215,35 +245,40 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_1 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_2 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_3 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '3',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_4 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '4',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'comment_order', 'asc' );
</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'default_comments_page', 'oldest' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->go_to( get_permalink( $p ) . '?cpage=2&comments_per_page=2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $link = add_query_arg( array(
+                       'cpage' => 2,
+                       'comments_per_page' => 2,
+               ), get_permalink( $p ) );
+
+               $this->go_to( $link );
</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = get_echo( 'comments_template' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Life in the fast lane.
</span><span class="cx" style="display: block; padding: 0 10px">                $comments = preg_match_all( '/id="comment-([0-9]+)"/', $found, $matches );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $found_cids = array_map( 'intval', $matches[1] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( array( $comment_1, $comment_2 ), $found_cids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $comment_2, $comment_1 ), $found_cids );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,34 +290,39 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_1 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_2 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '2',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_3 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '3',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $comment_4 = $this->factory->comment->create( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_post_ID' => $p,
</span><span class="cx" style="display: block; padding: 0 10px">                        'comment_content' => '4',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'comment_post_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'comment_order', 'desc' );
</span><span class="cx" style="display: block; padding: 0 10px">                update_option( 'default_comments_page', 'oldest' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->go_to( get_permalink( $p ) . '?cpage=2&comments_per_page=2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $link = add_query_arg( array(
+                       'cpage' => 2,
+                       'comments_per_page' => 2,
+               ), get_permalink( $p ) );
+
+               $this->go_to( $link );
</ins><span class="cx" style="display: block; padding: 0 10px">                 $found = get_echo( 'comments_template' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Life in the fast lane.
</span><span class="cx" style="display: block; padding: 0 10px">                $comments = preg_match_all( '/id="comment-([0-9]+)"/', $found, $matches );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $found_cids = array_map( 'intval', $matches[1] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( array( $comment_2, $comment_1 ), $found_cids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $comment_1, $comment_2 ), $found_cids );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>

</body>
</html>