tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-01 07:17:48 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10868 from creative-commoners/pulls/5.0/unit-test

Browse Source 
MNT Fix unit test
This commit is contained in:
Guy Sartorelli 2023-07-12 11:56:09 +12:00 committed by GitHub
commit 9b2aee10dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/php/ORM/DataListTest.php
View File

@ -26,6 +26,7 @@ use SilverStripe\ORM\Tests\DataObjectTest\Team;
use SilverStripe\ORM\Tests\DataObjectTest\TeamComment; use SilverStripe\ORM\Tests\DataObjectTest\TeamComment;
use SilverStripe\ORM\Tests\DataObjectTest\ValidatedObject; use SilverStripe\ORM\Tests\DataObjectTest\ValidatedObject;
use SilverStripe\ORM\Tests\ManyManyListTest\Category; use SilverStripe\ORM\Tests\ManyManyListTest\Category;
use SilverStripe\ORM\Connect\DatabaseException;
class DataListTest extends SapphireTest class DataListTest extends SapphireTest
{ {
@ -1860,7 +1861,7 @@ class DataListTest extends SapphireTest
if (!(DB::get_conn()->getConnector() instanceof MySQLiConnector)) { if (!(DB::get_conn()->getConnector() instanceof MySQLiConnector)) {
$this->markTestSkipped('Database connector is not MySQLiConnector'); $this->markTestSkipped('Database connector is not MySQLiConnector');
} }
$this->expectException(\mysqli_sql_exception::class); $this->expectException(DatabaseException::class);
$this->expectExceptionMessageMatches('/Unknown column/'); $this->expectExceptionMessageMatches('/Unknown column/');
} elseif ($type === 'invalid-column') { } elseif ($type === 'invalid-column') {
$this->expectException(InvalidArgumentException::class); $this->expectException(InvalidArgumentException::class);
@ -1891,7 +1892,7 @@ class DataListTest extends SapphireTest
if (!(DB::get_conn()->getConnector() instanceof MySQLiConnector)) { if (!(DB::get_conn()->getConnector() instanceof MySQLiConnector)) {
$this->markTestSkipped('Database connector is not MySQLiConnector'); $this->markTestSkipped('Database connector is not MySQLiConnector');
} }
$this->expectException(\mysqli_sql_exception::class); $this->expectException(DatabaseException::class);
if ($type === 'error-in-sql-syntax') { if ($type === 'error-in-sql-syntax') {
$this->expectExceptionMessageMatches('/You have an error in your SQL syntax/'); $this->expectExceptionMessageMatches('/You have an error in your SQL syntax/');
} else { } else {