[Pkg-owncloud-commits] [owncloud] 12/78: Uglify unit test to make them work on stable7

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit b62d20f2ee48f9d120bf1435eb9d5449c4389489
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Fri Mar 13 11:36:31 2015 +0100

    Uglify unit test to make them work on stable7
---
 apps/files_sharing/tests/propagation.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/apps/files_sharing/tests/propagation.php b/apps/files_sharing/tests/propagation.php
index 3d5f998..cd7bf99 100644
--- 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());
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git