Merge pull request #730 from nextcloud/backport/729/stable22

[stable22] Make background job time insensitive

lib/BackgroundJob/ExpireActivities.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
@@ -22,34 +24,31 @@
 
 namespace OCA\Activity\BackgroundJob;
 
-use OC\BackgroundJob\TimedJob;
 use OCA\Activity\Data;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\TimedJob;
 use OCP\IConfig;
 
-/**
- * Class ExpireActivities
- *
- * @package OCA\Activity\BackgroundJob
- */
 class ExpireActivities extends TimedJob {
 	/** @var Data */
 	protected $data;
 	/** @var IConfig */
 	protected $config;
 
-	/**
-	 * @param Data $data
-	 * @param IConfig $config
-	 */
-	public function __construct(Data $data, IConfig $config) {
+	public function __construct(ITimeFactory $time,
+								Data $data,
+								IConfig $config) {
+		parent::__construct($time);
+
 		// Run once per day
 		$this->setInterval(60 * 60 * 24);
+		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
 
 		$this->data = $data;
 		$this->config = $config;
 	}
 
-	protected function run($argument) {
+	protected function run($argument): void {
 		// Remove activities that are older then one year
 		$expireDays = $this->config->getSystemValue('activity_expire_days', 365);
 		$this->data->expire($expireDays);

tests/AppInfo/ApplicationTest.php

@@ -104,7 +104,7 @@ public function queryData(): array {
 			[EmailNotification::class],
 			[EmailNotification::class, TimedJob::class],
 			[ExpireActivities::class,],
-			[ExpireActivities::class, TimedJob::class],
+			[ExpireActivities::class, \OCP\BackgroundJob\TimedJob::class],
 
 			// Controller
 			[ActivitiesController::class],
@@ -131,6 +131,6 @@ public function testContainerQuery(string $service, ?string $expected = null): v
 		if ($expected === null) {
 			$expected = $service;
 		}
-		$this->assertInstanceOf($expected, $this->container->query($service));
+		$this->assertInstanceOf($expected, $this->container->get($service));
 	}
 }

tests/BackgroundJob/ExpireActivitiesTest.php

@@ -28,6 +28,7 @@
 use OCA\Activity\BackgroundJob\ExpireActivities;
 use OCA\Activity\Data;
 use OCA\Activity\Tests\TestCase;
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IConfig;
 use OCP\BackgroundJob\IJobList;
 
@@ -40,6 +41,7 @@
 class ExpireActivitiesTest extends TestCase {
 	public function testExecute(): void {
 		$backgroundJob = new ExpireActivities(
+			$this->createMock(ITimeFactory::class),
 			$this->createMock(Data::class),
 			$this->createMock(IConfig::class)
 		);

tests/DataDeleteActivitiesTest.php

@@ -29,6 +29,7 @@
 use OCA\Activity\BackgroundJob\ExpireActivities;
 use OCA\Activity\Data;
 use OCP\Activity\IExtension;
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\DB\IPreparedStatement;
 use OCP\IConfig;
 use OCP\IUserSession;
@@ -107,10 +108,15 @@ public function testDeleteActivities(array $condition, array $expected): void {
 
 	public function testExpireActivities(): void {
 		$config = $this->createMock(IConfig::class);
+		$time = $this->createMock(ITimeFactory::class);
+		$time->method('getTime')
+			->willReturn(time());
 		$backgroundjob = new ExpireActivities(
+			$time,
 			$this->data,
 			$config
 		);
+		$backgroundjob->setId(1);
 		$this->assertUserActivities(['delete', 'otherUser']);
 		$jobList = $this->createMock(IJobList::class);
 		$backgroundjob->execute($jobList);