Changeset 32147

Timestamp:

04/19/2015 05:38:07 AM (9 years ago)

Author:

pento

Message:

Backport the PHPUnit test fixes from [31622] to the 4.1 branch.

Props boonebgorges.

See #31537.

Location:

branches/4.1/tests/phpunit/tests

Files:

• admin/includesScreen.php (modified) (1 diff)
• ajax/Autosave.php (modified) (1 diff)
• ajax/Response.php (modified) (1 diff)
• basic.php (modified) (1 diff)
• cache.php (modified) (1 diff)
• canonical.php (modified) (1 diff)
• canonical/pageOnFront.php (modified) (1 diff)
• category.php (modified) (1 diff)
• comment/getCommentsPagesCount.php (modified) (1 diff)
• cron.php (modified) (1 diff)
• customize/manager.php (modified) (1 diff)
• customize/setting.php (modified) (1 diff)
• image/base.php (modified) (1 diff)
• link.php (modified) (1 diff)
• mail.php (modified) (1 diff)
• multisite/bootstrap.php (modified) (1 diff)
• multisite/ms-files-rewriting.php (modified) (1 diff)
• multisite/network.php (modified) (1 diff)
• multisite/site.php (modified) (1 diff)
• option/multisite.php (modified) (1 diff)
• post/meta.php (modified) (1 diff)
• post/revisions.php (modified) (1 diff)
• query/conditionals.php (modified) (1 diff)
• query/search.php (modified) (1 diff)
• rewrite.php (modified) (1 diff)
• shortcode.php (modified) (1 diff)
• user/countUserPosts.php (modified) (1 diff)
• user/mapMetaCap.php (modified) (1 diff)
• user/multisite.php (modified) (1 diff)
• xmlrpc/wp/getPage.php (modified) (1 diff)

branches/4.1/tests/phpunit/tests/admin/includesScreen.php

@@ -38 +38 @@
 
     function tearDown() {
-        parent::tearDown();
         unset( $GLOBALS['wp_taxonomies']['old-or-new'] );
         set_current_screen( 'front' );
+        parent::tearDown();
     }
 

branches/4.1/tests/phpunit/tests/ajax/Autosave.php

@@ -47 +47 @@
      */
     public function tearDown() {
+        wp_set_current_user( 0 );
         parent::tearDown();
-        wp_set_current_user( 0 );
     }
 

branches/4.1/tests/phpunit/tests/ajax/Response.php

@@ -37 +37 @@
      */
     public function tearDown() {
-        parent::tearDown();
         remove_filter( 'wp_die_ajax_handler', array( $this, 'getDieHandler' ), 1, 1 );
         error_reporting( $this->_error_level );
+        parent::tearDown();
     }
 

branches/4.1/tests/phpunit/tests/basic.php

@@ -14 +14 @@
 
     function tearDown() {
+        $this->val = false;
         parent::tearDown();
-        $this->val = false;
     }
 

branches/4.1/tests/phpunit/tests/cache.php

@@ -15 +15 @@
 
     function tearDown() {
+        $this->flush_cache();
         parent::tearDown();
-        $this->flush_cache();
     }
 

branches/4.1/tests/phpunit/tests/canonical.php

@@ -24 +24 @@
 
     public function tearDown() {
+        wp_set_current_user( self::$old_current_user );
         parent::tearDown();
-        wp_set_current_user( self::$old_current_user );
     }
 

branches/4.1/tests/phpunit/tests/canonical/pageOnFront.php

@@ -27 +27 @@
     function tearDown() {
         global $wp_rewrite;
+        $wp_rewrite->init();
         parent::tearDown();
-        $wp_rewrite->init();
     }
 

branches/4.1/tests/phpunit/tests/category.php

@@ -11 +11 @@
 
     function tearDown() {
+        _unregister_taxonomy( 'test_tax_cat' );
         parent::tearDown();
-
-        _unregister_taxonomy( 'test_tax_cat' );
     }
 

branches/4.1/tests/phpunit/tests/comment/getCommentsPagesCount.php

@@ -27 +27 @@
      */
     function tearDown() {
-        parent::tearDown();
         update_option( 'page_comments', $this->option_page_comments );
         update_option( 'comments_per_page', $this->option_page_comments );
         update_option( 'thread_comments', $this->option_page_comments );
         update_option( 'posts_per_rss', $this->option_posts_per_rss );
+        parent::tearDown();
     }
 

branches/4.1/tests/phpunit/tests/cron.php

@@ -14 +14 @@
 
     function tearDown() {
-        parent::tearDown();
         // make sure the schedule is clear
         _set_cron_array(array());
+        parent::tearDown();
     }
 

branches/4.1/tests/phpunit/tests/customize/manager.php

@@ -17 +17 @@
 
     function tearDown() {
-        parent::tearDown();
         $this->manager = null;
         unset( $GLOBALS['wp_customize'] );
+        parent::tearDown();
     }
 

branches/4.1/tests/phpunit/tests/customize/setting.php

@@ -27 +27 @@
 
     function tearDown() {
-        parent::tearDown();
         $this->manager = null;
         unset( $GLOBALS['wp_customize'] );
+        parent::tearDown();
     }
 

branches/4.1/tests/phpunit/tests/image/base.php

@@ -23 +23 @@
      */
     public function tearDown() {
+        remove_filter( 'wp_image_editors', array( $this, 'setEngine' ), 10, 2 );
         parent::tearDown();
-
-        remove_filter( 'wp_image_editors', array( $this, 'setEngine' ), 10, 2 );
     }
 

branches/4.1/tests/phpunit/tests/link.php

@@ -7 +7 @@
     function tearDown() {
         global $wp_rewrite;
+        $wp_rewrite->init();
         parent::tearDown();
-        $wp_rewrite->init();
     }
 

branches/4.1/tests/phpunit/tests/mail.php

@@ -12 +12 @@
 
     function tearDown() {
+        unset( $_SERVER['SERVER_NAME'] );
         parent::tearDown();
-        unset( $_SERVER['SERVER_NAME'] );
     }
 

branches/4.1/tests/phpunit/tests/multisite/bootstrap.php

@@ -22 +22 @@
     function tearDown() {
         global $wpdb;
+        $wpdb->suppress_errors( $this->suppress );
         parent::tearDown();
-        $wpdb->suppress_errors( $this->suppress );
     }
 

branches/4.1/tests/phpunit/tests/multisite/ms-files-rewriting.php

@@ -30 +30 @@
 
         update_site_option( 'ms_files_rewriting', 0 );
+        $wpdb->suppress_errors( $this->suppress );
+
         parent::tearDown();
-        $wpdb->suppress_errors( $this->suppress );
     }
 

branches/4.1/tests/phpunit/tests/multisite/network.php

@@ -23 +23 @@
     function tearDown() {
         global $wpdb;
+        $wpdb->suppress_errors( $this->suppress );
         parent::tearDown();
-        $wpdb->suppress_errors( $this->suppress );
     }
 

branches/4.1/tests/phpunit/tests/multisite/site.php

@@ -22 +22 @@
     function tearDown() {
         global $wpdb;
+        $wpdb->suppress_errors( $this->suppress );
         parent::tearDown();
-        $wpdb->suppress_errors( $this->suppress );
     }
 

branches/4.1/tests/phpunit/tests/option/multisite.php

@@ -23 +23 @@
     function tearDown() {
         global $wpdb;
+        $wpdb->suppress_errors( $this->suppress );
         parent::tearDown();
-        $wpdb->suppress_errors( $this->suppress );
     }
 

branches/4.1/tests/phpunit/tests/post/meta.php

@@ -34 +34 @@
 
     function tearDown() {
-        parent::tearDown();
         wp_delete_post($this->post_id);
         wp_delete_post($this->post_id_2);
+        parent::tearDown();
     }
 

branches/4.1/tests/phpunit/tests/post/revisions.php

@@ -13 +13 @@
 
     function tearDown() {
+        unset( $GLOBALS['wp_post_types'][ $this->post_type ] );
         parent::tearDown();
-        unset( $GLOBALS['wp_post_types'][ $this->post_type ] );
     }
 

branches/4.1/tests/phpunit/tests/query/conditionals.php

@@ -35 +35 @@
     function tearDown() {
         global $wp_rewrite;
+        $wp_rewrite->init();
+
         parent::tearDown();
-        $wp_rewrite->init();
     }
 

branches/4.1/tests/phpunit/tests/query/search.php

@@ -19 +19 @@
 
     function tearDown() {
-        parent::tearDown();
-
         _unregister_post_type( $this->post_type );
         unset( $this->q );
+
+        parent::tearDown();
     }
 

branches/4.1/tests/phpunit/tests/rewrite.php

@@ -23 +23 @@
     function tearDown() {
         global $wp_rewrite;
+        $wp_rewrite->init();
+
         parent::tearDown();
-        $wp_rewrite->init();
     }
 

branches/4.1/tests/phpunit/tests/shortcode.php

@@ -21 +21 @@
     function tearDown() {
         global $shortcode_tags;
-        parent::tearDown();
         foreach ( $this->shortcodes as $shortcode )
             unset( $shortcode_tags[ $shortcode ] );
+        parent::tearDown();
     }
 

branches/4.1/tests/phpunit/tests/user/countUserPosts.php

@@ -58 +58 @@
 
     public function tearDown() {
+        _unregister_post_type( 'wptests_pt' );
         parent::tearDown();
-        _unregister_post_type( 'wptests_pt' );
     }
 

branches/4.1/tests/phpunit/tests/user/mapMetaCap.php

@@ -33 +33 @@
 
     function tearDown() {
-        parent::tearDown();
-
         $GLOBALS['super_admins'] = $this->super_admins;
         unset( $GLOBALS['wp_post_types'][ $this->post_type ] );
+        parent::tearDown();
     }
 

branches/4.1/tests/phpunit/tests/user/multisite.php

@@ -23 +23 @@
     function tearDown() {
         global $wpdb;
+        $wpdb->suppress_errors( $this->suppress );
         parent::tearDown();
-        $wpdb->suppress_errors( $this->suppress );
     }
 

branches/4.1/tests/phpunit/tests/xmlrpc/wp/getPage.php

@@ -25 +25 @@
 
     function tearDown() {
+        wp_delete_post( $this->post_id );
         parent::tearDown();
-
-        wp_delete_post( $this->post_id );
     }