From da126f1692cffa30817f99e0d23fa25db6952801 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 6 Nov 2013 09:39:52 +0100
Subject: [PATCH] Fixed unit tests for files sharing watcher
---
apps/files_sharing/tests/base.php | 2 +-
apps/files_sharing/tests/watcher.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/files_sharing/tests/base.php b/apps/files_sharing/tests/base.php
index 0c7c5937fa..689c80cb9e 100644
--- a/apps/files_sharing/tests/base.php
+++ b/apps/files_sharing/tests/base.php
@@ -29,7 +29,7 @@ use OCA\Files\Share;
*
* Base class for sharing tests.
*/
-class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
+abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
const TEST_FILES_SHARING_API_USER1 = "test-share-user1";
const TEST_FILES_SHARING_API_USER2 = "test-share-user2";
diff --git a/apps/files_sharing/tests/watcher.php b/apps/files_sharing/tests/watcher.php
index 63f38894c7..1a9a54cbcf 100644
--- a/apps/files_sharing/tests/watcher.php
+++ b/apps/files_sharing/tests/watcher.php
@@ -55,12 +55,12 @@ class Test_Files_Sharing_Watcher extends Test_Files_Sharing_Base {
function tearDown() {
$this->sharedCache->clear();
+ self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+
$fileinfo = $this->view->getFileInfo('container/shareddir');
\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
self::TEST_FILES_SHARING_API_USER2);
- self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
-
$this->view->deleteAll('container');
$this->ownerCache->clear();
--
GitLab