mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use assertEqualsCanonicalizing instead of deprecated assertEquals parameter 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2020-07-23 13:38:49 +02:00 committed by backportbot[bot]
parent f11d72a928
commit c4bedf468e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
View File

@ -279,7 +279,7 @@ EOD;
$this->assertCount(0, $calendarObjects); $this->assertCount(0, $calendarObjects);
} }
public function testMultipleCalendarObjectsWithSameUID() { public function testMultipleCalendarObjectsWithSameUID() {
$this->expectException(\Sabre\DAV\Exception\BadRequest::class); $this->expectException(\Sabre\DAV\Exception\BadRequest::class);
$this->expectExceptionMessage('Calendar object with uid already exists in this calendar collection.'); $this->expectExceptionMessage('Calendar object with uid already exists in this calendar collection.');
@ -441,7 +441,7 @@ EOD;
$expectedEventsInResult = array_map(function ($index) use ($events) { $expectedEventsInResult = array_map(function ($index) use ($events) {
return $events[$index]; return $events[$index];
}, $expectedEventsInResult); }, $expectedEventsInResult);
$this->assertEquals($expectedEventsInResult, $result, '', 0.0, 10, true); $this->assertEqualsCanonicalizing($expectedEventsInResult, $result);
} }
public function testGetCalendarObjectByUID() { public function testGetCalendarObjectByUID() {

4
tests/lib/L10N/FactoryTest.php
View File

@ -329,7 +329,7 @@ class FactoryTest extends TestCase {
->with($app) ->with($app)
->willReturn(\OC::$SERVERROOT . '/tests/data/l10n/'); ->willReturn(\OC::$SERVERROOT . '/tests/data/l10n/');
$this->assertEquals(['cs', 'de', 'en', 'ru'], $factory->findAvailableLanguages($app), '', 0.0, 10, true); $this->assertEqualsCanonicalizing(['cs', 'de', 'en', 'ru'], $factory->findAvailableLanguages($app));
} }
public function dataLanguageExists() { public function dataLanguageExists() {
@ -360,7 +360,7 @@ class FactoryTest extends TestCase {
->with('theme') ->with('theme')
->willReturn('abc'); ->willReturn('abc');
$this->assertEquals(['en', 'zz'], $factory->findAvailableLanguages($app), '', 0.0, 10, true); $this->assertEqualsCanonicalizing(['en', 'zz'], $factory->findAvailableLanguages($app));
} }
/** /**