[Pkg-owncloud-commits] [owncloud] 45/103: Do not make setupMounts() public just because of testing

[David Prévot]

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

taffit pushed a commit to annotated tag v8.0.4RC1
in repository owncloud.

commit a2af0aae5e556d603a16aea406f2d8d23f5c7508
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Wed Mar 11 11:10:43 2015 +0100

    Do not make setupMounts() public just because of testing
---
 apps/files_sharing/lib/external/manager.php   |  2 +-
 apps/files_sharing/tests/external/manager.php | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index cdd8fac..490e5e5 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -94,7 +94,7 @@ class Manager {
 		}
 	}
 
-	public function setupMounts() {
+	private function setupMounts() {
 		// don't setup server-to-server shares if the admin disabled it
 		if (\OCA\Files_Sharing\Helper::isIncomingServer2serverShareEnabled() === false) {
 			return false;
diff --git a/apps/files_sharing/tests/external/manager.php b/apps/files_sharing/tests/external/manager.php
index fa98e8a..dcb3dfb 100644
--- a/apps/files_sharing/tests/external/manager.php
+++ b/apps/files_sharing/tests/external/manager.php
@@ -73,19 +73,19 @@ class Manager extends TestCase {
 
 	public function testAddBasic() {
 		$this->instance->addShare('http://example.com', 'foo', 'bar', 'example', 'me', true);
-		$this->instance->setupMounts();
+		\Test_Helper::invokePrivate($this->instance, 'setupMounts');
 		$this->assertMount('/example');
 	}
 
 	public function testAddBasicEmptyPassword() {
 		$this->instance->addShare('http://example.com', 'foo', '', 'example', 'me', true);
-		$this->instance->setupMounts();
+		\Test_Helper::invokePrivate($this->instance, 'setupMounts');
 		$this->assertMount('/example');
 	}
 
 	public function testAddNotAcceptedShare() {
 		$this->instance->addShare('http://example.com', 'foo', 'bar', 'example', 'me', false);
-		$this->instance->setupMounts();
+		\Test_Helper::invokePrivate($this->instance, 'setupMounts');
 		$this->assertNotMount('/example');
 	}
 
@@ -95,7 +95,7 @@ class Manager extends TestCase {
 		$this->assertCount(1, $open);
 		$this->instance->acceptShare($open[0]['id']);
 		$this->assertEquals([], $this->instance->getOpenShares());
-		$this->instance->setupMounts();
+		\Test_Helper::invokePrivate($this->instance, 'setupMounts');
 		$this->assertMount('/example');
 	}
 
@@ -105,38 +105,38 @@ class Manager extends TestCase {
 		$this->assertCount(1, $open);
 		$this->instance->declineShare($open[0]['id']);
 		$this->assertEquals([], $this->instance->getOpenShares());
-		$this->instance->setupMounts();
+		\Test_Helper::invokePrivate($this->instance, 'setupMounts');
 		$this->assertNotMount('/example');
 	}
 
 	public function testSetMountPoint() {
 		$this->instance->addShare('http://example.com', 'foo', 'bar', 'example', 'me', true);
-		$this->instance->setupMounts();
+		\Test_Helper::invokePrivate($this->instance, 'setupMounts');
 		$this->assertMount('/example');
 		$this->instance->setMountPoint($this->getFullPath('/example'), $this->getFullPath('/renamed'));
 		$this->mountManager->clear();
-		$this->instance->setupMounts();
+		\Test_Helper::invokePrivate($this->instance, 'setupMounts');
 		$this->assertMount('/renamed');
 		$this->assertNotMount('/example');
 	}
 
 	public function testRemoveShare() {
 		$this->instance->addShare('http://example.com', 'foo', 'bar', 'example', 'me', true);
-		$this->instance->setupMounts();
+		\Test_Helper::invokePrivate($this->instance, 'setupMounts');
 		$this->assertMount('/example');
 		$this->instance->removeShare($this->getFullPath('/example'));
 		$this->mountManager->clear();
-		$this->instance->setupMounts();
+		\Test_Helper::invokePrivate($this->instance, 'setupMounts');
 		$this->assertNotMount('/example');
 	}
 
 	public function testRemoveShareForUser() {
 		$this->instance->addShare('http://example.com', 'foo', 'bar', 'example', 'me', true);
-		$this->instance->setupMounts();
+		\Test_Helper::invokePrivate($this->instance, 'setupMounts');
 		$this->assertMount('/example');
 		$this->instance->removeUserShares($this->uid);
 		$this->mountManager->clear();
-		$this->instance->setupMounts();
+		\Test_Helper::invokePrivate($this->instance, 'setupMounts');
 		$this->assertNotMount('/example');
 	}
 }

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