feat(taskprocessing): fix tests

Signed-off-by: Julien Veyssier <[email protected]>

Author: julien-nc

core/Command/TaskProcessing/Cleanup.php

@@ -34,18 +34,18 @@ protected function configure() {
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$maxAgeSeconds = $input->getArgument('maxAgeSeconds') ?? Manager::MAX_TASK_AGE_SECONDS;
-		$output->writeln('<comment>Cleanup up tasks older than '. $maxAgeSeconds . ' seconds and the related output files</comment>');
+		$output->writeln('<comment>Cleanup up tasks older than ' . $maxAgeSeconds . ' seconds and the related output files</comment>');
 		$cleanupResult = $this->taskProcessingManager->cleanupOldTasks($maxAgeSeconds);
 		foreach ($cleanupResult as $entry) {
 			if (isset($entry['task_id'], $entry['file_id'], $entry['file_name'])) {
 				$output->writeln("<info>\t - " . 'Deleted appData/core/TaskProcessing/' . $entry['file_name'] . ' (fileId: ' . $entry['file_id'] . ', taskId: ' . $entry['task_id'] . ')</info>');
 			} elseif (isset($entry['directory_name'])) {
-				$output->writeln("<info>\t - " . 'Deleted appData/core/'. $entry['directory_name'] . '/' . $entry['file_name'] . '</info>');
+				$output->writeln("<info>\t - " . 'Deleted appData/core/' . $entry['directory_name'] . '/' . $entry['file_name'] . '</info>');
 			} elseif (isset($entry['deleted_task_count'])) {
-				$output->writeln("<comment>\t - " . 'Deleted '. $entry['deleted_task_count'] . ' tasks from the database</comment>');
+				$output->writeln("<comment>\t - " . 'Deleted ' . $entry['deleted_task_count'] . ' tasks from the database</comment>');
 			} elseif (isset($entry['deleted_task_id_list'])) {
 				foreach ($entry['deleted_task_id_list'] as $taskId) {
-					$output->writeln("<info>\t - " . 'Deleted task '. $taskId . ' from the database</info>');
+					$output->writeln("<info>\t - " . 'Deleted task ' . $taskId . ' from the database</info>');
 				}
 			}
 		}

lib/composer/composer/autoload_classmap.php

@@ -1346,6 +1346,7 @@
     'OC\\Core\\Command\\SystemTag\\Delete' => $baseDir . '/core/Command/SystemTag/Delete.php',
     'OC\\Core\\Command\\SystemTag\\Edit' => $baseDir . '/core/Command/SystemTag/Edit.php',
     'OC\\Core\\Command\\SystemTag\\ListCommand' => $baseDir . '/core/Command/SystemTag/ListCommand.php',
+    'OC\\Core\\Command\\TaskProcessing\\Cleanup' => $baseDir . '/core/Command/TaskProcessing/Cleanup.php',
     'OC\\Core\\Command\\TaskProcessing\\EnabledCommand' => $baseDir . '/core/Command/TaskProcessing/EnabledCommand.php',
     'OC\\Core\\Command\\TaskProcessing\\GetCommand' => $baseDir . '/core/Command/TaskProcessing/GetCommand.php',
     'OC\\Core\\Command\\TaskProcessing\\ListCommand' => $baseDir . '/core/Command/TaskProcessing/ListCommand.php',

lib/composer/composer/autoload_static.php

@@ -1387,6 +1387,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\Core\\Command\\SystemTag\\Delete' => __DIR__ . '/../../..' . '/core/Command/SystemTag/Delete.php',
         'OC\\Core\\Command\\SystemTag\\Edit' => __DIR__ . '/../../..' . '/core/Command/SystemTag/Edit.php',
         'OC\\Core\\Command\\SystemTag\\ListCommand' => __DIR__ . '/../../..' . '/core/Command/SystemTag/ListCommand.php',
+        'OC\\Core\\Command\\TaskProcessing\\Cleanup' => __DIR__ . '/../../..' . '/core/Command/TaskProcessing/Cleanup.php',
         'OC\\Core\\Command\\TaskProcessing\\EnabledCommand' => __DIR__ . '/../../..' . '/core/Command/TaskProcessing/EnabledCommand.php',
         'OC\\Core\\Command\\TaskProcessing\\GetCommand' => __DIR__ . '/../../..' . '/core/Command/TaskProcessing/GetCommand.php',
         'OC\\Core\\Command\\TaskProcessing\\ListCommand' => __DIR__ . '/../../..' . '/core/Command/TaskProcessing/ListCommand.php',

tests/lib/TaskProcessing/TaskProcessingTest.php

@@ -948,6 +948,25 @@ public function testOldTasksShouldBeCleanedUp(): void {
 			$timeFactory,
 		);
 
+		$manager = new Manager(
+			$this->appConfig,
+			$this->coordinator,
+			$this->serverContainer,
+			Server::get(LoggerInterface::class),
+			$this->taskMapper,
+			$this->jobList,
+			$this->eventDispatcher,
+			Server::get(IAppDataFactory::class),
+			Server::get(IRootFolder::class),
+			Server::get(\OC\TextToImage\Manager::class),
+			$this->userMountCache,
+			Server::get(IClientService::class),
+			Server::get(IAppManager::class),
+			Server::get(IUserManager::class),
+			Server::get(IUserSession::class),
+			Server::get(ICacheFactory::class),
+		);
+
 		$this->registrationContext->expects($this->any())->method('getTaskProcessingProviders')->willReturn([
 			new ServiceRegistration('test', SuccessfulSyncProvider::class)
 		]);
@@ -972,7 +991,8 @@ public function testOldTasksShouldBeCleanedUp(): void {
 		// run background job
 		$bgJob = new RemoveOldTasksBackgroundJob(
 			$timeFactory,
-			$this->manager,
+			// use a locally defined manager to make sure the taskMapper uses the mocked timeFactory
+			$manager,
 		);
 		$bgJob->setArgument([]);
 		$bgJob->start($this->jobList);