<!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>[55464] trunk/tests/phpunit/tests/functions.php: Tests: Move some data providers in `Tests_Functions` next to the tests they are used in.</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/55464">55464</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/55464","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>2023-03-06 13:08:03 +0000 (Mon, 06 Mar 2023)</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: Move some data providers in `Tests_Functions` next to the tests they are used in.
Includes renaming some data provider methods to use the `data_` prefix for consistency.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/36832">[36832]</a>, <a href="https://core.trac.wordpress.org/changeset/40124">[40124]</a>, <a href="https://core.trac.wordpress.org/changeset/40397">[40397]</a>, <a href="https://core.trac.wordpress.org/changeset/50810">[50810]</a>, <a href="https://core.trac.wordpress.org/changeset/53457">[53457]</a>.
See <a href="https://core.trac.wordpress.org/ticket/56793">#56793</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionsphp">trunk/tests/phpunit/tests/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsfunctionsphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions.php 2023-03-06 12:51:40 UTC (rev 55463)
+++ trunk/tests/phpunit/tests/functions.php 2023-03-06 13:08:03 UTC (rev 55464)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests path_join().
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 55897
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider path_join_data_provider
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_path_join
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_path_join( $base, $path, $expected ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, path_join( $base, $path ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string[][]
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function path_join_data_provider() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_path_join() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Absolute paths.
</span><span class="cx" style="display: block; padding: 0 10px"> 'absolute path should return path' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1158,7 +1158,7 @@
</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"> * @ticket 36054
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider datetime_provider
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_mysql_to_rfc3339
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_mysql_to_rfc3339( $expected, $actual ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $date_return = mysql_to_rfc3339( $actual );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1169,7 +1169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( new DateTime( $expected ), new DateTime( $date_return ), 'The date is not the same after the call method' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function datetime_provider() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_mysql_to_rfc3339() {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array( '2016-03-15T18:54:46', '15-03-2016 18:54:46' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '2016-03-02T19:13:25', '2016-03-02 19:13:25' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1334,7 +1334,7 @@
</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"> * @ticket 40017
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider wp_get_image_mime
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_wp_get_image_mime
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_get_image_mime( $file, $expected ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_callable( 'exif_imagetype' ) && ! function_exists( 'getimagesize' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1345,105 +1345,9 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 35725
- * @dataProvider data_wp_getimagesize
- */
- public function test_wp_getimagesize( $file, $expected ) {
- if ( ! is_callable( 'exif_imagetype' ) && ! function_exists( 'getimagesize' ) ) {
- $this->markTestSkipped( 'The exif PHP extension is not loaded.' );
- }
-
- $result = wp_getimagesize( $file );
-
- // The getimagesize() function varies in its response, so
- // let's restrict comparison to expected keys only.
- if ( is_array( $expected ) ) {
- foreach ( $expected as $k => $v ) {
- $this->assertArrayHasKey( $k, $result );
- $this->assertSame( $expected[ $k ], $result[ $k ] );
- }
- } else {
- $this->assertSame( $expected, $result );
- }
- }
-
- /**
- * @ticket 39550
- * @dataProvider wp_check_filetype_and_ext_data
- * @requires extension fileinfo
- */
- public function test_wp_check_filetype_and_ext( $file, $filename, $expected ) {
- $this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
- }
-
- /**
- * @ticket 39550
- * @group ms-excluded
- * @requires extension fileinfo
- */
- public function test_wp_check_filetype_and_ext_with_filtered_svg() {
- $file = DIR_TESTDATA . '/uploads/video-play.svg';
- $filename = 'video-play.svg';
-
- $expected = array(
- 'ext' => 'svg',
- 'type' => 'image/svg+xml',
- 'proper_filename' => false,
- );
-
- add_filter(
- 'upload_mimes',
- static function( $mimes ) {
- $mimes['svg'] = 'image/svg+xml';
- return $mimes;
- }
- );
-
- $this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
- }
-
- /**
- * @ticket 39550
- * @group ms-excluded
- * @requires extension fileinfo
- */
- public function test_wp_check_filetype_and_ext_with_filtered_woff() {
- $file = DIR_TESTDATA . '/uploads/dashicons.woff';
- $filename = 'dashicons.woff';
-
- $woff_mime_type = 'application/font-woff';
-
- /*
- * As of PHP 8.1.12, which includes libmagic/file update to version 5.42,
- * the expected mime type for WOFF files is 'font/woff'.
- *
- * See https://github.com/php/php-src/issues/8805.
- */
- if ( PHP_VERSION_ID >= 80112 ) {
- $woff_mime_type = 'font/woff';
- }
-
- $expected = array(
- 'ext' => 'woff',
- 'type' => $woff_mime_type,
- 'proper_filename' => false,
- );
-
- add_filter(
- 'upload_mimes',
- static function( $mimes ) use ( $woff_mime_type ) {
- $mimes['woff'] = $woff_mime_type;
- return $mimes;
- }
- );
-
- $this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Data provider for test_wp_get_image_mime().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function wp_get_image_mime() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function data_wp_get_image_mime() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Standard JPEG.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1496,6 +1400,29 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 35725
+ * @dataProvider data_wp_getimagesize
+ */
+ public function test_wp_getimagesize( $file, $expected ) {
+ if ( ! is_callable( 'exif_imagetype' ) && ! function_exists( 'getimagesize' ) ) {
+ $this->markTestSkipped( 'The exif PHP extension is not loaded.' );
+ }
+
+ $result = wp_getimagesize( $file );
+
+ // The getimagesize() function varies in its response, so
+ // let's restrict comparison to expected keys only.
+ if ( is_array( $expected ) ) {
+ foreach ( $expected as $k => $v ) {
+ $this->assertArrayHasKey( $k, $result );
+ $this->assertSame( $expected[ $k ], $result[ $k ] );
+ }
+ } else {
+ $this->assertSame( $expected, $result );
+ }
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Data profider for test_wp_getimagesize().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function data_wp_getimagesize() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1598,7 +1525,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function wp_check_filetype_and_ext_data() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 39550
+ * @dataProvider data_wp_check_filetype_and_ext
+ * @requires extension fileinfo
+ */
+ public function test_wp_check_filetype_and_ext( $file, $filename, $expected ) {
+ $this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
+ }
+
+ public function data_wp_check_filetype_and_ext() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Standard image.
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1764,10 +1700,74 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 39550
+ * @group ms-excluded
+ * @requires extension fileinfo
+ */
+ public function test_wp_check_filetype_and_ext_with_filtered_svg() {
+ $file = DIR_TESTDATA . '/uploads/video-play.svg';
+ $filename = 'video-play.svg';
+
+ $expected = array(
+ 'ext' => 'svg',
+ 'type' => 'image/svg+xml',
+ 'proper_filename' => false,
+ );
+
+ add_filter(
+ 'upload_mimes',
+ static function( $mimes ) {
+ $mimes['svg'] = 'image/svg+xml';
+ return $mimes;
+ }
+ );
+
+ $this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
+ }
+
+ /**
+ * @ticket 39550
+ * @group ms-excluded
+ * @requires extension fileinfo
+ */
+ public function test_wp_check_filetype_and_ext_with_filtered_woff() {
+ $file = DIR_TESTDATA . '/uploads/dashicons.woff';
+ $filename = 'dashicons.woff';
+
+ $woff_mime_type = 'application/font-woff';
+
+ /*
+ * As of PHP 8.1.12, which includes libmagic/file update to version 5.42,
+ * the expected mime type for WOFF files is 'font/woff'.
+ *
+ * See https://github.com/php/php-src/issues/8805.
+ */
+ if ( PHP_VERSION_ID >= 80112 ) {
+ $woff_mime_type = 'font/woff';
+ }
+
+ $expected = array(
+ 'ext' => 'woff',
+ 'type' => $woff_mime_type,
+ 'proper_filename' => false,
+ );
+
+ add_filter(
+ 'upload_mimes',
+ static function( $mimes ) use ( $woff_mime_type ) {
+ $mimes['woff'] = $woff_mime_type;
+ return $mimes;
+ }
+ );
+
+ $this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Test file path validation
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 42016
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider data_test_validate_file()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_test_validate_file
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $file File path.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $allowed_files List of allowed files.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1964,7 +1964,7 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Dataprovider for test_duration_format().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Data provider for test_duration_format().
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array {
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array {
</span></span></pre>
</div>
</div>
</body>
</html>