X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2FApiUploadTest.php;h=6b604093e4cc773e4818794097e227f793d4e81b;hb=1891a1e972b3eb0db21776cce4ce8bad0ae59f4c;hp=de2b56bde3f4534d376f35dd136b25413b48ed6a;hpb=939199bcea28a3b13c49c0f808d11d415660b924;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/api/ApiUploadTest.php b/tests/phpunit/includes/api/ApiUploadTest.php
index de2b56bde3..6b604093e4 100644
--- a/tests/phpunit/includes/api/ApiUploadTest.php
+++ b/tests/phpunit/includes/api/ApiUploadTest.php
@@ -19,6 +19,8 @@
  * @group Database
  * @group medium
  * @group Broken
+ *
+ * @covers ApiUpload
  */
 class ApiUploadTest extends ApiTestCaseUpload {
 	/**
@@ -51,7 +53,6 @@ class ApiUploadTest extends ApiTestCaseUpload {
 		$this->assertArrayHasKey( "login", $result );
 		$this->assertArrayHasKey( "result", $result['login'] );
 		$this->assertEquals( "Success", $result['login']['result'] );
-		$this->assertArrayHasKey( 'lgtoken', $result['login'] );
 
 		$this->assertNotEmpty( $session, 'API Login must return a session' );
 
@@ -67,9 +68,9 @@ class ApiUploadTest extends ApiTestCaseUpload {
 			$this->doApiRequest( [
 				'action' => 'upload'
 			] );
-		} catch ( UsageException $e ) {
+		} catch ( ApiUsageException $e ) {
 			$exception = true;
-			$this->assertEquals( "The token parameter must be set", $e->getMessage() );
+			$this->assertContains( 'The "token" parameter must be set', $e->getMessage() );
 		}
 		$this->assertTrue( $exception, "Got exception" );
 	}
@@ -83,10 +84,12 @@ class ApiUploadTest extends ApiTestCaseUpload {
 			$this->doApiRequestWithToken( [
 				'action' => 'upload',
 			], $session, self::$users['uploader']->getUser() );
-		} catch ( UsageException $e ) {
+		} catch ( ApiUsageException $e ) {
 			$exception = true;
-			$this->assertEquals( "One of the parameters filekey, file, url is required",
-				$e->getMessage() );
+			$this->assertEquals(
+				'One of the parameters "filekey", "file" and "url" is required.',
+				$e->getMessage()
+			);
 		}
 		$this->assertTrue( $exception, "Got exception" );
 	}
@@ -129,7 +132,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 		try {
 			list( $result, , ) = $this->doApiRequestWithToken( $params, $session,
 				self::$users['uploader']->getUser() );
-		} catch ( UsageException $e ) {
+		} catch ( ApiUsageException $e ) {
 			$exception = true;
 		}
 		$this->assertTrue( isset( $result['upload'] ) );
@@ -168,7 +171,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 		$exception = false;
 		try {
 			$this->doApiRequestWithToken( $params, $session, self::$users['uploader']->getUser() );
-		} catch ( UsageException $e ) {
+		} catch ( ApiUsageException $e ) {
 			$this->assertContains( 'The file you submitted was empty', $e->getMessage() );
 			$exception = true;
 		}
@@ -218,7 +221,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 		try {
 			list( $result, , $session ) = $this->doApiRequestWithToken( $params, $session,
 				self::$users['uploader']->getUser() );
-		} catch ( UsageException $e ) {
+		} catch ( ApiUsageException $e ) {
 			$exception = true;
 		}
 		$this->assertTrue( isset( $result['upload'] ) );
@@ -235,7 +238,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 		try {
 			list( $result, , ) = $this->doApiRequestWithToken( $params, $session,
 				self::$users['uploader']->getUser() ); // FIXME: leaks a temporary file
-		} catch ( UsageException $e ) {
+		} catch ( ApiUsageException $e ) {
 			$exception = true;
 		}
 		$this->assertTrue( isset( $result['upload'] ) );
@@ -289,7 +292,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 		try {
 			list( $result, , $session ) = $this->doApiRequestWithToken( $params, $session,
 				self::$users['uploader']->getUser() );
-		} catch ( UsageException $e ) {
+		} catch ( ApiUsageException $e ) {
 			$exception = true;
 		}
 		$this->assertTrue( isset( $result['upload'] ) );
@@ -314,7 +317,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 		try {
 			list( $result ) = $this->doApiRequestWithToken( $params, $session,
 				self::$users['uploader']->getUser() ); // FIXME: leaks a temporary file
-		} catch ( UsageException $e ) {
+		} catch ( ApiUsageException $e ) {
 			$exception = true;
 		}
 		$this->assertTrue( isset( $result['upload'] ) );
@@ -371,7 +374,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 		try {
 			list( $result, , $session ) = $this->doApiRequestWithToken( $params, $session,
 				self::$users['uploader']->getUser() ); // FIXME: leaks a temporary file
-		} catch ( UsageException $e ) {
+		} catch ( ApiUsageException $e ) {
 			$exception = true;
 		}
 		$this->assertFalse( $exception );
@@ -400,12 +403,12 @@ class ApiUploadTest extends ApiTestCaseUpload {
 		try {
 			list( $result ) = $this->doApiRequestWithToken( $params, $session,
 				self::$users['uploader']->getUser() );
-		} catch ( UsageException $e ) {
+		} catch ( ApiUsageException $e ) {
 			$exception = true;
 		}
 		$this->assertTrue( isset( $result['upload'] ) );
 		$this->assertEquals( 'Success', $result['upload']['result'] );
-		$this->assertFalse( $exception, "No UsageException exception." );
+		$this->assertFalse( $exception, "No ApiUsageException exception." );
 
 		// clean up
 		$this->deleteFileByFileName( $fileName );
@@ -476,7 +479,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 				try {
 					list( $result, , $session ) = $this->doApiRequestWithToken( $params, $session,
 						self::$users['uploader']->getUser() );
-				} catch ( UsageException $e ) {
+				} catch ( ApiUsageException $e ) {
 					$this->markTestIncomplete( $e->getMessage() );
 				}
 				// Make sure we got a valid chunk continue:
@@ -504,7 +507,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 			try {
 				list( $result, , $session ) = $this->doApiRequestWithToken( $params, $session,
 					self::$users['uploader']->getUser() );
-			} catch ( UsageException $e ) {
+			} catch ( ApiUsageException $e ) {
 				$this->markTestIncomplete( $e->getMessage() );
 			}
 			// Make sure we got a valid chunk continue:
@@ -544,7 +547,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 		try {
 			list( $result ) = $this->doApiRequestWithToken( $params, $session,
 				self::$users['uploader']->getUser() );
-		} catch ( UsageException $e ) {
+		} catch ( ApiUsageException $e ) {
 			$exception = true;
 		}
 		$this->assertTrue( isset( $result['upload'] ) );