From 17a2723948830e30713d012f0739c336af2a12f1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 18 Oct 2016 11:17:13 +0200 Subject: [PATCH] Fix the test Signed-off-by: Joas Schilling --- tests/lib/DB/LegacyDBTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/lib/DB/LegacyDBTest.php b/tests/lib/DB/LegacyDBTest.php index d28dfd1448..f3de570c52 100644 --- a/tests/lib/DB/LegacyDBTest.php +++ b/tests/lib/DB/LegacyDBTest.php @@ -400,18 +400,18 @@ class LegacyDBTest extends \Test\TestCase { /** * @dataProvider insertAndSelectDataProvider */ - public function testInsertAndSelectData($expected, $skipOnMysql) { + public function testInsertAndSelectData($expected, $throwsOnMysqlWithoutUTF8MB4) { $table = "*PREFIX*{$this->text_table}"; + $config = \OC::$server->getConfig(); $query = OC_DB::prepare("INSERT INTO `$table` (`textfield`) VALUES (?)"); + if ($throwsOnMysqlWithoutUTF8MB4 && $config->getSystemValue('dbtype', 'sqlite') === 'mysql' && $config->getSystemValue('mysql.utf8mb4', false) === false) { + $this->markTestSkipped('MySQL requires UTF8mb4 to store value: ' . $expected); + } $result = $query->execute(array($expected)); $this->assertEquals(1, $result); $actual = OC_DB::prepare("SELECT `textfield` FROM `$table`")->execute()->fetchOne(); - $config = \OC::$server->getConfig(); - if($skipOnMysql && $config->getSystemValue('dbtype', 'sqlite') === 'mysql' && $config->getSystemValue('mysql.utf8mb4', false) === false) { - return; - } $this->assertSame($expected, $actual); }