make tests compatible with hook based skeleton generation
This commit is contained in:
parent
ca0e3fdfea
commit
cb3a4d22b1
|
@ -461,7 +461,7 @@ class Helper {
|
|||
} else {
|
||||
\OC_Log::write(
|
||||
'Encryption library',
|
||||
'No share key found for user "' . $user . '" for file "' . $pathOld . '"',
|
||||
'No share key found for user "' . $user . '" for file "' . $fileName . '"',
|
||||
\OC_Log::WARN
|
||||
);
|
||||
}
|
||||
|
|
|
@ -102,6 +102,14 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
|
|||
public static function tearDownAfterClass() {
|
||||
// cleanup test user
|
||||
\OC_User::deleteUser(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
|
||||
|
||||
\OC_Hook::clear();
|
||||
\OC_FileProxy::clearProxies();
|
||||
|
||||
// Delete keys in /data/
|
||||
$view = new \OC\Files\View('/');
|
||||
$view->rmdir('public-keys');
|
||||
$view->rmdir('owncloud_private_key');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -20,18 +20,27 @@ class Test_Encryption_Helper extends \PHPUnit_Framework_TestCase {
|
|||
const TEST_ENCRYPTION_HELPER_USER1 = "test-helper-user1";
|
||||
const TEST_ENCRYPTION_HELPER_USER2 = "test-helper-user2";
|
||||
|
||||
public static function setUpBeforeClass() {
|
||||
public function setUp() {
|
||||
// create test user
|
||||
\Test_Encryption_Util::loginHelper(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER2, true);
|
||||
\Test_Encryption_Util::loginHelper(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER1, true);
|
||||
}
|
||||
|
||||
public static function tearDownAfterClass() {
|
||||
public function tearDown() {
|
||||
// cleanup test user
|
||||
\OC_User::deleteUser(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER1);
|
||||
\OC_User::deleteUser(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER2);
|
||||
}
|
||||
|
||||
public static function tearDownAfterClass() {
|
||||
|
||||
\OC_Hook::clear();
|
||||
\OC_FileProxy::clearProxies();
|
||||
|
||||
// Delete keys in /data/
|
||||
$view = new \OC\Files\View('/');
|
||||
$view->rmdir('public-keys');
|
||||
$view->rmdir('owncloud_private_key');
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -157,11 +166,6 @@ class Test_Encryption_Helper extends \PHPUnit_Framework_TestCase {
|
|||
$result
|
||||
);
|
||||
}
|
||||
|
||||
// clean up
|
||||
$rootView->unlink($baseDir);
|
||||
\Test_Encryption_Util::logoutHelper();
|
||||
\OC_User::deleteUser($userName);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -117,6 +117,14 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
|
|||
// cleanup test user
|
||||
\OC_User::deleteUser(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1);
|
||||
\OC_User::deleteUser(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2);
|
||||
|
||||
\OC_Hook::clear();
|
||||
\OC_FileProxy::clearProxies();
|
||||
|
||||
// Delete keys in /data/
|
||||
$view = new \OC\Files\View('/');
|
||||
$view->rmdir('public-keys');
|
||||
$view->rmdir('owncloud_private_key');
|
||||
}
|
||||
|
||||
function testDisableHook() {
|
||||
|
|
|
@ -98,6 +98,14 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
|
|||
if (self::$stateFilesTrashbin) {
|
||||
OC_App::enable('files_trashbin');
|
||||
}
|
||||
|
||||
\OC_Hook::clear();
|
||||
\OC_FileProxy::clearProxies();
|
||||
|
||||
// Delete keys in /data/
|
||||
$view = new \OC\Files\View('/');
|
||||
$view->rmdir('public-keys');
|
||||
$view->rmdir('owncloud_private_key');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -89,6 +89,14 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
|
|||
public static function tearDownAfterClass() {
|
||||
// cleanup test user
|
||||
\OC_User::deleteUser(\Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1);
|
||||
|
||||
\OC_Hook::clear();
|
||||
\OC_FileProxy::clearProxies();
|
||||
|
||||
// Delete keys in /data/
|
||||
$view = new \OC\Files\View('/');
|
||||
$view->rmdir('public-keys');
|
||||
$view->rmdir('owncloud_private_key');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -124,6 +124,14 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
|
|||
\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
|
||||
\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
|
||||
\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
|
||||
|
||||
\OC_Hook::clear();
|
||||
\OC_FileProxy::clearProxies();
|
||||
|
||||
// Delete keys in /data/
|
||||
$view = new \OC\Files\View('/');
|
||||
$view->rmdir('public-keys');
|
||||
$view->rmdir('owncloud_private_key');
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -96,6 +96,14 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
|
|||
public static function tearDownAfterClass() {
|
||||
// cleanup test user
|
||||
\OC_User::deleteUser(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1);
|
||||
|
||||
\OC_Hook::clear();
|
||||
\OC_FileProxy::clearProxies();
|
||||
|
||||
// Delete keys in /data/
|
||||
$view = new \OC\Files\View('/');
|
||||
$view->rmdir('public-keys');
|
||||
$view->rmdir('owncloud_private_key');
|
||||
}
|
||||
|
||||
function testStreamOptions() {
|
||||
|
|
|
@ -110,6 +110,14 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
|
|||
public static function tearDownAfterClass() {
|
||||
// cleanup test user
|
||||
\OC_User::deleteUser(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1);
|
||||
|
||||
\OC_Hook::clear();
|
||||
\OC_FileProxy::clearProxies();
|
||||
|
||||
// Delete keys in /data/
|
||||
$view = new \OC\Files\View('/');
|
||||
$view->rmdir('public-keys');
|
||||
$view->rmdir('owncloud_private_key');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -124,9 +124,18 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
|
|||
\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
|
||||
\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER2);
|
||||
\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
|
||||
|
||||
//cleanup groups
|
||||
\OC_Group::deleteGroup(self::TEST_ENCRYPTION_UTIL_GROUP1);
|
||||
\OC_Group::deleteGroup(self::TEST_ENCRYPTION_UTIL_GROUP2);
|
||||
|
||||
\OC_Hook::clear();
|
||||
\OC_FileProxy::clearProxies();
|
||||
|
||||
// Delete keys in /data/
|
||||
$view = new \OC\Files\View('/');
|
||||
$view->rmdir('public-keys');
|
||||
$view->rmdir('owncloud_private_key');
|
||||
}
|
||||
|
||||
public static function setupHooks() {
|
||||
|
|
|
@ -108,6 +108,14 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
|
|||
public static function tearDownAfterClass() {
|
||||
// cleanup test user
|
||||
\OC_User::deleteUser(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
|
||||
|
||||
\OC_Hook::clear();
|
||||
\OC_FileProxy::clearProxies();
|
||||
|
||||
// Delete keys in /data/
|
||||
$view = new \OC\Files\View('/');
|
||||
$view->rmdir('public-keys');
|
||||
$view->rmdir('owncloud_private_key');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -37,7 +37,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
|
|||
|
||||
const TEST_FILES_SHARING_API_GROUP1 = "test-share-group1";
|
||||
|
||||
public $stateFilesEncryption;
|
||||
public static $stateFilesEncryption;
|
||||
public $filename;
|
||||
public $data;
|
||||
/**
|
||||
|
@ -48,6 +48,13 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
|
|||
public $subfolder;
|
||||
|
||||
public static function setUpBeforeClass() {
|
||||
|
||||
// remember files_encryption state
|
||||
self::$stateFilesEncryption = \OC_App::isEnabled('files_encryption');
|
||||
|
||||
//we don't want to tests with app files_encryption enabled
|
||||
\OC_App::disable('files_encryption');
|
||||
|
||||
// reset backend
|
||||
\OC_User::clearBackends();
|
||||
\OC_User::useBackend('database');
|
||||
|
@ -70,29 +77,16 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
|
|||
|
||||
function setUp() {
|
||||
|
||||
$this->assertFalse(\OC_App::isEnabled('files_encryption'));
|
||||
|
||||
//login as user1
|
||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
|
||||
|
||||
$this->data = 'foobar';
|
||||
$this->view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
|
||||
// remember files_encryption state
|
||||
$this->stateFilesEncryption = \OC_App::isEnabled('files_encryption');
|
||||
|
||||
//we don't want to tests with app files_encryption enabled
|
||||
\OC_App::disable('files_encryption');
|
||||
|
||||
|
||||
$this->assertTrue(!\OC_App::isEnabled('files_encryption'));
|
||||
}
|
||||
|
||||
function tearDown() {
|
||||
// reset app files_encryption
|
||||
if ($this->stateFilesEncryption) {
|
||||
\OC_App::enable('files_encryption');
|
||||
} else {
|
||||
\OC_App::disable('files_encryption');
|
||||
}
|
||||
|
||||
$query = \OCP\DB::prepare('DELETE FROM `*PREFIX*share`');
|
||||
$query->execute();
|
||||
}
|
||||
|
@ -106,6 +100,13 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
|
|||
|
||||
// delete group
|
||||
\OC_Group::deleteGroup(self::TEST_FILES_SHARING_API_GROUP1);
|
||||
|
||||
// reset app files_encryption
|
||||
if (self::$stateFilesEncryption) {
|
||||
\OC_App::enable('files_encryption');
|
||||
} else {
|
||||
\OC_App::disable('files_encryption');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue