Changeset 35244 for trunk/tests/phpunit/tests/user/listAuthors.php

Timestamp:

10/17/2015 07:24:20 PM (11 years ago)

Author:

wonderboymusic

Message:

Unit Tests: WP_UnitTest_Generator_Sequence needs a static incrementer - otherwise, it assumes every test class is a reset, which it no longer is (it is now static).

While we're at it, remove unnecessary tearDown() code.

See #30017, #33968.

File:

• trunk/tests/phpunit/tests/user/listAuthors.php (modified) (6 diffs)

trunk/tests/phpunit/tests/user/listAuthors.php

@@ -5 +5 @@
  */
 class Tests_User_ListAuthors extends WP_UnitTestCase {
-        static $users = array();
+        static $user_ids = array();
         static $fred_id;
         static $posts = array();
@@ -25 +25 @@
                 */
         public static function wpSetUpBeforeClass( $factory ) {
-                self::$users[] = $factory->user->create( array( 'user_login' => 'zack', 'display_name' => 'zack', 'role' => 'author', 'first_name' => 'zack', 'last_name' => 'moon' ) );
-                self::$users[] = $factory->user->create( array( 'user_login' => 'bob', 'display_name' => 'bob', 'role' => 'author', 'first_name' => 'bob', 'last_name' => 'reno' ) );
-                self::$users[] = $factory->user->create( array( 'user_login' => 'paul', 'display_name' => 'paul', 'role' => 'author', 'first_name' => 'paul', 'last_name' => 'norris' ) );
+                self::$user_ids[] = $factory->user->create( array( 'user_login' => 'zack', 'display_name' => 'zack', 'role' => 'author', 'first_name' => 'zack', 'last_name' => 'moon' ) );
+                self::$user_ids[] = $factory->user->create( array( 'user_login' => 'bob', 'display_name' => 'bob', 'role' => 'author', 'first_name' => 'bob', 'last_name' => 'reno' ) );
+                self::$user_ids[] = $factory->user->create( array( 'user_login' => 'paul', 'display_name' => 'paul', 'role' => 'author', 'first_name' => 'paul', 'last_name' => 'norris' ) );
                 self::$fred_id = $factory->user->create( array( 'user_login' => 'fred', 'role' => 'author' ) );
 
                 $count = 0;
-                foreach ( self::$users as $userid ) {
+                foreach ( self::$user_ids as $userid ) {
                         $count = $count + 1;
                         for ( $i = 0; $i < $count; $i++ ) {
@@ -42 +42 @@
 
         public static function wpTearDownAfterClass() {
-                foreach ( array_merge( self::$users, array( self::$fred_id ) ) as $user_id ) {
+                self::$user_ids[] = self::$fred_id;
+
+                foreach ( self::$user_ids as $user_id ) {
                         self::delete_user( $user_id );
                 }
@@ -97 +99 @@
 
         function test_wp_list_authors_feed() {
-                $url0 = get_author_feed_link( self::$users[0] );
-                $url1 = get_author_feed_link( self::$users[1] );
-                $url2 = get_author_feed_link( self::$users[2] );
+                $url0 = get_author_feed_link( self::$user_ids[0] );
+                $url1 = get_author_feed_link( self::$user_ids[1] );
+                $url2 = get_author_feed_link( self::$user_ids[2] );
                 $expected['feed'] = '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a> (<a href="' . $url1 . '">link to feed</a>)</li><li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a> (<a href="' .  $url2 . '">link to feed</a>)</li><li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a> (<a href="' . $url0 . '">link to feed</a>)</li>';
                 $this->AssertEquals( $expected['feed'], wp_list_authors( array( 'echo' => false, 'feed' => 'link to feed' ) ) );
@@ -105 +107 @@
 
         function test_wp_list_authors_feed_image() {
-                $url0 = get_author_feed_link( self::$users[0] );
-                $url1 = get_author_feed_link( self::$users[1] );
-                $url2 = get_author_feed_link( self::$users[2] );
+                $url0 = get_author_feed_link( self::$user_ids[0] );
+                $url1 = get_author_feed_link( self::$user_ids[1] );
+                $url2 = get_author_feed_link( self::$user_ids[2] );
                 $expected['feed_image'] = '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a> <a href="' . $url1 . '"><img src="http://' . WP_TESTS_DOMAIN . '/path/to/a/graphic.png" style="border: none;" /></a></li><li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a> <a href="' .  $url2 . '"><img src="http://' . WP_TESTS_DOMAIN . '/path/to/a/graphic.png" style="border: none;" /></a></li><li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a> <a href="' .  $url0 . '"><img src="http://' . WP_TESTS_DOMAIN . '/path/to/a/graphic.png" style="border: none;" /></a></li>';
                 $this->AssertEquals( $expected['feed_image'], wp_list_authors( array( 'echo' => false, 'feed_image' => WP_TESTS_DOMAIN . '/path/to/a/graphic.png' ) ) );
@@ -116 +118 @@
          */
         function test_wp_list_authors_feed_type() {
-                $url0 = get_author_feed_link( self::$users[0], 'atom' );
-                $url1 = get_author_feed_link( self::$users[1], 'atom' );
-                $url2 = get_author_feed_link( self::$users[2], 'atom' );
+                $url0 = get_author_feed_link( self::$user_ids[0], 'atom' );
+                $url1 = get_author_feed_link( self::$user_ids[1], 'atom' );
+                $url2 = get_author_feed_link( self::$user_ids[2], 'atom' );
                 $expected['feed_type'] = '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a> (<a href="' . $url1 . '">link to feed</a>)</li><li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a> (<a href="' . $url2 . '">link to feed</a>)</li><li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a> (<a href="' . $url0 . '">link to feed</a>)</li>';
                 $this->AssertEquals( $expected['feed_type'], wp_list_authors( array( 'echo' => false, 'feed' => 'link to feed', 'feed_type' => 'atom' ) ) );