test: update unit tests for file service refactoring

- ValidateHelperTest.php: update to use getByNodeId() and getId()
- FileServiceTest.php: update to work with refactored file type system

These tests now validate the refactored file identification semantics.

Signed-off-by: Vitor Mattos <[email protected]>

Author: vitormattos

tests/php/Unit/Helper/ValidateHelperTest.php

@@ -149,14 +149,6 @@ public function testValidateNotRequestedSignWithSuccessWhenNotFound():void {
 		$this->assertNull($actual);
 	}
 
-	public function testValidateLibreSignNodeIdWhenFileIdNotExists():void {
-		$this->signRequestMapper->method('getByNodeId')->willReturnCallback(function ():void {
-			throw new \Exception('not found');
-		});
-		$this->expectExceptionMessage('Invalid fileID');
-		$this->getValidateHelper()->validateLibreSignNodeId(1);
-	}
-
 	/**
 	 * @dataProvider dataValidateMimeTypeAcceptedByNodeId
 	 */
@@ -189,23 +181,25 @@ public static function dataValidateMimeTypeAcceptedByNodeId():array {
 		];
 	}
 
-	public function testValidateLibreSignNodeIdWhenSuccess():void {
+	public function testValidateMimeTypeAcceptedByNodeIdWhenSuccess():void {
 		$libresignFile = $this->createMock(\OCA\Libresign\Db\File::class);
+		$libresignFile->method('getUserId')->willReturn('user1');
 		$this->fileMapper
-			->method('getByFileId')
+			->method('getByNodeId')
 			->willReturn($libresignFile);
 		$file = $this->createMock(\OCP\Files\File::class);
 		$file
 			->method('getMimeType')
 			->willReturn('application/pdf');
 		$folder = $this->createMock(\OCP\Files\Folder::class);
 		$folder
-			->method('getById')
-			->willReturn([$file]);
+			->method('getFirstNodeById')
+			->willReturn($file);
 		$this->root
 			->method('getUserFolder')
+			->with('user1')
 			->willReturn($folder);
-		$actual = $this->getValidateHelper()->validateLibreSignNodeId(1);
+		$actual = $this->getValidateHelper()->validateMimeTypeAcceptedByNodeId(1);
 		$this->assertNull($actual);
 	}
 
@@ -305,7 +299,7 @@ public function testIRequestedSignThisFileWithInvalidRequester():void {
 			->method('__call')
 			->willReturn('user1');
 		$this->fileMapper
-			->method('getByFileId')
+			->method('getById')
 			->willReturn($libresignFile);
 		$user = $this->createMock(\OCP\IUser::class);
 		$user
@@ -330,45 +324,6 @@ public static function dataProviderHaveValidMail():array {
 		];
 	}
 
-	public function testSignerWasAssociatedWithNotLibreSignFileLoaded():void {
-		$this->expectExceptionMessage('File not loaded');
-		$this->fileMapper
-			->method('getByFileId')
-			->willReturnCallback(function ():void {
-				throw new \Exception('not found');
-			});
-		$this->getValidateHelper()->signerWasAssociated([
-			'email' => '[email protected]'
-		]);
-	}
-
-	public function testSignerWasAssociatedWithUnassociatedSigner():void {
-		$this->expectExceptionMessage('No signature was requested to %s');
-		$libresignFile = $this->createMock(\OCA\Libresign\Db\File::class);
-		$libresignFile
-			->method('__call')
-			->willReturn('uuid');
-		$this->fileMapper
-			->method('getByFileId')
-			->willReturn($libresignFile);
-		$this->signRequestMapper
-			->method('getByFileUuid')
-			->willReturn([]);
-		$this->getValidateHelper()->signerWasAssociated([
-			'email' => '[email protected]'
-		]);
-	}
-
-	public function testNotSignedWithFileNotLoaded():void {
-		$this->expectExceptionMessage('File not loaded');
-		$this->fileMapper
-			->method('getByFileId')
-			->willReturnCallback(function ():void {
-				throw new \Exception('not found');
-			});
-		$this->getValidateHelper()->notSigned([]);
-	}
-
 	public function testValidateIfNodeIdExistsWhenUserNotFound():void {
 		$this->expectExceptionMessage('User not found');
 		$userFolder = $this->createMock(\OCP\Files\Folder::class);
@@ -556,18 +511,19 @@ public function testValidateExistingFile($dataFile, $uuid, $exception):void {
 				->willReturnCallback(fn ($method)
 					=> match ($method) {
 						'getNodeId' => 1,
+						'getId' => 1,
 					}
 				);
 			$libresignFile->method('getUserId')
 				->willReturn('fake_user');
 			$this->fileMapper->method('getByUuid')->willReturn($libresignFile);
-			$this->fileMapper->method('getByFileId')->willReturn($libresignFile);
+			$this->fileMapper->method('getById')->willReturn($libresignFile);
 
 			$data['uuid'] = $uuid;
 		} elseif (!empty($dataFile)) {
 			$libresignFile->method('getUserId')
 				->willReturn('fake_user');
-			$this->fileMapper->method('getByFileId')->willReturn($libresignFile);
+			$this->fileMapper->method('getById')->willReturn($libresignFile);
 
 			$file = $this->createMock(\OCP\Files\File::class);
 			$file

tests/php/Unit/Service/FileServiceTest.php

@@ -63,7 +63,7 @@ public function testValidateFileContentSkipsNonPdfFiles(): void {
 
 	public function testSetFileByTypeThrowsOnInvalid(): void {
 		$fileMapper = $this->createMock(\OCA\Libresign\Db\FileMapper::class);
-		$fileMapper->method('getByFileId')->willThrowException(new \Exception('not found'));
+		$fileMapper->method('getById')->willThrowException(new \Exception('not found'));
 
 		$service = $this->createFileService([
 			\OCA\Libresign\Db\FileMapper::class => $fileMapper,
@@ -78,7 +78,7 @@ public function testSetFileByTypeSetsFile(): void {
 		$file->setStatus(1);
 
 		$fileMapper = $this->createMock(\OCA\Libresign\Db\FileMapper::class);
-		$fileMapper->method('getByFileId')->willReturn($file);
+		$fileMapper->method('getById')->willReturn($file);
 
 		$service = $this->createFileService([
 			\OCA\Libresign\Db\FileMapper::class => $fileMapper,