<!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>[51938] Tests: Some test improvements for `clean_dirsize_cache()` 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/51938">51938</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/51938","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-10-26 02:02:50 +0000 (Tue, 26 Oct 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: Some test improvements for `clean_dirsize_cache()` tests:
* Move the directory being tested to the `data` directory, for consistency with other test data.
* Set the `svn:eol-style` property to `native`, for consistency with other files.
* Correct the test class name in `dummy.txt`.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/51246">[51246]</a>, <a href="https://core.trac.wordpress.org/changeset/51910">[51910]</a>, <a href="https://core.trac.wordpress.org/changeset/51911">[51911]</a>.
See <a href="https://core.trac.wordpress.org/ticket/52241">#52241</a>, <a href="https://core.trac.wordpress.org/ticket/53363">#53363</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitdatafunctionsdummytxt">trunk/tests/phpunit/data/functions/dummy.txt</a></li>
<li><a href="#trunktestsphpunittestsfunctionscleanDirsizeCachephp">trunk/tests/phpunit/tests/functions/cleanDirsizeCache.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/tests/phpunit/data/functions/</li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/tests/phpunit/tests/functions/fixtures/</li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunktestsphpunitdatafunctionsdummytxt">trunk/tests/phpunit/data/functions/dummy.txt</a></li>
<li><a href="#trunktestsphpunittestsfunctionscleanDirsizeCachephp">trunk/tests/phpunit/tests/functions/cleanDirsizeCache.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitdatafunctionsdummytxt"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/functions/dummy.txt</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/fixtures/dummy.txt 2021-10-25 20:26:45 UTC (rev 51937)
+++ trunk/tests/phpunit/data/functions/dummy.txt 2021-10-26 02:02:50 UTC (rev 51938)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1 +1 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-This is a dummy text file which is only used by the `Tests_Multisite_CleanDirsizeCache::test_recurse_dirsize_without_transient()` test.
+This is a dummy text file which is only used by the `Tests_Functions_CleanDirsizeCache::test_recurse_dirsize_without_transient()` test.
</del><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/functions/dummy.txt
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:eol-style</h4></div>
<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-CR
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunittestsfunctionscleanDirsizeCachephp"></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/functions/cleanDirsizeCache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/cleanDirsizeCache.php 2021-10-25 20:26:45 UTC (rev 51937)
+++ trunk/tests/phpunit/tests/functions/cleanDirsizeCache.php 2021-10-26 02:02:50 UTC (rev 51938)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,140 +1,140 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * Tests specific to the directory size caching.
- *
- * @group functions.php
- */
-class Tests_Functions_CleanDirsizeCache extends WP_UnitTestCase {
-
- /**
- * Test the handling of invalid data passed as the $path parameter.
- *
- * @ticket 52241
- *
- * @covers ::clean_dirsize_cache
- *
- * @dataProvider data_clean_dirsize_cache_with_invalid_inputs
- *
- * @param mixed $path Path input to use in the test.
- * @param string $expected_message Expected notice message.
- */
- public function test_clean_dirsize_cache_with_invalid_inputs( $path, $expected_message ) {
- $this->expectNotice();
- $this->expectNoticeMessage( $expected_message );
-
- clean_dirsize_cache( $path );
- }
-
- /**
- * Data provider.
- *
- * @return array
- */
- public function data_clean_dirsize_cache_with_invalid_inputs() {
- return array(
- 'null' =>
; array(
- 'path' => null,
- 'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>NULL</code>.',
- ),
- 'bool false' => array(
- 'path' => false,
- 'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>boolean</code>.',
- ),
- 'empty string' => array(
- 'path' => '',
- 'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>string</code>.',
- ),
- 'array' => array(
- 'path' => array( '.', './second/path/' ),
- 'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>array</code>.',
- ),
- );
- }
-
- /**
- * Test the handling of a non-path te
xt string passed as the $path parameter.
- *
- * @ticket 52241
- *
- * @covers ::clean_dirsize_cache
- *
- * @dataProvider data_clean_dirsize_cache_with_non_path_string
- *
- * @param string $path Path input to use in the test.
- * @param int $expected_count Expected number of paths in the cache after cleaning.
- */
- public function test_clean_dirsize_cache_with_non_path_string( $path, $expected_count ) {
- // Set the dirsize cache to our mock.
- set_transient( 'dirsize_cache', $this->mock_dirsize_cache_with_non_path_string() );
-
- clean_dirsize_cache( $path );
-
- $cache = get_transient( 'dirsize_cache' );
- $this->assertIsArray( $cache );
- $this->assertCount( $expected_count, $cache );
- }
-
- /**
- * Data provider.
- *
- * @return array
- */
- public function data_clean_dirsize_cache_with_non_path_string() {
- return array(
- 'single dot' => array(
- 'path' => '.',
- 'expected_count' =>
; 1,
- ),
- 'non-path' => array(
- 'path' => 'string',
- 'expected_count' => 1,
- ),
- 'non-existant string, but non-path' => array(
- 'path' => 'doesnotexist',
- 'expected_count' => 2,
- ),
- );
- }
-
- private function mock_dirsize_cache_with_non_path_string() {
- return array(
- '.' => array( 'size' => 50 ),
- 'string' => array( 'size' => 42 ),
- );
- }
-
- /**
- * Test the behaviour of the function when the transient doesn't exist.
- *
- * @ticket 52241
- * @ticket 53635
- *
- * @covers ::recurse_dirsize
- */
- public function test_recurse_dirsize_without_transient() {
- delete_transient( 'dirsize_cache' );
-
- $size = recurse_dirsize( __DIR__ . '/fixtures' );
-
- $this->assertGreaterThan( 10, $size );
- }
-
- /**
- * Test the behaviour of the function when the transient does exist, but is not an array.
- *
- * In particular, this tests that no PHP TypeErr
ors are being thrown.
- *
- * @ticket 52241
- * @ticket 53635
- *
- * @covers ::recurse_dirsize
- */
- public function test_recurse_dirsize_with_invalid_transient() {
- set_transient( 'dirsize_cache', 'this is not a valid transient for dirsize cache' );
-
- $size = recurse_dirsize( __DIR__ . '/fixtures' );
-
- $this->assertGreaterThan( 10, $size );
- }
-}
+<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Tests specific to the directory size caching.
+ *
+ * @group functions.php
+ */
+class Tests_Functions_CleanDirsizeCache extends WP_UnitTestCase {
+
+ /**
+ * Test the handling of invalid data passed as the $path parameter.
+ *
+ * @ticket 52241
+ *
+ * @covers ::clean_dirsize_cache
+ *
+ * @dataProvider data_clean_dirsize_cache_with_invalid_inputs
+ *
+ * @param mixed $path Path input to use in the test.
+ * @param string $expected_message Expected notice message.
+ */
+ public function test_clean_dirsize_cache_with_invalid_inputs( $path, $expected_message ) {
+ $this->expectNotice();
+ $this->expectNoticeMessage( $expected_message );
+
+ clean_dirsize_cache( $path );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array
+ */
+ public function data_clean_dirsize_cache_with_invalid_inputs() {
+ return array(
+ 'null' => array(
+ 'path' => null,
+ 'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>NULL</code>.',
+ ),
+ 'bool false' => array(
+ 'path' => false,
+ 'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>boolean</code>.',
+ ),
+ 'empty string' => array(
+ 'path' => '',
+ 'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>string</code>.',
+ ),
+ 'array' => array(
+ 'path' => array( '.', './second/path/' ),
+ 'expected_message' => '<code>clean_dirsize_cache()</code> only accepts a non-empty path string, received <code>array</code>.',
+ ),
+ );
+ }
+
+ /**
+ * Test the handling of a non-path text string passed as the $path parameter.
+ *
+ * @ticket 52241
+ *
+ * @covers ::clean_dirsize_cache
+ *
+ * @dataProvider data_clean_dirsize_cache_with_non_path_string
+ *
+ * @param string $path Path input to use in the test.
+ * @param int $expected_count Expected number of paths in the cache after cleaning.
+ */
+ public function test_clean_dirsize_cache_with_non_path_string( $path, $expected_count ) {
+ // Set the dirsize cache to our mock.
+ set_transient( 'dirsize_cache', $this->mock_dirsize_cache_with_non_path_string() );
+
+ clean_dirsize_cache( $path );
+
+ $cache = get_transient( 'dirsize_cache' );
+ $this->assertIsArray( $cache );
+ $this->assertCount( $expected_count, $cache );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array
+ */
+ public function data_clean_dirsize_cache_with_non_path_string() {
+ return array(
+ 'single dot' => array(
+ 'path' => '.',
+ 'expected_count' => 1,
+ ),
+ 'non-path' => array(
+ 'path' => 'string',
+ 'expected_count' => 1,
+ ),
+ 'non-existant string, but non-path' => array(
+ 'path' => 'doesnotexist',
+ 'expected_count' => 2,
+ ),
+ );
+ }
+
+ private function mock_dirsize_cache_with_non_path_string() {
+ return array(
+ '.' => array( 'size' => 50 ),
+ 'string' => array( 'size' => 42 ),
+ );
+ }
+
+ /**
+ * Test the behaviour of the function when the transient doesn't exist.
+ *
+ * @ticket 52241
+ * @ticket 53635
+ *
+ * @covers ::recurse_dirsize
+ */
+ public function test_recurse_dirsize_without_transient() {
+ delete_transient( 'dirsize_cache' );
+
+ $size = recurse_dirsize( DIR_TESTDATA . '/functions' );
+
+ $this->assertGreaterThan( 10, $size );
+ }
+
+ /**
+ * Test the behaviour of the function when the transient does exist, but is not an array.
+ *
+ * In particular, this tests that no PHP TypeErrors are being thrown.
+ *
+ * @ticket 52241
+ * @ticket 53635
+ *
+ * @covers ::recurse_dirsize
+ */
+ public function test_recurse_dirsize_with_invalid_transient() {
+ set_transient( 'dirsize_cache', 'this is not a valid transient for dirsize cache' );
+
+ $size = recurse_dirsize( DIR_TESTDATA . '/functions' );
+
+ $this->assertGreaterThan( 10, $size );
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/tests/functions/cleanDirsizeCache.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:eol-style</h4></div>
<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-CR
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>