diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-03-20 13:38:52 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-03-20 14:25:43 +0100 |
| commit | 1565177fb5d1b34187629f37b8bf2fc10b6efcb8 (patch) | |
| tree | a8a498ad76e84c4efbab3f02af9779b9f5b5ef55 /tests/lib/TestCase.php | |
| parent | 450a899f012efd60ba83f8222116a0ca1a1facf9 (diff) | |
| download | nextcloud-server-1565177fb5d1b34187629f37b8bf2fc10b6efcb8.tar.gz nextcloud-server-1565177fb5d1b34187629f37b8bf2fc10b6efcb8.zip | |
Revert "Add a magic wrapper to allow phpunit4 to run the code again "
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'tests/lib/TestCase.php')
| -rw-r--r-- | tests/lib/TestCase.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php index afed2817910..021682ae8e4 100644 --- a/tests/lib/TestCase.php +++ b/tests/lib/TestCase.php @@ -24,6 +24,7 @@ namespace Test; use DOMDocument; use DOMNode; +use OC\Cache\CappedMemoryCache; use OC\Command\QueueBus; use OC\Files\Filesystem; use OC\Template\Base; @@ -33,7 +34,7 @@ use OCP\IDBConnection; use OCP\IL10N; use OCP\Security\ISecureRandom; -abstract class TestCase extends TestCasePhpUnitCompatibility { +abstract class TestCase extends \PHPUnit_Framework_TestCase { /** @var \OC\Command\QueueBus */ private $commandBus; @@ -152,7 +153,7 @@ abstract class TestCase extends TestCasePhpUnitCompatibility { } } - protected function realOnNotSuccessfulTest() { + protected function onNotSuccessfulTest($e) { $this->restoreAllServices(); // restore database connection @@ -161,6 +162,8 @@ abstract class TestCase extends TestCasePhpUnitCompatibility { return self::$realDatabase; }); } + + parent::onNotSuccessfulTest($e); } protected function tearDown() { |