Fix more ILogger related problems from tests

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

diff --git a/apps/dav/tests/unit/Comments/RootCollectionTest.php b/apps/dav/tests/unit/Comments/RootCollectionTest.php
index 6cc038bb7b846fd542627ff69dbaede38c5f23ca..f34a0faf88b346c551c9438f246502e87dc6d329 100644 (file)
--- a/apps/dav/tests/unit/Comments/RootCollectionTest.php
+++ b/apps/dav/tests/unit/Comments/RootCollectionTest.php
@@ -79,7 +79,7 @@ class RootCollectionTest extends \Test\TestCase {
                                \OC::$server,
                                $this->createMock(LoggerInterface::class)
                        ),
-                       $this->logger
+                       $this->createMock(LoggerInterface::class)
                );
 
                $this->collection = new \OCA\DAV\Comments\RootCollection(

diff --git a/tests/lib/Repair/RepairCollationTest.php b/tests/lib/Repair/RepairCollationTest.php
index 35679eb8630001c58dd4acf6d1be9384ea87d580..27d146fab43bd704c83964d421afeea585b8ad85 100644 (file)
--- a/tests/lib/Repair/RepairCollationTest.php
+++ b/tests/lib/Repair/RepairCollationTest.php
@@ -11,8 +11,8 @@ namespace Test\Repair;
 use Doctrine\DBAL\Platforms\MySqlPlatform;
 use OC\Repair\Collation;
 use OCP\IDBConnection;
-use OCP\ILogger;
 use OCP\Migration\IOutput;
+use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class TestCollationRepair extends Collation {
@@ -54,14 +54,14 @@ class RepairCollationTest extends TestCase {
         */
        private $config;
 
-       /** @var ILogger */
+       /** @var LoggerInterface */
        private $logger;
 
        protected function setUp(): void {
                parent::setUp();
 
                $this->connection = \OC::$server->get(IDBConnection::class);
-               $this->logger = $this->createMock(ILogger::class);
+               $this->logger = $this->createMock(LoggerInterface::class);
                $this->config = \OC::$server->getConfig();
                if (!$this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
                        $this->markTestSkipped("Test only relevant on MySql");

diff --git a/tests/lib/Template/IconsCacherTest.php b/tests/lib/Template/IconsCacherTest.php
index 44e7f8075afb4cacb2167708c2024b6a8e0a985d..188c0596799fef7a1d3d0de3ce0ebe25bf24dd60 100644 (file)
--- a/tests/lib/Template/IconsCacherTest.php
+++ b/tests/lib/Template/IconsCacherTest.php
@@ -110,8 +110,7 @@ class IconsCacherTest extends \Test\TestCase {
                ";
                $expected = "
                        icon.test {
-
-                               background-image: var(--icon-test);
+                               \n                              background-image: var(--icon-test);
                        }
                ";
 
@@ -133,8 +132,7 @@ class IconsCacherTest extends \Test\TestCase {
                ";
                $expected = "
                        icon.test {
-
-                               background-image: var(--icon-test);
+                               \n                              background-image: var(--icon-test);
                        }
                ";