Changeset 10260 for trunk/tests/phpunit/testcases/core/avatars.php

Timestamp:

10/12/2015 11:13:47 PM (9 years ago)

Author:

djpaul

Message:

Tests: fix test failures on PHP7

PHP7 has changed its array sorting behaviour so that it is not
necessarily guaranteed to match previous versions of PHP. Brittle
tests, such as these, fail because of the change.

As a workaround, let's try using assertEqualSets, which is a
WordPress-provided testing assert that does a sort on each array
before comparing the arrays.

File:

• trunk/tests/phpunit/testcases/core/avatars.php (modified) (3 diffs)

trunk/tests/phpunit/testcases/core/avatars.php

@@ -256 +256 @@
         $mimes = bp_core_get_allowed_avatar_mimes();
 
-        $this->assertEquals( array( 'jpeg', 'gif', 'png', 'jpg' ), array_keys( $mimes ) );
-        $this->assertEquals( array( 'image/jpeg', 'image/gif', 'image/png', 'image/jpeg' ), array_values( $mimes ) );
+        $this->assertEqualSets( array( 'jpeg', 'gif', 'png', 'jpg' ), array_keys( $mimes ) );
+        $this->assertEqualSets( array( 'image/jpeg', 'image/gif', 'image/png', 'image/jpeg' ), array_values( $mimes ) );
 
         add_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_add_type' ) );
 
-        $this->assertEquals( array( 'image/jpeg', 'image/gif', 'image/png', 'image/jpeg' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
+        $this->assertEqualSets( array( 'image/jpeg', 'image/gif', 'image/png', 'image/jpeg' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
 
         remove_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_add_type' ) );
@@ -267 +267 @@
         add_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_remove_type' ) );
 
-        $this->assertEquals( array( 'image/gif', 'image/png' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
+        $this->assertEqualSets( array( 'image/gif', 'image/png' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
 
         remove_filter( 'bp_core_get_allowed_avatar_types', array( $this, 'avatar_types_filter_remove_type' ) );
@@ -273 +273 @@
         add_filter( 'bp_core_get_allowed_avatar_types', '__return_empty_array' );
 
-        $this->assertEquals( array( 'image/jpeg', 'image/gif', 'image/png', 'image/jpeg' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
+        $this->assertEqualSets( array( 'image/jpeg', 'image/gif', 'image/png', 'image/jpeg' ), array_values( bp_core_get_allowed_avatar_mimes() ) );
 
         remove_filter( 'bp_core_get_allowed_avatar_types', '__return_empty_array' );