gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove container from Sql\EnumValuesControllerTest

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2023-12-20 21:13:54 -03:00
parent 1245c976ee
commit c229b98f76
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
3 changed files with 53 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
psalm-baseline.xml
View File

@ -3170,9 +3170,6 @@
<code>$column</code>
<code>$currValue</code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code>__construct</code>
</PossiblyUnusedMethod>
</file>
<file src="src/Controllers/Sql/RelationalValuesController.php">
<MixedArgument>

8
tests/classes/AbstractTestCase.php
View File

@ -104,14 +104,6 @@ abstract class AbstractTestCase extends TestCase
return $response->getJSONResult();
}
protected function assertResponseWasNotSuccessfull(): void
{
/** @var ResponseRenderer $response */
$response = Core::getContainerBuilder()->get(ResponseRenderer::class);
$this->assertFalse($response->hasSuccessState(), 'expected the request to fail');
}
protected function assertResponseWasSuccessfull(): void
{
/** @var ResponseRenderer $response */

67
tests/classes/Controllers/Sql/EnumValuesControllerTest.php
View File

@ -4,13 +4,21 @@ declare(strict_types=1);
namespace PhpMyAdmin\Tests\Controllers\Sql;
use PhpMyAdmin\Bookmarks\BookmarkRepository;
use PhpMyAdmin\CheckUserPrivileges;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\ConfigStorage\RelationCleanup;
use PhpMyAdmin\Controllers\Sql\EnumValuesController;
use PhpMyAdmin\Core;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Operations;
use PhpMyAdmin\Sql;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\DbiDummy;
use PhpMyAdmin\Tests\Stubs\ResponseRenderer;
use PhpMyAdmin\Transformations;
use PHPUnit\Framework\Attributes\CoversClass;
#[CoversClass(EnumValuesController::class)]
@ -30,8 +38,6 @@ class EnumValuesControllerTest extends AbstractTestCase
$GLOBALS['server'] = 1;
$GLOBALS['text_dir'] = 'ltr';
parent::loadResponseIntoContainerBuilder();
}
public function testGetEnumValuesError(): void
@ -50,16 +56,31 @@ class EnumValuesControllerTest extends AbstractTestCase
['curr_value', null, 'b&c'],
]);
/** @var EnumValuesController $sqlController */
$sqlController = Core::getContainerBuilder()->get(EnumValuesController::class);
$responseRenderer = new ResponseRenderer();
$template = new Template();
$relation = new Relation($this->dbi);
$bookmarkRepository = new BookmarkRepository($this->dbi, $relation);
$sql = new Sql(
$this->dbi,
$relation,
self::createStub(RelationCleanup::class),
self::createStub(Operations::class),
self::createStub(Transformations::class),
$template,
$bookmarkRepository,
);
$sqlController = new EnumValuesController(
$responseRenderer,
$template,
$sql,
new CheckUserPrivileges($this->dbi),
);
$sqlController($request);
$this->assertResponseWasNotSuccessfull();
$this->assertFalse($responseRenderer->hasSuccessState(), 'expected the request to fail');
$this->assertSame(
['message' => 'Error in processing request'],
$this->getResponseJsonResult(),
);
$this->assertSame(['message' => 'Error in processing request'], $responseRenderer->getJSONResult());
}
public function testGetEnumValuesSuccess(): void
@ -91,11 +112,29 @@ class EnumValuesControllerTest extends AbstractTestCase
['curr_value', null, 'b&c'],
]);
/** @var EnumValuesController $sqlController */
$sqlController = Core::getContainerBuilder()->get(EnumValuesController::class);
$responseRenderer = new ResponseRenderer();
$template = new Template();
$relation = new Relation($this->dbi);
$bookmarkRepository = new BookmarkRepository($this->dbi, $relation);
$sql = new Sql(
$this->dbi,
$relation,
self::createStub(RelationCleanup::class),
self::createStub(Operations::class),
self::createStub(Transformations::class),
$template,
$bookmarkRepository,
);
$sqlController = new EnumValuesController(
$responseRenderer,
$template,
$sql,
new CheckUserPrivileges($this->dbi),
);
$sqlController($request);
$this->assertResponseWasSuccessfull();
$this->assertTrue($responseRenderer->hasSuccessState(), 'expected the request not to fail');
$this->assertSame(
[
@ -112,7 +151,7 @@ class EnumValuesControllerTest extends AbstractTestCase
. ' <option value="&quot;\&#039;">&quot;\&#039;</option>' . "\n"
. ' </select>' . "\n",
],
$this->getResponseJsonResult(),
$responseRenderer->getJSONResult(),
);
}
}