X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fresourceloader%2FResourceLoaderImageTest.php;h=84b56d4f11e7a26cf67ab5b2a89b2512a6e42885;hb=9b670fb797813a8ed35750e2c83fe953a10f349e;hp=179a8ed98f3aaefc20577d60018843ef4935dc3a;hpb=a85d1b9d0cd7f02111d3a647d5b91e3b1f334563;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php
index 179a8ed98f..35c3ef6454 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php
@@ -15,8 +15,8 @@ class ResourceLoaderImageTest extends ResourceLoaderTestCase {
 	protected function getTestImage( $name ) {
 		$options = ResourceLoaderImageModuleTest::$commonImageData[$name];
 		$fileDescriptor = is_string( $options ) ? $options : $options['file'];
-		$allowedVariants = is_array( $options ) &&
-			isset( $options['variants'] ) ? $options['variants'] : [];
+		$allowedVariants = ( is_array( $options ) && isset( $options['variants'] ) ) ?
+			$options['variants'] : [];
 		$variants = array_fill_keys( $allowedVariants, [ 'color' => 'red' ] );
 		return new ResourceLoaderImageTestable(
 			$name,
@@ -29,20 +29,22 @@ class ResourceLoaderImageTest extends ResourceLoaderTestCase {
 
 	public static function provideGetPath() {
 		return [
-			[ 'add', 'en', 'add.gif' ],
-			[ 'add', 'he', 'add.gif' ],
-			[ 'remove', 'en', 'remove.svg' ],
-			[ 'remove', 'he', 'remove.svg' ],
-			[ 'next', 'en', 'next.svg' ],
-			[ 'next', 'he', 'prev.svg' ],
-			[ 'help', 'en', 'help-ltr.svg' ],
-			[ 'help', 'ar', 'help-rtl.svg' ],
-			[ 'help', 'he', 'help-ltr.svg' ],
-			[ 'bold', 'en', 'bold-b.svg' ],
-			[ 'bold', 'de', 'bold-f.svg' ],
-			[ 'bold', 'ar', 'bold-f.svg' ],
-			[ 'bold', 'fr', 'bold-a.svg' ],
-			[ 'bold', 'he', 'bold-a.svg' ],
+			[ 'abc', 'en', 'abc.gif' ],
+			[ 'abc', 'he', 'abc.gif' ],
+			[ 'def', 'en', 'def.svg' ],
+			[ 'def', 'he', 'def.svg' ],
+			[ 'ghi', 'en', 'ghi.svg' ],
+			[ 'ghi', 'he', 'jkl.svg' ],
+			[ 'mno', 'en', 'mno-ltr.svg' ],
+			[ 'mno', 'ar', 'mno-rtl.svg' ],
+			[ 'mno', 'he', 'mno-ltr.svg' ],
+			[ 'pqr', 'en', 'pqr-b.svg' ],
+			[ 'pqr', 'en-gb', 'pqr-b.svg' ],
+			[ 'pqr', 'de', 'pqr-f.svg' ],
+			[ 'pqr', 'de-formal', 'pqr-f.svg' ],
+			[ 'pqr', 'ar', 'pqr-f.svg' ],
+			[ 'pqr', 'fr', 'pqr-a.svg' ],
+			[ 'pqr', 'he', 'pqr-a.svg' ],
 		];
 	}
 
@@ -53,7 +55,9 @@ class ResourceLoaderImageTest extends ResourceLoaderTestCase {
 	public function testGetPath( $imageName, $languageCode, $path ) {
 		static $dirMap = [
 			'en' => 'ltr',
+			'en-gb' => 'ltr',
 			'de' => 'ltr',
+			'de-formal' => 'ltr',
 			'fr' => 'ltr',
 			'he' => 'rtl',
 			'ar' => 'rtl',
@@ -61,7 +65,10 @@ class ResourceLoaderImageTest extends ResourceLoaderTestCase {
 		static $contexts = [];
 
 		$image = $this->getTestImage( $imageName );
-		$context = $this->getResourceLoaderContext( $languageCode, $dirMap[$languageCode] );
+		$context = $this->getResourceLoaderContext( [
+			'lang' => $languageCode,
+			'dir' => $dirMap[$languageCode],
+		] );
 
 		$this->assertEquals( $image->getPath( $context ), $this->imagesPath . '/' . $path );
 	}
@@ -71,11 +78,11 @@ class ResourceLoaderImageTest extends ResourceLoaderTestCase {
 	 * @covers ResourceLoaderImage::getMimeType
 	 */
 	public function testGetExtension() {
-		$image = $this->getTestImage( 'remove' );
+		$image = $this->getTestImage( 'def' );
 		$this->assertEquals( $image->getExtension(), 'svg' );
 		$this->assertEquals( $image->getExtension( 'original' ), 'svg' );
 		$this->assertEquals( $image->getExtension( 'rasterized' ), 'png' );
-		$image = $this->getTestImage( 'add' );
+		$image = $this->getTestImage( 'abc' );
 		$this->assertEquals( $image->getExtension(), 'gif' );
 		$this->assertEquals( $image->getExtension( 'original' ), 'gif' );
 		$this->assertEquals( $image->getExtension( 'rasterized' ), 'gif' );
@@ -87,11 +94,11 @@ class ResourceLoaderImageTest extends ResourceLoaderTestCase {
 	 * @covers ResourceLoaderImage::massageSvgPathdata
 	 */
 	public function testGetImageData() {
-		$context = $this->getResourceLoaderContext( 'en', 'ltr' );
+		$context = $this->getResourceLoaderContext();
 
-		$image = $this->getTestImage( 'remove' );
-		$data = file_get_contents( $this->imagesPath . '/remove.svg' );
-		$dataConstructive = file_get_contents( $this->imagesPath . '/remove_variantize.svg' );
+		$image = $this->getTestImage( 'def' );
+		$data = file_get_contents( $this->imagesPath . '/def.svg' );
+		$dataConstructive = file_get_contents( $this->imagesPath . '/def_variantize.svg' );
 		$this->assertEquals( $image->getImageData( $context, null, 'original' ), $data );
 		$this->assertEquals(
 			$image->getImageData( $context, 'destructive', 'original' ),
@@ -100,8 +107,8 @@ class ResourceLoaderImageTest extends ResourceLoaderTestCase {
 		// Stub, since we don't know if we even have a SVG handler, much less what exactly it'll output
 		$this->assertEquals( $image->getImageData( $context, null, 'rasterized' ), 'RASTERIZESTUB' );
 
-		$image = $this->getTestImage( 'add' );
-		$data = file_get_contents( $this->imagesPath . '/add.gif' );
+		$image = $this->getTestImage( 'abc' );
+		$data = file_get_contents( $this->imagesPath . '/abc.gif' );
 		$this->assertEquals( $image->getImageData( $context, null, 'original' ), $data );
 		$this->assertEquals( $image->getImageData( $context, null, 'rasterized' ), $data );
 	}
@@ -110,9 +117,9 @@ class ResourceLoaderImageTest extends ResourceLoaderTestCase {
 	 * @covers ResourceLoaderImage::massageSvgPathdata
 	 */
 	public function testMassageSvgPathdata() {
-		$image = $this->getTestImage( 'next' );
-		$data = file_get_contents( $this->imagesPath . '/next.svg' );
-		$dataMassaged = file_get_contents( $this->imagesPath . '/next_massage.svg' );
+		$image = $this->getTestImage( 'ghi' );
+		$data = file_get_contents( $this->imagesPath . '/ghi.svg' );
+		$dataMassaged = file_get_contents( $this->imagesPath . '/ghi_massage.svg' );
 		$this->assertEquals( $image->massageSvgPathdata( $data ), $dataMassaged );
 	}
 }