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

Adding unittest for empty setApp()

Browse source
This commit is contained in:
Philipp Holzer 2019-02-05 22:56:57 +01:00
parent b79bd63231
commit ef16e1a037
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/BaseObject.php
View file

@ -28,7 +28,7 @@ class BaseObject
public static function getApp()
{
if (empty(self::$app)) {
throw new InternalServerErrorException('App isn\' initialized.');
throw new InternalServerErrorException('App isn\'t initialized.');
}
return self::$app;

21
tests/src/BaseObjectTest.php
View file

@ -31,10 +31,6 @@ class BaseObjectTest extends TestCase
*/
protected function setUp()
{
$this->setUpVfsDir();
$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
$this->mockApp($this->root, $configMock);
$this->baseObject = new BaseObject();
}
@ -44,6 +40,10 @@ class BaseObjectTest extends TestCase
*/
public function testGetApp()
{
$this->setUpVfsDir();
$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
$this->mockApp($this->root, $configMock);
$this->assertInstanceOf(App::class, $this->baseObject->getApp());
}
@ -53,7 +53,20 @@ class BaseObjectTest extends TestCase
*/
public function testSetApp()
{
$this->setUpVfsDir();
$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
$this->mockApp($this->root, $configMock);
$this->assertNull($this->baseObject->setApp($this->app));
$this->assertEquals($this->app, $this->baseObject->getApp());
}
/**
* Test the getApp() function without App
* @expectedException Friendica\Network\HTTPException\InternalServerErrorException
*/
public function testGetAppFailed()
{
BaseObject::getApp();
}
}