5 files changed, 22 insertions, 5 deletions
diff --git a/tests/Core/Command/Config/App/DeleteConfigTest.php b/tests/Core/Command/Config/App/DeleteConfigTest.php
index 1e44c2aafe6..6f7bfbf3a7c 100644
--- a/tests/Core/Command/Config/App/DeleteConfigTest.php
+++ b/tests/Core/Command/Config/App/DeleteConfigTest.php
@@ -9,6 +9,7 @@ declare(strict_types=1);
 
 namespace Tests\Core\Command\Config\App;
 
+use OC\Config\ConfigManager;
 use OC\Core\Command\Config\App\DeleteConfig;
 use OCP\IAppConfig;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -19,6 +20,7 @@ use Test\TestCase;
 
 class DeleteConfigTest extends TestCase {
 	protected IAppConfig&MockObject $appConfig;
+	protected ConfigManager&MockObject $configManager;
 	protected InputInterface&MockObject $consoleInput;
 	protected OutputInterface&MockObject $consoleOutput;
 	protected Command $command;
@@ -27,10 +29,11 @@ class DeleteConfigTest extends TestCase {
 		parent::setUp();
 
 		$this->appConfig = $this->createMock(IAppConfig::class);
+		$this->configManager = $this->createMock(ConfigManager::class);
 		$this->consoleInput = $this->createMock(InputInterface::class);
 		$this->consoleOutput = $this->createMock(OutputInterface::class);
 
-		$this->command = new DeleteConfig($this->appConfig);
+		$this->command = new DeleteConfig($this->appConfig, $this->configManager);
 	}
 
 
diff --git a/tests/Core/Command/Config/App/GetConfigTest.php b/tests/Core/Command/Config/App/GetConfigTest.php
index 89a75c0b527..63a02f263d0 100644
--- a/tests/Core/Command/Config/App/GetConfigTest.php
+++ b/tests/Core/Command/Config/App/GetConfigTest.php
@@ -9,6 +9,7 @@ declare(strict_types=1);
 
 namespace Tests\Core\Command\Config\App;
 
+use OC\Config\ConfigManager;
 use OC\Core\Command\Config\App\GetConfig;
 use OCP\Exceptions\AppConfigUnknownKeyException;
 use OCP\IAppConfig;
@@ -20,6 +21,7 @@ use Test\TestCase;
 
 class GetConfigTest extends TestCase {
 	protected IAppConfig&MockObject $appConfig;
+	protected ConfigManager&MockObject $configManager;
 	protected InputInterface&MockObject $consoleInput;
 	protected OutputInterface&MockObject $consoleOutput;
 	protected Command $command;
@@ -28,10 +30,11 @@ class GetConfigTest extends TestCase {
 		parent::setUp();
 
 		$this->appConfig = $this->createMock(IAppConfig::class);
+		$this->configManager = $this->createMock(ConfigManager::class);
 		$this->consoleInput = $this->createMock(InputInterface::class);
 		$this->consoleOutput = $this->createMock(OutputInterface::class);
 
-		$this->command = new GetConfig($this->appConfig);
+		$this->command = new GetConfig($this->appConfig, $this->configManager);
 	}
 
 
diff --git a/tests/Core/Command/Config/App/SetConfigTest.php b/tests/Core/Command/Config/App/SetConfigTest.php
index 099471228b4..596439d85a8 100644
--- a/tests/Core/Command/Config/App/SetConfigTest.php
+++ b/tests/Core/Command/Config/App/SetConfigTest.php
@@ -10,6 +10,7 @@ declare(strict_types=1);
 namespace Tests\Core\Command\Config\App;
 
 use OC\AppConfig;
+use OC\Config\ConfigManager;
 use OC\Core\Command\Config\App\SetConfig;
 use OCP\Exceptions\AppConfigUnknownKeyException;
 use OCP\IAppConfig;
@@ -21,6 +22,7 @@ use Test\TestCase;
 
 class SetConfigTest extends TestCase {
 	protected IAppConfig&MockObject $appConfig;
+	protected ConfigManager&MockObject $configManager;
 	protected InputInterface&MockObject $consoleInput;
 	protected OutputInterface&MockObject $consoleOutput;
 	protected Command $command;
@@ -29,10 +31,11 @@ class SetConfigTest extends TestCase {
 		parent::setUp();
 
 		$this->appConfig = $this->createMock(AppConfig::class);
+		$this->configManager = $this->createMock(ConfigManager::class);
 		$this->consoleInput = $this->createMock(InputInterface::class);
 		$this->consoleOutput = $this->createMock(OutputInterface::class);
 
-		$this->command = new SetConfig($this->appConfig);
+		$this->command = new SetConfig($this->appConfig, $this->configManager);
 	}
 
 
diff --git a/tests/Core/Command/Config/ListConfigsTest.php b/tests/Core/Command/Config/ListConfigsTest.php
index 12a6e6f1cf8..216a6133579 100644
--- a/tests/Core/Command/Config/ListConfigsTest.php
+++ b/tests/Core/Command/Config/ListConfigsTest.php
@@ -7,6 +7,7 @@
 
 namespace Tests\Core\Command\Config;
 
+use OC\Config\ConfigManager;
 use OC\Core\Command\Config\ListConfigs;
 use OC\SystemConfig;
 use OCP\IAppConfig;
@@ -20,6 +21,8 @@ class ListConfigsTest extends TestCase {
 	protected $appConfig;
 	/** @var \PHPUnit\Framework\MockObject\MockObject */
 	protected $systemConfig;
+	/** @var \PHPUnit\Framework\MockObject\MockObject */
+	protected $configManager;
 
 	/** @var \PHPUnit\Framework\MockObject\MockObject */
 	protected $consoleInput;
@@ -38,12 +41,17 @@ class ListConfigsTest extends TestCase {
 		$appConfig = $this->appConfig = $this->getMockBuilder(IAppConfig::class)
 			->disableOriginalConstructor()
 			->getMock();
+		$configManager = $this->configManager = $this->getMockBuilder(ConfigManager::class)
+			->disableOriginalConstructor()
+			->getMock();
+
 		$this->consoleInput = $this->getMockBuilder(InputInterface::class)->getMock();
 		$this->consoleOutput = $this->getMockBuilder(OutputInterface::class)->getMock();
 
 		/** @var \OC\SystemConfig $systemConfig */
 		/** @var \OCP\IAppConfig $appConfig */
-		$this->command = new ListConfigs($systemConfig, $appConfig);
+		/** @var ConfigManager $configManager */
+		$this->command = new ListConfigs($systemConfig, $appConfig, $configManager);
 	}
 
 	public static function listData(): array {
diff --git a/tests/lib/DB/AdapterTest.php b/tests/lib/DB/AdapterTest.php
index 99b7cf4e099..1b8c38c0edc 100644
--- a/tests/lib/DB/AdapterTest.php
+++ b/tests/lib/DB/AdapterTest.php
@@ -14,7 +14,7 @@ class AdapterTest extends TestCase {
 
 	public function setUp(): void {
 		$this->connection = \OC::$server->getDatabaseConnection();
-		$this->appId = uniqid('test_db_adapter', true);
+		$this->appId = substr(uniqid('test_db_adapter', true), 0, 32);
 	}
 
 	public function tearDown(): void {