Changeset 34758

Timestamp:

10/02/2015 01:55:52 AM (11 years ago)

Author:

jeremyfelt

Message:

Tests: Split test_default_filter() Site Option test into multiple tests.

See #28290.

File:

• trunk/tests/phpunit/tests/option/siteOption.php (modified) (2 diffs)

trunk/tests/phpunit/tests/option/siteOption.php

@@ -35 +35 @@
                 update_site_option( $key, $new_value );
                 $this->assertEquals( $new_value, get_site_option( $key ) );
+        }
+
+        function test_get_site_option_does_not_exist_returns_filtered_default_with_no_default_provided() {
+                add_filter( 'default_site_option_doesnotexist', array( $this, '__return_foo' ) );
+                $site_option = get_site_option( 'doesnotexist' );
+                remove_filter( 'default_site_option_doesnotexist', array( $this, '__return_foo' ) );
+                $this->assertEquals( 'foo', $site_option );
+        }
+
+        function test_get_site_option_does_not_exist_returns_filtered_default_with_default_provided() {
+                add_filter( 'default_site_option_doesnotexist', array( $this, '__return_foo' ) );
+                $site_option = get_site_option( 'doesnotexist', 'bar' );
+                remove_filter( 'default_site_option_doesnotexist', array( $this, '__return_foo' ) );
+                $this->assertEquals( 'foo', $site_option );
+        }
+
+        function test_get_site_option_does_not_exist_returns_provided_default() {
+                $this->assertEquals( 'bar', get_site_option( 'doesnotexist', 'bar' ) );
+        }
+
+        function test_get_site_option_exists_does_not_return_provided_default() {
+                $key = rand_str();
+                $value = rand_str();
+                add_site_option( $key, $value );
+                $this->assertEquals( $value, get_site_option( $key, 'foo' ) );
+        }
+
+        function test_get_site_option_exists_does_not_return_filtered_default() {
+                $key = rand_str();
+                $value = rand_str();
+                add_site_option( $key, $value );
+                add_filter( 'default_site_option_' . $key , array( $this, '__return_foo' ) );
+                $site_option = get_site_option( $key );
+                remove_filter( 'default_site_option_' . $key, array( $this, '__return_foo' ) );
+                $this->assertEquals( $value, $site_option );
         }
 
@@ -80 +115 @@
         }
 
-        function test_default_filter() {
-                $random = rand_str();
-
-                $this->assertFalse( get_site_option( 'doesnotexist' ) );
-
-                // Default filter overrides $default arg.
-                add_filter( 'default_site_option_doesnotexist', array( $this, '__return_foo' ) );
-                $this->assertEquals( 'foo', get_site_option( 'doesnotexist', 'bar' ) );
-
-                // Remove the filter and the $default arg is honored.
-                remove_filter( 'default_site_option_doesnotexist', array( $this, '__return_foo' ) );
-                $this->assertEquals( 'bar', get_site_option( 'doesnotexist', 'bar' ) );
-
-                // Once the option exists, the $default arg and the default filter are ignored.
-                add_site_option( 'doesnotexist', $random );
-                $this->assertEquals( $random, get_site_option( 'doesnotexist', 'foo' ) );
-                add_filter( 'default_site_option_doesnotexist', array( $this, '__return_foo' ) );
-                $this->assertEquals( $random, get_site_option( 'doesnotexist', 'foo' ) );
-                remove_filter( 'default_site_option_doesnotexist', array( $this, '__return_foo' ) );
-
-                // Cleanup
-                $this->assertTrue( delete_site_option( 'doesnotexist' ) );
-                $this->assertFalse( get_site_option( 'doesnotexist' ) );
-        }
-
         function test_serialized_data() {
                 $key = rand_str();