Changeset 30017

Timestamp:

10/24/2014 07:51:01 PM (12 years ago)

Author:

boonebgorges

Message:

Streamline WP_User_Query unit tests.

• Don't create user during setUp(), as it's not used in every test.
• Create fewer users in get_all and orderby tests.

See #30017.

File:

• trunk/tests/phpunit/tests/user/query.php (modified) (5 diffs)

trunk/tests/phpunit/tests/user/query.php

@@ -11 +11 @@
         function setUp() {
                 parent::setUp();
-
-                $this->user_id = $this->factory->user->create( array(
-                        'role' => 'author'
-                ) );
         }
 
@@ -79 +75 @@
         }
 
-        function test_exclude() {
-                $users = new WP_User_Query();
-                $users->set( 'fields', '' );
-                $users->set( 'exclude', $this->user_id );
-                $users->prepare_query();
-                $users->query();
-
-                $ids = $users->get_results();
-                $this->assertNotContains( $this->user_id, $ids );
-        }
-
-        function test_get_all() {
-                $this->factory->user->create_many( 10, array(
+        public function test_exclude() {
+                $users = $this->factory->user->create_many( 3, array(
+                        'role' => 'author',
+                ) );
+
+                $q = new WP_User_Query( array(
+                        'fields' => '',
+                        'exclude' => $users[1],
+                ) );
+
+                $ids = $q->get_results();
+
+                // Indirect test in order to ignore default user created during installation.
+                $this->assertNotEmpty( $ids );
+                $this->assertNotContains( $users[1], $ids );
+        }
+
+        public function test_get_all() {
+                $this->factory->user->create_many( 3, array(
                         'role' => 'author'
                 ) );
@@ -97 +99 @@
                 $users = new WP_User_Query( array( 'blog_id' => get_current_blog_id() ) );
                 $users = $users->get_results();
-                $this->assertEquals( 12, count( $users ) );
+
+                // +1 for the default user created during installation.
+                $this->assertEquals( 4, count( $users ) );
                 foreach ( $users as $user ) {
                         $this->assertInstanceOf( 'WP_User', $user );
@@ -104 +108 @@
                 $users = new WP_User_Query( array( 'blog_id' => get_current_blog_id(), 'fields' => 'all_with_meta' ) );
                 $users = $users->get_results();
-                $this->assertEquals( 12, count( $users ) );
+                $this->assertEquals( 4, count( $users ) );
                 foreach ( $users as $user ) {
                         $this->assertInstanceOf( 'WP_User', $user );
@@ -110 +114 @@
         }
 
-        function test_orderby() {
-                $user_ids = $this->factory->user->create_many( 10, array(
+        public function test_orderby_meta_value() {
+                $users = $this->factory->user->create_many( 3, array(
                         'role' => 'author'
                 ) );
 
-                $names = array( 'd', 'f', 'n', 'f', 'd', 'j', 'r', 'p', 'h', 'g' );
-
-                foreach ( $names as $i => $name )
-                        update_user_meta( $user_ids[$i], 'last_name', $name );
-
-                $u = new WP_User_Query( array(
-                        'include' => $user_ids,
+                update_user_meta( $users[0], 'last_name', 'Jones' );
+                update_user_meta( $users[1], 'last_name', 'Albert' );
+                update_user_meta( $users[2], 'last_name', 'Zorro' );
+
+                $q = new WP_User_Query( array(
+                        'include' => $users,
                         'meta_key' => 'last_name',
                         'orderby' => 'meta_value',
                         'fields' => 'ids'
                 ) );
-                $values = array();
-                foreach ( $u->get_results() as $user )
-                        $values[] = get_user_meta( $user, 'last_name', true );
-
-                sort( $names );
-
-                $this->assertEquals( $names, $values );
+
+                $expected = array( $users[1], $users[0], $users[2] );
+
+                $this->assertEquals( $expected, $q->get_results() );
         }