<!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>[51665] trunk/tests/phpunit/tests/functions: Tests: Rename the test file and class for `wp_filter_object_list()` 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 { white-space: pre-line; 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/51665">51665</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/51665","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-08-26 16:08:48 +0000 (Thu, 26 Aug 2021)</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'>Tests: Rename the test file and class for `wp_filter_object_list()` tests.
This matches the name of the function being tested.
Follow-up to [410/tests], <a href="https://core.trac.wordpress.org/changeset/51663">[51663]</a>, <a href="https://core.trac.wordpress.org/changeset/51664">[51664]</a>.
See <a href="https://core.trac.wordpress.org/ticket/53363">#53363</a>, <a href="https://core.trac.wordpress.org/ticket/53987">#53987</a>.</pre>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionswpFilterObjectListphp">trunk/tests/phpunit/tests/functions/wpFilterObjectList.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionswpListFilterphp">trunk/tests/phpunit/tests/functions/wpListFilter.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsfunctionswpFilterObjectListphpfromrev51664trunktestsphpunittestsfunctionswpListFilterphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/tests/phpunit/tests/functions/wpFilterObjectList.php (from rev 51664, trunk/tests/phpunit/tests/functions/wpListFilter.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/wpFilterObjectList.php (rev 0)
+++ trunk/tests/phpunit/tests/functions/wpFilterObjectList.php 2021-08-26 16:08:48 UTC (rev 51665)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,204 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Test wp_filter_object_list().
+ *
+ * @group functions.php
+ * @covers ::wp_filter_object_list
+ */
+class Tests_Functions_wpFilterObjectList extends WP_UnitTestCase {
+ public $object_list = array();
+ public $array_list = array();
+
+ function set_up() {
+ parent::set_up();
+ $this->array_list['foo'] = array(
+ 'name' => 'foo',
+ 'id' => 'f',
+ 'field1' => true,
+ 'field2' => true,
+ 'field3' => true,
+ 'field4' => array( 'red' ),
+ );
+ $this->array_list['bar'] = array(
+ 'name' => 'bar',
+ 'id' => 'b',
+ 'field1' => true,
+ 'field2' => true,
+ 'field3' => false,
+ 'field4' => array( 'green' ),
+ );
+ $this->array_list['baz'] = array(
+ 'name' => 'baz',
+ 'id' => 'z',
+ 'field1' => true,
+ 'field2' => false,
+ 'field3' => false,
+ 'field4' => array( 'blue' ),
+ );
+ foreach ( $this->array_list as $key => $value ) {
+ $this->object_list[ $key ] = (object) $value;
+ }
+ }
+
+ function test_filter_object_list_and() {
+ $list = wp_filter_object_list(
+ $this->object_list,
+ array(
+ 'field1' => true,
+ 'field2' => true,
+ ),
+ 'AND'
+ );
+ $this->assertCount( 2, $list );
+ $this->assertArrayHasKey( 'foo', $list );
+ $this->assertArrayHasKey( 'bar', $list );
+ }
+
+ function test_filter_object_list_or() {
+ $list = wp_filter_object_list(
+ $this->object_list,
+ array(
+ 'field1' => true,
+ 'field2' => true,
+ ),
+ 'OR'
+ );
+ $this->assertCount( 3, $list );
+ $this->assertArrayHasKey( 'foo', $list );
+ $this->assertArrayHasKey( 'bar', $list );
+ $this->assertArrayHasKey( 'baz', $list );
+ }
+
+ function test_filter_object_list_not() {
+ $list = wp_filter_object_list(
+ $this->object_list,
+ array(
+ 'field2' => true,
+ 'field3' => true,
+ ),
+ 'NOT'
+ );
+ $this->assertCount( 1, $list );
+ $this->assertArrayHasKey( 'baz', $list );
+ }
+
+ function test_filter_object_list_and_field() {
+ $list = wp_filter_object_list(
+ $this->object_list,
+ array(
+ 'field1' => true,
+ 'field2' => true,
+ ),
+ 'AND',
+ 'name'
+ );
+ $this->assertSame(
+ array(
+ 'foo' => 'foo',
+ 'bar' => 'bar',
+ ),
+ $list
+ );
+ }
+
+ function test_filter_object_list_or_field() {
+ $list = wp_filter_object_list(
+ $this->object_list,
+ array(
+ 'field2' => true,
+ 'field3' => true,
+ ),
+ 'OR',
+ 'name'
+ );
+ $this->assertSame(
+ array(
+ 'foo' => 'foo',
+ 'bar' => 'bar',
+ ),
+ $list
+ );
+ }
+
+ function test_filter_object_list_not_field() {
+ $list = wp_filter_object_list(
+ $this->object_list,
+ array(
+ 'field2' => true,
+ 'field3' => true,
+ ),
+ 'NOT',
+ 'name'
+ );
+ $this->assertSame( array( 'baz' => 'baz' ), $list );
+ }
+
+ function test_filter_object_list_nested_array_and() {
+ $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'blue' ) ), 'AND' );
+ $this->assertCount( 1, $list );
+ $this->assertArrayHasKey( 'baz', $list );
+ }
+
+ function test_filter_object_list_nested_array_not() {
+ $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'red' ) ), 'NOT' );
+ $this->assertCount( 2, $list );
+ $this->assertArrayHasKey( 'bar', $list );
+ $this->assertArrayHasKey( 'baz', $list );
+ }
+
+ function test_filter_object_list_nested_array_or() {
+ $list = wp_filter_object_list(
+ $this->object_list,
+ array(
+ 'field3' => true,
+ 'field4' => array( 'blue' ),
+ ),
+ 'OR'
+ );
+ $this->assertCount( 2, $list );
+ $this->assertArrayHasKey( 'foo', $list );
+ $this->assertArrayHasKey( 'baz', $list );
+ }
+
+ function test_filter_object_list_nested_array_or_singular() {
+ $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'blue' ) ), 'OR' );
+ $this->assertCount( 1, $list );
+ $this->assertArrayHasKey( 'baz', $list );
+ }
+
+ function test_filter_object_list_nested_array_and_field() {
+ $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'blue' ) ), 'AND', 'name' );
+ $this->assertSame( array( 'baz' => 'baz' ), $list );
+ }
+
+ function test_filter_object_list_nested_array_not_field() {
+ $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'green' ) ), 'NOT', 'name' );
+ $this->assertSame(
+ array(
+ 'foo' => 'foo',
+ 'baz' => 'baz',
+ ),
+ $list
+ );
+ }
+
+ function test_filter_object_list_nested_array_or_field() {
+ $list = wp_filter_object_list(
+ $this->object_list,
+ array(
+ 'field3' => true,
+ 'field4' => array( 'blue' ),
+ ),
+ 'OR',
+ 'name'
+ );
+ $this->assertSame(
+ array(
+ 'foo' => 'foo',
+ 'baz' => 'baz',
+ ),
+ $list
+ );
+ }
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestsfunctionswpListFilterphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/tests/phpunit/tests/functions/wpListFilter.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/wpListFilter.php 2021-08-26 16:02:13 UTC (rev 51664)
+++ trunk/tests/phpunit/tests/functions/wpListFilter.php 2021-08-26 16:08:48 UTC (rev 51665)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,204 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * Test wp_filter_object_list().
- *
- * @group functions.php
- * @covers ::wp_filter_object_list
- */
-class Tests_Functions_wpListFilter extends WP_UnitTestCase {
- public $object_list = array();
- public $array_list = array();
-
- function set_up() {
- parent::set_up();
- $this->array_list['foo'] = array(
- 'name' => 'foo',
- 'id' => 'f',
- 'field1' => true,
- 'field2' => true,
- 'field3' => true,
- 'field4' => array( 'red' ),
- );
- $this->array_list['bar'] = array(
- 'name' => 'bar',
- 'id' => 'b',
- 'field1' => true,
- 'field2' => true,
- 'field3' => false,
- 'field4' => array( 'green' ),
- );
- $this->array_list['baz'] = array(
- 'name' => 'baz',
- 'id' => 'z',
- 'field1' => true,
- 'field2' => false,
- 'field3' => false,
- 'field4' => array( 'blue' ),
- );
- foreach ( $this->array_list as $key => $value ) {
- $this->object_list[ $key ] = (object) $value;
- }
- }
-
- function test_filter_object_list_and() {
- $list = wp_filter_object_list(
- $this->object_list,
- array(
- 'field1' => true,
- 'field2' => true,
- ),
- 'AND'
- );
- $this->assertCount( 2, $list );
- $this->assertArrayHasKey( 'foo', $list );
- $this->assertArrayHasKey( 'bar', $list );
- }
-
- function test_filter_object_list_or() {
- $list = wp_filter_object_list(
- $this->object_list,
- array(
- 'field1' => true,
- 'field2' => true,
- ),
- 'OR'
- );
- $this->assertCount( 3, $list );
- $this->assertArrayHasKey( 'foo', $list );
- $this->assertArrayHasKey( 'bar', $list );
- $this->assertArrayHasKey( 'baz', $list );
- }
-
- function test_filter_object_list_not() {
- $list = wp_filter_object_list(
- $this->object_list,
- array(
- 'field2' => true,
- 'field3' => true,
- ),
- 'NOT'
- );
- $this->assertCount( 1, $list );
- $this->assertArrayHasKey( 'baz', $list );
- }
-
- function test_filter_object_list_and_field() {
- $list = wp_filter_object_list(
- $this->object_list,
- array(
- 'field1' => true,
- 'field2' => true,
- ),
- 'AND',
- 'name'
- );
- $this->assertSame(
- array(
- 'foo' => 'foo',
- 'bar' => 'bar',
- ),
- $list
- );
- }
-
- function test_filter_object_list_or_field() {
- $list = wp_filter_object_list(
- $this->object_list,
- array(
- 'field2' => true,
- 'field3' => true,
- ),
- 'OR',
- 'name'
- );
- $this->assertSame(
- array(
- 'foo' => 'foo',
- 'bar' => 'bar',
- ),
- $list
- );
- }
-
- function test_filter_object_list_not_field() {
- $list = wp_filter_object_list(
- $this->object_list,
- array(
- 'field2' => true,
- 'field3' => true,
- ),
- 'NOT',
- 'name'
- );
- $this->assertSame( array( 'baz' => 'baz' ), $list );
- }
-
- function test_filter_object_list_nested_array_and() {
- $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'blue' ) ), 'AND' );
- $this->assertCount( 1, $list );
- $this->assertArrayHasKey( 'baz', $list );
- }
-
- function test_filter_object_list_nested_array_not() {
- $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'red' ) ), 'NOT' );
- $this->assertCount( 2, $list );
- $this->assertArrayHasKey( 'bar', $list );
- $this->assertArrayHasKey( 'baz', $list );
- }
-
- function test_filter_object_list_nested_array_or() {
- $list = wp_filter_object_list(
- $this->object_list,
- array(
- 'field3' => true,
- 'field4' => array( 'blue' ),
- ),
- 'OR'
- );
- $this->assertCount( 2, $list );
- $this->assertArrayHasKey( 'foo', $list );
- $this->assertArrayHasKey( 'baz', $list );
- }
-
- function test_filter_object_list_nested_array_or_singular() {
- $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'blue' ) ), 'OR' );
- $this->assertCount( 1, $list );
- $this->assertArrayHasKey( 'baz', $list );
- }
-
- function test_filter_object_list_nested_array_and_field() {
- $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'blue' ) ), 'AND', 'name' );
- $this->assertSame( array( 'baz' => 'baz' ), $list );
- }
-
- function test_filter_object_list_nested_array_not_field() {
- $list = wp_filter_object_list( $this->object_list, array( 'field4' => array( 'green' ) ), 'NOT', 'name' );
- $this->assertSame(
- array(
- 'foo' => 'foo',
- 'baz' => 'baz',
- ),
- $list
- );
- }
-
- function test_filter_object_list_nested_array_or_field() {
- $list = wp_filter_object_list(
- $this->object_list,
- array(
- 'field3' => true,
- 'field4' => array( 'blue' ),
- ),
- 'OR',
- 'name'
- );
- $this->assertSame(
- array(
- 'foo' => 'foo',
- 'baz' => 'baz',
- ),
- $list
- );
- }
-}
</del></span></pre>
</div>
</div>
</body>
</html>