From 43fa2d5c8cbbe3dc4976feedd565ddf837af1dfc Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 3 Jan 2022 17:25:45 +0100 Subject: Test with real data Signed-off-by: Joas Schilling --- tests/lib/DB/QueryBuilder/FunctionBuilderTest.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php b/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php index 938ab6d2b05..a0ae05d0149 100644 --- a/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php +++ b/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php @@ -58,7 +58,7 @@ class FunctionBuilderTest extends TestCase { $delete = $this->connection->getQueryBuilder(); $delete->delete('appconfig') - ->where($delete->expr()->eq('appid', $delete->createNamedParameter('group_concat', IQueryBuilder::PARAM_STR))); + ->where($delete->expr()->eq('appid', $delete->createNamedParameter('group_concat'))); $delete->executeStatement(); } @@ -67,9 +67,9 @@ class FunctionBuilderTest extends TestCase { $insert = $this->connection->getQueryBuilder(); $insert->insert('appconfig') - ->setValue('appid', $insert->createNamedParameter('group_concat', IQueryBuilder::PARAM_STR)) - ->setValue('configvalue', $insert->createNamedParameter('unittest', IQueryBuilder::PARAM_STR)) - ->setValue('configkey', $insert->createParameter('value', IQueryBuilder::PARAM_STR)); + ->setValue('appid', $insert->createNamedParameter('group_concat')) + ->setValue('configvalue', $insert->createNamedParameter('unittest')) + ->setValue('configkey', $insert->createParameter('value')); $insert->setParameter('value', '1'); $insert->executeStatement(); @@ -90,10 +90,13 @@ class FunctionBuilderTest extends TestCase { $result = $query->execute(); $column = $result->fetchOne(); $result->closeCursor(); - $this->assertGreaterThan(1, str_getcsv($column, ',')); + $this->assertStringContainsString(',', $column); + $actual = explode(',', $column); + $this->assertEqualsCanonicalizing([1,2,3], $actual); } - public function testGroupConcatWithSeparatorAndOrder() { + public function testGroupConcatWithSeparator() { + $this->addDummyData(); $query = $this->connection->getQueryBuilder(); $query->select($query->func()->groupConcat('configkey', '#')) @@ -103,7 +106,9 @@ class FunctionBuilderTest extends TestCase { $result = $query->execute(); $column = $result->fetchOne(); $result->closeCursor(); - $this->assertGreaterThan(1, str_getcsv($column, '#', 'appid')); + $this->assertStringContainsString('#', $column); + $actual = explode('#', $column); + $this->assertEqualsCanonicalizing([1,2,3], $actual); } public function testMd5() { -- cgit v1.2.3