Browse Source
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
Split View
Diff Options
-
+2 -2bin/auth_ejabberd.php
-
+1 -1bin/daemon.php
-
+2 -1composer.json
-
+197 -6composer.lock
-
+7 -7index.php
-
+0 -1phpunit.xml
-
+27 -3src/App.php
-
+38 -20src/App/Mode.php
-
+5 -5src/Core/Config.php
-
+2 -2src/Core/Console/ArchiveContact.php
-
+1 -1src/Core/Console/Cache.php
-
+2 -2src/Core/Console/Config.php
-
+1 -1src/Core/Console/GlobalCommunityBlock.php
-
+1 -1src/Core/Console/GlobalCommunitySilence.php
-
+2 -2src/Core/Console/Maintenance.php
-
+1 -1src/Core/Console/NewPassword.php
-
+2 -2src/Core/Console/PostUpdate.php
-
+8 -6src/Core/PConfig.php
-
+52 -0tests/Util/VFSTrait.php
-
+139 -0tests/src/App/ModeTest.php
-
+8 -42tests/src/Core/Console/ConsoleTest.php
+ 2
- 2
bin/auth_ejabberd.php
View File
+ 1
- 1
bin/daemon.php
View File
+ 2
- 1
composer.json
View File
+ 197
- 6
composer.lock
View File
+ 7
- 7
index.php
View File
+ 0
- 1
phpunit.xml
View File
+ 27
- 3
src/App.php
View File
+ 38
- 20
src/App/Mode.php
View File
+ 5
- 5
src/Core/Config.php
View File
+ 2
- 2
src/Core/Console/ArchiveContact.php
View File
+ 1
- 1
src/Core/Console/Cache.php
View File
+ 2
- 2
src/Core/Console/Config.php
View File
+ 1
- 1
src/Core/Console/GlobalCommunityBlock.php
View File
+ 1
- 1
src/Core/Console/GlobalCommunitySilence.php
View File
+ 2
- 2
src/Core/Console/Maintenance.php
View File
+ 1
- 1
src/Core/Console/NewPassword.php
View File
+ 2
- 2
src/Core/Console/PostUpdate.php
View File
+ 8
- 6
src/Core/PConfig.php
View File
+ 52
- 0
tests/Util/VFSTrait.php
View File
| @ -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); | |||
| } | |||
| } | |||
| } | |||
+ 139
- 0
tests/src/App/ModeTest.php
View File
| @ -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)); | |||
| } | |||
| } | |||