Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 00:00:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace assertRegExp() assertMatchesRegularExpression()

Browse source
This commit is contained in:
Philipp 2021-12-12 20:19:52 +01:00
parent f4907a48d8
commit 015de29b7b
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/src/Core/Logger/AbstractLoggerTest.php
View file

@ -31,7 +31,7 @@ abstract class AbstractLoggerTest extends MockedTest
{ {
use LoggerDataTrait; use LoggerDataTrait;
const LOGLINE = '/.* \[.*\]: .* \{.*\"file\":\".*\".*,.*\"line\":\d*,.*\"function\":\".*\".*,.*\"uid\":\".*\".*}/'; const LOGLINE = '/.* \[.*]: .* {.*\"file\":\".*\".*,.*\"line\":\d*,.*\"function\":\".*\".*,.*\"uid\":\".*\".*}/';
const FILE = 'test'; const FILE = 'test';
const LINE = 666; const LINE = 666;
@ -72,7 +72,7 @@ abstract class AbstractLoggerTest extends MockedTest
public function assertLogline($string) public function assertLogline($string)
{ {
self::assertRegExp(self::LOGLINE, $string); self::assertMatchesRegularExpression(self::LOGLINE, $string);
} }
public function assertLoglineNums($assertNum, $string) public function assertLoglineNums($assertNum, $string)

2
tests/src/Core/Logger/WorkerLoggerTest.php
View file

@ -29,7 +29,7 @@ class WorkerLoggerTest extends MockedTest
{ {
private function assertUid($uid) private function assertUid($uid)
{ {
self::assertRegExp('/^[a-zA-Z0-9]{' . WorkerLogger::WORKER_ID_LENGTH . '}+$/', $uid); self::assertMatchesRegularExpression('/^[a-zA-Z0-9]{' . WorkerLogger::WORKER_ID_LENGTH . '}+$/', $uid);
} }
public function dataTest() public function dataTest()

2
tests/src/Core/SystemTest.php
View file

@ -42,7 +42,7 @@ class SystemTest extends TestCase
private function assertGuid($guid, $length, $prefix = '') private function assertGuid($guid, $length, $prefix = '')
{ {
$length -= strlen($prefix); $length -= strlen($prefix);
self::assertRegExp("/^" . $prefix . "[a-z0-9]{" . $length . "}?$/", $guid); self::assertMatchesRegularExpression("/^" . $prefix . "[a-z0-9]{" . $length . "}?$/", $guid);
} }
public function testGuidWithoutParameter() public function testGuidWithoutParameter()

6
tests/src/Util/ProfilerTest.php
View file

@ -229,7 +229,7 @@ class ProfilerTest extends MockedTest
foreach ($data as $perf => $items) { foreach ($data as $perf => $items) {
foreach ($items['functions'] as $function) { foreach ($items['functions'] as $function) {
// assert that the output contains the functions // assert that the output contains the functions
self::assertRegExp('/' . $function . ': \d+/', $output); self::assertMatchesRegularExpression('/' . $function . ': \d+/', $output);
} }
} }
} }
@ -286,7 +286,7 @@ class ProfilerTest extends MockedTest
self::assertTrue($profiler->isRendertime()); self::assertTrue($profiler->isRendertime());
$output = $profiler->getRendertimeString(); $output = $profiler->getRendertimeString();
self::assertRegExp('/test1: \d+/', $output); self::assertMatchesRegularExpression('/test1: \d+/', $output);
self::assertRegExp('/test2: \d+/', $output); self::assertMatchesRegularExpression('/test2: \d+/', $output);
} }
} }