<!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>[570] wp-testcase/test_includes_theme.php: Fixing unit test errors, updating for new theme functions</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/570">570</a></dd>
<dt>Author</dt> <dd>kurtpayne</dd>
<dt>Date</dt> <dd>2012-03-13 21:51:05 +0000 (Tue, 13 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixing unit test errors, updating for new theme functions</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 (569 => 570)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_includes_theme.php 2012-03-09 11:23:01 UTC (rev 569)
+++ wp-testcase/test_includes_theme.php 2012-03-13 21:51:05 UTC (rev 570)
</span><span class="lines">@@ -10,16 +10,16 @@
</span><span class="cx">
</span><span class="cx"> function test_get_themes_default() {
</span><span class="cx"> $themes = get_themes();
</span><del>- // one theme is included by default: Twenty Ten
- $this->assertTrue( is_array($themes['Twenty Ten']) );
</del><ins>+ // one theme is included by default: Twenty Eleven
+ $this->assertInstanceOf( 'WP_Theme', $themes['Twenty Eleven']);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_get_themes_contents() {
</span><del>- $themes = get_themes();
</del><ins>+ $themes = wp_get_themes();
</ins><span class="cx">
</span><span class="cx"> // Generic tests that should hold true for any theme
</span><span class="cx"> foreach ($themes as $k=>$theme) {
</span><del>- $this->assertEquals($theme['Name'], $k);
</del><ins>+ $this->assertEquals($theme['Template'], $k);
</ins><span class="cx"> $this->assertTrue(!empty($theme['Title']));
</span><span class="cx">
</span><span class="cx"> // important attributes should all be set
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> $this->assertTrue(is_dir($dir . $theme['Template Dir']));
</span><span class="cx"> $this->assertTrue(is_dir($dir . $theme['Stylesheet Dir']));
</span><span class="cx">
</span><del>- $this->assertEquals('publish', $theme['Status']);
</del><ins>+ $this->assertEquals('public', $theme['Status']);
</ins><span class="cx">
</span><span class="cx"> $this->assertTrue(is_file($dir . $theme['Stylesheet Dir'] . '/' . $theme['Screenshot']));
</span><span class="cx"> $this->assertTrue(is_readable($dir . $theme['Stylesheet Dir'] . '/' . $theme['Screenshot']));
</span><span class="lines">@@ -80,12 +80,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_get_theme() {
</span><del>- $themes = get_themes();
-
- foreach (array_keys($themes) as $name) {
- $theme = get_theme($name);
- $this->assertTrue(is_array($theme));
- $this->assertEquals($theme, $themes[$name]);
</del><ins>+ $themes = wp_get_themes();
+ foreach ( $themes as $theme ) {
+ $_theme = wp_get_theme( $theme->get_stylesheet() );
+ $this->assertInstanceOf( 'WP_Theme', $_theme );
+ $this->assertFalse( $_theme->errors() );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -165,7 +164,9 @@
</span><span class="cx"> update_option('template', $template);
</span><span class="cx"> update_option('stylesheet', $style);
</span><span class="cx">
</span><del>- $this->assertEquals( 'Twenty Ten', get_current_theme() );
</del><ins>+ $theme = wp_get_theme();
+ $this->assertEquals( $style, $theme->__toString() );
+ $this->assertTrue( false !== $theme->errors() );
</ins><span class="cx">
</span><span class="cx"> // these return the bogus name - perhaps not ideal behaviour?
</span><span class="cx"> $this->assertEquals($template, get_template());
</span></span></pre>
</div>
</div>
</body>
</html>