From bb540722cd4e197bd608d9a87e4b10cf66dec5a9 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 7 Nov 2014 15:23:15 +0100 Subject: Use base class to reset the file mapper --- tests/lib/files/node/file.php | 5 +++-- tests/lib/files/node/folder.php | 5 +++-- tests/lib/files/node/integration.php | 3 +-- tests/lib/files/node/node.php | 5 +++-- tests/lib/files/node/root.php | 5 +++-- 5 files changed, 13 insertions(+), 10 deletions(-) (limited to 'tests/lib/files/node') diff --git a/tests/lib/files/node/file.php b/tests/lib/files/node/file.php index 76938a0dcc8..34ec7dee213 100644 --- a/tests/lib/files/node/file.php +++ b/tests/lib/files/node/file.php @@ -12,10 +12,11 @@ use OCP\Files\NotFoundException; use OCP\Files\NotPermittedException; use OC\Files\View; -class File extends \PHPUnit_Framework_TestCase { +class File extends \Test\TestCase { private $user; - public function setUp() { + protected function setUp() { + parent::setUp(); $this->user = new \OC\User\User('', new \OC_User_Dummy); } diff --git a/tests/lib/files/node/folder.php b/tests/lib/files/node/folder.php index 436161aba72..e348e452f6f 100644 --- a/tests/lib/files/node/folder.php +++ b/tests/lib/files/node/folder.php @@ -15,10 +15,11 @@ use OCP\Files\NotFoundException; use OCP\Files\NotPermittedException; use OC\Files\View; -class Folder extends \PHPUnit_Framework_TestCase { +class Folder extends \Test\TestCase { private $user; - public function setUp() { + protected function setUp() { + parent::setUp(); $this->user = new \OC\User\User('', new \OC_User_Dummy); } diff --git a/tests/lib/files/node/integration.php b/tests/lib/files/node/integration.php index cde2eb22b7b..fd777460ec6 100644 --- a/tests/lib/files/node/integration.php +++ b/tests/lib/files/node/integration.php @@ -14,7 +14,7 @@ use OC\Files\Storage\Temporary; use OC\Files\View; use OC\User\User; -class IntegrationTests extends \PHPUnit_Framework_TestCase { +class IntegrationTests extends \Test\TestCase { /** * @var \OC\Files\Node\Root $root */ @@ -65,7 +65,6 @@ class IntegrationTests extends \PHPUnit_Framework_TestCase { $storage->getCache()->clear(); } \OC\Files\Filesystem::clearMounts(); - \OC\Files\Filesystem::mount($this->originalStorage, array(), '/'); parent::tearDown(); diff --git a/tests/lib/files/node/node.php b/tests/lib/files/node/node.php index cf5fec30522..80e3ac6f80a 100644 --- a/tests/lib/files/node/node.php +++ b/tests/lib/files/node/node.php @@ -8,10 +8,11 @@ namespace Test\Files\Node; -class Node extends \PHPUnit_Framework_TestCase { +class Node extends \Test\TestCase { private $user; - public function setUp() { + protected function setUp() { + parent::setUp(); $this->user = new \OC\User\User('', new \OC_User_Dummy); } diff --git a/tests/lib/files/node/root.php b/tests/lib/files/node/root.php index 27f1a937826..fcce7070f5d 100644 --- a/tests/lib/files/node/root.php +++ b/tests/lib/files/node/root.php @@ -11,10 +11,11 @@ namespace Test\Files\Node; use OCP\Files\NotPermittedException; use OC\Files\Mount\Manager; -class Root extends \PHPUnit_Framework_TestCase { +class Root extends \Test\TestCase { private $user; - public function setUp() { + protected function setUp() { + parent::setUp(); $this->user = new \OC\User\User('', new \OC_User_Dummy); } -- cgit v1.2.3