mirror of
https://github.com/nextcloud/server.git
synced 2026-05-28 04:32:30 -04:00
fix(tests): Remove Encryption disabling in ViewTest to avoid side effects
Adapt tests a bit to make them pass with Encryption wrapper registered Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
parent
38f341c179
commit
21233b7e17
1 changed files with 6 additions and 10 deletions
|
|
@ -111,12 +111,6 @@ class ViewTest extends \Test\TestCase {
|
|||
protected function setUp(): void {
|
||||
parent::setUp();
|
||||
\OC_Hook::clear();
|
||||
/* Disable encryption, this is not what we want to test */
|
||||
$encryptionManager = Server::get(\OCP\Encryption\IManager::class);
|
||||
$encryptionModules = $encryptionManager->getEncryptionModules();
|
||||
foreach (array_keys($encryptionModules) as $encryptionModuleId) {
|
||||
$encryptionManager->unregisterEncryptionModule($encryptionModuleId);
|
||||
}
|
||||
|
||||
Server::get(IUserManager::class)->clearBackends();
|
||||
Server::get(IUserManager::class)->registerBackend(new \Test\Util\User\Dummy());
|
||||
|
|
@ -524,10 +518,10 @@ class ViewTest extends \Test\TestCase {
|
|||
}
|
||||
|
||||
public function moveBetweenStorages($storage1, $storage2) {
|
||||
Filesystem::mount($storage1, [], '/');
|
||||
Filesystem::mount($storage2, [], '/substorage');
|
||||
Filesystem::mount($storage1, [], '/' . $this->user . '/');
|
||||
Filesystem::mount($storage2, [], '/' . $this->user . '/substorage');
|
||||
|
||||
$rootView = new View('');
|
||||
$rootView = new View('/' . $this->user);
|
||||
$rootView->rename('foo.txt', 'substorage/folder/foo.txt');
|
||||
$this->assertFalse($rootView->file_exists('foo.txt'));
|
||||
$this->assertTrue($rootView->file_exists('substorage/folder/foo.txt'));
|
||||
|
|
@ -947,14 +941,16 @@ class ViewTest extends \Test\TestCase {
|
|||
$storage = new Temporary([]);
|
||||
$scanner = $storage->getScanner();
|
||||
Filesystem::mount($storage, [], '/test/');
|
||||
$storage->file_put_contents('test.part', 'foobar');
|
||||
$sizeWritten = $storage->file_put_contents('test.part', 'foobar');
|
||||
$scanner->scan('');
|
||||
$view = new View('/test');
|
||||
$info = $view->getFileInfo('test.part');
|
||||
|
||||
$this->assertInstanceOf('\OCP\Files\FileInfo', $info);
|
||||
$this->assertNull($info->getId());
|
||||
$this->assertEquals(6, $sizeWritten);
|
||||
$this->assertEquals(6, $info->getSize());
|
||||
$this->assertEquals('foobar', $view->file_get_contents('test.part'));
|
||||
}
|
||||
|
||||
public static function absolutePathProvider(): array {
|
||||
|
|
|
|||
Loading…
Reference in a new issue