@@ -1194,14 +1194,11 @@ class ApiTest extends TestCase { | |||
* Tests mounting a folder that is an external storage mount point. | |||
*/ | |||
public function testShareStorageMountPoint() { | |||
self::$tempStorage = new \OC\Files\Storage\Temporary(array()); | |||
self::$tempStorage->file_put_contents('test.txt', 'abcdef'); | |||
self::$tempStorage->getScanner()->scan(''); | |||
// needed because the sharing code sometimes switches the user internally and mounts the user's | |||
// storages. In our case the temp storage isn't mounted automatically, so doing it in the post hook | |||
// (similar to how ext storage works) | |||
\OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\OCA\Files_Sharing\Tests\ApiTest', 'initTestMountPointsHook'); | |||
$tempStorage = new \OC\Files\Storage\Temporary(array()); | |||
$tempStorage->file_put_contents('test.txt', 'abcdef'); | |||
$tempStorage->getScanner()->scan(''); | |||
$this->registerMount(self::TEST_FILES_SHARING_API_USER1, $tempStorage, self::TEST_FILES_SHARING_API_USER1 . '/files' . self::TEST_FOLDER_NAME); | |||
// logging in will auto-mount the temp storage for user1 as well | |||
self::loginHelper(self::TEST_FILES_SHARING_API_USER1); |
@@ -58,7 +58,7 @@ class ManagerTest extends TestCase { | |||
* @var \OCP\IUser | |||
*/ | |||
private $user; | |||
private $mountProvider; | |||
private $testMountProvider; | |||
protected function setUp() { | |||
parent::setUp(); | |||
@@ -82,13 +82,13 @@ class ManagerTest extends TestCase { | |||
$discoveryManager, | |||
$this->uid | |||
); | |||
$this->mountProvider = new MountProvider(\OC::$server->getDatabaseConnection(), function() { | |||
$this->testMountProvider = new MountProvider(\OC::$server->getDatabaseConnection(), function() { | |||
return $this->manager; | |||
}); | |||
} | |||
private function setupMounts() { | |||
$mounts = $this->mountProvider->getMountsForUser($this->user, new StorageFactory()); | |||
$mounts = $this->testMountProvider->getMountsForUser($this->user, new StorageFactory()); | |||
foreach ($mounts as $mount) { | |||
$this->mountManager->addMount($mount); | |||
} |
@@ -31,8 +31,10 @@ | |||
namespace OCA\Files_Sharing\Tests; | |||
use OC\Files\Cache\Scanner; | |||
use OC\Files\Filesystem; | |||
use OCA\Files_Sharing\AppInfo\Application; | |||
use Test\Traits\MountProviderTrait; | |||
/** | |||
* Class TestCase | |||
@@ -42,6 +44,7 @@ use OCA\Files_Sharing\AppInfo\Application; | |||
* Base class for sharing tests. | |||
*/ | |||
abstract class TestCase extends \Test\TestCase { | |||
use MountProviderTrait; | |||
const TEST_FILES_SHARING_API_USER1 = "test-share-user1"; | |||
const TEST_FILES_SHARING_API_USER2 = "test-share-user2"; |