<!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>[25402] trunk/tests/phpunit: There was way too much duplicated code in my notice cleanup, it built up over time, and there's definitely a need to standardize.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25402">25402</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-12 14:47:58 +0000 (Thu, 12 Sep 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>There was way too much duplicated code in my notice cleanup, it built up over time, and there's definitely a need to standardize.

* Remove duplicated code for deprecated function notice suppression
* Add support in `WP_UnitTestCase` setUp/tearDown methods for `$deprecated_functions` fixture if the extending class has added it
* Add a `$deprecated_functions` fixture to each extending class that needs it

To use this fixture, add something to your Test Case class like so:
`protected $deprecated_functions = array( 'get_theme', 'get_themes', 'get_theme_data', 'get_current_theme' );`

See <a href="http://core.trac.wordpress.org/ticket/25282">#25282</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludestestcasephp">trunk/tests/phpunit/includes/testcase.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesThemephp">trunk/tests/phpunit/tests/admin/includesTheme.php</a></li>
<li><a href="#trunktestsphpunittestsformattingCleanPrephp">trunk/tests/phpunit/tests/formatting/CleanPre.php</a></li>
<li><a href="#trunktestsphpunittestsimagefunctionsphp">trunk/tests/phpunit/tests/image/functions.php</a></li>
<li><a href="#trunktestsphpunittestsimagesizephp">trunk/tests/phpunit/tests/image/size.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
<li><a href="#trunktestsphpunittestsmsphp">trunk/tests/phpunit/tests/ms.php</a></li>
<li><a href="#trunktestsphpunitteststhemethemeDirphp">trunk/tests/phpunit/tests/theme/themeDir.php</a></li>
<li><a href="#trunktestsphpunitteststhemephp">trunk/tests/phpunit/tests/theme.php</a></li>
<li><a href="#trunktestsphpunittestsusercapabilitiesphp">trunk/tests/phpunit/tests/user/capabilities.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludestestcasephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/includes/testcase.php (25401 => 25402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/includes/testcase.php        2013-09-12 13:38:42 UTC (rev 25401)
+++ trunk/tests/phpunit/includes/testcase.php   2013-09-12 14:47:58 UTC (rev 25402)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
</span><span class="cx"> 
</span><span class="cx">  protected static $forced_tickets = array();
</span><ins>+       protected $deprecated_functions = array();
</ins><span class="cx"> 
</span><span class="cx">  /**
</span><span class="cx">   * @var WP_UnitTest_Factory
</span><span class="lines">@@ -24,6 +25,9 @@
</span><span class="cx">          $this->clean_up_global_scope();
</span><span class="cx">          $this->start_transaction();
</span><span class="cx">          add_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
</span><ins>+
+               if ( ! empty( $this->deprecated_functions ) )
+                       add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
</ins><span class="cx">   }
</span><span class="cx"> 
</span><span class="cx">  function tearDown() {
</span><span class="lines">@@ -32,8 +36,20 @@
</span><span class="cx">          remove_filter( 'dbdelta_create_queries', array( $this, '_create_temporary_tables' ) );
</span><span class="cx">          remove_filter( 'query', array( $this, '_drop_temporary_tables' ) );
</span><span class="cx">          remove_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
</span><ins>+               if ( ! empty( $this->deprecated_functions ) )
+                       remove_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
</ins><span class="cx">   }
</span><span class="cx"> 
</span><ins>+       function deprecated_function_run( $function ) {
+               if ( in_array( $function, $this->deprecated_functions ) )
+                       add_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
+       }
+
+       function deprecated_function_trigger_error() {
+               remove_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
+               return false;
+       }
+
</ins><span class="cx">   function clean_up_global_scope() {
</span><span class="cx">          $_GET = array();
</span><span class="cx">          $_POST = array();
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesThemephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/admin/includesTheme.php (25401 => 25402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/admin/includesTheme.php        2013-09-12 13:38:42 UTC (rev 25401)
+++ trunk/tests/phpunit/tests/admin/includesTheme.php   2013-09-12 14:47:58 UTC (rev 25402)
</span><span class="lines">@@ -3,6 +3,8 @@
</span><span class="cx">  * @group themes
</span><span class="cx">  */
</span><span class="cx"> class Tests_Admin_includesTheme extends WP_UnitTestCase {
</span><ins>+       protected $deprecated_functions = array( 'get_theme', 'get_themes', 'get_theme_data', 'get_current_theme' );
+
</ins><span class="cx">   function setUp() {
</span><span class="cx">          parent::setUp();
</span><span class="cx">          $this->theme_root = DIR_TESTDATA . '/themedir1';
</span><span class="lines">@@ -17,20 +19,8 @@
</span><span class="cx">          // clear caches
</span><span class="cx">          wp_clean_themes_cache();
</span><span class="cx">          unset( $GLOBALS['wp_themes'] );
</span><del>-               
-               add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run_check' ) );
</del><span class="cx">   }
</span><span class="cx"> 
</span><del>-       function deprecated_function_run_check( $function ) {
-               if ( in_array( $function, array( 'get_theme', 'get_themes', 'get_theme_data', 'get_current_theme' ) ) )
-                       add_filter( 'deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
-       }
-
-       function filter_deprecated_function_trigger_error() {
-               remove_filter( 'deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
-               return false;
-       }
-
</del><span class="cx">   function tearDown() {
</span><span class="cx">          $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
</span><span class="cx">          remove_filter('theme_root', array($this, '_theme_root'));
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingCleanPrephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/formatting/CleanPre.php (25401 => 25402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/formatting/CleanPre.php        2013-09-12 13:38:42 UTC (rev 25401)
+++ trunk/tests/phpunit/tests/formatting/CleanPre.php   2013-09-12 14:47:58 UTC (rev 25402)
</span><span class="lines">@@ -7,26 +7,8 @@
</span><span class="cx">  * @group formatting
</span><span class="cx">  */
</span><span class="cx"> class Tests_Formatting_CleanPre extends WP_UnitTestCase {
</span><del>-       function setUp() {
-               parent::setUp();
-               add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run_check' ) );
-       }
</del><ins>+        protected $deprecated_functions = array( 'clean_pre' );
</ins><span class="cx"> 
</span><del>-       function tearDown() {
-               parent::tearDown();
-               remove_action( 'deprecated_function_run', array( $this, 'deprecated_function_run_check' ) );
-       }
-
-       function deprecated_function_run_check( $function ) {
-               if ( in_array( $function, array( 'clean_pre' ) ) )
-                       add_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
-       }
-
-       function deprecated_function_trigger_error() {
-               remove_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
-               return false;
-       }
-
</del><span class="cx">   function test_removes_self_closing_br_with_space() {
</span><span class="cx">          $source = 'a b c\n<br />sldfj<br />';
</span><span class="cx">          $res = 'a b c\nsldfj';
</span></span></pre></div>
<a id="trunktestsphpunittestsimagefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/image/functions.php (25401 => 25402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/image/functions.php    2013-09-12 13:38:42 UTC (rev 25401)
+++ trunk/tests/phpunit/tests/image/functions.php       2013-09-12 14:47:58 UTC (rev 25402)
</span><span class="lines">@@ -6,6 +6,8 @@
</span><span class="cx">  * @group upload
</span><span class="cx">  */
</span><span class="cx"> class Tests_Image_Functions extends WP_UnitTestCase {
</span><ins>+       protected $deprecated_functions = array( 'wp_load_image' );
+
</ins><span class="cx">   /**
</span><span class="cx">   * Setup test fixture
</span><span class="cx">   */
</span><span class="lines">@@ -17,24 +19,8 @@
</span><span class="cx">          require_once( ABSPATH . WPINC . '/class-wp-image-editor-imagick.php' );
</span><span class="cx"> 
</span><span class="cx">          include_once( DIR_TESTDATA . '/../includes/mock-image-editor.php' );
</span><del>-               add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
</del><span class="cx">   }
</span><span class="cx"> 
</span><del>-       function tearDown() {
-               parent::tearDown();
-               remove_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
-       }
-
-       function deprecated_function_run( $function ) {
-               if ( in_array( $function, array( 'wp_load_image' ) ) )
-                       add_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
-       }
-
-       function deprecated_function_trigger_error() {
-               remove_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
-               return false;
-       }
-
</del><span class="cx">   /**
</span><span class="cx">   * Get the MIME type of a file
</span><span class="cx">   * @param string $filename
</span></span></pre></div>
<a id="trunktestsphpunittestsimagesizephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/image/size.php (25401 => 25402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/image/size.php 2013-09-12 13:38:42 UTC (rev 25401)
+++ trunk/tests/phpunit/tests/image/size.php    2013-09-12 14:47:58 UTC (rev 25402)
</span><span class="lines">@@ -6,28 +6,8 @@
</span><span class="cx">  * @group upload
</span><span class="cx">  */
</span><span class="cx"> class Tests_Image_Size extends WP_UnitTestCase {
</span><del>-       function setUp() {
-               parent::setUp();
-
-               add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run_check' ) );
-       }
-
-       function tearDown() {
-               parent::tearDown();
-
-               remove_action( 'deprecated_function_run', array( $this, 'deprecated_function_run_check' ) );
-       }
-
-       function deprecated_function_run_check( $function ) {
-               if ( in_array( $function, array( 'wp_shrink_dimensions' ) ) )
-                       add_filter( 'deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
-       }
-
-       function filter_deprecated_function_trigger_error() {
-               remove_filter( 'deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
-               return false;
-       }
-
</del><ins>+        protected $deprecated_functions = array( 'wp_shrink_dimensions' );
+       
</ins><span class="cx">   function test_constrain_dims_zero() {
</span><span class="cx">          if (!is_callable('wp_constrain_dimensions'))
</span><span class="cx">                  $this->markTestSkipped('wp_constrain_dimensions() is not callable.');
</span></span></pre></div>
<a id="trunktestsphpunittestsmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/media.php (25401 => 25402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/media.php      2013-09-12 13:38:42 UTC (rev 25401)
+++ trunk/tests/phpunit/tests/media.php 2013-09-12 14:47:58 UTC (rev 25402)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">  * @group shortcode
</span><span class="cx">  */
</span><span class="cx"> class Tests_Media extends WP_UnitTestCase {
</span><ins>+       protected $deprecated_functions = array( 'wp_convert_bytes_to_hr' );
</ins><span class="cx"> 
</span><span class="cx">  function setUp() {
</span><span class="cx">          parent::setUp();
</span><span class="lines">@@ -19,24 +20,8 @@
</span><span class="cx">          $this->img_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $this->img_name;
</span><span class="cx">          $this->img_html = '<img src="' . $this->img_url . '"/>';
</span><span class="cx">          $this->img_dimensions = array( 'width' => 100, 'height' => 100 );
</span><del>-               add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
</del><span class="cx">   }
</span><span class="cx"> 
</span><del>-       function tearDown() {
-               parent::tearDown();
-               remove_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
-       }
-
-       function deprecated_function_run( $function ) {
-               if ( in_array( $function, array( 'wp_convert_bytes_to_hr' ) ) )
-                       add_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
-       }
-
-       function deprecated_function_trigger_error() {
-               remove_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
-               return false;
-       }
-
</del><span class="cx">   function test_img_caption_shortcode_added() {
</span><span class="cx">          global $shortcode_tags;
</span><span class="cx">          $this->assertEquals( 'img_caption_shortcode', $shortcode_tags['caption'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsmsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/ms.php (25401 => 25402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/ms.php 2013-09-12 13:38:42 UTC (rev 25401)
+++ trunk/tests/phpunit/tests/ms.php    2013-09-12 14:47:58 UTC (rev 25402)
</span><span class="lines">@@ -8,31 +8,15 @@
</span><span class="cx">  * @group multisite
</span><span class="cx">  */
</span><span class="cx"> class Tests_MS extends WP_UnitTestCase {
</span><del>-
</del><ins>+        protected $deprecated_functions = array( 'is_blog_user', 'get_dashboard_blog' );
</ins><span class="cx">   protected $plugin_hook_count = 0;
</span><span class="cx"> 
</span><span class="cx">  function setUp() {
</span><span class="cx">          parent::setUp();
</span><span class="cx"> 
</span><span class="cx">          $_SERVER['REMOTE_ADDR'] = '';
</span><del>-               add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run_check' ) );
</del><span class="cx">   }
</span><span class="cx"> 
</span><del>-       function tearDown() {
-               parent::tearDown();
-               remove_action( 'deprecated_function_run', array( $this, 'deprecated_function_run_check' ) );
-       }
-
-       function deprecated_function_run_check( $function ) {
-               if ( in_array( $function, array( 'is_blog_user', 'get_dashboard_blog' ) ) )
-                       add_filter( 'deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
-       }
-
-       function filter_deprecated_function_trigger_error() {
-               remove_filter( 'deprecated_function_trigger_error', array( $this, 'filter_deprecated_function_trigger_error' ) );
-               return false;
-       }
-
</del><span class="cx">   function test_create_and_delete_blog() {
</span><span class="cx">          global $wpdb;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunktestsphpunitteststhemethemeDirphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/theme/themeDir.php (25401 => 25402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/theme/themeDir.php     2013-09-12 13:38:42 UTC (rev 25401)
+++ trunk/tests/phpunit/tests/theme/themeDir.php        2013-09-12 14:47:58 UTC (rev 25402)
</span><span class="lines">@@ -6,6 +6,8 @@
</span><span class="cx">  * @group themes
</span><span class="cx">  */
</span><span class="cx"> class Tests_Theme_ThemeDir extends WP_UnitTestCase {
</span><ins>+       protected $deprecated_functions = array( 'get_theme', 'get_themes', 'get_theme_data', 'get_current_theme', 'get_broken_themes' );
+
</ins><span class="cx">   function setUp() {
</span><span class="cx">          parent::setUp();
</span><span class="cx">          $this->theme_root = DIR_TESTDATA . '/themedir1';
</span><span class="lines">@@ -21,7 +23,6 @@
</span><span class="cx">          // clear caches
</span><span class="cx">          wp_clean_themes_cache();
</span><span class="cx">          unset( $GLOBALS['wp_themes'] );
</span><del>-               add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
</del><span class="cx">   }
</span><span class="cx"> 
</span><span class="cx">  function tearDown() {
</span><span class="lines">@@ -32,19 +33,8 @@
</span><span class="cx">          wp_clean_themes_cache();
</span><span class="cx">          unset( $GLOBALS['wp_themes'] );
</span><span class="cx">          parent::tearDown();
</span><del>-               remove_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
</del><span class="cx">   }
</span><span class="cx"> 
</span><del>-       function deprecated_function_run( $function ) {
-               if ( in_array( $function, array( 'get_theme', 'get_themes', 'get_theme_data', 'get_current_theme', 'get_broken_themes' ) ) )
-                       add_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
-       }
-
-       function deprecated_function_trigger_error() {
-               remove_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
-               return false;
-       }
-
</del><span class="cx">   // replace the normal theme root dir with our premade test dir
</span><span class="cx">  function _theme_root($dir) {
</span><span class="cx">          return $this->theme_root;
</span></span></pre></div>
<a id="trunktestsphpunitteststhemephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/theme.php (25401 => 25402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/theme.php      2013-09-12 13:38:42 UTC (rev 25401)
+++ trunk/tests/phpunit/tests/theme.php 2013-09-12 14:47:58 UTC (rev 25402)
</span><span class="lines">@@ -6,17 +6,15 @@
</span><span class="cx">  * @group themes
</span><span class="cx">  */
</span><span class="cx"> class Tests_Theme extends WP_UnitTestCase {
</span><ins>+       protected $deprecated_functions = array( 'get_theme', 'get_themes', 'get_theme_data', 'get_current_theme' );
+       protected $theme_slug = 'twentyeleven';
+       protected $theme_name = 'Twenty Eleven';
</ins><span class="cx"> 
</span><del>-       var $theme_slug = 'twentyeleven';
-       var $theme_name = 'Twenty Eleven';
-
</del><span class="cx">   function setUp() {
</span><span class="cx">          parent::setUp();
</span><span class="cx">          add_filter( 'extra_theme_headers', array( $this, '_theme_data_extra_headers' ) );
</span><span class="cx">          wp_clean_themes_cache();
</span><span class="cx">          unset( $GLOBALS['wp_themes'] );
</span><del>-
-               add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
</del><span class="cx">   }
</span><span class="cx"> 
</span><span class="cx">  function tearDown() {
</span><span class="lines">@@ -24,20 +22,8 @@
</span><span class="cx">          wp_clean_themes_cache();
</span><span class="cx">          unset( $GLOBALS['wp_themes'] );
</span><span class="cx">          parent::tearDown();
</span><del>-
-               remove_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
</del><span class="cx">   }
</span><span class="cx"> 
</span><del>-       function deprecated_function_run( $function ) {
-               if ( in_array( $function, array( 'get_theme', 'get_themes', 'get_theme_data', 'get_current_theme' ) ) )
-                       add_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
-       }
-
-       function deprecated_function_trigger_error() {
-               remove_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
-               return false;
-       }
-
</del><span class="cx">   function test_wp_get_themes_default() {
</span><span class="cx">          $themes = wp_get_themes();
</span><span class="cx">          $this->assertInstanceOf( 'WP_Theme', $themes[ $this->theme_slug ] );
</span></span></pre></div>
<a id="trunktestsphpunittestsusercapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/user/capabilities.php (25401 => 25402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/user/capabilities.php  2013-09-12 13:38:42 UTC (rev 25401)
+++ trunk/tests/phpunit/tests/user/capabilities.php     2013-09-12 14:47:58 UTC (rev 25402)
</span><span class="lines">@@ -7,7 +7,8 @@
</span><span class="cx">  * @group capabilities
</span><span class="cx">  */
</span><span class="cx"> class Tests_User_Capabilities extends WP_UnitTestCase {
</span><del>-       var $user_ids = array();
</del><ins>+        protected $user_ids = array();
+       protected $deprecated_functions = array( 'set_current_user' );
</ins><span class="cx"> 
</span><span class="cx">  function setUp() {
</span><span class="cx">          parent::setUp();
</span><span class="lines">@@ -15,24 +16,8 @@
</span><span class="cx">          $this->_flush_roles();
</span><span class="cx"> 
</span><span class="cx">          $this->orig_users = get_users();
</span><del>-               add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
</del><span class="cx">   }
</span><span class="cx"> 
</span><del>-       function tearDown() {
-               parent::tearDown();
-               remove_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
-       }
-
-       function deprecated_function_run( $function ) {
-               if ( in_array( $function, array( 'set_current_user' ) ) )
-                       add_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
-       }
-
-       function deprecated_function_trigger_error() {
-               remove_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
-               return false;
-       }
-
</del><span class="cx">   function _flush_roles() {
</span><span class="cx">          // we want to make sure we're testing against the db, not just in-memory data
</span><span class="cx">          // this will flush everything and reload it from the db
</span></span></pre>
</div>
</div>

</body>
</html>