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

MNT Fix unit test
silverstripe · Jul 11, 2023 · 9b2aee1 · 9b2aee1
2 parents b88e7fe + 3aa6d59
commit 9b2aee1
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/tests/php/ORM/DataListTest.php b/tests/php/ORM/DataListTest.php
@@ -26,6 +26,7 @@
 use SilverStripe\ORM\Tests\DataObjectTest\TeamComment;
 use SilverStripe\ORM\Tests\DataObjectTest\ValidatedObject;
 use SilverStripe\ORM\Tests\ManyManyListTest\Category;
+use SilverStripe\ORM\Connect\DatabaseException;
 
 class DataListTest extends SapphireTest
 {
@@ -1860,7 +1861,7 @@ public function testRawSqlSort(string $sort, string $type): void
             if (!(DB::get_conn()->getConnector() instanceof MySQLiConnector)) {
                 $this->markTestSkipped('Database connector is not MySQLiConnector');
             }
-            $this->expectException(\mysqli_sql_exception::class);
+            $this->expectException(DatabaseException::class);
             $this->expectExceptionMessageMatches('/Unknown column/');
         } elseif ($type === 'invalid-column') {
             $this->expectException(InvalidArgumentException::class);
@@ -1891,7 +1892,7 @@ public function testRawSqlOrderBy(string $sort, string $type): void
             if (!(DB::get_conn()->getConnector() instanceof MySQLiConnector)) {
                 $this->markTestSkipped('Database connector is not MySQLiConnector');
             }
-            $this->expectException(\mysqli_sql_exception::class);
+            $this->expectException(DatabaseException::class);
             if ($type === 'error-in-sql-syntax') {
                 $this->expectExceptionMessageMatches('/You have an error in your SQL syntax/');
             } else {