Uglify unit test to make them work on stable7

diff --git a/apps/files_sharing/tests/propagation.php b/apps/files_sharing/tests/propagation.php
index 3d5f9985afde8f8e923ca654d29a53b43a7604e4..cd7bf99c5a3c432228b7fcb1cd228297333328ae 100644 (file)
--- a/apps/files_sharing/tests/propagation.php
+++ b/apps/files_sharing/tests/propagation.php
@@ -20,17 +20,17 @@
  *
  */
 
-namespace OCA\Files_sharing\Tests;
-
 use OC\Files\View;
 
-class Propagation extends TestCase {
+require_once __DIR__ . '/base.php';
+
+class Test_Files_Sharing_Propagation extends Test_Files_Sharing_Base {
 
        public function testSizePropagationWhenOwnerChangesFile() {
-               $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1);
+               self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
                $recipientView = new View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
 
-               $this->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
+               self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
                $ownerView = new View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
                $ownerView->mkdir('/sharedfolder/subfolder');
                $ownerView->file_put_contents('/sharedfolder/subfolder/foo.txt', 'bar');
@@ -39,30 +39,30 @@ class Propagation extends TestCase {
                \OCP\Share::shareItem('folder', $sharedFolderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER1, 31);
                $ownerRootInfo = $ownerView->getFileInfo('', false);
 
-               $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1);
+               self::loginHelper(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->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
+               self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
                $ownerView->file_put_contents('/sharedfolder/subfolder/foo.txt', 'foobar');
 
                // size of recipient's root stays the same
-               $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1);
+               self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
                $newRecipientRootInfo = $recipientView->getFileInfo('', false);
                $this->assertEquals($recipientRootInfo->getSize(), $newRecipientRootInfo->getSize());
 
                // size of owner's root increases
-               $this->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
+               self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
                $newOwnerRootInfo = $ownerView->getFileInfo('', false);
                $this->assertEquals($ownerRootInfo->getSize() + 3, $newOwnerRootInfo->getSize());
        }
 
        public function testSizePropagationWhenRecipientChangesFile() {
-               $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1);
+               self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
                $recipientView = new View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
 
-               $this->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
+               self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
                $ownerView = new View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
                $ownerView->mkdir('/sharedfolder/subfolder');
                $ownerView->file_put_contents('/sharedfolder/subfolder/foo.txt', 'bar');
@@ -71,7 +71,7 @@ class Propagation extends TestCase {
                \OCP\Share::shareItem('folder', $sharedFolderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER1, 31);
                $ownerRootInfo = $ownerView->getFileInfo('', false);
 
-               $this->loginAsUser(self::TEST_FILES_SHARING_API_USER1);
+               self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
                $this->assertTrue($recipientView->file_exists('/sharedfolder/subfolder/foo.txt'));
                $recipientRootInfo = $recipientView->getFileInfo('', false);
 
@@ -83,7 +83,7 @@ class Propagation extends TestCase {
                $this->assertEquals($recipientRootInfo->getSize(), $newRecipientRootInfo->getSize());
 
                // size of owner's root increases
-               $this->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
+               self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
                $newOwnerRootInfo = $ownerView->getFileInfo('', false);
                $this->assertEquals($ownerRootInfo->getSize() + 3, $newOwnerRootInfo->getSize());
        }