Changeset 35369 for trunk/tests/phpunit/tests/http/http.php

Timestamp:

10/23/2015 05:53:05 AM (10 years ago)

Author:

dd32

Message:

WP_HTTP: Promote the WP_HTTP::parse_url() method to a more generic wp_parse_url() function.

Fixes #34408

File:

• trunk/tests/phpunit/tests/http/http.php (modified) (3 diffs)

trunk/tests/phpunit/tests/http/http.php

@@ -71 +71 @@
      * @dataProvider parse_url_testcases
      */
-    function test_parse_url( $url, $expected ) {
-        if ( ! is_callable( array( 'WP_HTTP_Testable', 'parse_url' ) ) ) {
-            $this->markTestSkipped( "This version of WP_HTTP doesn't support WP_HTTP::parse_url()" );
-            return;
-        }
-        $actual = WP_HTTP_Testable::parse_url( $url );
+    function test_wp_parse_url( $url, $expected ) {
+        $actual = wp_parse_url( $url );
         $this->assertEquals( $expected, $actual );
     }
@@ -93 +89 @@
             array( 'http://example.com/http://example.net/', array( 'scheme' => 'http', 'host' => 'example.com', 'path' => '/http://example.net/' ) ),
             array( '/path/http://example.net/', array( 'path' => '/path/http://example.net/' ) ),
+
+            // < PHP 5.4.7: IPv6 literals in schemeless URLs are handled incorrectly.
+            array( '//[::FFFF::127.0.0.1]/', array( 'host' => '[::FFFF::127.0.0.1]', 'path' => '/' ) ),
+
             // PHP's parse_url() calls this an invalid url, we handle it as a path
             array( '/://example.com/', array( 'path' => '/://example.com/' ) ),
@@ -104 +104 @@
     }
 }
-
-/**
- * A Wrapper of WP_Http to make parse_url() publicaly accessible for testing purposes.
- */
-class WP_HTTP_Testable extends WP_Http {
-    public static function parse_url( $url ) {
-        return parent::parse_url( $url );
-    }
-}