Skip to content

Commit 823a480

Browse files
committed
Try to cleanup failing tests
1 parent 7bcdd2c commit 823a480

3 files changed

Lines changed: 16 additions & 16 deletions

File tree

Tests/Pgsql/PgsqlPreparedStatementTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
use Joomla\Database\Exception\ExecutionFailureException;
1111
use Joomla\Test\DatabaseTestCase;
1212

13+
/**
14+
* Test class for Joomla\Database\Pgsql\PgsqlStatement
15+
*/
1316
class PgsqlPreparedStatementTest extends DatabaseTestCase
1417
{
1518
/**
@@ -19,14 +22,11 @@ class PgsqlPreparedStatementTest extends DatabaseTestCase
1922
*/
2023
public static function setUpBeforeClass(): void
2124
{
22-
$manager = static::getDatabaseManager();
25+
parent::setUpBeforeClass();
2326

24-
$connection = $manager->getConnection();
25-
$manager->dropDatabase();
26-
$manager->createDatabase();
27-
$connection->select($manager->getDbName());
28-
29-
static::$connection = $connection;
27+
if (!static::$connection || static::$connection->getName() !== 'pgsql') {
28+
self::markTestSkipped('PostgreSQL database not configured.');
29+
}
3030
}
3131

3232
/**

Tests/Sqlsrv/SqlsrvPreparedStatementTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
use Joomla\Database\Sqlsrv\SqlsrvStatement;
1212
use Joomla\Test\DatabaseTestCase;
1313

14+
/**
15+
* Test class for Joomla\Database\Sqlsrv\SqlsrvStatement
16+
*/
1417
class SqlsrvPreparedStatementTest extends DatabaseTestCase
1518
{
1619
/**
@@ -20,14 +23,11 @@ class SqlsrvPreparedStatementTest extends DatabaseTestCase
2023
*/
2124
public static function setUpBeforeClass(): void
2225
{
23-
$manager = static::getDatabaseManager();
26+
parent::setUpBeforeClass();
2427

25-
$connection = $manager->getConnection();
26-
$manager->dropDatabase();
27-
$manager->createDatabase();
28-
$connection->select($manager->getDbName());
29-
30-
static::$connection = $connection;
28+
if (!static::$connection || static::$connection->getName() !== 'sqlsrv') {
29+
self::markTestSkipped('SQL Server database not configured.');
30+
}
3131
}
3232

3333
/**
@@ -49,7 +49,7 @@ protected function setUp(): void
4949
} catch (ExecutionFailureException $exception) {
5050
$this->markTestSkipped(
5151
\sprintf(
52-
'Could not load MS SQL Server database: %s',
52+
'Could not load SQL Server database: %s',
5353
$exception->getMessage()
5454
)
5555
);

Tests/Sqlsrv/SqlsrvStatementTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @license GNU General Public License version 2 or later; see LICENSE
55
*/
66

7-
namespace Joomla\Database\Tests\Sqlqrv;
7+
namespace Joomla\Database\Tests\Sqlsrv;
88

99
use Joomla\Database\DatabaseDriver;
1010
use Joomla\Database\Exception\ExecutionFailureException;

0 commit comments

Comments
 (0)