test: fix ContactsMigratorTest

Signed-off-by: Anna Larch <[email protected]>
nextcloud · Sep 23, 2024 · ade574c · ade574c
1 parent 972877b
commit ade574c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15,894 deletions.
diff --git a/apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php b/apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php
@@ -114,20 +114,30 @@ public function testImportExportAsset(string $userId, string $filename, string $
 		$exportMetadata = array_filter(['displayName' => $displayName, 'description' => $description]);
 
 		$this->assertEquals($importMetadata, $exportMetadata);
-		$this->assertEquals(count($importCards), count($exportCards));
+		$this->assertSameSize($importCards, $exportCards);
 
-		for ($i = 0; $i < count($importCards); ++$i) {
-			$this->assertNotEqualsCanonicalizing(
-				$this->getPropertiesChangedOnImport($importCards[$i]),
-				$this->getPropertiesChangedOnImport($exportCards[$i]),
-			);
+		$importProperties = [];
+		$exportProperties = [];
+		for ($i = 0, $iMax = count($importCards); $i < $iMax; ++$i) {
+			$importProperties[] = $this->getPropertiesChangedOnImport($importCards[$i]);
+			$exportProperties[] = $this->getPropertiesChangedOnImport($exportCards[$i]);
 		}
 
-		for ($i = 0; $i < count($importCards); ++$i) {
-			$this->assertEqualsCanonicalizing(
-				$this->getProperties($importCards[$i]),
-				$this->getProperties($exportCards[$i]),
-			);
+		$this->assertNotEqualsCanonicalizing(
+			$importProperties,
+			$exportProperties,
+		);
+
+		$importProperties = [];
+		$exportProperties = [];
+		for ($i = 0, $iMax = count($importCards); $i < $iMax; ++$i) {
+			$importProperties[] = $this->getProperties($importCards[$i]);
+			$exportProperties[] = $this->getProperties($exportCards[$i]);
 		}
+
+		$this->assertEqualsCanonicalizing(
+			$importProperties,
+			$exportProperties,
+		);
 	}
 }