<!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>[47332] branches/4.1/tests/phpunit/tests: Build/Test Tools: Merge some test fixes to the 4.1 branch, for consistency with other branches.</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/47332">47332</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/47332","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>2020-02-20 17:44:32 +0000 (Thu, 20 Feb 2020)</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'>Build/Test Tools: Merge some test fixes to the 4.1 branch, for consistency with other branches.
This backports [31253-31254], <a href="https://core.trac.wordpress.org/changeset/31257">[31257]</a>.
See <a href="https://core.trac.wordpress.org/ticket/49485">#49485</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches41testsphpunittestsimageresizephp">branches/4.1/tests/phpunit/tests/image/resize.php</a></li>
<li><a href="#branches41testsphpunittestsimageresize_gdphp">branches/4.1/tests/phpunit/tests/image/resize_gd.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branches41testsphpunittestsexportfunctionsexportphp">branches/4.1/tests/phpunit/tests/export/functions.export.php</a></li>
<li><a href="#branches41testsphpunittestsexportwritersphp">branches/4.1/tests/phpunit/tests/export/writers.php</a></li>
<li><a href="#branches41testsphpunittestsiteratorsphp">branches/4.1/tests/phpunit/tests/iterators.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches41">branches/4.1/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.1
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.1 2020-02-20 17:43:23 UTC (rev 47331)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.1 2020-02-20 17:44:32 UTC (rev 47332)
</ins><a id="branches41"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.1</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/4.8:42478
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:42434
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43988,43994,44014,44017,44047
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:30801-30813,30817,30821,30823-30824,30828-30847,30849,30852-30857,30860,30865-30869,30871-30874,30879,30884-30891,30893,30896-30897,30899-30901,30903,30905,30907,30910,30912,30921,30929,30932,30944-30946,30951-30956,30961,30967,30971,30985,30991,30993,31010,31023,31071,31073,31140,31179-31180,31203,31251,31258-31259,31273,31329,31339,31342,31360,31362,31386,31390,31429,31432,33124,33142,36083,36435,37651,38524,39645,39659,39759,39772,39795,39807-39808,39831,39850,39956,40148,40160,40169,40183,40241,40400,40538,40604,40677,40692,40704,40723,40736,41072,41393,41395,41398,41457,41470,41483,41496,41522,41662,42056,42119-42120,42258-42261,42424,42433,42892-42893,44021,44048,44842,44993,45936,45971,45997,46474-46478,46483,46485,46895
</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">+/trunk:30801-30813,30817,30821,30823-30824,30828-30847,30849,30852-30857,30860,30865-30869,30871-30874,30879,30884-30891,30893,30896-30897,30899-30901,30903,30905,30907,30910,30912,30921,30929,30932,30944-30946,30951-30956,30961,30967,30971,30985,30991,30993,31010,31023,31071,31073,31140,31179-31180,31203,31251,31253-31254,31257-31259,31273,31329,31339,31342,31360,31362,31386,31390,31429,31432,33124,33142,36083,36435,37651,38524,39645,39659,39759,39772,39795,39807-39808,39831,39850,39956,40148,40160,40169,40183,40241,40400,40538,40604,40677,40692,40704,40723,40736,41072,41393,41395,41398,41457,41470,41483,41496,41522,41662,42056,42119-42120,42258-42261,42424,42433,42892-42893,44021,44048,44842,44993,45936,45971,45997,46474-46478,46483,46485,46895
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches41testsphpunittestsexportfunctionsexportphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/4.1/tests/phpunit/tests/export/functions.export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/tests/phpunit/tests/export/functions.export.php 2020-02-20 17:43:23 UTC (rev 47331)
+++ branches/4.1/tests/phpunit/tests/export/functions.export.php 2020-02-20 17:44:32 UTC (rev 47332)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,43 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * Test export functions
- *
- * @group export
- * @ticket 22435
- */
-class Test_WP_Export_Functions extends WP_UnitTestCase {
- function setUp() {
- if ( ! function_exists( 'wp_export' ) ) {
- $this->markTestSkipped( "wp_export function doesn't exist" );
- }
-
- parent::setUp();
- }
-
- function test_wp_export_returns_wp_error_if_the_writer_throws_Export_exception() {
- $this->assertTrue( is_wp_error( wp_export( array( 'writer' => 'Test_WP_Export_Stub_Writer_Throws_Export_Exception' ) ) ) );
- }
-
- function test_wp_export_passes_the_exception_if_the_writer_throws_other_exception() {
- $this->setExpectedException( 'Exception' );
- wp_export( array( 'writer' => 'Test_WP_Export_Stub_Writer_Throws_Other_Exception' ) );
- }
-
-}
-
-class Test_WP_Export_Stub_Writer_Throws_Export_Exception {
- function __construct( $formatter ) {
- }
- function export() {
- throw new WP_Export_Exception( 'baba' );
- }
-}
-
-class Test_WP_Export_Stub_Writer_Throws_Other_Exception {
- function __construct( $formatter ) {
- }
- function export() {
- throw new Exception( 'baba' );
- }
-}
</del></span></pre></div>
<a id="branches41testsphpunittestsexportwritersphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/4.1/tests/phpunit/tests/export/writers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/tests/phpunit/tests/export/writers.php 2020-02-20 17:43:23 UTC (rev 47331)
+++ branches/4.1/tests/phpunit/tests/export/writers.php 2020-02-20 17:44:32 UTC (rev 47332)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,28 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * Test WP_Export_*_Writer classes
- *
- * @group export
- * @ticket 22435
- */
-class Test_WP_Export_Writers extends WP_UnitTestCase {
- function test_export_returner_returns_all_the_return_values() {
- if ( ! class_exists( 'WP_Export_Returner' ) ) {
- $this->markTestSkipped( "WP_Export_Returner class doesn't exist" );
- }
- $returner = new WP_Export_Returner( $this->get_x_formatter() );
- $this->assertEquals( 'xxx' , $returner->export() );
- }
-
- private function get_x_formatter() {
- $methods = array( 'before_posts', 'posts', 'after_posts' );
- $formatter = $this->getMock( 'WP_Export_WXR_Formatter', $methods, array( null ) );
- foreach( $methods as $method ) {
- $return = 'posts' == $method? array( 'x' ) : 'x';
- $formatter->expects( $this->once() )->method( $method )->with()->will( $this->returnValue( $return ) );
- }
- return $formatter;
- }
-}
-
</del></span></pre></div>
<a id="branches41testsphpunittestsimageresizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/tests/phpunit/tests/image/resize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/tests/phpunit/tests/image/resize.php 2020-02-20 17:43:23 UTC (rev 47331)
+++ branches/4.1/tests/phpunit/tests/image/resize.php 2020-02-20 17:44:32 UTC (rev 47332)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,23 +148,6 @@
</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">- * Try resizing a php file (bad image)
- * @ticket 6821
- */
- public function test_resize_bad_image() {
-
- if ( $this->editor_engine == 'WP_Image_Editor_Imagick' ) {
- $this->markTestSkipped( sprintf( 'Avoid GLib-GObject-CRITICAL assertion in %s', $this->editor_engine ) );
- return;
- }
-
- $image = $this->resize_helper( DIR_TESTDATA.'/export/crazy-cdata.xml', 25, 25 );
- $this->assertInstanceOf( 'WP_Error', $image );
- $this->assertEquals( 'invalid_image', $image->get_error_code() );
- }
-
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Function to help out the tests
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function resize_helper( $file, $width, $height, $crop = false ) {
</span></span></pre></div>
<a id="branches41testsphpunittestsimageresize_gdphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/tests/phpunit/tests/image/resize_gd.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/tests/phpunit/tests/image/resize_gd.php 2020-02-20 17:43:23 UTC (rev 47331)
+++ branches/4.1/tests/phpunit/tests/image/resize_gd.php 2020-02-20 17:44:32 UTC (rev 47332)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,4 +22,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Try resizing a php file (bad image)
+ * @ticket 6821
+ */
+ public function test_resize_bad_image() {
+
+ $image = $this->resize_helper( DIR_TESTDATA.'/export/crazy-cdata.xml', 25, 25 );
+ $this->assertInstanceOf( 'WP_Error', $image );
+ $this->assertEquals( 'invalid_image', $image->get_error_code() );
+ }
+
+}
</ins></span></pre></div>
<a id="branches41testsphpunittestsiteratorsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: branches/4.1/tests/phpunit/tests/iterators.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/tests/phpunit/tests/iterators.php 2020-02-20 17:43:23 UTC (rev 47331)
+++ branches/4.1/tests/phpunit/tests/iterators.php 2020-02-20 17:44:32 UTC (rev 47332)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,53 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * @ticket 22435
- */
-class Test_WP_Post_IDs_Iterator extends WP_UnitTestCase {
- function setUp() {
- if ( ! class_exists( 'WP_Post_IDs_Iterator' ) ) {
- $this->markTestSkipped( "WP_Post_IDs_Iterator class doesn't exist" );
- }
-
- parent::setUp();
- }
-
- function test_create() {
- new WP_Post_IDs_Iterator( array( 1, 2, 3 ) );
- }
-
- function test_no_posts() {
- $this->assertIteratorReturnsSamePostIDs( array() );
- }
-
- function test_less_ids_than_limit() {
- $post_id_0 = $this->factory->post->create();
- $post_id_1 = $this->factory->post->create();
- $this->assertIteratorReturnsSamePostIDs( array( $post_id_0, $post_id_1 ), 10 );
- }
-
- function test_ids_exactly_as_limit() {
- $post_id_0 = $this->factory->post->create();
- $post_id_1 = $this->factory->post->create();
- $this->assertIteratorReturnsSamePostIDs( array( $post_id_0, $post_id_1 ), 2 );
- }
-
- function test_more_ids_than_limit() {
- $post_id_0 = $this->factory->post->create();
- $post_id_1 = $this->factory->post->create();
- $post_id_2 = $this->factory->post->create();
- $this->assertIteratorReturnsSamePostIDs( array( $post_id_0, $post_id_1, $post_id_2 ), 2 );
- }
-
- function test_ids_exactly_twice_more_than_limit() {
- $post_id_0 = $this->factory->post->create();
- $post_id_1 = $this->factory->post->create();
- $post_id_2 = $this->factory->post->create();
- $post_id_3 = $this->factory->post->create();
- $this->assertIteratorReturnsSamePostIDs( array( $post_id_0, $post_id_1, $post_id_2, $post_id_3 ), 2 );
- }
-
- private function assertIteratorReturnsSamePostIDs( $post_ids, $limit = 2 ) {
- $this->assertEquals( $post_ids, wp_list_pluck( iterator_to_array( new WP_Post_IDs_Iterator( $post_ids, $limit ) ), 'ID' ) );
- }
-}
</del></span></pre>
</div>
</div>
</body>
</html>