Skip to content

Commit 38662aa

Browse files
miaulalalaAndyScherzinger
authored andcommitted
test: fix ContactsMigratorTest
Signed-off-by: Anna Larch <[email protected]>
1 parent 38c31de commit 38662aa

2 files changed

Lines changed: 21 additions & 15894 deletions

File tree

apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,20 +114,30 @@ public function testImportExportAsset(string $userId, string $filename, string $
114114
$exportMetadata = array_filter(['displayName' => $displayName, 'description' => $description]);
115115

116116
$this->assertEquals($importMetadata, $exportMetadata);
117-
$this->assertEquals(count($importCards), count($exportCards));
117+
$this->assertSameSize($importCards, $exportCards);
118118

119-
for ($i = 0; $i < count($importCards); ++$i) {
120-
$this->assertNotEqualsCanonicalizing(
121-
$this->getPropertiesChangedOnImport($importCards[$i]),
122-
$this->getPropertiesChangedOnImport($exportCards[$i]),
123-
);
119+
$importProperties = [];
120+
$exportProperties = [];
121+
for ($i = 0, $iMax = count($importCards); $i < $iMax; ++$i) {
122+
$importProperties[] = $this->getPropertiesChangedOnImport($importCards[$i]);
123+
$exportProperties[] = $this->getPropertiesChangedOnImport($exportCards[$i]);
124124
}
125125

126-
for ($i = 0; $i < count($importCards); ++$i) {
127-
$this->assertEqualsCanonicalizing(
128-
$this->getProperties($importCards[$i]),
129-
$this->getProperties($exportCards[$i]),
130-
);
126+
$this->assertNotEqualsCanonicalizing(
127+
$importProperties,
128+
$exportProperties,
129+
);
130+
131+
$importProperties = [];
132+
$exportProperties = [];
133+
for ($i = 0, $iMax = count($importCards); $i < $iMax; ++$i) {
134+
$importProperties[] = $this->getProperties($importCards[$i]);
135+
$exportProperties[] = $this->getProperties($exportCards[$i]);
131136
}
137+
138+
$this->assertEqualsCanonicalizing(
139+
$importProperties,
140+
$exportProperties,
141+
);
132142
}
133143
}

0 commit comments

Comments
 (0)