nextcloud / server

apps/user_status/tests/Unit/Service/PredefinedStatusServiceTest.php

Indentation +161 added lines, -161 removed lines

@@ -14,165 +14,165 @@
 use Test\TestCase;
 
 class PredefinedStatusServiceTest extends TestCase {
-	protected IL10N&MockObject $l10n;
-	protected PredefinedStatusService $service;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->l10n = $this->createMock(IL10N::class);
-
-		$this->service = new PredefinedStatusService($this->l10n);
-	}
-
-	public function testGetDefaultStatuses(): void {
-		$this->l10n->expects($this->exactly(7))
-			->method('t')
-			->willReturnCallback(function ($text, $parameters = []) {
-				return vsprintf($text, $parameters);
-			});
-
-		$actual = $this->service->getDefaultStatuses();
-		$this->assertEquals([
-			[
-				'id' => 'meeting',
-				'icon' => '

apps/user_status/tests/Unit/Dashboard/UserStatusWidgetTest.php

Indentation +37 added lines, -37 removed lines

@@ -20,50 +20,50 @@
 use Test\TestCase;
 
 class UserStatusWidgetTest extends TestCase {
-	private IL10N&MockObject $l10n;
-	private IDateTimeFormatter&MockObject $dateTimeFormatter;
-	private IURLGenerator&MockObject $urlGenerator;
-	private IInitialState&MockObject $initialState;
-	private IUserManager&MockObject $userManager;
-	private IUserSession&MockObject $userSession;
-	private StatusService&MockObject $service;
-	private UserStatusWidget $widget;
+    private IL10N&MockObject $l10n;
+    private IDateTimeFormatter&MockObject $dateTimeFormatter;
+    private IURLGenerator&MockObject $urlGenerator;
+    private IInitialState&MockObject $initialState;
+    private IUserManager&MockObject $userManager;
+    private IUserSession&MockObject $userSession;
+    private StatusService&MockObject $service;
+    private UserStatusWidget $widget;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->l10n = $this->createMock(IL10N::class);
-		$this->dateTimeFormatter = $this->createMock(IDateTimeFormatter::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->initialState = $this->createMock(IInitialState::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->service = $this->createMock(StatusService::class);
+        $this->l10n = $this->createMock(IL10N::class);
+        $this->dateTimeFormatter = $this->createMock(IDateTimeFormatter::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->initialState = $this->createMock(IInitialState::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->service = $this->createMock(StatusService::class);
 
-		$this->widget = new UserStatusWidget($this->l10n, $this->dateTimeFormatter, $this->urlGenerator, $this->initialState, $this->userManager, $this->userSession, $this->service);
-	}
+        $this->widget = new UserStatusWidget($this->l10n, $this->dateTimeFormatter, $this->urlGenerator, $this->initialState, $this->userManager, $this->userSession, $this->service);
+    }
 
-	public function testGetId(): void {
-		$this->assertEquals('user_status', $this->widget->getId());
-	}
+    public function testGetId(): void {
+        $this->assertEquals('user_status', $this->widget->getId());
+    }
 
-	public function testGetTitle(): void {
-		$this->l10n->expects($this->exactly(1))
-			->method('t')
-			->willReturnArgument(0);
+    public function testGetTitle(): void {
+        $this->l10n->expects($this->exactly(1))
+            ->method('t')
+            ->willReturnArgument(0);
 
-		$this->assertEquals('Recent statuses', $this->widget->getTitle());
-	}
+        $this->assertEquals('Recent statuses', $this->widget->getTitle());
+    }
 
-	public function testGetOrder(): void {
-		$this->assertEquals(5, $this->widget->getOrder());
-	}
+    public function testGetOrder(): void {
+        $this->assertEquals(5, $this->widget->getOrder());
+    }
 
-	public function testGetIconClass(): void {
-		$this->assertEquals('icon-user-status-dark', $this->widget->getIconClass());
-	}
+    public function testGetIconClass(): void {
+        $this->assertEquals('icon-user-status-dark', $this->widget->getIconClass());
+    }
 
-	public function testGetUrl(): void {
-		$this->assertNull($this->widget->getUrl());
-	}
+    public function testGetUrl(): void {
+        $this->assertNull($this->widget->getUrl());
+    }
 }

apps/user_status/tests/Unit/Listener/UserDeletedListenerTest.php

Indentation +24 added lines, -24 removed lines

@@ -17,35 +17,35 @@
 use Test\TestCase;
 
 class UserDeletedListenerTest extends TestCase {
-	private StatusService&MockObject $service;
-	private UserDeletedListener $listener;
+    private StatusService&MockObject $service;
+    private UserDeletedListener $listener;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->service = $this->createMock(StatusService::class);
-		$this->listener = new UserDeletedListener($this->service);
-	}
+        $this->service = $this->createMock(StatusService::class);
+        $this->listener = new UserDeletedListener($this->service);
+    }
 
-	public function testHandleWithCorrectEvent(): void {
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->once())
-			->method('getUID')
-			->willReturn('john.doe');
+    public function testHandleWithCorrectEvent(): void {
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->once())
+            ->method('getUID')
+            ->willReturn('john.doe');
 
-		$this->service->expects($this->once())
-			->method('removeUserStatus')
-			->with('john.doe');
+        $this->service->expects($this->once())
+            ->method('removeUserStatus')
+            ->with('john.doe');
 
-		$event = new UserDeletedEvent($user);
-		$this->listener->handle($event);
-	}
+        $event = new UserDeletedEvent($user);
+        $this->listener->handle($event);
+    }
 
-	public function testHandleWithWrongEvent(): void {
-		$this->service->expects($this->never())
-			->method('removeUserStatus');
+    public function testHandleWithWrongEvent(): void {
+        $this->service->expects($this->never())
+            ->method('removeUserStatus');
 
-		$event = new GenericEvent();
-		$this->listener->handle($event);
-	}
+        $event = new GenericEvent();
+        $this->listener->handle($event);
+    }
 }

apps/user_status/tests/Unit/Listener/UserLiveStatusListenerTest.php

Indentation +125 added lines, -125 removed lines

@@ -23,129 +23,129 @@
 use Test\TestCase;
 
 class UserLiveStatusListenerTest extends TestCase {
-	private UserStatusMapper&MockObject $mapper;
-	private StatusService&MockObject $statusService;
-	private ITimeFactory&MockObject $timeFactory;
-	private CalendarStatusService&MockObject $calendarStatusService;
-
-	private LoggerInterface&MockObject $logger;
-	private UserLiveStatusListener $listener;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->mapper = $this->createMock(UserStatusMapper::class);
-		$this->statusService = $this->createMock(StatusService::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->calendarStatusService = $this->createMock(CalendarStatusService::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-
-		$this->listener = new UserLiveStatusListener(
-			$this->mapper,
-			$this->statusService,
-			$this->timeFactory,
-			$this->calendarStatusService,
-			$this->logger,
-		);
-	}
-
-	/**
-	 * @dataProvider handleEventWithCorrectEventDataProvider
-	 */
-	public function testHandleWithCorrectEvent(
-		string $userId,
-		string $previousStatus,
-		int $previousTimestamp,
-		bool $previousIsUserDefined,
-		string $eventStatus,
-		int $eventTimestamp,
-		bool $expectExisting,
-		bool $expectUpdate,
-	): void {
-		$userStatus = new UserStatus();
-
-		if ($expectExisting) {
-			$userStatus->setId(42);
-			$userStatus->setUserId($userId);
-			$userStatus->setStatus($previousStatus);
-			$userStatus->setStatusTimestamp($previousTimestamp);
-			$userStatus->setIsUserDefined($previousIsUserDefined);
-
-			$this->statusService->expects($this->once())
-				->method('findByUserId')
-				->with($userId)
-				->willReturn($userStatus);
-		} else {
-			$this->statusService->expects($this->once())
-				->method('findByUserId')
-				->with($userId)
-				->willThrowException(new DoesNotExistException(''));
-		}
-
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn($userId);
-		$event = new UserLiveStatusEvent($user, $eventStatus, $eventTimestamp);
-
-		$this->timeFactory->expects($this->atMost(1))
-			->method('getTime')
-			->willReturn(5000);
-
-		if ($expectUpdate) {
-			if ($expectExisting) {
-				$this->mapper->expects($this->never())
-					->method('insert');
-				$this->mapper->expects($this->once())
-					->method('update')
-					->with($this->callback(function ($userStatus) use ($eventStatus, $eventTimestamp) {
-						$this->assertEquals($eventStatus, $userStatus->getStatus());
-						$this->assertEquals($eventTimestamp, $userStatus->getStatusTimestamp());
-						$this->assertFalse($userStatus->getIsUserDefined());
-
-						return true;
-					}));
-			} else {
-				$this->mapper->expects($this->once())
-					->method('insert')
-					->with($this->callback(function ($userStatus) use ($eventStatus, $eventTimestamp) {
-						$this->assertEquals($eventStatus, $userStatus->getStatus());
-						$this->assertEquals($eventTimestamp, $userStatus->getStatusTimestamp());
-						$this->assertFalse($userStatus->getIsUserDefined());
-
-						return true;
-					}));
-				$this->mapper->expects($this->never())
-					->method('update');
-			}
-
-			$this->listener->handle($event);
-		} else {
-			$this->mapper->expects($this->never())
-				->method('insert');
-			$this->mapper->expects($this->never())
-				->method('update');
-
-			$this->listener->handle($event);
-		}
-	}
-
-	public static function handleEventWithCorrectEventDataProvider(): array {
-		return [
-			['john.doe', 'offline', 0, false, 'online', 5000, true, true],
-			['john.doe', 'offline', 0, false, 'online', 5000, false, true],
-			['john.doe', 'online', 5000, false, 'online', 5000, true, false],
-			['john.doe', 'online', 5000, false, 'online', 5000, false, true],
-			['john.doe', 'away', 5000, false, 'online', 5000, true, true],
-			['john.doe', 'online', 5000, false, 'away', 5000, true, false],
-			['john.doe', 'away', 5000, true, 'online', 5000, true, false],
-			['john.doe', 'online', 5000, true, 'away', 5000, true, false],
-		];
-	}
-
-	public function testHandleWithWrongEvent(): void {
-		$this->mapper->expects($this->never())
-			->method('insertOrUpdate');
-
-		$event = new GenericEvent();
-		$this->listener->handle($event);
-	}
+    private UserStatusMapper&MockObject $mapper;
+    private StatusService&MockObject $statusService;
+    private ITimeFactory&MockObject $timeFactory;
+    private CalendarStatusService&MockObject $calendarStatusService;
+
+    private LoggerInterface&MockObject $logger;
+    private UserLiveStatusListener $listener;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->mapper = $this->createMock(UserStatusMapper::class);
+        $this->statusService = $this->createMock(StatusService::class);
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->calendarStatusService = $this->createMock(CalendarStatusService::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+
+        $this->listener = new UserLiveStatusListener(
+            $this->mapper,
+            $this->statusService,
+            $this->timeFactory,
+            $this->calendarStatusService,
+            $this->logger,
+        );
+    }
+
+    /**
+     * @dataProvider handleEventWithCorrectEventDataProvider
+     */
+    public function testHandleWithCorrectEvent(
+        string $userId,
+        string $previousStatus,
+        int $previousTimestamp,
+        bool $previousIsUserDefined,
+        string $eventStatus,
+        int $eventTimestamp,
+        bool $expectExisting,
+        bool $expectUpdate,
+    ): void {
+        $userStatus = new UserStatus();
+
+        if ($expectExisting) {
+            $userStatus->setId(42);
+            $userStatus->setUserId($userId);
+            $userStatus->setStatus($previousStatus);
+            $userStatus->setStatusTimestamp($previousTimestamp);
+            $userStatus->setIsUserDefined($previousIsUserDefined);
+
+            $this->statusService->expects($this->once())
+                ->method('findByUserId')
+                ->with($userId)
+                ->willReturn($userStatus);
+        } else {
+            $this->statusService->expects($this->once())
+                ->method('findByUserId')
+                ->with($userId)
+                ->willThrowException(new DoesNotExistException(''));
+        }
+
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')->willReturn($userId);
+        $event = new UserLiveStatusEvent($user, $eventStatus, $eventTimestamp);
+
+        $this->timeFactory->expects($this->atMost(1))
+            ->method('getTime')
+            ->willReturn(5000);
+
+        if ($expectUpdate) {
+            if ($expectExisting) {
+                $this->mapper->expects($this->never())
+                    ->method('insert');
+                $this->mapper->expects($this->once())
+                    ->method('update')
+                    ->with($this->callback(function ($userStatus) use ($eventStatus, $eventTimestamp) {
+                        $this->assertEquals($eventStatus, $userStatus->getStatus());
+                        $this->assertEquals($eventTimestamp, $userStatus->getStatusTimestamp());
+                        $this->assertFalse($userStatus->getIsUserDefined());
+
+                        return true;
+                    }));
+            } else {
+                $this->mapper->expects($this->once())
+                    ->method('insert')
+                    ->with($this->callback(function ($userStatus) use ($eventStatus, $eventTimestamp) {
+                        $this->assertEquals($eventStatus, $userStatus->getStatus());
+                        $this->assertEquals($eventTimestamp, $userStatus->getStatusTimestamp());
+                        $this->assertFalse($userStatus->getIsUserDefined());
+
+                        return true;
+                    }));
+                $this->mapper->expects($this->never())
+                    ->method('update');
+            }
+
+            $this->listener->handle($event);
+        } else {
+            $this->mapper->expects($this->never())
+                ->method('insert');
+            $this->mapper->expects($this->never())
+                ->method('update');
+
+            $this->listener->handle($event);
+        }
+    }
+
+    public static function handleEventWithCorrectEventDataProvider(): array {
+        return [
+            ['john.doe', 'offline', 0, false, 'online', 5000, true, true],
+            ['john.doe', 'offline', 0, false, 'online', 5000, false, true],
+            ['john.doe', 'online', 5000, false, 'online', 5000, true, false],
+            ['john.doe', 'online', 5000, false, 'online', 5000, false, true],
+            ['john.doe', 'away', 5000, false, 'online', 5000, true, true],
+            ['john.doe', 'online', 5000, false, 'away', 5000, true, false],
+            ['john.doe', 'away', 5000, true, 'online', 5000, true, false],
+            ['john.doe', 'online', 5000, true, 'away', 5000, true, false],
+        ];
+    }
+
+    public function testHandleWithWrongEvent(): void {
+        $this->mapper->expects($this->never())
+            ->method('insertOrUpdate');
+
+        $event = new GenericEvent();
+        $this->listener->handle($event);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
 					->method('insert');
 				$this->mapper->expects($this->once())
 					->method('update')
-					->with($this->callback(function ($userStatus) use ($eventStatus, $eventTimestamp) {
+					->with($this->callback(function($userStatus) use ($eventStatus, $eventTimestamp) {
 						$this->assertEquals($eventStatus, $userStatus->getStatus());
 						$this->assertEquals($eventTimestamp, $userStatus->getStatusTimestamp());
 						$this->assertFalse($userStatus->getIsUserDefined());
@@ -106,7 +106,7 @@ 
 			} else {
 				$this->mapper->expects($this->once())
 					->method('insert')
-					->with($this->callback(function ($userStatus) use ($eventStatus, $eventTimestamp) {
+					->with($this->callback(function($userStatus) use ($eventStatus, $eventTimestamp) {
 						$this->assertEquals($eventStatus, $userStatus->getStatus());
 						$this->assertEquals($eventTimestamp, $userStatus->getStatusTimestamp());
 						$this->assertFalse($userStatus->getIsUserDefined());

apps/user_status/tests/Unit/BackgroundJob/ClearOldStatusesBackgroundJobTest.php

Indentation +20 added lines, -20 removed lines

@@ -15,30 +15,30 @@
 use Test\TestCase;
 
 class ClearOldStatusesBackgroundJobTest extends TestCase {
-	private ITimeFactory&MockObject $time;
-	private UserStatusMapper&MockObject $mapper;
-	private ClearOldStatusesBackgroundJob $job;
+    private ITimeFactory&MockObject $time;
+    private UserStatusMapper&MockObject $mapper;
+    private ClearOldStatusesBackgroundJob $job;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->time = $this->createMock(ITimeFactory::class);
-		$this->mapper = $this->createMock(UserStatusMapper::class);
+        $this->time = $this->createMock(ITimeFactory::class);
+        $this->mapper = $this->createMock(UserStatusMapper::class);
 
-		$this->job = new ClearOldStatusesBackgroundJob($this->time, $this->mapper);
-	}
+        $this->job = new ClearOldStatusesBackgroundJob($this->time, $this->mapper);
+    }
 
-	public function testRun(): void {
-		$this->mapper->expects($this->once())
-			->method('clearOlderThanClearAt')
-			->with(1337);
-		$this->mapper->expects($this->once())
-			->method('clearStatusesOlderThan')
-			->with(437, 1337);
+    public function testRun(): void {
+        $this->mapper->expects($this->once())
+            ->method('clearOlderThanClearAt')
+            ->with(1337);
+        $this->mapper->expects($this->once())
+            ->method('clearStatusesOlderThan')
+            ->with(437, 1337);
 
-		$this->time->method('getTime')
-			->willReturn(1337);
+        $this->time->method('getTime')
+            ->willReturn(1337);
 
-		self::invokePrivate($this->job, 'run', [[]]);
-	}
+        self::invokePrivate($this->job, 'run', [[]]);
+    }
 }

apps/user_status/tests/Unit/CapabilitiesTest.php

Indentation +33 added lines, -33 removed lines

@@ -14,37 +14,37 @@
 use Test\TestCase;
 
 class CapabilitiesTest extends TestCase {
-	private IEmojiHelper&MockObject $emojiHelper;
-	private Capabilities $capabilities;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->emojiHelper = $this->createMock(IEmojiHelper::class);
-		$this->capabilities = new Capabilities($this->emojiHelper);
-	}
-
-	/**
-	 * @dataProvider getCapabilitiesDataProvider
-	 */
-	public function testGetCapabilities(bool $supportsEmojis): void {
-		$this->emojiHelper->expects($this->once())
-			->method('doesPlatformSupportEmoji')
-			->willReturn($supportsEmojis);
-
-		$this->assertEquals([
-			'user_status' => [
-				'enabled' => true,
-				'restore' => true,
-				'supports_emoji' => $supportsEmojis,
-			]
-		], $this->capabilities->getCapabilities());
-	}
-
-	public static function getCapabilitiesDataProvider(): array {
-		return [
-			[true],
-			[false],
-		];
-	}
+    private IEmojiHelper&MockObject $emojiHelper;
+    private Capabilities $capabilities;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->emojiHelper = $this->createMock(IEmojiHelper::class);
+        $this->capabilities = new Capabilities($this->emojiHelper);
+    }
+
+    /**
+     * @dataProvider getCapabilitiesDataProvider
+     */
+    public function testGetCapabilities(bool $supportsEmojis): void {
+        $this->emojiHelper->expects($this->once())
+            ->method('doesPlatformSupportEmoji')
+            ->willReturn($supportsEmojis);
+
+        $this->assertEquals([
+            'user_status' => [
+                'enabled' => true,
+                'restore' => true,
+                'supports_emoji' => $supportsEmojis,
+            ]
+        ], $this->capabilities->getCapabilities());
+    }
+
+    public static function getCapabilitiesDataProvider(): array {
+        return [
+            [true],
+            [false],
+        ];
+    }
 }

apps/files_external/tests/Storage/SmbTest.php

Indentation +151 added lines, -151 removed lines

@@ -20,155 +20,155 @@
  * @package OCA\Files_External\Tests\Storage
  */
 class SmbTest extends \Test\Files\Storage\Storage {
-	/**
-	 * @var SMB instance
-	 */
-	protected $instance;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$id = $this->getUniqueID();
-		$config = include('files_external/tests/config.smb.php');
-		if (!is_array($config) or !$config['run']) {
-			$this->markTestSkipped('Samba backend not configured');
-		}
-		if (substr($config['root'], -1, 1) != '/') {
-			$config['root'] .= '/';
-		}
-		$config['root'] .= $id; //make sure we have an new empty folder to work in
-		$this->instance = new SMB($config);
-		$this->instance->mkdir('/');
-	}
-
-	protected function tearDown(): void {
-		if ($this->instance) {
-			$this->instance->rmdir('');
-		}
-
-		parent::tearDown();
-	}
-
-	public static function directoryProvider(): array {
-		// doesn't support leading/trailing spaces
-		return [['folder']];
-	}
-
-	public function testRenameWithSpaces(): void {
-		$this->instance->mkdir('with spaces');
-		$result = $this->instance->rename('with spaces', 'foo bar');
-		$this->assertTrue($result);
-		$this->assertTrue($this->instance->is_dir('foo bar'));
-	}
-
-	public function testStorageId(): void {
-		$this->instance = new SMB([
-			'host' => 'testhost',
-			'user' => 'testuser',
-			'password' => 'somepass',
-			'share' => 'someshare',
-			'root' => 'someroot',
-		]);
-		$this->assertEquals('smb::testuser@testhost//someshare//someroot/', $this->instance->getId());
-		$this->instance = null;
-	}
-
-	public function testNotifyGetChanges(): void {
-		$lastError = null;
-		for ($i = 0; $i < 5; $i++) {
-			try {
-				$this->tryTestNotifyGetChanges();
-				return;
-			} catch (ExpectationFailedException $e) {
-				$lastError = $e;
-				$this->tearDown();
-				$this->setUp();
-				sleep(1);
-			}
-		}
-		throw $lastError;
-	}
-
-	private function tryTestNotifyGetChanges(): void {
-		$notifyHandler = $this->instance->notify('');
-		sleep(1); //give time for the notify to start
-		$this->instance->file_put_contents('/newfile.txt', 'test content');
-		sleep(1);
-		$this->instance->rename('/newfile.txt', 'renamed.txt');
-		sleep(1);
-		$this->instance->unlink('/renamed.txt');
-		sleep(1); //time for all changes to be processed
-
-		/** @var IChange[] $changes */
-		$changes = [];
-		$count = 0;
-		// wait up to 10 seconds for incoming changes
-		while (count($changes) < 3 && $count < 10) {
-			$changes = array_merge($changes, $notifyHandler->getChanges());
-			$count++;
-			sleep(1);
-		}
-		$notifyHandler->stop();
-
-		// depending on the server environment, the initial create might be detected as a change instead
-		if ($changes[0]->getType() === IChange::MODIFIED) {
-			$expected = [
-				new Change(IChange::MODIFIED, 'newfile.txt'),
-				new RenameChange(IChange::RENAMED, 'newfile.txt', 'renamed.txt'),
-				new Change(IChange::REMOVED, 'renamed.txt')
-			];
-		} else {
-			$expected = [
-				new Change(IChange::ADDED, 'newfile.txt'),
-				new RenameChange(IChange::RENAMED, 'newfile.txt', 'renamed.txt'),
-				new Change(IChange::REMOVED, 'renamed.txt')
-			];
-		}
-
-		foreach ($expected as $expectedChange) {
-			$this->assertTrue(in_array($expectedChange, $changes), "Expected changes are:\n" . print_r($expected, true) . PHP_EOL . 'Expected to find: ' . PHP_EOL . print_r($expectedChange, true) . "\nGot:\n" . print_r($changes, true));
-		}
-	}
-
-	public function testNotifyListen(): void {
-		$notifyHandler = $this->instance->notify('');
-		usleep(100 * 1000); //give time for the notify to start
-		$this->instance->file_put_contents('/newfile.txt', 'test content');
-		$this->instance->unlink('/newfile.txt');
-		usleep(100 * 1000); //time for all changes to be processed
-
-		$result = null;
-
-		// since the notify handler buffers until we start listening we will get the above changes
-		$notifyHandler->listen(function (IChange $change) use (&$result) {
-			$result = $change;
-			return false;//stop listening
-		});
-
-		// depending on the server environment, the initial create might be detected as a change instead
-		if ($result->getType() === IChange::ADDED) {
-			$this->assertEquals(new Change(IChange::ADDED, 'newfile.txt'), $result);
-		} else {
-			$this->assertEquals(new Change(IChange::MODIFIED, 'newfile.txt'), $result);
-		}
-	}
-
-	public function testRenameRoot(): void {
-		// root can't be renamed
-		$this->assertFalse($this->instance->rename('', 'foo1'));
-
-		$this->instance->mkdir('foo2');
-		$this->assertFalse($this->instance->rename('foo2', ''));
-		$this->instance->rmdir('foo2');
-	}
-
-	public function testUnlinkRoot(): void {
-		// root can't be deleted
-		$this->assertFalse($this->instance->unlink(''));
-	}
-
-	public function testRmdirRoot(): void {
-		// root can't be deleted
-		$this->assertFalse($this->instance->rmdir(''));
-	}
+    /**
+     * @var SMB instance
+     */
+    protected $instance;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $id = $this->getUniqueID();
+        $config = include('files_external/tests/config.smb.php');
+        if (!is_array($config) or !$config['run']) {
+            $this->markTestSkipped('Samba backend not configured');
+        }
+        if (substr($config['root'], -1, 1) != '/') {
+            $config['root'] .= '/';
+        }
+        $config['root'] .= $id; //make sure we have an new empty folder to work in
+        $this->instance = new SMB($config);
+        $this->instance->mkdir('/');
+    }
+
+    protected function tearDown(): void {
+        if ($this->instance) {
+            $this->instance->rmdir('');
+        }
+
+        parent::tearDown();
+    }
+
+    public static function directoryProvider(): array {
+        // doesn't support leading/trailing spaces
+        return [['folder']];
+    }
+
+    public function testRenameWithSpaces(): void {
+        $this->instance->mkdir('with spaces');
+        $result = $this->instance->rename('with spaces', 'foo bar');
+        $this->assertTrue($result);
+        $this->assertTrue($this->instance->is_dir('foo bar'));
+    }
+
+    public function testStorageId(): void {
+        $this->instance = new SMB([
+            'host' => 'testhost',
+            'user' => 'testuser',
+            'password' => 'somepass',
+            'share' => 'someshare',
+            'root' => 'someroot',
+        ]);
+        $this->assertEquals('smb::testuser@testhost//someshare//someroot/', $this->instance->getId());
+        $this->instance = null;
+    }
+
+    public function testNotifyGetChanges(): void {
+        $lastError = null;
+        for ($i = 0; $i < 5; $i++) {
+            try {
+                $this->tryTestNotifyGetChanges();
+                return;
+            } catch (ExpectationFailedException $e) {
+                $lastError = $e;
+                $this->tearDown();
+                $this->setUp();
+                sleep(1);
+            }
+        }
+        throw $lastError;
+    }
+
+    private function tryTestNotifyGetChanges(): void {
+        $notifyHandler = $this->instance->notify('');
+        sleep(1); //give time for the notify to start
+        $this->instance->file_put_contents('/newfile.txt', 'test content');
+        sleep(1);
+        $this->instance->rename('/newfile.txt', 'renamed.txt');
+        sleep(1);
+        $this->instance->unlink('/renamed.txt');
+        sleep(1); //time for all changes to be processed
+
+        /** @var IChange[] $changes */
+        $changes = [];
+        $count = 0;
+        // wait up to 10 seconds for incoming changes
+        while (count($changes) < 3 && $count < 10) {
+            $changes = array_merge($changes, $notifyHandler->getChanges());
+            $count++;
+            sleep(1);
+        }
+        $notifyHandler->stop();
+
+        // depending on the server environment, the initial create might be detected as a change instead
+        if ($changes[0]->getType() === IChange::MODIFIED) {
+            $expected = [
+                new Change(IChange::MODIFIED, 'newfile.txt'),
+                new RenameChange(IChange::RENAMED, 'newfile.txt', 'renamed.txt'),
+                new Change(IChange::REMOVED, 'renamed.txt')
+            ];
+        } else {
+            $expected = [
+                new Change(IChange::ADDED, 'newfile.txt'),
+                new RenameChange(IChange::RENAMED, 'newfile.txt', 'renamed.txt'),
+                new Change(IChange::REMOVED, 'renamed.txt')
+            ];
+        }
+
+        foreach ($expected as $expectedChange) {
+            $this->assertTrue(in_array($expectedChange, $changes), "Expected changes are:\n" . print_r($expected, true) . PHP_EOL . 'Expected to find: ' . PHP_EOL . print_r($expectedChange, true) . "\nGot:\n" . print_r($changes, true));
+        }
+    }
+
+    public function testNotifyListen(): void {
+        $notifyHandler = $this->instance->notify('');
+        usleep(100 * 1000); //give time for the notify to start
+        $this->instance->file_put_contents('/newfile.txt', 'test content');
+        $this->instance->unlink('/newfile.txt');
+        usleep(100 * 1000); //time for all changes to be processed
+
+        $result = null;
+
+        // since the notify handler buffers until we start listening we will get the above changes
+        $notifyHandler->listen(function (IChange $change) use (&$result) {
+            $result = $change;
+            return false;//stop listening
+        });
+
+        // depending on the server environment, the initial create might be detected as a change instead
+        if ($result->getType() === IChange::ADDED) {
+            $this->assertEquals(new Change(IChange::ADDED, 'newfile.txt'), $result);
+        } else {
+            $this->assertEquals(new Change(IChange::MODIFIED, 'newfile.txt'), $result);
+        }
+    }
+
+    public function testRenameRoot(): void {
+        // root can't be renamed
+        $this->assertFalse($this->instance->rename('', 'foo1'));
+
+        $this->instance->mkdir('foo2');
+        $this->assertFalse($this->instance->rename('foo2', ''));
+        $this->instance->rmdir('foo2');
+    }
+
+    public function testUnlinkRoot(): void {
+        // root can't be deleted
+        $this->assertFalse($this->instance->unlink(''));
+    }
+
+    public function testRmdirRoot(): void {
+        // root can't be deleted
+        $this->assertFalse($this->instance->rmdir(''));
+    }
 }

apps/files_external/tests/Storage/FtpTest.php

Indentation +56 added lines, -56 removed lines

@@ -16,73 +16,73 @@
  * @package OCA\Files_External\Tests\Storage
  */
 class FtpTest extends \Test\Files\Storage\Storage {
-	private $config;
+    private $config;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$id = $this->getUniqueID();
-		$this->config = include('files_external/tests/config.ftp.php');
-		if (! is_array($this->config) or ! $this->config['run']) {
-			$this->markTestSkipped('FTP backend not configured');
-		}
-		$rootInstance = new FTP($this->config);
-		$rootInstance->mkdir($id);
+        $id = $this->getUniqueID();
+        $this->config = include('files_external/tests/config.ftp.php');
+        if (! is_array($this->config) or ! $this->config['run']) {
+            $this->markTestSkipped('FTP backend not configured');
+        }
+        $rootInstance = new FTP($this->config);
+        $rootInstance->mkdir($id);
 
-		$this->config['root'] .= '/' . $id; //make sure we have an new empty folder to work in
-		$this->instance = new FTP($this->config);
-	}
+        $this->config['root'] .= '/' . $id; //make sure we have an new empty folder to work in
+        $this->instance = new FTP($this->config);
+    }
 
-	protected function tearDown(): void {
-		if ($this->instance) {
-			$this->instance->rmdir('');
-		}
-		$this->instance = null;
+    protected function tearDown(): void {
+        if ($this->instance) {
+            $this->instance->rmdir('');
+        }
+        $this->instance = null;
 
-		parent::tearDown();
-	}
+        parent::tearDown();
+    }
 
-	/**
-	 * ftp has no proper way to handle spaces at the end of file names
-	 */
-	public static function directoryProvider(): array {
-		return array_filter(parent::directoryProvider(), function ($item) {
-			return substr($item[0], -1) !== ' ';
-		});
-	}
+    /**
+     * ftp has no proper way to handle spaces at the end of file names
+     */
+    public static function directoryProvider(): array {
+        return array_filter(parent::directoryProvider(), function ($item) {
+            return substr($item[0], -1) !== ' ';
+        });
+    }
 
 
-	/**
-	 * mtime for folders is only with a minute resolution
-	 */
-	public function testStat(): void {
-		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
-		$ctimeStart = time();
-		$this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
-		$this->assertTrue($this->instance->isReadable('/lorem.txt'));
-		$ctimeEnd = time();
-		$mTime = $this->instance->filemtime('/lorem.txt');
-		$this->assertTrue($this->instance->hasUpdated('/lorem.txt', $ctimeStart - 5));
-		$this->assertTrue($this->instance->hasUpdated('/', $ctimeStart - 61));
+    /**
+     * mtime for folders is only with a minute resolution
+     */
+    public function testStat(): void {
+        $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+        $ctimeStart = time();
+        $this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
+        $this->assertTrue($this->instance->isReadable('/lorem.txt'));
+        $ctimeEnd = time();
+        $mTime = $this->instance->filemtime('/lorem.txt');
+        $this->assertTrue($this->instance->hasUpdated('/lorem.txt', $ctimeStart - 5));
+        $this->assertTrue($this->instance->hasUpdated('/', $ctimeStart - 61));
 
-		// check that ($ctimeStart - 5) <= $mTime <= ($ctimeEnd + 1)
-		$this->assertGreaterThanOrEqual(($ctimeStart - 5), $mTime);
-		$this->assertLessThanOrEqual(($ctimeEnd + 1), $mTime);
-		$this->assertEquals(filesize($textFile), $this->instance->filesize('/lorem.txt'));
+        // check that ($ctimeStart - 5) <= $mTime <= ($ctimeEnd + 1)
+        $this->assertGreaterThanOrEqual(($ctimeStart - 5), $mTime);
+        $this->assertLessThanOrEqual(($ctimeEnd + 1), $mTime);
+        $this->assertEquals(filesize($textFile), $this->instance->filesize('/lorem.txt'));
 
-		$stat = $this->instance->stat('/lorem.txt');
-		//only size and mtime are required in the result
-		$this->assertEquals($stat['size'], $this->instance->filesize('/lorem.txt'));
-		$this->assertEquals($stat['mtime'], $mTime);
+        $stat = $this->instance->stat('/lorem.txt');
+        //only size and mtime are required in the result
+        $this->assertEquals($stat['size'], $this->instance->filesize('/lorem.txt'));
+        $this->assertEquals($stat['mtime'], $mTime);
 
-		if ($this->instance->touch('/lorem.txt', 100) !== false) {
-			$mTime = $this->instance->filemtime('/lorem.txt');
-			$this->assertEquals($mTime, 100);
-		}
+        if ($this->instance->touch('/lorem.txt', 100) !== false) {
+            $mTime = $this->instance->filemtime('/lorem.txt');
+            $this->assertEquals($mTime, 100);
+        }
 
-		$mtimeStart = time();
+        $mtimeStart = time();
 
-		$this->instance->unlink('/lorem.txt');
-		$this->assertTrue($this->instance->hasUpdated('/', $mtimeStart - 61));
-	}
+        $this->instance->unlink('/lorem.txt');
+        $this->assertTrue($this->instance->hasUpdated('/', $mtimeStart - 61));
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -23,13 +23,13 @@ 
 
 		$id = $this->getUniqueID();
 		$this->config = include('files_external/tests/config.ftp.php');
-		if (! is_array($this->config) or ! $this->config['run']) {
+		if (!is_array($this->config) or !$this->config['run']) {
 			$this->markTestSkipped('FTP backend not configured');
 		}
 		$rootInstance = new FTP($this->config);
 		$rootInstance->mkdir($id);
 
-		$this->config['root'] .= '/' . $id; //make sure we have an new empty folder to work in
+		$this->config['root'] .= '/'.$id; //make sure we have an new empty folder to work in
 		$this->instance = new FTP($this->config);
 	}
 
@@ -46,7 +46,7 @@ 
 	 * ftp has no proper way to handle spaces at the end of file names
 	 */
 	public static function directoryProvider(): array {
-		return array_filter(parent::directoryProvider(), function ($item) {
+		return array_filter(parent::directoryProvider(), function($item) {
 			return substr($item[0], -1) !== ' ';
 		});
 	}
@@ -56,7 +56,7 @@ 
 	 * mtime for folders is only with a minute resolution
 	 */
 	public function testStat(): void {
-		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+		$textFile = \OC::$SERVERROOT.'/tests/data/lorem.txt';
 		$ctimeStart = time();
 		$this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
 		$this->assertTrue($this->instance->isReadable('/lorem.txt'));

tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php

Indentation +59 added lines, -59 removed lines

@@ -10,71 +10,71 @@
 use Test\TestCase;
 
 class ExcludeFileByNameFilterIteratorTest extends TestCase {
-	/** @var ExcludeFileByNameFilterIterator|\PHPUnit\Framework\MockObject\MockObject */
-	protected $filter;
+    /** @var ExcludeFileByNameFilterIterator|\PHPUnit\Framework\MockObject\MockObject */
+    protected $filter;
 
-	protected function setUp(): void {
-		parent::setUp();
-		$this->filter = $this->getMockBuilder(ExcludeFileByNameFilterIterator::class)
-			->disableOriginalConstructor()
-			->onlyMethods(['current'])
-			->getMock();
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->filter = $this->getMockBuilder(ExcludeFileByNameFilterIterator::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['current'])
+            ->getMock();
+    }
 
-	public static function fileNameProvider(): array {
-		return [
-			['a file', true],
-			['Thumbs.db', false],
-			['another file', true],
-			['.directory', false],
-			['.webapp-nextcloud-15.0.2', false],
-			['.webapp-nextcloud-14.0.5-r3', false],
-			['wx.webapp-nextcloud-obee', true],
-			['.rnd', false],
-		];
-	}
+    public static function fileNameProvider(): array {
+        return [
+            ['a file', true],
+            ['Thumbs.db', false],
+            ['another file', true],
+            ['.directory', false],
+            ['.webapp-nextcloud-15.0.2', false],
+            ['.webapp-nextcloud-14.0.5-r3', false],
+            ['wx.webapp-nextcloud-obee', true],
+            ['.rnd', false],
+        ];
+    }
 
-	/**
-	 * @dataProvider fileNameProvider
-	 * @param string $fileName
-	 * @param bool $expectedResult
-	 */
-	public function testAcceptForFiles($fileName, $expectedResult): void {
-		$iteratorMock = $this->getMockBuilder(\RecursiveDirectoryIterator::class)
-			->disableOriginalConstructor()
-			->onlyMethods(['getFilename', 'isDir'])
-			->getMock();
+    /**
+     * @dataProvider fileNameProvider
+     * @param string $fileName
+     * @param bool $expectedResult
+     */
+    public function testAcceptForFiles($fileName, $expectedResult): void {
+        $iteratorMock = $this->getMockBuilder(\RecursiveDirectoryIterator::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getFilename', 'isDir'])
+            ->getMock();
 
-		$iteratorMock->method('getFilename')
-			->willReturn($fileName);
-		$iteratorMock->method('isDir')
-			->willReturn(false);
-		$this->filter->method('current')
-			->willReturn($iteratorMock);
+        $iteratorMock->method('getFilename')
+            ->willReturn($fileName);
+        $iteratorMock->method('isDir')
+            ->willReturn(false);
+        $this->filter->method('current')
+            ->willReturn($iteratorMock);
 
-		$actualResult = $this->filter->accept();
-		$this->assertEquals($expectedResult, $actualResult);
-	}
+        $actualResult = $this->filter->accept();
+        $this->assertEquals($expectedResult, $actualResult);
+    }
 
-	/**
-	 * @dataProvider fileNameProvider
-	 * @param string $fileName
-	 * @param bool $expectedResult
-	 */
-	public function testAcceptForDirs($fileName, $expectedResult): void {
-		$iteratorMock = $this->getMockBuilder(\RecursiveDirectoryIterator::class)
-			->disableOriginalConstructor()
-			->onlyMethods(['getFilename', 'isDir'])
-			->getMock();
+    /**
+     * @dataProvider fileNameProvider
+     * @param string $fileName
+     * @param bool $expectedResult
+     */
+    public function testAcceptForDirs($fileName, $expectedResult): void {
+        $iteratorMock = $this->getMockBuilder(\RecursiveDirectoryIterator::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getFilename', 'isDir'])
+            ->getMock();
 
-		$iteratorMock->method('getFilename')
-			->willReturn($fileName);
-		$iteratorMock->method('isDir')
-			->willReturn(true);
-		$this->filter->method('current')
-			->willReturn($iteratorMock);
+        $iteratorMock->method('getFilename')
+            ->willReturn($fileName);
+        $iteratorMock->method('isDir')
+            ->willReturn(true);
+        $this->filter->method('current')
+            ->willReturn($iteratorMock);
 
-		$actualResult = $this->filter->accept();
-		$this->assertTrue($actualResult);
-	}
+        $actualResult = $this->filter->accept();
+        $this->assertTrue($actualResult);
+    }
 }