Changeset 34601

Timestamp:

09/26/2015 07:10:12 PM (11 years ago)

Author:

wonderboymusic

Message:

After [34577] (not because of), uncover and fix some horrifying anomalies in Tests_Multisite_Site.

Location:

trunk/tests/phpunit/tests

Files:

• multisite/site.php (modified) (15 diffs)
• xmlrpc/wp/uploadFile.php (modified) (1 diff)

trunk/tests/phpunit/tests/multisite/site.php

@@ -11 +11 @@
 class Tests_Multisite_Site extends WP_UnitTestCase {
         protected $suppress = false;
+
+        protected static $space_used;
+        protected static $space_allowed;
+
+        public static function setUpBeforeClass() {
+                parent::setUpBeforeClass();
+
+                self::$space_allowed = get_space_allowed();
+                self::$space_used = get_space_used();
+        }
 
         function setUp() {
@@ -902 +912 @@
          */
         function test_get_space_allowed_default() {
-                $this->assertEquals( 100, get_space_allowed() );
+                $this->assertEquals( 100, self::$space_allowed );
         }
 
@@ -962 +972 @@
 
         function test_upload_is_user_over_quota_check_enabled() {
-                update_site_option('upload_space_check_disabled', false);
-                $this->assertFalse( upload_is_user_over_quota( false ) );
+                update_site_option( 'upload_space_check_disabled', false );
+                // will be set to ''
+                $this->assertEmpty( get_site_option( 'upload_space_check_disabled' ) );
+
+                $this->assertEquals(
+                        upload_is_user_over_quota( false ),
+                        self::$space_used > self::$space_allowed
+                );
         }
 
@@ -974 +990 @@
                 update_site_option( 'blog_upload_space', 100 );
                 add_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
-
-                $this->assertFalse( upload_is_user_over_quota( false ) );
-
+                $quota = upload_is_user_over_quota( false );
                 remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
+
+                $this->assertFalse( $quota );
         }
 
@@ -986 +1002 @@
                 update_site_option( 'upload_space_check_disabled', false );
                 update_site_option( 'blog_upload_space', 0 );
-                $this->assertFalse( upload_is_user_over_quota( false ) );
+
+                $this->assertEquals(
+                        upload_is_user_over_quota( false ),
+                        self::$space_used > self::$space_allowed
+                );
         }
 
@@ -997 +1017 @@
                 update_site_option( 'blog_upload_space', 0 );
                 add_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
-
-                $this->assertTrue( upload_is_user_over_quota( false ) );
-
+                $quota = upload_is_user_over_quota( false );
                 remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
+
+                $this->assertTrue( $quota );
         }
 
@@ -1006 +1026 @@
                 update_site_option( 'upload_space_check_disabled', false );
                 update_site_option( 'blog_upload_space', 200 );
-                $this->assertFalse( upload_is_user_over_quota( false ) );
+                $this->assertEquals(
+                        upload_is_user_over_quota( false ),
+                        self::$space_used > 200
+                );
         }
 
@@ -1013 +1036 @@
                 update_site_option( 'blog_upload_space', 200 );
                 add_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
-
-                $this->assertTrue( upload_is_user_over_quota( false ) );
-
+                $quota = upload_is_user_over_quota( false );
                 remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
+
+                $this->assertTrue( $quota );
         }
 
@@ -1022 +1045 @@
          * If the space used is exactly the same as the available quota, an over
          * quota response is not expected.
+         *
+         * @group woo
          */
         function test_upload_is_user_over_quota_upload_space_exact() {
@@ -1027 +1052 @@
                 update_site_option( 'blog_upload_space', 300 );
                 add_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
-
-                $this->assertFalse( upload_is_user_over_quota( false ) );
-
+                $quota = upload_is_user_over_quota( false );
+                $used = get_space_used();
                 remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
+
+                $this->assertEquals(
+                        $quota,
+                        $used > 300
+                );
         }
 
@@ -1052 +1081 @@
                 update_site_option( 'blog_upload_space', 350 );
                 add_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
+                $available = is_upload_space_available();
+                remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
 
                 $this->assertTrue( is_upload_space_available() );
-
-                remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
+                $this->assertEquals(
+                        $available,
+                        self::$space_used < 350
+                );
         }
 
@@ -1062 +1095 @@
                 update_site_option( 'blog_upload_space', 250 );
                 add_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
-
-                $this->assertFalse( is_upload_space_available() );
-
+                $available = is_upload_space_available();
                 remove_filter( 'pre_get_space_used', array( $this, '_filter_space_used' ) );
+
+                $this->assertEquals(
+                        $available,
+                        self::$space_used < 250
+                );
         }
 
@@ -1071 +1107 @@
                 update_site_option( 'upload_space_check_disabled', false );
                 update_site_option( 'blog_upload_space', 0 );
-                $this->assertTrue( is_upload_space_available() );
+                $this->assertFalse( is_upload_space_available() );
         }
 
@@ -1151 +1187 @@
         function test_domain_filtered_to_exist() {
                 add_filter( 'domain_exists', array( $this, '_domain_exists_cb' ), 10, 4 );
-
-                $this->assertEquals( 1234, domain_exists( 'foo', 'bar' ) );
-
+                $exists = domain_exists( 'foo', 'bar' );
                 remove_filter( 'domain_exists', array( $this, '_domain_exists_cb' ), 10, 4 );
+                $this->assertEquals( 1234, $exists );
         }
 
@@ -1163 +1198 @@
         function test_slashed_path_in_domain_exists() {
                 add_filter( 'domain_exists', array( $this, '_domain_exists_cb' ), 10, 4 );
+                $exists1 = domain_exists( 'foo', 'bar' );
+                $exists2 = domain_exists( 'foo', 'bar/' );
+                remove_filter( 'domain_exists', array( $this, '_domain_exists_cb' ), 10, 4 );
 
                 // Make sure the same result is returned with or without a trailing slash
-                $this->assertEquals( domain_exists( 'foo', 'bar' ), domain_exists( 'foo', 'bar/' ) );
-
-                remove_filter( 'domain_exists', array( $this, '_domain_exists_cb' ), 10, 4 );
+                $this->assertEquals( $exists1, $exists2 );
         }
 

trunk/tests/phpunit/tests/xmlrpc/wp/uploadFile.php

@@ -5 +5 @@
  */
 class Tests_XMLRPC_wp_uploadFile extends WP_XMLRPC_UnitTestCase {
+
+        public function tearDown() {
+                $this->remove_added_uploads();
+
+                parent::tearDown();
+        }
 
         function test_valid_attachment() {