<!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>[48996] trunk/tests/phpunit/tests: Tests: Consistently use the `expectException()` method instead of the older `@expectedException` annotation.</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/48996">48996</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/48996","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-09-18 13:22:22 +0000 (Fri, 18 Sep 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'>Tests: Consistently use the `expectException()` method instead of the older `@expectedException` annotation.
See https://thephp.cc/news/2016/02/questioning-phpunit-best-practices
The method is available since PHPUnit 5.2, and WordPress currently supports PHPUnit 5.4 as the minimum version.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/48993">[48993]</a>.
See <a href="https://core.trac.wordpress.org/ticket/51344">#51344</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsajaxDeletePluginphp">trunk/tests/phpunit/tests/ajax/DeletePlugin.php</a></li>
<li><a href="#trunktestsphpunittestsajaxUpdatePluginphp">trunk/tests/phpunit/tests/ajax/UpdatePlugin.php</a></li>
<li><a href="#trunktestsphpunittestscommentwpAllowCommentphp">trunk/tests/phpunit/tests/comment/wpAllowComment.php</a></li>
<li><a href="#trunktestsphpunittestscompatphp">trunk/tests/phpunit/tests/compat.php</a></li>
<li><a href="#trunktestsphpunittestsdbphp">trunk/tests/phpunit/tests/db.php</a></li>
<li><a href="#trunktestsphpunittestsformattingredirectphp">trunk/tests/phpunit/tests/formatting/redirect.php</a></li>
<li><a href="#trunktestsphpunittestsincludeshelpersphp">trunk/tests/phpunit/tests/includes/helpers.php</a></li>
<li><a href="#trunktestsphpunittestsoptionoptionphp">trunk/tests/phpunit/tests/option/option.php</a></li>
<li><a href="#trunktestsphpunittestsprivacywpPrivacyGeneratePersonalDataExportFilephp">trunk/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php</a></li>
<li><a href="#trunktestsphpunittestsprivacywpPrivacyProcessPersonalDataExportPagephp">trunk/tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsajaxDeletePluginphp"></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/ajax/DeletePlugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/DeletePlugin.php 2020-09-18 11:04:48 UTC (rev 48995)
+++ trunk/tests/phpunit/tests/ajax/DeletePlugin.php 2020-09-18 13:22:22 UTC (rev 48996)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,11 +10,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ajax
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Ajax_Delete_Plugin extends WP_Ajax_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * @expectedException WPAjaxDieStopException
- * @expectedExceptionMessage -1
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_missing_nonce() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_handleAjax( 'delete-plugin' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsajaxUpdatePluginphp"></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/ajax/UpdatePlugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/UpdatePlugin.php 2020-09-18 11:04:48 UTC (rev 48995)
+++ trunk/tests/phpunit/tests/ajax/UpdatePlugin.php 2020-09-18 13:22:22 UTC (rev 48996)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,11 +10,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group ajax
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Ajax_Update_Plugin extends WP_Ajax_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * @expectedException WPAjaxDieStopException
- * @expectedExceptionMessage -1
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_missing_nonce() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_handleAjax( 'update-plugin' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscommentwpAllowCommentphp"></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/comment/wpAllowComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/wpAllowComment.php 2020-09-18 11:04:48 UTC (rev 48995)
+++ trunk/tests/phpunit/tests/comment/wpAllowComment.php 2020-09-18 13:22:22 UTC (rev 48996)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,10 +52,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $result );
</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">- /**
- * @expectedException WPDieException
- */
</del><span class="cx" style="display: block; padding: 0 10px"> public function test_die_as_duplicate_if_comment_author_name_and_emails_match() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->expectException( 'WPDieException' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => self::$post_id,
</span></span></pre></div>
<a id="trunktestsphpunittestscompatphp"></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/compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/compat.php 2020-09-18 11:04:48 UTC (rev 48995)
+++ trunk/tests/phpunit/tests/compat.php 2020-09-18 13:22:22 UTC (rev 48996)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,10 +179,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 1 => '993003b95758e0ac2eba451a4c5877eb1bb7b92a' ), unpack( 'H40', _hash_hmac( 'sha1', 'simple', 'key', true ) ) );
</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">- /**
- * @expectedException PHPUnit_Framework_Error_Deprecated
- */
</del><span class="cx" style="display: block; padding: 0 10px"> function test_json_encode_decode() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->expectException( 'PHPUnit_Framework_Error_Deprecated' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-json.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $json = new Services_JSON();
</span><span class="cx" style="display: block; padding: 0 10px"> // Super basic test to verify Services_JSON is intact and working.
</span></span></pre></div>
<a id="trunktestsphpunittestsdbphp"></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/db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/db.php 2020-09-18 11:04:48 UTC (rev 48995)
+++ trunk/tests/phpunit/tests/db.php 2020-09-18 13:22:22 UTC (rev 48996)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -524,11 +524,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $wpdb->check_database_version() );
</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">- /**
- * @expectedException WPDieException
- */
</del><span class="cx" style="display: block; padding: 0 10px"> function test_bail() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->expectException( 'WPDieException' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->bail( 'Database is dead.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingredirectphp"></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/formatting/redirect.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/redirect.php 2020-09-18 11:04:48 UTC (rev 48995)
+++ trunk/tests/phpunit/tests/formatting/redirect.php 2020-09-18 13:22:22 UTC (rev 48996)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,12 +24,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44317
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider get_bad_status_codes
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @expectedException WPDieException
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $location The path or URL to redirect to.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $status HTTP response status code to use.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_redirect_bad_status_code( $location, $status ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->expectException( 'WPDieException' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( $location, $status );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsincludeshelpersphp"></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/includes/helpers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/includes/helpers.php 2020-09-18 11:04:48 UTC (rev 48995)
+++ trunk/tests/phpunit/tests/includes/helpers.php 2020-09-18 13:22:22 UTC (rev 48996)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,17 +268,18 @@
</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 36166
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @expectedException WPDieException
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_die_handler_should_handle_wp_error() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->expectException( 'WPDieException' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( new WP_Error( 'test', 'test' ) );
</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><span class="cx" style="display: block; padding: 0 10px"> * @ticket 46813
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @expectedException WPDieException
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_die_handler_should_not_cause_doing_it_wrong_notice_without_wp_query_set() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->expectException( 'WPDieException' );
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['wp_query'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die();
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionoptionphp"></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/option/option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/option.php 2020-09-18 11:04:48 UTC (rev 48995)
+++ trunk/tests/phpunit/tests/option/option.php 2020-09-18 13:22:22 UTC (rev 48996)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,17 +101,17 @@
</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 23289
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @expectedException WPDieException
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_special_option_name_alloption() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->expectException( 'WPDieException' );
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_option( 'alloptions' );
</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><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23289
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @expectedException WPDieException
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_special_option_name_notoptions() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->expectException( 'WPDieException' );
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_option( 'notoptions' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsprivacywpPrivacyGeneratePersonalDataExportFilephp"></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/privacy/wpPrivacyGeneratePersonalDataExportFile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php 2020-09-18 11:04:48 UTC (rev 48995)
+++ trunk/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php 2020-09-18 13:22:22 UTC (rev 48996)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_rejects_remove_requests() {
</span><span class="cx" style="display: block; padding: 0 10px"> $request_id = wp_create_user_request( 'removal-requester@example.com', 'remove_personal_data' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->setExpectedException( 'WPDieException' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->expectException( 'WPDieException' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( '{"success":false,"data":"Invalid request ID when generating export file."}' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_privacy_generate_personal_data_export_file( $request_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 44233
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_invalid_request_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->setExpectedException( 'WPDieException' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->expectException( 'WPDieException' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( '{"success":false,"data":"Invalid request ID when generating export file."}' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_privacy_generate_personal_data_export_file( 123456789 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +194,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">- $this->setExpectedException( 'WPDieException' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->expectException( 'WPDieException' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( '{"success":false,"data":"Invalid email address when generating export file."}' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_privacy_generate_personal_data_export_file( $request_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +208,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a file with the folder name to ensure the function cannot create a folder.
</span><span class="cx" style="display: block; padding: 0 10px"> touch( untrailingslashit( self::$exports_dir ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->setExpectedException( 'WPDieException' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->expectException( 'WPDieException' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( '{"success":false,"data":"Unable to create export folder."}' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_privacy_generate_personal_data_export_file( self::$export_request_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsprivacywpPrivacyProcessPersonalDataExportPagephp"></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/privacy/wpPrivacyProcessPersonalDataExportPage.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php 2020-09-18 11:04:48 UTC (rev 48995)
+++ trunk/tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php 2020-09-18 13:22:22 UTC (rev 48996)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $expected_output The expected string exception output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function _setup_expected_failure( $expected_output ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->setExpectedException( 'WPDieException' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->expectException( 'WPDieException' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( $expected_output );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>