Skip to content

Commit f3eaed3

Browse files
dlh01dlh01
committed
Make test cases compatible with PHPUnit 9
1 parent 0a7f9d1 commit f3eaed3

28 files changed

+584
-568
lines changed

‎tests/php/includes/class-fieldmanager-assets-unit-test-case.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class Fieldmanager_Assets_Unit_Test_Case extends WP_UnitTestCase {
66

77
protected $screen, $old_wp_scripts;
88

9-
public function setUp() {
9+
public function setUp(): void {
1010
parent::setUp();
1111

1212
// Spoof is_admin() for fm_add_script().
@@ -25,7 +25,7 @@ public function setUp() {
2525
Fieldmanager_Util_Assets::instance()->hooked = false;
2626
}
2727

28-
public function tearDown() {
28+
public function tearDown(): void {
2929
// Restore current_screen.
3030
$GLOBALS['current_screen'] = $this->screen;
3131

‎tests/php/test-fieldmanager-autocomplete-field.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
class Test_Fieldmanager_Autocomplete_Field extends WP_UnitTestCase {
1010

11-
public function setUp() {
11+
public function setUp(): void {
1212
parent::setUp();
1313
Fieldmanager_Field::$debug = true;
1414

@@ -65,14 +65,14 @@ public function test_exact_match() {
6565
ob_start();
6666
$fm->add_meta_box( 'Test Autocomplete', 'post' )->render_meta_box( $this->post, array() );
6767
$html = ob_get_clean();
68-
$this->assertRegExp( '/<input[^>]+type=[\'"]text[\'"][^>]+value=[\'"]{2}/', $html );
68+
$this->assertMatchesRegularExpression( '/<input[^>]+type=[\'"]text[\'"][^>]+value=[\'"]{2}/', $html );
6969

7070
$args['exact_match'] = false;
7171
$fm = new Fieldmanager_Autocomplete( $args );
7272
ob_start();
7373
$fm->add_meta_box( 'Test Autocomplete', 'post' )->render_meta_box( $this->post, array() );
7474
$html = ob_get_clean();
75-
$this->assertRegExp( '/<input[^>]+type=[\'"]text[\'"][^>]+value=[\'"]' . $args['default_value'] . '[\'"]/', $html );
75+
$this->assertMatchesRegularExpression( '/<input[^>]+type=[\'"]text[\'"][^>]+value=[\'"]' . $args['default_value'] . '[\'"]/', $html );
7676
}
7777

7878
public function test_ajax() {

‎tests/php/test-fieldmanager-calculate-context.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
class Test_Fieldmanager_Calculate_Context extends WP_UnitTestCase {
88
protected $screen, $self, $get, $submenus;
99

10-
public function setUp() {
10+
public function setUp(): void {
1111
parent::setUp();
1212

1313
$this->screen = get_current_screen();
@@ -21,7 +21,7 @@ public function setUp() {
2121
set_current_screen( 'dashboard-user' );
2222
}
2323

24-
public function tearDown( $value = null ) {
24+
public function tearDown(): void {
2525
$GLOBALS['current_screen'] = $this->screen;
2626
$_SERVER['PHP_SELF'] = $this->self;
2727
$_GET = $this->get;

‎tests/php/test-fieldmanager-checkbox-field.php

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
class Test_Fieldmanager_Checkbox_Field extends WP_UnitTestCase {
1010

11-
public function setUp() {
11+
public function setUp(): void {
1212
parent::setUp();
1313
Fieldmanager_Field::$debug = true;
1414

@@ -56,24 +56,24 @@ public function test_save() {
5656
);
5757

5858
$html = $this->render( $checkbox, $this->post );
59-
$this->assertContains( 'name="test_checkbox"', $html );
60-
$this->assertNotContains( 'checked', $html );
59+
$this->assertStringContainsString('name="test_checkbox"', $html );
60+
$this->assertStringNotContainsString( 'checked', $html );
6161

6262
$this->save_values( $checkbox, $this->post, true );
6363
$saved_value = get_post_meta( $this->post->ID, 'test_checkbox', true );
6464

6565
$this->assertSame( '1', $saved_value );
6666

6767
$html = $this->render( $checkbox, $this->post );
68-
$this->assertContains( 'checked', $html );
68+
$this->assertStringContainsString('checked', $html );
6969

7070
$this->save_values( $checkbox, $this->post, false );
7171
$saved_value = get_post_meta( $this->post->ID, 'test_checkbox', true );
7272

7373
$this->assertSame( '', $saved_value );
7474

7575
$html = $this->render( $checkbox, $this->post );
76-
$this->assertNotContains( 'checked', $html );
76+
$this->assertStringNotContainsString( 'checked', $html );
7777
}
7878

7979
/**
@@ -88,24 +88,24 @@ public function test_save_default_true() {
8888
);
8989

9090
$html = $this->render( $checkbox, $this->post );
91-
$this->assertContains( 'name="test_checkbox"', $html );
92-
$this->assertContains( 'checked', $html );
91+
$this->assertStringContainsString('name="test_checkbox"', $html );
92+
$this->assertStringContainsString('checked', $html );
9393

9494
$this->save_values( $checkbox, $this->post, true );
9595
$saved_value = get_post_meta( $this->post->ID, 'test_checkbox', true );
9696

9797
$this->assertSame( '1', $saved_value );
9898

9999
$html = $this->render( $checkbox, $this->post );
100-
$this->assertContains( 'checked', $html );
100+
$this->assertStringContainsString('checked', $html );
101101

102102
$this->save_values( $checkbox, $this->post, false );
103103
$saved_value = get_post_meta( $this->post->ID, 'test_checkbox', true );
104104

105105
$this->assertSame( '', $saved_value );
106106

107107
$html = $this->render( $checkbox, $this->post );
108-
$this->assertNotContains( 'checked', $html );
108+
$this->assertStringNotContainsString( 'checked', $html );
109109
}
110110

111111
/**
@@ -154,25 +154,25 @@ public function test_save_custom_values() {
154154
);
155155

156156
$html = $this->render( $checkbox, $this->post );
157-
$this->assertContains( 'name="test_checkbox"', $html );
158-
$this->assertContains( 'value="' . $checked . '"', $html );
159-
$this->assertNotContains( 'checked', $html );
157+
$this->assertStringContainsString('name="test_checkbox"', $html );
158+
$this->assertStringContainsString('value="' . $checked . '"', $html );
159+
$this->assertStringNotContainsString( 'checked', $html );
160160

161161
$this->save_values( $checkbox, $this->post, $checked );
162162
$saved_value = get_post_meta( $this->post->ID, 'test_checkbox', true );
163163

164164
$this->assertSame( $checked, $saved_value );
165165

166166
$html = $this->render( $checkbox, $this->post );
167-
$this->assertContains( 'checked', $html );
167+
$this->assertStringContainsString('checked', $html );
168168

169169
$this->save_values( $checkbox, $this->post, '' );
170170
$saved_value = get_post_meta( $this->post->ID, 'test_checkbox', true );
171171

172172
$this->assertSame( $unchecked, $saved_value );
173173

174174
$html = $this->render( $checkbox, $this->post );
175-
$this->assertNotContains( 'checked', $html );
175+
$this->assertStringNotContainsString( 'checked', $html );
176176
}
177177

178178
/**
@@ -191,25 +191,25 @@ public function test_save_custom_values_default_checked() {
191191
);
192192

193193
$html = $this->render( $checkbox, $this->post );
194-
$this->assertContains( 'name="test_checkbox"', $html );
195-
$this->assertContains( 'value="' . $checked . '"', $html );
196-
$this->assertContains( 'checked', $html );
194+
$this->assertStringContainsString('name="test_checkbox"', $html );
195+
$this->assertStringContainsString('value="' . $checked . '"', $html );
196+
$this->assertStringContainsString('checked', $html );
197197

198198
$this->save_values( $checkbox, $this->post, $checked );
199199
$saved_value = get_post_meta( $this->post->ID, 'test_checkbox', true );
200200

201201
$this->assertSame( $checked, $saved_value );
202202

203203
$html = $this->render( $checkbox, $this->post );
204-
$this->assertContains( 'checked', $html );
204+
$this->assertStringContainsString('checked', $html );
205205

206206
$this->save_values( $checkbox, $this->post, '' );
207207
$saved_value = get_post_meta( $this->post->ID, 'test_checkbox', true );
208208

209209
$this->assertSame( $unchecked, $saved_value );
210210

211211
$html = $this->render( $checkbox, $this->post );
212-
$this->assertNotContains( 'checked', $html );
212+
$this->assertStringNotContainsString( 'checked', $html );
213213
}
214214

215215
/**
@@ -226,23 +226,23 @@ public function test_save_group() {
226226
);
227227

228228
$html = $this->render( $group, $this->post );
229-
$this->assertNotContains( 'checked', $html );
229+
$this->assertStringNotContainsString( 'checked', $html );
230230

231231
$this->save_values( $group, $this->post, array( 'checkbox' => true ) );
232232
$saved_value = get_post_meta( $this->post->ID, 'test_checkbox', true );
233233

234234
$this->assertSame( true, $saved_value['checkbox'] );
235235

236236
$html = $this->render( $group, $this->post );
237-
$this->assertContains( 'checked', $html );
237+
$this->assertStringContainsString('checked', $html );
238238

239239
$this->save_values( $group, $this->post, array( 'checkbox' => false ) );
240240
$saved_value = get_post_meta( $this->post->ID, 'test_checkbox', true );
241241

242242
$this->assertSame( false, $saved_value['checkbox'] );
243243

244244
$html = $this->render( $group, $this->post );
245-
$this->assertNotContains( 'checked', $html );
245+
$this->assertStringNotContainsString( 'checked', $html );
246246
}
247247

248248
/**
@@ -263,23 +263,23 @@ public function test_save_group_default_true() {
263263
);
264264

265265
$html = $this->render( $group, $this->post );
266-
$this->assertContains( 'checked', $html );
266+
$this->assertStringContainsString('checked', $html );
267267

268268
$this->save_values( $group, $this->post, array( 'checkbox' => true ) );
269269
$saved_value = get_post_meta( $this->post->ID, 'test_checkbox', true );
270270

271271
$this->assertSame( true, $saved_value['checkbox'] );
272272

273273
$html = $this->render( $group, $this->post );
274-
$this->assertContains( 'checked', $html );
274+
$this->assertStringContainsString('checked', $html );
275275

276276
$this->save_values( $group, $this->post, array( 'checkbox' => false ) );
277277
$saved_value = get_post_meta( $this->post->ID, 'test_checkbox', true );
278278

279279
$this->assertSame( false, $saved_value['checkbox'] );
280280

281281
$html = $this->render( $group, $this->post );
282-
$this->assertNotContains( 'checked', $html );
282+
$this->assertStringNotContainsString( 'checked', $html );
283283
}
284284

285285
/**
@@ -303,24 +303,24 @@ public function test_save_group_custom_values() {
303303
);
304304

305305
$html = $this->render( $group, $this->post );
306-
$this->assertContains( 'value="' . $checked . '"', $html );
307-
$this->assertNotContains( 'checked', $html );
306+
$this->assertStringContainsString('value="' . $checked . '"', $html );
307+
$this->assertStringNotContainsString( 'checked', $html );
308308

309309
$this->save_values( $group, $this->post, array( 'checkbox' => $checked ) );
310310
$saved_value = get_post_meta( $this->post->ID, 'test_checkbox', true );
311311

312312
$this->assertSame( $checked, $saved_value['checkbox'] );
313313

314314
$html = $this->render( $group, $this->post );
315-
$this->assertContains( 'checked', $html );
315+
$this->assertStringContainsString('checked', $html );
316316

317317
$this->save_values( $group, $this->post, array( 'checkbox' => false ) );
318318
$saved_value = get_post_meta( $this->post->ID, 'test_checkbox', true );
319319

320320
$this->assertSame( $unchecked, $saved_value['checkbox'] );
321321

322322
$html = $this->render( $group, $this->post );
323-
$this->assertNotContains( 'checked', $html );
323+
$this->assertStringNotContainsString( 'checked', $html );
324324
}
325325

326326
/**
@@ -345,23 +345,23 @@ public function test_save_group_custom_values_default_checked() {
345345
);
346346

347347
$html = $this->render( $group, $this->post );
348-
$this->assertContains( 'value="' . $checked . '"', $html );
349-
$this->assertContains( 'checked', $html );
348+
$this->assertStringContainsString('value="' . $checked . '"', $html );
349+
$this->assertStringContainsString('checked', $html );
350350

351351
$this->save_values( $group, $this->post, array( 'checkbox' => $checked ) );
352352
$saved_value = get_post_meta( $this->post->ID, 'test_checkbox', true );
353353

354354
$this->assertSame( $checked, $saved_value['checkbox'] );
355355

356356
$html = $this->render( $group, $this->post );
357-
$this->assertContains( 'checked', $html );
357+
$this->assertStringContainsString('checked', $html );
358358

359359
$this->save_values( $group, $this->post, array( 'checkbox' => false ) );
360360
$saved_value = get_post_meta( $this->post->ID, 'test_checkbox', true );
361361

362362
$this->assertSame( $unchecked, $saved_value['checkbox'] );
363363

364364
$html = $this->render( $group, $this->post );
365-
$this->assertNotContains( 'checked', $html );
365+
$this->assertStringNotContainsString( 'checked', $html );
366366
}
367367
}

0 commit comments

Comments
 (0)