bitPickups/friendica_2020-09-1_sharedHosting
1
0
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
commit efaec26b1d
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
63 changed files with 1192 additions and 1192 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,11 +28,11 @@ class ArgumentsTest extends TestCase
{
private function assertArguments(array $assert, App\Arguments $arguments)
{
$this->assertEquals($assert['queryString'], $arguments->getQueryString());
$this->assertEquals($assert['command'], $arguments->getCommand());
$this->assertEquals($assert['argv'], $arguments->getArgv());
$this->assertEquals($assert['argc'], $arguments->getArgc());
$this->assertCount($assert['argc'], $arguments->getArgv());
self::assertEquals($assert['queryString'], $arguments->getQueryString());
self::assertEquals($assert['command'], $arguments->getCommand());
self::assertEquals($assert['argv'], $arguments->getArgv());
self::assertEquals($assert['argc'], $arguments->getArgc());
self::assertCount($assert['argc'], $arguments->getArgv());
}
/**
@ -42,7 +42,7 @@ class ArgumentsTest extends TestCase
{
$arguments = new App\Arguments();
$this->assertArguments([
self::assertArguments([
'queryString' => '',
'command' => '',
'argv' => [],
@ -177,7 +177,7 @@ class ArgumentsTest extends TestCase
$arguments = (new App\Arguments())
->determine($server, $get);
$this->assertArguments($assert, $arguments);
self::assertArguments($assert, $arguments);
}
/**
@ -191,13 +191,13 @@ class ArgumentsTest extends TestCase
->determine($server, $get);
for ($i = 0; $i < $arguments->getArgc(); $i++) {
$this->assertTrue($arguments->has($i));
$this->assertEquals($assert['argv'][$i], $arguments->get($i));
self::assertTrue($arguments->has($i));
self::assertEquals($assert['argv'][$i], $arguments->get($i));
}
$this->assertFalse($arguments->has($arguments->getArgc()));
$this->assertEmpty($arguments->get($arguments->getArgc()));
$this->assertEquals('default', $arguments->get($arguments->getArgc(), 'default'));
self::assertFalse($arguments->has($arguments->getArgc()));
self::assertEmpty($arguments->get($arguments->getArgc()));
self::assertEquals('default', $arguments->get($arguments->getArgc(), 'default'));
}
public function dataStripped()
@ -242,7 +242,7 @@ class ArgumentsTest extends TestCase
$arguments = (new App\Arguments())
->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([], []);
$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()
{
$mode = new Mode();
$this->assertTrue($mode->isInstall());
$this->assertFalse($mode->isNormal());
self::assertTrue($mode->isInstall());
self::assertFalse($mode->isNormal());
}
public function testWithoutConfig()
{
$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->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);
$this->assertTrue($mode->isInstall());
$this->assertFalse($mode->isNormal());
self::assertTrue($mode->isInstall());
self::assertFalse($mode->isNormal());
$this->assertFalse($mode->has(Mode::LOCALCONFIGPRESENT));
self::assertFalse($mode->has(Mode::LOCALCONFIGPRESENT));
}
public function testWithoutDatabase()
@ -96,11 +96,11 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
$this->assertFalse($mode->isNormal());
$this->assertTrue($mode->isInstall());
self::assertFalse($mode->isNormal());
self::assertTrue($mode->isInstall());
$this->assertTrue($mode->has(Mode::LOCALCONFIGPRESENT));
$this->assertFalse($mode->has(Mode::DBAVAILABLE));
self::assertTrue($mode->has(Mode::LOCALCONFIGPRESENT));
self::assertFalse($mode->has(Mode::DBAVAILABLE));
}
public function testWithoutDatabaseSetup()
@ -113,10 +113,10 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
$this->assertFalse($mode->isNormal());
$this->assertTrue($mode->isInstall());
self::assertFalse($mode->isNormal());
self::assertTrue($mode->isInstall());
$this->assertTrue($mode->has(Mode::LOCALCONFIGPRESENT));
self::assertTrue($mode->has(Mode::LOCALCONFIGPRESENT));
}
public function testWithMaintenanceMode()
@ -131,11 +131,11 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
$this->assertFalse($mode->isNormal());
$this->assertFalse($mode->isInstall());
self::assertFalse($mode->isNormal());
self::assertFalse($mode->isInstall());
$this->assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
$this->assertFalse($mode->has(Mode::MAINTENANCEDISABLED));
self::assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
self::assertFalse($mode->has(Mode::MAINTENANCEDISABLED));
}
public function testNormalMode()
@ -153,11 +153,11 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
$this->assertTrue($mode->isNormal());
$this->assertFalse($mode->isInstall());
self::assertTrue($mode->isNormal());
self::assertFalse($mode->isInstall());
$this->assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
$this->assertTrue($mode->has(Mode::MAINTENANCEDISABLED));
self::assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
self::assertTrue($mode->has(Mode::MAINTENANCEDISABLED));
}
/**
@ -178,11 +178,11 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
$this->assertTrue($mode->isNormal());
$this->assertFalse($mode->isInstall());
self::assertTrue($mode->isNormal());
self::assertFalse($mode->isInstall());
$this->assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
$this->assertTrue($mode->has(Mode::MAINTENANCEDISABLED));
self::assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
self::assertTrue($mode->has(Mode::MAINTENANCEDISABLED));
}
/**
@ -196,7 +196,7 @@ class ModeTest extends MockedTest
$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);
$this->assertTrue($mode->isBackend());
self::assertTrue($mode->isBackend());
}
/**
@ -224,7 +224,7 @@ class ModeTest extends MockedTest
$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);
$this->assertFalse($mode->isBackend());
self::assertFalse($mode->isBackend());
}
/**
@ -256,7 +256,7 @@ class ModeTest extends MockedTest
$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);
$this->assertFalse($mode->isAjax());
self::assertFalse($mode->isAjax());
}
/**
@ -286,8 +286,8 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
$this->assertTrue($mode->isMobile());
$this->assertTrue($mode->isTablet());
self::assertTrue($mode->isMobile());
self::assertTrue($mode->isTablet());
}
@ -304,7 +304,7 @@ class ModeTest extends MockedTest
$mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
$this->assertFalse($mode->isMobile());
$this->assertFalse($mode->isTablet());
self::assertFalse($mode->isMobile());
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)
{
$this->assertEquals($assert['isBackend'], $module->isBackend());
$this->assertEquals($assert['name'], $module->getName());
$this->assertEquals($assert['class'], $module->getClassName());
self::assertEquals($assert['isBackend'], $module->isBackend());
self::assertEquals($assert['name'], $module->getName());
self::assertEquals($assert['class'], $module->getClassName());
}
/**
@ -46,7 +46,7 @@ class ModuleTest extends DatabaseTest
{
$module = new App\Module();
$this->assertModule([
self::assertModule([
'isBackend' => false,
'name' => App\Module::DEFAULT,
'class' => App\Module::DEFAULT_CLASS,
@ -128,7 +128,7 @@ class ModuleTest extends DatabaseTest
{
$module = (new App\Module())->determineModule($args);
$this->assertModule($assert, $module);
self::assertModule($assert, $module);
}
public function dataModuleClass()
@ -185,7 +185,7 @@ class ModuleTest extends DatabaseTest
$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());
$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], '/optionalvariable[/{option}]', 'OptionalVariableModuleClassName');
$this->assertEquals('IndexModuleClassName', $router->getModuleClass('/'));
$this->assertEquals('TestModuleClassName', $router->getModuleClass('/test'));
$this->assertEquals('TestGetPostModuleClassName', $router->getModuleClass('/testgetpost'));
$this->assertEquals('TestSubModuleClassName', $router->getModuleClass('/test/sub'));
$this->assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional'));
$this->assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional/option'));
$this->assertEquals('VariableModuleClassName', $router->getModuleClass('/variable/123abc'));
$this->assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable'));
$this->assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable/123abc'));
self::assertEquals('IndexModuleClassName', $router->getModuleClass('/'));
self::assertEquals('TestModuleClassName', $router->getModuleClass('/test'));
self::assertEquals('TestGetPostModuleClassName', $router->getModuleClass('/testgetpost'));
self::assertEquals('TestSubModuleClassName', $router->getModuleClass('/test/sub'));
self::assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional'));
self::assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional/option'));
self::assertEquals('VariableModuleClassName', $router->getModuleClass('/variable/123abc'));
self::assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable'));
self::assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable/123abc'));
}
public function testPostModuleClass()
@ -88,15 +88,15 @@ class RouterTest extends TestCase
$routeCollector->addRoute([Router::POST], '/variable/{var}', 'VariableModuleClassName');
$routeCollector->addRoute([Router::POST], '/optionalvariable[/{option}]', 'OptionalVariableModuleClassName');
$this->assertEquals('IndexModuleClassName', $router->getModuleClass('/'));
$this->assertEquals('TestModuleClassName', $router->getModuleClass('/test'));
$this->assertEquals('TestGetPostModuleClassName', $router->getModuleClass('/testgetpost'));
$this->assertEquals('TestSubModuleClassName', $router->getModuleClass('/test/sub'));
$this->assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional'));
$this->assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional/option'));
$this->assertEquals('VariableModuleClassName', $router->getModuleClass('/variable/123abc'));
$this->assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable'));
$this->assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable/123abc'));
self::assertEquals('IndexModuleClassName', $router->getModuleClass('/'));
self::assertEquals('TestModuleClassName', $router->getModuleClass('/test'));
self::assertEquals('TestGetPostModuleClassName', $router->getModuleClass('/testgetpost'));
self::assertEquals('TestSubModuleClassName', $router->getModuleClass('/test/sub'));
self::assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional'));
self::assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional/option'));
self::assertEquals('VariableModuleClassName', $router->getModuleClass('/variable/123abc'));
self::assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable'));
self::assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable/123abc'));
}
public function testGetModuleClassNotFound()
@ -205,10 +205,10 @@ class RouterTest extends TestCase
$this->cache
))->loadRoutes($routes);
$this->assertEquals(Module\Home::class, $router->getModuleClass('/'));
$this->assertEquals(Module\Friendica::class, $router->getModuleClass('/group/route'));
$this->assertEquals(Module\Xrd::class, $router->getModuleClass('/group2/group3/route'));
$this->assertEquals(Module\Profile\Index::class, $router->getModuleClass('/double'));
self::assertEquals(Module\Home::class, $router->getModuleClass('/'));
self::assertEquals(Module\Friendica::class, $router->getModuleClass('/group/route'));
self::assertEquals(Module\Xrd::class, $router->getModuleClass('/group2/group3/route'));
self::assertEquals(Module\Profile\Index::class, $router->getModuleClass('/double'));
}
/**
@ -221,7 +221,7 @@ class RouterTest extends TestCase
], '', $this->l10n, $this->cache))->loadRoutes($routes);
// Don't find GET
$this->assertEquals(Module\WellKnown\NodeInfo::class, $router->getModuleClass('/post/it'));
$this->assertEquals(Module\Profile\Index::class, $router->getModuleClass('/double'));
self::assertEquals(Module\WellKnown\NodeInfo::class, $router->getModuleClass('/post/it'));
self::assertEquals(Module\Profile\Index::class, $router->getModuleClass('/double'));
}
}