Changeset 48988

Timestamp:

09/17/2020 11:28:05 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Tests: Move the data_wp_site_query_meta_query() data provider next to the test it's used in.

See #50767.

File:

• trunk/tests/phpunit/tests/multisite/siteQuery.php (modified) (2 diffs)

trunk/tests/phpunit/tests/multisite/siteQuery.php

@@ -908 +908 @@
                 $this->assertSameSets( $expected, $found );
             }
-        }
-
-
-        /**
-         * @ticket 45749
-         * @ticket 47599
-         */
-        public function test_sites_pre_query_filter_should_bypass_database_query() {
-            global $wpdb;
-
-            add_filter( 'sites_pre_query', array( __CLASS__, 'filter_sites_pre_query' ), 10, 2 );
-
-            $num_queries = $wpdb->num_queries;
-
-            $q       = new WP_Site_Query();
-            $results = $q->query( array() );
-
-            remove_filter( 'sites_pre_query', array( __CLASS__, 'filter_sites_pre_query' ), 10, 2 );
-
-            // Make sure no queries were executed.
-            $this->assertSame( $num_queries, $wpdb->num_queries );
-
-            // We manually inserted a non-existing site and overrode the results with it.
-            $this->assertSame( array( 555 ), $results );
-
-            // Make sure manually setting found_sites doesn't get overwritten.
-            $this->assertSame( 1, $q->found_sites );
-        }
-
-        public static function filter_sites_pre_query( $sites, $query ) {
-            $query->found_sites = 1;
-
-            return array( 555 );
         }
 
@@ -1097 +1064 @@
             );
         }
+
+        /**
+         * @ticket 45749
+         * @ticket 47599
+         */
+        public function test_sites_pre_query_filter_should_bypass_database_query() {
+            global $wpdb;
+
+            add_filter( 'sites_pre_query', array( __CLASS__, 'filter_sites_pre_query' ), 10, 2 );
+
+            $num_queries = $wpdb->num_queries;
+
+            $q       = new WP_Site_Query();
+            $results = $q->query( array() );
+
+            remove_filter( 'sites_pre_query', array( __CLASS__, 'filter_sites_pre_query' ), 10, 2 );
+
+            // Make sure no queries were executed.
+            $this->assertSame( $num_queries, $wpdb->num_queries );
+
+            // We manually inserted a non-existing site and overrode the results with it.
+            $this->assertSame( array( 555 ), $results );
+
+            // Make sure manually setting found_sites doesn't get overwritten.
+            $this->assertSame( 1, $q->found_sites );
+        }
+
+        public static function filter_sites_pre_query( $sites, $query ) {
+            $query->found_sites = 1;
+
+            return array( 555 );
+        }
     }