X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FWikiReferenceTest.php;h=227dd87da597caacf3020e1aaded33e7046a2f8b;hp=4fe2e855b6b4e9b9d015ed5f76eb4d10c710dbdb;hb=75160bdd3b4ac3642d147cda46e47c809999937d;hpb=1eceaa6c20730b987b92f1d505b9cf68737a95a9

diff --git a/tests/phpunit/includes/WikiReferenceTest.php b/tests/phpunit/includes/WikiReferenceTest.php
index 4fe2e855b6..227dd87da5 100644
--- a/tests/phpunit/includes/WikiReferenceTest.php
+++ b/tests/phpunit/includes/WikiReferenceTest.php
@@ -6,45 +6,91 @@
 
 class WikiReferenceTest extends PHPUnit_Framework_TestCase {
 
+	use MediaWikiCoversValidator;
+
 	public function provideGetDisplayName() {
-		return array(
-			'http' => array( 'foo.bar', 'http://foo.bar' ),
-			'https' => array( 'foo.bar', 'http://foo.bar' ),
+		return [
+			'http' => [ 'foo.bar', 'http://foo.bar' ],
+			'https' => [ 'foo.bar', 'http://foo.bar' ],
 
 			// apparently, this is the expected behavior
-			'invalid' => array( 'purple kittens', 'purple kittens' ),
-		);
+			'invalid' => [ 'purple kittens', 'purple kittens' ],
+		];
 	}
 
 	/**
 	 * @dataProvider provideGetDisplayName
 	 */
 	public function testGetDisplayName( $expected, $canonicalServer ) {
-		$reference = new WikiReference( 'wiki', 'xx', $canonicalServer, '/wiki/$1' );
+		$reference = new WikiReference( $canonicalServer, '/wiki/$1' );
 		$this->assertEquals( $expected, $reference->getDisplayName() );
 	}
 
 	public function testGetCanonicalServer() {
-		$reference = new WikiReference( 'wiki', 'xx', 'https://acme.com', '/wiki/$1', '//acme.com' );
+		$reference = new WikiReference( 'https://acme.com', '/wiki/$1', '//acme.com' );
 		$this->assertEquals( 'https://acme.com', $reference->getCanonicalServer() );
 	}
 
 	public function provideGetCanonicalUrl() {
-		return array(
-			'no fragement' => array( 'https://acme.com/wiki/Foo', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo', null ),
-			'empty fragement' => array( 'https://acme.com/wiki/Foo', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo', '' ),
-			'fragment' => array( 'https://acme.com/wiki/Foo#Bar', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo', 'Bar' ),
-			'double fragment' => array( 'https://acme.com/wiki/Foo#Bar%23Xus', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo', 'Bar#Xus' ),
-			'escaped fragement' => array( 'https://acme.com/wiki/Foo%23Bar', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo#Bar', null ),
-			'empty path' => array( 'https://acme.com/Foo', 'https://acme.com', '//acme.com', '/$1', 'Foo', null ),
-		);
+		return [
+			'no fragment' => [
+				'https://acme.com/wiki/Foo',
+				'https://acme.com',
+				'//acme.com',
+				'/wiki/$1',
+				'Foo',
+				null
+			],
+			'empty fragment' => [
+				'https://acme.com/wiki/Foo',
+				'https://acme.com',
+				'//acme.com',
+				'/wiki/$1',
+				'Foo',
+				''
+			],
+			'fragment' => [
+				'https://acme.com/wiki/Foo#Bar',
+				'https://acme.com',
+				'//acme.com',
+				'/wiki/$1',
+				'Foo',
+				'Bar'
+			],
+			'double fragment' => [
+				'https://acme.com/wiki/Foo#Bar%23Xus',
+				'https://acme.com',
+				'//acme.com',
+				'/wiki/$1',
+				'Foo',
+				'Bar#Xus'
+			],
+			'escaped fragment' => [
+				'https://acme.com/wiki/Foo%23Bar',
+				'https://acme.com',
+				'//acme.com',
+				'/wiki/$1',
+				'Foo#Bar',
+				null
+			],
+			'empty path' => [
+				'https://acme.com/Foo',
+				'https://acme.com',
+				'//acme.com',
+				'/$1',
+				'Foo',
+				null
+			],
+		];
 	}
 
 	/**
 	 * @dataProvider provideGetCanonicalUrl
 	 */
-	public function testGetCanonicalUrl( $expected, $canonicalServer, $server, $path, $page, $fragmentId ) {
-		$reference = new WikiReference( 'wiki', 'xx', $canonicalServer, $path, $server );
+	public function testGetCanonicalUrl(
+		$expected, $canonicalServer, $server, $path, $page, $fragmentId
+	) {
+		$reference = new WikiReference( $canonicalServer, $path, $server );
 		$this->assertEquals( $expected, $reference->getCanonicalUrl( $page, $fragmentId ) );
 	}
 
@@ -53,28 +99,69 @@ class WikiReferenceTest extends PHPUnit_Framework_TestCase {
 	 * @note getUrl is an alias for getCanonicalUrl
 	 */
 	public function testGetUrl( $expected, $canonicalServer, $server, $path, $page, $fragmentId ) {
-		$reference = new WikiReference( 'wiki', 'xx', $canonicalServer, $path, $server );
+		$reference = new WikiReference( $canonicalServer, $path, $server );
 		$this->assertEquals( $expected, $reference->getUrl( $page, $fragmentId ) );
 	}
 
 	public function provideGetFullUrl() {
-		return array(
-			'no fragement' => array( '//acme.com/wiki/Foo', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo', null ),
-			'empty fragement' => array( '//acme.com/wiki/Foo', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo', '' ),
-			'fragment' => array( '//acme.com/wiki/Foo#Bar', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo', 'Bar' ),
-			'double fragment' => array( '//acme.com/wiki/Foo#Bar%23Xus', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo', 'Bar#Xus' ),
-			'escaped fragement' => array( '//acme.com/wiki/Foo%23Bar', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo#Bar', null ),
-			'empty path' => array( '//acme.com/Foo', 'https://acme.com', '//acme.com', '/$1', 'Foo', null ),
-		);
+		return [
+			'no fragment' => [
+				'//acme.com/wiki/Foo',
+				'https://acme.com',
+				'//acme.com',
+				'/wiki/$1',
+				'Foo',
+				null
+			],
+			'empty fragment' => [
+				'//acme.com/wiki/Foo',
+				'https://acme.com',
+				'//acme.com',
+				'/wiki/$1',
+				'Foo',
+				''
+			],
+			'fragment' => [
+				'//acme.com/wiki/Foo#Bar',
+				'https://acme.com',
+				'//acme.com',
+				'/wiki/$1',
+				'Foo',
+				'Bar'
+			],
+			'double fragment' => [
+				'//acme.com/wiki/Foo#Bar%23Xus',
+				'https://acme.com',
+				'//acme.com',
+				'/wiki/$1',
+				'Foo',
+				'Bar#Xus'
+			],
+			'escaped fragment' => [
+				'//acme.com/wiki/Foo%23Bar',
+				'https://acme.com',
+				'//acme.com',
+				'/wiki/$1',
+				'Foo#Bar',
+				null
+			],
+			'empty path' => [
+				'//acme.com/Foo',
+				'https://acme.com',
+				'//acme.com',
+				'/$1',
+				'Foo',
+				null
+			],
+		];
 	}
 
 	/**
 	 * @dataProvider provideGetFullUrl
 	 */
 	public function testGetFullUrl( $expected, $canonicalServer, $server, $path, $page, $fragmentId ) {
-		$reference = new WikiReference( 'wiki', 'xx', $canonicalServer, $path, $server );
+		$reference = new WikiReference( $canonicalServer, $path, $server );
 		$this->assertEquals( $expected, $reference->getFullUrl( $page, $fragmentId ) );
 	}
 
 }
-