Browse Source
Changing Friendica\App\Mode from static methods to public methods
Changing Friendica\App\Mode from static methods to public methods
- Changing from static methods to public methods - Adding dev-composer-dependency Mockery for static method mocking (f.e. Config, DBA) - Adding ModeTest with Mocking - removing bootstrap from phpunit.xml because of double loading tests\bootstrap.phppull/5844/head
Philipp Holzer
3 years ago
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
21 changed files with 498 additions and 106 deletions
-
4bin/auth_ejabberd.php
-
2bin/daemon.php
-
3composer.json
-
203composer.lock
-
14index.php
-
1phpunit.xml
-
30src/App.php
-
58src/App/Mode.php
-
10src/Core/Config.php
-
4src/Core/Console/ArchiveContact.php
-
2src/Core/Console/Cache.php
-
4src/Core/Console/Config.php
-
2src/Core/Console/GlobalCommunityBlock.php
-
2src/Core/Console/GlobalCommunitySilence.php
-
4src/Core/Console/Maintenance.php
-
2src/Core/Console/NewPassword.php
-
4src/Core/Console/PostUpdate.php
-
14src/Core/PConfig.php
-
52tests/Util/VFSTrait.php
-
139tests/src/App/ModeTest.php
-
50tests/src/Core/Console/ConsoleTest.php
@ -0,0 +1,52 @@ |
|||
<?php |
|||
|
|||
namespace Friendica\Test\Util; |
|||
|
|||
|
|||
use org\bovigo\vfs\vfsStream; |
|||
use org\bovigo\vfs\vfsStreamDirectory; |
|||
|
|||
trait VFSTrait |
|||
{ |
|||
/** |
|||
* @var vfsStreamDirectory The Stream Directory |
|||
*/ |
|||
protected $root; |
|||
|
|||
protected function setUpVfsDir() { |
|||
// the used directories inside the App class
|
|||
$structure = [ |
|||
'config' => [], |
|||
'bin' => [] |
|||
]; |
|||
|
|||
// create a virtual directory and copy all needed files and folders to it
|
|||
$this->root = vfsStream::setup('friendica', null, $structure); |
|||
|
|||
$this->setConfigFile('config.ini.php'); |
|||
$this->setConfigFile('settings.ini.php'); |
|||
$this->setConfigFile('local.ini.php'); |
|||
$this->setConfigFile('dbstructure.json'); |
|||
} |
|||
|
|||
protected function setConfigFile($filename) |
|||
{ |
|||
$file = dirname(__DIR__) . DIRECTORY_SEPARATOR . |
|||
'..' . DIRECTORY_SEPARATOR . |
|||
'config' . DIRECTORY_SEPARATOR . |
|||
$filename; |
|||
|
|||
if (file_exists($file)) { |
|||
vfsStream::newFile($filename) |
|||
->at($this->root->getChild('config')) |
|||
->setContent(file_get_contents($file)); |
|||
} |
|||
} |
|||
|
|||
protected function delConfigFile($filename) |
|||
{ |
|||
if ($this->root->hasChild('config/' . $filename)) { |
|||
$this->root->removeChild('config/' . $filename); |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,139 @@ |
|||
<?php |
|||
|
|||
namespace Friendica\Test\src\App; |
|||
|
|||
use Friendica\App\Mode; |
|||
use Friendica\Test\Util\VFSTrait; |
|||
use PHPUnit\Framework\TestCase; |
|||
|
|||
/** |
|||
* @runTestsInSeparateProcesses |
|||
* @preserveGlobalState disabled |
|||
*/ |
|||
class ModeTest extends TestCase |
|||
{ |
|||
use VFSTrait; |
|||
|
|||
public function setUp() |
|||
{ |
|||
parent::setUp(); // TODO: Change the autogenerated stub
|
|||
|
|||
$this->setUpVfsDir(); |
|||
} |
|||
|
|||
public function testItEmpty() |
|||
{ |
|||
$mode = new Mode($this->root->url()); |
|||
$this->assertTrue($mode->isInstall()); |
|||
$this->assertFalse($mode->isNormal()); |
|||
} |
|||
|
|||
public function testWithoutConfig() |
|||
{ |
|||
$mode = new Mode($this->root->url()); |
|||
|
|||
$this->assertTrue($this->root->hasChild('config/local.ini.php')); |
|||
|
|||
$this->delConfigFile('local.ini.php'); |
|||
|
|||
$this->assertFalse($this->root->hasChild('config/local.ini.php')); |
|||
|
|||
$mode->determine(); |
|||
|
|||
$this->assertTrue($mode->isInstall()); |
|||
$this->assertFalse($mode->isNormal()); |
|||
|
|||
$this->assertFalse($mode->has(Mode::LOCALCONFIGPRESENT)); |
|||
} |
|||
|
|||
public function testWithoutDatabase() |
|||
{ |
|||
$dba = \Mockery::mock('alias:Friendica\Database\DBA'); |
|||
$dba |
|||
->shouldReceive('connected') |
|||
->andReturn(false); |
|||
|
|||
$mode = new Mode($this->root->url()); |
|||
$mode->determine(); |
|||
|
|||
$this->assertFalse($mode->isNormal()); |
|||
$this->assertTrue($mode->isInstall()); |
|||
|
|||
$this->assertTrue($mode->has(Mode::LOCALCONFIGPRESENT)); |
|||
$this->assertFalse($mode->has(Mode::DBAVAILABLE)); |
|||
} |
|||
|
|||
public function testWithoutDatabaseSetup() |
|||
{ |
|||
$dba = \Mockery::mock('alias:Friendica\Database\DBA'); |
|||
$dba |
|||
->shouldReceive('connected') |
|||
->andReturn(true); |
|||
$dba |
|||
->shouldReceive('fetchFirst') |
|||
->with('SHOW TABLES LIKE \'config\'') |
|||
->andReturn(false); |
|||
|
|||
$mode = new Mode($this->root->url()); |
|||
$mode->determine(); |
|||
|
|||
$this->assertFalse($mode->isNormal()); |
|||
$this->assertTrue($mode->isInstall()); |
|||
|
|||
$this->assertTrue($mode->has(Mode::LOCALCONFIGPRESENT)); |
|||
} |
|||
|
|||
public function testWithMaintenanceMode() |
|||
{ |
|||
$dba = \Mockery::mock('alias:Friendica\Database\DBA'); |
|||
$dba |
|||
->shouldReceive('connected') |
|||
->andReturn(true); |
|||
$dba |
|||
->shouldReceive('fetchFirst') |
|||
->with('SHOW TABLES LIKE \'config\'') |
|||
->andReturn(true); |
|||
|
|||
$conf = \Mockery::mock('alias:Friendica\Core\Config'); |
|||
$conf |
|||
->shouldReceive('get') |
|||
->with('system', 'maintenance') |
|||
->andReturn(true); |
|||
|
|||
$mode = new Mode($this->root->url()); |
|||
$mode->determine(); |
|||
|
|||
$this->assertFalse($mode->isNormal()); |
|||
$this->assertFalse($mode->isInstall()); |
|||
|
|||
$this->assertTrue($mode->has(Mode::DBCONFIGAVAILABLE)); |
|||
$this->assertFalse($mode->has(Mode::MAINTENANCEDISABLED)); |
|||
} |
|||
|
|||
public function testNormalMode() |
|||
{ |
|||
$dba = \Mockery::mock('alias:Friendica\Database\DBA'); |
|||
$dba |
|||
->shouldReceive('connected') |
|||
->andReturn(true); |
|||
$dba |
|||
->shouldReceive('fetchFirst') |
|||
->with('SHOW TABLES LIKE \'config\'') |
|||
->andReturn(true); |
|||
|
|||
$conf = \Mockery::mock('alias:Friendica\Core\Config'); |
|||
$conf |
|||
->shouldReceive('get') |
|||
->with('system', 'maintenance') |
|||
->andReturn(false); |
|||
|
|||
$mode = new Mode($this->root->url()); |
|||
$mode->determine(); |
|||
|
|||
$this->assertTrue($mode->isNormal()); |
|||
$this->assertFalse($mode->isInstall()); |
|||
|
|||
$this->assertTrue($mode->has(Mode::DBCONFIGAVAILABLE)); |
|||
$this->assertTrue($mode->has(Mode::MAINTENANCEDISABLED)); |
|||
} |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue