<!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>[30687] trunk/tests/phpunit: Unit Tests: The `assertEqualSets()` helper was returning true for some sets that were not equal.</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/30687">30687</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/30687","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-12-01 05:01:29 +0000 (Mon, 01 Dec 2014)</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'>Unit Tests: The `assertEqualSets()` helper was returning true for some sets that were not equal. `assertEqualSets()` now behaves correctly, and the new `assertEqualSetsWithIndex()` helper also checks that the array indexes are the same.
Fixes <a href="https://core.trac.wordpress.org/ticket/30522">#30522</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludestestcasephp">trunk/tests/phpunit/includes/testcase.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsincludeshelpersphp">trunk/tests/phpunit/tests/includes/helpers.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludestestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase.php 2014-12-01 04:17:53 UTC (rev 30686)
+++ trunk/tests/phpunit/includes/testcase.php 2014-12-01 05:01:29 UTC (rev 30687)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,10 +262,17 @@
</span><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"> function assertEqualSets( $expected, $actual ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array(), array_diff( $expected, $actual ) );
- $this->assertEquals( array(), array_diff( $actual, $expected ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sort( $expected );
+ sort( $actual );
+ $this->assertEquals( $expected, $actual );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function assertEqualSetsWithIndex( $expected, $actual ) {
+ ksort( $expected );
+ ksort( $actual );
+ $this->assertEquals( $expected, $actual );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function go_to( $url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // note: the WP and WP_Query classes like to silently fetch parameters
</span><span class="cx" style="display: block; padding: 0 10px"> // from all over the place (globals, GET, etc), which makes it tricky
</span></span></pre></div>
<a id="trunktestsphpunittestsincludeshelpersphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/includes/helpers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/includes/helpers.php (rev 0)
+++ trunk/tests/phpunit/tests/includes/helpers.php 2014-12-01 05:01:29 UTC (rev 30687)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,162 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group phpunit
+ */
+class Tests_TestHelpers extends WP_UnitTestCase {
+ /**
+ * @ticket 30522
+ */
+ function data_assertEqualSets() {
+ return array(
+ array(
+ array( 1, 2, 3 ), // test expected
+ array( 1, 2, 3 ), // test actual
+ false // exception expected
+ ),
+ array(
+ array( 1, 2, 3 ),
+ array( 2, 3, 1 ),
+ false
+ ),
+ array(
+ array( 1, 2, 3 ),
+ array( 1, 2, 3, 4 ),
+ true
+ ),
+ array(
+ array( 1, 2, 3, 4 ),
+ array( 1, 2, 3 ),
+ true
+ ),
+ array(
+ array( 1, 2, 3 ),
+ array( 3, 4, 2, 1 ),
+ true
+ ),
+ array(
+ array( 1, 2, 3 ),
+ array( 1, 2, 3, 3 ),
+ true
+ ),
+ array(
+ array( 1, 2, 3 ),
+ array( 2, 3, 1, 3 ),
+ true
+ ),
+ );
+ }
+
+ /**
+ * @dataProvider data_assertEqualSets
+ * @ticket 30522
+ */
+ function test_assertEqualSets( $expected, $actual, $exception ) {
+ if ( $exception ) {
+ try {
+ $this->assertEqualSets( $expected, $actual );
+ } catch ( PHPUnit_Framework_ExpectationFailedException $ex ) {
+ return;
+ }
+
+ $this->fail();
+ } else {
+ $this->assertEqualSets( $expected, $actual );
+ }
+ }
+
+ /**
+ * @ticket 30522
+ */
+ function data_assertEqualSetsWithIndex() {
+ return array(
+ array(
+ array( 1, 2, 3 ), // test expected
+ array( 1, 2, 3 ), // test actual
+ false // exception expected
+ ),
+ array(
+ array( 'a' => 1, 'b' => 2, 'c' => 3 ),
+ array( 'a' => 1, 'b' => 2, 'c' => 3 ),
+ false
+ ),
+ array(
+ array( 1, 2, 3 ),
+ array( 2, 3, 1 ),
+ true
+ ),
+ array(
+ array( 'a' => 1, 'b' => 2, 'c' => 3 ),
+ array( 'b' => 2, 'c' => 3, 'a' => 1 ),
+ false
+ ),
+ array(
+ array( 1, 2, 3 ),
+ array( 1, 2, 3, 4 ),
+ true
+ ),
+ array(
+ array( 1, 2, 3, 4 ),
+ array( 1, 2, 3 ),
+ true
+ ),
+ array(
+ array( 'a' => 1, 'b' => 2, 'c' => 3 ),
+ array( 'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4 ),
+ true
+ ),
+ array(
+ array( 'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4 ),
+ array( 'a' => 1, 'b' => 2, 'c' => 3 ),
+ true
+ ),
+ array(
+ array( 1, 2, 3 ),
+ array( 3, 4, 2, 1 ),
+ true
+ ),
+ array(
+ array( 'a' => 1, 'b' => 2, 'c' => 3 ),
+ array( 'c' => 3, 'b' => 2, 'd' => 4, 'a' => 1 ),
+ true
+ ),
+ array(
+ array( 1, 2, 3 ),
+ array( 1, 2, 3, 3 ),
+ true
+ ),
+ array(
+ array( 'a' => 1, 'b' => 2, 'c' => 3 ),
+ array( 'a' => 1, 'b' => 2, 'c' => 3, 'd' => 3 ),
+ true
+ ),
+ array(
+ array( 1, 2, 3 ),
+ array( 2, 3, 1, 3 ),
+ true
+ ),
+ array(
+ array( 'a' => 1, 'b' => 2, 'c' => 3 ),
+ array( 'c' => 3, 'b' => 2, 'd' => 3, 'a' => 1 ),
+ true
+ ),
+ );
+ }
+ /**
+ * @dataProvider data_assertEqualSetsWithIndex
+ * @ticket 30522
+ */
+ function test_assertEqualSetsWithIndex( $expected, $actual, $exception ) {
+ if ( $exception ) {
+ try {
+ $this->assertEqualSetsWithIndex( $expected, $actual );
+ } catch ( PHPUnit_Framework_ExpectationFailedException $ex ) {
+ return;
+ }
+
+ $this->fail();
+ } else {
+ $this->assertEqualSetsWithIndex( $expected, $actual );
+ }
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/tests/includes/helpers.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:executable</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+*
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>