<!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>[579] wp-testcase/test_includes_theme.php: Fix theme unit tests, post [WP20029], #WP20103.</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, #logmsg > ol { margin-left: 0; 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://unit-tests.trac.wordpress.org/changeset/579">579</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-03-15 15:31:41 +0000 (Thu, 15 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix theme unit tests, post [WP20029], #WP20103. see [UT570], [UT578].</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#wptestcasetest_includes_themephp">wp-testcase/test_includes_theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="wptestcasetest_includes_themephp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test_includes_theme.php (578 => 579)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_includes_theme.php 2012-03-15 13:44:34 UTC (rev 578)
+++ wp-testcase/test_includes_theme.php 2012-03-15 15:31:41 UTC (rev 579)
</span><span class="lines">@@ -211,18 +211,22 @@
</span><span class="cx"> $this->theme_root = realpath(DIR_TESTROOT.'/'.DIR_TESTDATA.'/themedir1');
</span><span class="cx">
</span><span class="cx"> $this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
</span><del>- $GLOBALS['wp_theme_directories'] = $this->theme_root;
</del><ins>+ $GLOBALS['wp_theme_directories'] = array( $this->theme_root );
</ins><span class="cx">
</span><span class="cx"> add_filter('theme_root', array(&$this, '_theme_root'));
</span><del>-
</del><ins>+ add_filter( 'stylesheet_root', array(&$this, '_theme_root') );
+ add_filter( 'template_root', array(&$this, '_theme_root') );
</ins><span class="cx"> // clear caches
</span><del>- unset($GLOBALS['wp_themes']);
- unset($GLOBALS['wp_broken_themes']);
</del><ins>+ search_theme_directories( true );
+ unset( $GLOBALS['wp_themes'] );
</ins><span class="cx"> }
</span><span class="cx">
</span><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><ins>+ remove_filter( 'stylesheet_root', array(&$this, '_theme_root') );
+ remove_filter( 'template_root', array(&$this, '_theme_root') );
+ search_theme_directories( true );
</ins><span class="cx"> parent::tearDown();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -245,16 +249,15 @@
</span><span class="cx"> $this->assertEquals( '1.6', $theme['Version'] );
</span><span class="cx"> $this->assertEquals( 'default', $theme['Template'] );
</span><span class="cx"> $this->assertEquals( 'default', $theme['Stylesheet'] );
</span><del>- $this->assertEquals( $this->theme_root.'/default/functions.php', $theme['Template Files'][0] );
- $this->assertEquals( $this->theme_root.'/default/index.php', $theme['Template Files'][1] );
</del><span class="cx">
</span><del>- $this->assertEquals( $this->theme_root.'/default/style.css', $theme['Stylesheet Files'][0] );
</del><ins>+ $this->assertContains( $this->theme_root . '/default/functions.php', $theme['Template Files'] );
+ $this->assertContains( $this->theme_root . '/default/index.php', $theme['Template Files'] );
+ $this->assertContains( $this->theme_root . '/default/style.css', $theme['Stylesheet Files'] );
</ins><span class="cx">
</span><span class="cx"> $this->assertEquals( $this->theme_root.'/default', $theme['Template Dir'] );
</span><span class="cx"> $this->assertEquals( $this->theme_root.'/default', $theme['Stylesheet Dir'] );
</span><span class="cx"> $this->assertEquals( 'publish', $theme['Status'] );
</span><span class="cx"> $this->assertEquals( '', $theme['Parent Theme'] );
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_theme_sandbox() {
</span><span class="lines">@@ -300,10 +303,10 @@
</span><span class="cx"> $this->assertEquals( '1.0', $theme['Version'] );
</span><span class="cx"> $this->assertEquals( 'sandbox', $theme['Template'] );
</span><span class="cx"> $this->assertEquals( 'stylesheetonly', $theme['Stylesheet'] );
</span><del>- $this->assertEquals( $this->theme_root.'/sandbox/functions.php', $theme['Template Files'][0] );
- $this->assertEquals( $this->theme_root.'/sandbox/index.php', $theme['Template Files'][1] );
</del><ins>+ $this->assertContains( $this->theme_root.'/sandbox/functions.php', $theme['Template Files'] );
+ $this->assertContains( $this->theme_root.'/sandbox/index.php', $theme['Template Files'] );
</ins><span class="cx">
</span><del>- $this->assertEquals( $this->theme_root.'/stylesheetonly/style.css', $theme['Stylesheet Files'][0] );
</del><ins>+ $this->assertContains( $this->theme_root.'/stylesheetonly/style.css', $theme['Stylesheet Files']);
</ins><span class="cx">
</span><span class="cx"> $this->assertEquals( $this->theme_root.'/sandbox', $theme['Template Dir'] );
</span><span class="cx"> $this->assertEquals( $this->theme_root.'/stylesheetonly', $theme['Stylesheet Dir'] );
</span><span class="lines">@@ -345,29 +348,29 @@
</span><span class="cx"> $this->assertFalse( empty($theme) );
</span><span class="cx">
</span><span class="cx"> $templates = $theme['Template Files'];
</span><del>- $this->assertEquals( 3, count( $templates ) );
</del><span class="cx"> $this->assertTrue( in_array( $this->theme_root . '/page-templates/template-top-level.php', $templates));
</span><del>- $this->assertTrue( in_array( $this->theme_root . '/page-templates/subdir/template-sub-dir.php', $templates));
</del><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> class TestLargeThemeDir extends _WPEmptyBlog {
</span><span class="cx"> function setUp() {
</span><span class="cx"> parent::setUp();
</span><span class="cx"> $this->theme_root = realpath(DIR_TESTROOT.'/'.DIR_TESTDATA.'/wpcom-themes');
</span><span class="cx">
</span><span class="cx"> $this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
</span><del>- $GLOBALS['wp_theme_directories'] = $this->theme_root;
</del><ins>+ $GLOBALS['wp_theme_directories'] = array( $this->theme_root );
</ins><span class="cx">
</span><span class="cx"> add_filter('theme_root', array(&$this, '_theme_root'));
</span><span class="cx">
</span><span class="cx"> // clear caches
</span><del>- unset($GLOBALS['wp_themes']);
- unset($GLOBALS['wp_broken_themes']);
</del><ins>+ search_theme_directories( true );
+ unset( $GLOBALS['wp_themes'] );
</ins><span class="cx"> }
</span><span class="cx">
</span><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><ins>+ search_theme_directories( true );
</ins><span class="cx"> parent::tearDown();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -378,17 +381,21 @@
</span><span class="cx">
</span><span class="cx"> function test_theme_list() {
</span><span class="cx"> $themes = get_themes();
</span><del>- $theme_names = array_keys($themes);
- $this->assertEquals(87, count($theme_names));
</del><ins>+ $theme_names = array_keys( $themes );
+ $this->assertEquals(87, count( $theme_names ) );
+ $length = strlen( serialize( $themes ) );
+
</ins><span class="cx"> //2.9 pre [12226]
</span><del>- $this->assertLessThanOrEqual(387283, strlen(serialize($themes)));
</del><ins>+ $this->assertLessThanOrEqual(387283, $length );
</ins><span class="cx"> //2.8.5
</span><del>- $this->assertLessThanOrEqual(368319, strlen(serialize($themes)));
</del><ins>+ $this->assertLessThanOrEqual(368319, $length );
</ins><span class="cx"> //2.9 post [12226]
</span><del>- $this->assertLessThanOrEqual(261998, strlen(serialize($themes)));
</del><ins>+ $this->assertLessThanOrEqual(261998, $length );
+ //3.4 post [20029], #20103
+ $this->assertLessThanOrEqual(100000, $length );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // #11214 looks at how we can reduce the inmemory size even more
</del><ins>+ // #11214 looked at how we can reduce the in-memory size even more
</ins><span class="cx"> function test_smaller_storage() {
</span><span class="cx"> $this->knownWPBug(11214);
</span><span class="cx"> $themes = get_themes();
</span></span></pre>
</div>
</div>
</body>
</html>