X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fphpunit%2Fincludes%2Ffilebackend%2FSwiftFileBackendTest.php;h=6acc94388a1bae23279353b45122802b5ccff216;hb=ee56f00ddf0609082f8ae9a4dc3e6e1b6f54ddfd;hp=a618889c099515e1fc3dcb5e61a86018517fc8b5;hpb=ac17fbac94f2ba72b3ac64fff2dd188dd76faaf3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php b/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
index a618889c09..35eca28f7e 100644
--- a/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
+++ b/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
@@ -1,9 +1,16 @@
 <?php
 
+use Wikimedia\TestingAccessWrapper;
+
 /**
  * @group FileRepo
  * @group FileBackend
  * @group medium
+ *
+ * @covers SwiftFileBackend
+ * @covers SwiftFileBackendDirList
+ * @covers SwiftFileBackendFileList
+ * @covers SwiftFileBackendList
  */
 class SwiftFileBackendTest extends MediaWikiTestCase {
 	/** @var TestingAccessWrapper Proxy to SwiftFileBackend */
@@ -13,86 +20,148 @@ class SwiftFileBackendTest extends MediaWikiTestCase {
 		parent::setUp();
 
 		$this->backend = TestingAccessWrapper::newFromObject(
-			new SwiftFileBackend( array(
+			new SwiftFileBackend( [
 				'name'             => 'local-swift-testing',
-				'class'            => 'SwiftFileBackend',
+				'class'            => SwiftFileBackend::class,
 				'wikiId'           => 'unit-testing',
 				'lockManager'      => LockManagerGroup::singleton()->get( 'fsLockManager' ),
 				'swiftAuthUrl'     => 'http://127.0.0.1:8080/auth', // unused
 				'swiftUser'        => 'test:tester',
 				'swiftKey'         => 'testing',
 				'swiftTempUrlKey'  => 'b3968d0207b54ece87cccc06515a89d4' // unused
-			) )
+			] )
 		);
 	}
 
 	/**
-	 * @dataProvider provider_testSanitzeHdrs
-	 * @covers SwiftFileBackend::sanitzeHdrs
-	 * @covers SwiftFileBackend::getCustomHeaders
+	 * @dataProvider provider_testSanitizeHdrsStrict
 	 */
-	public function testSanitzeHdrs( $raw, $sanitized ) {
-		$hdrs = $this->backend->sanitizeHdrs( array( 'headers' => $raw ) );
+	public function testSanitizeHdrsStrict( $raw, $sanitized ) {
+		$hdrs = $this->backend->sanitizeHdrsStrict( [ 'headers' => $raw ] );
+
+		$this->assertEquals( $hdrs, $sanitized, 'sanitizeHdrsStrict() has expected result' );
+	}
+
+	public static function provider_testSanitizeHdrsStrict() {
+		return [
+			[
+				[
+					'content-length' => 345,
+					'content-type'   => 'image+bitmap/jpeg',
+					'content-disposition' => 'inline',
+					'content-duration' => 35.6363,
+					'content-Custom' => 'hello',
+					'x-content-custom' => 'hello'
+				],
+				[
+					'content-disposition' => 'inline',
+					'content-duration' => 35.6363,
+					'content-custom' => 'hello',
+					'x-content-custom' => 'hello'
+				]
+			],
+			[
+				[
+					'content-length' => 345,
+					'content-type'   => 'image+bitmap/jpeg',
+					'content-Disposition' => 'inline; filename=xxx; ' . str_repeat( 'o', 1024 ),
+					'content-duration' => 35.6363,
+					'content-custom' => 'hello',
+					'x-content-custom' => 'hello'
+				],
+				[
+					'content-disposition' => 'inline;filename=xxx',
+					'content-duration' => 35.6363,
+					'content-custom' => 'hello',
+					'x-content-custom' => 'hello'
+				]
+			],
+			[
+				[
+					'content-length' => 345,
+					'content-type'   => 'image+bitmap/jpeg',
+					'content-disposition' => 'filename=' . str_repeat( 'o', 1024 ) . ';inline',
+					'content-duration' => 35.6363,
+					'content-custom' => 'hello',
+					'x-content-custom' => 'hello'
+				],
+				[
+					'content-disposition' => '',
+					'content-duration' => 35.6363,
+					'content-custom' => 'hello',
+					'x-content-custom' => 'hello'
+				]
+			]
+		];
+	}
+
+	/**
+	 * @dataProvider provider_testSanitizeHdrs
+	 */
+	public function testSanitizeHdrs( $raw, $sanitized ) {
+		$hdrs = $this->backend->sanitizeHdrs( [ 'headers' => $raw ] );
 
 		$this->assertEquals( $hdrs, $sanitized, 'sanitizeHdrs() has expected result' );
 	}
 
-	public static function provider_testSanitzeHdrs() {
-		return array(
-			array(
-				array(
+	public static function provider_testSanitizeHdrs() {
+		return [
+			[
+				[
 					'content-length' => 345,
 					'content-type'   => 'image+bitmap/jpeg',
 					'content-disposition' => 'inline',
 					'content-duration' => 35.6363,
 					'content-Custom' => 'hello',
 					'x-content-custom' => 'hello'
-				),
-				array(
+				],
+				[
+					'content-type'   => 'image+bitmap/jpeg',
 					'content-disposition' => 'inline',
 					'content-duration' => 35.6363,
 					'content-custom' => 'hello',
 					'x-content-custom' => 'hello'
-				)
-			),
-			array(
-				array(
+				]
+			],
+			[
+				[
 					'content-length' => 345,
 					'content-type'   => 'image+bitmap/jpeg',
 					'content-Disposition' => 'inline; filename=xxx; ' . str_repeat( 'o', 1024 ),
 					'content-duration' => 35.6363,
 					'content-custom' => 'hello',
 					'x-content-custom' => 'hello'
-				),
-				array(
+				],
+				[
+					'content-type'   => 'image+bitmap/jpeg',
 					'content-disposition' => 'inline;filename=xxx',
 					'content-duration' => 35.6363,
 					'content-custom' => 'hello',
 					'x-content-custom' => 'hello'
-				)
-			),
-			array(
-				array(
+				]
+			],
+			[
+				[
 					'content-length' => 345,
 					'content-type'   => 'image+bitmap/jpeg',
-					'content-disposition' => 'filename='. str_repeat( 'o', 1024 ) . ';inline',
+					'content-disposition' => 'filename=' . str_repeat( 'o', 1024 ) . ';inline',
 					'content-duration' => 35.6363,
 					'content-custom' => 'hello',
 					'x-content-custom' => 'hello'
-				),
-				array(
+				],
+				[
+					'content-type'   => 'image+bitmap/jpeg',
 					'content-disposition' => '',
 					'content-duration' => 35.6363,
 					'content-custom' => 'hello',
 					'x-content-custom' => 'hello'
-				)
-			)
-		);
+				]
+			]
+		];
 	}
 
 	/**
 	 * @dataProvider provider_testGetMetadataHeaders
-	 * @covers SwiftFileBackend::getMetadataHeaders
 	 */
 	public function testGetMetadataHeaders( $raw, $sanitized ) {
 		$hdrs = $this->backend->getMetadataHeaders( $raw );
@@ -101,26 +170,25 @@ class SwiftFileBackendTest extends MediaWikiTestCase {
 	}
 
 	public static function provider_testGetMetadataHeaders() {
-		return array(
-			array(
-				array(
+		return [
+			[
+				[
 					'content-length' => 345,
 					'content-custom' => 'hello',
 					'x-content-custom' => 'hello',
 					'x-object-meta-custom' => 5,
 					'x-object-meta-sha1Base36' => 'a3deadfg...',
-				),
-				array(
+				],
+				[
 					'x-object-meta-custom' => 5,
 					'x-object-meta-sha1base36' => 'a3deadfg...',
-				)
-			)
-		);
+				]
+			]
+		];
 	}
 
 	/**
 	 * @dataProvider provider_testGetMetadata
-	 * @covers SwiftFileBackend::getMetadata
 	 */
 	public function testGetMetadata( $raw, $sanitized ) {
 		$hdrs = $this->backend->getMetadata( $raw );
@@ -129,20 +197,20 @@ class SwiftFileBackendTest extends MediaWikiTestCase {
 	}
 
 	public static function provider_testGetMetadata() {
-		return array(
-			array(
-				array(
+		return [
+			[
+				[
 					'content-length' => 345,
 					'content-custom' => 'hello',
 					'x-content-custom' => 'hello',
 					'x-object-meta-custom' => 5,
 					'x-object-meta-sha1Base36' => 'a3deadfg...',
-				),
-				array(
+				],
+				[
 					'custom' => 5,
 					'sha1base36' => 'a3deadfg...',
-				)
-			)
-		);
+				]
+			]
+		];
 	}
-}
\ No newline at end of file
+}