rename proxy test

diff --git a/apps/files_sharing/tests/proxy.php b/apps/files_sharing/tests/proxy.php
deleted file mode 100644 (file)
index cfdc774..0000000
--- a/apps/files_sharing/tests/proxy.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * @author Björn Schießle <schiessle@owncloud.com>
- * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @copyright Copyright (c) 2015, 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/>
- *
- */
-
-
-use OCA\Files\Share;
-
-/**
- * Class Test_Files_Sharing_Proxy
- */
-class Test_Files_Sharing_Proxy extends OCA\Files_sharing\Tests\TestCase {
-
-       const TEST_FOLDER_NAME = '/folder_share_api_test';
-
-       private static $tempStorage;
-
-       protected function setUp() {
-               parent::setUp();
-
-               // load proxies
-               OC::$CLASSPATH['OCA\Files\Share\Proxy'] = 'files_sharing/lib/proxy.php';
-               OC_FileProxy::register(new OCA\Files\Share\Proxy());
-
-               $this->folder = self::TEST_FOLDER_NAME;
-               $this->subfolder  = '/subfolder_share_api_test';
-               $this->subsubfolder = '/subsubfolder_share_api_test';
-
-               $this->filename = '/share-api-test';
-
-               // save file with content
-               $this->view->mkdir($this->folder);
-               $this->view->mkdir($this->folder . $this->subfolder);
-               $this->view->mkdir($this->folder . $this->subfolder . $this->subsubfolder);
-               $this->view->file_put_contents($this->folder.$this->filename, $this->data);
-               $this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data);
-       }
-
-       protected function tearDown() {
-               $this->view->deleteAll($this->folder);
-
-               self::$tempStorage = null;
-
-               parent::tearDown();
-       }
-
-       /**
-        * @medium
-        */
-       function testpreUnlink() {
-
-               $fileInfo2 = \OC\Files\Filesystem::getFileInfo($this->folder);
-
-               $result = \OCP\Share::shareItem('folder', $fileInfo2->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31);
-               $this->assertTrue($result);
-
-               self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
-
-               // one folder should be shared with the user
-               $sharedFolders = \OCP\Share::getItemsSharedWith('folder');
-               $this->assertSame(1, count($sharedFolders));
-
-               // move shared folder to 'localDir'
-               \OC\Files\Filesystem::mkdir('localDir');
-               $result = \OC\Files\Filesystem::rename($this->folder, '/localDir/' . $this->folder);
-               $this->assertTrue($result);
-
-               \OC\Files\Filesystem::unlink('localDir');
-
-               self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
-
-               // after the parent directory was deleted the share should be unshared
-               $sharedFolders = \OCP\Share::getItemsSharedWith('folder');
-               $this->assertTrue(empty($sharedFolders));
-
-               self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
-
-               // the folder for the owner should still exists
-               $this->assertTrue(\OC\Files\Filesystem::file_exists($this->folder));
-       }
-}

diff --git a/apps/files_sharing/tests/unsharechildren.php b/apps/files_sharing/tests/unsharechildren.php
new file mode 100644 (file)
index 0000000..574f1dd
--- /dev/null
+++ b/apps/files_sharing/tests/unsharechildren.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files\Share;
+
+class UnshareChildren extends TestCase {
+
+       protected $subsubfolder;
+
+       const TEST_FOLDER_NAME = '/folder_share_api_test';
+
+       private static $tempStorage;
+
+       protected function setUp() {
+               parent::setUp();
+
+               // load proxies
+               \OC::$CLASSPATH['OCA\Files\Share\Proxy'] = 'files_sharing/lib/proxy.php';
+               \OC_FileProxy::register(new \OCA\Files\Share\Proxy());
+
+               $this->folder = self::TEST_FOLDER_NAME;
+               $this->subfolder  = '/subfolder_share_api_test';
+               $this->subsubfolder = '/subsubfolder_share_api_test';
+
+               $this->filename = '/share-api-test';
+
+               // save file with content
+               $this->view->mkdir($this->folder);
+               $this->view->mkdir($this->folder . $this->subfolder);
+               $this->view->mkdir($this->folder . $this->subfolder . $this->subsubfolder);
+               $this->view->file_put_contents($this->folder.$this->filename, $this->data);
+               $this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data);
+       }
+
+       protected function tearDown() {
+               $this->view->deleteAll($this->folder);
+
+               self::$tempStorage = null;
+
+               parent::tearDown();
+       }
+
+       /**
+        * @medium
+        */
+       function testUnshareChildren() {
+
+               $fileInfo2 = \OC\Files\Filesystem::getFileInfo($this->folder);
+
+               $result = \OCP\Share::shareItem('folder', $fileInfo2->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31);
+               $this->assertTrue($result);
+
+               self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+               // one folder should be shared with the user
+               $sharedFolders = \OCP\Share::getItemsSharedWith('folder');
+               $this->assertSame(1, count($sharedFolders));
+
+               // move shared folder to 'localDir'
+               \OC\Files\Filesystem::mkdir('localDir');
+               $result = \OC\Files\Filesystem::rename($this->folder, '/localDir/' . $this->folder);
+               $this->assertTrue($result);
+
+               \OC\Files\Filesystem::unlink('localDir');
+
+               self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+               // after the parent directory was deleted the share should be unshared
+               $sharedFolders = \OCP\Share::getItemsSharedWith('folder');
+               $this->assertTrue(empty($sharedFolders));
+
+               self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+
+               // the folder for the owner should still exists
+               $this->assertTrue(\OC\Files\Filesystem::file_exists($this->folder));
+       }
+}