Changeset 54186 for trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php

Timestamp:

09/16/2022 10:55:58 AM (2 years ago)

Author:

spacedmonkey

Message:

Posts, Post Types: Improve performance of the get_user_data_from_wp_global_styles method.

Improve the logic found in get_user_data_from_wp_global_styles method. Replace call to wp_get_recent_posts with the more standard, WP_Query for consistancy. Use transient over standard cache, to improve performance on sites without persistent object caching. Improve handling of cases where wp_insert_post returns a WP_Error.

Props spacedmonkey, adamsilverstein, mukesh27, peterwilsoncc, andregal.
Fixes #55392.

File:

• trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php (modified) (1 diff)

trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php

@@ -354 +354 @@
     }
 
+    /**
+     * @covers WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles
+     */
     function test_get_user_data_from_wp_global_styles_does_not_use_uncached_queries() {
+        $theme = wp_get_theme();
+        WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
         add_filter( 'query', array( $this, 'filter_db_query' ) );
         $query_count = count( $this->queries );
         for ( $i = 0; $i < 3; $i++ ) {
-            WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( wp_get_theme() );
-            WP_Theme_JSON_Resolver::clean_cached_data();
-        }
-        $query_count = count( $this->queries ) - $query_count;
-        $this->assertEquals( 1, $query_count, 'Only one SQL query should be peformed for multiple invocations of WP_Theme_JSON_Resolver::get_global_styles_from_post()' );
-
-        $user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( wp_get_theme() );
-        $this->assertEmpty( $user_cpt );
-
-        $user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( wp_get_theme(), true );
-        $this->assertNotEmpty( $user_cpt );
-
-        $query_count = count( $this->queries );
-        for ( $i = 0; $i < 3; $i++ ) {
-            WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( wp_get_theme() );
+            WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
             WP_Theme_JSON_Resolver::clean_cached_data();
         }
         $query_count = count( $this->queries ) - $query_count;
         $this->assertEquals( 0, $query_count, 'Unexpected SQL queries detected for the wp_global_style post type' );
+
+        $user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
+        $this->assertEmpty( $user_cpt );
+
+        $user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme, true );
+        $this->assertNotEmpty( $user_cpt );
+
+        $query_count = count( $this->queries );
+        for ( $i = 0; $i < 3; $i ++ ) {
+            $new_user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
+            WP_Theme_JSON_Resolver::clean_cached_data();
+            $this->assertSameSets( $user_cpt, $new_user_cpt );
+        }
+        $query_count = count( $this->queries ) - $query_count;
+        $this->assertEquals( 0, $query_count, 'Unexpected SQL queries detected for the wp_global_style post type' );
         remove_filter( 'query', array( $this, 'filter_db_query' ) );
     }
+
+    /**
+     * @ticket 55392
+     * @covers WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles
+     */
+    function test_get_user_data_from_wp_global_styles_does_exist() {
+        $theme = wp_get_theme();
+        $post1 = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme, true );
+        $this->assertIsArray( $post1 );
+        $this->assertArrayHasKey( 'ID', $post1 );
+        wp_delete_post( $post1['ID'], true );
+        $post2 = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme, true );
+        $this->assertIsArray( $post2 );
+        $this->assertArrayHasKey( 'ID', $post2 );
+    }
+
+    /**
+     * @ticket 55392
+     * @covers WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles
+     */
+    function test_get_user_data_from_wp_global_styles_create_post() {
+        $theme = wp_get_theme( 'testing' );
+        $post1 = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
+        $this->assertIsArray( $post1 );
+        $this->assertSameSets( array(), $post1 );
+        $post2 = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
+        $this->assertIsArray( $post2 );
+        $this->assertSameSets( array(), $post2 );
+        $post3 = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme, true );
+        $this->assertIsArray( $post3 );
+        $this->assertArrayHasKey( 'ID', $post3 );
+    }
+
+    /**
+     * @ticket 55392
+     * @covers WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles
+     */
+    function test_get_user_data_from_wp_global_styles_filter_state() {
+        $theme = wp_get_theme( 'foo' );
+        $post1 = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme, true, array( 'publish' ) );
+        $this->assertIsArray( $post1 );
+        $this->assertArrayHasKey( 'ID', $post1 );
+        $post2 = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme, false, array( 'draft' ) );
+        $this->assertIsArray( $post2 );
+        $this->assertSameSets( array(), $post2 );
+    }
 }