wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more robust test setup

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2016-09-20 15:27:40 +02:00
parent 7ce68ce6ac
commit 3845d4ec9a
No known key found for this signature in database
GPG key ID: 425003AC385454C5
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/files_sharing/tests/ApiTest.php
View file

@ -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('');
$tempStorage = new \OC\Files\Storage\Temporary(array());
$tempStorage->file_put_contents('test.txt', 'abcdef');
$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');
$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);

6
apps/files_sharing/tests/External/ManagerTest.php vendored
View file

@ -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);
}

3
apps/files_sharing/tests/TestCase.php
View file

@ -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";