maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Feature/crontaskid (#1005)

Browse Source 
* Add \Froxlor\Cron\TaskId for fixed task id naming

* Replace Cronjob::inserttask numbers with \Froxlor\Cron\TaskId constants

* Use TaskId in Froxlor\Cron\System\TasksCron

* Use TaskId in Froxlor\System\Cronjob,
simplify getOutstandingTasks.
Rename lng['tasks'] cronjob task description.
WARNING: DELETE_DOMAIN_PDNS, DELETE_DOMAIN_SSL now use %domain%

* Remove Froxlor\System\Cronjob type 3 check
This commit is contained in:
Oskar Eisemuth
2022-01-21 10:03:45 +01:00
committed by GitHub
parent bcb95e9b7d
commit 4a912e3902
30 changed files with 368 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
tests/Cron/TaskIdTest.php Normal file
View File

@@ -0,0 +1,84 @@
<?php
use PHPUnit\Framework\TestCase;
use Froxlor\Cron\TaskId;
/**
*
* @covers \Froxlor\Cron\TaskId
*/
class TaskIDTest extends TestCase
{
private $fixedids = array(
'REBUILD_VHOST' => 1,
'CREATE_HOME' => 2,
'REBUILD_DNS' => 4,
'CREATE_FTP' => 5,
'DELETE_CUSTOMER_FILES' => 6,
'DELETE_EMAIL_DATA' => 7,
'DELETE_FTP_DATA' => 8,
'CREATE_QUOTA' => 10,
'DELETE_DOMAIN_PDNS' => 11,
'DELETE_DOMAIN_SSL' => 12,
'CREATE_CUSTOMER_BACKUP' => 20,
'REBUILD_CRON' => 99,
);
public function testValidTaskId()
{
$isId99Valid = TaskId::isValid(99);
$this->assertTrue($isId99Valid, "Task id 99 must be valid");
$isIdStringValid = TaskId::isValid('99');
$this->assertTrue($isIdStringValid, "String task ids should be valid");
$isNegativeValid = TaskId::isValid(-1);
$this->assertFalse($isNegativeValid, "Negative task should be invalid");
}
public function testAcceptNewTaskId()
{
$isTESTTASKValid = TaskIdExtended::isValid(10101010);
$this->assertTrue($isTESTTASKValid);
}
public function testFixedTaskIdTable()
{
$isTESTTASKValid = TaskIdExtended::isValid(10101010);
$this->assertTrue($isTESTTASKValid);
}
public function testIdMappingCorrect() {
foreach($this->fixedids as $name => $expected) {
$result = constant("\Froxlor\Cron\TaskId::$name");
$this->assertEquals( $expected, $result, "Task $name has bad mapping");
}
}
public function testConvertToConstant() {
foreach($this->fixedids as $name => $taskid) {
$result = TaskId::convertToConstant($taskid);
$this->assertEquals( $name, $result, "Task $name has bad mapping from id to name");
}
$unknownIDResult = TaskId::isValid(10101010);
$this->assertFalse($unknownIDResult);
}
}
class TaskIdExtended extends TaskId {
const TESTTASK = 10101010;
}