wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixup! fixup! Add backgroundjobs to OCP

Browse source 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-10-09 15:25:56 +02:00
parent 7370fb37bb
commit 8493f49211
No known key found for this signature in database
GPG key ID: F941078878347C0C
2 changed files with 111 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
tests/lib/BackgroundJob/QueuedJobTest.php
View file

@ -8,18 +8,24 @@
namespace Test\BackgroundJob;
class TestQueuedJob extends \OC\BackgroundJob\QueuedJob {
private $testCase;
use OCP\AppFramework\Utility\ITimeFactory;
class TestQueuedJob extends \OC\BackgroundJob\QueuedJob {
public $ran = false;
/**
* @param QueuedJobTest $testCase
*/
public function __construct($testCase) {
$this->testCase = $testCase;
}
public function run($argument) {
$this->testCase->markRun();
$this->ran = true;
}
}
class TestQueuedJobNew extends \OCP\BackgroundJob\QueuedJob {
public $ran = false;
public function run($argument) {
$this->ran = true;
}
}
@ -28,29 +34,29 @@ class QueuedJobTest extends \Test\TestCase {
* @var DummyJobList $jobList
*/
private $jobList;
/**
* @var \OC\BackgroundJob\TimedJob $job
*/
private $job;
private $jobRun = false;
public function markRun() {
$this->jobRun = true;
}
protected function setup() {
parent::setUp();
$this->jobList = new DummyJobList();
$this->job = new TestQueuedJob($this);
$this->jobList->add($this->job);
$this->jobRun = false;
}
public function testJobShouldBeRemoved() {
$this->assertTrue($this->jobList->has($this->job, null));
$this->job->execute($this->jobList);
$this->assertTrue($this->jobRun);
$job = new TestQueuedJob();
$this->jobList->add($job);
$this->assertTrue($this->jobList->has($job, null));
$job->execute($this->jobList);
$this->assertTrue($job->ran);
}
public function testJobShouldBeRemovedNew() {
$job = new TestQueuedJobNew(\OC::$server->query(ITimeFactory::class));
$job->setId(42);
$this->jobList->add($job);
$this->assertTrue($this->jobList->has($job, null));
$job->execute($this->jobList);
$this->assertTrue($job->ran);
}
}

115
tests/lib/BackgroundJob/TimedJobTest.php
View file

@ -8,65 +8,110 @@
namespace Test\BackgroundJob;
class TestTimedJob extends \OC\BackgroundJob\TimedJob {
private $testCase;
use OCP\AppFramework\Utility\ITimeFactory;
/**
* @param TimedJobTest $testCase
*/
public function __construct($testCase) {
class TestTimedJob extends \OC\BackgroundJob\TimedJob {
/** @var bool */
public $ran = false;
public function __construct() {
$this->setInterval(10);
$this->testCase = $testCase;
}
public function run($argument) {
$this->testCase->markRun();
$this->ran = true;
}
}
class TestTimedJobNew extends \OCP\BackgroundJob\TimedJob {
/** @var bool */
public $ran = false;
public function __construct(ITimeFactory $timeFactory) {
parent::__construct($timeFactory);
$this->setInterval(10);
}
public function run($argument) {
$this->ran = true;
}
}
class TimedJobTest extends \Test\TestCase {
/**
* @var DummyJobList $jobList
*/
/** @var DummyJobList $jobList */
private $jobList;
/**
* @var \OC\BackgroundJob\TimedJob $job
*/
private $job;
private $jobRun = false;
public function markRun() {
$this->jobRun = true;
}
/** @var ITimeFactory */
private $time;
protected function setup() {
parent::setUp();
$this->jobList = new DummyJobList();
$this->job = new TestTimedJob($this);
$this->jobList->add($this->job);
$this->jobRun = false;
$this->time = \OC::$server->query(ITimeFactory::class);
}
public function testShouldRunAfterInterval() {
$this->job->setLastRun(time() - 12);
$this->job->execute($this->jobList);
$this->assertTrue($this->jobRun);
$job = new TestTimedJob();
$this->jobList->add($job);
$job->setLastRun(time() - 12);
$job->execute($this->jobList);
$this->assertTrue($job->ran);
}
public function testShouldNotRunWithinInterval() {
$this->job->setLastRun(time() - 5);
$this->job->execute($this->jobList);
$this->assertFalse($this->jobRun);
$job = new TestTimedJob();
$this->jobList->add($job);
$job->setLastRun(time() - 5);
$job->execute($this->jobList);
$this->assertFalse($job->ran);
}
public function testShouldNotTwice() {
$this->job->setLastRun(time() - 15);
$this->job->execute($this->jobList);
$this->assertTrue($this->jobRun);
$this->jobRun = false;
$this->job->execute($this->jobList);
$this->assertFalse($this->jobRun);
$job = new TestTimedJob();
$this->jobList->add($job);
$job->setLastRun(time() - 15);
$job->execute($this->jobList);
$this->assertTrue($job->ran);
$job->ran = false;
$job->execute($this->jobList);
$this->assertFalse($job->ran);
}
public function testShouldRunAfterIntervalNew() {
$job = new TestTimedJobNew($this->time);
$job->setId(42);
$this->jobList->add($job);
$job->setLastRun(time() - 12);
$job->execute($this->jobList);
$this->assertTrue($job->ran);
}
public function testShouldNotRunWithinIntervalNew() {
$job = new TestTimedJobNew($this->time);
$job->setId(42);
$this->jobList->add($job);
$job->setLastRun(time() - 5);
$job->execute($this->jobList);
$this->assertFalse($job->ran);
}
public function testShouldNotTwiceNew() {
$job = new TestTimedJobNew($this->time);
$job->setId(42);
$this->jobList->add($job);
$job->setLastRun(time() - 15);
$job->execute($this->jobList);
$this->assertTrue($job->ran);
$job->ran = false;
$job->execute($this->jobList);
$this->assertFalse($job->ran);
}
}