fix tests

Signed-off-by: Maxence Lange <[email protected]>
nextcloud · Dec 7, 2023 · 4e0783a · 4e0783a
1 parent 662161f
commit 4e0783a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/core/Migrations/Version29000Date20231126110901.php b/core/Migrations/Version29000Date20231126110901.php
@@ -46,8 +46,8 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			return null;
 		}
 
-		$table->addColumn('lazy_group', Types::STRING, ['length' => 32, 'default' => '']);
-		$table->addColumn('sensitive', Types::SMALLINT, ['length' => 1, 'default' => '0']);
+		$table->addColumn('lazy_group', Types::STRING, ['length' => 32, 'notnull' => true, 'default' => '']);
+		$table->addColumn('sensitive', Types::SMALLINT, ['length' => 1, 'notnull' => true, 'default' => '0']);
 
 		if ($table->hasIndex('appconfig_config_key_index')) {
 			$table->dropIndex('appconfig_config_key_index');

diff --git a/tests/lib/AppConfigTest.php b/tests/lib/AppConfigTest.php
@@ -11,6 +11,8 @@
 
 use OC\AppConfig;
 use OC\DB\Connection;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IAppConfig;
 use OCP\IConfig;
 
 /**
@@ -52,6 +54,8 @@ protected function setUp(): void {
 				'appid' => $sql->createParameter('appid'),
 				'configkey' => $sql->createParameter('configkey'),
 				'configvalue' => $sql->createParameter('configvalue'),
+				'lazy_group' => $sql->createNamedParameter(''),
+				'sensitive' => $sql->createNamedParameter(0, IQueryBuilder::PARAM_INT),
 			]);
 
 		$sql->setParameters([
@@ -139,7 +143,7 @@ protected function tearDown(): void {
 	}
 
 	public function testGetApps() {
-		$config = new \OC\AppConfig(\OC::$server->get(Connection::class));
+		$config = \OCP\Server::get(IAppConfig::class);
 
 		$this->assertEqualsCanonicalizing([
 			'anotherapp',
@@ -150,7 +154,7 @@ public function testGetApps() {
 	}
 
 	public function testGetKeys() {
-		$config = new \OC\AppConfig(\OC::$server->get(Connection::class));
+		$config = \OCP\Server::get(IAppConfig::class);
 
 		$keys = $config->getKeys('testapp');
 		$this->assertEqualsCanonicalizing([
@@ -163,7 +167,7 @@ public function testGetKeys() {
 	}
 
 	public function testGetValue() {
-		$config = new \OC\AppConfig(\OC::$server->get(Connection::class));
+		$config = \OCP\Server::get(IAppConfig::class);
 
 		$value = $config->getValue('testapp', 'installed_version');
 		$this->assertConfigKey('testapp', 'installed_version', $value);
@@ -176,15 +180,15 @@ public function testGetValue() {
 	}
 
 	public function testHasKey() {
-		$config = new \OC\AppConfig(\OC::$server->get(Connection::class));
+		$config = \OCP\Server::get(IAppConfig::class);
 
 		$this->assertTrue($config->hasKey('testapp', 'installed_version'));
 		$this->assertFalse($config->hasKey('testapp', 'nonexistant'));
 		$this->assertFalse($config->hasKey('nonexistant', 'nonexistant'));
 	}
 
 	public function testSetValueUpdate() {
-		$config = new \OC\AppConfig(\OC::$server->get(Connection::class));
+		$config = \OCP\Server::get(IAppConfig::class);
 
 		$this->assertEquals('1.2.3', $config->getValue('testapp', 'installed_version'));
 		$this->assertConfigKey('testapp', 'installed_version', '1.2.3');
@@ -208,7 +212,7 @@ public function testSetValueUpdate() {
 	}
 
 	public function testSetValueInsert() {
-		$config = new \OC\AppConfig(\OC::$server->get(Connection::class));
+		$config = \OCP\Server::get(IAppConfig::class);
 
 		$this->assertFalse($config->hasKey('someapp', 'somekey'));
 		$this->assertNull($config->getValue('someapp', 'somekey'));
@@ -226,7 +230,7 @@ public function testSetValueInsert() {
 	}
 
 	public function testDeleteKey() {
-		$config = new \OC\AppConfig(\OC::$server->get(Connection::class));
+		$config = \OCP\Server::get(IAppConfig::class);
 
 		$this->assertTrue($config->hasKey('testapp', 'deletethis'));
 
@@ -248,7 +252,7 @@ public function testDeleteKey() {
 	}
 
 	public function testDeleteApp() {
-		$config = new \OC\AppConfig(\OC::$server->get(Connection::class));
+		$config = \OCP\Server::get(IAppConfig::class);
 
 		$this->assertTrue($config->hasKey('someapp', 'otherkey'));
 
@@ -268,15 +272,15 @@ public function testDeleteApp() {
 	}
 
 	public function testGetValuesNotAllowed() {
-		$config = new \OC\AppConfig(\OC::$server->get(Connection::class));
+		$config = \OCP\Server::get(IAppConfig::class);
 
 		$this->assertFalse($config->getValues('testapp', 'enabled'));
 
 		$this->assertFalse($config->getValues(false, false));
 	}
 
 	public function testGetValues() {
-		$config = new \OC\AppConfig(\OC::$server->get(Connection::class));
+		$config = \OCP\Server::get(IAppConfig::class);
 
 		$sql = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 		$sql->select(['configkey', 'configvalue'])
@@ -334,8 +338,8 @@ public function testGetFilteredValues() {
 	}
 
 	public function testSettingConfigParallel() {
-		$appConfig1 = new \OC\AppConfig(\OC::$server->get(Connection::class));
-		$appConfig2 = new \OC\AppConfig(\OC::$server->get(Connection::class));
+		$appConfig1 = \OCP\Server::get(IAppConfig::class);
+		$appConfig2 = \OCP\Server::get(IAppConfig::class);
 		$appConfig1->getValue('testapp', 'foo', 'v1');
 		$appConfig2->getValue('testapp', 'foo', 'v1');
 

diff --git a/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php b/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php
@@ -157,6 +157,8 @@ protected function createConfig($appId, $key, $value) {
 				'appid' => $query->createNamedParameter($appId),
 				'configkey' => $query->createNamedParameter((string) $key),
 				'configvalue' => $query->createNamedParameter((string) $value),
+				'lazy_group' => $query->createNamedParameter(''),
+				'sensitive' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT),
 			])
 			->execute();
 	}

diff --git a/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php b/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php
@@ -431,6 +431,8 @@ protected function createConfig($appId, $key, $value) {
 				'appid' => $query->createNamedParameter($appId),
 				'configkey' => $query->createNamedParameter((string) $key),
 				'configvalue' => $query->createNamedParameter((string) $value),
+				'lazy_group' => $query->createNamedParameter(''),
+				'sensitive' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT),
 			])
 			->execute();
 	}

diff --git a/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php b/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php
@@ -114,7 +114,9 @@ protected function addDummyData(): void {
 		$insert->insert('appconfig')
 			->setValue('appid', $insert->createNamedParameter('group_concat'))
 			->setValue('configvalue', $insert->createNamedParameter('unittest'))
-			->setValue('configkey', $insert->createParameter('value'));
+			->setValue('configkey', $insert->createParameter('value'))
+			->setValue('lazy_group', $insert->createParameter(''))
+			->setValue('sensitive', $insert->createParameter(0, IQueryBuilder::PARAM_INT));
 
 		$insert->setParameter('value', '1');
 		$insert->executeStatement();
@@ -394,6 +396,8 @@ private function setUpMinMax($value) {
 				'appid' => $query->createNamedParameter('minmax'),
 				'configkey' => $query->createNamedParameter(uniqid()),
 				'configvalue' => $query->createNamedParameter((string)$value),
+				'lazy_group' => $query->createNamedParameter(''),
+				'sensitive' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT),
 			]);
 		$query->execute();
 	}