From 391fab35f078bd37d7b432eaf6a1c6fab701dff4 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 2 Apr 2015 10:54:51 +0200 Subject: [PATCH] reset storage for each unit test --- apps/files_sharing/tests/testcase.php | 13 +++++++++++++ apps/files_sharing/tests/updater.php | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php index bef727edac7..69f68f7dfe8 100644 --- a/apps/files_sharing/tests/testcase.php +++ b/apps/files_sharing/tests/testcase.php @@ -141,6 +141,8 @@ abstract class TestCase extends \Test\TestCase { \OC_Group::addToGroup($user, 'group'); } + self::resetStorage(); + \OC_Util::tearDownFS(); \OC::$server->getUserSession()->setUser(null); \OC\Files\Filesystem::tearDown(); @@ -148,6 +150,17 @@ abstract class TestCase extends \Test\TestCase { \OC_Util::setupFS($user); } + /** + * reset init status for the share storage + */ + protected static function resetStorage() { + $storage = new \ReflectionClass('\OC\Files\Storage\Shared'); + $isInitialized = $storage->getProperty('isInitialized'); + $isInitialized->setAccessible(true); + $isInitialized->setValue(false); + $isInitialized->setAccessible(false); + } + /** * get some information from a given share * @param int $shareID diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php index df1bbe1cc66..67c76c28ed2 100644 --- a/apps/files_sharing/tests/updater.php +++ b/apps/files_sharing/tests/updater.php @@ -27,7 +27,7 @@ /** * Class Test_Files_Sharing_Updater */ -class Test_Files_Sharing_Updater extends OCA\Files_sharing\Tests\TestCase { +class Test_Files_Sharing_Updater extends OCA\Files_Sharing\Tests\TestCase { const TEST_FOLDER_NAME = '/folder_share_updater_test'; -- 2.39.5