Use native PHPUnit assertions
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
parent
ef0dfce381
commit
50123a39ac
@ -17,8 +17,6 @@ use PhpMyAdmin\Transformations;
|
||||
use PHPUnit\Framework\Attributes\CoversClass;
|
||||
use PHPUnit\Framework\Attributes\DataProvider;
|
||||
|
||||
use function in_array;
|
||||
|
||||
#[CoversClass(FirstStepController::class)]
|
||||
class FirstStepControllerTest extends AbstractTestCase
|
||||
{
|
||||
@ -46,12 +44,14 @@ class FirstStepControllerTest extends AbstractTestCase
|
||||
$controller($request);
|
||||
|
||||
$files = $response->getHeader()->getScripts()->getFiles();
|
||||
self::assertTrue(
|
||||
in_array(['name' => 'normalization.js', 'fire' => 1], $files, true),
|
||||
self::assertContains(
|
||||
['name' => 'normalization.js', 'fire' => 1],
|
||||
$files,
|
||||
'normalization.js script was not included in the response.',
|
||||
);
|
||||
self::assertTrue(
|
||||
in_array(['name' => 'vendor/jquery/jquery.uitablefilter.js', 'fire' => 0], $files, true),
|
||||
self::assertContains(
|
||||
['name' => 'vendor/jquery/jquery.uitablefilter.js', 'fire' => 0],
|
||||
$files,
|
||||
'vendor/jquery/jquery.uitablefilter.js script was not included in the response.',
|
||||
);
|
||||
|
||||
|
||||
@ -13,8 +13,6 @@ use PhpMyAdmin\Tests\Stubs\DbiDummy;
|
||||
use PhpMyAdmin\Tests\Stubs\ResponseRenderer;
|
||||
use PHPUnit\Framework\Attributes\CoversClass;
|
||||
|
||||
use function in_array;
|
||||
|
||||
#[CoversClass(MainController::class)]
|
||||
class MainControllerTest extends AbstractTestCase
|
||||
{
|
||||
@ -46,12 +44,14 @@ class MainControllerTest extends AbstractTestCase
|
||||
$controller(self::createStub(ServerRequest::class));
|
||||
|
||||
$files = $response->getHeader()->getScripts()->getFiles();
|
||||
self::assertTrue(
|
||||
in_array(['name' => 'normalization.js', 'fire' => 1], $files, true),
|
||||
self::assertContains(
|
||||
['name' => 'normalization.js', 'fire' => 1],
|
||||
$files,
|
||||
'normalization.js script was not included in the response.',
|
||||
);
|
||||
self::assertTrue(
|
||||
in_array(['name' => 'vendor/jquery/jquery.uitablefilter.js', 'fire' => 0], $files, true),
|
||||
self::assertContains(
|
||||
['name' => 'vendor/jquery/jquery.uitablefilter.js', 'fire' => 0],
|
||||
$files,
|
||||
'vendor/jquery/jquery.uitablefilter.js script was not included in the response.',
|
||||
);
|
||||
|
||||
|
||||
@ -111,9 +111,8 @@ class CoreTest extends AbstractTestCase
|
||||
$arr['sarr'][0][1][2],
|
||||
);
|
||||
|
||||
self::assertSame(
|
||||
self::assertNull(
|
||||
Core::arrayRead('sarr/not_exiting/1', $arr),
|
||||
null,
|
||||
);
|
||||
|
||||
self::assertSame(
|
||||
|
||||
@ -9,7 +9,6 @@ use PhpMyAdmin\Tests\AbstractTestCase;
|
||||
use PHPUnit\Framework\Attributes\CoversClass;
|
||||
use PHPUnit\Framework\Attributes\DataProvider;
|
||||
|
||||
use function preg_match;
|
||||
use function str_replace;
|
||||
|
||||
use const DIRECTORY_SEPARATOR;
|
||||
@ -124,9 +123,9 @@ class ErrorTest extends AbstractTestCase
|
||||
*/
|
||||
public function testGetHash(): void
|
||||
{
|
||||
self::assertSame(
|
||||
1,
|
||||
preg_match('/^([a-z0-9]*)$/', $this->object->getHash()),
|
||||
self::assertMatchesRegularExpression(
|
||||
'/^([a-z0-9]*)$/',
|
||||
$this->object->getHash(),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@ -368,7 +368,7 @@ class GitTest extends AbstractTestCase
|
||||
self::assertFalse($this->object->isGitRevision($gitFolder));
|
||||
|
||||
// Assert that the value is replaced by cached one
|
||||
self::assertSame($gitFolder, null);
|
||||
self::assertNull($gitFolder);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -12,7 +12,6 @@ use PHPUnit\Framework\Attributes\DataProvider;
|
||||
use ReflectionProperty;
|
||||
|
||||
use function ini_get;
|
||||
use function is_string;
|
||||
use function parse_str;
|
||||
use function str_repeat;
|
||||
use function urldecode;
|
||||
@ -202,7 +201,7 @@ class UrlTest extends AbstractTestCase
|
||||
parse_str($query, $queryParams);
|
||||
self::assertCount(2, $queryParams);
|
||||
self::assertSame('0', $queryParams['pos']);
|
||||
self::assertTrue(is_string($queryParams['eq']));
|
||||
self::assertIsString($queryParams['eq']);
|
||||
self::assertNotSame('', $queryParams['eq']);
|
||||
self::assertMatchesRegularExpression('/^[a-zA-Z0-9-_=]+$/', $queryParams['eq']);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user