Changeset 40342 for trunk/tests/phpunit/tests/multisite/bootstrap.php

Timestamp:

03/28/2017 01:24:44 AM (8 years ago)

Author:

jeremyfelt

Message:

Tests: Clarify zero path segment tests for get_network_by_path().

The set of assertions in this data provider intend to test a 0 path segment configuration rather than the use of paths.

Fixes #37217.

File:

• trunk/tests/phpunit/tests/multisite/bootstrap.php (modified) (2 diffs)

trunk/tests/phpunit/tests/multisite/bootstrap.php

@@ -95 +95 @@
     /**
      * @ticket 37217
-     * @dataProvider data_get_network_by_path_not_using_paths
+     * @dataProvider data_get_network_by_path_with_zero_path_segments
      *
      * @param string $expected_key The array key associated with expected data for the test.
@@ -102 +102 @@
      * @param string $message      The message to pass for failed tests.
      */
-    public function test_get_network_by_path_not_using_paths( $expected_key, $domain, $path, $message ) {
-        if ( ! wp_using_ext_object_cache() ) {
-            $this->markTestSkipped( 'Only testable with an external object cache.' );
-        }
-
-        // Temporarily store original object cache and using paths values.
-        $using_paths_orig = wp_cache_get( 'networks_have_paths', 'site-options' );
-
-        wp_cache_set( 'networks_have_paths', 0, 'site-options'  );
+    public function test_get_network_by_path_with_zero_path_segments( $expected_key, $domain, $path, $message ) {
+        add_filter( 'network_by_path_segments_count', '__return_zero' );
 
         $network = get_network_by_path( $domain, $path );
 
-        // Restore original object cache and using paths values.
-        wp_cache_set( 'networks_have_paths', $using_paths_orig, 'site-options' );
+        remove_filter( 'network_by_path_segments_count', '__return_zero' );
 
         $this->assertEquals( self::$network_ids[ $expected_key ], $network->id, $message );
     }
 
-    public function data_get_network_by_path_not_using_paths() {
+    public function data_get_network_by_path_with_zero_path_segments() {
         return array(
             array( 'wordpress.org/',         'wordpress.org',       '/',          'A standard domain and path request should work.' ),