fix(tests): align phpunit mocks with dav and activity changes

Signed-off-by: Jaggob <37583151+Jaggob@users.noreply.github.com>

Author: Jaggob

lib/Activity/ActivityManager.php

@@ -452,11 +452,12 @@ private function createEvent($objectType, $entity, $subject, $additionalParams =
 	 */
 	private function sendToUsers(IEvent $event) {
 		$subjectParams = $event->getSubjectParameters();
-		if ($event->getObjectType() === self::DECK_OBJECT_BOARD) {
+		$objectType = $event->getObjectType();
+		if ($objectType === self::DECK_OBJECT_BOARD) {
 			$boardId = (int)$event->getObjectId();
 		} elseif (isset($subjectParams['board']['id'])) {
 			$boardId = (int)$subjectParams['board']['id'];
-		} elseif ($event->getObjectType() === self::DECK_OBJECT_CARD) {
+		} elseif ($objectType === self::DECK_OBJECT_CARD) {
 			$boardId = $this->cardMapper->findBoardId((int)$event->getObjectId());
 		} else {
 			return;

lib/DAV/DeckCalendarBackend.php

@@ -311,7 +311,7 @@ public function createCalendarObject(int $boardId, string $owner, string $data,
 		$categories = $this->extractCategories($todo);
 		if ($categories !== null) {
 			$categories = $this->normalizeCategoriesForLabelSync($boardId, $categories, $mode);
-			$this->syncCardCategories($card->getId(), $categories);
+			$this->syncCardCategories($card->getId(), $categories, $boardId);
 		}
 
 		return $card;
@@ -418,7 +418,7 @@ private function updateCardFromCalendar(Card $sourceItem, string $data, bool $re
 			return $card;
 		}
 		if ($isNoopUpdate && $categories !== null) {
-			$this->syncCardCategories($card->getId(), $categories);
+			$this->syncCardCategories($card->getId(), $categories, $boardId);
 			return $card;
 		}
 
@@ -437,7 +437,7 @@ private function updateCardFromCalendar(Card $sourceItem, string $data, bool $re
 			$boardId
 		);
 		if ($categories !== null) {
-			$this->syncCardCategories($updatedCard->getId(), $categories);
+			$this->syncCardCategories($updatedCard->getId(), $categories, $boardId);
 		}
 
 		return $updatedCard;
@@ -722,9 +722,9 @@ private function extractCategories($todo): ?array {
 	/**
 	 * @param list<string> $categories
 	 */
-	private function syncCardCategories(int $cardId, array $categories): void {
+	private function syncCardCategories(int $cardId, array $categories, ?int $boardId = null): void {
 		$card = $this->cardService->find($cardId);
-		$boardId = $this->getBoardIdForCard($card);
+		$boardId ??= $this->getBoardIdForCard($card);
 		$board = $this->boardMapper->find($boardId, true, false);
 		$canCreateLabels = $this->checkBoardPermission($boardId, Acl::PERMISSION_MANAGE);
 		$boardLabels = $board->getLabels() ?? [];

tests/unit/Activity/ActivityManagerTest.php

@@ -134,9 +134,6 @@ public function testCreateEvent() {
 		$board = new Board();
 		$board->setId(123);
 		$board->setTitle('');
-		$this->boardMapper->expects(self::once())
-			->method('find')
-			->willReturn($board);
 		$event = $this->expectEventCreation(ActivityManager::SUBJECT_BOARD_CREATE, [
 			'author' => 'admin'
 		]);
@@ -331,18 +328,11 @@ public function testSendToUser($objectType) {
 			)
 			->willReturnSelf();
 
-		$mapper = null;
-		switch ($objectType) {
-			case ActivityManager::DECK_OBJECT_BOARD:
-				$mapper = $this->boardMapper;
-				break;
-			case ActivityManager::DECK_OBJECT_CARD:
-				$mapper = $this->cardMapper;
-				break;
+		if ($objectType === ActivityManager::DECK_OBJECT_CARD) {
+			$this->cardMapper->expects(self::once())
+				->method('findBoardId')
+				->willReturn(123);
 		}
-		$mapper->expects(self::once())
-			->method('findBoardId')
-			->willReturn(123);
 		$this->permissionService->expects(self::once())
 			->method('findUsers')
 			->willReturn($users);
@@ -391,18 +381,26 @@ public function testFindObjectForEntity($objectType, $entity) {
 		$card->setId(3);
 		$expected = null;
 		if ($objectType === ActivityManager::DECK_OBJECT_BOARD) {
-			$this->boardMapper->expects(self::once())
-				->method('find')
-				->with(1)
-				->willReturn($board);
-			$expected = $board;
+			if ($entity instanceof Board) {
+				$expected = $entity;
+			} else {
+				$this->boardMapper->expects(self::once())
+					->method('find')
+					->with(1)
+					->willReturn($board);
+				$expected = $board;
+			}
 		}
 		if ($objectType === ActivityManager::DECK_OBJECT_CARD) {
-			$this->cardMapper->expects(self::once())
-				->method('find')
-				->with(3)
-				->willReturn($card);
-			$expected = $card;
+			if ($entity instanceof Card) {
+				$expected = $entity;
+			} else {
+				$this->cardMapper->expects(self::once())
+					->method('find')
+					->with(3)
+					->willReturn($card);
+				$expected = $card;
+			}
 		}
 		$actual = $this->invokePrivate($this->activityManager, 'findObjectForEntity', [$objectType, $entity]);
 		$this->assertEquals($expected, $actual);

tests/unit/DAV/DeckCalendarBackendTest.php

@@ -661,9 +661,10 @@ public function testCreateCardFromCalendarWithExistingDeckUidUpdatesInsteadOfCre
 				[123]
 			)
 			->willReturnOnConsecutiveCalls($sourceCard, $sourceCard);
-		$this->stackService->expects($this->exactly(2))
+		$this->stackService->expects($this->exactly(3))
 			->method('find')
 			->willReturnMap([
+				[42, $sourceStack],
 				[42, $sourceStack],
 				[88, $targetStack],
 			]);
@@ -727,7 +728,7 @@ public function testUpdateCardWithInProgressStatusClearsDone(): void {
 		$currentStack = new Stack();
 		$currentStack->setId(42);
 		$currentStack->setBoardId(12);
-		$this->stackService->expects($this->once())
+		$this->stackService->expects($this->exactly(2))
 			->method('find')
 			->with(42)
 			->willReturn($currentStack);

tests/unit/Service/CardServiceTest.php

@@ -229,10 +229,40 @@ public function testCreate() {
 		$this->cardMapper->expects($this->once())
 			->method('insert')
 			->willReturn($card);
-		$this->stackMapper->expects($this->once())
+		$board = $this->createMock(Board::class);
+		$user = $this->createMock(IUser::class);
+		$this->userManager->expects($this->once())
+			->method('get')
+			->with('user1')
+			->willReturn($user);
+		$this->commentsManager->expects($this->once())
+			->method('getNumberOfCommentsForObject')
+			->with('deckCard', '0')
+			->willReturn(0);
+		$this->attachmentService->expects($this->once())
+			->method('count')
+			->with(0)
+			->willReturn(0);
+		$this->stackMapper->expects($this->exactly(2))
 			->method('find')
 			->with(123)
 			->willReturn($stack);
+		$this->boardMapper->expects($this->once())
+			->method('find')
+			->with(1337)
+			->willReturn($board);
+		$this->labelMapper->expects($this->once())
+			->method('findAssignedLabelsForCards')
+			->with([0])
+			->willReturn([]);
+		$this->assignedUsersMapper->expects($this->once())
+			->method('findIn')
+			->with([0])
+			->willReturn([]);
+		$this->referenceManager->expects($this->once())
+			->method('extractReferences')
+			->with('Card title')
+			->willReturn([]);
 		$b = $this->cardService->create('Card title', 123, 'text', 999, 'admin');
 
 		$this->assertEquals($b->getTitle(), 'Card title');