From d272df38d498f77bb9606341d7e33cecef840432 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Wed, 27 Sep 2023 18:56:46 +0000
Subject: [PATCH] fix sql connection tests

---
 .../Connection/MysqlConnectionTest.php         |  9 +++++++++
 .../Connection/PostgresConnectionTest.php      | 15 ++++++++++++---
 .../Connection/SQLiteConnectionTest.php        |  5 +++++
 .../Connection/SqlServerConnectionTest.php     | 18 ++++++++++++++++++
 4 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/tests/DataStorage/Database/Connection/MysqlConnectionTest.php b/tests/DataStorage/Database/Connection/MysqlConnectionTest.php
index 47d4e3be6..db2b820fe 100755
--- a/tests/DataStorage/Database/Connection/MysqlConnectionTest.php
+++ b/tests/DataStorage/Database/Connection/MysqlConnectionTest.php
@@ -50,6 +50,7 @@ final class MysqlConnectionTest extends \PHPUnit\Framework\TestCase
         self::assertEquals((int) $GLOBALS['CONFIG']['db']['core']['masters']['admin']['port'], $mysql->getPort());
         self::assertInstanceOf('\phpOMS\DataStorage\Database\Query\Grammar\MysqlGrammar', $mysql->getGrammar());
         self::assertEquals(DatabaseType::MYSQL, $mysql->getType());
+        $mysql->close();
     }
 
     /**
@@ -65,6 +66,7 @@ final class MysqlConnectionTest extends \PHPUnit\Framework\TestCase
         $mysql = new MysqlConnection($db);
         $mysql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $mysql->getStatus());
+        $mysql->close();
     }
 
     /**
@@ -80,6 +82,7 @@ final class MysqlConnectionTest extends \PHPUnit\Framework\TestCase
         $mysql = new MysqlConnection($db);
         $mysql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $mysql->getStatus());
+        $mysql->close();
     }
 
     /**
@@ -95,6 +98,7 @@ final class MysqlConnectionTest extends \PHPUnit\Framework\TestCase
         $mysql = new MysqlConnection($db);
         $mysql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $mysql->getStatus());
+        $mysql->close();
     }
 
     /**
@@ -110,6 +114,7 @@ final class MysqlConnectionTest extends \PHPUnit\Framework\TestCase
         $mysql = new MysqlConnection($db);
         $mysql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $mysql->getStatus());
+        $mysql->close();
     }
 
     /**
@@ -125,6 +130,7 @@ final class MysqlConnectionTest extends \PHPUnit\Framework\TestCase
         $mysql = new MysqlConnection($db);
         $mysql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $mysql->getStatus());
+        $mysql->close();
     }
 
     /**
@@ -140,6 +146,7 @@ final class MysqlConnectionTest extends \PHPUnit\Framework\TestCase
         $mysql = new MysqlConnection($db);
         $mysql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $mysql->getStatus());
+        $mysql->close();
     }
 
     /**
@@ -155,6 +162,7 @@ final class MysqlConnectionTest extends \PHPUnit\Framework\TestCase
         $mysql = new MysqlConnection($db);
         $mysql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $mysql->getStatus());
+        $mysql->close();
     }
 
     /**
@@ -170,5 +178,6 @@ final class MysqlConnectionTest extends \PHPUnit\Framework\TestCase
         $mysql = new MysqlConnection($db);
         $mysql->connect();
         self::assertEquals(DatabaseStatus::MISSING_DATABASE, $mysql->getStatus());
+        $mysql->close();
     }
 }
diff --git a/tests/DataStorage/Database/Connection/PostgresConnectionTest.php b/tests/DataStorage/Database/Connection/PostgresConnectionTest.php
index e66329e1b..8cda49ec6 100755
--- a/tests/DataStorage/Database/Connection/PostgresConnectionTest.php
+++ b/tests/DataStorage/Database/Connection/PostgresConnectionTest.php
@@ -50,6 +50,7 @@ final class PostgresConnectionTest extends \PHPUnit\Framework\TestCase
         self::assertEquals((int) $GLOBALS['CONFIG']['db']['core']['postgresql']['admin']['port'], $psql->getPort());
         self::assertInstanceOf('\phpOMS\DataStorage\Database\Query\Grammar\PostgresGrammar', $psql->getGrammar());
         self::assertEquals(DatabaseType::PGSQL, $psql->getType());
+        $psql->close();
     }
 
     /**
@@ -64,6 +65,7 @@ final class PostgresConnectionTest extends \PHPUnit\Framework\TestCase
         $psql = new PostgresConnection($db);
         $psql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $psql->getStatus());
+        $psql->close();
     }
 
     /**
@@ -78,6 +80,7 @@ final class PostgresConnectionTest extends \PHPUnit\Framework\TestCase
         $psql = new PostgresConnection($db);
         $psql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $psql->getStatus());
+        $psql->close();
     }
 
     /**
@@ -92,6 +95,7 @@ final class PostgresConnectionTest extends \PHPUnit\Framework\TestCase
         $psql = new PostgresConnection($db);
         $psql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $psql->getStatus());
+        $psql->close();
     }
 
     /**
@@ -106,6 +110,7 @@ final class PostgresConnectionTest extends \PHPUnit\Framework\TestCase
         $psql = new PostgresConnection($db);
         $psql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $psql->getStatus());
+        $psql->close();
     }
 
     /**
@@ -120,6 +125,7 @@ final class PostgresConnectionTest extends \PHPUnit\Framework\TestCase
         $psql = new PostgresConnection($db);
         $psql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $psql->getStatus());
+        $psql->close();
     }
 
     /**
@@ -134,6 +140,7 @@ final class PostgresConnectionTest extends \PHPUnit\Framework\TestCase
         $psql = new PostgresConnection($db);
         $psql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $psql->getStatus());
+        $psql->close();
     }
 
     /**
@@ -148,6 +155,7 @@ final class PostgresConnectionTest extends \PHPUnit\Framework\TestCase
         $psql     = new PostgresConnection($db);
         $psql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $psql->getStatus());
+        $psql->close();
     }
 
     /**
@@ -160,8 +168,9 @@ final class PostgresConnectionTest extends \PHPUnit\Framework\TestCase
         $db             = $GLOBALS['CONFIG']['db']['core']['masters']['admin'];
         $db['database'] = 'invalid';
 
-        $mysql = new PostgresConnection($db);
-        $mysql->connect();
-        self::assertEquals(DatabaseStatus::MISSING_DATABASE, $mysql->getStatus());
+        $psql = new PostgresConnection($db);
+        $psql->connect();
+        self::assertEquals(DatabaseStatus::MISSING_DATABASE, $psql->getStatus());
+        $psql->close();
     }
 }
diff --git a/tests/DataStorage/Database/Connection/SQLiteConnectionTest.php b/tests/DataStorage/Database/Connection/SQLiteConnectionTest.php
index 1c7ab3ffe..b1daf453e 100755
--- a/tests/DataStorage/Database/Connection/SQLiteConnectionTest.php
+++ b/tests/DataStorage/Database/Connection/SQLiteConnectionTest.php
@@ -47,6 +47,7 @@ final class SQLiteConnectionTest extends \PHPUnit\Framework\TestCase
         self::assertEquals($GLOBALS['CONFIG']['db']['core']['sqlite']['admin']['database'], $sqlite->getDatabase());
         self::assertInstanceOf('\phpOMS\DataStorage\Database\Query\Grammar\SQLiteGrammar', $sqlite->getGrammar());
         self::assertEquals(DatabaseType::SQLITE, $sqlite->getType());
+        $sqlite->close();
     }
 
     /**
@@ -61,6 +62,7 @@ final class SQLiteConnectionTest extends \PHPUnit\Framework\TestCase
         $sqlite = new SQLiteConnection($db);
         $sqlite->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $sqlite->getStatus());
+        $sqlite->close();
     }
 
     /**
@@ -76,6 +78,7 @@ final class SQLiteConnectionTest extends \PHPUnit\Framework\TestCase
         $sqlite = new SQLiteConnection($db);
         $sqlite->connect();
         self::assertEquals(DatabaseStatus::MISSING_DATABASE, $sqlite->getStatus());
+        $sqlite->close();
     }
 
     /**
@@ -90,6 +93,7 @@ final class SQLiteConnectionTest extends \PHPUnit\Framework\TestCase
         $sqlite = new SQLiteConnection($db);
         $sqlite->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $sqlite->getStatus());
+        $sqlite->close();
     }
 
     /**
@@ -105,6 +109,7 @@ final class SQLiteConnectionTest extends \PHPUnit\Framework\TestCase
         $sqlite = new SQLiteConnection($db);
         $sqlite->connect();
         self::assertEquals(DatabaseStatus::MISSING_DATABASE, $sqlite->getStatus());
+        $sqlite->close();
     }
 
     /*
diff --git a/tests/DataStorage/Database/Connection/SqlServerConnectionTest.php b/tests/DataStorage/Database/Connection/SqlServerConnectionTest.php
index 6ec079702..c87abe0d1 100755
--- a/tests/DataStorage/Database/Connection/SqlServerConnectionTest.php
+++ b/tests/DataStorage/Database/Connection/SqlServerConnectionTest.php
@@ -32,6 +32,15 @@ final class SqlServerConnectionTest extends \PHPUnit\Framework\TestCase
               'The Sqlsrv extension is not available.'
             );
         }
+
+        $ssql = new SqlServerConnection($GLOBALS['CONFIG']['db']['core']['mssql']['admin']);
+        $ssql->connect();
+        if ($ssql->getStatus() !== DatabaseStatus::OK) {
+            $this->markTestSkipped(
+                'The Sqlsrv extension is not available.'
+              );
+        }
+        $ssql->close();
     }
 
     /**
@@ -49,6 +58,7 @@ final class SqlServerConnectionTest extends \PHPUnit\Framework\TestCase
         self::assertEquals((int) $GLOBALS['CONFIG']['db']['core']['mssql']['admin']['port'], $ssql->getPort());
         self::assertInstanceOf('\phpOMS\DataStorage\Database\Query\Grammar\SqlServerGrammar', $ssql->getGrammar());
         self::assertEquals(DatabaseType::SQLSRV, $ssql->getType());
+        $ssql->close();
     }
 
     /**
@@ -63,6 +73,7 @@ final class SqlServerConnectionTest extends \PHPUnit\Framework\TestCase
         $ssql = new SqlServerConnection($db);
         $ssql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $ssql->getStatus());
+        $ssql->close();
     }
 
     /**
@@ -77,6 +88,7 @@ final class SqlServerConnectionTest extends \PHPUnit\Framework\TestCase
         $ssql = new SqlServerConnection($db);
         $ssql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $ssql->getStatus());
+        $ssql->close();
     }
 
     /**
@@ -91,6 +103,7 @@ final class SqlServerConnectionTest extends \PHPUnit\Framework\TestCase
         $ssql = new SqlServerConnection($db);
         $ssql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $ssql->getStatus());
+        $ssql->close();
     }
 
     /**
@@ -105,6 +118,7 @@ final class SqlServerConnectionTest extends \PHPUnit\Framework\TestCase
         $ssql = new SqlServerConnection($db);
         $ssql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $ssql->getStatus());
+        $ssql->close();
     }
 
     /**
@@ -119,6 +133,7 @@ final class SqlServerConnectionTest extends \PHPUnit\Framework\TestCase
         $ssql = new SqlServerConnection($db);
         $ssql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $ssql->getStatus());
+        $ssql->close();
     }
 
     /**
@@ -133,6 +148,7 @@ final class SqlServerConnectionTest extends \PHPUnit\Framework\TestCase
         $ssql = new SqlServerConnection($db);
         $ssql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $ssql->getStatus());
+        $ssql->close();
     }
 
     /**
@@ -147,6 +163,7 @@ final class SqlServerConnectionTest extends \PHPUnit\Framework\TestCase
         $ssql     = new SqlServerConnection($db);
         $ssql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $ssql->getStatus());
+        $ssql->close();
     }
 
     /**
@@ -161,5 +178,6 @@ final class SqlServerConnectionTest extends \PHPUnit\Framework\TestCase
         $ssql = new SqlServerConnection($db);
         $ssql->connect();
         self::assertEquals(DatabaseStatus::FAILURE, $ssql->getStatus());
+        $ssql->close();
     }
 }