From a4a086e296062c6aa7914ba6c1dddc2dddab7145 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 23 Jul 2020 13:38:49 +0200 Subject: [PATCH] Use assertEqualsCanonicalizing instead of deprecated assertEquals parameter Signed-off-by: Morris Jobke --- apps/dav/tests/unit/CalDAV/CalDavBackendTest.php | 4 ++-- tests/lib/L10N/FactoryTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php index 8ac4961f19f..559b6f1b417 100644 --- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php @@ -280,7 +280,7 @@ EOD; $this->assertCount(0, $calendarObjects); } - + public function testMultipleCalendarObjectsWithSameUID() { $this->expectException(\Sabre\DAV\Exception\BadRequest::class); $this->expectExceptionMessage('Calendar object with uid already exists in this calendar collection.'); @@ -443,7 +443,7 @@ EOD; $expectedEventsInResult = array_map(function($index) use($events) { return $events[$index]; }, $expectedEventsInResult); - $this->assertEquals($expectedEventsInResult, $result, '', 0.0, 10, true); + $this->assertEqualsCanonicalizing($expectedEventsInResult, $result); } public function testGetCalendarObjectByUID() { diff --git a/tests/lib/L10N/FactoryTest.php b/tests/lib/L10N/FactoryTest.php index c75bfba5b99..f75eb3599f1 100644 --- a/tests/lib/L10N/FactoryTest.php +++ b/tests/lib/L10N/FactoryTest.php @@ -329,7 +329,7 @@ class FactoryTest extends TestCase { ->with($app) ->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() { @@ -360,7 +360,7 @@ class FactoryTest extends TestCase { ->with('theme') ->willReturn('abc'); - $this->assertEquals(['en', 'zz'], $factory->findAvailableLanguages($app), '', 0.0, 10, true); + $this->assertEqualsCanonicalizing(['en', 'zz'], $factory->findAvailableLanguages($app)); } /**