Revert "temp fix unit tests"

This reverts commit cb8c6f2.

Author: heelc29

tests/Unit/Component/Actionlogs/Administrator/Model/ActionlogConfigModelTest.php

@@ -12,7 +12,7 @@
 
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\Component\Actionlogs\Administrator\Model\ActionlogConfigModel;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Tests\Unit\UnitTestCase;
 
 /**
@@ -33,10 +33,9 @@ class ActionlogConfigModelTest extends UnitTestCase
      */
     public function testGetLogContentTypeParams()
     {
-        /* @todo: Return to DatabaseInterface when createQuery is implemented in the interface */
         $config = new \stdClass();
-        $db     = $this->createStub(DatabaseDriver::class);
-        $db->method('createQuery')->willReturn($this->getQueryStub($db));
+        $db     = $this->createStub(DatabaseInterface::class);
+        $db->method('getQuery')->willReturn($this->getQueryStub($db));
         $db->method('loadObject')->willReturn($config);
 
         $model = new ActionlogConfigModel(['dbo' => $db], $this->createStub(MVCFactoryInterface::class));
@@ -53,9 +52,8 @@ public function testGetLogContentTypeParams()
      */
     public function testGetNullLogContentTypeParams()
     {
-        /* @todo: Return to DatabaseInterface when createQuery is implemented in the interface */
-        $db = $this->createStub(DatabaseDriver::class);
-        $db->method('createQuery')->willReturn($this->getQueryStub($db));
+        $db = $this->createStub(DatabaseInterface::class);
+        $db->method('getQuery')->willReturn($this->getQueryStub($db));
 
         $model = new ActionlogConfigModel(['dbo' => $db], $this->createStub(MVCFactoryInterface::class));
 

tests/Unit/Libraries/Cms/MVC/Model/DatabaseModelTest.php

@@ -16,7 +16,6 @@
 use Joomla\CMS\MVC\Model\DatabaseAwareTrait;
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\User\User;
-use Joomla\Database\DatabaseDriver;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Tests\Unit\UnitTestCase;
 
@@ -129,10 +128,9 @@ public function _getList($query, $limitstart = 0, $limit = 0)
      */
     public function testGetListFromString()
     {
-        /* @todo: Return to DatabaseInterface when createQuery is implemented in the interface */
-        $db = $this->createStub(DatabaseDriver::class);
+        $db = $this->createStub(DatabaseInterface::class);
         $db->method('loadObjectList')->willReturn([1]);
-        $db->method('createQuery')->willReturn($this->getQueryStub($db));
+        $db->method('getQuery')->willReturn($this->getQueryStub($db));
 
         $model = new class (['dbo' => $db], $this->createStub(MVCFactoryInterface::class)) extends BaseDatabaseModel {
             public function _getList($query, $limitstart = 0, $limit = 0)