Changeset 904 in tests for trunk/tests/http/base.php

Timestamp:

07/18/2012 07:01:41 PM (12 years ago)

Author:

nacin

Message:

Rename tests to conform to this standard: the class Tests_A_B_C.php should be found in Tests/A/B/C.php.

One class per file. Tests are now organized by general component, rather than by the core file they are found in.

Work in progress. Some classes need to be renamed, and some files still need to be moved (and split up).

Location:

trunk/tests/http

Files:

• . (added)
• base.php (moved) (moved from trunk/tests/test_http.php) (2 diffs)

trunk/tests/http/base.php

@@ -10 +10 @@
  *
  * The WP_HTTP tests require a class-http.php file of r17550 or later.
- */
-
-/**
- * @group http
  */
 abstract class WP_HTTP_UnitTestCase extends WP_UnitTestCase {
@@ -184 +180 @@
     }
 }
-
-// Stubs to test each transport
-/**
- * @group http
- */
-class WPHTTP_curl extends WP_HTTP_UnitTestCase {
-    var $transport = 'curl';
-}
-/**
- * @group http
- */
-class WPHTTP_streams extends WP_HTTP_UnitTestCase {
-    var $transport = 'streams';
-}
-/**
- * @group http
- */
-class WPHTTP_fsockopen extends WP_HTTP_UnitTestCase {
-    var $transport = 'fsockopen';
-}
-
-/**
- * Non-transport-specific WP_HTTP Tests
- *
- * @group http
- */
-class WPHTTP extends WP_UnitTestCase {
-
-    /**
-     * @dataProvider make_absolute_url_testcases
-     */
-    function test_make_absolute_url( $relative_url, $absolute_url, $expected ) {
-        if ( ! is_callable( array( 'WP_HTTP', 'make_absolute_url' ) ) ) {
-            $this->markTestSkipped( "This version of WP_HTTP doesn't support WP_HTTP::make_absolute_url()" );
-            return;
-        }
-
-        $actual = WP_HTTP::make_absolute_url( $relative_url, $absolute_url );
-        $this->assertEquals( $expected, $actual );
-    }
-
-    function make_absolute_url_testcases() {
-        // 0: The Location header, 1: The current url, 3: The expected url
-        return array(
-            array( 'http://site.com/', 'http://example.com/', 'http://site.com/' ), // Absolute URL provided
-            array( '/location', '', '/location' ), // No current url provided
-
-            array( '', 'http://example.com', 'http://example.com/' ), // No location provided
-
-            // Location provided relative to site root
-            array( '/root-relative-link.ext', 'http://example.com/', 'http://example.com/root-relative-link.ext' ),
-            array( '/root-relative-link.ext?with=query', 'http://example.com/index.ext?query', 'http://example.com/root-relative-link.ext?with=query' ),
-
-            // Location provided relative to current file/directory
-            array( 'relative-file.ext', 'http://example.com/', 'http://example.com/relative-file.ext' ),
-            array( 'relative-file.ext', 'http://example.com/filename', 'http://example.com/relative-file.ext' ),
-            array( 'relative-file.ext', 'http://example.com/directory/', 'http://example.com/directory/relative-file.ext' ),
-
-            // Location provided relative to current file/directory but in a parent directory
-            array( '../file-in-parent.ext', 'http://example.com', 'http://example.com/file-in-parent.ext' ),
-            array( '../file-in-parent.ext', 'http://example.com/filename', 'http://example.com/file-in-parent.ext' ),
-            array( '../file-in-parent.ext', 'http://example.com/directory/', 'http://example.com/file-in-parent.ext' ),
-            array( '../file-in-parent.ext', 'http://example.com/directory/filename', 'http://example.com/file-in-parent.ext' ),
-
-            // Location provided in muliple levels higher, including impossible to reach (../ below DOCROOT)
-            array( '../../file-in-grand-parent.ext', 'http://example.com', 'http://example.com/file-in-grand-parent.ext' ),
-            array( '../../file-in-grand-parent.ext', 'http://example.com/filename', 'http://example.com/file-in-grand-parent.ext' ),
-            array( '../../file-in-grand-parent.ext', 'http://example.com/directory/', 'http://example.com/file-in-grand-parent.ext' ),
-            array( '../../file-in-grand-parent.ext', 'http://example.com/directory/filename/', 'http://example.com/file-in-grand-parent.ext' ),
-            array( '../../file-in-grand-parent.ext', 'http://example.com/directory1/directory2/filename', 'http://example.com/file-in-grand-parent.ext' ),
-
-            // Query strings should attach, or replace existing query string.
-            array( '?query=string', 'http://example.com', 'http://example.com/?query=string' ),
-            array( '?query=string', 'http://example.com/file.ext', 'http://example.com/file.ext?query=string' ),
-            array( '?query=string', 'http://example.com/file.ext?existing=query-string', 'http://example.com/file.ext?query=string' ),
-            array( 'otherfile.ext?query=string', 'http://example.com/file.ext?existing=query-string', 'http://example.com/otherfile.ext?query=string' ),
-
-            // A file with a leading dot
-            array( '.ext', 'http://example.com/', 'http://example.com/.ext' )
-        );
-    }
-}