Gut anything from HttpTest that involves making external requests and setting cookies...
authorChad Horohoe <demon@users.mediawiki.org>
Thu, 8 Sep 2011 14:04:36 +0000 (14:04 +0000)
committerChad Horohoe <demon@users.mediawiki.org>
Thu, 8 Sep 2011 14:04:36 +0000 (14:04 +0000)
Chalk this up as an example of how *not* to write unit tests.
Still have 5 failures :(

tests/phpunit/includes/HttpTest.php

index f0cc3b6..dd3207d 100644 (file)
 <?php
-
-class MockCookie extends Cookie {
-       public function canServeDomain( $arg ) { return parent::canServeDomain( $arg ); }
-       public function canServePath( $arg ) { return parent::canServePath( $arg ); }
-       public function isUnExpired() { return parent::isUnExpired(); }
-}
-
 /**
  * @group Broken
  */
 class HttpTest extends MediaWikiTestCase {
-       static $content;
-       static $headers;
-       static $has_curl;
-       static $has_fopen;
-       static $has_proxy = false;
-       static $proxy = "http://hulk:8080/";
-       var $test_geturl = array(
-               "http://en.wikipedia.org/robots.txt",
-               "https://secure.wikimedia.org/",
-               "http://pecl.php.net/feeds/pkg_apc.rss",
-               "http://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw",
-               "http://www.mediawiki.org/w/api.php?action=query&list=categorymembers&cmtitle=Category:MediaWiki_hooks&format=php",
-       );
-       var $test_requesturl = array( "http://en.wikipedia.org/wiki/Special:Export/User:MarkAHershberger" );
-
-       var $test_posturl = array( "http://www.comp.leeds.ac.uk/cgi-bin/Perl/environment-example" => "review=test" );
-
-       function setUp() {
-               putenv( "http_proxy" ); /* Remove any proxy env var, so curl doesn't get confused */
-               if ( is_array( self::$content ) ) {
-                       return;
-               }
-               self::$has_curl = function_exists( 'curl_init' );
-               self::$has_fopen = wfIniGetBool( 'allow_url_fopen' );
-
-               if ( !file_exists( "/usr/bin/curl" ) ) {
-                       $this->markTestIncomplete( "This test requires the curl binary at /usr/bin/curl.         If you have curl, please file a bug on this test, or, better yet, provide a patch." );
-               }
-
-               $content = tempnam( wfTempDir(), "" );
-               $headers = tempnam( wfTempDir(), "" );
-               if ( !$content && !$headers ) {
-                       die( "Couldn't create temp file!" );
-               }
-
-               // This probably isn't the best test for a proxy, but it works on my system!
-               system( "curl -0 -o $content -s " . self::$proxy );
-               $out = file_get_contents( $content );
-               if ( $out ) {
-                       self::$has_proxy = true;
-               }
-
-               /* Maybe use wget instead of curl here ... just to use a different codebase? */
-               foreach ( $this->test_geturl as $u ) {
-                       system( "curl -0 -s -D $headers '$u' -o $content" );
-                       self::$content["GET $u"] = file_get_contents( $content );
-                       self::$headers["GET $u"] = file_get_contents( $headers );
-               }
-               foreach ( $this->test_requesturl as $u ) {
-                       system( "curl -0 -s -X POST -H 'Content-Length: 0' -D $headers '$u' -o $content" );
-                       self::$content["POST $u"] = file_get_contents( $content );
-                       self::$headers["POST $u"] = file_get_contents( $headers );
-               }
-               foreach ( $this->test_posturl as $u => $postData ) {
-                       system( "curl -0 -s -X POST -d '$postData' -D $headers '$u' -o $content" );
-                       self::$content["POST $u => $postData"] = file_get_contents( $content );
-                       self::$headers["POST $u => $postData"] = file_get_contents( $headers );
-               }
-               unlink( $content );
-               unlink( $headers );
-       }
-
-
-       function testInstantiation() {
-               Http::$httpEngine = false;
-
-               $r = MWHttpRequest::factory( "http://www.example.com/" );
-               if ( self::$has_curl ) {
-                       $this->assertThat( $r, $this->isInstanceOf( 'CurlHttpRequest' ) );
-               } else {
-                       $this->assertThat( $r, $this->isInstanceOf( 'PhpHttpRequest' ) );
-               }
-               $this->assertTrue( $r->status->isGood(), '$r->status is good' );
-               unset( $r );
-               
-               $r = MWHttpRequest::factory( "//www.example.com/" );
-               if ( self::$has_curl ) {
-                       $this->assertThat( $r, $this->isInstanceOf( 'CurlHttpRequest' ) );
-               } else {
-                       $this->assertThat( $r, $this->isInstanceOf( 'PhpHttpRequest' ) );
-               }
-               $this->assertTrue( $r->status->isGood(), '$r->status is good' );
-
-               if ( !self::$has_fopen ) {
-                       $this->setExpectedException( 'MWException' );
-               }
-               Http::$httpEngine = 'php';
-               $r = MWHttpRequest::factory( "http://www.example.com/" );
-               $this->assertThat( $r, $this->isInstanceOf( 'PhpHttpRequest' ) );
-               $this->assertTrue( $r->status->isGood(), '$r->status is good' );
-               unset( $r );
-
-               if ( !self::$has_curl ) {
-                       $this->setExpectedException( 'MWException' );
-               }
-               Http::$httpEngine = 'curl';
-               $r = MWHttpRequest::factory( "http://www.example.com/" );
-               if ( self::$has_curl ) {
-                       $this->assertThat( $r, $this->isInstanceOf( 'CurlHttpRequest' ) );
-                       $this->assertTrue( $r->status->isGood(), '$r->status is good' );
-               }
-       }
-
-       function runHTTPFailureChecks() {
-               // Each of the following requests should result in a failure.
-
-               $timeout = 1;
-               $start_time = time();
-               $r = Http::get( "http://www.example.com:1/", $timeout );
-               $end_time = time();
-               $this->assertLessThan( $timeout + 2, $end_time - $start_time,
-                                                         "Request took less than {$timeout}s via " . Http::$httpEngine );
-               $this->assertEquals( $r, false, "false -- what we get on error from Http::get()" );
-
-               $r = Http::get( "http://www.mediawiki.org/xml/made-up-url", $timeout );
-               $this->assertFalse( $r, "False on 404s" );
-
-
-               $r = MWHttpRequest::factory( "http://www.mediawiki.org/xml/made-up-url" );
-               $er = $r->execute();
-               if ( $r instanceof PhpHttpRequest && version_compare( '5.2.10', phpversion(), '>' ) ) {
-                       $this->assertRegexp( "/HTTP request failed/", $er->getWikiText() );
-               } else {
-                       $this->assertRegexp( "/404 Not Found/", $er->getWikiText() );
-               }
-       }
-
-       function testFailureDefault() {
-               Http::$httpEngine = false;
-               $this->runHTTPFailureChecks();
-       }
-
-       function testFailurePhp() {
-               if ( !self::$has_fopen ) {
-                       $this->markTestIncomplete( "This test requires allow_url_fopen=true." );
-               }
-
-               Http::$httpEngine = "php";
-               $this->runHTTPFailureChecks();
-       }
-
-       function testFailureCurl() {
-               if ( !self::$has_curl ) {
-                       $this->markTestIncomplete( "This test requires curl." );
-               }
-
-               Http::$httpEngine = "curl";
-               $this->runHTTPFailureChecks();
-       }
-
-       /* ./phase3/includes/Import.php:1108:           $data = Http::request( $method, $url ); */
-       /* ./includes/Import.php:1124:                  $link = Title::newFromText( "$interwiki:Special:Export/$page" ); */
-       /* ./includes/Import.php:1134:                  return ImportStreamSource::newFromURL( $url, "POST" ); */
-       function runHTTPRequests( $proxy = null ) {
-               $opt = array();
-
-               if ( $proxy ) {
-                       $opt['proxy'] = $proxy;
-               } elseif ( $proxy === false ) {
-                       $opt['noProxy'] = true;
-               }
-
-               /* no postData here because the only request I could find in code so far didn't have any */
-               foreach ( $this->test_requesturl as $u ) {
-                       $r = Http::request( "POST", $u, $opt );
-                       $this->assertEquals( self::$content["POST $u"], "$r", "POST $u with " . Http::$httpEngine );
-                       
-                       // If this was an HTTP URL, repeat the same test with a protocol-relative URL
-                       // We can't do this with HTTPS URLs because MWHttpRequest expands protocol-relative
-                       // URLs to HTTP.
-                       list( $prot, $url ) = explode( ':', $u, 2 );
-                       if ( $prot === 'http' ) {
-                               $r = Http::request( "POST", $url, $opt );
-                               $this->assertEquals( self::$content["POST $u"], "$r", "POST $url with " . Http::$httpEngine );
-                       }
-               }
-       }
-
-       function testRequestDefault() {
-               Http::$httpEngine = false;
-               $this->runHTTPRequests();
-       }
-
-       function testRequestPhp() {
-               if ( !self::$has_fopen ) {
-                       $this->markTestIncomplete( "This test requires allow_url_fopen=true." );
-               }
-
-               Http::$httpEngine = "php";
-               $this->runHTTPRequests();
-       }
-
-       function testRequestCurl() {
-               if ( !self::$has_curl ) {
-                       $this->markTestIncomplete( "This test requires curl." );
-               }
-
-               Http::$httpEngine = "curl";
-               $this->runHTTPRequests();
-       }
-
-       function runHTTPGets( $proxy = null ) {
-               $opt = array();
-
-               if ( $proxy ) {
-                       $opt['proxy'] = $proxy;
-               } elseif ( $proxy === false ) {
-                       $opt['noProxy'] = true;
-               }
-
-               foreach ( $this->test_geturl as $u ) {
-                       $r = Http::get( $u, 30, $opt ); /* timeout of 30s */
-                       $this->assertEquals( self::$content["GET $u"], "$r", "Get $u with " . Http::$httpEngine );
-                       
-                       // If this was an HTTP URL, repeat the same test with a protocol-relative URL
-                       // We can't do this with HTTPS URLs because MWHttpRequest expands protocol-relative
-                       // URLs to HTTP.
-                       list( $prot, $url ) = explode( ':', $u, 2 );
-                       if ( $prot === 'http' ) {
-                               $r = Http::get( $url, 30, $opt );
-                               $this->assertEquals( self::$content["GET $u"], "$r", "Get $url with " . Http::$httpEngine );
-                       }
-               }
-       }
-
-       function testGetDefault() {
-               Http::$httpEngine = false;
-               $this->runHTTPGets();
-       }
-
-       function testGetPhp() {
-               if ( !self::$has_fopen ) {
-                       $this->markTestIncomplete( "This test requires allow_url_fopen=true." );
-               }
-
-               Http::$httpEngine = "php";
-               $this->runHTTPGets();
-       }
-
-       function testGetCurl() {
-               if ( !self::$has_curl ) {
-                       $this->markTestIncomplete( "This test requires curl." );
-               }
-
-               Http::$httpEngine = "curl";
-               $this->runHTTPGets();
-       }
-
-       function runHTTPPosts( $proxy = null ) {
-               $opt = array();
-
-               if ( $proxy ) {
-                       $opt['proxy'] = $proxy;
-               } elseif ( $proxy === false ) {
-                       $opt['noProxy'] = true;
-               }
-
-               foreach ( $this->test_posturl as $u => $postData ) {
-                       $opt['postData'] = $postData;
-                       $r = Http::post( $u, $opt );
-                       $this->assertEquals( self::$content["POST $u => $postData"], "$r",
-                                                                "POST $u (postData=$postData) with " . Http::$httpEngine );
-                       
-                       // If this was an HTTP URL, repeat the same test with a protocol-relative URL
-                       // We can't do this with HTTPS URLs because MWHttpRequest expands protocol-relative
-                       // URLs to HTTP.
-                       list( $prot, $url ) = explode( ':', $u, 2 );
-                       if ( $prot === 'http' ) {
-                               $r = Http::post( $url, $opt );
-                               $this->assertEquals( self::$content["POST $u => $postData"], "$r",
-                                       "POST $u (postData=$postData) with " . Http::$httpEngine );
-                       }
-               }
-       }
-
-       function testPostDefault() {
-               Http::$httpEngine = false;
-               $this->runHTTPPosts();
-       }
-
-       function testPostPhp() {
-               if ( !self::$has_fopen ) {
-                       $this->markTestIncomplete( "This test requires allow_url_fopen=true." );
-               }
-
-               Http::$httpEngine = "php";
-               $this->runHTTPPosts();
-       }
-
-       function testPostCurl() {
-               if ( !self::$has_curl ) {
-                       $this->markTestIncomplete( "This test requires curl." );
-               }
-
-               Http::$httpEngine = "curl";
-               $this->runHTTPPosts();
-       }
-
-       function runProxyRequests() {
-               if ( !self::$has_proxy ) {
-                       $this->markTestIncomplete( "This test requires a proxy." );
-               }
-               $this->runHTTPGets( self::$proxy );
-               $this->runHTTPPosts( self::$proxy );
-               $this->runHTTPRequests( self::$proxy );
-
-               // Set false here to do noProxy
-               $this->runHTTPGets( false );
-               $this->runHTTPPosts( false );
-               $this->runHTTPRequests( false );
-       }
-
-       function testProxyDefault() {
-               Http::$httpEngine = false;
-               $this->runProxyRequests();
-       }
-
-       function testProxyPhp() {
-               if ( !self::$has_fopen ) {
-                       $this->markTestIncomplete( "This test requires allow_url_fopen=true." );
-               }
-
-               Http::$httpEngine = 'php';
-               $this->runProxyRequests();
-       }
-
-       function testProxyCurl() {
-               if ( !self::$has_curl ) {
-                       $this->markTestIncomplete( "This test requires curl." );
-               }
-
-               Http::$httpEngine = 'curl';
-               $this->runProxyRequests();
-       }
-
-       function testIsLocalUrl() {
-       }
-
-       /* ./extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php:559:           $user_agent = Http::userAgent(); */
-       function testUserAgent() {
-       }
-
-       function testIsValidUrl() {
-       }
-
        /**
         * @dataProvider cookieDomains
         */
-       function testValidateCookieDomain( $expected, $domain, $origin=null ) {
+       function testValidateCookieDomain( $expected, $domain, $origin = null ) {
                if ( $origin ) {
                        $ok = Cookie::validateCookieDomain( $domain, $origin );
                        $msg = "$domain against origin $origin";
@@ -368,7 +16,7 @@ class HttpTest extends MediaWikiTestCase {
                }
                $this->assertEquals( $expected, $ok, $msg );
        }
-       
+
        function cookieDomains() {
                return array(
                        array( false, "org"),
@@ -398,189 +46,11 @@ class HttpTest extends MediaWikiTestCase {
                );
        }
 
-       function testSetCooke() {
-               $c = new MockCookie( "name", "value",
-                                                        array(
-                                                                "domain" => "ac.th",
-                                                                "path" => "/path/",
-                                                        ) );
-               $this->assertFalse( $c->canServeDomain( "ac.th" ) );
-
-               $c = new MockCookie( "name", "value",
-                                                        array(
-                                                                "domain" => "example.com",
-                                                                "path" => "/path/",
-                                                        ) );
-
-               $this->assertTrue( $c->canServeDomain( "example.com" ) );
-               $this->assertFalse( $c->canServeDomain( "www.example.com" ) );
-
-               $c = new MockCookie( "name", "value",
-                                                        array(
-                                                                "domain" => ".example.com",
-                                                                "path" => "/path/",
-                                                        ) );
-
-               $this->assertFalse( $c->canServeDomain( "www.example.net" ) );
-               $this->assertFalse( $c->canServeDomain( "example.com" ) );
-               $this->assertTrue( $c->canServeDomain( "www.example.com" ) );
-
-               $this->assertFalse( $c->canServePath( "/" ) );
-               $this->assertFalse( $c->canServePath( "/bogus/path/" ) );
-               $this->assertFalse( $c->canServePath( "/path" ) );
-               $this->assertTrue( $c->canServePath( "/path/" ) );
-
-               $this->assertTrue( $c->isUnExpired() );
-
-               $this->assertEquals( "", $c->serializeToHttpRequest( "/path/", "www.example.net" ) );
-               $this->assertEquals( "", $c->serializeToHttpRequest( "/", "www.example.com" ) );
-               $this->assertEquals( "name=value", $c->serializeToHttpRequest( "/path/", "www.example.com" ) );
-
-               $c = new MockCookie( "name", "value",
-                                                        array(
-                                                                "domain" => "www.example.com",
-                                                                "path" => "/path/",
-                                                        ) );
-               $this->assertFalse( $c->canServeDomain( "example.com" ) );
-               $this->assertFalse( $c->canServeDomain( "www.example.net" ) );
-               $this->assertTrue( $c->canServeDomain( "www.example.com" ) );
-
-               $c = new MockCookie( "name", "value",
-                                                array(
-                                                        "domain" => ".example.com",
-                                                        "path" => "/path/",
-                                                        "expires" => "-1 day",
-                                                ) );
-               $this->assertFalse( $c->isUnExpired() );
-               $this->assertEquals( "", $c->serializeToHttpRequest( "/path/", "www.example.com" ) );
-
-               $c = new MockCookie( "name", "value",
-                                                array(
-                                                        "domain" => ".example.com",
-                                                        "path" => "/path/",
-                                                        "expires" => "+1 day",
-                                                ) );
-               $this->assertTrue( $c->isUnExpired() );
-               $this->assertEquals( "name=value", $c->serializeToHttpRequest( "/path/", "www.example.com" ) );
-       }
-
-       function testCookieJarSetCookie() {
-               $cj = new CookieJar;
-               $cj->setCookie( "name", "value",
-                                                array(
-                                                        "domain" => ".example.com",
-                                                        "path" => "/path/",
-                                                ) );
-               $cj->setCookie( "name2", "value",
-                                                array(
-                                                        "domain" => ".example.com",
-                                                        "path" => "/path/sub",
-                                                ) );
-               $cj->setCookie( "name3", "value",
-                                                array(
-                                                        "domain" => ".example.com",
-                                                        "path" => "/",
-                                                ) );
-               $cj->setCookie( "name4", "value",
-                                                array(
-                                                        "domain" => ".example.net",
-                                                        "path" => "/path/",
-                                                ) );
-               $cj->setCookie( "name5", "value",
-                                                array(
-                                                        "domain" => ".example.net",
-                                                        "path" => "/path/",
-                                                        "expires" => "-1 day",
-                                                ) );
-
-               $this->assertEquals( "name4=value", $cj->serializeToHttpRequest( "/path/", "www.example.net" ) );
-               $this->assertEquals( "name3=value", $cj->serializeToHttpRequest( "/", "www.example.com" ) );
-               $this->assertEquals( "name=value; name3=value", $cj->serializeToHttpRequest( "/path/", "www.example.com" ) );
-
-               $cj->setCookie( "name5", "value",
-                                                array(
-                                                        "domain" => ".example.net",
-                                                        "path" => "/path/",
-                                                        "expires" => "+1 day",
-                                                ) );
-               $this->assertEquals( "name4=value; name5=value", $cj->serializeToHttpRequest( "/path/", "www.example.net" ) );
-
-               $cj->setCookie( "name4", "value",
-                                                array(
-                                                        "domain" => ".example.net",
-                                                        "path" => "/path/",
-                                                        "expires" => "-1 day",
-                                                ) );
-               $this->assertEquals( "name5=value", $cj->serializeToHttpRequest( "/path/", "www.example.net" ) );
-       }
-
-       function testParseResponseHeader() {
-               $cj = new CookieJar;
-
-               $h[] = "Set-Cookie: name4=value; domain=.example.com; path=/; expires=Mon, 09-Dec-2029 13:46:00 GMT";
-               $cj->parseCookieResponseHeader( $h[0], "www.example.com" );
-               $this->assertEquals( "name4=value", $cj->serializeToHttpRequest( "/", "www.example.com" ) );
-
-               $h[] = "name4=value2; domain=.example.com; path=/path/; expires=Mon, 09-Dec-2029 13:46:00 GMT";
-               $cj->parseCookieResponseHeader( $h[1], "www.example.com" );
-               $this->assertEquals( "", $cj->serializeToHttpRequest( "/", "www.example.com" ) );
-               $this->assertEquals( "name4=value2", $cj->serializeToHttpRequest( "/path/", "www.example.com" ) );
-
-               $h[] = "name5=value3; domain=.example.com; path=/path/; expires=Mon, 09-Dec-2029 13:46:00 GMT";
-               $cj->parseCookieResponseHeader( $h[2], "www.example.com" );
-               $this->assertEquals( "name4=value2; name5=value3", $cj->serializeToHttpRequest( "/path/", "www.example.com" ) );
-
-               $h[] = "name6=value3; domain=.example.net; path=/path/; expires=Mon, 09-Dec-2029 13:46:00 GMT";
-               $cj->parseCookieResponseHeader( $h[3], "www.example.com" );
-               $this->assertEquals( "", $cj->serializeToHttpRequest( "/path/", "www.example.net" ) );
-
-               $h[] = "name6=value0; domain=.example.net; path=/path/; expires=Mon, 09-Dec-1999 13:46:00 GMT";
-               $cj->parseCookieResponseHeader( $h[4], "www.example.net" );
-               $this->assertEquals( "", $cj->serializeToHttpRequest( "/path/", "www.example.net" ) );
-
-               $h[] = "name6=value4; domain=.example.net; path=/path/; expires=Mon, 09-Dec-2029 13:46:00 GMT";
-               $cj->parseCookieResponseHeader( $h[5], "www.example.net" );
-               $this->assertEquals( "name6=value4", $cj->serializeToHttpRequest( "/path/", "www.example.net" ) );
-       }
-
-       function runCookieRequests() {
-               $r = MWHttpRequest::factory( "http://www.php.net/manual", array( 'followRedirects' => true ) );
-               $r->execute();
-
-               $jar = $r->getCookieJar();
-               $this->assertThat( $jar, $this->isInstanceOf( 'CookieJar' ) );
-
-               $serialized = $jar->serializeToHttpRequest( "/search?q=test", "www.php.net" );
-               $this->assertRegExp( '/\bCOUNTRY=[^=;]+/', $serialized );
-               $this->assertRegExp( '/\bLAST_LANG=[^=;]+/', $serialized );
-               $this->assertEquals( '', $jar->serializeToHttpRequest( "/search?q=test", "www.php.com" ) );
-       }
-
-       function testCookieRequestDefault() {
-               Http::$httpEngine = false;
-               $this->runCookieRequests();
-       }
-       function testCookieRequestPhp() {
-               if ( !self::$has_fopen ) {
-                       $this->markTestIncomplete( "This test requires allow_url_fopen=true." );
-               }
-
-               Http::$httpEngine = 'php';
-               $this->runCookieRequests();
-       }
-       function testCookieRequestCurl() {
-               if ( !self::$has_curl ) {
-                       $this->markTestIncomplete( "This test requires curl." );
-               }
-
-               Http::$httpEngine = 'curl';
-               $this->runCookieRequests();
-       }
-
        /**
         * Test Http::isValidURI()
         * @bug 27854 : Http::isValidURI is to lax
-        *@dataProvider provideURI */
+        * @dataProvider provideURI
+        */
        function testIsValidUri( $expect, $URI, $message = '' ) {
                $this->assertEquals(
                        $expect,