Ticket #39219: 39219-unit-tests-to-replace.diff

tests/phpunit/tests/theme.php

@@ -302 +302 @@
 
                 $theme = wp_get_theme();
                 $this->assertEquals( $style, (string) $theme );
-                $this->assertNotSame( false, $theme->errors() );
+                $this->assertNotFalse( $theme->errors() );
                 $this->assertFalse( $theme->exists() );
 
                 // these return the bogus name - perhaps not ideal behaviour?

tests/phpunit/tests/theme/support.php

@@ -90 +90 @@
                 remove_theme_support( 'html5' );
                 $this->assertFalse( current_theme_supports( 'html5' ) );
                 $this->assertFalse( current_theme_supports( 'html5', 'comment-form' ) );
-                $this->assertNotSame( false, add_theme_support( 'html5' ) );
+                $this->assertNotFalse( add_theme_support( 'html5' ) );
                 $this->assertTrue( current_theme_supports( 'html5' ) );
                 $this->assertTrue( current_theme_supports( 'html5', 'comment-form' ) );
                 $this->assertTrue( current_theme_supports( 'html5', 'comment-list' ) );
@@ -108 +108 @@
                 $this->assertFalse( current_theme_supports( 'html5' ) );
                 $this->assertFalse( current_theme_supports( 'html5', 'comment-form' ) );
                 $this->assertFalse( add_theme_support( 'html5', 'comment-form' ) );
-                $this->assertNotSame( false, add_theme_support( 'html5', array( 'comment-form' ) ) );
+                $this->assertNotFalse( add_theme_support( 'html5', array( 'comment-form' ) ) );
                 $this->assertTrue( current_theme_supports( 'html5', 'comment-form' ) );
 
                 // This will return true, which might help a plugin author decide what markup to serve,
@@ -117 +117 @@
 
                 // It appends, rather than replaces.
                 $this->assertFalse( current_theme_supports( 'html5', 'comment-list' ) );
-                $this->assertNotSame( false, add_theme_support( 'html5', array( 'comment-list' ) ) );
+                $this->assertNotFalse( add_theme_support( 'html5', array( 'comment-list' ) ) );
                 $this->assertTrue( current_theme_supports( 'html5', 'comment-form' ) );
                 $this->assertTrue( current_theme_supports( 'html5', 'comment-list' ) );
                 $this->assertFalse( current_theme_supports( 'html5', 'search-form' ) );