test: fix unit tests after FileUploadHelper injection

- Add FileUploadHelper mock to AccountServiceTest
- Add FileUploadHelper instance to FileServiceTest
- Add FileUploadHelper mock to IdDocsServiceTest
- Replace FileService with FileUploadHelper in RequestSignatureServiceTest
- All services now correctly inject FileUploadHelper dependency

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

Author: vitormattos

tests/php/Unit/Service/AccountServiceTest.php

@@ -18,6 +18,7 @@
 use OCA\Libresign\Db\UserElementMapper;
 use OCA\Libresign\Handler\CertificateEngine\CertificateEngineFactory;
 use OCA\Libresign\Handler\SignEngine\Pkcs12Handler;
+use OCA\Libresign\Helper\FileUploadHelper;
 use OCA\Libresign\Helper\ValidateHelper;
 use OCA\Libresign\Service\AccountService;
 use OCA\Libresign\Service\FolderService;
@@ -71,6 +72,7 @@ final class AccountServiceTest extends \OCA\Libresign\Tests\Unit\TestCase {
 	private TimeFactory&MockObject $timeFactory;
 	private RequestSignatureService&MockObject $requestSignatureService;
 	private Pkcs12Handler&MockObject $pkcs12Handler;
+	private FileUploadHelper&MockObject $uploadHelper;
 
 	public function setUp(): void {
 		parent::setUp();
@@ -104,6 +106,7 @@ public function setUp(): void {
 		$this->folderService = $this->createMock(FolderService::class);
 		$this->clientService = $this->createMock(ClientService::class);
 		$this->timeFactory = $this->createMock(TimeFactory::class);
+		$this->uploadHelper = $this->createMock(FileUploadHelper::class);
 	}
 
 	private function getService(): AccountService {
@@ -134,7 +137,8 @@ private function getService(): AccountService {
 			$this->userElementMapper,
 			$this->folderService,
 			$this->clientService,
-			$this->timeFactory
+			$this->timeFactory,
+			$this->uploadHelper
 		);
 	}
 

tests/php/Unit/Service/FileServiceTest.php

@@ -28,6 +28,7 @@ function is_uploaded_file($filename) {
 use OCA\Libresign\Db\SignRequestMapper;
 use OCA\Libresign\Handler\DocMdpHandler;
 use OCA\Libresign\Handler\SignEngine\Pkcs12Handler;
+use OCA\Libresign\Helper\FileUploadHelper;
 use OCA\Libresign\Helper\ValidateHelper;
 use OCA\Libresign\Service\AccountService;
 use OCA\Libresign\Service\EnvelopeService;
@@ -81,6 +82,7 @@ final class FileServiceTest extends \OCA\Libresign\Tests\Unit\TestCase {
 	protected IL10N $l10n;
 	protected EnvelopeService $envelopeService;
 	protected vfsDirectory $tempFolder;
+	protected FileUploadHelper&MockObject $uploadHelper;
 
 	public function setUp(): void {
 		// Disable lazy objects to avoid PHP 8.4 dependency injection issues in tests
@@ -117,6 +119,7 @@ private function getService(): FileService {
 		$this->logger = \OCP\Server::get(LoggerInterface::class);
 		$this->l10n = \OCP\Server::get(IL10NFactory::class)->get(Application::APP_ID);
 		$this->envelopeService = \OCP\Server::get(EnvelopeService::class);
+		$this->uploadHelper = \OCP\Server::get(FileUploadHelper::class);
 		return new FileService(
 			$this->fileMapper,
 			$this->signRequestMapper,
@@ -142,6 +145,7 @@ private function getService(): FileService {
 			$this->logger,
 			$this->l10n,
 			$this->envelopeService,
+			$this->uploadHelper,
 		);
 	}
 

tests/php/Unit/Service/IdDocsServiceTest.php

@@ -19,6 +19,7 @@
 use OCA\Libresign\Db\UserElementMapper;
 use OCA\Libresign\Handler\CertificateEngine\CertificateEngineFactory;
 use OCA\Libresign\Handler\SignEngine\Pkcs12Handler;
+use OCA\Libresign\Helper\FileUploadHelper;
 use OCA\Libresign\Helper\ValidateHelper;
 use OCA\Libresign\Service\AccountService;
 use OCA\Libresign\Service\FolderService;
@@ -73,6 +74,7 @@ final class IdDocsServiceTest extends \OCA\Libresign\Tests\Unit\TestCase {
 	private TimeFactory&MockObject $timeFactory;
 	private RequestSignatureService&MockObject $requestSignatureService;
 	private Pkcs12Handler&MockObject $pkcs12Handler;
+	private FileUploadHelper&MockObject $uploadHelper;
 
 	public function setUp(): void {
 		parent::setUp();
@@ -107,6 +109,7 @@ public function setUp(): void {
 		$this->folderService = $this->createMock(FolderService::class);
 		$this->clientService = $this->createMock(ClientService::class);
 		$this->timeFactory = $this->createMock(TimeFactory::class);
+		$this->uploadHelper = $this->createMock(FileUploadHelper::class);
 	}
 
 	private function getService(): AccountService {
@@ -137,7 +140,8 @@ private function getService(): AccountService {
 			$this->userElementMapper,
 			$this->folderService,
 			$this->clientService,
-			$this->timeFactory
+			$this->timeFactory,
+			$this->uploadHelper,
 		);
 	}
 

tests/php/Unit/Service/RequestSignatureServiceTest.php

@@ -12,11 +12,11 @@
 use OCA\Libresign\Db\IdentifyMethodMapper;
 use OCA\Libresign\Db\SignRequestMapper;
 use OCA\Libresign\Handler\DocMdpHandler;
+use OCA\Libresign\Helper\FileUploadHelper;
 use OCA\Libresign\Helper\ValidateHelper;
 use OCA\Libresign\Service\DocMdpConfigService;
 use OCA\Libresign\Service\EnvelopeService;
 use OCA\Libresign\Service\FileElementService;
-use OCA\Libresign\Service\FileService;
 use OCA\Libresign\Service\FileStatusService;
 use OCA\Libresign\Service\FolderService;
 use OCA\Libresign\Service\IdentifyMethodService;
@@ -61,7 +61,7 @@ final class RequestSignatureServiceTest extends \OCA\Libresign\Tests\Unit\TestCa
 	private SignRequestStatusService&MockObject $signRequestStatusService;
 	private DocMdpConfigService&MockObject $docMdpConfigService;
 	private EnvelopeService&MockObject $envelopeService;
-	private FileService&MockObject $fileService;
+	private FileUploadHelper&MockObject $uploadHelper;
 
 	public function setUp(): void {
 		parent::setUp();
@@ -93,7 +93,7 @@ public function setUp(): void {
 		$this->signRequestStatusService = $this->createMock(SignRequestStatusService::class);
 		$this->docMdpConfigService = $this->createMock(DocMdpConfigService::class);
 		$this->envelopeService = $this->createMock(EnvelopeService::class);
-		$this->fileService = $this->createMock(FileService::class);
+		$this->uploadHelper = $this->createMock(FileUploadHelper::class);
 	}
 
 	private function getService(): RequestSignatureService {
@@ -120,7 +120,7 @@ private function getService(): RequestSignatureService {
 			$this->signRequestStatusService,
 			$this->docMdpConfigService,
 			$this->envelopeService,
-			$this->fileService,
+			$this->uploadHelper,
 		);
 	}