<!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>[38762] trunk/tests/phpunit/tests: Build/Test Tools: Begin eliminating unnecessary randomness in 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 { 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/38762">38762</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/38762","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-10-09 01:11:14 +0000 (Sun, 09 Oct 2016)</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: Begin eliminating unnecessary randomness in tests.
Although unlikely, clashes in randomly generated strings could cause unexpected failures. In addition, most randomness is entirely unnecessary, is bad practice, and increases test time (however small it may be).
See <a href="https://core.trac.wordpress.org/ticket/37371">#37371</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfilephp">trunk/tests/phpunit/tests/file.php</a></li>
<li><a href="#trunktestsphpunittestsfiltersphp">trunk/tests/phpunit/tests/filters.php</a></li>
<li><a href="#trunktestsphpunittestsgeneraldocumenttitlephp">trunk/tests/phpunit/tests/general/document-title.php</a></li>
<li><a href="#trunktestsphpunittestshooksadd_filterphp">trunk/tests/phpunit/tests/hooks/add_filter.php</a></li>
<li><a href="#trunktestsphpunittestshooksapply_filtersphp">trunk/tests/phpunit/tests/hooks/apply_filters.php</a></li>
<li><a href="#trunktestsphpunittestshooksdo_actionphp">trunk/tests/phpunit/tests/hooks/do_action.php</a></li>
<li><a href="#trunktestsphpunittestshooksdo_all_hookphp">trunk/tests/phpunit/tests/hooks/do_all_hook.php</a></li>
<li><a href="#trunktestsphpunittestshookshas_filterphp">trunk/tests/phpunit/tests/hooks/has_filter.php</a></li>
<li><a href="#trunktestsphpunittestshookshas_filtersphp">trunk/tests/phpunit/tests/hooks/has_filters.php</a></li>
<li><a href="#trunktestsphpunittestshooksiteratorphp">trunk/tests/phpunit/tests/hooks/iterator.php</a></li>
<li><a href="#trunktestsphpunittestshookspreinit_hooksphp">trunk/tests/phpunit/tests/hooks/preinit_hooks.php</a></li>
<li><a href="#trunktestsphpunittestshooksremove_all_filtersphp">trunk/tests/phpunit/tests/hooks/remove_all_filters.php</a></li>
<li><a href="#trunktestsphpunittestshooksremove_filterphp">trunk/tests/phpunit/tests/hooks/remove_filter.php</a></li>
<li><a href="#trunktestsphpunittestsimagefunctionsphp">trunk/tests/phpunit/tests/image/functions.php</a></li>
<li><a href="#trunktestsphpunittestslinkgetPreviewPostLinkphp">trunk/tests/phpunit/tests/link/getPreviewPostLink.php</a></li>
<li><a href="#trunktestsphpunittestsmetaphp">trunk/tests/phpunit/tests/meta.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitegetSpaceUsedphp">trunk/tests/phpunit/tests/multisite/getSpaceUsed.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitemsfilesrewritingphp">trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>
<li><a href="#trunktestsphpunittestsoembedWpEmbedphp">trunk/tests/phpunit/tests/oembed/WpEmbed.php</a></li>
<li><a href="#trunktestsphpunittestsoptionmultisitephp">trunk/tests/phpunit/tests/option/multisite.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsfilephp"></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/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/file.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/file.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +84,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_unique_filename_is_valid() {
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure it produces a valid, writable, unique filename
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filename = wp_unique_filename( $this->dir, rand_str() . '.txt' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filename = wp_unique_filename( $this->dir, __FUNCTION__ . '.txt' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $this->is_unique_writable_file($this->dir, $filename) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_unique_filename_is_unique() {
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure it produces two unique filenames
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $name = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $name = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $filename1 = wp_unique_filename( $this->dir, $name . '.txt' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $this->is_unique_writable_file($this->dir, $filename1) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,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"> function test_unique_filename_is_sanitized() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $name = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $name = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $filename = wp_unique_filename( $this->dir, $name . $this->badchars . '.txt' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure the bad characters were all stripped out
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +120,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"> function test_unique_filename_with_slashes() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $name = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $name = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> // "foo/foo.txt"
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = wp_unique_filename( $this->dir, $name . '/' . $name . '.txt' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_unique_filename_multiple_ext() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $name = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $name = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $filename = wp_unique_filename( $this->dir, $name . '.php.txt' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // "foo.php.txt" becomes "foo.php_.txt"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,7 +145,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"> function test_unique_filename_no_ext() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $name = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $name = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $filename = wp_unique_filename( $this->dir, $name );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $name, $filename );
</span></span></pre></div>
<a id="trunktestsphpunittestsfiltersphp"></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/filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/filters.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/filters.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,8 +9,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_simple_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
- $val = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
+ $val = __FUNCTION__ . '_val';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter($tag, array($a, 'filter'));
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals($val, apply_filters($tag, $val));
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,8 +27,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_remove_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
- $val = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
+ $val = __FUNCTION__ . '_val';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter($tag, array($a, 'filter'));
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals($val, apply_filters($tag, $val));
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,8 +46,8 @@
</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"> function test_has_filter() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
- $func = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
+ $func = __FUNCTION__ . '_func';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_filter($tag, $func) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( has_filter($tag) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,8 +63,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_multiple_filters() {
</span><span class="cx" style="display: block; padding: 0 10px"> $a1 = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $a2 = new MockAction();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
- $val = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
+ $val = __FUNCTION__ . '_val';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // add both filters to the hook
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter($tag, array($a1, 'filter'));
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,9 +79,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_filter_args_1() {
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
- $val = rand_str();
- $arg1 = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
+ $val = __FUNCTION__ . '_val';
+ $arg1 = __FUNCTION__ . '_arg1';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter($tag, array($a, 'filter'), 10, 2);
</span><span class="cx" style="display: block; padding: 0 10px"> // call the filter with a single argument
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,10 +95,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_filter_args_2() {
</span><span class="cx" style="display: block; padding: 0 10px"> $a1 = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $a2 = new MockAction();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
- $val = rand_str();
- $arg1 = rand_str();
- $arg2 = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
+ $val = __FUNCTION__ . '_val';
+ $arg1 = __FUNCTION__ . '_arg1';
+ $arg2 = __FUNCTION__ . '_arg2';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // a1 accepts two arguments, a2 doesn't
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter($tag, array($a1, 'filter'), 10, 3);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,8 +119,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_filter_priority() {
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
- $val = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
+ $val = __FUNCTION__ . '_val';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // make two filters with different priorities
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter($tag, array($a, 'filter'), 10);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,9 +150,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_all_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag1 = rand_str();
- $tag2 = rand_str();
- $val = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag1 = __FUNCTION__ . '_1';
+ $tag2 = __FUNCTION__ . '_2';
+ $val = __FUNCTION__ . '_val';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // add an 'all' filter
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter('all', array($a, 'filterall'));
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,8 +174,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_remove_all_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
- $val = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
+ $val = __FUNCTION__ . '_val';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter('all', array($a, 'filterall'));
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( has_filter('all') );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,8 +201,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_remove_all_filters_should_respect_the_priority_argument() {
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
- $val = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
+ $val = __FUNCTION__ . '_val';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( $tag, array( $a, 'filter' ), 12 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( has_filter( $tag ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +221,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_filter_ref_array() {
</span><span class="cx" style="display: block; padding: 0 10px"> $obj = new stdClass();
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action($tag, array($a, 'filter'));
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,7 +241,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $obj = new stdClass();
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $b = new MockAction();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action($tag, array($a, 'filter_append'), 10, 2);
</span><span class="cx" style="display: block; padding: 0 10px"> add_action($tag, array($b, 'filter_append'), 10, 2);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,8 +274,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_has_filter_after_remove_all_filters() {
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
- $val = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
+ $val = __FUNCTION__ . '_val';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // No priority
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( $tag, array( $a, 'filter' ), 11 );
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneraldocumenttitlephp"></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/general/document-title.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/document-title.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/general/document-title.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_id = $this->factory->post->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $this->author_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_content' => rand_str(),
</del><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => 'test_title',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => '2015-09-22 18:52:17',
</span></span></pre></div>
<a id="trunktestsphpunittestshooksadd_filterphp"></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/hooks/add_filter.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/add_filter.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/hooks/add_filter.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_filter_with_function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = array( $a, 'action' );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_filter_with_static_method() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = array( 'MockAction', 'action' );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_one = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_two = '__return_false';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_one = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_two = '__return_false';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_readd_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_readd_filter_with_different_priority() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $b = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $c = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->add_filter( $tag, array( $a, 'action' ), 10, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->add_filter( $tag, array( $b, 'action' ), 5, 1 );
</span></span></pre></div>
<a id="trunktestsphpunittestshooksapply_filtersphp"></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/hooks/apply_filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/apply_filters.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/hooks/apply_filters.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,10 +11,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = array( $a, 'filter' );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $arg = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $arg = __FUNCTION__ . '_arg';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->add_filter( $tag, $callback, $priority, $accepted_args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,10 +28,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = array( $a, 'filter' );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $arg = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $arg = __FUNCTION__ . '_arg';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->add_filter( $tag, $callback, $priority, $accepted_args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestshooksdo_actionphp"></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/hooks/do_action.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/do_action.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/hooks/do_action.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,10 +19,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = array( $a, 'action' );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $arg = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $arg = __FUNCTION__ . '_arg';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->add_filter( $tag, $callback, $priority, $accepted_args );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->do_action( array( $arg ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,10 +34,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = array( $a, 'filter' );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $arg = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $arg = __FUNCTION__ . '_arg';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->add_filter( $tag, $callback, $priority, $accepted_args );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->do_action( array( $arg ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,10 +52,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_one = array( $a, 'filter' );
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_two = array( $b, 'filter' );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $arg = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $arg = __FUNCTION__ . '_arg';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->add_filter( $tag, $callback_one, $priority, $accepted_args );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->add_filter( $tag, $callback_two, $priority, $accepted_args );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,10 +71,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_one = array( $a, 'filter' );
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_two = array( $b, 'filter' );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $arg = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $arg = __FUNCTION__ . '_arg';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->add_filter( $tag, $callback_one, $priority, $accepted_args );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->add_filter( $tag, $callback_two, $priority, $accepted_args );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,10 +87,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_do_action_with_no_accepted_args() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = array( $this, '_action_callback' );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $arg = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $arg = __FUNCTION__ . '_arg';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->add_filter( $tag, $callback, $priority, $accepted_args );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->do_action( array( $arg ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,10 +101,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_do_action_with_one_accepted_arg() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = array( $this, '_action_callback' );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = 1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $arg = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $arg = __FUNCTION__ . '_arg';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->add_filter( $tag, $callback, $priority, $accepted_args );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->do_action( array( $arg ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,10 +115,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_do_action_with_more_accepted_args() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = array( $this, '_action_callback' );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = 1000;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $arg = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $arg = __FUNCTION__ . '_arg';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->add_filter( $tag, $callback, $priority, $accepted_args );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->do_action( array( $arg ) );
</span></span></pre></div>
<a id="trunktestsphpunittestshooksdo_all_hookphp"></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/hooks/do_all_hook.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/do_all_hook.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/hooks/do_all_hook.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = 'all';
</span><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $arg = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $arg = 'all_arg';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hook->add_filter( $tag, $callback, $priority, $accepted_args );
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( $arg );
</span></span></pre></div>
<a id="trunktestsphpunittestshookshas_filterphp"></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/hooks/has_filter.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/has_filter.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/hooks/has_filter.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_has_filter_with_function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = array( $a, 'action' );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_has_filter_with_static_method() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = array( 'MockAction', 'action' );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_has_filter_without_callback() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_not_has_filter_with_callback() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $hook->has_filter( $tag, $callback ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_has_filter_with_wrong_callback() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestshookshas_filtersphp"></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/hooks/has_filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/has_filters.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/hooks/has_filters.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_has_filters_with_callback() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_not_has_filters_with_removed_callback() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_not_has_filter_with_directly_removed_callback() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestshooksiteratorphp"></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/hooks/iterator.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/iterator.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/hooks/iterator.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_one = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_two = '__return_false';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestshookspreinit_hooksphp"></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/hooks/preinit_hooks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/preinit_hooks.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/hooks/preinit_hooks.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,9 +8,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_WP_Hook_Preinit_Hooks extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_array_to_hooks() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag1 = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag1 = __FUNCTION__ . '_1';
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority1 = rand( 1, 100 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag2 = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag2 = __FUNCTION__ . '_2';
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority2 = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $filters = array(
</span><span class="cx" style="display: block; padding: 0 10px"> $tag1 => array(
</span></span></pre></div>
<a id="trunktestsphpunittestshooksremove_all_filtersphp"></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/hooks/remove_all_filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/remove_all_filters.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/hooks/remove_all_filters.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_remove_all_filters() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_one = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_two = '__return_false';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestshooksremove_filterphp"></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/hooks/remove_filter.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/hooks/remove_filter.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/hooks/remove_filter.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_remove_filter_with_function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $a = new MockAction();
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = array( $a, 'action' );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_remove_filter_with_static_method() {
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = array( 'MockAction', 'action' );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_one = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_two = '__return_false';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_one = '__return_null';
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_two = '__return_false';
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = new WP_Hook();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $priority = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $accepted_args = rand( 1, 100 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsimagefunctionsphp"></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/image/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/functions.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/image/functions.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image( 'https://asdftestblog1.files.wordpress.com/2008/04/canola.jpg',
</span><span class="cx" style="display: block; padding: 0 10px"> 0, 0, 100, 100, 100, 100, false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- DIR_TESTDATA . '/images/' . rand_str() . '.jpg' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ DIR_TESTDATA . '/images/' . __FUNCTION__ . '.jpg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'WP_Error', $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFileExists( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $image = wp_get_image_editor( $file );
</span></span></pre></div>
<a id="trunktestsphpunittestslinkgetPreviewPostLinkphp"></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/link/getPreviewPostLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/getPreviewPostLink.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/link/getPreviewPostLink.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,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"> public function test_get_preview_post_link_should_return_empty_string_for_non_viewable_post_type() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_type = register_post_type( rand_str(12), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type = register_post_type( 'non_viewable_cpt', array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</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="trunktestsphpunittestsmetaphp"></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/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/meta.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/meta.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,7 +161,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"> function test_metadata_slashes() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = 'Test\\singleslash';
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = 'Testsingleslash';
</span><span class="cx" style="display: block; padding: 0 10px"> $value2 = 'Test\\\\doubleslash';
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitegetSpaceUsedphp"></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/multisite/getSpaceUsed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/getSpaceUsed.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/multisite/getSpaceUsed.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,8 +35,8 @@
</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"> // Upload a file to the new site.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filename = rand_str().'.jpg';
- $contents = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filename = __FUNCTION__ . '.jpg';
+ $contents = __FUNCTION__ . '_contents';
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = wp_upload_bits( $filename, null, $contents );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // get_space_used() is measures in MB, get the size of the new file in MB.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,8 +71,8 @@
</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"> // Upload a file to the new site.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filename = rand_str().'.jpg';
- $contents = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filename = __FUNCTION__ . '.jpg';
+ $contents = __FUNCTION__ . '_contents';
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_upload_bits( $filename, null, $contents );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitemsfilesrewritingphp"></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/multisite/ms-files-rewriting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,8 +61,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * should change with upload directories.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_upload_directories_after_multiple_wpmu_delete_blog_with_ms_files() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filename = rand_str().'.jpg';
- $contents = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filename = __FUNCTION__ . '.jpg';
+ $contents = __FUNCTION__ . '_contents';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Upload a file to the main site on the network.
</span><span class="cx" style="display: block; padding: 0 10px"> $file1 = wp_upload_bits( $filename, null, $contents );
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitesitephp"></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/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/multisite/site.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,8 +270,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * should change with upload directories.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_upload_directories_after_multiple_wpmu_delete_blog() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filename = rand_str().'.jpg';
- $contents = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filename = __FUNCTION__ . '.jpg';
+ $contents = __FUNCTION__ . '_contents';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Upload a file to the main site on the network.
</span><span class="cx" style="display: block; padding: 0 10px"> $file1 = wp_upload_bits( $filename, null, $contents );
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedWpEmbedphp"></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/oembed/WpEmbed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/WpEmbed.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/oembed/WpEmbed.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,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"> public function test_wp_embed_register_handler() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $handle = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $handle = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $regex = '#https?://example\.com/embed/([^/]+)#i';
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = array( $this, '_embed_handler_callback' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,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"> public function test_autoembed_should_return_modified_content() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $handle = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $handle = __FUNCTION__;
</ins><span class="cx" style="display: block; padding: 0 10px"> $regex = '#https?://example\.com/embed/([^/]+)#i';
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = array( $this, '_embed_handler_callback' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionmultisitephp"></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/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/multisite.php 2016-10-08 22:42:12 UTC (rev 38761)
+++ trunk/tests/phpunit/tests/option/multisite.php 2016-10-09 01:11:14 UTC (rev 38762)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,10 +25,10 @@
</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"> function test_from_same_site() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = rand_str();
- $key2 = rand_str();
- $value = rand_str();
- $value2 = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = __FUNCTION__ . '_1';
+ $key2 = __FUNCTION__ . '_2';
+ $value = __FUNCTION__ . '_val1';
+ $value2 = __FUNCTION__ . '_val2';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_blog_option( 1, 'doesnotexist' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_option( 'doesnotexist' ) ); // check get_option()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,10 +62,10 @@
</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"> function test_from_same_site_with_null_blog_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = rand_str();
- $key2 = rand_str();
- $value = rand_str();
- $value2 = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = __FUNCTION__ . '_1';
+ $key2 = __FUNCTION__ . '_2';
+ $value = __FUNCTION__ . '_val1';
+ $value2 = __FUNCTION__ . '_val2';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_blog_option( null, 'doesnotexist' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_option( 'doesnotexist' ) ); // check get_option()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,10 +109,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'integer', $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = rand_str();
- $key2 = rand_str();
- $value = rand_str();
- $value2 = rand_str();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = __FUNCTION__ . '_key1';
+ $key2 = __FUNCTION__ . '_key2';
+ $value = __FUNCTION__ . '_val1';
+ $value2 = __FUNCTION__ . '_val2';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_blog_option( $blog_id, 'doesnotexist' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> //$this->assertFalse( get_option( 'doesnotexist' ) ); // check get_option()
</span></span></pre>
</div>
</div>
</body>
</html>