summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2016-04-20 14:58:43 +0200
committerRobin Appelman <icewind@owncloud.com>2016-04-21 13:13:18 +0200
commitb7867e93686985f0903abd40a0ec0544cd54ab6d (patch)
treeb1ca34b3edbb648227627fddef1d689e973bb3b4 /apps
parente673ff0f330425ac37697e2ce2f262888289b406 (diff)
downloadnextcloud-server-b7867e93686985f0903abd40a0ec0544cd54ab6d.tar.gz
nextcloud-server-b7867e93686985f0903abd40a0ec0544cd54ab6d.zip
Add unit tests for shared size propagation with encryption
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/tests/encryptedsizepropagation.php41
-rw-r--r--apps/files_sharing/tests/sizepropagation.php41
2 files changed, 68 insertions, 14 deletions
diff --git a/apps/files_sharing/tests/encryptedsizepropagation.php b/apps/files_sharing/tests/encryptedsizepropagation.php
new file mode 100644
index 00000000000..e341606abe4
--- /dev/null
+++ b/apps/files_sharing/tests/encryptedsizepropagation.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_sharing\Tests;
+
+use OC\Files\View;
+use Test\Traits\EncryptionTrait;
+
+/**
+ * @group DB
+ */
+class EncryptedSizePropagation extends SizePropagation {
+ use EncryptionTrait;
+
+ protected function setupUser($name, $password = '') {
+ $this->createUser($name, $password);
+ $tmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
+ $this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
+ $this->setupForUser($name, $password);
+ $this->loginWithEncryption($name);
+ return new View('/' . $name . '/files');
+ }
+}
diff --git a/apps/files_sharing/tests/sizepropagation.php b/apps/files_sharing/tests/sizepropagation.php
index d4062e3a38c..c0f5696c16d 100644
--- a/apps/files_sharing/tests/sizepropagation.php
+++ b/apps/files_sharing/tests/sizepropagation.php
@@ -24,6 +24,8 @@
namespace OCA\Files_sharing\Tests;
use OC\Files\View;
+use Test\Traits\MountProviderTrait;
+use Test\Traits\UserTrait;
/**
* Class SizePropagation
@@ -33,13 +35,21 @@ use OC\Files\View;
* @package OCA\Files_sharing\Tests
*/
class SizePropagation extends TestCase {
+ use UserTrait;
+ use MountProviderTrait;
+
+ protected function setupUser($name, $password = '') {
+ $this->createUser($name, $password);
+ $tmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
+ $this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
+ $this->loginAsUser($name);
+ return new View('/' . $name . '/files');
+ }
public function testSizePropagationWhenOwnerChangesFile() {
- $this->loginHelper(self::TEST_FILES_SHARING_API_USER1);
- $recipientView = new View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
+ $recipientView = $this->setupUser(self::TEST_FILES_SHARING_API_USER1);
- $this->loginHelper(self::TEST_FILES_SHARING_API_USER2);
- $ownerView = new View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
+ $ownerView = $this->setupUser(self::TEST_FILES_SHARING_API_USER2);
$ownerView->mkdir('/sharedfolder/subfolder');
$ownerView->file_put_contents('/sharedfolder/subfolder/foo.txt', 'bar');
@@ -52,31 +62,29 @@ class SizePropagation extends TestCase {
);
$ownerRootInfo = $ownerView->getFileInfo('', false);
- $this->loginHelper(self::TEST_FILES_SHARING_API_USER1);
+ $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1);
$this->assertTrue($recipientView->file_exists('/sharedfolder/subfolder/foo.txt'));
$recipientRootInfo = $recipientView->getFileInfo('', false);
// when file changed as owner
- $this->loginHelper(self::TEST_FILES_SHARING_API_USER2);
+ $this->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
$ownerView->file_put_contents('/sharedfolder/subfolder/foo.txt', 'foobar');
// size of recipient's root stays the same
- $this->loginHelper(self::TEST_FILES_SHARING_API_USER1);
+ $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1);
$newRecipientRootInfo = $recipientView->getFileInfo('', false);
$this->assertEquals($recipientRootInfo->getSize(), $newRecipientRootInfo->getSize());
// size of owner's root increases
- $this->loginHelper(self::TEST_FILES_SHARING_API_USER2);
+ $this->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
$newOwnerRootInfo = $ownerView->getFileInfo('', false);
$this->assertEquals($ownerRootInfo->getSize() + 3, $newOwnerRootInfo->getSize());
}
public function testSizePropagationWhenRecipientChangesFile() {
- $this->loginHelper(self::TEST_FILES_SHARING_API_USER1);
- $recipientView = new View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
+ $recipientView = $this->setupUser(self::TEST_FILES_SHARING_API_USER1);
- $this->loginHelper(self::TEST_FILES_SHARING_API_USER2);
- $ownerView = new View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
+ $ownerView = $this->setupUser(self::TEST_FILES_SHARING_API_USER2);
$ownerView->mkdir('/sharedfolder/subfolder');
$ownerView->file_put_contents('/sharedfolder/subfolder/foo.txt', 'bar');
@@ -89,9 +97,10 @@ class SizePropagation extends TestCase {
);
$ownerRootInfo = $ownerView->getFileInfo('', false);
- $this->loginHelper(self::TEST_FILES_SHARING_API_USER1);
+ $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1);
$this->assertTrue($recipientView->file_exists('/sharedfolder/subfolder/foo.txt'));
$recipientRootInfo = $recipientView->getFileInfo('', false);
+ $recipientRootInfoWithMounts = $recipientView->getFileInfo('', true);
// when file changed as recipient
$recipientView->file_put_contents('/sharedfolder/subfolder/foo.txt', 'foobar');
@@ -100,8 +109,12 @@ class SizePropagation extends TestCase {
$newRecipientRootInfo = $recipientView->getFileInfo('', false);
$this->assertEquals($recipientRootInfo->getSize(), $newRecipientRootInfo->getSize());
+ // but the size including mountpoints increases
+ $newRecipientRootInfo = $recipientView->getFileInfo('', true);
+ $this->assertEquals($recipientRootInfoWithMounts->getSize() +3, $newRecipientRootInfo->getSize());
+
// size of owner's root increases
- $this->loginHelper(self::TEST_FILES_SHARING_API_USER2);
+ $this->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
$newOwnerRootInfo = $ownerView->getFileInfo('', false);
$this->assertEquals($ownerRootInfo->getSize() + 3, $newOwnerRootInfo->getSize());
}