diff options
author | Joas Schilling <coding@schilljs.com> | 2016-11-15 14:33:06 +0100 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2016-11-15 14:49:14 +0100 |
commit | e76ef9aaa8ca8e1913e49492b4d27470df6481cb (patch) | |
tree | af7f1b9f9a25ed9a6c324cf475996158c482eece /tests/lib/TestCase.php | |
parent | 571c5aac5e87deee1933f605d366060a82323621 (diff) | |
download | nextcloud-server-e76ef9aaa8ca8e1913e49492b4d27470df6481cb.tar.gz nextcloud-server-e76ef9aaa8ca8e1913e49492b4d27470df6481cb.zip |
Add a magic wrapper from hell to allow phpunit4 to run the code again
Remove this once phpunit 5 is the lowest supported version, by reverting:
https://github.com/nextcloud/server/pull/2137
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'tests/lib/TestCase.php')
-rw-r--r-- | tests/lib/TestCase.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php index 42b2273e119..f115c11938a 100644 --- a/tests/lib/TestCase.php +++ b/tests/lib/TestCase.php @@ -24,7 +24,6 @@ namespace Test; use DOMDocument; use DOMNode; -use OC\Cache\CappedMemoryCache; use OC\Command\QueueBus; use OC\Files\Filesystem; use OC\Template\Base; @@ -34,7 +33,7 @@ use OCP\IDBConnection; use OCP\IL10N; use OCP\Security\ISecureRandom; -abstract class TestCase extends \PHPUnit_Framework_TestCase { +abstract class TestCase extends TestCasePhpUnitCompatibility { /** @var \OC\Command\QueueBus */ private $commandBus; @@ -153,7 +152,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { } } - protected function onNotSuccessfulTest($e) { + protected function realOnNotSuccessfulTest() { $this->restoreAllServices(); // restore database connection @@ -162,8 +161,6 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { return self::$realDatabase; }); } - - parent::onNotSuccessfulTest($e); } protected function tearDown() { |