1 files changed, 29 insertions, 18 deletions

diff --git a/apps/user_status/tests/Integration/Service/StatusServiceIntegrationTest.php b/apps/user_status/tests/Integration/Service/StatusServiceIntegrationTest.php
index 3b68806a55b..8a21052b09f 100644
--- a/apps/user_status/tests/Integration/Service/StatusServiceIntegrationTest.php
+++ b/apps/user_status/tests/Integration/Service/StatusServiceIntegrationTest.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\UserStatus\Tests\Integration\BackgroundJob;
+namespace OCA\UserStatus\Tests\Integration\Service;
 
 use OCA\UserStatus\Service\StatusService;
 use OCP\AppFramework\Db\DoesNotExistException;
@@ -42,17 +42,20 @@ class StatusServiceIntegrationTest extends TestCase {
 	}
 
 	public function testCustomStatusMessageTimestamp(): void {
+		$before = time();
 		$this->service->setCustomMessage(
 			'test123',
 			'🍕',
 			'Lunch',
 			null,
 		);
+		$after = time();
 
 		$status = $this->service->findByUserId('test123');
 
 		self::assertSame('Lunch', $status->getCustomMessage());
-		self::assertGreaterThanOrEqual(time(), $status->getStatusMessageTimestamp());
+		self::assertGreaterThanOrEqual($before, $status->getStatusMessageTimestamp());
+		self::assertLessThanOrEqual($after, $status->getStatusMessageTimestamp());
 	}
 
 	public function testOnlineStatusKeepsMessageTimestamp(): void {
@@ -95,15 +98,29 @@ class StatusServiceIntegrationTest extends TestCase {
 			'meeting',
 			true,
 		);
+
 		self::assertSame(
 			'meeting',
 			$this->service->findByUserId('test123')->getMessageId(),
 		);
+		self::assertSame(
+			IUserStatus::ONLINE,
+			$this->service->findByUserId('_test123')->getStatus(),
+		);
 
-		$this->service->revertUserStatus(
+		$revertedStatus = $this->service->revertUserStatus(
 			'test123',
 			'meeting',
 		);
+
+		self::assertNotNull($revertedStatus, 'Status should have been reverted');
+
+		try {
+			$this->service->findByUserId('_test123');
+			$this->fail('Expected DoesNotExistException() to be thrown when finding backup status after reverting');
+		} catch (DoesNotExistException) {
+		}
+
 		self::assertSame(
 			IUserStatus::ONLINE,
 			$this->service->findByUserId('test123')->getStatus(),
@@ -119,7 +136,7 @@ class StatusServiceIntegrationTest extends TestCase {
 		);
 		$this->service->setUserStatus(
 			'test123',
-			IUserStatus::AWAY,
+			IUserStatus::BUSY,
 			IUserStatus::MESSAGE_CALENDAR_BUSY,
 			true,
 		);
@@ -130,12 +147,12 @@ class StatusServiceIntegrationTest extends TestCase {
 
 		$this->service->setUserStatus(
 			'test123',
-			IUserStatus::AWAY,
+			IUserStatus::BUSY,
 			IUserStatus::MESSAGE_CALL,
 			true,
 		);
 		self::assertSame(
-			IUserStatus::AWAY,
+			IUserStatus::BUSY,
 			$this->service->findByUserId('test123')->getStatus(),
 		);
 
@@ -154,32 +171,26 @@ class StatusServiceIntegrationTest extends TestCase {
 		);
 		$this->service->setUserStatus(
 			'test123',
-			IUserStatus::AWAY,
-			IUserStatus::MESSAGE_CALENDAR_BUSY,
+			IUserStatus::DND,
+			IUserStatus::MESSAGE_AVAILABILITY,
 			true,
 		);
 		self::assertSame(
-			'meeting',
+			'availability',
 			$this->service->findByUserId('test123')->getMessageId(),
 		);
 
 		$nostatus = $this->service->setUserStatus(
 			'test123',
-			IUserStatus::AWAY,
-			IUserStatus::MESSAGE_AVAILABILITY,
+			IUserStatus::BUSY,
+			IUserStatus::MESSAGE_CALENDAR_BUSY,
 			true,
 		);
 
 		self::assertNull($nostatus);
 		self::assertSame(
-			IUserStatus::MESSAGE_CALENDAR_BUSY,
+			IUserStatus::MESSAGE_AVAILABILITY,
 			$this->service->findByUserId('test123')->getMessageId(),
 		);
 	}
-
-	public function testCi(): void {
-		// TODO: remove if CI turns red
-		self::assertTrue(false);
-	}
-
 }