X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fhttp%2FHttpTest.php;h=94b8c91b4ed6a2803a3eb90d3fe916be9d095cb2;hp=09bcfc9adfe574b923c43ee3eacc26bdace153d2;hb=9e8439e79d67788916d488f645108f79016d9aca;hpb=8768c686e68e89d86adc31ed03da1ec81aae1965

diff --git a/tests/phpunit/includes/http/HttpTest.php b/tests/phpunit/includes/http/HttpTest.php
index 09bcfc9adf..94b8c91b4e 100644
--- a/tests/phpunit/includes/http/HttpTest.php
+++ b/tests/phpunit/includes/http/HttpTest.php
@@ -7,20 +7,6 @@
  */
 class HttpTest extends MediaWikiTestCase {
 
-	/**
-	 * Test Http::isValidURI()
-	 * T29854 : Http::isValidURI is too lax
-	 * @dataProvider provideURI
-	 * @covers Http::isValidURI
-	 */
-	public function testIsValidUri( $expect, $URI, $message = '' ) {
-		$this->assertEquals(
-			$expect,
-			(bool)Http::isValidURI( $URI ),
-			$message
-		);
-	}
-
 	/**
 	 * @covers Http::getProxy
 	 */
@@ -28,7 +14,7 @@ class HttpTest extends MediaWikiTestCase {
 		$this->hideDeprecated( 'Http::getProxy' );
 
 		$this->setMwGlobals( 'wgHTTPProxy', false );
-		$this->assertEquals(
+		$this->assertSame(
 			'',
 			Http::getProxy(),
 			'default setting'
@@ -41,71 +27,4 @@ class HttpTest extends MediaWikiTestCase {
 		);
 	}
 
-	/**
-	 * Feeds URI to test a long regular expression in Http::isValidURI
-	 */
-	public static function provideURI() {
-		/** Format: 'boolean expectation', 'URI to test', 'Optional message' */
-		return [
-			[ false, '¿non sens before!! http://a', 'Allow anything before URI' ],
-
-			# (http|https) - only two schemes allowed
-			[ true, 'http://www.example.org/' ],
-			[ true, 'https://www.example.org/' ],
-			[ true, 'http://www.example.org', 'URI without directory' ],
-			[ true, 'http://a', 'Short name' ],
-			[ true, 'http://étoile', 'Allow UTF-8 in hostname' ], # 'étoile' is french for 'star'
-			[ false, '\\host\directory', 'CIFS share' ],
-			[ false, 'gopher://host/dir', 'Reject gopher scheme' ],
-			[ false, 'telnet://host', 'Reject telnet scheme' ],
-
-			# :\/\/ - double slashes
-			[ false, 'http//example.org', 'Reject missing colon in protocol' ],
-			[ false, 'http:/example.org', 'Reject missing slash in protocol' ],
-			[ false, 'http:example.org', 'Must have two slashes' ],
-			# Following fail since hostname can be made of anything
-			[ false, 'http:///example.org', 'Must have exactly two slashes, not three' ],
-
-			# (\w+:{0,1}\w*@)? - optional user:pass
-			[ true, 'http://user@host', 'Username provided' ],
-			[ true, 'http://user:@host', 'Username provided, no password' ],
-			[ true, 'http://user:pass@host', 'Username and password provided' ],
-
-			# (\S+) - host part is made of anything not whitespaces
-			// commented these out in order to remove @group Broken
-			// @todo are these valid tests? if so, fix Http::isValidURI so it can handle them
-			// [ false, 'http://!"èèè¿¿¿~~\'', 'hostname is made of any non whitespace' ],
-			// [ false, 'http://exam:ple.org/', 'hostname can not use colons!' ],
-
-			# (:[0-9]+)? - port number
-			[ true, 'http://example.org:80/' ],
-			[ true, 'https://example.org:80/' ],
-			[ true, 'http://example.org:443/' ],
-			[ true, 'https://example.org:443/' ],
-
-			# Part after the hostname is / or / with something else
-			[ true, 'http://example/#' ],
-			[ true, 'http://example/!' ],
-			[ true, 'http://example/:' ],
-			[ true, 'http://example/.' ],
-			[ true, 'http://example/?' ],
-			[ true, 'http://example/+' ],
-			[ true, 'http://example/=' ],
-			[ true, 'http://example/&' ],
-			[ true, 'http://example/%' ],
-			[ true, 'http://example/@' ],
-			[ true, 'http://example/-' ],
-			[ true, 'http://example//' ],
-			[ true, 'http://example/&' ],
-
-			# Fragment
-			[ true, 'http://exam#ple.org', ], # This one is valid, really!
-			[ true, 'http://example.org:80#anchor' ],
-			[ true, 'http://example.org/?id#anchor' ],
-			[ true, 'http://example.org/?#anchor' ],
-
-			[ false, 'http://a ¿non !!sens after', 'Allow anything after URI' ],
-		];
-	}
-
 }