Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 03:10:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make Router::getModuleClass throw exceptions

Browse source 
- Add new MethodNotAllowedModule
- Add new Module->determineClass catch blocks
- Update Module and Router tests
This commit is contained in:
Hypolite Petovan 2019-10-11 11:55:02 -04:00
parent bfcae2f79a
commit 4ee9e21a4f
6 changed files with 122 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,13 +4,15 @@ namespace Friendica\Test\src\App;
use Friendica\App\Router;
use Friendica\Module;
use Friendica\Network\HTTPException\MethodNotAllowedException;
use Friendica\Network\HTTPException\NotFoundException;
use PHPUnit\Framework\TestCase;
class RouterTest extends TestCase
{
public function testGetModuleClass()
{
$router = new Router(['GET']);
$router = new Router(['REQUEST_METHOD' => 'GET']);
$routeCollector = $router->getRouteCollector();
$routeCollector->addRoute(['GET'], '/', 'IndexModuleClassName');
@ -22,23 +24,70 @@ class RouterTest extends TestCase
$routeCollector->addRoute(['POST', 'PUT', 'PATCH', 'DELETE', 'HEAD'], '/unsupported', 'UnsupportedMethodModuleClassName');
$this->assertEquals('IndexModuleClassName', $router->getModuleClass('/'));
$this->assertEquals('TestModuleClassName', $router->getModuleClass('/test'));
$this->assertNull($router->getModuleClass('/tes'));
$this->assertEquals('TestSubModuleClassName', $router->getModuleClass('/test/sub'));
$this->assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional'));
$this->assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional/option'));
$this->assertNull($router->getModuleClass('/optional/opt'));
$this->assertEquals('VariableModuleClassName', $router->getModuleClass('/variable/123abc'));
$this->assertNull($router->getModuleClass('/variable'));
$this->assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable'));
$this->assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable/123abc'));
}
$this->assertNull($router->getModuleClass('/unsupported'));
public function testGetModuleClassNotFound()
{
$this->expectException(NotFoundException::class);
$router = new Router(['REQUEST_METHOD' => 'GET']);
$router->getModuleClass('/unsupported');
}
public function testGetModuleClassNotFoundTypo()
{
$this->expectException(NotFoundException::class);
$router = new Router(['REQUEST_METHOD' => 'GET']);
$routeCollector = $router->getRouteCollector();
$routeCollector->addRoute(['GET'], '/test', 'TestModuleClassName');
$router->getModuleClass('/tes');
}
public function testGetModuleClassNotFoundOptional()
{
$this->expectException(NotFoundException::class);
$router = new Router(['REQUEST_METHOD' => 'GET']);
$routeCollector = $router->getRouteCollector();
$routeCollector->addRoute(['GET'], '/optional[/option]', 'OptionalModuleClassName');
$router->getModuleClass('/optional/opt');
}
public function testGetModuleClassNotFoundVariable()
{
$this->expectException(NotFoundException::class);
$router = new Router(['REQUEST_METHOD' => 'GET']);
$routeCollector = $router->getRouteCollector();
$routeCollector->addRoute(['GET'], '/variable/{var}', 'VariableModuleClassName');
$router->getModuleClass('/variable');
}
public function testGetModuleClassMethodNotAllowed()
{
$this->expectException(MethodNotAllowedException::class);
$router = new Router(['REQUEST_METHOD' => 'POST']);
$routeCollector = $router->getRouteCollector();
$routeCollector->addRoute(['GET'], '/test', 'TestModuleClassName');
$router->getModuleClass('/test');
}
public function dataRoutes()