<!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>[661] wp-testcase: Add more comprehensive tests for balanceTags()</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/661">661</a></dd>
<dt>Author</dt> <dd>coffee2code</dd>
<dt>Date</dt> <dd>2012-04-09 21:51:10 +0000 (Mon, 09 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add more comprehensive tests for balanceTags()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#wptestcasetest_includes_formattingphp">wp-testcase/test_includes_formatting.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#wptestcasetest_includes_balance_tagsphp">wp-testcase/test_includes_balance_tags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="wptestcasetest_includes_balance_tagsphp"></a>
<div class="addfile"><h4>Added: wp-testcase/test_includes_balance_tags.php (0 => 661)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_includes_balance_tags.php (rev 0)
+++ wp-testcase/test_includes_balance_tags.php 2012-04-09 21:51:10 UTC (rev 661)
</span><span class="lines">@@ -0,0 +1,215 @@
</span><ins>+<?php
+
+class TestBalanceTags extends WPTestCase {
+
+ // These are single/self-closing tags that WP has traditionally recognized.
+ var $basic_single_tags = array( 'br', 'hr', 'img', 'input' );
+
+ // This is a complete(?) listing of valid single/self-closing tags.
+ var $single_tags = array(
+ 'area', 'base', 'basefont', 'br', 'col', 'command',
+ 'embed', 'frame', 'hr', 'img', 'input', 'isindex',
+ 'link', 'meta', 'param', 'source' );
+
+ // Tags that can be directly nested within themselves, i.e. <div><div>Test</div></div>
+ var $nestable_tags = array( 'blockquote', 'div', 'q', 'span' );
+ // Use this instead if/when #20401 gets fixed
+ //var $nestable_tags = array( 'blockquote', 'div', 'object', 'q', 'span' );
+
+ // These are single tags WP has traditionally properly handled
+ // This test can be removed if #1597 is fixed and the next test passes, as
+ // it supercedes this test.
+ function test_selfcloses_unclosed_basic_known_single_tags() {
+ foreach ( $this->basic_single_tags as $tag ) {
+ $this->assertEquals( "<$tag />", balanceTags( "<$tag>", true ) );
+ }
+ }
+
+ // If a recognized valid single tag appears unclosed, it should get self-closed
+ function test_selfcloses_unclosed_known_single_tags() {
+ $this->knownWPBug( 1597 );
+
+ foreach ( $this->single_tags as $tag ) {
+ $this->assertEquals( "<$tag />", balanceTags( "<$tag>", true ) );
+ }
+ }
+
+ // These are single tags WP has traditionally properly handled
+ // This test can be removed if #1597 is fixed and the next test passes, as
+ // it supercedes this test.
+ function test_selfcloses_basic_known_single_tags_having_closing_tag() {
+ foreach ( $this->basic_single_tags as $tag ) {
+ $this->assertEquals( "<$tag />", balanceTags( "<$tag></$tag>", true ) );
+ }
+ }
+
+ // If a recognized valid single tag is given a closing tag, the closing tag
+ // should get removed and tag should be self-closed.
+ function test_selfcloses_known_single_tags_having_closing_tag() {
+ $this->knownWPBug( 1597 );
+
+ foreach ( $this->single_tags as $tag ) {
+ $this->assertEquals( "<$tag />", balanceTags( "<$tag></$tag>", true ) );
+ }
+ }
+
+ function test_closes_unknown_single_tags_with_closing_tag() {
+ $this->knownWPBug( 1597 );
+
+ $inputs = array(
+ '<strong/>',
+ '<em />',
+ '<p class="main1"/>',
+ '<p class="main2" />',
+ );
+ $expected = array(
+ '<strong></strong>',
+ '<em></em>',
+ '<p class="main1"></p>',
+ '<p class="main2"></p>',
+ );
+
+ foreach ( $inputs as $key => $input ) {
+ $this->assertEquals( $expected[$key], balanceTags( $inputs[$key], true ) );
+ }
+ }
+
+ function test_closes_unclosed_single_tags_having_attributes() {
+ $inputs = array(
+ '<img src="/images/example.png">',
+ '<input type="text" name="example">'
+ );
+ $expected = array(
+ '<img src="/images/example.png"/>',
+ '<input type="text" name="example"/>'
+ );
+
+ foreach ( $inputs as $key => $input ) {
+ $this->assertEquals( $expected[$key], balanceTags( $inputs[$key], true ) );
+ }
+ }
+
+ function test_allows_validly_closed_single_tags() {
+ $inputs = array(
+ '<br />',
+ '<hr />',
+ '<img src="/images/example.png" />',
+ '<input type="text" name="example" />'
+ );
+
+ foreach ( $inputs as $key => $input ) {
+ $this->assertEquals( $inputs[$key], balanceTags( $inputs[$key], true ) );
+ }
+ }
+
+ function test_balances_nestable_tags() {
+ $inputs = array(
+ '<q>Test<q>Test</q>',
+ '<div><div>Test',
+ '<div>Test</div></div>',
+ );
+ $expected = array(
+ '<q>Test<q>Test</q></q>',
+ '<div><div>Test</div></div>',
+ '<div>Test</div>',
+ );
+
+ foreach ( $inputs as $key => $input ) {
+ $this->assertEquals( $expected[$key], balanceTags( $inputs[$key], true ) );
+ }
+ }
+
+ function test_allows_adjacent_nestable_tags() {
+ $inputs = array(
+ '<blockquote><blockquote>Example quote</blockquote></blockquote>',
+ '<div class="container"><div>This is allowed></div></div>',
+ '<span><span><span>Example in spans</span></span></span>',
+ '<blockquote>Main quote<blockquote>Example quote</blockquote> more text</blockquote>',
+ '<q><q class="inner-q">Inline quote</q></q>',
+ );
+
+ foreach ( $inputs as $key => $input ) {
+ $this->assertEquals( $inputs[$key], balanceTags( $inputs[$key], true ) );
+ }
+ }
+
+ function test_allows_immediately_nested_object_tags() {
+ $this->knownWPBug( 20401 );
+
+ $object = '<object id="obj1"><param name="param1"/><object id="obj2"><param name="param2"/></object></object>';
+ $this->assertEquals( $object, balanceTags( $object, true ) );
+ }
+
+ function test_balances_nested_non_nestable_tags() {
+ $inputs = array(
+ '<b><b>This is bold</b></b>',
+ '<b>Some text here <b>This is bold</b></b>',
+ );
+ $expected = array(
+ '<b></b><b>This is bold</b>',
+ '<b>Some text here </b><b>This is bold</b>',
+ );
+
+ foreach ( $inputs as $key => $input ) {
+ $this->assertEquals( $expected[$key], balanceTags( $inputs[$key], true ) );
+ }
+ }
+
+ function test_fixes_improper_closing_tag_sequence() {
+ $inputs = array(
+ '<p>Here is a <strong class="part">bold <em>and emphasis</p></em></strong>',
+ '<ul><li>Aaa</li><li>Bbb</ul></li>',
+ );
+ $expected = array(
+ '<p>Here is a <strong class="part">bold <em>and emphasis</em></strong></p>',
+ '<ul><li>Aaa</li><li>Bbb</li></ul>',
+ );
+
+ foreach ($inputs as $key => $input) {
+ $this->assertEquals( $expected[$key], balanceTags( $inputs[$key], true ) );
+ }
+ }
+
+ function test_adds_missing_closing_tags() {
+ $inputs = array(
+ '<b><i>Test</b>',
+ '<p>Test',
+ '<p>Test test</em> test</p>',
+ '</p>Test',
+ '<p>Here is a <strong class="part">Test</p>',
+ );
+ $expected = array(
+ '<b><i>Test</i></b>',
+ '<p>Test</p>',
+ '<p>Test test test</p>',
+ 'Test',
+ '<p>Here is a <strong class="part">Test</strong></p>',
+ );
+
+ foreach ( $inputs as $key => $input ) {
+ $this->assertEquals( $expected[$key], balanceTags( $inputs[$key], true ) );
+ }
+ }
+
+ function test_removes_extraneous_closing_tags() {
+ $inputs = array(
+ '<b>Test</b></b>',
+ '<div>Test</div></div><div>Test',
+ '<p>Test test</em> test</p>',
+ '</p>Test',
+ );
+ $expected = array(
+ '<b>Test</b>',
+ '<div>Test</div><div>Test</div>',
+ '<p>Test test test</p>',
+ 'Test',
+ );
+
+ foreach ( $inputs as $key => $input ) {
+ $this->assertEquals( $expected[$key], balanceTags( $inputs[$key], true ) );
+ }
+ }
+
+}
+
+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="wptestcasetest_includes_formattingphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test_includes_formatting.php (660 => 661)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_includes_formatting.php 2012-04-09 21:22:50 UTC (rev 660)
+++ wp-testcase/test_includes_formatting.php 2012-04-09 21:51:10 UTC (rev 661)
</span><span class="lines">@@ -1055,23 +1055,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-class TestBalanceTags extends WPTestCase {
- function test_adds_missing_end_tags() {
- $this->assertEquals("<b><i>abc</i></b>", balanceTags("<b><i>abc</b>", true));
- }
-
- function test_fixes_simple_bad_nesting() {
- $this->assertEquals("<b><i>abc</i></b>", balanceTags("<b><i>abc</b></i>", true));
- }
-
- function test_nestable_tags() {
- $this->assertEquals( '<div><div>Test</div></div>', balanceTags( '<div><div>Test</div>', true ) );
- $this->assertEquals( '<q>Test<q>Test</q></q>', balanceTags( '<q>Test<q>Test</q>', true ) );
- // not nestable
- $this->assertEquals( '<b>Test</b><b>Test</b>', balanceTags( '<b>Test<b>Test</b>', true ) );
- }
-}
-
</del><span class="cx"> class TestZeroise extends WPTestCase {
</span><span class="cx"> function test_pads_with_leading_zeroes() {
</span><span class="cx"> $this->assertEquals("00005", zeroise(5, 5));
</span></span></pre>
</div>
</div>
</body>
</html>