<!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>[32507] trunk/tests/phpunit/tests: Improve unit tests for `wp_unique_term_slug()`.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32507">32507</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32507","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-05-15 20:37:51 +0000 (Fri, 15 May 2015)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Improve unit tests for `wp_unique_term_slug()`.

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitteststermphp">trunk/tests/phpunit/tests/term.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunitteststermwpUniqueTermSlugphp">trunk/tests/phpunit/tests/term/wpUniqueTermSlug.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitteststermwpUniqueTermSlugphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/term/wpUniqueTermSlug.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpUniqueTermSlug.php                               (rev 0)
+++ trunk/tests/phpunit/tests/term/wpUniqueTermSlug.php 2015-05-15 20:37:51 UTC (rev 32507)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,108 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group taxonomy
+ */
+class Tests_Term_WpUniqueTermSlug extends WP_UnitTestCase {
+       public function setUp() {
+               parent::setUp();
+               register_taxonomy( 'wptests_tax1', 'post', array( 'hierarchical' => false ) );
+               register_taxonomy( 'wptests_tax2', 'post', array( 'hierarchical' => true ) );
+       }
+
+       public function test_unique_slug_should_be_unchanged() {
+               $term = $this->factory->term->create_and_get( array(
+                       'taxonomy' => 'wptests_tax1',
+                       'name' => 'foo',
+                       'slug' => 'foo',
+               ) );
+
+               $actual = wp_unique_term_slug( 'bar', $term );
+               $this->assertEquals( 'bar', $actual );
+       }
+
+       public function test_nonunique_slug_in_different_taxonomy_should_be_unchanged() {
+               $term1 = $this->factory->term->create( array(
+                       'taxonomy' => 'wptests_tax2',
+                       'name' => 'bar',
+                       'slug' => 'bar',
+               ) );
+
+               $term2 = $this->factory->term->create( array(
+                       'taxonomy' => 'wptests_tax1',
+                       'name' => 'foo',
+                       'slug' => 'foo',
+               ) );
+               $term2_object = get_term( $term2, 'wptests_tax1' );
+
+               $actual = wp_unique_term_slug( 'bar', $term2_object );
+               $this->assertEquals( 'bar', $actual );
+       }
+
+       public function test_nonunique_slug_in_same_nonhierarchical_taxonomy_should_be_changed() {
+               $term1 = $this->factory->term->create( array(
+                       'taxonomy' => 'wptests_tax1',
+                       'name' => 'bar',
+                       'slug' => 'bar',
+               ) );
+
+               $term2 = $this->factory->term->create( array(
+                       'taxonomy' => 'wptests_tax1',
+                       'name' => 'foo',
+                       'slug' => 'foo',
+               ) );
+               $term2_object = get_term( $term2, 'wptests_tax1' );
+
+               $actual = wp_unique_term_slug( 'bar', $term2_object );
+               $this->assertEquals( 'bar-2', $actual );
+       }
+
+       public function test_nonunique_slug_in_same_hierarchical_taxonomy_with_same_parent_should_be_suffixed_with_parent_slug() {
+               $parent = $this->factory->term->create( array(
+                       'taxonomy' => 'wptests_tax2',
+                       'slug' => 'parent-term',
+               ) );
+
+               $term1 = $this->factory->term->create( array(
+                       'taxonomy' => 'wptests_tax2',
+                       'name' => 'bar',
+                       'slug' => 'bar',
+                       'parent' => $parent,
+               ) );
+
+               $term2 = $this->factory->term->create( array(
+                       'taxonomy' => 'wptests_tax2',
+                       'name' => 'foo',
+                       'slug' => 'foo',
+                       'parent' => $parent,
+               ) );
+               $term2_object = get_term( $term2, 'wptests_tax2' );
+
+               $actual = wp_unique_term_slug( 'bar', $term2_object );
+               $this->assertEquals( 'bar-parent-term', $actual );
+       }
+
+       public function test_nonunique_slug_in_same_hierarchical_taxonomy_at_different_level_of_hierarchy_should_be_suffixed_with_number() {
+               $parent = $this->factory->term->create( array(
+                       'taxonomy' => 'wptests_tax2',
+                       'slug' => 'parent-term',
+               ) );
+
+               $term1 = $this->factory->term->create( array(
+                       'taxonomy' => 'wptests_tax2',
+                       'name' => 'bar',
+                       'slug' => 'bar',
+                       'parent' => $parent,
+               ) );
+
+               $term2 = $this->factory->term->create( array(
+                       'taxonomy' => 'wptests_tax2',
+                       'name' => 'foo',
+                       'slug' => 'foo',
+               ) );
+               $term2_object = get_term( $term2, 'wptests_tax2' );
+
+               $actual = wp_unique_term_slug( 'bar', $term2_object );
+               $this->assertEquals( 'bar-2', $actual );
+       }
+}
</ins></span></pre></div>
<a id="trunktestsphpunitteststermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term.php        2015-05-15 16:18:50 UTC (rev 32506)
+++ trunk/tests/phpunit/tests/term.php  2015-05-15 20:37:51 UTC (rev 32507)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,50 +471,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( get_option( 'default_category' ), $post->post_category[0] );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        function test_wp_unique_term_slug() {
-               // set up test data
-               $a = wp_insert_term( 'parent', $this->taxonomy );
-               $this->assertInternalType( 'array', $a );
-               $b = wp_insert_term( 'child',  $this->taxonomy, array( 'parent' => $a['term_id'] ) );
-               $this->assertInternalType( 'array', $b );
-               $c = wp_insert_term( 'neighbor', $this->taxonomy );
-               $this->assertInternalType( 'array', $c );
-               $d = wp_insert_term( 'pet',  $this->taxonomy, array( 'parent' => $c['term_id'] )  );
-               $this->assertInternalType( 'array', $c );
-
-               $a_term = get_term( $a['term_id'], $this->taxonomy );
-               $b_term = get_term( $b['term_id'], $this->taxonomy );
-               $c_term = get_term( $c['term_id'], $this->taxonomy );
-               $d_term = get_term( $d['term_id'], $this->taxonomy );
-
-               // a unique slug gets unchanged
-               $this->assertEquals( 'unique-term', wp_unique_term_slug( 'unique-term', $c_term ) );
-
-               // a non-hierarchicial dupe gets suffixed with "-#"
-               $this->assertEquals( 'parent-2', wp_unique_term_slug( 'parent', $c_term ) );
-
-               // a hierarchical dupe initially gets suffixed with its parent term
-               $this->assertEquals( 'child-neighbor', wp_unique_term_slug( 'child', $d_term ) );
-
-               // a hierarchical dupe whose parent already contains the {term}-{parent term}
-               // term gets suffixed with parent term name and then '-#'
-               $e = wp_insert_term( 'child-neighbor', $this->taxonomy, array( 'parent' => $c['term_id'] ) );
-               $this->assertEquals( 'child-neighbor-2', wp_unique_term_slug( 'child', $d_term ) );
-
-               $f = wp_insert_term( 'foo', $this->taxonomy );
-               $this->assertInternalType( 'array', $f );
-               $f_term = get_term( $f['term_id'], $this->taxonomy );
-               $this->assertEquals( 'foo', $f_term->slug );
-               $this->assertEquals( 'foo', wp_unique_term_slug(  'foo', $f_term ) );
-
-               $g = wp_insert_term( 'foo',  $this->taxonomy );
-               $this->assertInstanceOf( 'WP_Error', $g );
-
-               // clean up
-               foreach ( array( $a, $b, $c, $d, $e, $f ) as $t )
-                       $this->assertTrue( wp_delete_term( $t['term_id'], $this->taxonomy ) );
-       }
-
</del><span class="cx" style="display: block; padding: 0 10px">         /**
</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 25852
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span></span></pre>
</div>
</div>

</body>
</html>