<!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>[59516] trunk/tests/phpunit/tests/formatting/convertSmilies.php: Tests: Clean up `convert_smilies()` tests.</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 { white-space: pre-line; 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/59516">59516</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/59516","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-12-15 23:22:22 +0000 (Sun, 15 Dec 2024)</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'>Tests: Clean up `convert_smilies()` tests.
Includes:
* Removing redundant `use_smilies` option switches, as it is set to 1 by default.
* Restoring the `$wpsmiliestrans` array before performing assertions, not after.
* Moving most of the `smilies_init()` calls to a `set_up()` method.
Follow-up to [409/tests], <a href="https://core.trac.wordpress.org/changeset/26191">[26191]</a>, <a href="https://core.trac.wordpress.org/changeset/28717">[28717]</a>.
See <a href="https://core.trac.wordpress.org/ticket/62278">#62278</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsformattingconvertSmiliesphp">trunk/tests/phpunit/tests/formatting/convertSmilies.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsformattingconvertSmiliesphp"></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/formatting/convertSmilies.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/convertSmilies.php 2024-12-14 23:51:09 UTC (rev 59515)
+++ trunk/tests/phpunit/tests/formatting/convertSmilies.php 2024-12-15 23:22:22 UTC (rev 59516)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,6 +8,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
+ parent::set_up();
+
+ smilies_init();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Basic validation test to confirm that smilies are converted to image
</span><span class="cx" style="display: block; padding: 0 10px"> * when use_smilies = 1 and not when use_smilies = 0.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,14 +21,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_convert_standard_smilies
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_convert_standard_smilies( $input, $converted ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Standard smilies, use_smilies: ON.
- update_option( 'use_smilies', 1 );
-
- smilies_init();
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $converted, convert_smilies( $input ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Standard smilies, use_smilies: OFF.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Disable smilies.
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'use_smilies', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $input, convert_smilies( $input ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,13 +78,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_convert_custom_smilies( $input, $converted ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpsmiliestrans;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Custom smilies, use_smilies: ON.
- update_option( 'use_smilies', 1 );
-
- if ( ! isset( $wpsmiliestrans ) ) {
- smilies_init();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $trans_orig = $wpsmiliestrans; // Save original translations array.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpsmiliestrans = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,12 +91,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $converted, convert_smilies( $input ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Standard smilies, use_smilies: OFF.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Disable smilies.
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'use_smilies', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpsmiliestrans = $trans_orig; // Reset original translations array.
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $input, convert_smilies( $input ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $wpsmiliestrans = $trans_orig; // Reset original translations array.
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,14 +141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $input = 'Do we ignore smilies ;-) in ' . $element . ' tags <' . $element . ' class="foo">My Content Here :?: </' . $element . '>';
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = "Do we ignore smilies \xf0\x9f\x98\x89 in $element tags <$element class=\"foo\">My Content Here :?: </$element>";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Standard smilies, use_smilies: ON.
- update_option( 'use_smilies', 1 );
- smilies_init();
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, convert_smilies( $input ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Standard smilies, use_smilies: OFF.
- update_option( 'use_smilies', 0 );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,13 +171,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_smilies_combinations
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_smilies_combinations( $input, $converted ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Custom smilies, use_smilies: ON.
- update_option( 'use_smilies', 1 );
- smilies_init();
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $converted, convert_smilies( $input ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Custom smilies, use_smilies: OFF.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Disable smilies.
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'use_smilies', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $input, convert_smilies( $input ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,13 +230,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_single_smilies_in_wpsmiliestrans( $input, $converted ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpsmiliestrans;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Standard smilies, use_smilies: ON.
- update_option( 'use_smilies', 1 );
-
- if ( ! isset( $wpsmiliestrans ) ) {
- smilies_init();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $orig_trans = $wpsmiliestrans; // Save original translations array.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpsmiliestrans = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,12 +240,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $converted, convert_smilies( $input ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Standard smilies, use_smilies: OFF.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Disable smilies.
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'use_smilies', 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpsmiliestrans = $orig_trans; // Reset original translations array.
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $input, convert_smilies( $input ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $wpsmiliestrans = $orig_trans; // Reset original translations array.
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,15 +288,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_spaces_around_smilies
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_spaces_around_smilies( $input, $converted ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Standard smilies, use_smilies: ON.
- update_option( 'use_smilies', 1 );
-
- smilies_init();
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $converted, convert_smilies( $input ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Standard smilies, use_smilies: OFF.
- update_option( 'use_smilies', 0 );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>