<!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>[Tests][930] trunk/tests/shortcode.php: Add shortcode tests for shortcodes with hyphens.</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/930">930</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-07-20 12:57:44 +0000 (Fri, 20 Jul 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add shortcode tests for shortcodes with hyphens. props aaroncampbell, kovshenin, see #WP17657.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsshortcodephp">trunk/tests/shortcode.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsshortcodephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/shortcode.php (929 => 930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/shortcode.php 2012-07-20 03:57:19 UTC (rev 929)
+++ trunk/tests/shortcode.php 2012-07-20 12:57:44 UTC (rev 930)
</span><span class="lines">@@ -4,14 +4,13 @@
</span><span class="cx"> */
</span><span class="cx"> class Tests_Shortcode extends WP_UnitTestCase {
</span><span class="cx">
</span><del>- protected $shortcodes = array( 'footag', 'bartag', 'baztag', 'dumptag' );
</del><ins>+ protected $shortcodes = array( 'test-shortcode-tag', 'footag', 'bartag', 'baztag', 'dumptag', 'hyphen', 'hyphen-foo', 'hyphen-foo-bar' );
</ins><span class="cx">
</span><span class="cx"> function setUp() {
</span><span class="cx"> parent::setUp();
</span><del>- add_shortcode('test-shortcode-tag', array(&$this, '_shortcode_tag'));
</del><span class="cx">
</span><span class="cx"> foreach ( $this->shortcodes as $shortcode )
</span><del>- add_shortcode( $shortcode, array( $this, '_shortcode_' . $shortcode ) );
</del><ins>+ add_shortcode( $shortcode, array( $this, '_shortcode_' . str_replace( '-', '_', $shortcode ) ) );
</ins><span class="cx">
</span><span class="cx"> $this->atts = null;
</span><span class="cx"> $this->content = null;
</span><span class="lines">@@ -24,9 +23,14 @@
</span><span class="cx"> parent::tearDown();
</span><span class="cx"> foreach ( $this->shortcodes as $shortcode )
</span><span class="cx"> unset( $shortcode_tags[ $shortcode ] );
</span><del>- unset( $shortcode_tags['test-shortcode-tag'] );
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+ function _shortcode_test_shortcode_tag( $atts, $content = null, $tagname = null ) {
+ $this->atts = $atts;
+ $this->content = $content;
+ $this->tagname = $tagname;
+ }
+
</ins><span class="cx"> // [footag foo="bar"]
</span><span class="cx"> function _shortcode_footag( $atts ) {
</span><span class="cx"> return @"foo = {$atts['foo']}";
</span><span class="lines">@@ -54,12 +58,18 @@
</span><span class="cx"> return $out;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function _shortcode_tag($atts, $content=NULL, $tagname=NULL) {
- $this->atts = $atts;
- $this->content = $content;
- $this->tagname = $tagname;
</del><ins>+ function _shortcode_hyphen() {
+ return __FUNCTION__;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ function _shortcode_hyphen_foo() {
+ return __FUNCTION__;
+ }
+
+ function _shortcode_hyphen_foo_bar() {
+ return __FUNCTION__;
+ }
+
</ins><span class="cx"> function test_noatts() {
</span><span class="cx"> do_shortcode('[test-shortcode-tag /]');
</span><span class="cx"> $this->assertEquals( '', $this->atts );
</span><span class="lines">@@ -77,6 +87,35 @@
</span><span class="cx"> $this->assertEquals( '[not-a-shortcode-tag]', $out );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * @ticket 17657
+ */
+ function test_tag_hyphen_not_tag() {
+ $out = do_shortcode( '[dumptag-notreal]' );
+ $this->assertEquals( '[dumptag-notreal]', $out );
+ }
+
+ function test_tag_underscore_not_tag() {
+ $out = do_shortcode( '[dumptag_notreal]' );
+ $this->assertEquals( '[dumptag_notreal]', $out );
+ }
+
+ function test_tag_not_tag() {
+ $out = do_shortcode( '[dumptagnotreal]' );
+ $this->assertEquals( '[dumptagnotreal]', $out );
+ }
+
+ /**
+ * @ticket 17657
+ */
+ function test_tag_hyphen() {
+ $this->assertEquals( '_shortcode_hyphen', do_shortcode( '[hyphen]' ) );
+ $this->assertEquals( '_shortcode_hyphen_foo', do_shortcode( '[hyphen-foo]' ) );
+ $this->assertEquals( '_shortcode_hyphen_foo_bar', do_shortcode( '[hyphen-foo-bar]' ) );
+ $this->assertEquals( '[hyphen-baz]', do_shortcode( '[hyphen-baz]' ) );
+ $this->assertEquals( '[hyphen-foo-bar-baz]', do_shortcode( '[hyphen-foo-bar-baz]' ) );
+ }
+
</ins><span class="cx"> function test_two_atts() {
</span><span class="cx"> do_shortcode('[test-shortcode-tag foo="asdf" bar="bing" /]');
</span><span class="cx"> $this->assertEquals( array('foo' => 'asdf', 'bar' => 'bing'), $this->atts );
</span></span></pre>
</div>
</div>
</body>
</html>