Fix a lot of notices/warnings/deprecation notes in the test directory

[friendica.git] / tests / src / Core / StorageManagerTest.php

diff --git a/tests/src/Core/StorageManagerTest.php b/tests/src/Core/StorageManagerTest.php
index 30342099c55bdfb445e2614e64d3ec59c5e20a0a..e3fd747e4a4d9a6ec80bfd7a25d8c3231feb9c2f 100644 (file)
--- a/tests/src/Core/StorageManagerTest.php
+++ b/tests/src/Core/StorageManagerTest.php
@@ -34,7 +34,7 @@ use Friendica\Factory\ConfigFactory;
 use Friendica\Model\Config\Config;
 use Friendica\Model\Storage;
 use Friendica\Core\Session;
-use Friendica\Database\DBStructure;
+use Friendica\Model\Storage\StorageException;
 use Friendica\Test\DatabaseTest;
 use Friendica\Test\Util\Database\StaticDatabase;
 use Friendica\Test\Util\VFSTrait;
@@ -57,7 +57,7 @@ class StorageManagerTest extends DatabaseTest
 
        use VFSTrait;
 
-       public function setUp()
+       protected function setUp()
        {
                parent::setUp();
 
@@ -75,8 +75,6 @@ class StorageManagerTest extends DatabaseTest
 
                $this->dba = new StaticDatabase($configCache, $profiler, $this->logger);
 
-               $this->dba->setTestmode(true);
-
                $configModel  = new Config($this->dba);
                $this->config = new PreloadConfig($configCache, $configModel);
 
@@ -90,7 +88,7 @@ class StorageManagerTest extends DatabaseTest
        {
                $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
 
-               $this->assertInstanceOf(StorageManager::class, $storageManager);
+               self::assertInstanceOf(StorageManager::class, $storageManager);
        }
 
        public function dataStorages()
@@ -175,12 +173,12 @@ class StorageManagerTest extends DatabaseTest
                $storage = $storageManager->getByName($name, $userBackend);
 
                if (!empty($assert)) {
-                       $this->assertInstanceOf(Storage\IStorage::class, $storage);
-                       $this->assertInstanceOf($assert, $storage);
+                       self::assertInstanceOf(Storage\IStorage::class, $storage);
+                       self::assertInstanceOf($assert, $storage);
                } else {
-                       $this->assertNull($storage);
+                       self::assertNull($storage);
                }
-               $this->assertEquals($assertName, $storage);
+               self::assertEquals($assertName, $storage);
        }
 
        /**
@@ -193,10 +191,10 @@ class StorageManagerTest extends DatabaseTest
                $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
 
                // true in every of the backends
-               $this->assertEquals(!empty($assertName), $storageManager->isValidBackend($name));
+               self::assertEquals(!empty($assertName), $storageManager->isValidBackend($name));
 
                // if userBackend is set to true, filter out e.g. SystemRessource
-               $this->assertEquals($userBackend, $storageManager->isValidBackend($name, true));
+               self::assertEquals($userBackend, $storageManager->isValidBackend($name, true));
        }
 
        /**
@@ -206,7 +204,7 @@ class StorageManagerTest extends DatabaseTest
        {
                $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
 
-               $this->assertEquals(StorageManager::DEFAULT_BACKENDS, $storageManager->listBackends());
+               self::assertEquals(StorageManager::DEFAULT_BACKENDS, $storageManager->listBackends());
        }
 
        /**
@@ -218,12 +216,12 @@ class StorageManagerTest extends DatabaseTest
        {
                $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
 
-               $this->assertNull($storageManager->getBackend());
+               self::assertNull($storageManager->getBackend());
 
                if ($userBackend) {
                        $storageManager->setBackend($name);
 
-                       $this->assertInstanceOf($assert, $storageManager->getBackend());
+                       self::assertInstanceOf($assert, $storageManager->getBackend());
                }
        }
 
@@ -240,9 +238,9 @@ class StorageManagerTest extends DatabaseTest
                $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
 
                if ($userBackend) {
-                       $this->assertInstanceOf($assert, $storageManager->getBackend());
+                       self::assertInstanceOf($assert, $storageManager->getBackend());
                } else {
-                       $this->assertNull($storageManager->getBackend());
+                       self::assertNull($storageManager->getBackend());
                }
        }
 
@@ -264,12 +262,12 @@ class StorageManagerTest extends DatabaseTest
 
                $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
 
-               $this->assertTrue($storageManager->register(SampleStorageBackend::class));
+               self::assertTrue($storageManager->register(SampleStorageBackend::class));
 
-               $this->assertEquals(array_merge(StorageManager::DEFAULT_BACKENDS, [
+               self::assertEquals(array_merge(StorageManager::DEFAULT_BACKENDS, [
                        SampleStorageBackend::getName() => SampleStorageBackend::class,
                ]), $storageManager->listBackends());
-               $this->assertEquals(array_merge(StorageManager::DEFAULT_BACKENDS, [
+               self::assertEquals(array_merge(StorageManager::DEFAULT_BACKENDS, [
                        SampleStorageBackend::getName() => SampleStorageBackend::class,
                ]), $this->config->get('storage', 'backends'));
 
@@ -277,17 +275,17 @@ class StorageManagerTest extends DatabaseTest
                SampleStorageBackend::registerHook();
                Hook::loadHooks();
 
-               $this->assertTrue($storageManager->setBackend(SampleStorageBackend::NAME));
-               $this->assertEquals(SampleStorageBackend::NAME, $this->config->get('storage', 'name'));
+               self::assertTrue($storageManager->setBackend(SampleStorageBackend::NAME));
+               self::assertEquals(SampleStorageBackend::NAME, $this->config->get('storage', 'name'));
 
-               $this->assertInstanceOf(SampleStorageBackend::class, $storageManager->getBackend());
+               self::assertInstanceOf(SampleStorageBackend::class, $storageManager->getBackend());
 
-               $this->assertTrue($storageManager->unregister(SampleStorageBackend::class));
-               $this->assertEquals(StorageManager::DEFAULT_BACKENDS, $this->config->get('storage', 'backends'));
-               $this->assertEquals(StorageManager::DEFAULT_BACKENDS, $storageManager->listBackends());
+               self::assertTrue($storageManager->unregister(SampleStorageBackend::class));
+               self::assertEquals(StorageManager::DEFAULT_BACKENDS, $this->config->get('storage', 'backends'));
+               self::assertEquals(StorageManager::DEFAULT_BACKENDS, $storageManager->listBackends());
 
-               $this->assertNull($storageManager->getBackend());
-               $this->assertNull($this->config->get('storage', 'name'));
+               self::assertNull($storageManager->getBackend());
+               self::assertNull($this->config->get('storage', 'name'));
        }
 
        /**
@@ -311,23 +309,23 @@ class StorageManagerTest extends DatabaseTest
 
                while ($photo = $this->dba->fetch($photos)) {
 
-                       $this->assertEmpty($photo['data']);
+                       self::assertEmpty($photo['data']);
 
                        $storage = $storageManager->getByName($photo['backend-class']);
                        $data = $storage->get($photo['backend-ref']);
 
-                       $this->assertNotEmpty($data);
+                       self::assertNotEmpty($data);
                }
        }
 
        /**
         * Test moving data to a WRONG storage
-        *
-        * @expectedException \Friendica\Model\Storage\StorageException
-        * @expectedExceptionMessage Can't move to storage backend 'SystemResource'
         */
        public function testMoveStorageWrong()
        {
+               $this->expectExceptionMessage("Can't move to storage backend 'SystemResource'");
+               $this->expectException(StorageException::class);
+
                $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
                $storage = $storageManager->getByName(Storage\SystemResource::getName());
                $storageManager->move($storage);