<!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>[51651] trunk/tests/phpunit/tests/feed: Tests: Rename classes in `phpunit/tests/feed/` per the naming conventions.</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/51651">51651</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/51651","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-22 10:07:17 +0000 (Sun, 22 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 classes in `phpunit/tests/feed/` per the naming conventions.
https://make.wordpress.org/core/handbook/testing/automated-testing/writing-phpunit-tests/#naming-and-organization
Follow-up to <a href="https://core.trac.wordpress.org/changeset/47780">[47780]</a>, <a href="https://core.trac.wordpress.org/changeset/48911">[48911]</a>, <a href="https://core.trac.wordpress.org/changeset/49327">[49327]</a>, <a href="https://core.trac.wordpress.org/changeset/50291">[50291]</a>, <a href="https://core.trac.wordpress.org/changeset/50292">[50292]</a>, <a href="https://core.trac.wordpress.org/changeset/50342">[50342]</a>, <a href="https://core.trac.wordpress.org/changeset/50452">[50452]</a>, <a href="https://core.trac.wordpress.org/changeset/50453">[50453]</a>, <a href="https://core.trac.wordpress.org/changeset/50456">[50456]</a>, <a href="https://core.trac.wordpress.org/changeset/50967">[50967]</a>, <a href="https://core.trac.wordpress.org/changeset/50968">[50968]</a>, <a href="https://core.trac.wordpress.org/changeset/50969">[50969]</a>, <a href="https://core.trac.wordpress.org/changeset/51491">[51491]</a>, <a href="https://core.trac.wordpress.org/changeset/51492">[514
92]</a>, <a href="https://core.trac.wordpress.org/changeset/51493">[51493]</a>, <a href="https://core.trac.wordpress.org/changeset/51623">[51623]</a>, <a href="https://core.trac.wordpress.org/changeset/51639">[51639]</a>, <a href="https://core.trac.wordpress.org/changeset/51646">[51646]</a>, <a href="https://core.trac.wordpress.org/changeset/51650">[51650]</a>.
See <a href="https://core.trac.wordpress.org/ticket/53363">#53363</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfeedatomphp">trunk/tests/phpunit/tests/feed/atom.php</a></li>
<li><a href="#trunktestsphpunittestsfeedrss2php">trunk/tests/phpunit/tests/feed/rss2.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfeedwpSimplePieFilephp">trunk/tests/phpunit/tests/feed/wpSimplePieFile.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfeedwpsimplepiefilephp">trunk/tests/phpunit/tests/feed/wp-simplepie-file.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsfeedatomphp"></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/feed/atom.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/feed/atom.php 2021-08-21 15:32:53 UTC (rev 51650)
+++ trunk/tests/phpunit/tests/feed/atom.php 2021-08-22 10:07:17 UTC (rev 51651)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @group feed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class Tests_Feeds_Atom extends WP_UnitTestCase {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class Tests_Feed_Atom extends WP_UnitTestCase {
</ins><span class="cx" style="display: block; padding: 0 10px"> public static $user_id;
</span><span class="cx" style="display: block; padding: 0 10px"> public static $posts;
</span><span class="cx" style="display: block; padding: 0 10px"> public static $category;
</span></span></pre></div>
<a id="trunktestsphpunittestsfeedrss2php"></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/feed/rss2.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/feed/rss2.php 2021-08-21 15:32:53 UTC (rev 51650)
+++ trunk/tests/phpunit/tests/feed/rss2.php 2021-08-22 10:07:17 UTC (rev 51651)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @group feed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class Tests_Feeds_RSS2 extends WP_UnitTestCase {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class Tests_Feed_RSS2 extends WP_UnitTestCase {
</ins><span class="cx" style="display: block; padding: 0 10px"> public static $user_id;
</span><span class="cx" style="display: block; padding: 0 10px"> public static $posts;
</span><span class="cx" style="display: block; padding: 0 10px"> public static $category;
</span></span></pre></div>
<a id="trunktestsphpunittestsfeedwpsimplepiefilephp"></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/feed/wp-simplepie-file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/feed/wp-simplepie-file.php 2021-08-21 15:32:53 UTC (rev 51650)
+++ trunk/tests/phpunit/tests/feed/wp-simplepie-file.php 2021-08-22 10:07:17 UTC (rev 51651)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,121 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Unit tests for methods in `WP_SimplePie_File`.
- *
- * @package WordPress
- * @subpackage UnitTests
- * @since 5.6.1
- */
-
-/**
- * Tests the `WP_SimplePie_File` class.
- *
- * @group feed
- * @group wp-simplepie-file
- *
- * @since 5.6.1
- */
-class Tests_WP_SimplePie_File extends WP_UnitTestCase {
- public static function set_up_before_class() {
- parent::set_up_before_class();
-
- require_once ABSPATH . '/wp-includes/class-simplepie.php';
- require_once ABSPATH . '/wp-includes/class-wp-simplepie-file.php';
- }
-
- /**
- * Test that single- and multiple-value headers are parsed in the way that SimplePie expects.
- *
- * @dataProvider data_header_parsing
- *
- * @covers WP_SimplePie_File::__construct
- *
- * @since 5.6.1
- *
- * @ticket 51056
- */
- public function test_header_parsing( $callback, $header_field, $expected ) {
- add_filter( 'pre_http_request', array( $this, $callback ) );
-
- $file = new WP_SimplePie_File( 'https://wordpress.org/news/feed/' );
-
- $this->assertSame( $expected, $file->headers[ $header_field ] );
- }
-
- /**
- * Provide test cases for `test_header_parsing()`.
- *
- * @return array
- */
- public function data_header_parsing() {
- return array(
- 'single content type header works' => array(
- 'mocked_response_single_header_values',
- 'content-type',
- 'application/rss+xml; charset=UTF-8',
- ),
-
- 'single generic header works' => array(
- 'mocked_response_single_header_values',
- 'link',
- '<https://wordpress.org/news/wp-json/>; rel="https://api.w.org/"',
- ),
-
- 'only the final content-type header should be used' => array(
- 'mocked_response_multiple_header_values',
- 'content-type',
- 'application/rss+xml; charset=UTF-8',
- ),
-
- 'multiple generic header values should be merged into a comma separated string' => array(
- 'mocked_response_multiple_header_values',
- 'link',
- '<https://wordpress.org/news/wp-json/>; rel="https://api.w.org/", <https://wordpress.org/news/wp/v2/categories/3>; rel="alternate"; type="application/json"',
- ),
- );
- }
-
- /**
- * Mock a feed HTTP response where headers only have one value.
- */
- public function mocked_response_single_header_values() {
- $single_value_headers = array(
- 'content-type' => 'application/rss+xml; charset=UTF-8',
- 'link' => '<https://wordpress.org/news/wp-json/>; rel="https://api.w.org/"',
- );
-
- return array(
- 'headers' => new Requests_Utility_CaseInsensitiveDictionary( $single_value_headers ),
- 'body' => file_get_contents( DIR_TESTDATA . '/feed/wordpress-org-news.xml' ),
- 'response' => array(
- 'code' => 200,
- 'message' => 'OK',
- ),
- 'cookies' => array(),
- 'filename' => null,
- );
- }
-
- /**
- * Mock a feed HTTP response where headers have multiple values.
- */
- public function mocked_response_multiple_header_values() {
- $response = $this->mocked_response_single_header_values();
-
- $multiple_value_headers = array(
- 'content-type' => array(
- 'application/rss+xml; charset=ISO-8859-2',
- 'application/rss+xml; charset=UTF-8',
- ),
-
- 'link' => array(
- '<https://wordpress.org/news/wp-json/>; rel="https://api.w.org/"',
- '<https://wordpress.org/news/wp/v2/categories/3>; rel="alternate"; type="application/json"',
- ),
- );
-
- $response['headers'] = new Requests_Utility_CaseInsensitiveDictionary( $multiple_value_headers );
-
- return $response;
- }
-}
</del></span></pre></div>
<a id="trunktestsphpunittestsfeedwpSimplePieFilephpfromrev51650trunktestsphpunittestsfeedwpsimplepiefilephp"></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/feed/wpSimplePieFile.php (from rev 51650, trunk/tests/phpunit/tests/feed/wp-simplepie-file.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/feed/wpSimplePieFile.php (rev 0)
+++ trunk/tests/phpunit/tests/feed/wpSimplePieFile.php 2021-08-22 10:07:17 UTC (rev 51651)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,121 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Unit tests for methods in `WP_SimplePie_File`.
+ *
+ * @package WordPress
+ * @subpackage UnitTests
+ * @since 5.6.1
+ */
+
+/**
+ * Tests the `WP_SimplePie_File` class.
+ *
+ * @group feed
+ * @group wp-simplepie-file
+ *
+ * @since 5.6.1
+ */
+class Tests_Feed_wpSimplePieFile extends WP_UnitTestCase {
+ public static function set_up_before_class() {
+ parent::set_up_before_class();
+
+ require_once ABSPATH . '/wp-includes/class-simplepie.php';
+ require_once ABSPATH . '/wp-includes/class-wp-simplepie-file.php';
+ }
+
+ /**
+ * Test that single- and multiple-value headers are parsed in the way that SimplePie expects.
+ *
+ * @dataProvider data_header_parsing
+ *
+ * @covers WP_SimplePie_File::__construct
+ *
+ * @since 5.6.1
+ *
+ * @ticket 51056
+ */
+ public function test_header_parsing( $callback, $header_field, $expected ) {
+ add_filter( 'pre_http_request', array( $this, $callback ) );
+
+ $file = new WP_SimplePie_File( 'https://wordpress.org/news/feed/' );
+
+ $this->assertSame( $expected, $file->headers[ $header_field ] );
+ }
+
+ /**
+ * Provide test cases for `test_header_parsing()`.
+ *
+ * @return array
+ */
+ public function data_header_parsing() {
+ return array(
+ 'single content type header works' => array(
+ 'mocked_response_single_header_values',
+ 'content-type',
+ 'application/rss+xml; charset=UTF-8',
+ ),
+
+ 'single generic header works' => array(
+ 'mocked_response_single_header_values',
+ 'link',
+ '<https://wordpress.org/news/wp-json/>; rel="https://api.w.org/"',
+ ),
+
+ 'only the final content-type header should be used' => array(
+ 'mocked_response_multiple_header_values',
+ 'content-type',
+ 'application/rss+xml; charset=UTF-8',
+ ),
+
+ 'multiple generic header values should be merged into a comma separated string' => array(
+ 'mocked_response_multiple_header_values',
+ 'link',
+ '<https://wordpress.org/news/wp-json/>; rel="https://api.w.org/", <https://wordpress.org/news/wp/v2/categories/3>; rel="alternate"; type="application/json"',
+ ),
+ );
+ }
+
+ /**
+ * Mock a feed HTTP response where headers only have one value.
+ */
+ public function mocked_response_single_header_values() {
+ $single_value_headers = array(
+ 'content-type' => 'application/rss+xml; charset=UTF-8',
+ 'link' => '<https://wordpress.org/news/wp-json/>; rel="https://api.w.org/"',
+ );
+
+ return array(
+ 'headers' => new Requests_Utility_CaseInsensitiveDictionary( $single_value_headers ),
+ 'body' => file_get_contents( DIR_TESTDATA . '/feed/wordpress-org-news.xml' ),
+ 'response' => array(
+ 'code' => 200,
+ 'message' => 'OK',
+ ),
+ 'cookies' => array(),
+ 'filename' => null,
+ );
+ }
+
+ /**
+ * Mock a feed HTTP response where headers have multiple values.
+ */
+ public function mocked_response_multiple_header_values() {
+ $response = $this->mocked_response_single_header_values();
+
+ $multiple_value_headers = array(
+ 'content-type' => array(
+ 'application/rss+xml; charset=ISO-8859-2',
+ 'application/rss+xml; charset=UTF-8',
+ ),
+
+ 'link' => array(
+ '<https://wordpress.org/news/wp-json/>; rel="https://api.w.org/"',
+ '<https://wordpress.org/news/wp/v2/categories/3>; rel="alternate"; type="application/json"',
+ ),
+ );
+
+ $response['headers'] = new Requests_Utility_CaseInsensitiveDictionary( $multiple_value_headers );
+
+ return $response;
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>