From 9731350acef75931ccbeafa054b40afe8189653f Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 24 Aug 2017 16:06:37 +0200 Subject: split async test bus for easier subclassing --- tests/lib/Command/AsyncBusTest.php | 56 ++++++++++++++++++++------------------ tests/lib/Command/CronBusTest.php | 50 ++++++++++++++++++++++++++++++++++ tests/lib/TestCase.php | 4 ++- 3 files changed, 82 insertions(+), 28 deletions(-) create mode 100644 tests/lib/Command/CronBusTest.php (limited to 'tests') diff --git a/tests/lib/Command/AsyncBusTest.php b/tests/lib/Command/AsyncBusTest.php index 8c1713f1260..da168d66e6d 100644 --- a/tests/lib/Command/AsyncBusTest.php +++ b/tests/lib/Command/AsyncBusTest.php @@ -12,7 +12,6 @@ namespace Test\Command; use OC\Command\FileAccess; use OCP\Command\IBus; use OCP\Command\ICommand; -use Test\BackgroundJob\DummyJobList; use Test\TestCase; class SimpleCommand implements ICommand { @@ -58,7 +57,7 @@ class ThisClosureTest { } } -class AsyncBusTest extends TestCase { +abstract class AsyncBusTest extends TestCase { /** * Basic way to check output from a command * @@ -66,11 +65,6 @@ class AsyncBusTest extends TestCase { */ public static $lastCommand; - /** - * @var \OCP\BackgroundJob\IJobList - */ - private $jobList; - /** * @var \OCP\Command\IBus */ @@ -80,47 +74,60 @@ class AsyncBusTest extends TestCase { self::$lastCommand = 'static'; } + /** + * @return IBus + */ + protected function getBus() { + if (!$this->bus instanceof IBus) { + $this->bus = $this->createBus(); + } + return $this->bus; + } + + /** + * @return IBus + */ + abstract protected function createBus(); + public function setUp() { - $this->jobList = new DummyJobList(); - $this->bus = new \OC\Command\AsyncBus($this->jobList); self::$lastCommand = ''; } public function testSimpleCommand() { $command = new SimpleCommand(); - $this->bus->push($command); + $this->getBus()->push($command); $this->runJobs(); $this->assertEquals('SimpleCommand', self::$lastCommand); } public function testStateFullCommand() { $command = new StateFullCommand('foo'); - $this->bus->push($command); + $this->getBus()->push($command); $this->runJobs(); $this->assertEquals('foo', self::$lastCommand); } public function testStaticCallable() { - $this->bus->push(['\Test\Command\AsyncBusTest', 'DummyCommand']); + $this->getBus()->push(['\Test\Command\AsyncBusTest', 'DummyCommand']); $this->runJobs(); $this->assertEquals('static', self::$lastCommand); } public function testMemberCallable() { $command = new StateFullCommand('bar'); - $this->bus->push([$command, 'handle']); + $this->getBus()->push([$command, 'handle']); $this->runJobs(); $this->assertEquals('bar', self::$lastCommand); } public function testFunctionCallable() { - $this->bus->push('\Test\Command\BasicFunction'); + $this->getBus()->push('\Test\Command\BasicFunction'); $this->runJobs(); $this->assertEquals('function', self::$lastCommand); } public function testClosure() { - $this->bus->push(function () { + $this->getBus()->push(function () { AsyncBusTest::$lastCommand = 'closure'; }); $this->runJobs(); @@ -128,7 +135,7 @@ class AsyncBusTest extends TestCase { } public function testClosureSelf() { - $this->bus->push(function () { + $this->getBus()->push(function () { self::$lastCommand = 'closure-self'; }); $this->runJobs(); @@ -139,14 +146,14 @@ class AsyncBusTest extends TestCase { public function testClosureThis() { // clean class to prevent phpunit putting closure in $this $test = new ThisClosureTest(); - $test->test($this->bus); + $test->test($this->getBus()); $this->runJobs(); $this->assertEquals('closure-this', self::$lastCommand); } public function testClosureBind() { $state = 'bar'; - $this->bus->push(function () use ($state) { + $this->getBus()->push(function () use ($state) { self::$lastCommand = 'closure-' . $state; }); $this->runJobs(); @@ -154,15 +161,15 @@ class AsyncBusTest extends TestCase { } public function testFileFileAccessCommand() { - $this->bus->push(new FilesystemCommand()); + $this->getBus()->push(new FilesystemCommand()); $this->assertEquals('', self::$lastCommand); $this->runJobs(); $this->assertEquals('FileAccess', self::$lastCommand); } public function testFileFileAccessCommandSync() { - $this->bus->requireSync('\OC\Command\FileAccess'); - $this->bus->push(new FilesystemCommand()); + $this->getBus()->requireSync('\OC\Command\FileAccess'); + $this->getBus()->push(new FilesystemCommand()); $this->assertEquals('FileAccess', self::$lastCommand); self::$lastCommand = ''; $this->runJobs(); @@ -170,10 +177,5 @@ class AsyncBusTest extends TestCase { } - private function runJobs() { - $jobs = $this->jobList->getAll(); - foreach ($jobs as $job) { - $job->execute($this->jobList); - } - } + abstract protected function runJobs(); } diff --git a/tests/lib/Command/CronBusTest.php b/tests/lib/Command/CronBusTest.php new file mode 100644 index 00000000000..79fd13a99a8 --- /dev/null +++ b/tests/lib/Command/CronBusTest.php @@ -0,0 +1,50 @@ + + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +namespace Test\Command; + +use OC\Command\CronBus; +use Test\BackgroundJob\DummyJobList; + +class CronBusTest extends AsyncBusTest { + /** + * @var \OCP\BackgroundJob\IJobList + */ + private $jobList; + + + public function setUp() { + parent::setUp(); + + $this->jobList = new DummyJobList(); + } + + protected function createBus() { + return new CronBus($this->jobList); + } + + protected function runJobs() { + $jobs = $this->jobList->getAll(); + foreach ($jobs as $job) { + $job->execute($this->jobList); + } + } +} \ No newline at end of file diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php index c3aa2c73c9e..818b3454c3a 100644 --- a/tests/lib/TestCase.php +++ b/tests/lib/TestCase.php @@ -190,7 +190,9 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { self::assertEquals([], $errors, "There have been xml parsing errors"); } - \OC\Files\Cache\Storage::getGlobalCache()->clearCache(); + if ($this->IsDatabaseAccessAllowed()) { + \OC\Files\Cache\Storage::getGlobalCache()->clearCache(); + } // tearDown the traits $traits = $this->getTestTraits(); -- cgit v1.2.3 From 1ebf91ec16c00ea0696defe70d29884e2819237c Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 4 Sep 2017 14:21:44 +0200 Subject: Add proper EOL Signed-off-by: Morris Jobke --- lib/private/Command/CronBus.php | 2 +- tests/lib/Command/CronBusTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/lib/private/Command/CronBus.php b/lib/private/Command/CronBus.php index a0ad9b3c860..9bde4d88242 100644 --- a/lib/private/Command/CronBus.php +++ b/lib/private/Command/CronBus.php @@ -72,4 +72,4 @@ class CronBus extends AsyncBus { throw new \InvalidArgumentException('Invalid command'); } } -} \ No newline at end of file +} diff --git a/tests/lib/Command/CronBusTest.php b/tests/lib/Command/CronBusTest.php index 79fd13a99a8..9bf53ba92d2 100644 --- a/tests/lib/Command/CronBusTest.php +++ b/tests/lib/Command/CronBusTest.php @@ -47,4 +47,4 @@ class CronBusTest extends AsyncBusTest { $job->execute($this->jobList); } } -} \ No newline at end of file +} -- cgit v1.2.3