sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix NODB tests etc 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
pull/3901/head
Roeland Jago Douma 2017-03-20 14:53:57 +07:00
parent c92b9ce2c4
commit 0fb5776133
No known key found for this signature in database
GPG Key ID: F941078878347C0C
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/lib/TestCase.php
Unescape Escape View File

@ -139,7 +139,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
if (is_null(self::$realDatabase)) {
self::$realDatabase = \OC::$server->getDatabaseConnection();
}
\OC::$server->registerService('DatabaseConnection', function () {
\OC::$server->registerService(IDBConnection::class, function () {
$this->fail('Your test case is not allowed to access the database.');
});
}
@ -158,7 +158,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
// restore database connection
if (!$this->IsDatabaseAccessAllowed()) {
\OC::$server->registerService('DatabaseConnection', function () {
\OC::$server->registerService(IDBConnection::class, function () {
return self::$realDatabase;
});
}
@ -171,7 +171,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
// restore database connection
if (!$this->IsDatabaseAccessAllowed()) {
\OC::$server->registerService('DatabaseConnection', function () {
\OC::$server->registerService(IDBConnection::class, function () {
return self::$realDatabase;
});
}
@ -259,7 +259,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
if (!self::$wasDatabaseAllowed && self::$realDatabase !== null) {
// in case an error is thrown in a test, PHPUnit jumps straight to tearDownAfterClass,
// so we need the database again
\OC::$server->registerService('DatabaseConnection', function () {
\OC::$server->registerService(IDBConnection::class, function () {
return self::$realDatabase;
});
}