Changeset 38938 for trunk/tests/phpunit/tests/query/metaQuery.php

Timestamp:

10/26/2016 01:23:24 AM (8 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Continue eliminating randomness in tests.

See #37371

File:

• trunk/tests/phpunit/tests/query/metaQuery.php (modified) (4 diffs)

trunk/tests/phpunit/tests/query/metaQuery.php

@@ -391 +391 @@
     public function test_meta_query_relation_or() {
         $post_id = self::factory()->post->create();
-        add_post_meta( $post_id, 'foo', rand_str() );
-        add_post_meta( $post_id, 'foo', rand_str() );
+        add_post_meta( $post_id, 'foo', 'foo_val_1' );
+        add_post_meta( $post_id, 'foo', 'foo_val_2' );
+
         $post_id2 = self::factory()->post->create();
-        add_post_meta( $post_id2, 'bar', 'val2' );
+        add_post_meta( $post_id2, 'bar', 'bar_val_1' );
+
         $post_id3 = self::factory()->post->create();
-        add_post_meta( $post_id3, 'baz', rand_str() );
+        add_post_meta( $post_id3, 'baz', 'baz_val_1' );
+
         $post_id4 = self::factory()->post->create();
-        add_post_meta( $post_id4, 'froo', rand_str() );
+        add_post_meta( $post_id4, 'froo', 'froo_val_1' );
+
         $post_id5 = self::factory()->post->create();
-        add_post_meta( $post_id5, 'tango', 'val2' );
+        add_post_meta( $post_id5, 'tango', 'tango_val_1' );
+
+        $post_id6 = self::factory()->post->create();
+        add_post_meta( $post_id6, 'bar', 'bar_val_2' );
+
+        $query = new WP_Query( array(
+            'update_post_meta_cache' => false,
+            'update_post_term_cache' => false,
+            'fields' => 'ids',
+            'meta_query' => array(
+                array(
+                    'key' => 'foo'
+                ),
+                array(
+                    'key' => 'bar',
+                    'value' => 'bar_val_1'
+                ),
+                array(
+                    'key' => 'baz'
+                ),
+                array(
+                    'key' => 'froo'
+                ),
+                'relation' => 'OR',
+            ),
+        ) );
+
+        $expected = array( $post_id, $post_id2, $post_id3, $post_id4 );
+        $this->assertEqualSets( $expected, $query->posts );
+    }
+
+    public function test_meta_query_relation_and() {
+        $post_id = self::factory()->post->create();
+        add_post_meta( $post_id, 'foo', 'foo_val_1' );
+        add_post_meta( $post_id, 'foo', 'foo_val_2' );
+
+        $post_id2 = self::factory()->post->create();
+        add_post_meta( $post_id2, 'bar', 'val_2' );
+        add_post_meta( $post_id2, 'foo', 'foo_val_3' );
+
+        $post_id3 = self::factory()->post->create();
+        add_post_meta( $post_id3, 'baz', 'baz_val_1' );
+
+        $post_id4 = self::factory()->post->create();
+        add_post_meta( $post_id4, 'froo', 'froo_val_1' );
+
+        $post_id5 = self::factory()->post->create();
+        add_post_meta( $post_id5, 'tango', 'val_2' );
+
         $post_id6 = self::factory()->post->create();
         add_post_meta( $post_id6, 'bar', 'val1' );
-
-        $query = new WP_Query( array(
-            'update_post_meta_cache' => false,
-            'update_post_term_cache' => false,
-            'fields' => 'ids',
+        add_post_meta( $post_id6, 'foo', 'foo_val_4' );
+
+        $post_id7 = self::factory()->post->create();
+        add_post_meta( $post_id7, 'foo', 'foo_val_5' );
+        add_post_meta( $post_id7, 'froo', 'froo_val_2' );
+        add_post_meta( $post_id7, 'baz', 'baz_val_2' );
+        add_post_meta( $post_id7, 'bar', 'val_2' );
+
+        $query = new WP_Query( array(
             'meta_query' => array(
                 array(
@@ -414 +470 @@
                 array(
                     'key' => 'bar',
-                    'value' => 'val2'
-                ),
-                array(
-                    'key' => 'baz'
-                ),
-                array(
-                    'key' => 'froo'
-                ),
-                'relation' => 'OR',
-            ),
-        ) );
-
-        $expected = array( $post_id, $post_id2, $post_id3, $post_id4 );
-        $this->assertEqualSets( $expected, $query->posts );
-    }
-
-    public function test_meta_query_relation_and() {
-        $post_id = self::factory()->post->create();
-        add_post_meta( $post_id, 'foo', rand_str() );
-        add_post_meta( $post_id, 'foo', rand_str() );
-        $post_id2 = self::factory()->post->create();
-        add_post_meta( $post_id2, 'bar', 'val2' );
-        add_post_meta( $post_id2, 'foo', rand_str() );
-        $post_id3 = self::factory()->post->create();
-        add_post_meta( $post_id3, 'baz', rand_str() );
-        $post_id4 = self::factory()->post->create();
-        add_post_meta( $post_id4, 'froo', rand_str() );
-        $post_id5 = self::factory()->post->create();
-        add_post_meta( $post_id5, 'tango', 'val2' );
-        $post_id6 = self::factory()->post->create();
-        add_post_meta( $post_id6, 'bar', 'val1' );
-        add_post_meta( $post_id6, 'foo', rand_str() );
-        $post_id7 = self::factory()->post->create();
-        add_post_meta( $post_id7, 'foo', rand_str() );
-        add_post_meta( $post_id7, 'froo', rand_str() );
-        add_post_meta( $post_id7, 'baz', rand_str() );
-        add_post_meta( $post_id7, 'bar', 'val2' );
-
-        $query = new WP_Query( array(
-            'meta_query' => array(
-                array(
-                    'key' => 'foo'
-                ),
-                array(
-                    'key' => 'bar',
-                    'value' => 'val2'
+                    'value' => 'val_2'
                 ),
                 array(
@@ -566 +577 @@
     public function test_meta_query_compare_not_exists() {
         $post_id = self::factory()->post->create();
-        add_post_meta( $post_id, 'foo', rand_str() );
+        add_post_meta( $post_id, 'foo', 'foo_val_1' );
+
         $post_id2 = self::factory()->post->create();
-        add_post_meta( $post_id2, 'bar', rand_str() );
+        add_post_meta( $post_id2, 'bar', 'bar_val_1' );
+
         $post_id3 = self::factory()->post->create();
-        add_post_meta( $post_id3, 'bar', rand_str() );
+        add_post_meta( $post_id3, 'bar', 'bar_val_2' );
+
         $post_id4 = self::factory()->post->create();
-        add_post_meta( $post_id4, 'baz', rand_str() );
+        add_post_meta( $post_id4, 'baz', 'baz_val_1' );
+
         $post_id5 = self::factory()->post->create();
-        add_post_meta( $post_id5, 'foo', rand_str() );
+        add_post_meta( $post_id5, 'foo', 'foo_val_2' );
 
         $query = new WP_Query( array(
@@ -1453 +1468 @@
         add_post_meta( $post_id4, 'baz', 'bar' );
         $post_id5 = self::factory()->post->create();
-        add_post_meta( $post_id5, 'foo', rand_str() );
+        add_post_meta( $post_id5, 'foo', 'tango' );
 
         $posts = get_posts( array(