From ac867c903a81bb5e76aa20a3a99e01b2825a885e Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Tue, 19 Jul 2016 15:19:48 -0400 Subject: [PATCH] Actually fix failing test, remove some older test skips --- tests/databases/firebird/FirebirdQBTest.php | 6 ------ tests/databases/firebird/FirebirdTest.php | 5 ----- tests/databases/mysql/MySQLQBTest.php | 4 ++-- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/tests/databases/firebird/FirebirdQBTest.php b/tests/databases/firebird/FirebirdQBTest.php index e337d50..25cea6f 100644 --- a/tests/databases/firebird/FirebirdQBTest.php +++ b/tests/databases/firebird/FirebirdQBTest.php @@ -126,12 +126,6 @@ class FirebirdQBTest extends QBTest { public function testResultErrors() { - - if (version_compare(PHP_VERSION, '7.0.0', '>=')) - { - $this->markTestSkipped("Segfaults on this version of PHP"); - } - $obj = self::$db->query('SELECT * FROM "create_test"'); // Test row count diff --git a/tests/databases/firebird/FirebirdTest.php b/tests/databases/firebird/FirebirdTest.php index b8ca021..f8bbdbf 100644 --- a/tests/databases/firebird/FirebirdTest.php +++ b/tests/databases/firebird/FirebirdTest.php @@ -136,11 +136,6 @@ class FirebirdTest extends DBtest { public function testTruncate() { - if (version_compare(PHP_VERSION, '7.0.0', '>=')) - { - $this->markTestSkipped("Segfaults on this version of PHP"); - } - self::$db->truncate('create_test'); $this->assertTrue(self::$db->affected_rows() > 0); diff --git a/tests/databases/mysql/MySQLQBTest.php b/tests/databases/mysql/MySQLQBTest.php index d3e023d..dbe564c 100644 --- a/tests/databases/mysql/MySQLQBTest.php +++ b/tests/databases/mysql/MySQLQBTest.php @@ -68,7 +68,7 @@ class MySQLQBTest extends QBTest { // The important thing is that there is an array // of results returned $this->assertTrue(is_array($res)); - $this->assertTrue(count($res) > 1); - $this->assertTrue(array_key_exists('table', $res)); + $this->assertTrue(count(array_keys($res[0])) > 1); + $this->assertTrue(array_key_exists('table', $res[0])); } } \ No newline at end of file