tests: use expectException() for unit-tests, not try/catch

Author: fpoy

tests/system/Database/Live/PreparedQueryTest.php

@@ -154,33 +154,37 @@ public function testExecuteRunsInvalidQuery()
         $this->query->execute('foo', '[email protected]', 'US');
     }
 
-    public function testDeallocatePreparedQuery()
+    public function testDeallocatePreparedQueryThenTryToExecute()
     {
         $this->query = $this->db->prepare(static fn ($db) => $db->table('user')->insert([
             'name'    => 'a',
             'email'   => '[email protected]',
             'country' => 'x',
         ]));
 
-        $this->query->execute('foo', '[email protected]', 'US');
-
         $this->query->close();
 
         // Try to execute a non-existing prepared statement
-        try {
-            $this->query->execute('bar', '[email protected]', 'GB');
-        } catch (BadMethodCallException $e) {
-            $this->assertSame('You must call prepare before trying to execute a prepared statement.', $e->getMessage());
-        }
+        $this->expectException(BadMethodCallException::class);
+        $this->expectExceptionMessage('You must call prepare before trying to execute a prepared statement.');
+
+        $this->query->execute('bar', '[email protected]', 'GB');
+    }
+
+    public function testDeallocatePreparedQueryThenTryToClose()
+    {
+        $this->query = $this->db->prepare(static fn ($db) => $db->table('user')->insert([
+            'name'    => 'a',
+            'email'   => '[email protected]',
+            'country' => 'x',
+        ]));
+
+        $this->query->close();
 
         // Try to close a non-existing prepared statement
-        try {
-            $this->query->close();
-        } catch (BadMethodCallException $e) {
-            $this->assertSame('Cannot call close on a non-existing prepared statement.', $e->getMessage());
-        }
+        $this->expectException(BadMethodCallException::class);
+        $this->expectExceptionMessage('Cannot call close on a non-existing prepared statement.');
 
-        $this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'foo', 'email' => '[email protected]']);
-        $this->dontSeeInDatabase($this->db->DBPrefix . 'user', ['name' => 'bar', 'email' => '[email protected]']);
+        $this->query->close();
     }
 }