From 14ef33879bbaec4c62bd47b92d9eefaa6abc2448 Mon Sep 17 00:00:00 2001
From: "J. King" <jking@jkingweb.ca>
Date: Sun, 19 Jan 2020 18:13:32 -0500
Subject: [PATCH] Re-arrange database tests by engine

---
 tests/cases/REST/NextcloudNews/TestV1_2.php |  1 +
 tests/phpunit.dist.xml                      | 28 ++++++++++-----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/tests/cases/REST/NextcloudNews/TestV1_2.php b/tests/cases/REST/NextcloudNews/TestV1_2.php
index 090e90f..af3d9d5 100644
--- a/tests/cases/REST/NextcloudNews/TestV1_2.php
+++ b/tests/cases/REST/NextcloudNews/TestV1_2.php
@@ -462,6 +462,7 @@ class TestV1_2 extends \JKingWeb\Arsse\Test\AbstractTest {
         $this->assertMessage($exp, $act);
         \Phake::verify(Arsse::$db)->folderPropertiesSet(Arsse::$user->id, $id, $input);
     }
+
     public function provideFolderRenamings() {
         return [
             [['name' => "Software"], 1, true,                                      new EmptyResponse(204)],
diff --git a/tests/phpunit.dist.xml b/tests/phpunit.dist.xml
index 9708442..6732b56 100644
--- a/tests/phpunit.dist.xml
+++ b/tests/phpunit.dist.xml
@@ -59,54 +59,52 @@
         <file>cases/Feed/TestFetching.php</file>
         <file>cases/Feed/TestFeed.php</file>
     </testsuite>
-    <testsuite name="Database drivers">
+    <testsuite name="Database interface">
         <file>cases/Db/TestTransaction.php</file>
         <file>cases/Db/TestResultAggregate.php</file>
         <file>cases/Db/TestResultEmpty.php</file>
-
+        <file>cases/Database/TestDatabase.php</file>
+    </testsuite>
+    <testsuite name="SQLite">
         <file>cases/Db/SQLite3/TestResult.php</file>
         <file>cases/Db/SQLite3/TestStatement.php</file>
         <file>cases/Db/SQLite3/TestCreation.php</file>
         <file>cases/Db/SQLite3/TestDriver.php</file>
         <file>cases/Db/SQLite3/TestUpdate.php</file>
-
+        <file>cases/Db/SQLite3/TestDatabase.php</file>
         <file>cases/Db/SQLite3PDO/TestResult.php</file>
         <file>cases/Db/SQLite3PDO/TestStatement.php</file>
         <file>cases/Db/SQLite3PDO/TestCreation.php</file>
         <file>cases/Db/SQLite3PDO/TestDriver.php</file>
         <file>cases/Db/SQLite3PDO/TestUpdate.php</file>
-
+        <file>cases/Db/SQLite3PDO/TestDatabase.php</file>
+    </testsuite>
+    <testsuite name="PostgreSQL">
         <file>cases/Db/PostgreSQL/TestResult.php</file>
         <file>cases/Db/PostgreSQL/TestStatement.php</file>
         <file>cases/Db/PostgreSQL/TestCreation.php</file>
         <file>cases/Db/PostgreSQL/TestDriver.php</file>
         <file>cases/Db/PostgreSQL/TestUpdate.php</file>
-
+        <file>cases/Db/PostgreSQL/TestDatabase.php</file>
         <file>cases/Db/PostgreSQLPDO/TestResult.php</file>
         <file>cases/Db/PostgreSQLPDO/TestStatement.php</file>
         <file>cases/Db/PostgreSQLPDO/TestCreation.php</file>
         <file>cases/Db/PostgreSQLPDO/TestDriver.php</file>
         <file>cases/Db/PostgreSQLPDO/TestUpdate.php</file>
-
+        <file>cases/Db/PostgreSQLPDO/TestDatabase.php</file>
+    </testsuite>
+    <testsuite name="MySQL">
         <file>cases/Db/MySQL/TestResult.php</file>
         <file>cases/Db/MySQL/TestStatement.php</file>
         <file>cases/Db/MySQL/TestCreation.php</file>
         <file>cases/Db/MySQL/TestDriver.php</file>
         <file>cases/Db/MySQL/TestUpdate.php</file>
-
+        <file>cases/Db/MySQL/TestDatabase.php</file>
         <file>cases/Db/MySQLPDO/TestResult.php</file>
         <file>cases/Db/MySQLPDO/TestStatement.php</file>
         <file>cases/Db/MySQLPDO/TestCreation.php</file>
         <file>cases/Db/MySQLPDO/TestDriver.php</file>
         <file>cases/Db/MySQLPDO/TestUpdate.php</file>
-    </testsuite>
-    <testsuite name="Database functions">
-        <file>cases/Database/TestDatabase.php</file>
-        <file>cases/Db/SQLite3/TestDatabase.php</file>
-        <file>cases/Db/SQLite3PDO/TestDatabase.php</file>
-        <file>cases/Db/PostgreSQL/TestDatabase.php</file>
-        <file>cases/Db/PostgreSQLPDO/TestDatabase.php</file>
-        <file>cases/Db/MySQL/TestDatabase.php</file>
         <file>cases/Db/MySQLPDO/TestDatabase.php</file>
     </testsuite>
     <testsuite name="REST">