vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-04 20:54:29 +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

30
tests/phpunit/tests/query/commentCount.php
View File

@@ -81,7 +81,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase {
$expected = self::$post_ids[4];
$this->assertEqualSets( $found_post_ids, $expected );
$this->assertSameSets( $found_post_ids, $expected );
}
public function test_operator_greater_than() {
@@ -99,7 +99,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase {
$expected = self::$post_ids[5];
$this->assertEqualSets( $found_post_ids, $expected );
$this->assertSameSets( $found_post_ids, $expected );
}
public function test_operator_greater_than_no_results() {
@@ -117,7 +117,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase {
$expected = array();
$this->assertEqualSets( $found_post_ids, $expected );
$this->assertSameSets( $found_post_ids, $expected );
}
public function test_operator_less_than() {
$args = array(
@@ -143,7 +143,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase {
$expected[] = $expected_id;
}
$this->assertEqualSets( $found_post_ids, $expected );
$this->assertSameSets( $found_post_ids, $expected );
}
public function test_operator_less_than_no_results() {
@@ -161,7 +161,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase {
$expected = array();
$this->assertEqualSets( $found_post_ids, $expected );
$this->assertSameSets( $found_post_ids, $expected );
}
@@ -189,7 +189,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase {
$expected[] = $expected_id;
}
$this->assertEqualSets( $found_post_ids, $expected );
$this->assertSameSets( $found_post_ids, $expected );
}
public function test_operator_equal_or_greater_than() {
@@ -213,7 +213,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase {
$expected[] = $expected_id;
}
$this->assertEqualSets( $found_post_ids, $expected );
$this->assertSameSets( $found_post_ids, $expected );
}
public function test_operator_equal_or_greater_than_no_results() {
@@ -231,7 +231,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase {
$expected = array();
$this->assertEqualSets( $found_post_ids, $expected );
$this->assertSameSets( $found_post_ids, $expected );
}
public function test_operator_equal_or_less_than() {
@@ -255,7 +255,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase {
$expected[] = $expected_id;
}
$this->assertEqualSets( $found_post_ids, $expected );
$this->assertSameSets( $found_post_ids, $expected );
}
public function test_operator_equal_or_less_than_no_results() {
@@ -273,7 +273,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase {
$expected = array();
$this->assertEqualSets( $found_post_ids, $expected );
$this->assertSameSets( $found_post_ids, $expected );
}
public function test_invalid_operator_should_fall_back_on_equals() {
@@ -294,7 +294,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase {
$expected[] = $expected_id;
}
$this->assertEqualSets( $found_post_ids, $expected );
$this->assertSameSets( $found_post_ids, $expected );
}
public function test_wrong_count_no_results() {
@@ -312,7 +312,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase {
$expected = array();
$this->assertEqualSets( $found_post_ids, $expected );
$this->assertSameSets( $found_post_ids, $expected );
}
public function test_no_operator_no_results() {
@@ -329,7 +329,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase {
$expected = self::$post_ids[5];
$this->assertEqualSets( $found_post_ids, $expected );
$this->assertSameSets( $found_post_ids, $expected );
}
public function test_empty_non_numeric_string_should_be_ignored() {
@@ -353,7 +353,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase {
$expected[] = $expected_id;
}
$this->assertEqualSets( $found_post_ids, $expected );
$this->assertSameSets( $found_post_ids, $expected );
}
public function test_simple_count() {
@@ -368,7 +368,7 @@ class Tests_Query_CommentCount extends WP_UnitTestCase {
$expected = self::$post_ids[5];
$this->assertEqualSets( $found_post_ids, $expected );
$this->assertSameSets( $found_post_ids, $expected );
}
}

32
tests/phpunit/tests/query/dateQuery.php
View File

@@ -54,7 +54,7 @@ class Tests_Query_DateQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p1, $p2 ), wp_list_pluck( $posts, 'ID' ) );
$this->assertSameSets( array( $p1, $p2 ), wp_list_pluck( $posts, 'ID' ) );
}
/**
@@ -77,7 +77,7 @@ class Tests_Query_DateQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p1 ), wp_list_pluck( $posts, 'ID' ) );
$this->assertSameSets( array( $p1 ), wp_list_pluck( $posts, 'ID' ) );
}
public function test_date_query_before_string() {
@@ -118,7 +118,7 @@ class Tests_Query_DateQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p3 ), wp_list_pluck( $posts, 'ID' ) );
$this->assertSameSets( array( $p3 ), wp_list_pluck( $posts, 'ID' ) );
}
/**
@@ -290,8 +290,8 @@ class Tests_Query_DateQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p1, $p2 ), $before_posts );
$this->assertEqualSets( array( $p1, $p2 ), $after_posts );
$this->assertSameSets( array( $p1, $p2 ), $before_posts );
$this->assertSameSets( array( $p1, $p2 ), $after_posts );
}
/**
@@ -374,8 +374,8 @@ class Tests_Query_DateQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p1, $p2 ), $before_posts );
$this->assertEqualSets( array( $p1, $p2 ), $after_posts );
$this->assertSameSets( array( $p1, $p2 ), $before_posts );
$this->assertSameSets( array( $p1, $p2 ), $after_posts );
}
/**
@@ -458,8 +458,8 @@ class Tests_Query_DateQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p1, $p2 ), $before_posts );
$this->assertEqualSets( array( $p1, $p2 ), $after_posts );
$this->assertSameSets( array( $p1, $p2 ), $before_posts );
$this->assertSameSets( array( $p1, $p2 ), $after_posts );
}
/**
@@ -542,8 +542,8 @@ class Tests_Query_DateQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p1, $p2 ), $before_posts );
$this->assertEqualSets( array( $p1, $p2 ), $after_posts );
$this->assertSameSets( array( $p1, $p2 ), $before_posts );
$this->assertSameSets( array( $p1, $p2 ), $after_posts );
}
/**
@@ -626,8 +626,8 @@ class Tests_Query_DateQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p1, $p2 ), $before_posts );
$this->assertEqualSets( array( $p1, $p2 ), $after_posts );
$this->assertSameSets( array( $p1, $p2 ), $before_posts );
$this->assertSameSets( array( $p1, $p2 ), $after_posts );
}
/**
@@ -867,7 +867,7 @@ class Tests_Query_DateQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p2, $p3, $p4 ), wp_list_pluck( $posts, 'ID' ) );
$this->assertSameSets( array( $p2, $p3, $p4 ), wp_list_pluck( $posts, 'ID' ) );
}
public function test_date_query_relation_or() {
@@ -1084,7 +1084,7 @@ class Tests_Query_DateQuery extends WP_UnitTestCase {
$expected = array( $p1, $p2 );
$this->assertEqualSets( $expected, $q->posts );
$this->assertSameSets( $expected, $q->posts );
}
/**
@@ -1163,6 +1163,6 @@ class Tests_Query_DateQuery extends WP_UnitTestCase {
);
$expected = array( $p1, $p4, $p5 );
$this->assertEqualSets( $expected, $q->posts );
$this->assertSameSets( $expected, $q->posts );
}
}

140
tests/phpunit/tests/query/metaQuery.php
View File

@@ -28,7 +28,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p1, $p2 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
public function test_meta_query_no_value() {
@@ -54,7 +54,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p2, $p3 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
public function test_meta_query_single_query_compare_default() {
@@ -78,7 +78,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p1 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
public function test_meta_query_single_query_compare_equals() {
@@ -103,7 +103,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p1 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
public function test_meta_query_single_query_compare_not_equals() {
@@ -130,7 +130,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p2 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
public function test_meta_query_single_query_compare_arithmetic_comparisons() {
@@ -159,7 +159,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p1 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
// <=
$query = new WP_Query(
@@ -178,7 +178,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p1, $p2 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
// >=
$query = new WP_Query(
@@ -197,7 +197,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p2, $p3 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
// >
$query = new WP_Query(
@@ -216,7 +216,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p3 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
public function test_meta_query_single_query_compare_like() {
@@ -241,7 +241,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p1 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
public function test_meta_query_single_query_compare_not_like() {
@@ -268,7 +268,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p2 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
public function test_meta_query_single_query_compare_between_not_between() {
@@ -297,7 +297,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p2 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
$query = new WP_Query(
array(
@@ -316,7 +316,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p1, $p3 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
public function test_meta_query_single_query_compare_regexp_rlike() {
@@ -342,7 +342,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p2 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
// RLIKE is a synonym for REGEXP.
$query = new WP_Query(
@@ -361,7 +361,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p2 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
public function test_meta_query_single_query_compare_not_regexp() {
@@ -387,7 +387,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p1 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
public function test_meta_query_relation_default() {
@@ -467,7 +467,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $post_id, $post_id2, $post_id3, $post_id4 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
public function test_meta_query_relation_and() {
@@ -523,7 +523,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $post_id7 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
$query = new WP_Query(
array(
@@ -543,7 +543,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $post_id2, $post_id6, $post_id7 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
/**
@@ -566,7 +566,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $posts[0], $posts[2] ), $query->posts );
$this->assertSameSets( array( $posts[0], $posts[2] ), $query->posts );
}
/**
@@ -590,7 +590,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $posts[2] ), $query->posts );
$this->assertSameSets( array( $posts[2] ), $query->posts );
}
/**
@@ -614,7 +614,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $posts[1] ), $query->posts );
$this->assertSameSets( array( $posts[1] ), $query->posts );
}
/**
@@ -651,7 +651,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $post_id2, $post_id3, $post_id4 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
$query = new WP_Query(
array(
@@ -734,7 +734,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $posts[1], $posts[2], $posts[3] );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
/**
@@ -769,7 +769,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $posts[1], $posts[2] );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
/**
@@ -804,7 +804,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $posts[0], $posts[1] );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
/**
@@ -839,7 +839,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $posts[0], $posts[1] );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
/**
@@ -874,7 +874,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $posts[1], $posts[2] );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
/**
@@ -910,7 +910,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $posts[0], $posts[2] );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
/**
@@ -947,7 +947,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $posts[3] );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
/**
@@ -984,7 +984,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $posts[1] );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
/**
@@ -1020,7 +1020,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $posts[3] );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
/**
@@ -1063,7 +1063,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $posts[2] );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
/**
@@ -1099,7 +1099,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $posts[3] );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
/**
@@ -1135,7 +1135,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $posts[3] );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
/**
@@ -1167,7 +1167,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
'fields' => 'ids',
)
);
$this->assertEqualSets( array( $post_3 ), $query->posts );
$this->assertSameSets( array( $post_3 ), $query->posts );
$query = new WP_Query(
array(
@@ -1184,7 +1184,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
'fields' => 'ids',
)
);
$this->assertEqualSets( array( $post_4 ), $query->posts );
$this->assertSameSets( array( $post_4 ), $query->posts );
$query = new WP_Query(
array(
@@ -1201,7 +1201,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
'fields' => 'ids',
)
);
$this->assertEqualSets( array( $post_3, $post_4 ), $query->posts );
$this->assertSameSets( array( $post_3, $post_4 ), $query->posts );
$query = new WP_Query(
array(
@@ -1218,7 +1218,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
'fields' => 'ids',
)
);
$this->assertEqualSets( array( $post_1 ), $query->posts, 'ID' );
$this->assertSameSets( array( $post_1 ), $query->posts, 'ID' );
$query = new WP_Query(
array(
@@ -1235,7 +1235,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
'fields' => 'ids',
)
);
$this->assertEqualSets( array( $post_1, $post_2, $post_3 ), $query->posts );
$this->assertSameSets( array( $post_1, $post_2, $post_3 ), $query->posts );
$query = new WP_Query(
array(
@@ -1252,7 +1252,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
'fields' => 'ids',
)
);
$this->assertEqualSets( array( $post_3 ), $query->posts );
$this->assertSameSets( array( $post_3 ), $query->posts );
$query = new WP_Query(
array(
@@ -1269,7 +1269,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
'fields' => 'ids',
)
);
$this->assertEqualSets( array( $post_1, $post_2, $post_4 ), $query->posts );
$this->assertSameSets( array( $post_1, $post_2, $post_4 ), $query->posts );
$query = new WP_Query(
array(
@@ -1286,7 +1286,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
'fields' => 'ids',
)
);
$this->assertEqualSets( array( $post_1, $post_3 ), $query->posts );
$this->assertSameSets( array( $post_1, $post_3 ), $query->posts );
$query = new WP_Query(
array(
@@ -1303,7 +1303,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
'fields' => 'ids',
)
);
$this->assertEqualSets( array( $post_2, $post_4 ), $query->posts );
$this->assertSameSets( array( $post_2, $post_4 ), $query->posts );
$query = new WP_Query(
array(
@@ -1316,7 +1316,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
'fields' => 'ids',
)
);
$this->assertEqualSets( array( $post_4, $post_3, $post_2, $post_1 ), $query->posts );
$this->assertSameSets( array( $post_4, $post_3, $post_2, $post_1 ), $query->posts );
}
public function test_meta_vars_should_be_converted_to_meta_query() {
@@ -1461,7 +1461,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p1, $p3 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
/**
@@ -1511,7 +1511,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
);
$expected = array( $p1, $p3 );
$this->assertEqualSets( $expected, $query->posts );
$this->assertSameSets( $expected, $query->posts );
}
public function test_meta_between_not_between() {
@@ -1540,7 +1540,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
$this->assertSame( 'raw', $post->filter );
}
$posts = wp_list_pluck( $query->posts, 'ID' );
$this->assertEqualSets( array( $post_id2, $post_id3 ), $posts );
$this->assertSameSets( array( $post_id2, $post_id3 ), $posts );
$args = array(
'meta_key' => 'time',
@@ -1556,7 +1556,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
$this->assertSame( 'raw', $post->filter );
}
$posts = wp_list_pluck( $query->posts, 'ID' );
$this->assertEqualSets( array( $post_id, $post_id4, $post_id5 ), $posts );
$this->assertSameSets( array( $post_id, $post_id4, $post_id5 ), $posts );
}
/**
@@ -1584,7 +1584,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
$this->assertSame( 2, count( $posts ) );
$posts = wp_list_pluck( $posts, 'ID' );
$this->assertEqualSets( array( $post_id, $post_id3 ), $posts );
$this->assertSameSets( array( $post_id, $post_id3 ), $posts );
$posts = get_posts(
array(
@@ -1600,7 +1600,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
$this->assertSame( 'raw', $post->filter );
}
$posts = wp_list_pluck( $posts, 'ID' );
$this->assertEqualSets( array( $post_id, $post_id3 ), $posts );
$this->assertSameSets( array( $post_id, $post_id3 ), $posts );
}
/**
@@ -1631,7 +1631,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
$this->assertSame( 'raw', $post->filter );
}
$posts = wp_list_pluck( $posts, 'ID' );
$this->assertEqualSets( array( $post_id, $post_id2 ), $posts );
$this->assertSameSets( array( $post_id, $post_id2 ), $posts );
}
/**
@@ -1678,7 +1678,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
$this->assertSame( 'raw', $post->filter );
}
$posts = wp_list_pluck( $posts, 'ID' );
$this->assertEqualSets( array( $post_id, $post_id5 ), $posts );
$this->assertSameSets( array( $post_id, $post_id5 ), $posts );
$posts = get_posts(
array(
@@ -1692,7 +1692,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
$this->assertSame( 'raw', $post->filter );
}
$posts = wp_list_pluck( $posts, 'ID' );
$this->assertEqualSets( array( $post_id, $post_id5 ), $posts );
$this->assertSameSets( array( $post_id, $post_id5 ), $posts );
$posts = get_posts( array( 'meta_value' => 0 ) );
$this->assertSame( 5, count( $posts ) );
@@ -1701,7 +1701,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
$this->assertSame( 'raw', $post->filter );
}
$posts = wp_list_pluck( $posts, 'ID' );
$this->assertEqualSets( array( $post_id, $post_id3, $post_id4, $post_id5, $post_id6 ), $posts );
$this->assertSameSets( array( $post_id, $post_id3, $post_id4, $post_id5, $post_id6 ), $posts );
$posts = get_posts( array( 'meta_value' => '0' ) );
$this->assertSame( 5, count( $posts ) );
@@ -1710,7 +1710,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
$this->assertSame( 'raw', $post->filter );
}
$posts = wp_list_pluck( $posts, 'ID' );
$this->assertEqualSets( array( $post_id, $post_id3, $post_id4, $post_id5, $post_id6 ), $posts );
$this->assertSameSets( array( $post_id, $post_id3, $post_id4, $post_id5, $post_id6 ), $posts );
}
/**
@@ -1846,7 +1846,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( 'foo_key', 'foo_key-1', 'foo_key-2' ), array_keys( $q->meta_query->get_clauses() ) );
$this->assertSameSets( array( 'foo_key', 'foo_key-1', 'foo_key-2' ), array_keys( $q->meta_query->get_clauses() ) );
}
/**
@@ -1871,7 +1871,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $posts[0], $posts[2] ), $q->posts );
$this->assertSameSets( array( $posts[0], $posts[2] ), $q->posts );
}
/**
@@ -1892,7 +1892,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $posts[0], $posts[2] ), $q->posts );
$this->assertSameSets( array( $posts[0], $posts[2] ), $q->posts );
}
/**
@@ -1919,7 +1919,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $posts[0] ), $q->posts );
$this->assertSameSets( array( $posts[0] ), $q->posts );
}
@@ -1947,7 +1947,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $posts[0], $posts[1] ), $q->posts );
$this->assertSameSets( array( $posts[0], $posts[1] ), $q->posts );
}
/**
@@ -1974,7 +1974,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $posts[0], $posts[2] ), $q->posts );
$this->assertSameSets( array( $posts[0], $posts[2] ), $q->posts );
}
/**
@@ -1999,7 +1999,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $posts[1], $posts[2] ), $q->posts );
$this->assertSameSets( array( $posts[1], $posts[2] ), $q->posts );
}
/**
@@ -2026,7 +2026,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $posts[1] ), $q->posts );
$this->assertSameSets( array( $posts[1] ), $q->posts );
}
/**
@@ -2053,7 +2053,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $posts[0], $posts[1] ), $q->posts );
$this->assertSameSets( array( $posts[0], $posts[1] ), $q->posts );
}
/**
@@ -2080,7 +2080,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $posts[2] ), $q->posts );
$this->assertSameSets( array( $posts[2] ), $q->posts );
}
/**
@@ -2106,7 +2106,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $posts[0], $posts[2] ), $q->posts );
$this->assertSameSets( array( $posts[0], $posts[2] ), $q->posts );
$q = new WP_Query(
array(
@@ -2121,7 +2121,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $posts[0] ), $q->posts );
$this->assertSameSets( array( $posts[0] ), $q->posts );
}
/**
@@ -2148,7 +2148,7 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $posts[1] ), $q->posts );
$this->assertSameSets( array( $posts[1] ), $q->posts );
$q = new WP_Query(
array(
@@ -2163,6 +2163,6 @@ class Tests_Query_MetaQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $posts[1], $posts[2] ), $q->posts );
$this->assertSameSets( array( $posts[1], $posts[2] ), $q->posts );
}
}

10
tests/phpunit/tests/query/postStatus.php
View File

@@ -82,7 +82,7 @@ class Tests_Query_PostStatus extends WP_UnitTestCase {
self::$author_private_post,
);
$this->assertEqualSets( $expected, wp_list_pluck( $q->posts, 'ID' ) );
$this->assertSameSets( $expected, wp_list_pluck( $q->posts, 'ID' ) );
}
public function test_private_should_not_be_included_for_non_author_if_perm_is_not_false() {
@@ -112,7 +112,7 @@ class Tests_Query_PostStatus extends WP_UnitTestCase {
self::$author_private_post,
);
$this->assertEqualSets( $expected, wp_list_pluck( $q->posts, 'ID' ) );
$this->assertSameSets( $expected, wp_list_pluck( $q->posts, 'ID' ) );
}
public function test_private_should_be_included_for_all_users_if_perm_is_readable_and_user_can_read_others_posts() {
@@ -130,7 +130,7 @@ class Tests_Query_PostStatus extends WP_UnitTestCase {
self::$editor_private_post,
);
$this->assertEqualSets( $expected, wp_list_pluck( $q->posts, 'ID' ) );
$this->assertSameSets( $expected, wp_list_pluck( $q->posts, 'ID' ) );
}
public function test_private_should_be_included_only_for_current_user_if_perm_is_editable_and_user_cannot_read_others_posts() {
@@ -147,7 +147,7 @@ class Tests_Query_PostStatus extends WP_UnitTestCase {
self::$author_private_post,
);
$this->assertEqualSets( $expected, wp_list_pluck( $q->posts, 'ID' ) );
$this->assertSameSets( $expected, wp_list_pluck( $q->posts, 'ID' ) );
}
public function test_private_should_be_included_for_all_users_if_perm_is_editable_and_user_can_read_others_posts() {
@@ -165,7 +165,7 @@ class Tests_Query_PostStatus extends WP_UnitTestCase {
self::$editor_private_post,
);
$this->assertEqualSets( $expected, wp_list_pluck( $q->posts, 'ID' ) );
$this->assertSameSets( $expected, wp_list_pluck( $q->posts, 'ID' ) );
}
public function test_all_public_post_stati_should_be_included_when_no_post_status_is_provided() {

16
tests/phpunit/tests/query/search.php
View File

@@ -153,7 +153,7 @@ class Tests_Query_Search extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p2 ), $q->posts );
$this->assertSameSets( array( $p2 ), $q->posts );
}
/**
@@ -180,7 +180,7 @@ class Tests_Query_Search extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p2 ), $q->posts );
$this->assertSameSets( array( $p2 ), $q->posts );
}
/**
@@ -213,7 +213,7 @@ class Tests_Query_Search extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p3 ), $q->posts );
$this->assertSameSets( array( $p3 ), $q->posts );
}
/**
@@ -246,7 +246,7 @@ class Tests_Query_Search extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p1, $p3 ), $q->posts );
$this->assertSameSets( array( $p1, $p3 ), $q->posts );
}
/**
@@ -292,7 +292,7 @@ class Tests_Query_Search extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p2 ), $q->posts );
$this->assertSameSets( array( $p2 ), $q->posts );
}
/**
@@ -345,7 +345,7 @@ class Tests_Query_Search extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p1, $p3 ), $q->posts );
$this->assertSameSets( array( $p1, $p3 ), $q->posts );
$q = new WP_Query(
array(
@@ -354,7 +354,7 @@ class Tests_Query_Search extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p1, $p2 ), $q->posts );
$this->assertSameSets( array( $p1, $p2 ), $q->posts );
$q = new WP_Query(
array(
@@ -363,7 +363,7 @@ class Tests_Query_Search extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p2 ), $q->posts );
$this->assertSameSets( array( $p2 ), $q->posts );
}
/**

22
tests/phpunit/tests/query/taxQuery.php
View File

@@ -297,7 +297,7 @@ class Tests_Query_TaxQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p1, $p2 ), $q->posts );
$this->assertSameSets( array( $p1, $p2 ), $q->posts );
}
public function test_tax_query_single_query_multiple_terms_operator_not_in() {
@@ -464,7 +464,7 @@ class Tests_Query_TaxQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p1, $p3 ), $q->posts );
$this->assertSameSets( array( $p1, $p3 ), $q->posts );
}
/**
@@ -511,7 +511,7 @@ class Tests_Query_TaxQuery extends WP_UnitTestCase {
unregister_taxonomy( 'wptests_tax1' );
unregister_taxonomy( 'wptests_tax2' );
$this->assertEqualSets( array( $p1, $p3, $p4 ), $q->posts );
$this->assertSameSets( array( $p1, $p3, $p4 ), $q->posts );
}
/**
@@ -545,7 +545,7 @@ class Tests_Query_TaxQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p2 ), $q->posts );
$this->assertSameSets( array( $p2 ), $q->posts );
}
/**
@@ -580,7 +580,7 @@ class Tests_Query_TaxQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p2 ), $q->posts );
$this->assertSameSets( array( $p2 ), $q->posts );
}
/**
@@ -705,7 +705,7 @@ class Tests_Query_TaxQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p1, $p2 ), $q->posts );
$this->assertSameSets( array( $p1, $p2 ), $q->posts );
}
public function test_tax_query_multiple_queries_different_taxonomies() {
@@ -751,7 +751,7 @@ class Tests_Query_TaxQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p1, $p2 ), $q->posts );
$this->assertSameSets( array( $p1, $p2 ), $q->posts );
}
/**
@@ -833,7 +833,7 @@ class Tests_Query_TaxQuery extends WP_UnitTestCase {
_unregister_taxonomy( 'foo' );
_unregister_taxonomy( 'bar' );
$this->assertEqualSets( array( $p1, $p2 ), $q->posts );
$this->assertSameSets( array( $p1, $p2 ), $q->posts );
}
/**
@@ -907,7 +907,7 @@ class Tests_Query_TaxQuery extends WP_UnitTestCase {
_unregister_taxonomy( 'foo' );
_unregister_taxonomy( 'bar' );
$this->assertEqualSets( array( $p1, $p2 ), $q->posts );
$this->assertSameSets( array( $p1, $p2 ), $q->posts );
}
/**
@@ -990,7 +990,7 @@ class Tests_Query_TaxQuery extends WP_UnitTestCase {
_unregister_taxonomy( 'foo' );
_unregister_taxonomy( 'bar' );
$this->assertEqualSets( array( $p1, $p2, $p3 ), $q->posts );
$this->assertSameSets( array( $p1, $p2, $p3 ), $q->posts );
}
/**
@@ -1621,6 +1621,6 @@ class Tests_Query_TaxQuery extends WP_UnitTestCase {
)
);
$this->assertEqualSets( array( $p ), $q->posts );
$this->assertSameSets( array( $p ), $q->posts );
}
}