From cbdbae2f9a2b3d4abcd13a090643238475d591da Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Mon, 9 Apr 2018 09:58:44 -0600
Subject: [PATCH] Shuffle around some code for better extendability

---
 api/tests/Vfs/SharingBase.php | 36 ++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/api/tests/Vfs/SharingBase.php b/api/tests/Vfs/SharingBase.php
index 3567147502..945d25cd96 100644
--- a/api/tests/Vfs/SharingBase.php
+++ b/api/tests/Vfs/SharingBase.php
@@ -124,6 +124,10 @@ class SharingBase extends LoggedInTest
 		{
 			echo "\n".__METHOD__ . "($dir, $mode)\n";
 		}
+		if(substr($dir, -1) != '/')
+		{
+			$dir .= '/';
+		}
 		$this->files += $this->addFiles($dir);
 
 		$logged_in_files = array_map(
@@ -139,12 +143,7 @@ class SharingBase extends LoggedInTest
 
 		// Create and use link
 		$extra = array();
-		switch($mode)
-		{
-			case Sharing::WRITABLE:
-				$extra['share_writable'] = TRUE;
-				break;
-		}
+		$this->getShareExtra($dir, $mode, $extra);
 		$this->shareLink($dir, $mode, $extra);
 
 		$files = Vfs::find('/', static::VFS_OPTIONS);
@@ -164,6 +163,24 @@ class SharingBase extends LoggedInTest
 		}
 	}
 
+	/**
+	 * Get the extra information required to create a share link for the given
+	 * directory, with the given mode
+	 *
+	 * @param string $dir Share target
+	 * @param int $mode Share mode
+	 * @param Array $extra
+	 */
+	protected function getShareExtra($dir, $mode, &$extra)
+	{
+		switch($mode)
+		{
+			case Sharing::WRITABLE:
+				$extra['share_writable'] = TRUE;
+				break;
+		}
+	}
+
 	/**
 	 * Check the access permissions for one file/directory
 	 *
@@ -246,7 +263,12 @@ class SharingBase extends LoggedInTest
 
 		$backup = Vfs::$is_root;
 		Vfs::$is_root = true;
-		$url = Filesystem\StreamWrapper::SCHEME.'://default'.  realpath(__DIR__ . '/../fixtures/Vfs/filesystem_mount').
+		$fs_path = realpath(__DIR__ . '/../fixtures/Vfs/filesystem_mount');
+		if(!file_exists($fs_path))
+		{
+			$this->fail("Missing filesystem test directory 'api/tests/fixtures/Vfs/filesystem_mount'");
+		}
+		$url = Filesystem\StreamWrapper::SCHEME.'://default'. $fs_path.
 				'?user='.$GLOBALS['egw_info']['user']['account_id'].'&group=Default&mode=775';
 		$this->assertTrue(Vfs::mount($url,$path), "Unable to mount $url to $path");
 		Vfs::$is_root = $backup;