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

Tests: Introduce assertSameSets() and assertSameSetsWithIndex(), and use them where appropriate.

Browse Source 
This ensures that not only the array values being compared are equal, but also that their type is the same.

These new methods replace most of the existing instances of `assertEqualSets()` and `assertEqualSetsWithIndex()`.

Going forward, stricter type checking by using `assertSameSets()` or `assertSameSetsWithIndex()` should generally be preferred, to make the tests more reliable.

Follow-up to [48937].

See #38266.

git-svn-id: https://develop.svn.wordpress.org/trunk@48939 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2020-09-04 07:01:00 +00:00
parent 5e2a75ef29
commit 8be943d06e
105 changed files with 757 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/phpunit/tests/general/wpError.php
+19 -19
View File
@@ -112,7 +112,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
public function test_get_error_codes_with_one_error_should_return_an_array_with_only_that_code() {
$this->wp_error->add( 'code', 'message' );
$this->assertEqualSets( array( 'code' ), $this->wp_error->get_error_codes() );
$this->assertSameSets( array( 'code' ), $this->wp_error->get_error_codes() );
}
/**
@@ -124,7 +124,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
$expected = array( 'code', 'code2' );
$this->assertEqualSets( $expected, $this->wp_error->get_error_codes() );
$this->assertSameSets( $expected, $this->wp_error->get_error_codes() );
}
/**
@@ -166,7 +166,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
public function test_get_error_messages_with_empty_code_one_error_should_return_an_array_with_that_message() {
$this->wp_error->add( 'code', 'message' );
$this->assertEqualSets( array( 'message' ), $this->wp_error->get_error_messages() );
$this->assertSameSets( array( 'message' ), $this->wp_error->get_error_messages() );
}
/**
@@ -176,7 +176,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
$this->wp_error->add( 'code', 'message' );
$this->wp_error->add( 'code2', 'message2' );
$this->assertEqualSets( array( 'message', 'message2' ), $this->wp_error->get_error_messages() );
$this->assertSameSets( array( 'message', 'message2' ), $this->wp_error->get_error_messages() );
}
/**
@@ -192,7 +192,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
public function test_get_error_messages_with_one_error_should_return_an_array_with_that_message() {
$this->wp_error->add( 'code', 'message' );
$this->assertEqualSets( array( 'message' ), $this->wp_error->get_error_messages( 'code' ) );
$this->assertSameSets( array( 'message' ), $this->wp_error->get_error_messages( 'code' ) );
}
/**
@@ -301,7 +301,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
$expected = array( 'data-key' => 'data-value' );
$this->wp_error->add( 'code', 'message', $expected );
$this->assertEqualSetsWithIndex( $expected, $this->wp_error->get_error_data() );
$this->assertSameSetsWithIndex( $expected, $this->wp_error->get_error_data() );
}
/**
@@ -312,7 +312,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
$this->wp_error->add( 'code', 'message', $expected );
$this->wp_error->add( 'code2', 'message2', 'data2' );
$this->assertEqualSetsWithIndex( $expected, $this->wp_error->get_error_data() );
$this->assertSameSetsWithIndex( $expected, $this->wp_error->get_error_data() );
}
/**
@@ -349,7 +349,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
$expected = array( 'data-key' => 'data-value' );
$this->wp_error->add( 'code', 'message', $expected );
$this->assertEqualSetsWithIndex( $expected, $this->wp_error->get_error_data( 'code' ) );
$this->assertSameSetsWithIndex( $expected, $this->wp_error->get_error_data( 'code' ) );
}
/**
@@ -361,7 +361,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
$this->wp_error->add( 'code2', 'message2', 'data2' );
$this->wp_error->add( 'code', 'message3', $expected );
$this->assertEqualSetsWithIndex( $expected, $this->wp_error->get_error_data( 'code' ) );
$this->assertSameSetsWithIndex( $expected, $this->wp_error->get_error_data( 'code' ) );
}
/**
@@ -405,7 +405,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
public function test_add_with_empty_code_empty_message_empty_data_should_add_empty_message_to_errors_array_under_empty_key() {
$this->wp_error->add( '', '', 'data' );
$this->assertEqualSetsWithIndex( array( '' => array( '' ) ), $this->wp_error->errors );
$this->assertSameSetsWithIndex( array( '' => array( '' ) ), $this->wp_error->errors );
}
/**
@@ -423,7 +423,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
public function test_add_with_empty_code_empty_message_non_empty_data_should_store_data_under_an_empty_code_key() {
$this->wp_error->add( '', '', 'data' );
$this->assertEqualSetsWithIndex( array( '' => 'data' ), $this->wp_error->error_data );
$this->assertSameSetsWithIndex( array( '' => 'data' ), $this->wp_error->error_data );
}
/**
@@ -525,7 +525,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
$expected = array( 'message', 'message2' );
$this->assertEqualSets( $expected, $this->wp_error->get_error_messages( 'code' ) );
$this->assertSameSets( $expected, $this->wp_error->get_error_messages( 'code' ) );
}
/**
@@ -553,7 +553,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
public function test_add_data_with_empty_data_empty_code_no_errors_should_create_data_under_an_empty_code_key() {
$this->wp_error->add_data( '' );
$this->assertEqualSets( array( '' => '' ), $this->wp_error->error_data );
$this->assertSameSets( array( '' => '' ), $this->wp_error->error_data );
}
/**
@@ -606,7 +606,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
public function test_add_data_with_data_and_code_no_errors_should_create_data_under_that_code_key() {
$this->wp_error->add_data( 'data', 'code' );
$this->assertEqualSets( array( 'code' => 'data' ), $this->wp_error->error_data );
$this->assertSameSets( array( 'code' => 'data' ), $this->wp_error->error_data );
}
/**
@@ -617,7 +617,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
$this->wp_error->add_data( 'data', 'code2' );
$this->assertEqualSetsWithIndex( array( 'code' => array( 'message' ) ), $this->wp_error->errors );
$this->assertSameSetsWithIndex( array( 'code' => array( 'message' ) ), $this->wp_error->errors );
}
/**
@@ -628,7 +628,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
$this->wp_error->add_data( 'data', 'code2' );
$this->assertEqualSetsWithIndex( array( 'code2' => 'data' ), $this->wp_error->error_data );
$this->assertSameSetsWithIndex( array( 'code2' => 'data' ), $this->wp_error->error_data );
}
/**
@@ -652,7 +652,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
$after = $this->wp_error->errors;
$this->assertEqualSetsWithIndex( $before, $after );
$this->assertSameSetsWithIndex( $before, $after );
}
/**
@@ -665,7 +665,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
$after = $this->wp_error->errors;
$this->assertEqualSetsWithIndex( $before, $after );
$this->assertSameSetsWithIndex( $before, $after );
}
/**
@@ -680,7 +680,7 @@ class Tests_WP_Error extends WP_UnitTestCase {
$after = $this->wp_error->errors;
$this->assertEqualSetsWithIndex( $before, $after );
$this->assertSameSetsWithIndex( $before, $after );
}
/**