X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Fsrc%2FCore%2FStorageManagerTest.php;h=30342099c55bdfb445e2614e64d3ec59c5e20a0a;hb=53237a0259477b13eebcd98fd872d3255e41e860;hp=084caa68ab09f2550526b69cc7d206c1d2ca1fbe;hpb=3e72e8015bb72a2fd3918b5b1b9ae589739f1093;p=friendica.git

diff --git a/tests/src/Core/StorageManagerTest.php b/tests/src/Core/StorageManagerTest.php
index 084caa68ab..30342099c5 100644
--- a/tests/src/Core/StorageManagerTest.php
+++ b/tests/src/Core/StorageManagerTest.php
@@ -1,12 +1,31 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Test\src\Core;
 
 use Dice\Dice;
-use Friendica\Core\Config\IConfiguration;
-use Friendica\Core\Config\PreloadConfiguration;
+use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\PreloadConfig;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n\L10n;
+use Friendica\Core\L10n;
 use Friendica\Core\Session\ISession;
 use Friendica\Core\StorageManager;
 use Friendica\Database\Database;
@@ -15,6 +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\Test\DatabaseTest;
 use Friendica\Test\Util\Database\StaticDatabase;
 use Friendica\Test\Util\VFSTrait;
@@ -28,7 +48,7 @@ class StorageManagerTest extends DatabaseTest
 {
 	/** @var Database */
 	private $dba;
-	/** @var IConfiguration */
+	/** @var IConfig */
 	private $config;
 	/** @var LoggerInterface */
 	private $logger;
@@ -55,8 +75,10 @@ class StorageManagerTest extends DatabaseTest
 
 		$this->dba = new StaticDatabase($configCache, $profiler, $this->logger);
 
+		$this->dba->setTestmode(true);
+
 		$configModel  = new Config($this->dba);
-		$this->config = new PreloadConfiguration($configCache, $configModel);
+		$this->config = new PreloadConfig($configCache, $configModel);
 
 		$this->l10n = \Mockery::mock(L10n::class);
 	}
@@ -109,10 +131,42 @@ class StorageManagerTest extends DatabaseTest
 		];
 	}
 
+	/**
+	 * Data array for legacy backends
+	 *
+	 * @todo 2020.09 After 2 releases, remove the legacy functionality and these data array with it
+	 *
+	 * @return array
+	 */
+	public function dataLegacyBackends()
+	{
+		return [
+			'legacyDatabase'          => [
+				'name'        => 'Friendica\Model\Storage\Database',
+				'assert'      => Storage\Database::class,
+				'assertName'  => Storage\Database::NAME,
+				'userBackend' => true,
+			],
+			'legacyFilesystem'       => [
+				'name'        => 'Friendica\Model\Storage\Filesystem',
+				'assert'      => Storage\Filesystem::class,
+				'assertName'  => Storage\Filesystem::NAME,
+				'userBackend' => true,
+			],
+			'legacySystemResource'     => [
+				'name'        => 'Friendica\Model\Storage\SystemResource',
+				'assert'      => Storage\SystemResource::class,
+				'assertName'  => Storage\SystemResource::NAME,
+				'userBackend' => false,
+			],
+		];
+	}
+
 	/**
 	 * Test the getByName() method
 	 *
 	 * @dataProvider dataStorages
+	 * @dataProvider dataLegacyBackends
 	 */
 	public function testGetByName($name, $assert, $assertName, $userBackend)
 	{
@@ -123,7 +177,6 @@ class StorageManagerTest extends DatabaseTest
 		if (!empty($assert)) {
 			$this->assertInstanceOf(Storage\IStorage::class, $storage);
 			$this->assertInstanceOf($assert, $storage);
-			$this->assertEquals($name, $storage::getName());
 		} else {
 			$this->assertNull($storage);
 		}
@@ -178,6 +231,7 @@ class StorageManagerTest extends DatabaseTest
 	 * Test the method getBackend() with a pre-configured backend
 	 *
 	 * @dataProvider dataStorages
+	 * @dataProvider dataLegacyBackends
 	 */
 	public function testPresetBackend($name, $assert, $assertName, $userBackend)
 	{