Changeset 38453

Timestamp:

08/30/2016 06:30:51 PM (8 years ago)

Author:

johnbillion

Message:

HTTP API: Separate the test for wp_parse_url() with -1 as its component into a separate test, so the remaining tests can use strict type checking. This helps avoid gotches with the potentially empty values (ie. null) that we're testing for.

See #36356

File:

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

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

@@ -118 +118 @@
     /**
      * @ticket 36356
+     */
+    function test_wp_parse_url_with_default_component() {
+        $actual = wp_parse_url( self::$full_test_url, -1 );
+        $this->assertEquals( array(
+            'scheme'   => 'http',
+            'host'     => 'host.name',
+            'port'     => 9090,
+            'user'     => 'username',
+            'pass'     => 'password',
+            'path'     => '/path',
+            'query'    => 'arg1=value1&arg2=value2',
+            'fragment' => 'anchor',
+        ), $actual );
+    }
+
+    /**
+     * @ticket 36356
      *
      * @dataProvider parse_url_component_testcases
@@ -123 +140 @@
     function test_wp_parse_url_with_component( $url, $component, $expected ) {
         $actual = wp_parse_url( $url, $component );
-        $this->assertEquals( $expected, $actual );
+        $this->assertSame( $expected, $actual );
     }
 
@@ -129 +146 @@
         // 0: The URL, 1: The requested component, 2: The expected resulting component.
         return array(
-            array( self::$full_test_url, -1, array(
-                'scheme'   => 'http',
-                'host'     => 'host.name',
-                'port'     => 9090,
-                'user'     => 'username',
-                'pass'     => 'password',
-                'path'     => '/path',
-                'query'    => 'arg1=value1&arg2=value2',
-                'fragment' => 'anchor',
-            ) ),
             array( self::$full_test_url, PHP_URL_SCHEME, 'http' ),
             array( self::$full_test_url, PHP_URL_USER, 'username' ),