mirror of
https://github.com/friendica/friendica
synced 2025-05-01 19:04:23 +02:00
Fix tests
- Fix InstallerTest case - Fix native function mocking - Add returntype for Unit-Tests - Fixing ExtendedPDO test troubles - Fix wrong class inheritance path for DatabaseTestTrait.php - Fix SyslogLogger Server Exception for PHP8 - Add user/contact to database.fixture.php - Avoid invalid rollbacks for test setup in PHP8
This commit is contained in:
parent
8cab5edea9
commit
02e6dff6a0
53 changed files with 171 additions and 69 deletions
|
@ -31,7 +31,7 @@ class ConfigFileLoaderTest extends MockedTest
|
|||
{
|
||||
use VFSTrait;
|
||||
|
||||
protected function setUp()
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
|
|
@ -29,6 +29,15 @@ use PHPUnit\Framework\TestCase;
|
|||
|
||||
class CryptoTest extends TestCase
|
||||
{
|
||||
public static function tearDownAfterClass(): void
|
||||
{
|
||||
// Reset mocking
|
||||
global $phpMock;
|
||||
$phpMock = [];
|
||||
|
||||
parent::tearDownAfterClass();
|
||||
}
|
||||
|
||||
/**
|
||||
* Replaces random_int results with given mocks
|
||||
*
|
||||
|
|
|
@ -35,7 +35,7 @@ class EMailerTest extends MockedTest
|
|||
/** @var BaseURL|MockInterface */
|
||||
private $baseUrl;
|
||||
|
||||
protected function setUp()
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
@ -53,7 +53,7 @@ class EMailerTest extends MockedTest
|
|||
$this->baseUrl->shouldReceive('get')->andReturn('http://friendica.local');
|
||||
}
|
||||
|
||||
protected function tearDown()
|
||||
protected function tearDown(): void
|
||||
{
|
||||
EmailerSpy::$MAIL_DATA = [];
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@ class MailBuilderTest extends MockedTest
|
|||
/** @var string */
|
||||
private $defaultHeaders;
|
||||
|
||||
protected function setUp()
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@ class SystemMailBuilderTest extends MockedTest
|
|||
/** @var BaseURL */
|
||||
private $baseUrl;
|
||||
|
||||
protected function setUp()
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@ abstract class AbstractLoggerTest extends MockedTest
|
|||
*/
|
||||
abstract protected function getInstance($level = LogLevel::DEBUG);
|
||||
|
||||
protected function setUp()
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@ class ProfilerLoggerTest extends MockedTest
|
|||
*/
|
||||
private $profiler;
|
||||
|
||||
protected function setUp()
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@ class StreamLoggerTest extends AbstractLoggerTest
|
|||
*/
|
||||
private $fileSystem;
|
||||
|
||||
protected function setUp()
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ class SyslogLoggerTest extends AbstractLoggerTest
|
|||
*/
|
||||
private $logger;
|
||||
|
||||
protected function setUp()
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
@ -86,8 +86,13 @@ class SyslogLoggerTest extends AbstractLoggerTest
|
|||
*/
|
||||
public function testServerException()
|
||||
{
|
||||
$this->expectException(\UnexpectedValueException::class);
|
||||
$this->expectExceptionMessageRegExp("/Can\'t open syslog for ident \".*\" and facility \".*\": .* /");
|
||||
if (PHP_MAJOR_VERSION < 8) {
|
||||
$this->expectException(\UnexpectedValueException::class);
|
||||
$this->expectExceptionMessageRegExp("/Can\'t open syslog for ident \".*\" and facility \".*\": .* /");
|
||||
} else {
|
||||
$this->expectException(\TypeError::class);
|
||||
$this->expectExceptionMessage("openlog(): Argument #3 (\$facility) must be of type int, string given");
|
||||
}
|
||||
|
||||
$logger = new SyslogLoggerWrapper('test', $this->introspection, LogLevel::DEBUG, null, 'a string');
|
||||
$logger->emergency('not working');
|
||||
|
|
|
@ -35,7 +35,7 @@ class ProfilerTest extends MockedTest
|
|||
*/
|
||||
private $logger;
|
||||
|
||||
protected function setUp()
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue