aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib/backgroundjob
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib/backgroundjob')
-rw-r--r--tests/lib/backgroundjob/job.php5
-rw-r--r--tests/lib/backgroundjob/joblist.php6
-rw-r--r--tests/lib/backgroundjob/queuedjob.php6
-rw-r--r--tests/lib/backgroundjob/timedjob.php6
4 files changed, 15 insertions, 8 deletions
diff --git a/tests/lib/backgroundjob/job.php b/tests/lib/backgroundjob/job.php
index 10a8f46462e..fec9b0a792d 100644
--- a/tests/lib/backgroundjob/job.php
+++ b/tests/lib/backgroundjob/job.php
@@ -8,10 +8,11 @@
namespace Test\BackgroundJob;
-class Job extends \PHPUnit_Framework_TestCase {
+class Job extends \Test\TestCase {
private $run = false;
- public function setUp() {
+ protected function setUp() {
+ parent::setUp();
$this->run = false;
}
diff --git a/tests/lib/backgroundjob/joblist.php b/tests/lib/backgroundjob/joblist.php
index c3318f80cb2..13bee12479e 100644
--- a/tests/lib/backgroundjob/joblist.php
+++ b/tests/lib/backgroundjob/joblist.php
@@ -8,7 +8,7 @@
namespace Test\BackgroundJob;
-class JobList extends \PHPUnit_Framework_TestCase {
+class JobList extends \Test\TestCase {
/**
* @var \OC\BackgroundJob\JobList
*/
@@ -19,7 +19,9 @@ class JobList extends \PHPUnit_Framework_TestCase {
*/
protected $config;
- public function setUp() {
+ protected function setUp() {
+ parent::setUp();
+
$conn = \OC::$server->getDatabaseConnection();
$this->config = $this->getMock('\OCP\IConfig');
$this->instance = new \OC\BackgroundJob\JobList($conn, $this->config);
diff --git a/tests/lib/backgroundjob/queuedjob.php b/tests/lib/backgroundjob/queuedjob.php
index 19c1b28a507..8d3cd6f907b 100644
--- a/tests/lib/backgroundjob/queuedjob.php
+++ b/tests/lib/backgroundjob/queuedjob.php
@@ -23,7 +23,7 @@ class TestQueuedJob extends \OC\BackgroundJob\QueuedJob {
}
}
-class QueuedJob extends \PHPUnit_Framework_TestCase {
+class QueuedJob extends \Test\TestCase {
/**
* @var DummyJobList $jobList
*/
@@ -39,7 +39,9 @@ class QueuedJob extends \PHPUnit_Framework_TestCase {
$this->jobRun = true;
}
- public function setup() {
+ protected function setup() {
+ parent::setUp();
+
$this->jobList = new DummyJobList();
$this->job = new TestQueuedJob($this);
$this->jobList->add($this->job);
diff --git a/tests/lib/backgroundjob/timedjob.php b/tests/lib/backgroundjob/timedjob.php
index 646a2607ef3..7d9bfe979af 100644
--- a/tests/lib/backgroundjob/timedjob.php
+++ b/tests/lib/backgroundjob/timedjob.php
@@ -24,7 +24,7 @@ class TestTimedJob extends \OC\BackgroundJob\TimedJob {
}
}
-class TimedJob extends \PHPUnit_Framework_TestCase {
+class TimedJob extends \Test\TestCase {
/**
* @var DummyJobList $jobList
*/
@@ -40,7 +40,9 @@ class TimedJob extends \PHPUnit_Framework_TestCase {
$this->jobRun = true;
}
- public function setup() {
+ protected function setup() {
+ parent::setUp();
+
$this->jobList = new DummyJobList();
$this->job = new TestTimedJob($this);
$this->jobList->add($this->job);