vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-01 07:40:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tests: First pass at using assertSame() instead of assertEquals() in most of the unit tests.

Browse Source 
This ensures that not only the return values match the expected results, but also that their type is the same.

Going forward, stricter type checking by using `assertSame()` should generally be preferred to `assertEquals()` where appropriate, to make the tests more reliable.

Props johnbillion, jrf, SergeyBiryukov.
See #38266.

git-svn-id: https://develop.svn.wordpress.org/trunk@48937 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2020-09-02 00:35:36 +00:00
parent ba7c6a2d5f
commit 164b22cf6a
426 changed files with 7959 additions and 7949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
tests/phpunit/tests/widgets.php
View File

@@ -155,7 +155,7 @@ class Tests_Widgets extends WP_UnitTestCase {
}
}
$this->assertEquals( $num, count( $result ) );
$this->assertSame( $num, count( $result ) );
}
@@ -288,7 +288,7 @@ class Tests_Widgets extends WP_UnitTestCase {
* If the sidebar ID is invalid, the second argument passed to
* the 'dynamic_sidebar_before' hook will be false.
*/
$this->assertSame( false, $this->valid_sidebar );
$this->assertFalse( $this->valid_sidebar );
}
/**
@@ -349,7 +349,7 @@ class Tests_Widgets extends WP_UnitTestCase {
ob_start();
$retval = $widget->form( array() );
$output = ob_get_clean();
$this->assertEquals( 'noform', $retval );
$this->assertSame( 'noform', $retval );
$this->assertContains( 'no-options-widget', $output );
}
@@ -361,13 +361,13 @@ class Tests_Widgets extends WP_UnitTestCase {
$name = 'Foo';
$foo_widget = new WP_Widget( $id_base, $name );
$this->assertEquals( $id_base, $foo_widget->id_base );
$this->assertEquals( $name, $foo_widget->name );
$this->assertEquals( "widget_{$id_base}", $foo_widget->option_name );
$this->assertSame( $id_base, $foo_widget->id_base );
$this->assertSame( $name, $foo_widget->name );
$this->assertSame( "widget_{$id_base}", $foo_widget->option_name );
$this->assertArrayHasKey( 'classname', $foo_widget->widget_options );
$this->assertEquals( "widget_{$id_base}", $foo_widget->widget_options['classname'] );
$this->assertSame( "widget_{$id_base}", $foo_widget->widget_options['classname'] );
$this->assertArrayHasKey( 'id_base', $foo_widget->control_options );
$this->assertEquals( $id_base, $foo_widget->control_options['id_base'] );
$this->assertSame( $id_base, $foo_widget->control_options['id_base'] );
$id_base = 'bar';
$name = 'Bar';
@@ -378,8 +378,8 @@ class Tests_Widgets extends WP_UnitTestCase {
'id_base' => 'bar_id_base',
);
$bar_widget = new WP_Widget( $id_base, $name, $widget_options, $control_options );
$this->assertEquals( $widget_options['classname'], $bar_widget->widget_options['classname'] );
$this->assertEquals( $control_options['id_base'], $bar_widget->control_options['id_base'] );
$this->assertSame( $widget_options['classname'], $bar_widget->widget_options['classname'] );
$this->assertSame( $control_options['id_base'], $bar_widget->control_options['id_base'] );
}
/**
@@ -389,7 +389,7 @@ class Tests_Widgets extends WP_UnitTestCase {
function test_wp_widget_get_field_name( $expected, $value_to_test ) {
$widget = new WP_Widget( 'foo', 'Foo' );
$widget->_set( 2 );
$this->assertEquals( $expected, $widget->get_field_name( $value_to_test ) );
$this->assertSame( $expected, $widget->get_field_name( $value_to_test ) );
}
/**
@@ -439,7 +439,7 @@ class Tests_Widgets extends WP_UnitTestCase {
function test_wp_widget_get_field_id( $expected, $value_to_test ) {
$widget = new WP_Widget( 'foo', 'Foo' );
$widget->_set( 2 );
$this->assertEquals( $expected, $widget->get_field_id( $value_to_test ) );
$this->assertSame( $expected, $widget->get_field_id( $value_to_test ) );
}
@@ -535,7 +535,7 @@ class Tests_Widgets extends WP_UnitTestCase {
$option_value = get_option( 'widget_search' );
$this->assertArrayHasKey( '_multiwidget', $option_value );
$this->assertEquals( 1, $option_value['_multiwidget'] );
$this->assertSame( 1, $option_value['_multiwidget'] );
$this->assertArrayHasKey( 2, $option_value );
$instance = $option_value[2];
$this->assertInternalType( 'array', $instance );
@@ -545,7 +545,7 @@ class Tests_Widgets extends WP_UnitTestCase {
// Pretend this widget is new.
delete_option( 'widget_nav_menu' );
$never_used = get_option( 'widget_nav_menu', array() );
$this->assertEquals( array(), (array) $never_used );
$this->assertSame( array(), (array) $never_used );
wp_widgets_init();
$wp_widget_search = $wp_registered_widgets['search-2']['callback'][0];
@@ -555,12 +555,12 @@ class Tests_Widgets extends WP_UnitTestCase {
$this->assertArrayHasKey( 2, $settings );
foreach ( $option_value as $widget_number => $instance ) {
$this->assertEquals( $settings[ $widget_number ], $option_value[ $widget_number ] );
$this->assertSame( $settings[ $widget_number ], $option_value[ $widget_number ] );
}
// After widgets_init(), get_settings() should create the widget option.
$never_used = get_option( 'widget_nav_menu' );
$this->assertEquals( 1, $never_used['_multiwidget'] );
$this->assertSame( 1, $never_used['_multiwidget'] );
$this->assertArrayNotHasKey( 0, $never_used );
}
@@ -592,7 +592,7 @@ class Tests_Widgets extends WP_UnitTestCase {
$option_value = get_option( $wp_widget_search->option_name );
$this->assertArrayHasKey( '_multiwidget', $option_value );
$this->assertEquals( $overridden_title, $option_value[2]['title'] );
$this->assertSame( $overridden_title, $option_value[2]['title'] );
}
/**
@@ -773,7 +773,7 @@ class Tests_Widgets extends WP_UnitTestCase {
$result = retrieve_widgets( true );
$this->assertInternalType( 'array', $result );
$this->assertEquals( $result, $sidebars_widgets );
$this->assertSame( $result, $sidebars_widgets );
foreach ( $sidebars_widgets as $widgets ) {
$this->assertInternalType( 'array', $widgets );
@@ -798,7 +798,7 @@ class Tests_Widgets extends WP_UnitTestCase {
$this->assertContains( 'recent-comments-2', $sidebars_widgets['wp_inactive_widgets'] );
// Sidebar_widgets option was updated.
$this->assertEquals( $sidebars_widgets, wp_get_sidebars_widgets() );
$this->assertSame( $sidebars_widgets, wp_get_sidebars_widgets() );
}
/**
@@ -823,7 +823,7 @@ class Tests_Widgets extends WP_UnitTestCase {
// $sidebars_widgets matches registered sidebars.
$this->assertInternalType( 'array', $result );
$this->assertEquals( $result, $sidebars_widgets );
$this->assertSame( $result, $sidebars_widgets );
foreach ( $sidebars_widgets as $widgets ) {
$this->assertInternalType( 'array', $widgets );
@@ -862,7 +862,7 @@ class Tests_Widgets extends WP_UnitTestCase {
$_wp_sidebars_widgets = array();
$this->assertInternalType( 'array', $result );
$this->assertEquals( $result, $sidebars_widgets );
$this->assertSame( $result, $sidebars_widgets );
foreach ( $sidebars_widgets as $widgets ) {
$this->assertInternalType( 'array', $widgets );
@@ -890,7 +890,7 @@ class Tests_Widgets extends WP_UnitTestCase {
$this->assertContains( 'recent-comments-2', $sidebars_widgets['wp_inactive_widgets'] );
// Sidebar_widgets option was updated.
$this->assertEquals( $sidebars_widgets, wp_get_sidebars_widgets() );
$this->assertSame( $sidebars_widgets, wp_get_sidebars_widgets() );
// Reset.
$sidebars_widgets = array(
@@ -905,7 +905,7 @@ class Tests_Widgets extends WP_UnitTestCase {
$_wp_sidebars_widgets = array();
$this->assertInternalType( 'array', $result );
$this->assertEquals( $result, $sidebars_widgets );
$this->assertSame( $result, $sidebars_widgets );
foreach ( $sidebars_widgets as $widgets ) {
$this->assertInternalType( 'array', $widgets );
@@ -930,7 +930,7 @@ class Tests_Widgets extends WP_UnitTestCase {
$this->assertContains( 'recent-comments-2', $sidebars_widgets['wp_inactive_widgets'] );
// Sidebar_widgets option was updated.
$this->assertEquals( $sidebars_widgets, wp_get_sidebars_widgets() );
$this->assertSame( $sidebars_widgets, wp_get_sidebars_widgets() );
}
/**
@@ -957,7 +957,7 @@ class Tests_Widgets extends WP_UnitTestCase {
$_wp_sidebars_widgets = array();
$this->assertInternalType( 'array', $result );
$this->assertEquals( $result, $sidebars_widgets );
$this->assertSame( $result, $sidebars_widgets );
foreach ( $sidebars_widgets as $widgets ) {
$this->assertInternalType( 'array', $widgets );
@@ -1037,7 +1037,7 @@ class Tests_Widgets extends WP_UnitTestCase {
$this->assertArrayNotHasKey( 'orphaned_widgets_1', $sidebars_widgets );
// Sidebar_widgets option was updated.
$this->assertEquals( $sidebars_widgets, wp_get_sidebars_widgets() );
$this->assertSame( $sidebars_widgets, wp_get_sidebars_widgets() );
}
/**
@@ -1062,7 +1062,7 @@ class Tests_Widgets extends WP_UnitTestCase {
$this->assertArrayHasKey( 'fantasy', $filtered_widgets );
$this->assertEmpty( $filtered_widgets['fantasy'] );
$this->assertArrayHasKey( 'array_version', $filtered_widgets );
$this->assertEquals( 3, $filtered_widgets['array_version'] );
$this->assertSame( 3, $filtered_widgets['array_version'] );
$this->assertInternalType( 'integer', $filtered_widgets['array_version'] );
}