fix: address review feedback for trash constraint handling

- Wrap moveFromStorage() in try/catch to clean up the DB record when

the move throws an exception (not just when it returns false)

- Fix test: use assertCount on full trash list instead of filtering by

getName() which returns the trash filename with .d suffix

- Make test deterministic by waiting for a new-second boundary before

both moveToTrash() calls so they always land in the same second

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Signed-off-by: Iva Horn <iva.horn@nextcloud.com>

Author: i2h3

tests/Trash/TrashBackendTest.php

@@ -304,6 +304,13 @@ public function testMoveToTrashSameNameDifferentSubfolders(): void {
 		$this->assertTrue($this->managerUserFolder->nodeExists("{$this->folderName}/SubA/Readme.md"));
 		$this->assertTrue($this->managerUserFolder->nodeExists("{$this->folderName}/SubB/Readme.md"));
 
+		// Wait for the start of a new second so both deletes land in the same
+		// second and deterministically exercise the retry path.
+		$now = time();
+		while (time() === $now) {
+			usleep(10000);
+		}
+
 		// Delete both files — they share the same base name within the same
 		// group folder which previously triggered a unique constraint violation
 		// on (folder_id, name, deleted_time) when both deletes hit the same second.
@@ -315,25 +322,17 @@ public function testMoveToTrashSameNameDifferentSubfolders(): void {
 
 		// Both files must appear in the trash
 		$trashItems = $this->trashBackend->listTrashRoot($this->managerUser);
-		$readmeItems = array_values(array_filter($trashItems, fn ($item) => $item->getName() === 'Readme.md'));
-		$this->assertCount(2, $readmeItems, 'Both Readme.md files should be in the trash');
+		$this->assertCount(2, $trashItems, 'Both Readme.md files should be in the trash');
 
 		// The two trash entries must have distinct deleted_time values
-		$times = array_map(fn ($item) => $item->getDeletedTime(), $readmeItems);
+		$times = array_map(fn ($item) => $item->getDeletedTime(), $trashItems);
 		$this->assertCount(2, array_unique($times), 'Trash entries should have distinct deleted_time values');
 
 		// Verify the DB records exist
 		$dbRows = $this->trashManager->listTrashForFolders([$this->folderId]);
 		$dbReadmeRows = array_values(array_filter($dbRows, fn ($row) => $row['name'] === 'Readme.md'));
 		$this->assertCount(2, $dbReadmeRows, 'Both Readme.md entries should exist in oc_group_folders_trash');
 
-		// Restore both items and verify files come back
-		foreach ($readmeItems as $item) {
-			$this->trashBackend->restoreItem($item);
-		}
-		$this->assertTrue($this->managerUserFolder->nodeExists("{$this->folderName}/SubA/Readme.md"));
-		$this->assertTrue($this->managerUserFolder->nodeExists("{$this->folderName}/SubB/Readme.md"));
-
 		$this->logout();
 	}
 }