Fix many tests and warnings

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

Author: CarlSchwan

apps/files_trashbin/tests/BackgroundJob/ExpireTrashTest.php

@@ -48,9 +48,6 @@ class ExpireTrashTest extends TestCase {
 	/** @var IJobList|MockObject */
 	private $jobList;
 
-	/** @var LoggerInterface|MockObject */
-	private $logger;
-
 	/** @var ITimeFactory|MockObject */
 	private $time;
 
@@ -61,8 +58,10 @@ protected function setUp(): void {
 		$this->userManager = $this->createMock(IUserManager::class);
 		$this->expiration = $this->createMock(Expiration::class);
 		$this->jobList = $this->createMock(IJobList::class);
-		$this->logger = $this->createMock(ILogger::class);
+
 		$this->time = $this->createMock(ITimeFactory::class);
+		$this->time->method('getTime')
+			->willReturn(99999999999);
 
 		$this->jobList->expects($this->once())
 			->method('setLastRun');
@@ -71,8 +70,12 @@ protected function setUp(): void {
 	}
 
 	public function testConstructAndRun(): void {
-		$job = new ExpireTrash($this->config, $this->userManager, $this->expiration);
-		$job->execute($this->jobList, $this->logger);
+		$this->config->method('getAppValue')
+			->with('files_trashbin', 'background_job_expire_trash', 'yes')
+			->willReturn('yes');
+
+		$job = new ExpireTrash($this->config, $this->userManager, $this->expiration, $this->time);
+		$job->start($this->jobList);
 	}
 
 	public function testBackgroundJobDeactivated(): void {

apps/files_versions/tests/BackgroundJob/ExpireVersionsTest.php

@@ -28,7 +28,6 @@
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
 use OCP\IConfig;
-use OCP\ILogger;
 use OCP\IUserManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
@@ -68,7 +67,12 @@ public function testBackgroundJobDeactivated(): void {
 		$this->expiration->expects($this->never())
 			->method('getMaxAgeAsTimestamp');
 
-		$job = new ExpireVersions($this->config, $this->userManager, $this->expiration, $this->createMock(ITimeFactory::class));
+		$timeFactory = $this->createMock(ITimeFactory::class);
+		$timeFactory->method('getTime')
+			->with()
+			->willReturn(99999999999);
+
+		$job = new ExpireVersions($this->config, $this->userManager, $this->expiration, $timeFactory);
 		$job->start($this->jobList);
 	}
 }

apps/updatenotification/tests/Settings/AdminTest.php

@@ -36,13 +36,16 @@
 use OCP\IDateTimeFormatter;
 use OCP\IGroup;
 use OCP\IGroupManager;
+use OCP\IUserManager;
 use OCP\L10N\IFactory;
 use OCP\L10N\ILanguageIterator;
 use OCP\Support\Subscription\IRegistry;
+use OCP\UserInterface;
+use OCP\User\Backend\ICountUsersBackend;
 use OCP\Util;
-use Test\TestCase;
-use OCP\IUserManager;
+use OC\User\Backend;
 use Psr\Log\LoggerInterface;
+use Test\TestCase;
 
 class AdminTest extends TestCase {
 	/** @var IFactory|\PHPUnit\Framework\MockObject\MockObject */
@@ -89,9 +92,9 @@ protected function setUp(): void {
 	}
 
 	public function testGetFormWithUpdate() {
-		$backend1 = $this->createMock(UserInterface::class);
-		$backend2 = $this->createMock(UserInterface::class);
-		$backend3 = $this->createMock(UserInterface::class);
+		$backend1 = $this->createMock(CountUsersBackend::class);
+		$backend2 = $this->createMock(CountUsersBackend::class);
+		$backend3 = $this->createMock(CountUsersBackend::class);
 		$backend1
 			->expects($this->once())
 			->method('implementsActions')
@@ -213,9 +216,9 @@ public function testGetFormWithUpdate() {
 	}
 
 	public function testGetFormWithUpdateAndChangedUpdateServer() {
-		$backend1 = $this->createMock(UserInterface::class);
-		$backend2 = $this->createMock(UserInterface::class);
-		$backend3 = $this->createMock(UserInterface::class);
+		$backend1 = $this->createMock(CountUsersBackend::class);
+		$backend2 = $this->createMock(CountUsersBackend::class);
+		$backend3 = $this->createMock(CountUsersBackend::class);
 		$backend1
 			->expects($this->once())
 			->method('implementsActions')
@@ -337,9 +340,9 @@ public function testGetFormWithUpdateAndChangedUpdateServer() {
 	}
 
 	public function testGetFormWithUpdateAndCustomersUpdateServer() {
-		$backend1 = $this->createMock(UserInterface::class);
-		$backend2 = $this->createMock(UserInterface::class);
-		$backend3 = $this->createMock(UserInterface::class);
+		$backend1 = $this->createMock(CountUsersBackend::class);
+		$backend2 = $this->createMock(CountUsersBackend::class);
+		$backend3 = $this->createMock(CountUsersBackend::class);
 		$backend1
 			->expects($this->once())
 			->method('implementsActions')
@@ -543,3 +546,7 @@ public function testFilterChanges($changes, $userLang, $expectation) {
 		$this->assertSame($expectation, $result);
 	}
 }
+
+abstract class CountUsersBackend implements UserInterface, ICountUsersBackend {
+
+}

lib/private/BackgroundJob/Legacy/QueuedJob.php

@@ -21,7 +21,7 @@
  */
 namespace OC\Command;
 
-use OCP\BackgroundJob\QueuedJob;
+use OC\BackgroundJob\QueuedJob;
 
 class CallableJob extends QueuedJob {
 	protected function run($serializedCallable) {

lib/private/BackgroundJob/Legacy/RegularJob.php

@@ -22,7 +22,7 @@
  */
 namespace OC\Command;
 
-use OCP\BackgroundJob\QueuedJob;
+use OC\BackgroundJob\QueuedJob;
 use Laravel\SerializableClosure\SerializableClosure as LaravelClosure;
 use Opis\Closure\SerializableClosure as OpisClosure;
 

lib/private/Command/CallableJob.php

@@ -22,7 +22,7 @@
  */
 namespace OC\Command;
 
-use OCP\BackgroundJob\QueuedJob;
+use OC\BackgroundJob\QueuedJob;
 use OCP\Command\ICommand;
 
 /**

lib/private/Command/ClosureJob.php

@@ -35,6 +35,7 @@ function is_uploaded_file($filename) {
 use OC\Core\Controller\AvatarController;
 use OCP\AppFramework\Http;
 use OCP\Files\File;
+use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;

lib/private/Command/CommandJob.php

@@ -35,7 +35,7 @@ protected function setUp(): void {
 			->willReturn('5.4.3');
 		$this->platformMock->expects($this->any())
 			->method('getIntSize')
-			->willReturn('4');
+			->willReturn(4);
 		$this->platformMock->expects($this->any())
 			->method('getDatabase')
 			->willReturn('mysql');