bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Fix wrong $this->assert...() with `self::assert...()

Browse source
This commit is contained in:
Philipp Holzer 2020-10-17 14:19:57 +02:00
parent b3e5621d37
commit efaec26b1d
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
63 changed files with 1192 additions and 1192 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
tests/functional/DependencyCheckTest.php
View file

@ -19,7 +19,7 @@
* *
*/ */
namespace functional; namespace Friendica\Test\functional;
use Dice\Dice; use Dice\Dice;
use Friendica\App; use Friendica\App;
@ -63,8 +63,8 @@ class dependencyCheck extends TestCase
/** @var BasePath $basePath */ /** @var BasePath $basePath */
$basePath = $this->dice->create(BasePath::class, [$this->root->url()]); $basePath = $this->dice->create(BasePath::class, [$this->root->url()]);
$this->assertInstanceOf(BasePath::class, $basePath); self::assertInstanceOf(BasePath::class, $basePath);
$this->assertEquals($this->root->url(), $basePath->getPath()); self::assertEquals($this->root->url(), $basePath->getPath());
} }
/** /**
@ -76,14 +76,14 @@ class dependencyCheck extends TestCase
/** @var ConfigFileLoader $configFileLoader */ /** @var ConfigFileLoader $configFileLoader */
$configFileLoader = $this->dice->create(ConfigFileLoader::class); $configFileLoader = $this->dice->create(ConfigFileLoader::class);
$this->assertInstanceOf(ConfigFileLoader::class, $configFileLoader); self::assertInstanceOf(ConfigFileLoader::class, $configFileLoader);
$configCache = new Cache(); $configCache = new Cache();
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);
$this->assertNotEmpty($configCache->getAll()); self::assertNotEmpty($configCache->getAll());
$this->assertArrayHasKey('database', $configCache->getAll()); self::assertArrayHasKey('database', $configCache->getAll());
$this->assertArrayHasKey('system', $configCache->getAll()); self::assertArrayHasKey('system', $configCache->getAll());
} }
/** /**
@ -94,7 +94,7 @@ class dependencyCheck extends TestCase
/** @var Profiler $profiler */ /** @var Profiler $profiler */
$profiler = $this->dice->create(Profiler::class); $profiler = $this->dice->create(Profiler::class);
$this->assertInstanceOf(Profiler::class, $profiler); self::assertInstanceOf(Profiler::class, $profiler);
$configCache = new Cache([ $configCache = new Cache([
'system' => [ 'system' => [
@ -109,8 +109,8 @@ class dependencyCheck extends TestCase
$this->dice = new Dice(); $this->dice = new Dice();
$profiler = $this->dice->create(Profiler::class, [$configCache]); $profiler = $this->dice->create(Profiler::class, [$configCache]);
$this->assertInstanceOf(Profiler::class, $profiler); self::assertInstanceOf(Profiler::class, $profiler);
$this->assertTrue($profiler->isRendertime()); self::assertTrue($profiler->isRendertime());
} }
public function testDatabase() public function testDatabase()
@ -118,8 +118,8 @@ class dependencyCheck extends TestCase
/** @var Database $database */ /** @var Database $database */
$database = $this->dice->create(Database::class); $database = $this->dice->create(Database::class);
$this->assertInstanceOf(Database::class, $database); self::assertInstanceOf(Database::class, $database);
$this->assertTrue($database->connected()); self::assertTrue($database->connected());
} }
public function testAppMode() public function testAppMode()
@ -127,9 +127,9 @@ class dependencyCheck extends TestCase
/** @var App\Mode $mode */ /** @var App\Mode $mode */
$mode = $this->dice->create(App\Mode::class); $mode = $this->dice->create(App\Mode::class);
$this->assertInstanceOf(App\Mode::class, $mode); self::assertInstanceOf(App\Mode::class, $mode);
$this->assertTrue($mode->isNormal()); self::assertTrue($mode->isNormal());
} }
public function testConfiguration() public function testConfiguration()
@ -137,9 +137,9 @@ class dependencyCheck extends TestCase
/** @var IConfig $config */ /** @var IConfig $config */
$config = $this->dice->create(IConfig::class); $config = $this->dice->create(IConfig::class);
$this->assertInstanceOf(IConfig::class, $config); self::assertInstanceOf(IConfig::class, $config);
$this->assertNotEmpty($config->get('database', 'username')); self::assertNotEmpty($config->get('database', 'username'));
} }
public function testLogger() public function testLogger()
@ -147,7 +147,7 @@ class dependencyCheck extends TestCase
/** @var LoggerInterface $logger */ /** @var LoggerInterface $logger */
$logger = $this->dice->create(LoggerInterface::class, ['test']); $logger = $this->dice->create(LoggerInterface::class, ['test']);
$this->assertInstanceOf(LoggerInterface::class, $logger); self::assertInstanceOf(LoggerInterface::class, $logger);
} }
public function testDevLogger() public function testDevLogger()
@ -159,7 +159,7 @@ class dependencyCheck extends TestCase
/** @var LoggerInterface $logger */ /** @var LoggerInterface $logger */
$logger = $this->dice->create('$devLogger', ['dev']); $logger = $this->dice->create('$devLogger', ['dev']);
$this->assertInstanceOf(LoggerInterface::class, $logger); self::assertInstanceOf(LoggerInterface::class, $logger);
} }
public function testCache() public function testCache()
@ -167,7 +167,7 @@ class dependencyCheck extends TestCase
/** @var ICache $cache */ /** @var ICache $cache */
$cache = $this->dice->create(ICache::class); $cache = $this->dice->create(ICache::class);
$this->assertInstanceOf(ICache::class, $cache); self::assertInstanceOf(ICache::class, $cache);
} }
public function testMemoryCache() public function testMemoryCache()
@ -176,7 +176,7 @@ class dependencyCheck extends TestCase
$cache = $this->dice->create(IMemoryCache::class); $cache = $this->dice->create(IMemoryCache::class);
// We need to check "just" ICache, because the default Cache is DB-Cache, which isn't a memorycache // We need to check "just" ICache, because the default Cache is DB-Cache, which isn't a memorycache
$this->assertInstanceOf(ICache::class, $cache); self::assertInstanceOf(ICache::class, $cache);
} }
public function testLock() public function testLock()
@ -184,6 +184,6 @@ class dependencyCheck extends TestCase
/** @var ILock $cache */ /** @var ILock $cache */
$lock = $this->dice->create(ILock::class); $lock = $this->dice->create(ILock::class);
$this->assertInstanceOf(ILock::class, $lock); self::assertInstanceOf(ILock::class, $lock);
} }
} }

600
tests/legacy/ApiTest.php
View file

File diff suppressed because it is too large Load diff

28
tests/src/App/ArgumentsTest.php
View file

@ -28,11 +28,11 @@ class ArgumentsTest extends TestCase
{ {
private function assertArguments(array $assert, App\Arguments $arguments) private function assertArguments(array $assert, App\Arguments $arguments)
{ {
$this->assertEquals($assert['queryString'], $arguments->getQueryString()); self::assertEquals($assert['queryString'], $arguments->getQueryString());
$this->assertEquals($assert['command'], $arguments->getCommand()); self::assertEquals($assert['command'], $arguments->getCommand());
$this->assertEquals($assert['argv'], $arguments->getArgv()); self::assertEquals($assert['argv'], $arguments->getArgv());
$this->assertEquals($assert['argc'], $arguments->getArgc()); self::assertEquals($assert['argc'], $arguments->getArgc());
$this->assertCount($assert['argc'], $arguments->getArgv()); self::assertCount($assert['argc'], $arguments->getArgv());
} }
/** /**
@ -42,7 +42,7 @@ class ArgumentsTest extends TestCase
{ {
$arguments = new App\Arguments(); $arguments = new App\Arguments();
$this->assertArguments([ self::assertArguments([
'queryString' => '', 'queryString' => '',
'command' => '', 'command' => '',
'argv' => [], 'argv' => [],
@ -177,7 +177,7 @@ class ArgumentsTest extends TestCase
$arguments = (new App\Arguments()) $arguments = (new App\Arguments())
->determine($server, $get); ->determine($server, $get);
$this->assertArguments($assert, $arguments); self::assertArguments($assert, $arguments);
} }
/** /**
@ -191,13 +191,13 @@ class ArgumentsTest extends TestCase
->determine($server, $get); ->determine($server, $get);
for ($i = 0; $i < $arguments->getArgc(); $i++) { for ($i = 0; $i < $arguments->getArgc(); $i++) {
$this->assertTrue($arguments->has($i)); self::assertTrue($arguments->has($i));
$this->assertEquals($assert['argv'][$i], $arguments->get($i)); self::assertEquals($assert['argv'][$i], $arguments->get($i));
} }
$this->assertFalse($arguments->has($arguments->getArgc())); self::assertFalse($arguments->has($arguments->getArgc()));
$this->assertEmpty($arguments->get($arguments->getArgc())); self::assertEmpty($arguments->get($arguments->getArgc()));
$this->assertEquals('default', $arguments->get($arguments->getArgc(), 'default')); self::assertEquals('default', $arguments->get($arguments->getArgc(), 'default'));
} }
public function dataStripped() public function dataStripped()
@ -242,7 +242,7 @@ class ArgumentsTest extends TestCase
$arguments = (new App\Arguments()) $arguments = (new App\Arguments())
->determine(['QUERY_STRING' => 'pagename=' . $command . $input,], ['pagename' => $command]); ->determine(['QUERY_STRING' => 'pagename=' . $command . $input,], ['pagename' => $command]);
$this->assertEquals($command . $assert, $arguments->getQueryString()); self::assertEquals($command . $assert, $arguments->getQueryString());
} }
/** /**
@ -254,6 +254,6 @@ class ArgumentsTest extends TestCase
$argNew = $argument->determine([], []); $argNew = $argument->determine([], []);
$this->assertNotSame($argument, $argNew); self::assertNotSame($argument, $argNew);
} }
} }

72
tests/src/App/ModeTest.php
View file

@ -66,26 +66,26 @@ class ModeTest extends MockedTest
public function testItEmpty() public function testItEmpty()
{ {
$mode = new Mode(); $mode = new Mode();
$this->assertTrue($mode->isInstall()); self::assertTrue($mode->isInstall());
$this->assertFalse($mode->isNormal()); self::assertFalse($mode->isNormal());
} }
public function testWithoutConfig() public function testWithoutConfig()
{ {
$this->basePathMock->shouldReceive('getPath')->andReturn($this->root->url())->once(); $this->basePathMock->shouldReceive('getPath')->andReturn($this->root->url())->once();
$this->assertTrue($this->root->hasChild('config/local.config.php')); self::assertTrue($this->root->hasChild('config/local.config.php'));
$this->delConfigFile('local.config.php'); $this->delConfigFile('local.config.php');
$this->assertFalse($this->root->hasChild('config/local.config.php')); self::assertFalse($this->root->hasChild('config/local.config.php'));
$mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock); $mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
$this->assertTrue($mode->isInstall()); self::assertTrue($mode->isInstall());
$this->assertFalse($mode->isNormal()); self::assertFalse($mode->isNormal());
$this->assertFalse($mode->has(Mode::LOCALCONFIGPRESENT)); self::assertFalse($mode->has(Mode::LOCALCONFIGPRESENT));
} }
public function testWithoutDatabase() public function testWithoutDatabase()
@ -96,11 +96,11 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock); $mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
$this->assertFalse($mode->isNormal()); self::assertFalse($mode->isNormal());
$this->assertTrue($mode->isInstall()); self::assertTrue($mode->isInstall());
$this->assertTrue($mode->has(Mode::LOCALCONFIGPRESENT)); self::assertTrue($mode->has(Mode::LOCALCONFIGPRESENT));
$this->assertFalse($mode->has(Mode::DBAVAILABLE)); self::assertFalse($mode->has(Mode::DBAVAILABLE));
} }
public function testWithoutDatabaseSetup() public function testWithoutDatabaseSetup()
@ -113,10 +113,10 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock); $mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
$this->assertFalse($mode->isNormal()); self::assertFalse($mode->isNormal());
$this->assertTrue($mode->isInstall()); self::assertTrue($mode->isInstall());
$this->assertTrue($mode->has(Mode::LOCALCONFIGPRESENT)); self::assertTrue($mode->has(Mode::LOCALCONFIGPRESENT));
} }
public function testWithMaintenanceMode() public function testWithMaintenanceMode()
@ -131,11 +131,11 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock); $mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
$this->assertFalse($mode->isNormal()); self::assertFalse($mode->isNormal());
$this->assertFalse($mode->isInstall()); self::assertFalse($mode->isInstall());
$this->assertTrue($mode->has(Mode::DBCONFIGAVAILABLE)); self::assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
$this->assertFalse($mode->has(Mode::MAINTENANCEDISABLED)); self::assertFalse($mode->has(Mode::MAINTENANCEDISABLED));
} }
public function testNormalMode() public function testNormalMode()
@ -153,11 +153,11 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock); $mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
$this->assertTrue($mode->isNormal()); self::assertTrue($mode->isNormal());
$this->assertFalse($mode->isInstall()); self::assertFalse($mode->isInstall());
$this->assertTrue($mode->has(Mode::DBCONFIGAVAILABLE)); self::assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
$this->assertTrue($mode->has(Mode::MAINTENANCEDISABLED)); self::assertTrue($mode->has(Mode::MAINTENANCEDISABLED));
} }
/** /**
@ -178,11 +178,11 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock); $mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
$this->assertTrue($mode->isNormal()); self::assertTrue($mode->isNormal());
$this->assertFalse($mode->isInstall()); self::assertFalse($mode->isInstall());
$this->assertTrue($mode->has(Mode::DBCONFIGAVAILABLE)); self::assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
$this->assertTrue($mode->has(Mode::MAINTENANCEDISABLED)); self::assertTrue($mode->has(Mode::MAINTENANCEDISABLED));
} }
/** /**
@ -196,7 +196,7 @@ class ModeTest extends MockedTest
$modeNew = $mode->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock); $modeNew = $mode->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
$this->assertNotSame($modeNew, $mode); self::assertNotSame($modeNew, $mode);
} }
/** /**
@ -210,7 +210,7 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect); $mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
$this->assertTrue($mode->isBackend()); self::assertTrue($mode->isBackend());
} }
/** /**
@ -224,7 +224,7 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determineRunMode(false, $module, $server, $mobileDetect); $mode = (new Mode())->determineRunMode(false, $module, $server, $mobileDetect);
$this->assertTrue($mode->isBackend()); self::assertTrue($mode->isBackend());
} }
/** /**
@ -238,7 +238,7 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determineRunMode(false, $module, $server, $mobileDetect); $mode = (new Mode())->determineRunMode(false, $module, $server, $mobileDetect);
$this->assertFalse($mode->isBackend()); self::assertFalse($mode->isBackend());
} }
/** /**
@ -256,7 +256,7 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect); $mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
$this->assertTrue($mode->isAjax()); self::assertTrue($mode->isAjax());
} }
/** /**
@ -270,7 +270,7 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect); $mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
$this->assertFalse($mode->isAjax()); self::assertFalse($mode->isAjax());
} }
/** /**
@ -286,8 +286,8 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect); $mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
$this->assertTrue($mode->isMobile()); self::assertTrue($mode->isMobile());
$this->assertTrue($mode->isTablet()); self::assertTrue($mode->isTablet());
} }
@ -304,7 +304,7 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect); $mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
$this->assertFalse($mode->isMobile()); self::assertFalse($mode->isMobile());
$this->assertFalse($mode->isTablet()); self::assertFalse($mode->isTablet());
} }
} }

14
tests/src/App/ModuleTest.php
View file

@ -34,9 +34,9 @@ class ModuleTest extends DatabaseTest
{ {
private function assertModule(array $assert, App\Module $module) private function assertModule(array $assert, App\Module $module)
{ {
$this->assertEquals($assert['isBackend'], $module->isBackend()); self::assertEquals($assert['isBackend'], $module->isBackend());
$this->assertEquals($assert['name'], $module->getName()); self::assertEquals($assert['name'], $module->getName());
$this->assertEquals($assert['class'], $module->getClassName()); self::assertEquals($assert['class'], $module->getClassName());
} }
/** /**
@ -46,7 +46,7 @@ class ModuleTest extends DatabaseTest
{ {
$module = new App\Module(); $module = new App\Module();
$this->assertModule([ self::assertModule([
'isBackend' => false, 'isBackend' => false,
'name' => App\Module::DEFAULT, 'name' => App\Module::DEFAULT,
'class' => App\Module::DEFAULT_CLASS, 'class' => App\Module::DEFAULT_CLASS,
@ -128,7 +128,7 @@ class ModuleTest extends DatabaseTest
{ {
$module = (new App\Module())->determineModule($args); $module = (new App\Module())->determineModule($args);
$this->assertModule($assert, $module); self::assertModule($assert, $module);
} }
public function dataModuleClass() public function dataModuleClass()
@ -185,7 +185,7 @@ class ModuleTest extends DatabaseTest
$module = (new App\Module($name))->determineClass(new App\Arguments('', $command), $router, $config); $module = (new App\Module($name))->determineClass(new App\Arguments('', $command), $router, $config);
$this->assertEquals($assert, $module->getClassName()); self::assertEquals($assert, $module->getClassName());
} }
/** /**
@ -197,6 +197,6 @@ class ModuleTest extends DatabaseTest
$moduleNew = $module->determineModule(new App\Arguments()); $moduleNew = $module->determineModule(new App\Arguments());
$this->assertNotSame($moduleNew, $module); self::assertNotSame($moduleNew, $module);
} }
} }

48
tests/src/App/RouterTest.php
View file

@ -64,15 +64,15 @@ class RouterTest extends TestCase
$routeCollector->addRoute([Router::GET], '/variable/{var}', 'VariableModuleClassName'); $routeCollector->addRoute([Router::GET], '/variable/{var}', 'VariableModuleClassName');
$routeCollector->addRoute([Router::GET], '/optionalvariable[/{option}]', 'OptionalVariableModuleClassName'); $routeCollector->addRoute([Router::GET], '/optionalvariable[/{option}]', 'OptionalVariableModuleClassName');
$this->assertEquals('IndexModuleClassName', $router->getModuleClass('/')); self::assertEquals('IndexModuleClassName', $router->getModuleClass('/'));
$this->assertEquals('TestModuleClassName', $router->getModuleClass('/test')); self::assertEquals('TestModuleClassName', $router->getModuleClass('/test'));
$this->assertEquals('TestGetPostModuleClassName', $router->getModuleClass('/testgetpost')); self::assertEquals('TestGetPostModuleClassName', $router->getModuleClass('/testgetpost'));
$this->assertEquals('TestSubModuleClassName', $router->getModuleClass('/test/sub')); self::assertEquals('TestSubModuleClassName', $router->getModuleClass('/test/sub'));
$this->assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional')); self::assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional'));
$this->assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional/option')); self::assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional/option'));
$this->assertEquals('VariableModuleClassName', $router->getModuleClass('/variable/123abc')); self::assertEquals('VariableModuleClassName', $router->getModuleClass('/variable/123abc'));
$this->assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable')); self::assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable'));
$this->assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable/123abc')); self::assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable/123abc'));
} }
public function testPostModuleClass() public function testPostModuleClass()
@ -88,15 +88,15 @@ class RouterTest extends TestCase
$routeCollector->addRoute([Router::POST], '/variable/{var}', 'VariableModuleClassName'); $routeCollector->addRoute([Router::POST], '/variable/{var}', 'VariableModuleClassName');
$routeCollector->addRoute([Router::POST], '/optionalvariable[/{option}]', 'OptionalVariableModuleClassName'); $routeCollector->addRoute([Router::POST], '/optionalvariable[/{option}]', 'OptionalVariableModuleClassName');
$this->assertEquals('IndexModuleClassName', $router->getModuleClass('/')); self::assertEquals('IndexModuleClassName', $router->getModuleClass('/'));
$this->assertEquals('TestModuleClassName', $router->getModuleClass('/test')); self::assertEquals('TestModuleClassName', $router->getModuleClass('/test'));
$this->assertEquals('TestGetPostModuleClassName', $router->getModuleClass('/testgetpost')); self::assertEquals('TestGetPostModuleClassName', $router->getModuleClass('/testgetpost'));
$this->assertEquals('TestSubModuleClassName', $router->getModuleClass('/test/sub')); self::assertEquals('TestSubModuleClassName', $router->getModuleClass('/test/sub'));
$this->assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional')); self::assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional'));
$this->assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional/option')); self::assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional/option'));
$this->assertEquals('VariableModuleClassName', $router->getModuleClass('/variable/123abc')); self::assertEquals('VariableModuleClassName', $router->getModuleClass('/variable/123abc'));
$this->assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable')); self::assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable'));
$this->assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable/123abc')); self::assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable/123abc'));
} }
public function testGetModuleClassNotFound() public function testGetModuleClassNotFound()
@ -205,10 +205,10 @@ class RouterTest extends TestCase
$this->cache $this->cache
))->loadRoutes($routes); ))->loadRoutes($routes);
$this->assertEquals(Module\Home::class, $router->getModuleClass('/')); self::assertEquals(Module\Home::class, $router->getModuleClass('/'));
$this->assertEquals(Module\Friendica::class, $router->getModuleClass('/group/route')); self::assertEquals(Module\Friendica::class, $router->getModuleClass('/group/route'));
$this->assertEquals(Module\Xrd::class, $router->getModuleClass('/group2/group3/route')); self::assertEquals(Module\Xrd::class, $router->getModuleClass('/group2/group3/route'));
$this->assertEquals(Module\Profile\Index::class, $router->getModuleClass('/double')); self::assertEquals(Module\Profile\Index::class, $router->getModuleClass('/double'));
} }
/** /**
@ -221,7 +221,7 @@ class RouterTest extends TestCase
], '', $this->l10n, $this->cache))->loadRoutes($routes); ], '', $this->l10n, $this->cache))->loadRoutes($routes);
// Don't find GET // Don't find GET
$this->assertEquals(Module\WellKnown\NodeInfo::class, $router->getModuleClass('/post/it')); self::assertEquals(Module\WellKnown\NodeInfo::class, $router->getModuleClass('/post/it'));
$this->assertEquals(Module\Profile\Index::class, $router->getModuleClass('/double')); self::assertEquals(Module\Profile\Index::class, $router->getModuleClass('/double'));
} }
} }

124
tests/src/Console/AutomaticInstallationConsoleTest.php
View file

@ -264,7 +264,7 @@ Installation is finished
FIN; FIN;
$this->assertEquals($finished, $txt); self::assertEquals($finished, $txt);
} }
private function assertStuckDB($txt) private function assertStuckDB($txt)
@ -295,7 +295,7 @@ Could not connect to database.:
FIN; FIN;
$this->assertEquals($finished, $txt); self::assertEquals($finished, $txt);
} }
private function assertStuckURL($txt) private function assertStuckURL($txt)
@ -319,7 +319,7 @@ The Friendica URL has to be set during CLI installation.
FIN; FIN;
$this->assertEquals($finished, $txt); self::assertEquals($finished, $txt);
} }
/** /**
@ -333,13 +333,13 @@ FIN;
public function assertConfigEntry($cat, $key, $assertion = null, $default_value = null) public function assertConfigEntry($cat, $key, $assertion = null, $default_value = null)
{ {
if (!empty($assertion[$cat][$key])) { if (!empty($assertion[$cat][$key])) {
$this->assertEquals($assertion[$cat][$key], $this->configCache->get($cat, $key)); self::assertEquals($assertion[$cat][$key], $this->configCache->get($cat, $key));
} elseif (!empty($assertion) && !is_array($assertion)) { } elseif (!empty($assertion) && !is_array($assertion)) {
$this->assertEquals($assertion, $this->configCache->get($cat, $key)); self::assertEquals($assertion, $this->configCache->get($cat, $key));
} elseif (!empty($default_value)) { } elseif (!empty($default_value)) {
$this->assertEquals($default_value, $this->configCache->get($cat, $key)); self::assertEquals($default_value, $this->configCache->get($cat, $key));
} else { } else {
$this->assertEmpty($this->configCache->get($cat, $key), $this->configCache->get($cat, $key)); self::assertEmpty($this->configCache->get($cat, $key), $this->configCache->get($cat, $key));
} }
} }
@ -358,21 +358,21 @@ FIN;
$assertion['database']['hostname'] .= (!empty($assertion['database']['port']) ? ':' . $assertion['database']['port'] : ''); $assertion['database']['hostname'] .= (!empty($assertion['database']['port']) ? ':' . $assertion['database']['port'] : '');
} }
$this->assertConfigEntry('database', 'hostname', ($saveDb) ? $assertion : null, (!$saveDb || $defaultDb) ? Installer::DEFAULT_HOST : null); self::assertConfigEntry('database', 'hostname', ($saveDb) ? $assertion : null, (!$saveDb || $defaultDb) ? Installer::DEFAULT_HOST : null);
$this->assertConfigEntry('database', 'username', ($saveDb) ? $assertion : null); self::assertConfigEntry('database', 'username', ($saveDb) ? $assertion : null);
$this->assertConfigEntry('database', 'password', ($saveDb) ? $assertion : null); self::assertConfigEntry('database', 'password', ($saveDb) ? $assertion : null);
$this->assertConfigEntry('database', 'database', ($saveDb) ? $assertion : null); self::assertConfigEntry('database', 'database', ($saveDb) ? $assertion : null);
$this->assertConfigEntry('config', 'admin_email', $assertion); self::assertConfigEntry('config', 'admin_email', $assertion);
$this->assertConfigEntry('config', 'php_path', trim(shell_exec('which php'))); self::assertConfigEntry('config', 'php_path', trim(shell_exec('which php')));
$this->assertConfigEntry('config', 'hostname', $assertion); self::assertConfigEntry('config', 'hostname', $assertion);
$this->assertConfigEntry('system', 'default_timezone', $assertion, ($default) ? Installer::DEFAULT_TZ : null); self::assertConfigEntry('system', 'default_timezone', $assertion, ($default) ? Installer::DEFAULT_TZ : null);
$this->assertConfigEntry('system', 'language', $assertion, ($default) ? Installer::DEFAULT_LANG : null); self::assertConfigEntry('system', 'language', $assertion, ($default) ? Installer::DEFAULT_LANG : null);
$this->assertConfigEntry('system', 'url', $assertion); self::assertConfigEntry('system', 'url', $assertion);
$this->assertConfigEntry('system', 'urlpath', $assertion); self::assertConfigEntry('system', 'urlpath', $assertion);
$this->assertConfigEntry('system', 'ssl_policy', $assertion, ($default) ? App\BaseURL::DEFAULT_SSL_SCHEME : null); self::assertConfigEntry('system', 'ssl_policy', $assertion, ($default) ? App\BaseURL::DEFAULT_SSL_SCHEME : null);
$this->assertConfigEntry('system', 'basepath', ($realBasepath) ? $this->root->url() : $assertion); self::assertConfigEntry('system', 'basepath', ($realBasepath) ? $this->root->url() : $assertion);
} }
/** /**
@ -385,7 +385,7 @@ FIN;
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertStuckURL($txt); self::assertStuckURL($txt);
} }
/** /**
@ -407,10 +407,10 @@ FIN;
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertFinished($txt, true, false); self::assertFinished($txt, true, false);
$this->assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php')); self::assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php'));
$this->assertConfig(['config' => ['hostname' => 'friendica.local'], 'system' => ['url' => 'http://friendica.local', 'ssl_policy' => 0, 'urlPath' => '']], false, true, true, true); self::assertConfig(['config' => ['hostname' => 'friendica.local'], 'system' => ['url' => 'http://friendica.local', 'ssl_policy' => 0, 'urlPath' => '']], false, true, true, true);
} }
/** /**
@ -481,12 +481,12 @@ CONF;
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertFinished($txt, false, true); self::assertFinished($txt, false, true);
$this->assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php')); self::assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php'));
$this->assertEquals($config, file_get_contents($this->root->getChild('config' . DIRECTORY_SEPARATOR . 'local.config.php')->url())); self::assertEquals($config, file_get_contents($this->root->getChild('config' . DIRECTORY_SEPARATOR . 'local.config.php')->url()));
$this->assertConfig($data, true, false, false); self::assertConfig($data, true, false, false);
} }
/** /**
@ -504,27 +504,27 @@ CONF;
$this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1); $this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1);
$this->mockReplaceMacros('testTemplate', \Mockery::any(), '', 1); $this->mockReplaceMacros('testTemplate', \Mockery::any(), '', 1);
$this->assertTrue(putenv('MYSQL_HOST=' . $data['database']['hostname'])); self::assertTrue(putenv('MYSQL_HOST=' . $data['database']['hostname']));
$this->assertTrue(putenv('MYSQL_PORT=' . $data['database']['port'])); self::assertTrue(putenv('MYSQL_PORT=' . $data['database']['port']));
$this->assertTrue(putenv('MYSQL_DATABASE=' . $data['database']['database'])); self::assertTrue(putenv('MYSQL_DATABASE=' . $data['database']['database']));
$this->assertTrue(putenv('MYSQL_USERNAME=' . $data['database']['username'])); self::assertTrue(putenv('MYSQL_USERNAME=' . $data['database']['username']));
$this->assertTrue(putenv('MYSQL_PASSWORD=' . $data['database']['password'])); self::assertTrue(putenv('MYSQL_PASSWORD=' . $data['database']['password']));
$this->assertTrue(putenv('FRIENDICA_HOSTNAME=' . $data['config']['hostname'])); self::assertTrue(putenv('FRIENDICA_HOSTNAME=' . $data['config']['hostname']));
$this->assertTrue(putenv('FRIENDICA_BASE_PATH=' . $data['system']['basepath'])); self::assertTrue(putenv('FRIENDICA_BASE_PATH=' . $data['system']['basepath']));
$this->assertTrue(putenv('FRIENDICA_URL=' . $data['system']['url'])); self::assertTrue(putenv('FRIENDICA_URL=' . $data['system']['url']));
$this->assertTrue(putenv('FRIENDICA_PHP_PATH=' . $data['config']['php_path'])); self::assertTrue(putenv('FRIENDICA_PHP_PATH=' . $data['config']['php_path']));
$this->assertTrue(putenv('FRIENDICA_ADMIN_MAIL=' . $data['config']['admin_email'])); self::assertTrue(putenv('FRIENDICA_ADMIN_MAIL=' . $data['config']['admin_email']));
$this->assertTrue(putenv('FRIENDICA_TZ=' . $data['system']['default_timezone'])); self::assertTrue(putenv('FRIENDICA_TZ=' . $data['system']['default_timezone']));
$this->assertTrue(putenv('FRIENDICA_LANG=' . $data['system']['language'])); self::assertTrue(putenv('FRIENDICA_LANG=' . $data['system']['language']));
$console = new AutomaticInstallation($this->consoleArgv); $console = new AutomaticInstallation($this->consoleArgv);
$console->setOption('savedb', true); $console->setOption('savedb', true);
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertFinished($txt, true); self::assertFinished($txt, true);
$this->assertConfig($data, true, true, false, true); self::assertConfig($data, true, true, false, true);
} }
/** /**
@ -542,26 +542,26 @@ CONF;
$this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1); $this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1);
$this->mockReplaceMacros('testTemplate', \Mockery::any(), '', 1); $this->mockReplaceMacros('testTemplate', \Mockery::any(), '', 1);
$this->assertTrue(putenv('MYSQL_HOST=' . $data['database']['hostname'])); self::assertTrue(putenv('MYSQL_HOST=' . $data['database']['hostname']));
$this->assertTrue(putenv('MYSQL_PORT=' . $data['database']['port'])); self::assertTrue(putenv('MYSQL_PORT=' . $data['database']['port']));
$this->assertTrue(putenv('MYSQL_DATABASE=' . $data['database']['database'])); self::assertTrue(putenv('MYSQL_DATABASE=' . $data['database']['database']));
$this->assertTrue(putenv('MYSQL_USERNAME=' . $data['database']['username'])); self::assertTrue(putenv('MYSQL_USERNAME=' . $data['database']['username']));
$this->assertTrue(putenv('MYSQL_PASSWORD=' . $data['database']['password'])); self::assertTrue(putenv('MYSQL_PASSWORD=' . $data['database']['password']));
$this->assertTrue(putenv('FRIENDICA_HOSTNAME=' . $data['config']['hostname'])); self::assertTrue(putenv('FRIENDICA_HOSTNAME=' . $data['config']['hostname']));
$this->assertTrue(putenv('FRIENDICA_BASE_PATH=' . $data['system']['basepath'])); self::assertTrue(putenv('FRIENDICA_BASE_PATH=' . $data['system']['basepath']));
$this->assertTrue(putenv('FRIENDICA_URL=' . $data['system']['url'])); self::assertTrue(putenv('FRIENDICA_URL=' . $data['system']['url']));
$this->assertTrue(putenv('FRIENDICA_PHP_PATH=' . $data['config']['php_path'])); self::assertTrue(putenv('FRIENDICA_PHP_PATH=' . $data['config']['php_path']));
$this->assertTrue(putenv('FRIENDICA_ADMIN_MAIL=' . $data['config']['admin_email'])); self::assertTrue(putenv('FRIENDICA_ADMIN_MAIL=' . $data['config']['admin_email']));
$this->assertTrue(putenv('FRIENDICA_TZ=' . $data['system']['default_timezone'])); self::assertTrue(putenv('FRIENDICA_TZ=' . $data['system']['default_timezone']));
$this->assertTrue(putenv('FRIENDICA_LANG=' . $data['system']['language'])); self::assertTrue(putenv('FRIENDICA_LANG=' . $data['system']['language']));
$console = new AutomaticInstallation($this->consoleArgv); $console = new AutomaticInstallation($this->consoleArgv);
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertFinished($txt, true); self::assertFinished($txt, true);
$this->assertConfig($data, false, true, false, true); self::assertConfig($data, false, true, false, true);
} }
/** /**
@ -599,8 +599,8 @@ CONF;
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertFinished($txt, true); self::assertFinished($txt, true);
$this->assertConfig($data, true, true, true, true); self::assertConfig($data, true, true, true, true);
} }
/** /**
@ -618,10 +618,10 @@ CONF;
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertStuckDB($txt); self::assertStuckDB($txt);
$this->assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php')); self::assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php'));
$this->assertConfig(['config' => ['hostname' => 'friendica.local'], 'system' => ['url' => 'http://friendica.local', 'ssl_policy' => 0, 'urlpath' => '']], false, true, false, true); self::assertConfig(['config' => ['hostname' => 'friendica.local'], 'system' => ['url' => 'http://friendica.local', 'ssl_policy' => 0, 'urlpath' => '']], false, true, false, true);
} }
public function testGetHelp() public function testGetHelp()
@ -685,6 +685,6 @@ HELP;
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals($theHelp, $txt); self::assertEquals($theHelp, $txt);
} }
} }

16
tests/src/Console/ConfigConsoleTest.php
View file

@ -71,7 +71,7 @@ class ConfigConsoleTest extends ConsoleTest
$console->setArgument(1, 'test'); $console->setArgument(1, 'test');
$console->setArgument(2, 'now'); $console->setArgument(2, 'now');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals("config.test <= now\n", $txt); self::assertEquals("config.test <= now\n", $txt);
$this->configMock $this->configMock
->shouldReceive('get') ->shouldReceive('get')
@ -83,7 +83,7 @@ class ConfigConsoleTest extends ConsoleTest
$console->setArgument(0, 'config'); $console->setArgument(0, 'config');
$console->setArgument(1, 'test'); $console->setArgument(1, 'test');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals("config.test => now\n", $txt); self::assertEquals("config.test => now\n", $txt);
$this->configMock $this->configMock
->shouldReceive('get') ->shouldReceive('get')
@ -95,7 +95,7 @@ class ConfigConsoleTest extends ConsoleTest
$console->setArgument(0, 'config'); $console->setArgument(0, 'config');
$console->setArgument(1, 'test'); $console->setArgument(1, 'test');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals("config.test => \n", $txt); self::assertEquals("config.test => \n", $txt);
} }
function testSetArrayValue() { function testSetArrayValue() {
@ -112,7 +112,7 @@ class ConfigConsoleTest extends ConsoleTest
$console->setArgument(2, 'now'); $console->setArgument(2, 'now');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals("[Error] config.test is an array and can't be set using this command.\n", $txt); self::assertEquals("[Error] config.test is an array and can't be set using this command.\n", $txt);
} }
function testTooManyArguments() { function testTooManyArguments() {
@ -124,7 +124,7 @@ class ConfigConsoleTest extends ConsoleTest
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$assertion = '[Warning] Too many arguments'; $assertion = '[Warning] Too many arguments';
$firstline = substr($txt, 0, strlen($assertion)); $firstline = substr($txt, 0, strlen($assertion));
$this->assertEquals($assertion, $firstline); self::assertEquals($assertion, $firstline);
} }
function testVerbose() { function testVerbose() {
@ -152,7 +152,7 @@ test.it => now
CONF; CONF;
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals($assertion, $txt); self::assertEquals($assertion, $txt);
} }
function testUnableToSet() { function testUnableToSet() {
@ -171,7 +171,7 @@ CONF;
$console->setArgument(1, 'it'); $console->setArgument(1, 'it');
$console->setArgument(2, 'now'); $console->setArgument(2, 'now');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertSame("Unable to set test.it\n", $txt); self::assertSame("Unable to set test.it\n", $txt);
} }
public function testGetHelp() public function testGetHelp()
@ -212,6 +212,6 @@ HELP;
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals($txt, $theHelp); self::assertEquals($txt, $theHelp);
} }
} }

20
tests/src/Console/LockConsoleTest.php
View file

@ -66,7 +66,7 @@ class LockConsoleTest extends ConsoleTest
$console = new Lock($this->appMode, $this->lockMock, $this->consoleArgv); $console = new Lock($this->appMode, $this->lockMock, $this->consoleArgv);
$console->setArgument(0, 'list'); $console->setArgument(0, 'list');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals("Listing all Locks:\ntest\ntest2\n2 locks found\n", $txt); self::assertEquals("Listing all Locks:\ntest\ntest2\n2 locks found\n", $txt);
} }
public function testListPrefix() public function testListPrefix()
@ -81,7 +81,7 @@ class LockConsoleTest extends ConsoleTest
$console->setArgument(0, 'list'); $console->setArgument(0, 'list');
$console->setArgument(1, 'test'); $console->setArgument(1, 'test');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals("Listing all Locks starting with \"test\":\ntest\ntest2\n2 locks found\n", $txt); self::assertEquals("Listing all Locks starting with \"test\":\ntest\ntest2\n2 locks found\n", $txt);
} }
public function testDelLock() public function testDelLock()
@ -96,7 +96,7 @@ class LockConsoleTest extends ConsoleTest
$console->setArgument(0, 'del'); $console->setArgument(0, 'del');
$console->setArgument(1, 'test'); $console->setArgument(1, 'test');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals("Lock 'test' released.\n", $txt); self::assertEquals("Lock 'test' released.\n", $txt);
} }
public function testDelUnknownLock() public function testDelUnknownLock()
@ -111,7 +111,7 @@ class LockConsoleTest extends ConsoleTest
$console->setArgument(0, 'del'); $console->setArgument(0, 'del');
$console->setArgument(1, 'test'); $console->setArgument(1, 'test');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals("Couldn't release Lock 'test'\n", $txt); self::assertEquals("Couldn't release Lock 'test'\n", $txt);
} }
public function testSetLock() public function testSetLock()
@ -131,7 +131,7 @@ class LockConsoleTest extends ConsoleTest
$console->setArgument(0, 'set'); $console->setArgument(0, 'set');
$console->setArgument(1, 'test'); $console->setArgument(1, 'test');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals("Lock 'test' acquired.\n", $txt); self::assertEquals("Lock 'test' acquired.\n", $txt);
} }
public function testSetLockIsLocked() public function testSetLockIsLocked()
@ -146,7 +146,7 @@ class LockConsoleTest extends ConsoleTest
$console->setArgument(0, 'set'); $console->setArgument(0, 'set');
$console->setArgument(1, 'test'); $console->setArgument(1, 'test');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals("[Error] 'test' is already set.\n", $txt); self::assertEquals("[Error] 'test' is already set.\n", $txt);
} }
public function testSetLockNotWorking() public function testSetLockNotWorking()
@ -166,7 +166,7 @@ class LockConsoleTest extends ConsoleTest
$console->setArgument(0, 'set'); $console->setArgument(0, 'set');
$console->setArgument(1, 'test'); $console->setArgument(1, 'test');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals("[Error] Unable to lock 'test'.\n", $txt); self::assertEquals("[Error] Unable to lock 'test'.\n", $txt);
} }
public function testReleaseAll() public function testReleaseAll()
@ -179,7 +179,7 @@ class LockConsoleTest extends ConsoleTest
$console = new Lock($this->appMode, $this->lockMock, $this->consoleArgv); $console = new Lock($this->appMode, $this->lockMock, $this->consoleArgv);
$console->setArgument(0, 'clear'); $console->setArgument(0, 'clear');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals("Locks successfully cleared.\n", $txt); self::assertEquals("Locks successfully cleared.\n", $txt);
} }
public function testReleaseAllFailed() public function testReleaseAllFailed()
@ -192,7 +192,7 @@ class LockConsoleTest extends ConsoleTest
$console = new Lock($this->appMode, $this->lockMock, $this->consoleArgv); $console = new Lock($this->appMode, $this->lockMock, $this->consoleArgv);
$console->setArgument(0, 'clear'); $console->setArgument(0, 'clear');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals("[Error] Unable to clear the locks.\n", $txt); self::assertEquals("[Error] Unable to clear the locks.\n", $txt);
} }
public function testGetHelp() public function testGetHelp()
@ -229,6 +229,6 @@ HELP;
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals($txt, $theHelp); self::assertEquals($txt, $theHelp);
} }
} }

24
tests/src/Console/ServerBlockConsoleTest.php
View file

@ -69,7 +69,7 @@ class ServerBlockConsoleTest extends ConsoleTest
CONS; CONS;
$this->assertEquals($output, $txt); self::assertEquals($output, $txt);
} }
/** /**
@ -101,7 +101,7 @@ CONS;
$console->setArgument(2, 'I like it!'); $console->setArgument(2, 'I like it!');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals('The domain \'testme.now\' is now blocked. (Reason: \'I like it!\')' . PHP_EOL, $txt); self::assertEquals('The domain \'testme.now\' is now blocked. (Reason: \'I like it!\')' . PHP_EOL, $txt);
} }
/** /**
@ -132,7 +132,7 @@ CONS;
$console->setArgument(1, 'testme.now'); $console->setArgument(1, 'testme.now');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals('The domain \'testme.now\' is now blocked. (Reason: \'' . ServerBlock::DEFAULT_REASON . '\')' . PHP_EOL, $txt); self::assertEquals('The domain \'testme.now\' is now blocked. (Reason: \'' . ServerBlock::DEFAULT_REASON . '\')' . PHP_EOL, $txt);
} }
/** /**
@ -169,7 +169,7 @@ CONS;
$console->setArgument(2, 'Other reason'); $console->setArgument(2, 'Other reason');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals('The domain \'pod.ordoevangelistarum.com\' is now updated. (Reason: \'Other reason\')' . PHP_EOL, $txt); self::assertEquals('The domain \'pod.ordoevangelistarum.com\' is now updated. (Reason: \'Other reason\')' . PHP_EOL, $txt);
} }
/** /**
@ -201,7 +201,7 @@ CONS;
$console->setArgument(1, 'pod.ordoevangelistarum.com'); $console->setArgument(1, 'pod.ordoevangelistarum.com');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals('The domain \'pod.ordoevangelistarum.com\' is not more blocked' . PHP_EOL, $txt); self::assertEquals('The domain \'pod.ordoevangelistarum.com\' is not more blocked' . PHP_EOL, $txt);
} }
/** /**
@ -213,7 +213,7 @@ CONS;
$console->setArgument(0, 'wrongcommand'); $console->setArgument(0, 'wrongcommand');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertStringStartsWith('[Warning] Unknown command', $txt); self::assertStringStartsWith('[Warning] Unknown command', $txt);
} }
/** /**
@ -232,7 +232,7 @@ CONS;
$console->setArgument(1, 'not.exiting'); $console->setArgument(1, 'not.exiting');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals('The domain \'not.exiting\' is not blocked.' . PHP_EOL, $txt); self::assertEquals('The domain \'not.exiting\' is not blocked.' . PHP_EOL, $txt);
} }
/** /**
@ -244,7 +244,7 @@ CONS;
$console->setArgument(0, 'add'); $console->setArgument(0, 'add');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertStringStartsWith('[Warning] Add needs a domain and optional a reason.', $txt); self::assertStringStartsWith('[Warning] Add needs a domain and optional a reason.', $txt);
} }
/** /**
@ -275,7 +275,7 @@ CONS;
$console->setArgument(1, 'testme.now'); $console->setArgument(1, 'testme.now');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals('Couldn\'t save \'testme.now\' as blocked server' . PHP_EOL, $txt); self::assertEquals('Couldn\'t save \'testme.now\' as blocked server' . PHP_EOL, $txt);
} }
/** /**
@ -307,7 +307,7 @@ CONS;
$console->setArgument(1, 'pod.ordoevangelistarum.com'); $console->setArgument(1, 'pod.ordoevangelistarum.com');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertEquals('Couldn\'t remove \'pod.ordoevangelistarum.com\' from blocked servers' . PHP_EOL, $txt); self::assertEquals('Couldn\'t remove \'pod.ordoevangelistarum.com\' from blocked servers' . PHP_EOL, $txt);
} }
/** /**
@ -319,7 +319,7 @@ CONS;
$console->setArgument(0, 'remove'); $console->setArgument(0, 'remove');
$txt = $this->dumpExecute($console); $txt = $this->dumpExecute($console);
$this->assertStringStartsWith('[Warning] Remove needs a second parameter.', $txt); self::assertStringStartsWith('[Warning] Remove needs a second parameter.', $txt);
} }
/** /**
@ -357,6 +357,6 @@ Options
HELP; HELP;
$this->assertEquals($help, $txt); self::assertEquals($help, $txt);
} }
} }

4
tests/src/Content/PageInfoTest.php
View file

@ -87,7 +87,7 @@ class PageInfoTest extends MockedTest
*/ */
public function testGetRelevantUrlFromBody($expected, string $body, bool $searchNakedUrls = false) public function testGetRelevantUrlFromBody($expected, string $body, bool $searchNakedUrls = false)
{ {
$this->assertSame($expected, PageInfoMock::getRelevantUrlFromBody($body, $searchNakedUrls)); self::assertSame($expected, PageInfoMock::getRelevantUrlFromBody($body, $searchNakedUrls));
} }
public function dataStripTrailingUrlFromBody() public function dataStripTrailingUrlFromBody()
@ -135,6 +135,6 @@ class PageInfoTest extends MockedTest
*/ */
public function testStripTrailingUrlFromBody(string $expected, string $body, string $url) public function testStripTrailingUrlFromBody(string $expected, string $body, string $url)
{ {
$this->assertSame($expected, PageInfoMock::stripTrailingUrlFromBody($body, $url)); self::assertSame($expected, PageInfoMock::stripTrailingUrlFromBody($body, $url));
} }
} }

2
tests/src/Content/SmiliesTest.php
View file

@ -62,6 +62,6 @@ class SmiliesTest extends MockedTest
public function testReplaceFromArray($text, $smilies, $expected) public function testReplaceFromArray($text, $smilies, $expected)
{ {
$output = Smilies::replaceFromArray($text, $smilies); $output = Smilies::replaceFromArray($text, $smilies);
$this->assertEquals($expected, $output); self::assertEquals($expected, $output);
} }
} }

2
tests/src/Content/Text/BBCode/VideoTest.php
View file

@ -57,6 +57,6 @@ class VideoTest extends MockedTest
{ {
$bbCodeVideo = new Video(); $bbCodeVideo = new Video();
$this->assertEquals($assert, $bbCodeVideo->transform($input)); self::assertEquals($assert, $bbCodeVideo->transform($input));
} }
} }

8
tests/src/Content/Text/BBCodeTest.php
View file

@ -169,9 +169,9 @@ class BBCodeTest extends MockedTest
$output = BBCode::convert($data); $output = BBCode::convert($data);
$assert = '<a href="' . $data . '" target="_blank" rel="noopener noreferrer">' . $data . '</a>'; $assert = '<a href="' . $data . '" target="_blank" rel="noopener noreferrer">' . $data . '</a>';
if ($assertHTML) { if ($assertHTML) {
$this->assertEquals($assert, $output); self::assertEquals($assert, $output);
} else { } else {
$this->assertNotEquals($assert, $output); self::assertNotEquals($assert, $output);
} }
} }
@ -264,7 +264,7 @@ class BBCodeTest extends MockedTest
{ {
$actual = BBCode::convert($text, $try_oembed, $simpleHtml, $forPlaintext); $actual = BBCode::convert($text, $try_oembed, $simpleHtml, $forPlaintext);
$this->assertEquals($expectedHtml, $actual); self::assertEquals($expectedHtml, $actual);
} }
public function dataBBCodesToMarkdown() public function dataBBCodesToMarkdown()
@ -299,6 +299,6 @@ class BBCodeTest extends MockedTest
{ {
$actual = BBCode::toMarkdown($text, $for_diaspora); $actual = BBCode::toMarkdown($text, $for_diaspora);
$this->assertEquals($expected, $actual); self::assertEquals($expected, $actual);
} }
} }

4
tests/src/Content/Text/HTMLTest.php
View file

@ -67,7 +67,7 @@ class HTMLTest extends MockedTest
{ {
$output = HTML::toPlaintext($input, 0); $output = HTML::toPlaintext($input, 0);
$this->assertEquals($expected, $output); self::assertEquals($expected, $output);
} }
public function dataHTMLText() public function dataHTMLText()
@ -97,6 +97,6 @@ class HTMLTest extends MockedTest
{ {
$actual = HTML::toBBCode($html); $actual = HTML::toBBCode($html);
$this->assertEquals($expectedBBCode, $actual); self::assertEquals($expectedBBCode, $actual);
} }
} }

4
tests/src/Content/Text/MarkdownTest.php
View file

@ -67,7 +67,7 @@ class MarkdownTest extends MockedTest
{ {
$output = Markdown::convert($input); $output = Markdown::convert($input);
$this->assertEquals($expected, $output); self::assertEquals($expected, $output);
} }
public function dataMarkdownText() public function dataMarkdownText()
@ -93,6 +93,6 @@ class MarkdownTest extends MockedTest
{ {
$actual = Markdown::toBBCode($html); $actual = Markdown::toBBCode($html);
$this->assertEquals($expectedBBCode, $actual); self::assertEquals($expectedBBCode, $actual);
} }
} }

52
tests/src/Core/Cache/CacheTest.php
View file

@ -97,25 +97,25 @@ abstract class CacheTest extends MockedTest
*/ */
function testSimple($value1, $value2) function testSimple($value1, $value2)
{ {
$this->assertNull($this->instance->get('value1')); self::assertNull($this->instance->get('value1'));
$this->instance->set('value1', $value1); $this->instance->set('value1', $value1);
$received = $this->instance->get('value1'); $received = $this->instance->get('value1');
$this->assertEquals($value1, $received, 'Value received from cache not equal to the original'); self::assertEquals($value1, $received, 'Value received from cache not equal to the original');
$this->instance->set('value1', $value2); $this->instance->set('value1', $value2);
$received = $this->instance->get('value1'); $received = $this->instance->get('value1');
$this->assertEquals($value2, $received, 'Value not overwritten by second set'); self::assertEquals($value2, $received, 'Value not overwritten by second set');
$this->instance->set('value2', $value1); $this->instance->set('value2', $value1);
$received2 = $this->instance->get('value2'); $received2 = $this->instance->get('value2');
$this->assertEquals($value2, $received, 'Value changed while setting other variable'); self::assertEquals($value2, $received, 'Value changed while setting other variable');
$this->assertEquals($value1, $received2, 'Second value not equal to original'); self::assertEquals($value1, $received2, 'Second value not equal to original');
$this->assertNull($this->instance->get('not_set'), 'Unset value not equal to null'); self::assertNull($this->instance->get('not_set'), 'Unset value not equal to null');
$this->assertTrue($this->instance->delete('value1')); self::assertTrue($this->instance->delete('value1'));
$this->assertNull($this->instance->get('value1')); self::assertNull($this->instance->get('value1'));
} }
/** /**
@ -135,7 +135,7 @@ abstract class CacheTest extends MockedTest
$this->instance->set('2_value1', $value3); $this->instance->set('2_value1', $value3);
$this->instance->set('3_value1', $value4); $this->instance->set('3_value1', $value4);
$this->assertEquals([ self::assertEquals([
'1_value1' => $value1, '1_value1' => $value1,
'1_value2' => $value2, '1_value2' => $value2,
'2_value1' => $value3, '2_value1' => $value3,
@ -147,9 +147,9 @@ abstract class CacheTest extends MockedTest
'3_value1' => $this->instance->get('3_value1'), '3_value1' => $this->instance->get('3_value1'),
]); ]);
$this->assertTrue($this->instance->clear()); self::assertTrue($this->instance->clear());
$this->assertEquals([ self::assertEquals([
'1_value1' => $value1, '1_value1' => $value1,
'1_value2' => $value2, '1_value2' => $value2,
'2_value1' => $value3, '2_value1' => $value3,
@ -161,9 +161,9 @@ abstract class CacheTest extends MockedTest
'3_value1' => $this->instance->get('3_value1'), '3_value1' => $this->instance->get('3_value1'),
]); ]);
$this->assertTrue($this->instance->clear(false)); self::assertTrue($this->instance->clear(false));
$this->assertEquals([ self::assertEquals([
'1_value1' => null, '1_value1' => null,
'1_value2' => null, '1_value2' => null,
'2_value3' => null, '2_value3' => null,
@ -183,16 +183,16 @@ abstract class CacheTest extends MockedTest
{ {
$this->markTestSkipped('taking too much time without mocking'); $this->markTestSkipped('taking too much time without mocking');
$this->assertNull($this->instance->get('value1')); self::assertNull($this->instance->get('value1'));
$value = 'foobar'; $value = 'foobar';
$this->instance->set('value1', $value, 1); $this->instance->set('value1', $value, 1);
$received = $this->instance->get('value1'); $received = $this->instance->get('value1');
$this->assertEquals($value, $received, 'Value received from cache not equal to the original'); self::assertEquals($value, $received, 'Value received from cache not equal to the original');
sleep(2); sleep(2);
$this->assertNull($this->instance->get('value1')); self::assertNull($this->instance->get('value1'));
} }
/** /**
@ -206,7 +206,7 @@ abstract class CacheTest extends MockedTest
{ {
$this->instance->set('val', $data); $this->instance->set('val', $data);
$received = $this->instance->get('val'); $received = $this->instance->get('val');
$this->assertEquals($data, $received, 'Value type changed from ' . gettype($data) . ' to ' . gettype($received)); self::assertEquals($data, $received, 'Value type changed from ' . gettype($data) . ' to ' . gettype($received));
} }
/** /**
@ -220,20 +220,20 @@ abstract class CacheTest extends MockedTest
*/ */
public function testGetAllKeys($value1, $value2, $value3) public function testGetAllKeys($value1, $value2, $value3)
{ {
$this->assertTrue($this->instance->set('value1', $value1)); self::assertTrue($this->instance->set('value1', $value1));
$this->assertTrue($this->instance->set('value2', $value2)); self::assertTrue($this->instance->set('value2', $value2));
$this->assertTrue($this->instance->set('test_value3', $value3)); self::assertTrue($this->instance->set('test_value3', $value3));
$list = $this->instance->getAllKeys(); $list = $this->instance->getAllKeys();
$this->assertContains('value1', $list); self::assertContains('value1', $list);
$this->assertContains('value2', $list); self::assertContains('value2', $list);
$this->assertContains('test_value3', $list); self::assertContains('test_value3', $list);
$list = $this->instance->getAllKeys('test'); $list = $this->instance->getAllKeys('test');
$this->assertContains('test_value3', $list); self::assertContains('test_value3', $list);
$this->assertNotContains('value1', $list); self::assertNotContains('value1', $list);
$this->assertNotContains('value2', $list); self::assertNotContains('value2', $list);
} }
} }

38
tests/src/Core/Cache/MemoryCacheTest.php
View file

@ -45,15 +45,15 @@ abstract class MemoryCacheTest extends CacheTest
*/ */
function testCompareSet($value1, $value2) function testCompareSet($value1, $value2)
{ {
$this->assertNull($this->instance->get('value1')); self::assertNull($this->instance->get('value1'));
$this->instance->add('value1', $value1); $this->instance->add('value1', $value1);
$received = $this->instance->get('value1'); $received = $this->instance->get('value1');
$this->assertEquals($value1, $received, 'Value received from cache not equal to the original'); self::assertEquals($value1, $received, 'Value received from cache not equal to the original');
$this->instance->compareSet('value1', $value1, $value2); $this->instance->compareSet('value1', $value1, $value2);
$received = $this->instance->get('value1'); $received = $this->instance->get('value1');
$this->assertEquals($value2, $received, 'Value not overwritten by compareSet'); self::assertEquals($value2, $received, 'Value not overwritten by compareSet');
} }
/** /**
@ -62,16 +62,16 @@ abstract class MemoryCacheTest extends CacheTest
*/ */
function testNegativeCompareSet($value1, $value2) function testNegativeCompareSet($value1, $value2)
{ {
$this->assertNull($this->instance->get('value1')); self::assertNull($this->instance->get('value1'));
$this->instance->add('value1', $value1); $this->instance->add('value1', $value1);
$received = $this->instance->get('value1'); $received = $this->instance->get('value1');
$this->assertEquals($value1, $received, 'Value received from cache not equal to the original'); self::assertEquals($value1, $received, 'Value received from cache not equal to the original');
$this->instance->compareSet('value1', 'wrong', $value2); $this->instance->compareSet('value1', 'wrong', $value2);
$received = $this->instance->get('value1'); $received = $this->instance->get('value1');
$this->assertNotEquals($value2, $received, 'Value was wrongly overwritten by compareSet'); self::assertNotEquals($value2, $received, 'Value was wrongly overwritten by compareSet');
$this->assertEquals($value1, $received, 'Value was wrongly overwritten by any other value'); self::assertEquals($value1, $received, 'Value was wrongly overwritten by any other value');
} }
/** /**
@ -80,13 +80,13 @@ abstract class MemoryCacheTest extends CacheTest
*/ */
function testCompareDelete($data) function testCompareDelete($data)
{ {
$this->assertNull($this->instance->get('value1')); self::assertNull($this->instance->get('value1'));
$this->instance->add('value1', $data); $this->instance->add('value1', $data);
$received = $this->instance->get('value1'); $received = $this->instance->get('value1');
$this->assertEquals($data, $received, 'Value received from cache not equal to the original'); self::assertEquals($data, $received, 'Value received from cache not equal to the original');
$this->instance->compareDelete('value1', $data); $this->instance->compareDelete('value1', $data);
$this->assertNull($this->instance->get('value1'), 'Value was not deleted by compareDelete'); self::assertNull($this->instance->get('value1'), 'Value was not deleted by compareDelete');
} }
/** /**
@ -95,16 +95,16 @@ abstract class MemoryCacheTest extends CacheTest
*/ */
function testNegativeCompareDelete($data) function testNegativeCompareDelete($data)
{ {
$this->assertNull($this->instance->get('value1')); self::assertNull($this->instance->get('value1'));
$this->instance->add('value1', $data); $this->instance->add('value1', $data);
$received = $this->instance->get('value1'); $received = $this->instance->get('value1');
$this->assertEquals($data, $received, 'Value received from cache not equal to the original'); self::assertEquals($data, $received, 'Value received from cache not equal to the original');
$this->instance->compareDelete('value1', 'wrong'); $this->instance->compareDelete('value1', 'wrong');
$this->assertNotNull($this->instance->get('value1'), 'Value was wrongly compareDeleted'); self::assertNotNull($this->instance->get('value1'), 'Value was wrongly compareDeleted');
$this->instance->compareDelete('value1', $data); $this->instance->compareDelete('value1', $data);
$this->assertNull($this->instance->get('value1'), 'Value was wrongly NOT deleted by compareDelete'); self::assertNull($this->instance->get('value1'), 'Value was wrongly NOT deleted by compareDelete');
} }
/** /**
@ -113,19 +113,19 @@ abstract class MemoryCacheTest extends CacheTest
*/ */
function testAdd($value1, $value2) function testAdd($value1, $value2)
{ {
$this->assertNull($this->instance->get('value1')); self::assertNull($this->instance->get('value1'));
$this->instance->add('value1', $value1); $this->instance->add('value1', $value1);
$this->instance->add('value1', $value2); $this->instance->add('value1', $value2);
$received = $this->instance->get('value1'); $received = $this->instance->get('value1');
$this->assertNotEquals($value2, $received, 'Value was wrongly overwritten by add'); self::assertNotEquals($value2, $received, 'Value was wrongly overwritten by add');
$this->assertEquals($value1, $received, 'Value was wrongly overwritten by any other value'); self::assertEquals($value1, $received, 'Value was wrongly overwritten by any other value');
$this->instance->delete('value1'); $this->instance->delete('value1');
$this->instance->add('value1', $value2); $this->instance->add('value1', $value2);
$received = $this->instance->get('value1'); $received = $this->instance->get('value1');
$this->assertEquals($value2, $received, 'Value was not overwritten by add'); self::assertEquals($value2, $received, 'Value was not overwritten by add');
$this->assertNotEquals($value1, $received, 'Value was not overwritten by any other value'); self::assertNotEquals($value1, $received, 'Value was not overwritten by any other value');
} }
} }

70
tests/src/Core/Config/CacheTest.php
View file

@ -52,7 +52,7 @@ class CacheTest extends MockedTest
{ {
foreach ($data as $cat => $values) { foreach ($data as $cat => $values) {
foreach ($values as $key => $value) { foreach ($values as $key => $value) {
$this->assertEquals($data[$cat][$key], $configCache->get($cat, $key)); self::assertEquals($data[$cat][$key], $configCache->get($cat, $key));
} }
} }
} }
@ -66,7 +66,7 @@ class CacheTest extends MockedTest
$configCache = new Cache(); $configCache = new Cache();
$configCache->load($data); $configCache->load($data);
$this->assertConfigValues($data, $configCache); self::assertConfigValues($data, $configCache);
} }
/** /**
@ -87,26 +87,26 @@ class CacheTest extends MockedTest
// doesn't override - Low Priority due Config file // doesn't override - Low Priority due Config file
$configCache->load($override, Cache::SOURCE_FILE); $configCache->load($override, Cache::SOURCE_FILE);
$this->assertConfigValues($data, $configCache); self::assertConfigValues($data, $configCache);
// override the value - High Prio due Server Env // override the value - High Prio due Server Env
$configCache->load($override, Cache::SOURCE_ENV); $configCache->load($override, Cache::SOURCE_ENV);
$this->assertEquals($override['system']['test'], $configCache->get('system', 'test')); self::assertEquals($override['system']['test'], $configCache->get('system', 'test'));
$this->assertEquals($override['system']['boolTrue'], $configCache->get('system', 'boolTrue')); self::assertEquals($override['system']['boolTrue'], $configCache->get('system', 'boolTrue'));
// Don't overwrite server ENV variables - even in load mode // Don't overwrite server ENV variables - even in load mode
$configCache->load($data, Cache::SOURCE_DB); $configCache->load($data, Cache::SOURCE_DB);
$this->assertEquals($override['system']['test'], $configCache->get('system', 'test')); self::assertEquals($override['system']['test'], $configCache->get('system', 'test'));
$this->assertEquals($override['system']['boolTrue'], $configCache->get('system', 'boolTrue')); self::assertEquals($override['system']['boolTrue'], $configCache->get('system', 'boolTrue'));
// Overwrite ENV variables with ENV variables // Overwrite ENV variables with ENV variables
$configCache->load($data, Cache::SOURCE_ENV); $configCache->load($data, Cache::SOURCE_ENV);
$this->assertConfigValues($data, $configCache); self::assertConfigValues($data, $configCache);
$this->assertNotEquals($override['system']['test'], $configCache->get('system', 'test')); self::assertNotEquals($override['system']['test'], $configCache->get('system', 'test'));
$this->assertNotEquals($override['system']['boolTrue'], $configCache->get('system', 'boolTrue')); self::assertNotEquals($override['system']['boolTrue'], $configCache->get('system', 'boolTrue'));
} }
/** /**
@ -118,15 +118,15 @@ class CacheTest extends MockedTest
// empty dataset // empty dataset
$configCache->load([]); $configCache->load([]);
$this->assertEmpty($configCache->getAll()); self::assertEmpty($configCache->getAll());
// wrong dataset // wrong dataset
$configCache->load(['system' => 'not_array']); $configCache->load(['system' => 'not_array']);
$this->assertEmpty($configCache->getAll()); self::assertEmpty($configCache->getAll());
// incomplete dataset (key is integer ID of the array) // incomplete dataset (key is integer ID of the array)
$configCache->load(['system' => ['value']]); $configCache->load(['system' => ['value']]);
$this->assertEquals('value', $configCache->get('system', 0)); self::assertEquals('value', $configCache->get('system', 0));
} }
/** /**
@ -140,8 +140,8 @@ class CacheTest extends MockedTest
$all = $configCache->getAll(); $all = $configCache->getAll();
$this->assertContains($data['system'], $all); self::assertContains($data['system'], $all);
$this->assertContains($data['config'], $all); self::assertContains($data['config'], $all);
} }
/** /**
@ -158,7 +158,7 @@ class CacheTest extends MockedTest
} }
} }
$this->assertConfigValues($data, $configCache); self::assertConfigValues($data, $configCache);
} }
/** /**
@ -168,7 +168,7 @@ class CacheTest extends MockedTest
{ {
$configCache = new Cache(); $configCache = new Cache();
$this->assertNull($configCache->get('something', 'value')); self::assertNull($configCache->get('something', 'value'));
} }
/** /**
@ -186,13 +186,13 @@ class CacheTest extends MockedTest
], ],
]); ]);
$this->assertEquals([ self::assertEquals([
'key1' => 'value1', 'key1' => 'value1',
'key2' => 'value2', 'key2' => 'value2',
], $configCache->get('system')); ], $configCache->get('system'));
// explicit null as key // explicit null as key
$this->assertEquals([ self::assertEquals([
'key1' => 'value1', 'key1' => 'value1',
'key2' => 'value2', 'key2' => 'value2',
], $configCache->get('system', null)); ], $configCache->get('system', null));
@ -212,7 +212,7 @@ class CacheTest extends MockedTest
} }
} }
$this->assertEmpty($configCache->getAll()); self::assertEmpty($configCache->getAll());
} }
/** /**
@ -229,7 +229,7 @@ class CacheTest extends MockedTest
] ]
]; ];
$this->assertEquals($diffConfig, $configCache->keyDiff($diffConfig)); self::assertEquals($diffConfig, $configCache->keyDiff($diffConfig));
} }
/** /**
@ -242,7 +242,7 @@ class CacheTest extends MockedTest
$diffConfig = $configCache->getAll(); $diffConfig = $configCache->getAll();
$this->assertEmpty($configCache->keyDiff($diffConfig)); self::assertEmpty($configCache->keyDiff($diffConfig));
} }
/** /**
@ -257,9 +257,9 @@ class CacheTest extends MockedTest
], ],
]); ]);
$this->assertEquals('supersecure', $configCache->get('database', 'password')); self::assertEquals('supersecure', $configCache->get('database', 'password'));
$this->assertNotEquals('supersecure', print_r($configCache->get('database', 'password'), true)); self::assertNotEquals('supersecure', print_r($configCache->get('database', 'password'), true));
$this->assertEquals('notsecured', print_r($configCache->get('database', 'username'), true)); self::assertEquals('notsecured', print_r($configCache->get('database', 'username'), true));
} }
/** /**
@ -274,9 +274,9 @@ class CacheTest extends MockedTest
], ],
], false); ], false);
$this->assertEquals('supersecure', $configCache->get('database', 'password')); self::assertEquals('supersecure', $configCache->get('database', 'password'));
$this->assertEquals('supersecure', print_r($configCache->get('database', 'password'), true)); self::assertEquals('supersecure', print_r($configCache->get('database', 'password'), true));
$this->assertEquals('notsecured', print_r($configCache->get('database', 'username'), true)); self::assertEquals('notsecured', print_r($configCache->get('database', 'username'), true));
} }
/** /**
@ -291,9 +291,9 @@ class CacheTest extends MockedTest
] ]
]); ]);
$this->assertNotEmpty($configCache->get('database', 'password')); self::assertNotEmpty($configCache->get('database', 'password'));
$this->assertInstanceOf(HiddenString::class, $configCache->get('database', 'password')); self::assertInstanceOf(HiddenString::class, $configCache->get('database', 'password'));
$this->assertEmpty($configCache->get('database', 'username')); self::assertEmpty($configCache->get('database', 'username'));
} }
public function testWrongTypePassword() public function testWrongTypePassword()
@ -305,8 +305,8 @@ class CacheTest extends MockedTest
] ]
]); ]);
$this->assertNotEmpty($configCache->get('database', 'password')); self::assertNotEmpty($configCache->get('database', 'password'));
$this->assertEmpty($configCache->get('database', 'username')); self::assertEmpty($configCache->get('database', 'username'));
$configCache = new Cache([ $configCache = new Cache([
'database' => [ 'database' => [
@ -315,7 +315,7 @@ class CacheTest extends MockedTest
] ]
]); ]);
$this->assertEquals(23, $configCache->get('database', 'password')); self::assertEquals(23, $configCache->get('database', 'password'));
$this->assertEmpty($configCache->get('database', 'username')); self::assertEmpty($configCache->get('database', 'username'));
} }
} }

92
tests/src/Core/Config/ConfigTest.php
View file

@ -49,9 +49,9 @@ abstract class ConfigTest extends MockedTest
{ {
$result = $this->testedConfig->getCache()->getAll(); $result = $this->testedConfig->getCache()->getAll();
$this->assertNotEmpty($result); self::assertNotEmpty($result);
$this->assertArrayHasKey($cat, $result); self::assertArrayHasKey($cat, $result);
$this->assertArraySubset($data, $result[$cat]); self::assertArraySubset($data, $result[$cat]);
} }
@ -161,10 +161,10 @@ abstract class ConfigTest extends MockedTest
->once(); ->once();
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
// assert config is loaded everytime // assert config is loaded everytime
$this->assertConfig('config', $data['config']); self::assertConfig('config', $data['config']);
} }
/** /**
@ -173,7 +173,7 @@ abstract class ConfigTest extends MockedTest
public function testLoad(array $data, array $possibleCats, array $load) public function testLoad(array $data, array $possibleCats, array $load)
{ {
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
foreach ($load as $loadedCats) { foreach ($load as $loadedCats) {
$this->testedConfig->load($loadedCats); $this->testedConfig->load($loadedCats);
@ -181,7 +181,7 @@ abstract class ConfigTest extends MockedTest
// Assert at least loaded cats are loaded // Assert at least loaded cats are loaded
foreach ($load as $loadedCats) { foreach ($load as $loadedCats) {
$this->assertConfig($loadedCats, $data[$loadedCats]); self::assertConfig($loadedCats, $data[$loadedCats]);
} }
} }
@ -254,7 +254,7 @@ abstract class ConfigTest extends MockedTest
public function testCacheLoadDouble(array $data1, array $data2, array $expect) public function testCacheLoadDouble(array $data1, array $data2, array $expect)
{ {
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
foreach ($data1 as $cat => $data) { foreach ($data1 as $cat => $data) {
$this->testedConfig->load($cat); $this->testedConfig->load($cat);
@ -262,7 +262,7 @@ abstract class ConfigTest extends MockedTest
// Assert at least loaded cats are loaded // Assert at least loaded cats are loaded
foreach ($data1 as $cat => $data) { foreach ($data1 as $cat => $data) {
$this->assertConfig($cat, $data); self::assertConfig($cat, $data);
} }
foreach ($data2 as $cat => $data) { foreach ($data2 as $cat => $data) {
@ -279,9 +279,9 @@ abstract class ConfigTest extends MockedTest
$this->configModel->shouldReceive('load')->withAnyArgs()->andReturn([])->once(); $this->configModel->shouldReceive('load')->withAnyArgs()->andReturn([])->once();
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertEmpty($this->testedConfig->getCache()->getAll()); self::assertEmpty($this->testedConfig->getCache()->getAll());
} }
/** /**
@ -296,12 +296,12 @@ abstract class ConfigTest extends MockedTest
->times(3); ->times(3);
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertTrue($this->testedConfig->set('test', 'it', $data)); self::assertTrue($this->testedConfig->set('test', 'it', $data));
$this->assertEquals($data, $this->testedConfig->get('test', 'it')); self::assertEquals($data, $this->testedConfig->get('test', 'it'));
$this->assertEquals($data, $this->testedConfig->getCache()->get('test', 'it')); self::assertEquals($data, $this->testedConfig->getCache()->get('test', 'it'));
} }
/** /**
@ -314,12 +314,12 @@ abstract class ConfigTest extends MockedTest
$this->configModel->shouldReceive('set')->with('test', 'it', $data)->andReturn(true)->once(); $this->configModel->shouldReceive('set')->with('test', 'it', $data)->andReturn(true)->once();
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertTrue($this->testedConfig->set('test', 'it', $data)); self::assertTrue($this->testedConfig->set('test', 'it', $data));
$this->assertEquals($data, $this->testedConfig->get('test', 'it')); self::assertEquals($data, $this->testedConfig->get('test', 'it'));
$this->assertEquals($data, $this->testedConfig->getCache()->get('test', 'it')); self::assertEquals($data, $this->testedConfig->getCache()->get('test', 'it'));
} }
/** /**
@ -328,19 +328,19 @@ abstract class ConfigTest extends MockedTest
public function testGetWrongWithoutDB() public function testGetWrongWithoutDB()
{ {
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
// without refresh // without refresh
$this->assertNull($this->testedConfig->get('test', 'it')); self::assertNull($this->testedConfig->get('test', 'it'));
/// beware that the cache returns '!<unset>!' and not null for a non existing value /// beware that the cache returns '!<unset>!' and not null for a non existing value
$this->assertNull($this->testedConfig->getCache()->get('test', 'it')); self::assertNull($this->testedConfig->getCache()->get('test', 'it'));
// with default value // with default value
$this->assertEquals('default', $this->testedConfig->get('test', 'it', 'default')); self::assertEquals('default', $this->testedConfig->get('test', 'it', 'default'));
// with default value and refresh // with default value and refresh
$this->assertEquals('default', $this->testedConfig->get('test', 'it', 'default', true)); self::assertEquals('default', $this->testedConfig->get('test', 'it', 'default', true));
} }
/** /**
@ -353,19 +353,19 @@ abstract class ConfigTest extends MockedTest
$this->configCache->load(['test' => ['it' => 'now']], Cache::SOURCE_FILE); $this->configCache->load(['test' => ['it' => 'now']], Cache::SOURCE_FILE);
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
// without refresh // without refresh
$this->assertEquals('now', $this->testedConfig->get('test', 'it')); self::assertEquals('now', $this->testedConfig->get('test', 'it'));
$this->assertEquals('now', $this->testedConfig->getCache()->get('test', 'it')); self::assertEquals('now', $this->testedConfig->getCache()->get('test', 'it'));
// with refresh // with refresh
$this->assertEquals($data, $this->testedConfig->get('test', 'it', null, true)); self::assertEquals($data, $this->testedConfig->get('test', 'it', null, true));
$this->assertEquals($data, $this->testedConfig->getCache()->get('test', 'it')); self::assertEquals($data, $this->testedConfig->getCache()->get('test', 'it'));
// without refresh and wrong value and default // without refresh and wrong value and default
$this->assertEquals('default', $this->testedConfig->get('test', 'not', 'default')); self::assertEquals('default', $this->testedConfig->get('test', 'not', 'default'));
$this->assertNull($this->testedConfig->getCache()->get('test', 'not')); self::assertNull($this->testedConfig->getCache()->get('test', 'not'));
} }
/** /**
@ -378,16 +378,16 @@ abstract class ConfigTest extends MockedTest
$this->configCache->load(['test' => ['it' => $data]], Cache::SOURCE_FILE); $this->configCache->load(['test' => ['it' => $data]], Cache::SOURCE_FILE);
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertEquals($data, $this->testedConfig->get('test', 'it')); self::assertEquals($data, $this->testedConfig->get('test', 'it'));
$this->assertEquals($data, $this->testedConfig->getCache()->get('test', 'it')); self::assertEquals($data, $this->testedConfig->getCache()->get('test', 'it'));
$this->assertTrue($this->testedConfig->delete('test', 'it')); self::assertTrue($this->testedConfig->delete('test', 'it'));
$this->assertNull($this->testedConfig->get('test', 'it')); self::assertNull($this->testedConfig->get('test', 'it'));
$this->assertNull($this->testedConfig->getCache()->get('test', 'it')); self::assertNull($this->testedConfig->getCache()->get('test', 'it'));
$this->assertEmpty($this->testedConfig->getCache()->getAll()); self::assertEmpty($this->testedConfig->getCache()->getAll());
} }
/** /**
@ -415,23 +415,23 @@ abstract class ConfigTest extends MockedTest
->once(); ->once();
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
// directly set the value to the cache // directly set the value to the cache
$this->testedConfig->getCache()->set('test', 'it', 'now'); $this->testedConfig->getCache()->set('test', 'it', 'now');
$this->assertEquals('now', $this->testedConfig->get('test', 'it')); self::assertEquals('now', $this->testedConfig->get('test', 'it'));
$this->assertEquals('now', $this->testedConfig->getCache()->get('test', 'it')); self::assertEquals('now', $this->testedConfig->getCache()->get('test', 'it'));
// delete from cache only // delete from cache only
$this->assertTrue($this->testedConfig->delete('test', 'it')); self::assertTrue($this->testedConfig->delete('test', 'it'));
// delete from db only // delete from db only
$this->assertTrue($this->testedConfig->delete('test', 'second')); self::assertTrue($this->testedConfig->delete('test', 'second'));
// no delete // no delete
$this->assertFalse($this->testedConfig->delete('test', 'third')); self::assertFalse($this->testedConfig->delete('test', 'third'));
// delete both // delete both
$this->assertTrue($this->testedConfig->delete('test', 'quarter')); self::assertTrue($this->testedConfig->delete('test', 'quarter'));
$this->assertEmpty($this->testedConfig->getCache()->getAll()); self::assertEmpty($this->testedConfig->getCache()->getAll());
} }
} }

2
tests/src/Core/Config/JitConfigTest.php
View file

@ -100,7 +100,7 @@ class JitConfigTest extends ConfigTest
// Assert the expected categories // Assert the expected categories
foreach ($data2 as $cat => $data) { foreach ($data2 as $cat => $data) {
$this->assertConfig($cat, $expect[$cat]); self::assertConfig($cat, $expect[$cat]);
} }
} }

4
tests/src/Core/Config/PreloadConfigTest.php
View file

@ -59,7 +59,7 @@ class PreloadConfigTest extends ConfigTest
// Assert that every category is loaded everytime // Assert that every category is loaded everytime
foreach ($data as $cat => $values) { foreach ($data as $cat => $values) {
$this->assertConfig($cat, $values); self::assertConfig($cat, $values);
} }
} }
@ -80,7 +80,7 @@ class PreloadConfigTest extends ConfigTest
// Assert that every category is loaded everytime and is NOT overwritten // Assert that every category is loaded everytime and is NOT overwritten
foreach ($data1 as $cat => $values) { foreach ($data1 as $cat => $values) {
$this->assertConfig($cat, $values); self::assertConfig($cat, $values);
} }
} }

66
tests/src/Core/InstallerTest.php
View file

@ -104,7 +104,7 @@ class InstallerTest extends MockedTest
'help' => $help] 'help' => $help]
]; ];
$this->assertArraySubset($subSet, $assertionArray, false, "expected subset: " . PHP_EOL . print_r($subSet, true) . PHP_EOL . "current subset: " . print_r($assertionArray, true)); self::assertArraySubset($subSet, $assertionArray, false, "expected subset: " . PHP_EOL . print_r($subSet, true) . PHP_EOL . "current subset: " . print_r($assertionArray, true));
} }
/** /**
@ -152,11 +152,11 @@ class InstallerTest extends MockedTest
$this->setFunctions(['openssl_pkey_new' => false]); $this->setFunctions(['openssl_pkey_new' => false]);
$install = new Installer(); $install = new Installer();
$this->assertFalse($install->checkKeys()); self::assertFalse($install->checkKeys());
$this->setFunctions(['openssl_pkey_new' => true]); $this->setFunctions(['openssl_pkey_new' => true]);
$install = new Installer(); $install = new Installer();
$this->assertTrue($install->checkKeys()); self::assertTrue($install->checkKeys());
} }
/** /**
@ -167,8 +167,8 @@ class InstallerTest extends MockedTest
$this->mockFunctionL10TCalls(); $this->mockFunctionL10TCalls();
$this->setFunctions(['curl_init' => false, 'imagecreatefromjpeg' => true]); $this->setFunctions(['curl_init' => false, 'imagecreatefromjpeg' => true]);
$install = new Installer(); $install = new Installer();
$this->assertFalse($install->checkFunctions()); self::assertFalse($install->checkFunctions());
$this->assertCheckExist(3, self::assertCheckExist(3,
'libCurl PHP module', 'libCurl PHP module',
'Error: libCURL PHP module required but not installed.', 'Error: libCURL PHP module required but not installed.',
false, false,
@ -178,8 +178,8 @@ class InstallerTest extends MockedTest
$this->mockFunctionL10TCalls(); $this->mockFunctionL10TCalls();
$this->setFunctions(['imagecreatefromjpeg' => false]); $this->setFunctions(['imagecreatefromjpeg' => false]);
$install = new Installer(); $install = new Installer();
$this->assertFalse($install->checkFunctions()); self::assertFalse($install->checkFunctions());
$this->assertCheckExist(4, self::assertCheckExist(4,
'GD graphics PHP module', 'GD graphics PHP module',
'Error: GD graphics PHP module with JPEG support required but not installed.', 'Error: GD graphics PHP module with JPEG support required but not installed.',
false, false,
@ -189,8 +189,8 @@ class InstallerTest extends MockedTest
$this->mockFunctionL10TCalls(); $this->mockFunctionL10TCalls();
$this->setFunctions(['openssl_public_encrypt' => false]); $this->setFunctions(['openssl_public_encrypt' => false]);
$install = new Installer(); $install = new Installer();
$this->assertFalse($install->checkFunctions()); self::assertFalse($install->checkFunctions());
$this->assertCheckExist(5, self::assertCheckExist(5,
'OpenSSL PHP module', 'OpenSSL PHP module',
'Error: openssl PHP module required but not installed.', 'Error: openssl PHP module required but not installed.',
false, false,
@ -200,8 +200,8 @@ class InstallerTest extends MockedTest
$this->mockFunctionL10TCalls(); $this->mockFunctionL10TCalls();
$this->setFunctions(['mb_strlen' => false]); $this->setFunctions(['mb_strlen' => false]);
$install = new Installer(); $install = new Installer();
$this->assertFalse($install->checkFunctions()); self::assertFalse($install->checkFunctions());
$this->assertCheckExist(6, self::assertCheckExist(6,
'mb_string PHP module', 'mb_string PHP module',
'Error: mb_string PHP module required but not installed.', 'Error: mb_string PHP module required but not installed.',
false, false,
@ -211,8 +211,8 @@ class InstallerTest extends MockedTest
$this->mockFunctionL10TCalls(); $this->mockFunctionL10TCalls();
$this->setFunctions(['iconv_strlen' => false]); $this->setFunctions(['iconv_strlen' => false]);
$install = new Installer(); $install = new Installer();
$this->assertFalse($install->checkFunctions()); self::assertFalse($install->checkFunctions());
$this->assertCheckExist(7, self::assertCheckExist(7,
'iconv PHP module', 'iconv PHP module',
'Error: iconv PHP module required but not installed.', 'Error: iconv PHP module required but not installed.',
false, false,
@ -222,8 +222,8 @@ class InstallerTest extends MockedTest
$this->mockFunctionL10TCalls(); $this->mockFunctionL10TCalls();
$this->setFunctions(['posix_kill' => false]); $this->setFunctions(['posix_kill' => false]);
$install = new Installer(); $install = new Installer();
$this->assertFalse($install->checkFunctions()); self::assertFalse($install->checkFunctions());
$this->assertCheckExist(8, self::assertCheckExist(8,
'POSIX PHP module', 'POSIX PHP module',
'Error: POSIX PHP module required but not installed.', 'Error: POSIX PHP module required but not installed.',
false, false,
@ -233,8 +233,8 @@ class InstallerTest extends MockedTest
$this->mockFunctionL10TCalls(); $this->mockFunctionL10TCalls();
$this->setFunctions(['json_encode' => false]); $this->setFunctions(['json_encode' => false]);
$install = new Installer(); $install = new Installer();
$this->assertFalse($install->checkFunctions()); self::assertFalse($install->checkFunctions());
$this->assertCheckExist(9, self::assertCheckExist(9,
'JSON PHP module', 'JSON PHP module',
'Error: JSON PHP module required but not installed.', 'Error: JSON PHP module required but not installed.',
false, false,
@ -244,8 +244,8 @@ class InstallerTest extends MockedTest
$this->mockFunctionL10TCalls(); $this->mockFunctionL10TCalls();
$this->setFunctions(['finfo_open' => false]); $this->setFunctions(['finfo_open' => false]);
$install = new Installer(); $install = new Installer();
$this->assertFalse($install->checkFunctions()); self::assertFalse($install->checkFunctions());
$this->assertCheckExist(10, self::assertCheckExist(10,
'File Information PHP module', 'File Information PHP module',
'Error: File Information PHP module required but not installed.', 'Error: File Information PHP module required but not installed.',
false, false,
@ -264,7 +264,7 @@ class InstallerTest extends MockedTest
'finfo_open' => true, 'finfo_open' => true,
]); ]);
$install = new Installer(); $install = new Installer();
$this->assertTrue($install->checkFunctions()); self::assertTrue($install->checkFunctions());
} }
/** /**
@ -274,17 +274,17 @@ class InstallerTest extends MockedTest
{ {
$this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; }); $this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
$this->assertTrue($this->root->hasChild('config/local.config.php')); self::assertTrue($this->root->hasChild('config/local.config.php'));
$install = new Installer(); $install = new Installer();
$this->assertTrue($install->checkLocalIni()); self::assertTrue($install->checkLocalIni());
$this->delConfigFile('local.config.php'); $this->delConfigFile('local.config.php');
$this->assertFalse($this->root->hasChild('config/local.config.php')); self::assertFalse($this->root->hasChild('config/local.config.php'));
$install = new Installer(); $install = new Installer();
$this->assertTrue($install->checkLocalIni()); self::assertTrue($install->checkLocalIni());
} }
/** /**
@ -330,8 +330,8 @@ class InstallerTest extends MockedTest
$install = new Installer(); $install = new Installer();
$this->assertFalse($install->checkHtAccess('https://test')); self::assertFalse($install->checkHtAccess('https://test'));
$this->assertSame('test Error', $install->getChecks()[0]['error_msg']['msg']); self::assertSame('test Error', $install->getChecks()[0]['error_msg']['msg']);
} }
/** /**
@ -377,7 +377,7 @@ class InstallerTest extends MockedTest
$install = new Installer(); $install = new Installer();
$this->assertTrue($install->checkHtAccess('https://test')); self::assertTrue($install->checkHtAccess('https://test'));
} }
/** /**
@ -396,9 +396,9 @@ class InstallerTest extends MockedTest
$install = new Installer(); $install = new Installer();
// even there is no supported type, Imagick should return true (because it is not required) // even there is no supported type, Imagick should return true (because it is not required)
$this->assertTrue($install->checkImagick()); self::assertTrue($install->checkImagick());
$this->assertCheckExist(1, self::assertCheckExist(1,
$this->l10nMock->t('ImageMagick supports GIF'), $this->l10nMock->t('ImageMagick supports GIF'),
'', '',
true, true,
@ -422,8 +422,8 @@ class InstallerTest extends MockedTest
$install = new Installer(); $install = new Installer();
// even there is no supported type, Imagick should return true (because it is not required) // even there is no supported type, Imagick should return true (because it is not required)
$this->assertTrue($install->checkImagick()); self::assertTrue($install->checkImagick());
$this->assertCheckExist(1, self::assertCheckExist(1,
$this->l10nMock->t('ImageMagick supports GIF'), $this->l10nMock->t('ImageMagick supports GIF'),
'', '',
false, false,
@ -439,8 +439,8 @@ class InstallerTest extends MockedTest
$install = new Installer(); $install = new Installer();
// even there is no supported type, Imagick should return true (because it is not required) // even there is no supported type, Imagick should return true (because it is not required)
$this->assertTrue($install->checkImagick()); self::assertTrue($install->checkImagick());
$this->assertCheckExist(0, self::assertCheckExist(0,
'ImageMagick PHP extension is not installed', 'ImageMagick PHP extension is not installed',
'', '',
false, false,

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

@ -109,6 +109,6 @@ class L10nTest extends MockedTest
*/ */
public function testDetectLanguage(array $server, array $get, string $default, string $assert) public function testDetectLanguage(array $server, array $get, string $default, string $assert)
{ {
$this->assertEquals($assert, L10n::detectLanguage($server, $get, $default)); self::assertEquals($assert, L10n::detectLanguage($server, $get, $default));
} }
} }

140
tests/src/Core/Lock/LockTest.php
View file

@ -56,10 +56,10 @@ abstract class LockTest extends MockedTest
*/ */
public function testLock() public function testLock()
{ {
$this->assertFalse($this->instance->isLocked('foo')); self::assertFalse($this->instance->isLocked('foo'));
$this->assertTrue($this->instance->acquire('foo', 1)); self::assertTrue($this->instance->acquire('foo', 1));
$this->assertTrue($this->instance->isLocked('foo')); self::assertTrue($this->instance->isLocked('foo'));
$this->assertFalse($this->instance->isLocked('bar')); self::assertFalse($this->instance->isLocked('bar'));
} }
/** /**
@ -67,11 +67,11 @@ abstract class LockTest extends MockedTest
*/ */
public function testDoubleLock() public function testDoubleLock()
{ {
$this->assertFalse($this->instance->isLocked('foo')); self::assertFalse($this->instance->isLocked('foo'));
$this->assertTrue($this->instance->acquire('foo', 1)); self::assertTrue($this->instance->acquire('foo', 1));
$this->assertTrue($this->instance->isLocked('foo')); self::assertTrue($this->instance->isLocked('foo'));
// We already locked it // We already locked it
$this->assertTrue($this->instance->acquire('foo', 1)); self::assertTrue($this->instance->acquire('foo', 1));
} }
/** /**
@ -79,11 +79,11 @@ abstract class LockTest extends MockedTest
*/ */
public function testReleaseLock() public function testReleaseLock()
{ {
$this->assertFalse($this->instance->isLocked('foo')); self::assertFalse($this->instance->isLocked('foo'));
$this->assertTrue($this->instance->acquire('foo', 1)); self::assertTrue($this->instance->acquire('foo', 1));
$this->assertTrue($this->instance->isLocked('foo')); self::assertTrue($this->instance->isLocked('foo'));
$this->instance->release('foo'); $this->instance->release('foo');
$this->assertFalse($this->instance->isLocked('foo')); self::assertFalse($this->instance->isLocked('foo'));
} }
/** /**
@ -91,19 +91,19 @@ abstract class LockTest extends MockedTest
*/ */
public function testReleaseAll() public function testReleaseAll()
{ {
$this->assertTrue($this->instance->acquire('foo', 1)); self::assertTrue($this->instance->acquire('foo', 1));
$this->assertTrue($this->instance->acquire('bar', 1)); self::assertTrue($this->instance->acquire('bar', 1));
$this->assertTrue($this->instance->acquire('nice', 1)); self::assertTrue($this->instance->acquire('nice', 1));
$this->assertTrue($this->instance->isLocked('foo')); self::assertTrue($this->instance->isLocked('foo'));
$this->assertTrue($this->instance->isLocked('bar')); self::assertTrue($this->instance->isLocked('bar'));
$this->assertTrue($this->instance->isLocked('nice')); self::assertTrue($this->instance->isLocked('nice'));
$this->assertTrue($this->instance->releaseAll()); self::assertTrue($this->instance->releaseAll());
$this->assertFalse($this->instance->isLocked('foo')); self::assertFalse($this->instance->isLocked('foo'));
$this->assertFalse($this->instance->isLocked('bar')); self::assertFalse($this->instance->isLocked('bar'));
$this->assertFalse($this->instance->isLocked('nice')); self::assertFalse($this->instance->isLocked('nice'));
} }
/** /**
@ -111,23 +111,23 @@ abstract class LockTest extends MockedTest
*/ */
public function testReleaseAfterUnlock() public function testReleaseAfterUnlock()
{ {
$this->assertFalse($this->instance->isLocked('foo')); self::assertFalse($this->instance->isLocked('foo'));
$this->assertFalse($this->instance->isLocked('bar')); self::assertFalse($this->instance->isLocked('bar'));
$this->assertFalse($this->instance->isLocked('nice')); self::assertFalse($this->instance->isLocked('nice'));
$this->assertTrue($this->instance->acquire('foo', 1)); self::assertTrue($this->instance->acquire('foo', 1));
$this->assertTrue($this->instance->acquire('bar', 1)); self::assertTrue($this->instance->acquire('bar', 1));
$this->assertTrue($this->instance->acquire('nice', 1)); self::assertTrue($this->instance->acquire('nice', 1));
$this->assertTrue($this->instance->release('foo')); self::assertTrue($this->instance->release('foo'));
$this->assertFalse($this->instance->isLocked('foo')); self::assertFalse($this->instance->isLocked('foo'));
$this->assertTrue($this->instance->isLocked('bar')); self::assertTrue($this->instance->isLocked('bar'));
$this->assertTrue($this->instance->isLocked('nice')); self::assertTrue($this->instance->isLocked('nice'));
$this->assertTrue($this->instance->releaseAll()); self::assertTrue($this->instance->releaseAll());
$this->assertFalse($this->instance->isLocked('bar')); self::assertFalse($this->instance->isLocked('bar'));
$this->assertFalse($this->instance->isLocked('nice')); self::assertFalse($this->instance->isLocked('nice'));
} }
/** /**
@ -135,11 +135,11 @@ abstract class LockTest extends MockedTest
*/ */
public function testReleaseWitTTL() public function testReleaseWitTTL()
{ {
$this->assertFalse($this->instance->isLocked('test')); self::assertFalse($this->instance->isLocked('test'));
$this->assertTrue($this->instance->acquire('test', 1, 10)); self::assertTrue($this->instance->acquire('test', 1, 10));
$this->assertTrue($this->instance->isLocked('test')); self::assertTrue($this->instance->isLocked('test'));
$this->assertTrue($this->instance->release('test')); self::assertTrue($this->instance->release('test'));
$this->assertFalse($this->instance->isLocked('test')); self::assertFalse($this->instance->isLocked('test'));
} }
/** /**
@ -147,19 +147,19 @@ abstract class LockTest extends MockedTest
*/ */
public function testGetLocks() public function testGetLocks()
{ {
$this->assertTrue($this->instance->acquire('foo', 1)); self::assertTrue($this->instance->acquire('foo', 1));
$this->assertTrue($this->instance->acquire('bar', 1)); self::assertTrue($this->instance->acquire('bar', 1));
$this->assertTrue($this->instance->acquire('nice', 1)); self::assertTrue($this->instance->acquire('nice', 1));
$this->assertTrue($this->instance->isLocked('foo')); self::assertTrue($this->instance->isLocked('foo'));
$this->assertTrue($this->instance->isLocked('bar')); self::assertTrue($this->instance->isLocked('bar'));
$this->assertTrue($this->instance->isLocked('nice')); self::assertTrue($this->instance->isLocked('nice'));
$locks = $this->instance->getLocks(); $locks = $this->instance->getLocks();
$this->assertContains('foo', $locks); self::assertContains('foo', $locks);
$this->assertContains('bar', $locks); self::assertContains('bar', $locks);
$this->assertContains('nice', $locks); self::assertContains('nice', $locks);
} }
/** /**
@ -167,19 +167,19 @@ abstract class LockTest extends MockedTest
*/ */
public function testGetLocksWithPrefix() public function testGetLocksWithPrefix()
{ {
$this->assertTrue($this->instance->acquire('foo', 1)); self::assertTrue($this->instance->acquire('foo', 1));
$this->assertTrue($this->instance->acquire('test1', 1)); self::assertTrue($this->instance->acquire('test1', 1));
$this->assertTrue($this->instance->acquire('test2', 1)); self::assertTrue($this->instance->acquire('test2', 1));
$this->assertTrue($this->instance->isLocked('foo')); self::assertTrue($this->instance->isLocked('foo'));
$this->assertTrue($this->instance->isLocked('test1')); self::assertTrue($this->instance->isLocked('test1'));
$this->assertTrue($this->instance->isLocked('test2')); self::assertTrue($this->instance->isLocked('test2'));
$locks = $this->instance->getLocks('test'); $locks = $this->instance->getLocks('test');
$this->assertContains('test1', $locks); self::assertContains('test1', $locks);
$this->assertContains('test2', $locks); self::assertContains('test2', $locks);
$this->assertNotContains('foo', $locks); self::assertNotContains('foo', $locks);
} }
/** /**
@ -189,25 +189,25 @@ abstract class LockTest extends MockedTest
{ {
$this->markTestSkipped('taking too much time without mocking'); $this->markTestSkipped('taking too much time without mocking');
$this->assertFalse($this->instance->isLocked('foo')); self::assertFalse($this->instance->isLocked('foo'));
$this->assertFalse($this->instance->isLocked('bar')); self::assertFalse($this->instance->isLocked('bar'));
// TODO [nupplaphil] - Because of the Datetime-Utils for the database, we have to wait a FULL second between the checks to invalidate the db-locks/cache // TODO [nupplaphil] - Because of the Datetime-Utils for the database, we have to wait a FULL second between the checks to invalidate the db-locks/cache
$this->assertTrue($this->instance->acquire('foo', 2, 1)); self::assertTrue($this->instance->acquire('foo', 2, 1));
$this->assertTrue($this->instance->acquire('bar', 2, 3)); self::assertTrue($this->instance->acquire('bar', 2, 3));
$this->assertTrue($this->instance->isLocked('foo')); self::assertTrue($this->instance->isLocked('foo'));
$this->assertTrue($this->instance->isLocked('bar')); self::assertTrue($this->instance->isLocked('bar'));
sleep(2); sleep(2);
$this->assertFalse($this->instance->isLocked('foo')); self::assertFalse($this->instance->isLocked('foo'));
$this->assertTrue($this->instance->isLocked('bar')); self::assertTrue($this->instance->isLocked('bar'));
sleep(2); sleep(2);
$this->assertFalse($this->instance->isLocked('foo')); self::assertFalse($this->instance->isLocked('foo'));
$this->assertFalse($this->instance->isLocked('bar')); self::assertFalse($this->instance->isLocked('bar'));
} }
/** /**
@ -215,7 +215,7 @@ abstract class LockTest extends MockedTest
*/ */
public function testReleaseLockWithoutLock() public function testReleaseLockWithoutLock()
{ {
$this->assertFalse($this->instance->isLocked('wrongLock')); self::assertFalse($this->instance->isLocked('wrongLock'));
$this->assertFalse($this->instance->release('wrongLock')); self::assertFalse($this->instance->release('wrongLock'));
} }
} }

20
tests/src/Core/Lock/SemaphoreLockTest.php
View file

@ -73,9 +73,9 @@ class SemaphoreLockTest extends LockTest
$file = get_temppath() . '/test.sem'; $file = get_temppath() . '/test.sem';
touch($file); touch($file);
$this->assertTrue(file_exists($file)); self::assertTrue(file_exists($file));
$this->assertFalse($this->instance->release('test', false)); self::assertFalse($this->instance->release('test', false));
$this->assertTrue(file_exists($file)); self::assertTrue(file_exists($file));
} }
/** /**
@ -90,9 +90,9 @@ class SemaphoreLockTest extends LockTest
$file = get_temppath() . '/test.sem'; $file = get_temppath() . '/test.sem';
touch($file); touch($file);
$this->assertTrue(file_exists($file)); self::assertTrue(file_exists($file));
$this->assertFalse($this->instance->release('test', true)); self::assertFalse($this->instance->release('test', true));
$this->assertTrue(file_exists($file)); self::assertTrue(file_exists($file));
} }
/** /**
@ -103,9 +103,9 @@ class SemaphoreLockTest extends LockTest
$file = get_temppath() . '/test.sem'; $file = get_temppath() . '/test.sem';
touch($file); touch($file);
$this->assertTrue(file_exists($file)); self::assertTrue(file_exists($file));
$this->assertTrue($this->instance->acquire('test')); self::assertTrue($this->instance->acquire('test'));
$this->assertTrue($this->instance->isLocked('test')); self::assertTrue($this->instance->isLocked('test'));
$this->assertTrue($this->instance->release('test')); self::assertTrue($this->instance->release('test'));
} }
} }

52
tests/src/Core/PConfig/CacheTest.php
View file

@ -51,7 +51,7 @@ class CacheTest extends MockedTest
{ {
foreach ($data as $cat => $values) { foreach ($data as $cat => $values) {
foreach ($values as $key => $value) { foreach ($values as $key => $value) {
$this->assertEquals($data[$cat][$key], $configCache->get($uid, $cat, $key)); self::assertEquals($data[$cat][$key], $configCache->get($uid, $cat, $key));
} }
} }
} }
@ -72,7 +72,7 @@ class CacheTest extends MockedTest
} }
} }
$this->assertConfigValues($data, $configCache, $uid); self::assertConfigValues($data, $configCache, $uid);
} }
@ -94,13 +94,13 @@ class CacheTest extends MockedTest
], ],
]); ]);
$this->assertEquals([ self::assertEquals([
'key1' => 'value1', 'key1' => 'value1',
'key2' => 'value2', 'key2' => 'value2',
], $configCache->get($uid, 'system')); ], $configCache->get($uid, 'system'));
// test explicit cat with null as key // test explicit cat with null as key
$this->assertEquals([ self::assertEquals([
'key1' => 'value1', 'key1' => 'value1',
'key2' => 'value2', 'key2' => 'value2',
], $configCache->get($uid, 'system', null)); ], $configCache->get($uid, 'system', null));
@ -128,7 +128,7 @@ class CacheTest extends MockedTest
} }
} }
$this->assertEmpty($configCache->getAll()); self::assertEmpty($configCache->getAll());
} }
/** /**
@ -146,7 +146,7 @@ class CacheTest extends MockedTest
] ]
]; ];
$this->assertEquals($diffConfig, $configCache->keyDiff($diffConfig)); self::assertEquals($diffConfig, $configCache->keyDiff($diffConfig));
} }
/** /**
@ -162,7 +162,7 @@ class CacheTest extends MockedTest
$diffConfig = $configCache->getAll(); $diffConfig = $configCache->getAll();
$this->assertEmpty($configCache->keyDiff($diffConfig)); self::assertEmpty($configCache->keyDiff($diffConfig));
} }
/** /**
@ -179,9 +179,9 @@ class CacheTest extends MockedTest
] ]
]); ]);
$this->assertEquals('supersecure', $configCache->get(1, 'database', 'password')); self::assertEquals('supersecure', $configCache->get(1, 'database', 'password'));
$this->assertNotEquals('supersecure', print_r($configCache->get(1, 'database', 'password'), true)); self::assertNotEquals('supersecure', print_r($configCache->get(1, 'database', 'password'), true));
$this->assertEquals('notsecured', print_r($configCache->get(1, 'database', 'username'), true)); self::assertEquals('notsecured', print_r($configCache->get(1, 'database', 'username'), true));
} }
/** /**
@ -198,9 +198,9 @@ class CacheTest extends MockedTest
] ]
]); ]);
$this->assertEquals('supersecure', $configCache->get(1, 'database', 'password')); self::assertEquals('supersecure', $configCache->get(1, 'database', 'password'));
$this->assertEquals('supersecure', print_r($configCache->get(1, 'database', 'password'), true)); self::assertEquals('supersecure', print_r($configCache->get(1, 'database', 'password'), true));
$this->assertEquals('notsecured', print_r($configCache->get(1, 'database', 'username'), true)); self::assertEquals('notsecured', print_r($configCache->get(1, 'database', 'username'), true));
} }
/** /**
@ -217,8 +217,8 @@ class CacheTest extends MockedTest
] ]
]); ]);
$this->assertEmpty($configCache->get(1, 'database', 'password')); self::assertEmpty($configCache->get(1, 'database', 'password'));
$this->assertEmpty($configCache->get(1, 'database', 'username')); self::assertEmpty($configCache->get(1, 'database', 'username'));
} }
public function testWrongTypePassword() public function testWrongTypePassword()
@ -232,8 +232,8 @@ class CacheTest extends MockedTest
] ]
]); ]);
$this->assertNotEmpty($configCache->get(1, 'database', 'password')); self::assertNotEmpty($configCache->get(1, 'database', 'password'));
$this->assertEmpty($configCache->get(1, 'database', 'username')); self::assertEmpty($configCache->get(1, 'database', 'username'));
$configCache = new Cache(); $configCache = new Cache();
@ -244,8 +244,8 @@ class CacheTest extends MockedTest
], ],
]); ]);
$this->assertEquals(23, $configCache->get(1, 'database', 'password')); self::assertEquals(23, $configCache->get(1, 'database', 'password'));
$this->assertEmpty($configCache->get(1, 'database', 'username')); self::assertEmpty($configCache->get(1, 'database', 'username'));
} }
/** /**
@ -268,11 +268,11 @@ class CacheTest extends MockedTest
], ],
]); ]);
$this->assertEquals('value1', $configCache->get(1, 'cat1', 'key1')); self::assertEquals('value1', $configCache->get(1, 'cat1', 'key1'));
$this->assertEquals('value2', $configCache->get(2, 'cat2', 'key2')); self::assertEquals('value2', $configCache->get(2, 'cat2', 'key2'));
$this->assertNull($configCache->get(1, 'cat2', 'key2')); self::assertNull($configCache->get(1, 'cat2', 'key2'));
$this->assertNull($configCache->get(2, 'cat1', 'key1')); self::assertNull($configCache->get(2, 'cat1', 'key1'));
} }
/** /**
@ -286,9 +286,9 @@ class CacheTest extends MockedTest
$configCache = new Cache(); $configCache = new Cache();
$this->assertNull($configCache->get($uid, 'cat1', 'cat2')); self::assertNull($configCache->get($uid, 'cat1', 'cat2'));
$this->assertFalse($configCache->set($uid, 'cat1', 'key1', 'doesn\'t matter!')); self::assertFalse($configCache->set($uid, 'cat1', 'key1', 'doesn\'t matter!'));
$this->assertFalse($configCache->delete($uid, 'cat1', 'key1')); self::assertFalse($configCache->delete($uid, 'cat1', 'key1'));
} }
} }

2
tests/src/Core/PConfig/JitPConfigTest.php
View file

@ -78,7 +78,7 @@ class JitPConfigTest extends PConfigTest
// Assert the expected categories // Assert the expected categories
foreach ($data2 as $cat => $data) { foreach ($data2 as $cat => $data) {
$this->assertConfig($uid, $cat, $expect[$cat]); self::assertConfig($uid, $cat, $expect[$cat]);
} }
} }

108
tests/src/Core/PConfig/PConfigTest.php
View file

@ -50,10 +50,10 @@ abstract class PConfigTest extends MockedTest
{ {
$result = $this->testedConfig->getCache()->getAll(); $result = $this->testedConfig->getCache()->getAll();
$this->assertNotEmpty($result); self::assertNotEmpty($result);
$this->assertArrayHasKey($uid, $result); self::assertArrayHasKey($uid, $result);
$this->assertArrayHasKey($cat, $result[$uid]); self::assertArrayHasKey($cat, $result[$uid]);
$this->assertArraySubset($data, $result[$uid][$cat]); self::assertArraySubset($data, $result[$uid][$cat]);
} }
@ -164,9 +164,9 @@ abstract class PConfigTest extends MockedTest
public function testSetUp(int $uid, array $data) public function testSetUp(int $uid, array $data)
{ {
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertEmpty($this->testedConfig->getCache()->getAll()); self::assertEmpty($this->testedConfig->getCache()->getAll());
} }
/** /**
@ -175,7 +175,7 @@ abstract class PConfigTest extends MockedTest
public function testLoad(int $uid, array $data, array $possibleCats, array $load) public function testLoad(int $uid, array $data, array $possibleCats, array $load)
{ {
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
foreach ($load as $loadedCats) { foreach ($load as $loadedCats) {
$this->testedConfig->load($uid, $loadedCats); $this->testedConfig->load($uid, $loadedCats);
@ -183,7 +183,7 @@ abstract class PConfigTest extends MockedTest
// Assert at least loaded cats are loaded // Assert at least loaded cats are loaded
foreach ($load as $loadedCats) { foreach ($load as $loadedCats) {
$this->assertConfig($uid, $loadedCats, $data[$loadedCats]); self::assertConfig($uid, $loadedCats, $data[$loadedCats]);
} }
} }
@ -258,7 +258,7 @@ abstract class PConfigTest extends MockedTest
public function testCacheLoadDouble(int $uid, array $data1, array $data2, array $expect) public function testCacheLoadDouble(int $uid, array $data1, array $data2, array $expect)
{ {
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
foreach ($data1 as $cat => $data) { foreach ($data1 as $cat => $data) {
$this->testedConfig->load($uid, $cat); $this->testedConfig->load($uid, $cat);
@ -266,7 +266,7 @@ abstract class PConfigTest extends MockedTest
// Assert at least loaded cats are loaded // Assert at least loaded cats are loaded
foreach ($data1 as $cat => $data) { foreach ($data1 as $cat => $data) {
$this->assertConfig($uid, $cat, $data); self::assertConfig($uid, $cat, $data);
} }
foreach ($data2 as $cat => $data) { foreach ($data2 as $cat => $data) {
@ -282,12 +282,12 @@ abstract class PConfigTest extends MockedTest
public function testSetGetWithoutDB(int $uid, $data) public function testSetGetWithoutDB(int $uid, $data)
{ {
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertTrue($this->testedConfig->set($uid, 'test', 'it', $data)); self::assertTrue($this->testedConfig->set($uid, 'test', 'it', $data));
$this->assertEquals($data, $this->testedConfig->get($uid, 'test', 'it')); self::assertEquals($data, $this->testedConfig->get($uid, 'test', 'it'));
$this->assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it')); self::assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it'));
} }
/** /**
@ -303,12 +303,12 @@ abstract class PConfigTest extends MockedTest
->once(); ->once();
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertTrue($this->testedConfig->set($uid, 'test', 'it', $data)); self::assertTrue($this->testedConfig->set($uid, 'test', 'it', $data));
$this->assertEquals($data, $this->testedConfig->get($uid, 'test', 'it')); self::assertEquals($data, $this->testedConfig->get($uid, 'test', 'it'));
$this->assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it')); self::assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it'));
} }
/** /**
@ -317,19 +317,19 @@ abstract class PConfigTest extends MockedTest
public function testGetWrongWithoutDB() public function testGetWrongWithoutDB()
{ {
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
// without refresh // without refresh
$this->assertNull($this->testedConfig->get(0, 'test', 'it')); self::assertNull($this->testedConfig->get(0, 'test', 'it'));
/// beware that the cache returns '!<unset>!' and not null for a non existing value /// beware that the cache returns '!<unset>!' and not null for a non existing value
$this->assertNull($this->testedConfig->getCache()->get(0, 'test', 'it')); self::assertNull($this->testedConfig->getCache()->get(0, 'test', 'it'));
// with default value // with default value
$this->assertEquals('default', $this->testedConfig->get(0, 'test', 'it', 'default')); self::assertEquals('default', $this->testedConfig->get(0, 'test', 'it', 'default'));
// with default value and refresh // with default value and refresh
$this->assertEquals('default', $this->testedConfig->get(0, 'test', 'it', 'default', true)); self::assertEquals('default', $this->testedConfig->get(0, 'test', 'it', 'default', true));
} }
/** /**
@ -342,19 +342,19 @@ abstract class PConfigTest extends MockedTest
$this->configCache->load($uid, ['test' => ['it' => 'now']]); $this->configCache->load($uid, ['test' => ['it' => 'now']]);
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
// without refresh // without refresh
$this->assertEquals('now', $this->testedConfig->get($uid, 'test', 'it')); self::assertEquals('now', $this->testedConfig->get($uid, 'test', 'it'));
$this->assertEquals('now', $this->testedConfig->getCache()->get($uid, 'test', 'it')); self::assertEquals('now', $this->testedConfig->getCache()->get($uid, 'test', 'it'));
// with refresh // with refresh
$this->assertEquals($data, $this->testedConfig->get($uid, 'test', 'it', null, true)); self::assertEquals($data, $this->testedConfig->get($uid, 'test', 'it', null, true));
$this->assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it')); self::assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it'));
// without refresh and wrong value and default // without refresh and wrong value and default
$this->assertEquals('default', $this->testedConfig->get($uid, 'test', 'not', 'default')); self::assertEquals('default', $this->testedConfig->get($uid, 'test', 'not', 'default'));
$this->assertNull($this->testedConfig->getCache()->get($uid, 'test', 'not')); self::assertNull($this->testedConfig->getCache()->get($uid, 'test', 'not'));
} }
/** /**
@ -367,16 +367,16 @@ abstract class PConfigTest extends MockedTest
$this->configCache->load($uid, ['test' => ['it' => $data]]); $this->configCache->load($uid, ['test' => ['it' => $data]]);
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertEquals($data, $this->testedConfig->get($uid, 'test', 'it')); self::assertEquals($data, $this->testedConfig->get($uid, 'test', 'it'));
$this->assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it')); self::assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it'));
$this->assertTrue($this->testedConfig->delete($uid, 'test', 'it')); self::assertTrue($this->testedConfig->delete($uid, 'test', 'it'));
$this->assertNull($this->testedConfig->get($uid, 'test', 'it')); self::assertNull($this->testedConfig->get($uid, 'test', 'it'));
$this->assertNull($this->testedConfig->getCache()->get($uid, 'test', 'it')); self::assertNull($this->testedConfig->getCache()->get($uid, 'test', 'it'));
$this->assertEmpty($this->testedConfig->getCache()->getAll()); self::assertEmpty($this->testedConfig->getCache()->getAll());
} }
/** /**
@ -406,24 +406,24 @@ abstract class PConfigTest extends MockedTest
->once(); ->once();
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
// directly set the value to the cache // directly set the value to the cache
$this->testedConfig->getCache()->set($uid, 'test', 'it', 'now'); $this->testedConfig->getCache()->set($uid, 'test', 'it', 'now');
$this->assertEquals('now', $this->testedConfig->get($uid, 'test', 'it')); self::assertEquals('now', $this->testedConfig->get($uid, 'test', 'it'));
$this->assertEquals('now', $this->testedConfig->getCache()->get($uid, 'test', 'it')); self::assertEquals('now', $this->testedConfig->getCache()->get($uid, 'test', 'it'));
// delete from cache only // delete from cache only
$this->assertTrue($this->testedConfig->delete($uid, 'test', 'it')); self::assertTrue($this->testedConfig->delete($uid, 'test', 'it'));
// delete from db only // delete from db only
$this->assertTrue($this->testedConfig->delete($uid, 'test', 'second')); self::assertTrue($this->testedConfig->delete($uid, 'test', 'second'));
// no delete // no delete
$this->assertFalse($this->testedConfig->delete($uid, 'test', 'third')); self::assertFalse($this->testedConfig->delete($uid, 'test', 'third'));
// delete both // delete both
$this->assertTrue($this->testedConfig->delete($uid, 'test', 'quarter')); self::assertTrue($this->testedConfig->delete($uid, 'test', 'quarter'));
$this->assertEmpty($this->testedConfig->getCache()->getAll()); self::assertEmpty($this->testedConfig->getCache()->getAll());
} }
public function dataMultiUid() public function dataMultiUid()
@ -466,12 +466,12 @@ abstract class PConfigTest extends MockedTest
$this->configCache->load($data2['uid'], $data2['data']); $this->configCache->load($data2['uid'], $data2['data']);
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertInstanceOf(Cache::class, $this->testedConfig->getCache()); self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
$this->assertConfig($data1['uid'], 'cat1', $data1['data']['cat1']); self::assertConfig($data1['uid'], 'cat1', $data1['data']['cat1']);
$this->assertConfig($data1['uid'], 'cat2', $data1['data']['cat2']); self::assertConfig($data1['uid'], 'cat2', $data1['data']['cat2']);
$this->assertConfig($data2['uid'], 'cat1', $data2['data']['cat1']); self::assertConfig($data2['uid'], 'cat1', $data2['data']['cat1']);
$this->assertConfig($data2['uid'], 'cat2', $data2['data']['cat2']); self::assertConfig($data2['uid'], 'cat2', $data2['data']['cat2']);
} }
/** /**
@ -485,10 +485,10 @@ abstract class PConfigTest extends MockedTest
$this->testedConfig = $this->getInstance(); $this->testedConfig = $this->getInstance();
$this->assertNull($this->testedConfig->get($uid, 'cat1', 'cat2')); self::assertNull($this->testedConfig->get($uid, 'cat1', 'cat2'));
$this->assertEquals('fallback!', $this->testedConfig->get($uid, 'cat1', 'cat2', 'fallback!')); self::assertEquals('fallback!', $this->testedConfig->get($uid, 'cat1', 'cat2', 'fallback!'));
$this->assertFalse($this->testedConfig->set($uid, 'cat1', 'key1', 'doesn\'t matter!')); self::assertFalse($this->testedConfig->set($uid, 'cat1', 'key1', 'doesn\'t matter!'));
$this->assertFalse($this->testedConfig->delete($uid, 'cat1', 'key1')); self::assertFalse($this->testedConfig->delete($uid, 'cat1', 'key1'));
} }
} }

4
tests/src/Core/PConfig/PreloadPConfigTest.php
View file

@ -49,7 +49,7 @@ class PreloadPConfigTest extends PConfigTest
// Assert that every category is loaded everytime // Assert that every category is loaded everytime
foreach ($data as $cat => $values) { foreach ($data as $cat => $values) {
$this->assertConfig($uid, $cat, $values); self::assertConfig($uid, $cat, $values);
} }
} }
@ -71,7 +71,7 @@ class PreloadPConfigTest extends PConfigTest
// Assert that every category is loaded everytime and is NOT overwritten // Assert that every category is loaded everytime and is NOT overwritten
foreach ($data1 as $cat => $values) { foreach ($data1 as $cat => $values) {
$this->assertConfig($uid, $cat, $values); self::assertConfig($uid, $cat, $values);
} }
} }

50
tests/src/Core/StorageManagerTest.php
View file

@ -87,7 +87,7 @@ class StorageManagerTest extends DatabaseTest
{ {
$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n); $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
$this->assertInstanceOf(StorageManager::class, $storageManager); self::assertInstanceOf(StorageManager::class, $storageManager);
} }
public function dataStorages() public function dataStorages()
@ -172,12 +172,12 @@ class StorageManagerTest extends DatabaseTest
$storage = $storageManager->getByName($name, $userBackend); $storage = $storageManager->getByName($name, $userBackend);
if (!empty($assert)) { if (!empty($assert)) {
$this->assertInstanceOf(Storage\IStorage::class, $storage); self::assertInstanceOf(Storage\IStorage::class, $storage);
$this->assertInstanceOf($assert, $storage); self::assertInstanceOf($assert, $storage);
} else { } else {
$this->assertNull($storage); self::assertNull($storage);
} }
$this->assertEquals($assertName, $storage); self::assertEquals($assertName, $storage);
} }
/** /**
@ -190,10 +190,10 @@ class StorageManagerTest extends DatabaseTest
$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n); $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
// true in every of the backends // true in every of the backends
$this->assertEquals(!empty($assertName), $storageManager->isValidBackend($name)); self::assertEquals(!empty($assertName), $storageManager->isValidBackend($name));
// if userBackend is set to true, filter out e.g. SystemRessource // if userBackend is set to true, filter out e.g. SystemRessource
$this->assertEquals($userBackend, $storageManager->isValidBackend($name, true)); self::assertEquals($userBackend, $storageManager->isValidBackend($name, true));
} }
/** /**
@ -203,7 +203,7 @@ class StorageManagerTest extends DatabaseTest
{ {
$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n); $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
$this->assertEquals(StorageManager::DEFAULT_BACKENDS, $storageManager->listBackends()); self::assertEquals(StorageManager::DEFAULT_BACKENDS, $storageManager->listBackends());
} }
/** /**
@ -215,12 +215,12 @@ class StorageManagerTest extends DatabaseTest
{ {
$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n); $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
$this->assertNull($storageManager->getBackend()); self::assertNull($storageManager->getBackend());
if ($userBackend) { if ($userBackend) {
$storageManager->setBackend($name); $storageManager->setBackend($name);
$this->assertInstanceOf($assert, $storageManager->getBackend()); self::assertInstanceOf($assert, $storageManager->getBackend());
} }
} }
@ -237,9 +237,9 @@ class StorageManagerTest extends DatabaseTest
$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n); $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
if ($userBackend) { if ($userBackend) {
$this->assertInstanceOf($assert, $storageManager->getBackend()); self::assertInstanceOf($assert, $storageManager->getBackend());
} else { } else {
$this->assertNull($storageManager->getBackend()); self::assertNull($storageManager->getBackend());
} }
} }
@ -261,12 +261,12 @@ class StorageManagerTest extends DatabaseTest
$storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n); $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
$this->assertTrue($storageManager->register(SampleStorageBackend::class)); self::assertTrue($storageManager->register(SampleStorageBackend::class));
$this->assertEquals(array_merge(StorageManager::DEFAULT_BACKENDS, [ self::assertEquals(array_merge(StorageManager::DEFAULT_BACKENDS, [
SampleStorageBackend::getName() => SampleStorageBackend::class, SampleStorageBackend::getName() => SampleStorageBackend::class,
]), $storageManager->listBackends()); ]), $storageManager->listBackends());
$this->assertEquals(array_merge(StorageManager::DEFAULT_BACKENDS, [ self::assertEquals(array_merge(StorageManager::DEFAULT_BACKENDS, [
SampleStorageBackend::getName() => SampleStorageBackend::class, SampleStorageBackend::getName() => SampleStorageBackend::class,
]), $this->config->get('storage', 'backends')); ]), $this->config->get('storage', 'backends'));
@ -274,17 +274,17 @@ class StorageManagerTest extends DatabaseTest
SampleStorageBackend::registerHook(); SampleStorageBackend::registerHook();
Hook::loadHooks(); Hook::loadHooks();
$this->assertTrue($storageManager->setBackend(SampleStorageBackend::NAME)); self::assertTrue($storageManager->setBackend(SampleStorageBackend::NAME));
$this->assertEquals(SampleStorageBackend::NAME, $this->config->get('storage', 'name')); self::assertEquals(SampleStorageBackend::NAME, $this->config->get('storage', 'name'));
$this->assertInstanceOf(SampleStorageBackend::class, $storageManager->getBackend()); self::assertInstanceOf(SampleStorageBackend::class, $storageManager->getBackend());
$this->assertTrue($storageManager->unregister(SampleStorageBackend::class)); self::assertTrue($storageManager->unregister(SampleStorageBackend::class));
$this->assertEquals(StorageManager::DEFAULT_BACKENDS, $this->config->get('storage', 'backends')); self::assertEquals(StorageManager::DEFAULT_BACKENDS, $this->config->get('storage', 'backends'));
$this->assertEquals(StorageManager::DEFAULT_BACKENDS, $storageManager->listBackends()); self::assertEquals(StorageManager::DEFAULT_BACKENDS, $storageManager->listBackends());
$this->assertNull($storageManager->getBackend()); self::assertNull($storageManager->getBackend());
$this->assertNull($this->config->get('storage', 'name')); self::assertNull($this->config->get('storage', 'name'));
} }
/** /**
@ -308,12 +308,12 @@ class StorageManagerTest extends DatabaseTest
while ($photo = $this->dba->fetch($photos)) { while ($photo = $this->dba->fetch($photos)) {
$this->assertEmpty($photo['data']); self::assertEmpty($photo['data']);
$storage = $storageManager->getByName($photo['backend-class']); $storage = $storageManager->getByName($photo['backend-class']);
$data = $storage->get($photo['backend-ref']); $data = $storage->get($photo['backend-ref']);
$this->assertNotEmpty($data); self::assertNotEmpty($data);
} }
} }

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

@ -42,33 +42,33 @@ class SystemTest extends TestCase
private function assertGuid($guid, $length, $prefix = '') private function assertGuid($guid, $length, $prefix = '')
{ {
$length -= strlen($prefix); $length -= strlen($prefix);
$this->assertRegExp("/^" . $prefix . "[a-z0-9]{" . $length . "}?$/", $guid); self::assertRegExp("/^" . $prefix . "[a-z0-9]{" . $length . "}?$/", $guid);
} }
function testGuidWithoutParameter() function testGuidWithoutParameter()
{ {
$this->useBaseUrl(); $this->useBaseUrl();
$guid = System::createGUID(); $guid = System::createGUID();
$this->assertGuid($guid, 16); self::assertGuid($guid, 16);
} }
function testGuidWithSize32() function testGuidWithSize32()
{ {
$this->useBaseUrl(); $this->useBaseUrl();
$guid = System::createGUID(32); $guid = System::createGUID(32);
$this->assertGuid($guid, 32); self::assertGuid($guid, 32);
} }
function testGuidWithSize64() function testGuidWithSize64()
{ {
$this->useBaseUrl(); $this->useBaseUrl();
$guid = System::createGUID(64); $guid = System::createGUID(64);
$this->assertGuid($guid, 64); self::assertGuid($guid, 64);
} }
function testGuidWithPrefix() function testGuidWithPrefix()
{ {
$guid = System::createGUID(23, 'test'); $guid = System::createGUID(23, 'test');
$this->assertGuid($guid, 23, 'test'); self::assertGuid($guid, 23, 'test');
} }
} }

12
tests/src/Database/DBATest.php
View file

@ -32,13 +32,13 @@ class DBATest extends DatabaseTest
*/ */
public function testExists() { public function testExists() {
$this->assertTrue(DBA::exists('config', [])); self::assertTrue(DBA::exists('config', []));
$this->assertFalse(DBA::exists('notable', [])); self::assertFalse(DBA::exists('notable', []));
$this->assertTrue(DBA::exists('config', null)); self::assertTrue(DBA::exists('config', null));
$this->assertFalse(DBA::exists('notable', null)); self::assertFalse(DBA::exists('notable', null));
$this->assertTrue(DBA::exists('config', ['k' => 'hostname'])); self::assertTrue(DBA::exists('config', ['k' => 'hostname']));
$this->assertFalse(DBA::exists('config', ['k' => 'nonsense'])); self::assertFalse(DBA::exists('config', ['k' => 'nonsense']));
} }
} }

26
tests/src/Database/DBStructureTest.php
View file

@ -44,13 +44,13 @@ class DBStructureTest extends DatabaseTest
* @small * @small
*/ */
public function testExists() { public function testExists() {
$this->assertTrue(DBStructure::existsTable('config')); self::assertTrue(DBStructure::existsTable('config'));
$this->assertFalse(DBStructure::existsTable('notatable')); self::assertFalse(DBStructure::existsTable('notatable'));
$this->assertTrue(DBStructure::existsColumn('config', ['k'])); self::assertTrue(DBStructure::existsColumn('config', ['k']));
$this->assertFalse(DBStructure::existsColumn('config', ['nonsense'])); self::assertFalse(DBStructure::existsColumn('config', ['nonsense']));
$this->assertFalse(DBStructure::existsColumn('config', ['k', 'nonsense'])); self::assertFalse(DBStructure::existsColumn('config', ['k', 'nonsense']));
} }
/** /**
@ -62,13 +62,13 @@ class DBStructureTest extends DatabaseTest
$fromType = 'varbinary(255) not null'; $fromType = 'varbinary(255) not null';
$toType = 'varbinary(255) not null comment \'Test To Type\''; $toType = 'varbinary(255) not null comment \'Test To Type\'';
$this->assertTrue(DBStructure::rename('config', [ $fromColumn => [ $toColumn, $toType ]])); self::assertTrue(DBStructure::rename('config', [ $fromColumn => [ $toColumn, $toType ]]));
$this->assertTrue(DBStructure::existsColumn('config', [ $toColumn ])); self::assertTrue(DBStructure::existsColumn('config', [ $toColumn ]));
$this->assertFalse(DBStructure::existsColumn('config', [ $fromColumn ])); self::assertFalse(DBStructure::existsColumn('config', [ $fromColumn ]));
$this->assertTrue(DBStructure::rename('config', [ $toColumn => [ $fromColumn, $fromType ]])); self::assertTrue(DBStructure::rename('config', [ $toColumn => [ $fromColumn, $fromType ]]));
$this->assertTrue(DBStructure::existsColumn('config', [ $fromColumn ])); self::assertTrue(DBStructure::existsColumn('config', [ $fromColumn ]));
$this->assertFalse(DBStructure::existsColumn('config', [ $toColumn ])); self::assertFalse(DBStructure::existsColumn('config', [ $toColumn ]));
} }
/** /**
@ -79,7 +79,7 @@ class DBStructureTest extends DatabaseTest
$oldID = 'client_id'; $oldID = 'client_id';
$newID = 'pw'; $newID = 'pw';
$this->assertTrue(DBStructure::rename('clients', [ $newID ], DBStructure::RENAME_PRIMARY_KEY)); self::assertTrue(DBStructure::rename('clients', [ $newID ], DBStructure::RENAME_PRIMARY_KEY));
$this->assertTrue(DBStructure::rename('clients', [ $oldID ], DBStructure::RENAME_PRIMARY_KEY)); self::assertTrue(DBStructure::rename('clients', [ $oldID ], DBStructure::RENAME_PRIMARY_KEY));
} }
} }

4
tests/src/Model/FileTagTest.php
View file

@ -73,7 +73,7 @@ class FileTagTest extends TestCase
*/ */
public function testArrayToFile(array $array, string $type, string $file) public function testArrayToFile(array $array, string $type, string $file)
{ {
$this->assertEquals($file, FileTag::arrayToFile($array, $type)); self::assertEquals($file, FileTag::arrayToFile($array, $type));
} }
public function dataFileToArray() public function dataFileToArray()
@ -133,6 +133,6 @@ class FileTagTest extends TestCase
*/ */
public function testFileToArray(string $file, string $type, array $array) public function testFileToArray(string $file, string $type, array $array)
{ {
$this->assertEquals($array, FileTag::fileToArray($file, $type)); self::assertEquals($array, FileTag::fileToArray($file, $type));
} }
} }

12
tests/src/Model/ProcessTest.php
View file

@ -41,22 +41,22 @@ class ProcessTest extends DatabaseTest
{ {
$process = new Process($this->dba); $process = new Process($this->dba);
$this->assertEquals(0, $this->dba->count('process')); self::assertEquals(0, $this->dba->count('process'));
$process->insert('test', 1); $process->insert('test', 1);
$process->insert('test2', 2); $process->insert('test2', 2);
$process->insert('test3', 3); $process->insert('test3', 3);
$this->assertEquals(3, $this->dba->count('process')); self::assertEquals(3, $this->dba->count('process'));
$this->assertEquals([ self::assertEquals([
['command' => 'test'] ['command' => 'test']
], $this->dba->selectToArray('process', ['command'], ['pid' => 1])); ], $this->dba->selectToArray('process', ['command'], ['pid' => 1]));
$process->deleteByPid(1); $process->deleteByPid(1);
$this->assertEmpty($this->dba->selectToArray('process', ['command'], ['pid' => 1])); self::assertEmpty($this->dba->selectToArray('process', ['command'], ['pid' => 1]));
$this->assertEquals(2, $this->dba->count('process')); self::assertEquals(2, $this->dba->count('process'));
} }
public function testDoubleInsert() public function testDoubleInsert()
@ -68,7 +68,7 @@ class ProcessTest extends DatabaseTest
// double insert doesn't work // double insert doesn't work
$process->insert('test23', 1); $process->insert('test23', 1);
$this->assertEquals([['command' => 'test']], $this->dba->selectToArray('process', ['command'], ['pid' => 1])); self::assertEquals([['command' => 'test']], $this->dba->selectToArray('process', ['command'], ['pid' => 1]));
} }
public function testWrongDelete() public function testWrongDelete()

2
tests/src/Model/Storage/DatabaseStorageTest.php
View file

@ -66,6 +66,6 @@ class DatabaseStorageTest extends StorageTest
protected function assertOption(IStorage $storage) protected function assertOption(IStorage $storage)
{ {
$this->assertEmpty($storage->getOptions()); self::assertEmpty($storage->getOptions());
} }
} }

12
tests/src/Model/Storage/FilesystemStorageTest.php
View file

@ -66,7 +66,7 @@ class FilesystemStorageTest extends StorageTest
protected function assertOption(IStorage $storage) protected function assertOption(IStorage $storage)
{ {
$this->assertEquals([ self::assertEquals([
'storagepath' => [ 'storagepath' => [
'input', 'Storage base path', 'input', 'Storage base path',
$this->root->getChild('storage')->url(), $this->root->getChild('storage')->url(),
@ -119,12 +119,12 @@ class FilesystemStorageTest extends StorageTest
$dir = $this->root->getChild('storage/f0/c0')->url(); $dir = $this->root->getChild('storage/f0/c0')->url();
$file = $this->root->getChild('storage/f0/c0/d0i0')->url(); $file = $this->root->getChild('storage/f0/c0/d0i0')->url();
$this->assertDirectoryExists($dir); self::assertDirectoryExists($dir);
$this->assertFileExists($file); self::assertFileExists($file);
$this->assertDirectoryIsWritable($dir); self::assertDirectoryIsWritable($dir);
$this->assertFileIsWritable($file); self::assertFileIsWritable($file);
$this->assertEquals('test', file_get_contents($file)); self::assertEquals('test', file_get_contents($file));
} }
} }

22
tests/src/Model/Storage/StorageTest.php
View file

@ -37,7 +37,7 @@ abstract class StorageTest extends MockedTest
public function testInstance() public function testInstance()
{ {
$instance = $this->getInstance(); $instance = $this->getInstance();
$this->assertInstanceOf(IStorage::class, $instance); self::assertInstanceOf(IStorage::class, $instance);
} }
/** /**
@ -58,11 +58,11 @@ abstract class StorageTest extends MockedTest
$instance = $this->getInstance(); $instance = $this->getInstance();
$ref = $instance->put('data12345'); $ref = $instance->put('data12345');
$this->assertNotEmpty($ref); self::assertNotEmpty($ref);
$this->assertEquals('data12345', $instance->get($ref)); self::assertEquals('data12345', $instance->get($ref));
$this->assertTrue($instance->delete($ref)); self::assertTrue($instance->delete($ref));
} }
/** /**
@ -73,7 +73,7 @@ abstract class StorageTest extends MockedTest
$instance = $this->getInstance(); $instance = $this->getInstance();
// Even deleting not existing references should return "true" // Even deleting not existing references should return "true"
$this->assertTrue($instance->delete(-1234456)); self::assertTrue($instance->delete(-1234456));
} }
/** /**
@ -84,7 +84,7 @@ abstract class StorageTest extends MockedTest
$instance = $this->getInstance(); $instance = $this->getInstance();
// Invalid references return an empty string // Invalid references return an empty string
$this->assertEmpty($instance->get(-123456)); self::assertEmpty($instance->get(-123456));
} }
/** /**
@ -95,12 +95,12 @@ abstract class StorageTest extends MockedTest
$instance = $this->getInstance(); $instance = $this->getInstance();
$ref = $instance->put('data12345'); $ref = $instance->put('data12345');
$this->assertNotEmpty($ref); self::assertNotEmpty($ref);
$this->assertEquals('data12345', $instance->get($ref)); self::assertEquals('data12345', $instance->get($ref));
$this->assertEquals($ref, $instance->put('data5432', $ref)); self::assertEquals($ref, $instance->put('data5432', $ref));
$this->assertEquals('data5432', $instance->get($ref)); self::assertEquals('data5432', $instance->get($ref));
} }
/** /**
@ -110,6 +110,6 @@ abstract class StorageTest extends MockedTest
{ {
$instance = $this->getInstance(); $instance = $this->getInstance();
$this->assertEquals(-123, $instance->put('data12345', -123)); self::assertEquals(-123, $instance->put('data12345', -123));
} }
} }

66
tests/src/Model/User/CookieTest.php
View file

@ -60,7 +60,7 @@ class CookieTest extends MockedTest
$this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn('7')->once(); $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn('7')->once();
$cookie = new Cookie($this->config, $this->baseUrl); $cookie = new Cookie($this->config, $this->baseUrl);
$this->assertInstanceOf(Cookie::class, $cookie); self::assertInstanceOf(Cookie::class, $cookie);
} }
public function dataGet() public function dataGet()
@ -124,31 +124,31 @@ class CookieTest extends MockedTest
$this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn('7')->once(); $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn('7')->once();
$cookie = new Cookie($this->config, $this->baseUrl, [], $cookieData); $cookie = new Cookie($this->config, $this->baseUrl, [], $cookieData);
$this->assertInstanceOf(Cookie::class, $cookie); self::assertInstanceOf(Cookie::class, $cookie);
$assertData = $cookie->getData(); $assertData = $cookie->getData();
if (!$hasValues) { if (!$hasValues) {
$this->assertEmpty($assertData); self::assertEmpty($assertData);
} else { } else {
$this->assertNotEmpty($assertData); self::assertNotEmpty($assertData);
if (isset($uid)) { if (isset($uid)) {
$this->assertObjectHasAttribute('uid', $assertData); self::assertObjectHasAttribute('uid', $assertData);
$this->assertEquals($uid, $assertData->uid); self::assertEquals($uid, $assertData->uid);
} else { } else {
$this->assertObjectNotHasAttribute('uid', $assertData); self::assertObjectNotHasAttribute('uid', $assertData);
} }
if (isset($hash)) { if (isset($hash)) {
$this->assertObjectHasAttribute('hash', $assertData); self::assertObjectHasAttribute('hash', $assertData);
$this->assertEquals($hash, $assertData->hash); self::assertEquals($hash, $assertData->hash);
} else { } else {
$this->assertObjectNotHasAttribute('hash', $assertData); self::assertObjectNotHasAttribute('hash', $assertData);
} }
if (isset($ip)) { if (isset($ip)) {
$this->assertObjectHasAttribute('ip', $assertData); self::assertObjectHasAttribute('ip', $assertData);
$this->assertEquals($ip, $assertData->ip); self::assertEquals($ip, $assertData->ip);
} else { } else {
$this->assertObjectNotHasAttribute('ip', $assertData); self::assertObjectNotHasAttribute('ip', $assertData);
} }
} }
} }
@ -192,9 +192,9 @@ class CookieTest extends MockedTest
$this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn('7')->once(); $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn('7')->once();
$cookie = new Cookie($this->config, $this->baseUrl); $cookie = new Cookie($this->config, $this->baseUrl);
$this->assertInstanceOf(Cookie::class, $cookie); self::assertInstanceOf(Cookie::class, $cookie);
$this->assertEquals($assertTrue, $cookie->check($assertHash, $password, $userPrivateKey)); self::assertEquals($assertTrue, $cookie->check($assertHash, $password, $userPrivateKey));
} }
public function dataSet() public function dataSet()
@ -245,21 +245,21 @@ class CookieTest extends MockedTest
public function assertCookie($uid, $hash, $remoteIp, $lifetime) public function assertCookie($uid, $hash, $remoteIp, $lifetime)
{ {
$this->assertArrayHasKey(Cookie::NAME, StaticCookie::$_COOKIE); self::assertArrayHasKey(Cookie::NAME, StaticCookie::$_COOKIE);
$data = json_decode(StaticCookie::$_COOKIE[Cookie::NAME]); $data = json_decode(StaticCookie::$_COOKIE[Cookie::NAME]);
$this->assertObjectHasAttribute('uid', $data); self::assertObjectHasAttribute('uid', $data);
$this->assertEquals($uid, $data->uid); self::assertEquals($uid, $data->uid);
$this->assertObjectHasAttribute('hash', $data); self::assertObjectHasAttribute('hash', $data);
$this->assertEquals($hash, $data->hash); self::assertEquals($hash, $data->hash);
$this->assertObjectHasAttribute('ip', $data); self::assertObjectHasAttribute('ip', $data);
$this->assertEquals($remoteIp, $data->ip); self::assertEquals($remoteIp, $data->ip);
if (isset($lifetime) && $lifetime !== 0) { if (isset($lifetime) && $lifetime !== 0) {
$this->assertLessThanOrEqual(time() + $lifetime, StaticCookie::$_EXPIRE); self::assertLessThanOrEqual(time() + $lifetime, StaticCookie::$_EXPIRE);
} else { } else {
$this->assertLessThanOrEqual(time() + Cookie::DEFAULT_EXPIRE * 24 * 60 * 60, StaticCookie::$_EXPIRE); self::assertLessThanOrEqual(time() + Cookie::DEFAULT_EXPIRE * 24 * 60 * 60, StaticCookie::$_EXPIRE);
} }
} }
@ -275,11 +275,11 @@ class CookieTest extends MockedTest
$this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn(Cookie::DEFAULT_EXPIRE)->once(); $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn(Cookie::DEFAULT_EXPIRE)->once();
$cookie = new StaticCookie($this->config, $this->baseUrl, $serverArray); $cookie = new StaticCookie($this->config, $this->baseUrl, $serverArray);
$this->assertInstanceOf(Cookie::class, $cookie); self::assertInstanceOf(Cookie::class, $cookie);
$cookie->set($uid, $password, $privateKey, $lifetime); $cookie->set($uid, $password, $privateKey, $lifetime);
$this->assertCookie($uid, $assertHash, $remoteIp, $lifetime); self::assertCookie($uid, $assertHash, $remoteIp, $lifetime);
} }
/** /**
@ -294,14 +294,14 @@ class CookieTest extends MockedTest
$this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn(Cookie::DEFAULT_EXPIRE)->once(); $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn(Cookie::DEFAULT_EXPIRE)->once();
$cookie = new StaticCookie($this->config, $this->baseUrl, $serverArray); $cookie = new StaticCookie($this->config, $this->baseUrl, $serverArray);
$this->assertInstanceOf(Cookie::class, $cookie); self::assertInstanceOf(Cookie::class, $cookie);
// Invalid set, should get overwritten // Invalid set, should get overwritten
$cookie->set(-1, 'invalid', 'nothing', -234); $cookie->set(-1, 'invalid', 'nothing', -234);
$cookie->set($uid, $password, $privateKey, $lifetime); $cookie->set($uid, $password, $privateKey, $lifetime);
$this->assertCookie($uid, $assertHash, $remoteIp, $lifetime); self::assertCookie($uid, $assertHash, $remoteIp, $lifetime);
} }
/** /**
@ -318,14 +318,14 @@ class CookieTest extends MockedTest
$this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn(Cookie::DEFAULT_EXPIRE)->once(); $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn(Cookie::DEFAULT_EXPIRE)->once();
$cookie = new StaticCookie($this->config, $this->baseUrl); $cookie = new StaticCookie($this->config, $this->baseUrl);
$this->assertInstanceOf(Cookie::class, $cookie); self::assertInstanceOf(Cookie::class, $cookie);
$this->assertEquals('test', StaticCookie::$_COOKIE[Cookie::NAME]); self::assertEquals('test', StaticCookie::$_COOKIE[Cookie::NAME]);
$this->assertEquals(null, StaticCookie::$_EXPIRE); self::assertEquals(null, StaticCookie::$_EXPIRE);
$cookie->clear(); $cookie->clear();
$this->assertEmpty(StaticCookie::$_COOKIE[Cookie::NAME]); self::assertEmpty(StaticCookie::$_COOKIE[Cookie::NAME]);
$this->assertEquals(-3600, StaticCookie::$_EXPIRE); self::assertEquals(-3600, StaticCookie::$_EXPIRE);
} }
} }

6
tests/src/Model/UserTest.php
View file

@ -72,7 +72,7 @@ class UserTest extends MockedTest
$record = User::identities($this->parent['uid']); $record = User::identities($this->parent['uid']);
$this->assertEquals([], $record); self::assertEquals([], $record);
} }
public function testIdentitiesAsParent() public function testIdentitiesAsParent()
@ -109,7 +109,7 @@ class UserTest extends MockedTest
$record = User::identities($this->parent['uid']); $record = User::identities($this->parent['uid']);
$this->assertEquals([ self::assertEquals([
$this->parent, $this->parent,
$this->child, $this->child,
$this->manage $this->manage
@ -162,7 +162,7 @@ class UserTest extends MockedTest
$record = User::identities($this->child['uid']); $record = User::identities($this->child['uid']);
$this->assertEquals([ self::assertEquals([
$this->parent, $this->parent,
$this->child, $this->child,
$this->manage $this->manage

54
tests/src/Module/Api/Twitter/ContactEndpointTest.php
View file

@ -12,9 +12,9 @@ class ContactEndpointTest extends FixtureTest
{ {
public function testGetUid() public function testGetUid()
{ {
$this->assertSame(42, ContactEndpointMock::getUid(42)); self::assertSame(42, ContactEndpointMock::getUid(42));
$this->assertSame(42, ContactEndpointMock::getUid(null, 'selfcontact')); self::assertSame(42, ContactEndpointMock::getUid(null, 'selfcontact'));
$this->assertSame(42, ContactEndpointMock::getUid(84, 'selfcontact')); self::assertSame(42, ContactEndpointMock::getUid(84, 'selfcontact'));
} }
public function testGetUidContactIdNotFound() public function testGetUidContactIdNotFound()
@ -52,7 +52,7 @@ class ContactEndpointTest extends FixtureTest
'total_count' => 0, 'total_count' => 0,
]; ];
$this->assertSame($expectedEmpty, ContactEndpointMock::ids(Contact::FOLLOWER, 42)); self::assertSame($expectedEmpty, ContactEndpointMock::ids(Contact::FOLLOWER, 42));
$expectedFriend = [ $expectedFriend = [
'ids' => [47], 'ids' => [47],
@ -63,20 +63,20 @@ class ContactEndpointTest extends FixtureTest
'total_count' => 1, 'total_count' => 1,
]; ];
$this->assertSame($expectedFriend, ContactEndpointMock::ids(Contact::FRIEND, 42)); self::assertSame($expectedFriend, ContactEndpointMock::ids(Contact::FRIEND, 42));
$this->assertSame($expectedFriend, ContactEndpointMock::ids([Contact::FOLLOWER, Contact::FRIEND], 42)); self::assertSame($expectedFriend, ContactEndpointMock::ids([Contact::FOLLOWER, Contact::FRIEND], 42));
$result = ContactEndpointMock::ids(Contact::SHARING, 42); $result = ContactEndpointMock::ids(Contact::SHARING, 42);
$this->assertArrayHasKey('ids', $result); self::assertArrayHasKey('ids', $result);
$this->assertContainsOnly('int', $result['ids']); self::assertContainsOnly('int', $result['ids']);
$this->assertSame(45, $result['ids'][0]); self::assertSame(45, $result['ids'][0]);
$result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42); $result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42);
$this->assertArrayHasKey('ids', $result); self::assertArrayHasKey('ids', $result);
$this->assertContainsOnly('int', $result['ids']); self::assertContainsOnly('int', $result['ids']);
$this->assertSame(45, $result['ids'][0]); self::assertSame(45, $result['ids'][0]);
} }
/** /**
@ -88,9 +88,9 @@ class ContactEndpointTest extends FixtureTest
{ {
$result = ContactEndpointMock::ids(Contact::SHARING, 42, -1, ContactEndpoint::DEFAULT_COUNT, true); $result = ContactEndpointMock::ids(Contact::SHARING, 42, -1, ContactEndpoint::DEFAULT_COUNT, true);
$this->assertArrayHasKey('ids', $result); self::assertArrayHasKey('ids', $result);
$this->assertContainsOnly('string', $result['ids']); self::assertContainsOnly('string', $result['ids']);
$this->assertSame('45', $result['ids'][0]); self::assertSame('45', $result['ids'][0]);
} }
public function testIdsPagination() public function testIdsPagination()
@ -106,7 +106,7 @@ class ContactEndpointTest extends FixtureTest
$result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42, -1, 1); $result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42, -1, 1);
$this->assertSame($expectedDefaultPageResult, $result); self::assertSame($expectedDefaultPageResult, $result);
$nextPageCursor = $result['next_cursor']; $nextPageCursor = $result['next_cursor'];
@ -121,7 +121,7 @@ class ContactEndpointTest extends FixtureTest
$result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42, $nextPageCursor, 1); $result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42, $nextPageCursor, 1);
$this->assertSame($expectedSecondPageResult, $result); self::assertSame($expectedSecondPageResult, $result);
$firstPageCursor = $result['previous_cursor']; $firstPageCursor = $result['previous_cursor'];
$emptyNextPageCursor = $result['next_cursor']; $emptyNextPageCursor = $result['next_cursor'];
@ -137,7 +137,7 @@ class ContactEndpointTest extends FixtureTest
$result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42, $firstPageCursor, 1); $result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42, $firstPageCursor, 1);
$this->assertSame($expectedFirstPageResult, $result); self::assertSame($expectedFirstPageResult, $result);
$emptyPrevPageCursor = $result['previous_cursor']; $emptyPrevPageCursor = $result['previous_cursor'];
@ -152,7 +152,7 @@ class ContactEndpointTest extends FixtureTest
$result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42, $emptyPrevPageCursor, 1); $result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42, $emptyPrevPageCursor, 1);
$this->assertSame($expectedEmptyPrevPageResult, $result); self::assertSame($expectedEmptyPrevPageResult, $result);
$expectedEmptyNextPageResult = [ $expectedEmptyNextPageResult = [
'ids' => [], 'ids' => [],
@ -165,7 +165,7 @@ class ContactEndpointTest extends FixtureTest
$result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42, $emptyNextPageCursor, 1); $result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42, $emptyNextPageCursor, 1);
$this->assertSame($expectedEmptyNextPageResult, $result); self::assertSame($expectedEmptyNextPageResult, $result);
} }
/** /**
@ -186,7 +186,7 @@ class ContactEndpointTest extends FixtureTest
'total_count' => 0, 'total_count' => 0,
]; ];
$this->assertSame($expectedEmpty, ContactEndpointMock::list(Contact::FOLLOWER, 42)); self::assertSame($expectedEmpty, ContactEndpointMock::list(Contact::FOLLOWER, 42));
$expectedFriendContactUser = [ $expectedFriendContactUser = [
'id' => 45, 'id' => 45,
@ -241,14 +241,14 @@ class ContactEndpointTest extends FixtureTest
$result = ContactEndpointMock::list(Contact::SHARING, 42); $result = ContactEndpointMock::list(Contact::SHARING, 42);
$this->assertArrayHasKey('users', $result); self::assertArrayHasKey('users', $result);
$this->assertContainsOnlyInstancesOf(User::class, $result['users']); self::assertContainsOnlyInstancesOf(User::class, $result['users']);
$this->assertSame($expectedFriendContactUser, $result['users'][0]->toArray()); self::assertSame($expectedFriendContactUser, $result['users'][0]->toArray());
$result = ContactEndpointMock::list([Contact::SHARING, Contact::FRIEND], 42); $result = ContactEndpointMock::list([Contact::SHARING, Contact::FRIEND], 42);
$this->assertArrayHasKey('users', $result); self::assertArrayHasKey('users', $result);
$this->assertContainsOnlyInstancesOf(User::class, $result['users']); self::assertContainsOnlyInstancesOf(User::class, $result['users']);
$this->assertSame($expectedFriendContactUser, $result['users'][0]->toArray()); self::assertSame($expectedFriendContactUser, $result['users'][0]->toArray());
} }
} }

76
tests/src/Network/CurlResultTest.php
View file

@ -62,14 +62,14 @@ class CurlResultTest extends TestCase
'url' => 'https://test.local' 'url' => 'https://test.local'
]); ]);
$this->assertTrue($curlResult->isSuccess()); self::assertTrue($curlResult->isSuccess());
$this->assertFalse($curlResult->isTimeout()); self::assertFalse($curlResult->isTimeout());
$this->assertFalse($curlResult->isRedirectUrl()); self::assertFalse($curlResult->isRedirectUrl());
$this->assertSame($header, $curlResult->getHeader()); self::assertSame($header, $curlResult->getHeader());
$this->assertSame($body, $curlResult->getBody()); self::assertSame($body, $curlResult->getBody());
$this->assertSame('text/html; charset=utf-8', $curlResult->getContentType()); self::assertSame('text/html; charset=utf-8', $curlResult->getContentType());
$this->assertSame('https://test.local', $curlResult->getUrl()); self::assertSame('https://test.local', $curlResult->getUrl());
$this->assertSame('https://test.local', $curlResult->getRedirectUrl()); self::assertSame('https://test.local', $curlResult->getRedirectUrl());
} }
/** /**
@ -90,14 +90,14 @@ class CurlResultTest extends TestCase
'redirect_url' => 'https://test.other' 'redirect_url' => 'https://test.other'
]); ]);
$this->assertTrue($curlResult->isSuccess()); self::assertTrue($curlResult->isSuccess());
$this->assertFalse($curlResult->isTimeout()); self::assertFalse($curlResult->isTimeout());
$this->assertTrue($curlResult->isRedirectUrl()); self::assertTrue($curlResult->isRedirectUrl());
$this->assertSame($header, $curlResult->getHeader()); self::assertSame($header, $curlResult->getHeader());
$this->assertSame($body, $curlResult->getBody()); self::assertSame($body, $curlResult->getBody());
$this->assertSame('text/html; charset=utf-8', $curlResult->getContentType()); self::assertSame('text/html; charset=utf-8', $curlResult->getContentType());
$this->assertSame('https://test.local/test/it', $curlResult->getUrl()); self::assertSame('https://test.local/test/it', $curlResult->getUrl());
$this->assertSame('https://test.other/test/it', $curlResult->getRedirectUrl()); self::assertSame('https://test.other/test/it', $curlResult->getRedirectUrl());
} }
/** /**
@ -116,14 +116,14 @@ class CurlResultTest extends TestCase
'redirect_url' => 'https://test.other' 'redirect_url' => 'https://test.other'
], CURLE_OPERATION_TIMEDOUT, 'Tested error'); ], CURLE_OPERATION_TIMEDOUT, 'Tested error');
$this->assertFalse($curlResult->isSuccess()); self::assertFalse($curlResult->isSuccess());
$this->assertTrue($curlResult->isTimeout()); self::assertTrue($curlResult->isTimeout());
$this->assertFalse($curlResult->isRedirectUrl()); self::assertFalse($curlResult->isRedirectUrl());
$this->assertSame($header, $curlResult->getHeader()); self::assertSame($header, $curlResult->getHeader());
$this->assertSame($body, $curlResult->getBody()); self::assertSame($body, $curlResult->getBody());
$this->assertSame('text/html; charset=utf-8', $curlResult->getContentType()); self::assertSame('text/html; charset=utf-8', $curlResult->getContentType());
$this->assertSame('https://test.local/test/it', $curlResult->getRedirectUrl()); self::assertSame('https://test.local/test/it', $curlResult->getRedirectUrl());
$this->assertSame('Tested error', $curlResult->getError()); self::assertSame('Tested error', $curlResult->getError());
} }
/** /**
@ -143,14 +143,14 @@ class CurlResultTest extends TestCase
'url' => 'https://test.local/test/it?key=value', 'url' => 'https://test.local/test/it?key=value',
]); ]);
$this->assertTrue($curlResult->isSuccess()); self::assertTrue($curlResult->isSuccess());
$this->assertFalse($curlResult->isTimeout()); self::assertFalse($curlResult->isTimeout());
$this->assertTrue($curlResult->isRedirectUrl()); self::assertTrue($curlResult->isRedirectUrl());
$this->assertSame($header, $curlResult->getHeader()); self::assertSame($header, $curlResult->getHeader());
$this->assertSame($body, $curlResult->getBody()); self::assertSame($body, $curlResult->getBody());
$this->assertSame('text/html; charset=utf-8', $curlResult->getContentType()); self::assertSame('text/html; charset=utf-8', $curlResult->getContentType());
$this->assertSame('https://test.local/test/it?key=value', $curlResult->getUrl()); self::assertSame('https://test.local/test/it?key=value', $curlResult->getUrl());
$this->assertSame('https://test.other/some/?key=value', $curlResult->getRedirectUrl()); self::assertSame('https://test.other/some/?key=value', $curlResult->getRedirectUrl());
} }
/** /**
@ -166,8 +166,8 @@ class CurlResultTest extends TestCase
'content_type' => 'text/html; charset=utf-8', 'content_type' => 'text/html; charset=utf-8',
'url' => 'https://test.local' 'url' => 'https://test.local'
]); ]);
$this->assertTrue($curlResult->inHeader('vary')); self::assertTrue($curlResult->inHeader('vary'));
$this->assertFalse($curlResult->inHeader('wrongHeader')); self::assertFalse($curlResult->inHeader('wrongHeader'));
} }
/** /**
@ -186,8 +186,8 @@ class CurlResultTest extends TestCase
$headers = $curlResult->getHeaderArray(); $headers = $curlResult->getHeaderArray();
$this->assertNotEmpty($headers); self::assertNotEmpty($headers);
$this->assertArrayHasKey('vary', $headers); self::assertArrayHasKey('vary', $headers);
} }
/** /**
@ -204,7 +204,7 @@ class CurlResultTest extends TestCase
'url' => 'https://test.local' 'url' => 'https://test.local'
]); ]);
$this->assertNotEmpty($curlResult->getHeader()); self::assertNotEmpty($curlResult->getHeader());
$this->assertEmpty($curlResult->getHeader('wrongHeader')); self::assertEmpty($curlResult->getHeader('wrongHeader'));
} }
} }

4
tests/src/Network/ProbeTest.php
View file

@ -85,7 +85,7 @@ class ProbeTest extends TestCase
$feedLink = Probe::getFeedLink($url, $body); $feedLink = Probe::getFeedLink($url, $body);
$this->assertEquals($expected, $feedLink, 'base url = ' . $url . ' | href = ' . $href); self::assertEquals($expected, $feedLink, 'base url = ' . $url . ' | href = ' . $href);
} }
} }
} }
@ -101,7 +101,7 @@ class ProbeTest extends TestCase
$feedLink = Probe::getFeedLink('http://example.com', $body); $feedLink = Probe::getFeedLink('http://example.com', $body);
$this->assertEquals($expected, $feedLink, 'base url = ' . $url . ' | href = ' . $href); self::assertEquals($expected, $feedLink, 'base url = ' . $url . ' | href = ' . $href);
} }
} }
} }

6
tests/src/Protocol/ActivityTest.php
View file

@ -72,14 +72,14 @@ class ActivityTest extends MockedTest
{ {
$activity = new Activity(); $activity = new Activity();
$this->assertEquals($assert, $activity->match($haystack, $needle)); self::assertEquals($assert, $activity->match($haystack, $needle));
} }
public function testIsHidden() public function testIsHidden()
{ {
$activity = new Activity(); $activity = new Activity();
$this->assertTrue($activity->isHidden(Activity::LIKE)); self::assertTrue($activity->isHidden(Activity::LIKE));
$this->assertFalse($activity->isHidden(Activity\ObjectType::BOOKMARK)); self::assertFalse($activity->isHidden(Activity\ObjectType::BOOKMARK));
} }
} }

20
tests/src/Util/ACLFormaterTest.php
View file

@ -37,18 +37,18 @@ class ACLFormaterTest extends TestCase
$acl = $aclFormatter->expand($text); $acl = $aclFormatter->expand($text);
$this->assertEquals($assert, $acl); self::assertEquals($assert, $acl);
$this->assertMergable($acl); self::assertMergable($acl);
} }
public function assertMergable(array $aclOne, array $aclTwo = []) public function assertMergable(array $aclOne, array $aclTwo = [])
{ {
$this->assertTrue(is_array($aclOne)); self::assertTrue(is_array($aclOne));
$this->assertTrue(is_array($aclTwo)); self::assertTrue(is_array($aclTwo));
$aclMerged = array_unique(array_merge($aclOne, $aclTwo)); $aclMerged = array_unique(array_merge($aclOne, $aclTwo));
$this->assertTrue(is_array($aclMerged)); self::assertTrue(is_array($aclMerged));
return $aclMerged; return $aclMerged;
} }
@ -118,7 +118,7 @@ class ACLFormaterTest extends TestCase
*/ */
public function testExpand($input, array $assert) public function testExpand($input, array $assert)
{ {
$this->assertAcl($input, $assert); self::assertAcl($input, $assert);
} }
/** /**
@ -131,11 +131,11 @@ class ACLFormaterTest extends TestCase
$allow_people = $aclFormatter->expand(); $allow_people = $aclFormatter->expand();
$allow_groups = $aclFormatter->expand(); $allow_groups = $aclFormatter->expand();
$this->assertEmpty($aclFormatter->expand(null)); self::assertEmpty($aclFormatter->expand(null));
$this->assertEmpty($aclFormatter->expand()); self::assertEmpty($aclFormatter->expand());
$recipients = array_unique(array_merge($allow_people, $allow_groups)); $recipients = array_unique(array_merge($allow_people, $allow_groups));
$this->assertEmpty($recipients); self::assertEmpty($recipients);
} }
public function dataAclToString() public function dataAclToString()
@ -188,6 +188,6 @@ class ACLFormaterTest extends TestCase
{ {
$aclFormatter = new ACLFormatter(); $aclFormatter = new ACLFormatter();
$this->assertEquals($assert, $aclFormatter->toString($input)); self::assertEquals($assert, $aclFormatter->toString($input));
} }
} }

22
tests/src/Util/ArraysTest.php
View file

@ -35,7 +35,7 @@ class ArraysTest extends TestCase
public function testEmptyArrayEmptyDelimiter() public function testEmptyArrayEmptyDelimiter()
{ {
$str = Arrays::recursiveImplode([], ''); $str = Arrays::recursiveImplode([], '');
$this->assertEmpty($str); self::assertEmpty($str);
} }
/** /**
@ -44,7 +44,7 @@ class ArraysTest extends TestCase
public function testEmptyArrayNonEmptyDelimiter() public function testEmptyArrayNonEmptyDelimiter()
{ {
$str = Arrays::recursiveImplode([], ','); $str = Arrays::recursiveImplode([], ',');
$this->assertEmpty($str); self::assertEmpty($str);
} }
/** /**
@ -53,7 +53,7 @@ class ArraysTest extends TestCase
public function testNonEmptyArrayEmptyDelimiter() public function testNonEmptyArrayEmptyDelimiter()
{ {
$str = Arrays::recursiveImplode([1], ''); $str = Arrays::recursiveImplode([1], '');
$this->assertSame($str, '1'); self::assertSame($str, '1');
} }
/** /**
@ -62,7 +62,7 @@ class ArraysTest extends TestCase
public function testNonEmptyArray2EmptyDelimiter() public function testNonEmptyArray2EmptyDelimiter()
{ {
$str = Arrays::recursiveImplode([1, 2], ''); $str = Arrays::recursiveImplode([1, 2], '');
$this->assertSame($str, '12'); self::assertSame($str, '12');
} }
/** /**
@ -71,7 +71,7 @@ class ArraysTest extends TestCase
public function testNonEmptyArrayNonEmptyDelimiter() public function testNonEmptyArrayNonEmptyDelimiter()
{ {
$str = Arrays::recursiveImplode([1], ','); $str = Arrays::recursiveImplode([1], ',');
$this->assertSame($str, '1'); self::assertSame($str, '1');
} }
/** /**
@ -80,7 +80,7 @@ class ArraysTest extends TestCase
public function testNonEmptyArray2NonEmptyDelimiter() public function testNonEmptyArray2NonEmptyDelimiter()
{ {
$str = Arrays::recursiveImplode([1, 2], ','); $str = Arrays::recursiveImplode([1, 2], ',');
$this->assertSame($str, '1,2'); self::assertSame($str, '1,2');
} }
/** /**
@ -89,7 +89,7 @@ class ArraysTest extends TestCase
public function testEmptyMultiArray2EmptyDelimiter() public function testEmptyMultiArray2EmptyDelimiter()
{ {
$str = Arrays::recursiveImplode([[1], []], ''); $str = Arrays::recursiveImplode([[1], []], '');
$this->assertSame($str, '{1}{}'); self::assertSame($str, '{1}{}');
} }
/** /**
@ -98,7 +98,7 @@ class ArraysTest extends TestCase
public function testEmptyMulti2Array2EmptyDelimiter() public function testEmptyMulti2Array2EmptyDelimiter()
{ {
$str = Arrays::recursiveImplode([[1], [2]], ''); $str = Arrays::recursiveImplode([[1], [2]], '');
$this->assertSame($str, '{1}{2}'); self::assertSame($str, '{1}{2}');
} }
/** /**
@ -107,7 +107,7 @@ class ArraysTest extends TestCase
public function testEmptyMultiArray2NonEmptyDelimiter() public function testEmptyMultiArray2NonEmptyDelimiter()
{ {
$str = Arrays::recursiveImplode([[1], []], ','); $str = Arrays::recursiveImplode([[1], []], ',');
$this->assertSame($str, '{1},{}'); self::assertSame($str, '{1},{}');
} }
/** /**
@ -116,7 +116,7 @@ class ArraysTest extends TestCase
public function testEmptyMulti2Array2NonEmptyDelimiter() public function testEmptyMulti2Array2NonEmptyDelimiter()
{ {
$str = Arrays::recursiveImplode([[1], [2]], ','); $str = Arrays::recursiveImplode([[1], [2]], ',');
$this->assertSame($str, '{1},{2}'); self::assertSame($str, '{1},{2}');
} }
/** /**
@ -125,6 +125,6 @@ class ArraysTest extends TestCase
public function testEmptyMulti3Array2NonEmptyDelimiter() public function testEmptyMulti3Array2NonEmptyDelimiter()
{ {
$str = Arrays::recursiveImplode([[1], [2, [3]]], ','); $str = Arrays::recursiveImplode([[1], [2, [3]]], ',');
$this->assertSame($str, '{1},{2,{3}}'); self::assertSame($str, '{1},{2,{3}}');
} }
} }

2
tests/src/Util/BasePathTest.php
View file

@ -59,7 +59,7 @@ class BasePathTest extends MockedTest
public function testDetermineBasePath(array $server, $input, $output) public function testDetermineBasePath(array $server, $input, $output)
{ {
$basepath = new BasePath($input, $server); $basepath = new BasePath($input, $server);
$this->assertEquals($output, $basepath->getPath()); self::assertEquals($output, $basepath->getPath());
} }
/** /**

28
tests/src/Util/BaseURLTest.php
View file

@ -201,11 +201,11 @@ class BaseURLTest extends MockedTest
$baseUrl = new BaseURL($configMock, $server); $baseUrl = new BaseURL($configMock, $server);
$this->assertEquals($assert['hostname'], $baseUrl->getHostname()); self::assertEquals($assert['hostname'], $baseUrl->getHostname());
$this->assertEquals($assert['urlPath'], $baseUrl->getUrlPath()); self::assertEquals($assert['urlPath'], $baseUrl->getUrlPath());
$this->assertEquals($assert['sslPolicy'], $baseUrl->getSSLPolicy()); self::assertEquals($assert['sslPolicy'], $baseUrl->getSSLPolicy());
$this->assertEquals($assert['scheme'], $baseUrl->getScheme()); self::assertEquals($assert['scheme'], $baseUrl->getScheme());
$this->assertEquals($assert['url'], $baseUrl->get()); self::assertEquals($assert['url'], $baseUrl->get());
} }
public function dataSave() public function dataSave()
@ -320,7 +320,7 @@ class BaseURLTest extends MockedTest
$baseUrl->save($save['hostname'], $save['sslPolicy'], $save['urlPath']); $baseUrl->save($save['hostname'], $save['sslPolicy'], $save['urlPath']);
$this->assertEquals($url, $baseUrl->get()); self::assertEquals($url, $baseUrl->get());
} }
/** /**
@ -358,7 +358,7 @@ class BaseURLTest extends MockedTest
$baseUrl->saveByURL($url); $baseUrl->saveByURL($url);
$this->assertEquals($url, $baseUrl->get()); self::assertEquals($url, $baseUrl->get());
} }
public function dataGetBaseUrl() public function dataGetBaseUrl()
@ -417,7 +417,7 @@ class BaseURLTest extends MockedTest
$baseUrl = new BaseURL($configMock, []); $baseUrl = new BaseURL($configMock, []);
$this->assertEquals($assert, $baseUrl->get($ssl)); self::assertEquals($assert, $baseUrl->get($ssl));
} }
public function dataCheckRedirectHTTPS() public function dataCheckRedirectHTTPS()
@ -476,7 +476,7 @@ class BaseURLTest extends MockedTest
$baseUrl = new BaseURL($configMock, $server); $baseUrl = new BaseURL($configMock, $server);
$this->assertEquals($redirect, $baseUrl->checkRedirectHttps()); self::assertEquals($redirect, $baseUrl->checkRedirectHttps());
} }
public function dataWrongSave() public function dataWrongSave()
@ -531,12 +531,12 @@ class BaseURLTest extends MockedTest
} }
$baseUrl = new BaseURL($configMock, []); $baseUrl = new BaseURL($configMock, []);
$this->assertFalse($baseUrl->save('test', 10, 'nope')); self::assertFalse($baseUrl->save('test', 10, 'nope'));
// nothing should have changed because we never successfully saved anything // nothing should have changed because we never successfully saved anything
$this->assertEquals($baseUrl->getHostname(), 'friendica.local'); self::assertEquals($baseUrl->getHostname(), 'friendica.local');
$this->assertEquals($baseUrl->getUrlPath(), 'new/test'); self::assertEquals($baseUrl->getUrlPath(), 'new/test');
$this->assertEquals($baseUrl->getSSLPolicy(), BaseURL::DEFAULT_SSL_SCHEME); self::assertEquals($baseUrl->getSSLPolicy(), BaseURL::DEFAULT_SSL_SCHEME);
$this->assertEquals($baseUrl->get(), 'http://friendica.local/new/test'); self::assertEquals($baseUrl->get(), 'http://friendica.local/new/test');
} }
} }

76
tests/src/Util/Config/ConfigFileLoaderTest.php
View file

@ -50,7 +50,7 @@ class ConfigFileLoaderTest extends MockedTest
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);
$this->assertEquals($this->root->url(), $configCache->get('system', 'basepath')); self::assertEquals($this->root->url(), $configCache->get('system', 'basepath'));
} }
/** /**
@ -95,13 +95,13 @@ class ConfigFileLoaderTest extends MockedTest
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);
$this->assertEquals('testhost', $configCache->get('database', 'hostname')); self::assertEquals('testhost', $configCache->get('database', 'hostname'));
$this->assertEquals('testuser', $configCache->get('database', 'username')); self::assertEquals('testuser', $configCache->get('database', 'username'));
$this->assertEquals('testpw', $configCache->get('database', 'password')); self::assertEquals('testpw', $configCache->get('database', 'password'));
$this->assertEquals('testdb', $configCache->get('database', 'database')); self::assertEquals('testdb', $configCache->get('database', 'database'));
$this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email')); self::assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
$this->assertEquals('Friendica Social Network', $configCache->get('config', 'sitename')); self::assertEquals('Friendica Social Network', $configCache->get('config', 'sitename'));
} }
/** /**
@ -127,12 +127,12 @@ class ConfigFileLoaderTest extends MockedTest
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);
$this->assertEquals('testhost', $configCache->get('database', 'hostname')); self::assertEquals('testhost', $configCache->get('database', 'hostname'));
$this->assertEquals('testuser', $configCache->get('database', 'username')); self::assertEquals('testuser', $configCache->get('database', 'username'));
$this->assertEquals('testpw', $configCache->get('database', 'password')); self::assertEquals('testpw', $configCache->get('database', 'password'));
$this->assertEquals('testdb', $configCache->get('database', 'database')); self::assertEquals('testdb', $configCache->get('database', 'database'));
$this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email')); self::assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
} }
/** /**
@ -158,25 +158,25 @@ class ConfigFileLoaderTest extends MockedTest
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);
$this->assertEquals('testhost', $configCache->get('database', 'hostname')); self::assertEquals('testhost', $configCache->get('database', 'hostname'));
$this->assertEquals('testuser', $configCache->get('database', 'username')); self::assertEquals('testuser', $configCache->get('database', 'username'));
$this->assertEquals('testpw', $configCache->get('database', 'password')); self::assertEquals('testpw', $configCache->get('database', 'password'));
$this->assertEquals('testdb', $configCache->get('database', 'database')); self::assertEquals('testdb', $configCache->get('database', 'database'));
$this->assertEquals('anotherCharset', $configCache->get('database', 'charset')); self::assertEquals('anotherCharset', $configCache->get('database', 'charset'));
$this->assertEquals('/var/run/friendica.pid', $configCache->get('system', 'pidfile')); self::assertEquals('/var/run/friendica.pid', $configCache->get('system', 'pidfile'));
$this->assertEquals('Europe/Berlin', $configCache->get('system', 'default_timezone')); self::assertEquals('Europe/Berlin', $configCache->get('system', 'default_timezone'));
$this->assertEquals('fr', $configCache->get('system', 'language')); self::assertEquals('fr', $configCache->get('system', 'language'));
$this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email')); self::assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
$this->assertEquals('Friendly admin', $configCache->get('config', 'admin_nickname')); self::assertEquals('Friendly admin', $configCache->get('config', 'admin_nickname'));
$this->assertEquals('/another/php', $configCache->get('config', 'php_path')); self::assertEquals('/another/php', $configCache->get('config', 'php_path'));
$this->assertEquals('999', $configCache->get('config', 'max_import_size')); self::assertEquals('999', $configCache->get('config', 'max_import_size'));
$this->assertEquals('666', $configCache->get('system', 'maximagesize')); self::assertEquals('666', $configCache->get('system', 'maximagesize'));
$this->assertEquals('quattro,vier,duepuntozero', $configCache->get('system', 'allowed_themes')); self::assertEquals('quattro,vier,duepuntozero', $configCache->get('system', 'allowed_themes'));
$this->assertEquals('1', $configCache->get('system', 'no_regfullname')); self::assertEquals('1', $configCache->get('system', 'no_regfullname'));
} }
public function testLoadAddonConfig() public function testLoadAddonConfig()
@ -206,12 +206,12 @@ class ConfigFileLoaderTest extends MockedTest
$conf = $configFileLoader->loadAddonConfig('test'); $conf = $configFileLoader->loadAddonConfig('test');
$this->assertEquals('testhost', $conf['database']['hostname']); self::assertEquals('testhost', $conf['database']['hostname']);
$this->assertEquals('testuser', $conf['database']['username']); self::assertEquals('testuser', $conf['database']['username']);
$this->assertEquals('testpw', $conf['database']['password']); self::assertEquals('testpw', $conf['database']['password']);
$this->assertEquals('testdb', $conf['database']['database']); self::assertEquals('testdb', $conf['database']['database']);
$this->assertEquals('admin@test.it', $conf['config']['admin_email']); self::assertEquals('admin@test.it', $conf['config']['admin_email']);
} }
/** /**
@ -239,8 +239,8 @@ class ConfigFileLoaderTest extends MockedTest
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);
$this->assertEquals('admin@overwritten.local', $configCache->get('config', 'admin_email')); self::assertEquals('admin@overwritten.local', $configCache->get('config', 'admin_email'));
$this->assertEquals('newValue', $configCache->get('system', 'newKey')); self::assertEquals('newValue', $configCache->get('system', 'newKey'));
} }
/** /**
@ -268,8 +268,8 @@ class ConfigFileLoaderTest extends MockedTest
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);
$this->assertEquals('admin@overwritten.local', $configCache->get('config', 'admin_email')); self::assertEquals('admin@overwritten.local', $configCache->get('config', 'admin_email'));
$this->assertEquals('newValue', $configCache->get('system', 'newKey')); self::assertEquals('newValue', $configCache->get('system', 'newKey'));
} }
/** /**
@ -297,7 +297,7 @@ class ConfigFileLoaderTest extends MockedTest
$configFileLoader->setupCache($configCache); $configFileLoader->setupCache($configCache);
$this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email')); self::assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
$this->assertEmpty($configCache->get('system', 'NewKey')); self::assertEmpty($configCache->get('system', 'NewKey'));
} }
} }

20
tests/src/Util/CryptoTest.php
View file

@ -35,23 +35,23 @@ class CryptoTest extends TestCase
{ {
global $phpMock; global $phpMock;
$phpMock['random_int'] = function ($mMin, $mMax) use ($min, $max) { $phpMock['random_int'] = function ($mMin, $mMax) use ($min, $max) {
$this->assertEquals($min, $mMin); self::assertEquals($min, $mMin);
$this->assertEquals($max, $mMax); self::assertEquals($max, $mMax);
return 1; return 1;
}; };
} }
public function testRandomDigitsRandomInt() public function testRandomDigitsRandomInt()
{ {
$this->assertRandomInt(0, 9); self::assertRandomInt(0, 9);
$test = Crypto::randomDigits(1); $test = Crypto::randomDigits(1);
$this->assertEquals(1, strlen($test)); self::assertEquals(1, strlen($test));
$this->assertEquals(1, $test); self::assertEquals(1, $test);
$test = Crypto::randomDigits(8); $test = Crypto::randomDigits(8);
$this->assertEquals(8, strlen($test)); self::assertEquals(8, strlen($test));
$this->assertEquals(11111111, $test); self::assertEquals(11111111, $test);
} }
public function dataRsa() public function dataRsa()
@ -69,7 +69,7 @@ class CryptoTest extends TestCase
*/ */
public function testPubRsaToMe(string $key, string $expected) public function testPubRsaToMe(string $key, string $expected)
{ {
$this->assertEquals($expected, Crypto::rsaToPem(base64_decode($key))); self::assertEquals($expected, Crypto::rsaToPem(base64_decode($key)));
} }
@ -95,7 +95,7 @@ class CryptoTest extends TestCase
'n' => new BigInteger($m, 256) 'n' => new BigInteger($m, 256)
]); ]);
$this->assertEquals($expectedRSA->getPublicKey(), $key); self::assertEquals($expectedRSA->getPublicKey(), $key);
} }
/** /**
@ -107,7 +107,7 @@ class CryptoTest extends TestCase
$checkKey = Crypto::meToPem($m, $e); $checkKey = Crypto::meToPem($m, $e);
$this->assertEquals($key, $checkKey); self::assertEquals($key, $checkKey);
} }
} }

2
tests/src/Util/DateTimeFormatTest.php
View file

@ -75,6 +75,6 @@ class DateTimeFormatTest extends MockedTest
{ {
$dtFormat = new DateTimeFormat(); $dtFormat = new DateTimeFormat();
$this->assertEquals($assert, $dtFormat->isYearMonth($input)); self::assertEquals($assert, $dtFormat->isYearMonth($input));
} }
} }

30
tests/src/Util/EMailerTest.php
View file

@ -81,21 +81,21 @@ class EMailerTest extends MockedTest
$emailer = new EmailerSpy($this->config, $this->pConfig, $this->baseUrl, new NullLogger(), $this->l10n); $emailer = new EmailerSpy($this->config, $this->pConfig, $this->baseUrl, new NullLogger(), $this->l10n);
$this->assertTrue($emailer->send($testEmail)); self::assertTrue($emailer->send($testEmail));
$this->assertContains("X-Friendica-Host: friendica.local", EmailerSpy::$MAIL_DATA['headers']); self::assertContains("X-Friendica-Host: friendica.local", EmailerSpy::$MAIL_DATA['headers']);
$this->assertContains("X-Friendica-Platform: Friendica", EmailerSpy::$MAIL_DATA['headers']); self::assertContains("X-Friendica-Platform: Friendica", EmailerSpy::$MAIL_DATA['headers']);
$this->assertContains("List-ID: <notification.friendica.local>", EmailerSpy::$MAIL_DATA['headers']); self::assertContains("List-ID: <notification.friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
$this->assertContains("List-Archive: <http://friendica.local/notifications/system>", EmailerSpy::$MAIL_DATA['headers']); self::assertContains("List-Archive: <http://friendica.local/notifications/system>", EmailerSpy::$MAIL_DATA['headers']);
$this->assertContains("Reply-To: Sender <sender@friendica.local>", EmailerSpy::$MAIL_DATA['headers']); self::assertContains("Reply-To: Sender <sender@friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
$this->assertContains("MIME-Version: 1.0", EmailerSpy::$MAIL_DATA['headers']); self::assertContains("MIME-Version: 1.0", EmailerSpy::$MAIL_DATA['headers']);
// Base64 "Test Text" // Base64 "Test Text"
$this->assertContains(chunk_split(base64_encode('Test Text')), EmailerSpy::$MAIL_DATA['body']); self::assertContains(chunk_split(base64_encode('Test Text')), EmailerSpy::$MAIL_DATA['body']);
// Base64 "Test Message<b>Bold</b>" // Base64 "Test Message<b>Bold</b>"
$this->assertContains(chunk_split(base64_encode("Test Message<b>Bold</b>")), EmailerSpy::$MAIL_DATA['body']); self::assertContains(chunk_split(base64_encode("Test Message<b>Bold</b>")), EmailerSpy::$MAIL_DATA['body']);
$this->assertEquals("Test Subject", EmailerSpy::$MAIL_DATA['subject']); self::assertEquals("Test Subject", EmailerSpy::$MAIL_DATA['subject']);
$this->assertEquals("recipient@friendica.local", EmailerSpy::$MAIL_DATA['to']); self::assertEquals("recipient@friendica.local", EmailerSpy::$MAIL_DATA['to']);
$this->assertEquals("-f sender@friendica.local", EmailerSpy::$MAIL_DATA['parameters']); self::assertEquals("-f sender@friendica.local", EmailerSpy::$MAIL_DATA['parameters']);
} }
public function testTwoMessageIds() public function testTwoMessageIds()
@ -124,10 +124,10 @@ class EMailerTest extends MockedTest
$emailer = new EmailerSpy($this->config, $this->pConfig, $this->baseUrl, new NullLogger(), $this->l10n); $emailer = new EmailerSpy($this->config, $this->pConfig, $this->baseUrl, new NullLogger(), $this->l10n);
// even in case there are two message ids, send the mail anyway // even in case there are two message ids, send the mail anyway
$this->assertTrue($emailer->send($testEmail)); self::assertTrue($emailer->send($testEmail));
// check case sensitive key problem // check case sensitive key problem
$this->assertArrayHasKey('Message-ID', $testEmail->getAdditionalMailHeader()); self::assertArrayHasKey('Message-ID', $testEmail->getAdditionalMailHeader());
$this->assertArrayHasKey('Message-Id', $testEmail->getAdditionalMailHeader()); self::assertArrayHasKey('Message-Id', $testEmail->getAdditionalMailHeader());
} }
} }

26
tests/src/Util/Emailer/MailBuilderTest.php
View file

@ -67,15 +67,15 @@ class MailBuilderTest extends MockedTest
public function assertEmail(IEmail $email, array $asserts) public function assertEmail(IEmail $email, array $asserts)
{ {
$this->assertEquals($asserts['subject'] ?? $email->getSubject(), $email->getSubject()); self::assertEquals($asserts['subject'] ?? $email->getSubject(), $email->getSubject());
$this->assertEquals($asserts['html'] ?? $email->getMessage(), $email->getMessage()); self::assertEquals($asserts['html'] ?? $email->getMessage(), $email->getMessage());
$this->assertEquals($asserts['text'] ?? $email->getMessage(true), $email->getMessage(true)); self::assertEquals($asserts['text'] ?? $email->getMessage(true), $email->getMessage(true));
$this->assertEquals($asserts['toAddress'] ?? $email->getToAddress(), $email->getToAddress()); self::assertEquals($asserts['toAddress'] ?? $email->getToAddress(), $email->getToAddress());
$this->assertEquals($asserts['fromAddress'] ?? $email->getFromAddress(), $email->getFromAddress()); self::assertEquals($asserts['fromAddress'] ?? $email->getFromAddress(), $email->getFromAddress());
$this->assertEquals($asserts['fromName'] ?? $email->getFromName(), $email->getFromName()); self::assertEquals($asserts['fromName'] ?? $email->getFromName(), $email->getFromName());
$this->assertEquals($asserts['replyTo'] ?? $email->getReplyTo(), $email->getReplyTo()); self::assertEquals($asserts['replyTo'] ?? $email->getReplyTo(), $email->getReplyTo());
$this->assertEquals($asserts['uid'] ?? $email->getRecipientUid(), $email->getRecipientUid()); self::assertEquals($asserts['uid'] ?? $email->getRecipientUid(), $email->getRecipientUid());
$this->assertEquals($asserts['header'] ?? $email->getAdditionalMailHeader(), $email->getAdditionalMailHeader()); self::assertEquals($asserts['header'] ?? $email->getAdditionalMailHeader(), $email->getAdditionalMailHeader());
} }
/** /**
@ -85,7 +85,7 @@ class MailBuilderTest extends MockedTest
{ {
$builder = new SampleMailBuilder($this->l10n, $this->baseUrl, $this->config, new NullLogger()); $builder = new SampleMailBuilder($this->l10n, $this->baseUrl, $this->config, new NullLogger());
$this->assertInstanceOf(MailBuilder::class, $builder); self::assertInstanceOf(MailBuilder::class, $builder);
} }
/** /**
@ -112,7 +112,7 @@ class MailBuilderTest extends MockedTest
->forUser(['uid' => 100]) ->forUser(['uid' => 100])
->build(true); ->build(true);
$this->assertEmail($testEmail, [ self::assertEmail($testEmail, [
'subject' => 'Subject', 'subject' => 'Subject',
'html' => 'Html', 'html' => 'Html',
'text' => 'text', 'text' => 'text',
@ -165,7 +165,7 @@ class MailBuilderTest extends MockedTest
->withSender('Sender', 'sender@friendica.local') ->withSender('Sender', 'sender@friendica.local')
->build(true); ->build(true);
$this->assertEmail($testEmail, [ self::assertEmail($testEmail, [
'toAddress' => 'recipient@friendica.local', 'toAddress' => 'recipient@friendica.local',
'fromName' => 'Sender', 'fromName' => 'Sender',
'fromAddress' => 'sender@friendica.local', 'fromAddress' => 'sender@friendica.local',
@ -186,7 +186,7 @@ class MailBuilderTest extends MockedTest
->withSender('Sender', 'sender@friendica.local') ->withSender('Sender', 'sender@friendica.local')
->build(true); ->build(true);
$this->assertEmail($testEmail, [ self::assertEmail($testEmail, [
'toAddress' => 'recipient@friendica.local', 'toAddress' => 'recipient@friendica.local',
'fromName' => 'Sender', 'fromName' => 'Sender',
'fromAddress' => 'sender@friendica.local', 'fromAddress' => 'sender@friendica.local',

4
tests/src/Util/Emailer/SystemMailBuilderTest.php
View file

@ -70,7 +70,7 @@ class SystemMailBuilderTest extends MockedTest
{ {
$builder = new SystemMailBuilder($this->l10n, $this->baseUrl, $this->config, new NullLogger(), 'moreply@friendica.local', 'FriendicaSite'); $builder = new SystemMailBuilder($this->l10n, $this->baseUrl, $this->config, new NullLogger(), 'moreply@friendica.local', 'FriendicaSite');
$this->assertInstanceOf(MailBuilder::class, $builder); self::assertInstanceOf(MailBuilder::class, $builder);
$this->assertInstanceOf(SystemMailBuilder::class, $builder); self::assertInstanceOf(SystemMailBuilder::class, $builder);
} }
} }

2
tests/src/Util/HTTPSignatureTest.php
View file

@ -43,7 +43,7 @@ class HTTPSignatureTest extends TestCase
YWuxyvBa0Z6NdOb0di70cdrSDEsL5Gz7LBY5J2N9KdGg=="'; YWuxyvBa0Z6NdOb0di70cdrSDEsL5Gz7LBY5J2N9KdGg=="';
$headers = HTTPSignature::parseSigheader($header); $headers = HTTPSignature::parseSigheader($header);
$this->assertSame([ self::assertSame([
'keyId' => 'test-key-a', 'keyId' => 'test-key-a',
'algorithm' => 'hs2019', 'algorithm' => 'hs2019',
'created' => '1402170695', 'created' => '1402170695',

34
tests/src/Util/JsonLDTest.php
View file

@ -34,7 +34,7 @@ class JsonLDTest extends TestCase
$object = []; $object = [];
$data = JsonLD::fetchElementArray($object, 'field'); $data = JsonLD::fetchElementArray($object, 'field');
$this->assertNull($data); self::assertNull($data);
} }
public function testFetchElementArrayFoundEmptyArray() public function testFetchElementArrayFoundEmptyArray()
@ -42,7 +42,7 @@ class JsonLDTest extends TestCase
$object = ['field' => []]; $object = ['field' => []];
$data = JsonLD::fetchElementArray($object, 'field'); $data = JsonLD::fetchElementArray($object, 'field');
$this->assertSame([[]], $data); self::assertSame([[]], $data);
} }
public function testFetchElementArrayFoundID() public function testFetchElementArrayFoundID()
@ -50,7 +50,7 @@ class JsonLDTest extends TestCase
$object = ['field' => ['value1', ['@id' => 'value2'], ['@id' => 'value3']]]; $object = ['field' => ['value1', ['@id' => 'value2'], ['@id' => 'value3']]];
$data = JsonLD::fetchElementArray($object, 'field', '@id'); $data = JsonLD::fetchElementArray($object, 'field', '@id');
$this->assertSame(['value1', 'value2', 'value3'], $data); self::assertSame(['value1', 'value2', 'value3'], $data);
} }
public function testFetchElementArrayFoundID2() public function testFetchElementArrayFoundID2()
@ -60,7 +60,7 @@ class JsonLDTest extends TestCase
'value3', ['@id' => 'value4', 'subfield42' => 'value42']]]; 'value3', ['@id' => 'value4', 'subfield42' => 'value42']]];
$data = JsonLD::fetchElementArray($object, 'field', '@id'); $data = JsonLD::fetchElementArray($object, 'field', '@id');
$this->assertSame(['value3', 'value4'], $data); self::assertSame(['value3', 'value4'], $data);
} }
public function testFetchElementArrayFoundArrays() public function testFetchElementArrayFoundArrays()
{ {
@ -71,7 +71,7 @@ class JsonLDTest extends TestCase
['subfield21' => 'value21', 'subfield22' => 'value22']]; ['subfield21' => 'value21', 'subfield22' => 'value22']];
$data = JsonLD::fetchElementArray($object, 'field'); $data = JsonLD::fetchElementArray($object, 'field');
$this->assertSame($expect, $data); self::assertSame($expect, $data);
} }
public function testFetchElementNotFound() public function testFetchElementNotFound()
@ -79,7 +79,7 @@ class JsonLDTest extends TestCase
$object = []; $object = [];
$data = JsonLD::fetchElement($object, 'field'); $data = JsonLD::fetchElement($object, 'field');
$this->assertNull($data); self::assertNull($data);
} }
public function testFetchElementFound() public function testFetchElementFound()
@ -87,7 +87,7 @@ class JsonLDTest extends TestCase
$object = ['field' => 'value']; $object = ['field' => 'value'];
$data = JsonLD::fetchElement($object, 'field'); $data = JsonLD::fetchElement($object, 'field');
$this->assertSame('value', $data); self::assertSame('value', $data);
} }
public function testFetchElementFoundEmptyString() public function testFetchElementFoundEmptyString()
@ -95,7 +95,7 @@ class JsonLDTest extends TestCase
$object = ['field' => '']; $object = ['field' => ''];
$data = JsonLD::fetchElement($object, 'field'); $data = JsonLD::fetchElement($object, 'field');
$this->assertSame('', $data); self::assertSame('', $data);
} }
public function testFetchElementKeyFoundEmptyArray() public function testFetchElementKeyFoundEmptyArray()
@ -103,7 +103,7 @@ class JsonLDTest extends TestCase
$object = ['field' => ['content' => []]]; $object = ['field' => ['content' => []]];
$data = JsonLD::fetchElement($object, 'field', 'content'); $data = JsonLD::fetchElement($object, 'field', 'content');
$this->assertSame([], $data); self::assertSame([], $data);
} }
public function testFetchElementFoundID() public function testFetchElementFoundID()
@ -111,7 +111,7 @@ class JsonLDTest extends TestCase
$object = ['field' => ['field2' => 'value2', '@id' => 'value', 'field3' => 'value3']]; $object = ['field' => ['field2' => 'value2', '@id' => 'value', 'field3' => 'value3']];
$data = JsonLD::fetchElement($object, 'field'); $data = JsonLD::fetchElement($object, 'field');
$this->assertSame('value', $data); self::assertSame('value', $data);
} }
public function testFetchElementType() public function testFetchElementType()
@ -119,7 +119,7 @@ class JsonLDTest extends TestCase
$object = ['source' => ['content' => 'body', 'mediaType' => 'text/bbcode']]; $object = ['source' => ['content' => 'body', 'mediaType' => 'text/bbcode']];
$data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType', 'text/bbcode'); $data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType', 'text/bbcode');
$this->assertSame('body', $data); self::assertSame('body', $data);
} }
public function testFetchElementTypeValueNotFound() public function testFetchElementTypeValueNotFound()
@ -127,7 +127,7 @@ class JsonLDTest extends TestCase
$object = ['source' => ['content' => 'body', 'mediaType' => 'text/html']]; $object = ['source' => ['content' => 'body', 'mediaType' => 'text/html']];
$data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType', 'text/bbcode'); $data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType', 'text/bbcode');
$this->assertNull($data); self::assertNull($data);
} }
public function testFetchElementTypeNotFound() public function testFetchElementTypeNotFound()
@ -135,7 +135,7 @@ class JsonLDTest extends TestCase
$object = ['source' => ['content' => 'body', 'mediaType' => 'text/html']]; $object = ['source' => ['content' => 'body', 'mediaType' => 'text/html']];
$data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType2', 'text/html'); $data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType2', 'text/html');
$this->assertNull($data); self::assertNull($data);
} }
public function testFetchElementKeyWithoutType() public function testFetchElementKeyWithoutType()
@ -143,7 +143,7 @@ class JsonLDTest extends TestCase
$object = ['source' => ['content' => 'body', 'mediaType' => 'text/bbcode']]; $object = ['source' => ['content' => 'body', 'mediaType' => 'text/bbcode']];
$data = JsonLD::fetchElement($object, 'source', 'content'); $data = JsonLD::fetchElement($object, 'source', 'content');
$this->assertSame('body', $data); self::assertSame('body', $data);
} }
public function testFetchElementTypeArray() public function testFetchElementTypeArray()
@ -152,7 +152,7 @@ class JsonLDTest extends TestCase
['content' => 'body', 'mediaType' => 'text/bbcode']]]; ['content' => 'body', 'mediaType' => 'text/bbcode']]];
$data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType', 'text/bbcode'); $data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType', 'text/bbcode');
$this->assertSame('body', $data); self::assertSame('body', $data);
} }
public function testFetchElementTypeValueArrayNotFound() public function testFetchElementTypeValueArrayNotFound()
@ -161,7 +161,7 @@ class JsonLDTest extends TestCase
['content' => 'body', 'mediaType' => 'text/bbcode']]]; ['content' => 'body', 'mediaType' => 'text/bbcode']]];
$data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType', 'text/markdown'); $data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType', 'text/markdown');
$this->assertNull($data); self::assertNull($data);
} }
public function testFetchElementTypeArrayNotFound() public function testFetchElementTypeArrayNotFound()
@ -170,6 +170,6 @@ class JsonLDTest extends TestCase
['content' => 'body', 'mediaType' => 'text/bbcode']]]; ['content' => 'body', 'mediaType' => 'text/bbcode']]];
$data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType2', 'text/bbcode'); $data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType2', 'text/bbcode');
$this->assertNull($data); self::assertNull($data);
} }
} }

24
tests/src/Util/Logger/AbstractLoggerTest.php
View file

@ -72,12 +72,12 @@ abstract class AbstractLoggerTest extends MockedTest
public function assertLogline($string) public function assertLogline($string)
{ {
$this->assertRegExp(self::LOGLINE, $string); self::assertRegExp(self::LOGLINE, $string);
} }
public function assertLoglineNums($assertNum, $string) public function assertLoglineNums($assertNum, $string)
{ {
$this->assertEquals($assertNum, preg_match_all(self::LOGLINE, $string)); self::assertEquals($assertNum, preg_match_all(self::LOGLINE, $string));
} }
/** /**
@ -92,8 +92,8 @@ abstract class AbstractLoggerTest extends MockedTest
$logger->notice('message', ['an' => 'context']); $logger->notice('message', ['an' => 'context']);
$text = $this->getContent(); $text = $this->getContent();
$this->assertLogline($text); self::assertLogline($text);
$this->assertLoglineNums(4, $text); self::assertLoglineNums(4, $text);
} }
/** /**
@ -106,8 +106,8 @@ abstract class AbstractLoggerTest extends MockedTest
$logger->emergency('A {psr} test', ['psr' => 'working']); $logger->emergency('A {psr} test', ['psr' => 'working']);
$logger->alert('An {array} test', ['array' => ['it', 'is', 'working']]); $logger->alert('An {array} test', ['array' => ['it', 'is', 'working']]);
$text = $this->getContent(); $text = $this->getContent();
$this->assertContains('A working test', $text); self::assertContains('A working test', $text);
$this->assertContains('An ["it","is","working"] test', $text); self::assertContains('An ["it","is","working"] test', $text);
} }
/** /**
@ -119,9 +119,9 @@ abstract class AbstractLoggerTest extends MockedTest
$logger->emergency('A test'); $logger->emergency('A test');
$text = $this->getContent(); $text = $this->getContent();
$this->assertContains('"file":"' . self::FILE . '"', $text); self::assertContains('"file":"' . self::FILE . '"', $text);
$this->assertContains('"line":' . self::LINE, $text); self::assertContains('"line":' . self::LINE, $text);
$this->assertContains('"function":"' . self::FUNC . '"', $text); self::assertContains('"function":"' . self::FUNC . '"', $text);
} }
/** /**
@ -141,7 +141,7 @@ abstract class AbstractLoggerTest extends MockedTest
$text = $this->getContent(); $text = $this->getContent();
$this->assertLoglineNums(5, $text); self::assertLoglineNums(5, $text);
} }
/** /**
@ -155,8 +155,8 @@ abstract class AbstractLoggerTest extends MockedTest
$text = $this->getContent(); $text = $this->getContent();
$this->assertLogline($text); self::assertLogline($text);
$this->assertContains(@json_encode($context), $text); self::assertContains(@json_encode($context), $text);
} }
} }

4
tests/src/Util/Logger/StreamLoggerTest.php
View file

@ -92,7 +92,7 @@ class StreamLoggerTest extends AbstractLoggerTest
$text = $logfile->getContent(); $text = $logfile->getContent();
$this->assertLogline($text); self::assertLogline($text);
} }
/** /**
@ -111,7 +111,7 @@ class StreamLoggerTest extends AbstractLoggerTest
$text = $logfile->getContent(); $text = $logfile->getContent();
$this->assertLoglineNums(2, $text); self::assertLoglineNums(2, $text);
} }
/** /**

8
tests/src/Util/Logger/WorkerLoggerTest.php
View file

@ -29,7 +29,7 @@ class WorkerLoggerTest extends MockedTest
{ {
private function assertUid($uid, $length = 7) private function assertUid($uid, $length = 7)
{ {
$this->assertRegExp('/^[a-zA-Z0-9]{' . $length . '}+$/', $uid); self::assertRegExp('/^[a-zA-Z0-9]{' . $length . '}+$/', $uid);
} }
/** /**
@ -51,7 +51,7 @@ class WorkerLoggerTest extends MockedTest
for ($i = 1; $i < 14; $i++) { for ($i = 1; $i < 14; $i++) {
$workLogger = new WorkerLogger($logger, 'test', $i); $workLogger = new WorkerLogger($logger, 'test', $i);
$uid = $workLogger->getWorkerId(); $uid = $workLogger->getWorkerId();
$this->assertUid($uid, $i); self::assertUid($uid, $i);
} }
} }
@ -107,7 +107,7 @@ class WorkerLoggerTest extends MockedTest
$testContext = $context; $testContext = $context;
$testContext['worker_id'] = $workLogger->getWorkerId(); $testContext['worker_id'] = $workLogger->getWorkerId();
$testContext['worker_cmd'] = 'test'; $testContext['worker_cmd'] = 'test';
$this->assertUid($testContext['worker_id']); self::assertUid($testContext['worker_id']);
$logger $logger
->shouldReceive($func) ->shouldReceive($func)
->with($msg, $testContext) ->with($msg, $testContext)
@ -125,7 +125,7 @@ class WorkerLoggerTest extends MockedTest
$context = $testContext = ['test' => 'it']; $context = $testContext = ['test' => 'it'];
$testContext['worker_id'] = $workLogger->getWorkerId(); $testContext['worker_id'] = $workLogger->getWorkerId();
$testContext['worker_cmd'] = 'test'; $testContext['worker_cmd'] = 'test';
$this->assertUid($testContext['worker_id']); self::assertUid($testContext['worker_id']);
$logger $logger
->shouldReceive('log') ->shouldReceive('log')
->with('debug', 'a test', $testContext) ->with('debug', 'a test', $testContext)

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

@ -134,7 +134,7 @@ class ProfilerTest extends MockedTest
$profiler->saveTimestamp($timestamp, $name, $function); $profiler->saveTimestamp($timestamp, $name, $function);
} }
$this->assertGreaterThanOrEqual(0, $profiler->get($name)); self::assertGreaterThanOrEqual(0, $profiler->get($name));
} }
/** /**
@ -154,7 +154,7 @@ class ProfilerTest extends MockedTest
$profiler->saveTimestamp($timestamp, $name); $profiler->saveTimestamp($timestamp, $name);
$profiler->reset(); $profiler->reset();
$this->assertEquals(0, $profiler->get($name)); self::assertEquals(0, $profiler->get($name));
} }
public function dataBig() public function dataBig()
@ -227,7 +227,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
$this->assertRegExp('/' . $function . ': \d+/', $output); self::assertRegExp('/' . $function . ': \d+/', $output);
} }
} }
} }
@ -249,8 +249,8 @@ class ProfilerTest extends MockedTest
$profiler = new Profiler($configCache); $profiler = new Profiler($configCache);
$this->assertFalse($profiler->isRendertime()); self::assertFalse($profiler->isRendertime());
$this->assertEmpty($profiler->getRendertimeString()); self::assertEmpty($profiler->getRendertimeString());
$profiler->saveTimestamp(time(), 'network', 'test1'); $profiler->saveTimestamp(time(), 'network', 'test1');
@ -266,8 +266,8 @@ class ProfilerTest extends MockedTest
$profiler->update($config); $profiler->update($config);
$this->assertFalse($profiler->isRendertime()); self::assertFalse($profiler->isRendertime());
$this->assertEmpty($profiler->getRendertimeString()); self::assertEmpty($profiler->getRendertimeString());
$config->shouldReceive('get') $config->shouldReceive('get')
->with('system', 'profiler') ->with('system', 'profiler')
@ -282,9 +282,9 @@ class ProfilerTest extends MockedTest
$profiler->saveTimestamp(time(), 'database', 'test2'); $profiler->saveTimestamp(time(), 'database', 'test2');
$this->assertTrue($profiler->isRendertime()); self::assertTrue($profiler->isRendertime());
$output = $profiler->getRendertimeString(); $output = $profiler->getRendertimeString();
$this->assertRegExp('/test1: \d+/', $output); self::assertRegExp('/test1: \d+/', $output);
$this->assertRegExp('/test2: \d+/', $output); self::assertRegExp('/test2: \d+/', $output);
} }
} }

28
tests/src/Util/StringsTest.php
View file

@ -37,7 +37,7 @@ class StringsTest extends TestCase
$randomname1 = Strings::getRandomName(10); $randomname1 = Strings::getRandomName(10);
$randomname2 = Strings::getRandomName(10); $randomname2 = Strings::getRandomName(10);
$this->assertNotEquals($randomname1, $randomname2); self::assertNotEquals($randomname1, $randomname2);
} }
/** /**
@ -48,7 +48,7 @@ class StringsTest extends TestCase
$randomname1 = Strings::getRandomName(9); $randomname1 = Strings::getRandomName(9);
$randomname2 = Strings::getRandomName(9); $randomname2 = Strings::getRandomName(9);
$this->assertNotEquals($randomname1, $randomname2); self::assertNotEquals($randomname1, $randomname2);
} }
/** /**
@ -57,7 +57,7 @@ class StringsTest extends TestCase
public function testRandomNameNoLength() public function testRandomNameNoLength()
{ {
$randomname1 = Strings::getRandomName(0); $randomname1 = Strings::getRandomName(0);
$this->assertEquals(0, strlen($randomname1)); self::assertEquals(0, strlen($randomname1));
} }
/** /**
@ -68,7 +68,7 @@ class StringsTest extends TestCase
public function testRandomNameNegativeLength() public function testRandomNameNegativeLength()
{ {
$randomname1 = Strings::getRandomName(-23); $randomname1 = Strings::getRandomName(-23);
$this->assertEquals(0, strlen($randomname1)); self::assertEquals(0, strlen($randomname1));
} }
/** /**
@ -77,10 +77,10 @@ class StringsTest extends TestCase
public function testRandomNameLength1() public function testRandomNameLength1()
{ {
$randomname1 = Strings::getRandomName(1); $randomname1 = Strings::getRandomName(1);
$this->assertEquals(1, strlen($randomname1)); self::assertEquals(1, strlen($randomname1));
$randomname2 = Strings::getRandomName(1); $randomname2 = Strings::getRandomName(1);
$this->assertEquals(1, strlen($randomname2)); self::assertEquals(1, strlen($randomname2));
} }
/** /**
@ -93,8 +93,8 @@ class StringsTest extends TestCase
$validstring = Strings::escapeTags($invalidstring); $validstring = Strings::escapeTags($invalidstring);
$escapedString = Strings::escapeHtml($invalidstring); $escapedString = Strings::escapeHtml($invalidstring);
$this->assertEquals('[submit type="button" onclick="alert(\'failed!\');" /]', $validstring); self::assertEquals('[submit type="button" onclick="alert(\'failed!\');" /]', $validstring);
$this->assertEquals( self::assertEquals(
"&lt;submit type=&quot;button&quot; onclick=&quot;alert('failed!');&quot; /&gt;", "&lt;submit type=&quot;button&quot; onclick=&quot;alert('failed!');&quot; /&gt;",
$escapedString $escapedString
); );
@ -132,7 +132,7 @@ class StringsTest extends TestCase
*/ */
public function testIsHex($input, $valid) public function testIsHex($input, $valid)
{ {
$this->assertEquals($valid, Strings::isHex($input)); self::assertEquals($valid, Strings::isHex($input));
} }
/** /**
@ -142,13 +142,13 @@ class StringsTest extends TestCase
public function testSubstringReplaceASCII() public function testSubstringReplaceASCII()
{ {
for ($start = -10; $start <= 10; $start += 5) { for ($start = -10; $start <= 10; $start += 5) {
$this->assertEquals( self::assertEquals(
substr_replace('string', 'replacement', $start), substr_replace('string', 'replacement', $start),
Strings::substringReplace('string', 'replacement', $start) Strings::substringReplace('string', 'replacement', $start)
); );
for ($length = -10; $length <= 10; $length += 5) { for ($length = -10; $length <= 10; $length += 5) {
$this->assertEquals( self::assertEquals(
substr_replace('string', 'replacement', $start, $length), substr_replace('string', 'replacement', $start, $length),
Strings::substringReplace('string', 'replacement', $start, $length) Strings::substringReplace('string', 'replacement', $start, $length)
); );
@ -184,7 +184,7 @@ class StringsTest extends TestCase
*/ */
public function testSubstringReplaceMultiByte(string $expected, string $string, string $replacement, int $start, int $length = null) public function testSubstringReplaceMultiByte(string $expected, string $string, string $replacement, int $start, int $length = null)
{ {
$this->assertEquals( self::assertEquals(
$expected, $expected,
Strings::substringReplace( Strings::substringReplace(
$string, $string,
@ -203,7 +203,7 @@ class StringsTest extends TestCase
return $text; return $text;
}); });
$this->assertEquals($originalText, $text); self::assertEquals($originalText, $text);
} }
public function testPerformWithEscapedBlocksNested() public function testPerformWithEscapedBlocksNested()
@ -218,6 +218,6 @@ class StringsTest extends TestCase
return $text; return $text;
}); });
$this->assertEquals($originalText, $text); self::assertEquals($originalText, $text);
} }
} }

8
tests/src/Util/XmlTest.php
View file

@ -37,7 +37,7 @@ class XmlTest extends TestCase
$text="<tag>I want to break\n this!11!<?hard?></tag>"; $text="<tag>I want to break\n this!11!<?hard?></tag>";
$xml=XML::escape($text); $xml=XML::escape($text);
$retext=XML::unescape($text); $retext=XML::unescape($text);
$this->assertEquals($text, $retext); self::assertEquals($text, $retext);
} }
/** /**
@ -52,12 +52,12 @@ class XmlTest extends TestCase
//should be possible to parse it //should be possible to parse it
$values=array(); $values=array();
$index=array(); $index=array();
$this->assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index)); self::assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index));
$this->assertEquals( self::assertEquals(
array('TEXT'=>array(0)), array('TEXT'=>array(0)),
$index $index
); );
$this->assertEquals( self::assertEquals(
array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)), array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)),
$values $values
); );