Skip to content

Commit cdc2f25

Browse files
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], [26191], [28717]. See #62278. git-svn-id: https://develop.svn.wordpress.org/trunk@59516 602fd350-edb4-49c9-b593-d223f7449a82
1 parent c3c319e commit cdc2f25

File tree

1 file changed

+14
-46
lines changed

1 file changed

+14
-46
lines changed

tests/phpunit/tests/formatting/convertSmilies.php

Lines changed: 14 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,22 @@
88
*/
99
class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase {
1010

11+
public function set_up() {
12+
parent::set_up();
13+
14+
smilies_init();
15+
}
16+
1117
/**
1218
* Basic validation test to confirm that smilies are converted to image
1319
* when use_smilies = 1 and not when use_smilies = 0.
1420
*
1521
* @dataProvider data_convert_standard_smilies
1622
*/
1723
public function test_convert_standard_smilies( $input, $converted ) {
18-
// Standard smilies, use_smilies: ON.
19-
update_option( 'use_smilies', 1 );
20-
21-
smilies_init();
22-
2324
$this->assertSame( $converted, convert_smilies( $input ) );
2425

25-
// Standard smilies, use_smilies: OFF.
26+
// Disable smilies.
2627
update_option( 'use_smilies', 0 );
2728

2829
$this->assertSame( $input, convert_smilies( $input ) );
@@ -77,13 +78,6 @@ public function data_convert_standard_smilies() {
7778
public function test_convert_custom_smilies( $input, $converted ) {
7879
global $wpsmiliestrans;
7980

80-
// Custom smilies, use_smilies: ON.
81-
update_option( 'use_smilies', 1 );
82-
83-
if ( ! isset( $wpsmiliestrans ) ) {
84-
smilies_init();
85-
}
86-
8781
$trans_orig = $wpsmiliestrans; // Save original translations array.
8882

8983
$wpsmiliestrans = array(
@@ -97,12 +91,12 @@ public function test_convert_custom_smilies( $input, $converted ) {
9791

9892
$this->assertSame( $converted, convert_smilies( $input ) );
9993

100-
// Standard smilies, use_smilies: OFF.
94+
// Disable smilies.
10195
update_option( 'use_smilies', 0 );
10296

103-
$this->assertSame( $input, convert_smilies( $input ) );
104-
10597
$wpsmiliestrans = $trans_orig; // Reset original translations array.
98+
99+
$this->assertSame( $input, convert_smilies( $input ) );
106100
}
107101

108102
/**
@@ -147,14 +141,7 @@ public function test_ignore_smilies_in_tags( $element ) {
147141
$input = 'Do we ignore smilies ;-) in ' . $element . ' tags <' . $element . ' class="foo">My Content Here :?: </' . $element . '>';
148142
$expected = "Do we ignore smilies \xf0\x9f\x98\x89 in $element tags <$element class=\"foo\">My Content Here :?: </$element>";
149143

150-
// Standard smilies, use_smilies: ON.
151-
update_option( 'use_smilies', 1 );
152-
smilies_init();
153-
154144
$this->assertSame( $expected, convert_smilies( $input ) );
155-
156-
// Standard smilies, use_smilies: OFF.
157-
update_option( 'use_smilies', 0 );
158145
}
159146

160147
/**
@@ -184,13 +171,9 @@ public function data_ignore_smilies_in_tags() {
184171
* @dataProvider data_smilies_combinations
185172
*/
186173
public function test_smilies_combinations( $input, $converted ) {
187-
// Custom smilies, use_smilies: ON.
188-
update_option( 'use_smilies', 1 );
189-
smilies_init();
190-
191174
$this->assertSame( $converted, convert_smilies( $input ) );
192175

193-
// Custom smilies, use_smilies: OFF.
176+
// Disable smilies.
194177
update_option( 'use_smilies', 0 );
195178

196179
$this->assertSame( $input, convert_smilies( $input ) );
@@ -247,13 +230,6 @@ public function data_smilies_combinations() {
247230
public function test_single_smilies_in_wpsmiliestrans( $input, $converted ) {
248231
global $wpsmiliestrans;
249232

250-
// Standard smilies, use_smilies: ON.
251-
update_option( 'use_smilies', 1 );
252-
253-
if ( ! isset( $wpsmiliestrans ) ) {
254-
smilies_init();
255-
}
256-
257233
$orig_trans = $wpsmiliestrans; // Save original translations array.
258234

259235
$wpsmiliestrans = array(
@@ -264,12 +240,12 @@ public function test_single_smilies_in_wpsmiliestrans( $input, $converted ) {
264240

265241
$this->assertSame( $converted, convert_smilies( $input ) );
266242

267-
// Standard smilies, use_smilies: OFF.
243+
// Disable smilies.
268244
update_option( 'use_smilies', 0 );
269245

270-
$this->assertSame( $input, convert_smilies( $input ) );
271-
272246
$wpsmiliestrans = $orig_trans; // Reset original translations array.
247+
248+
$this->assertSame( $input, convert_smilies( $input ) );
273249
}
274250

275251
/**
@@ -312,15 +288,7 @@ public function data_single_smilies_in_wpsmiliestrans() {
312288
* @dataProvider data_spaces_around_smilies
313289
*/
314290
public function test_spaces_around_smilies( $input, $converted ) {
315-
// Standard smilies, use_smilies: ON.
316-
update_option( 'use_smilies', 1 );
317-
318-
smilies_init();
319-
320291
$this->assertSame( $converted, convert_smilies( $input ) );
321-
322-
// Standard smilies, use_smilies: OFF.
323-
update_option( 'use_smilies', 0 );
324292
}
325293

326294
/**

0 commit comments

Comments
 (0)