Merge pull request #282 from nextcloud/fix-tests
Fix unit test compatibility issues with phpunit 5.2+
This commit is contained in:
commit
756b0c05b6
|
@ -449,16 +449,6 @@ class CommentsPlugin extends \Test\TestCase {
|
|||
->with('users', 'alice', 'files', '42')
|
||||
->will($this->returnValue($comment));
|
||||
|
||||
$this->commentsManager->expects($this->any())
|
||||
->method('setMessage')
|
||||
->with('')
|
||||
->will($this->throwException(new \InvalidArgumentException()));
|
||||
|
||||
$this->commentsManager->expects($this->any())
|
||||
->method('setVerb')
|
||||
->with('')
|
||||
->will($this->throwException(new \InvalidArgumentException()));
|
||||
|
||||
$this->userSession->expects($this->once())
|
||||
->method('getUser')
|
||||
->will($this->returnValue($user));
|
||||
|
|
|
@ -84,32 +84,37 @@ class FilesPlugin extends \Test\TestCase {
|
|||
|
||||
/**
|
||||
* @param string $class
|
||||
* @param bool $hasAllMethods
|
||||
* @return \PHPUnit_Framework_MockObject_MockObject|\Sabre\DAV\IFile
|
||||
*/
|
||||
private function createTestNode($class) {
|
||||
private function createTestNode($class, $hasAllMethods = true)
|
||||
{
|
||||
$node = $this->getMockBuilder($class)
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$node->expects($this->any())
|
||||
->method('getId')
|
||||
->will($this->returnValue(123));
|
||||
|
||||
$this->tree->expects($this->any())
|
||||
->method('getNodeForPath')
|
||||
->with('/dummypath')
|
||||
->will($this->returnValue($node));
|
||||
|
||||
$node->expects($this->any())
|
||||
->method('getFileId')
|
||||
->will($this->returnValue('00000123instanceid'));
|
||||
$node->expects($this->any())
|
||||
->method('getInternalFileId')
|
||||
->will($this->returnValue('123'));
|
||||
$node->expects($this->any())
|
||||
->method('getEtag')
|
||||
->will($this->returnValue('"abc"'));
|
||||
$node->expects($this->any())
|
||||
->method('getDavPermissions')
|
||||
->will($this->returnValue('DWCKMSR'));
|
||||
if ($hasAllMethods) {
|
||||
$node->expects($this->any())
|
||||
->method('getId')
|
||||
->will($this->returnValue(123));
|
||||
$node->expects($this->any())
|
||||
->method('getFileId')
|
||||
->will($this->returnValue('00000123instanceid'));
|
||||
$node->expects($this->any())
|
||||
->method('getInternalFileId')
|
||||
->will($this->returnValue('123'));
|
||||
$node->expects($this->any())
|
||||
->method('getEtag')
|
||||
->will($this->returnValue('"abc"'));
|
||||
$node->expects($this->any())
|
||||
->method('getDavPermissions')
|
||||
->will($this->returnValue('DWCKMSR'));
|
||||
}
|
||||
|
||||
return $node;
|
||||
}
|
||||
|
@ -169,7 +174,7 @@ class FilesPlugin extends \Test\TestCase {
|
|||
}
|
||||
|
||||
public function testGetPropertiesForFileHome() {
|
||||
$node = $this->createTestNode('\OCA\DAV\Files\FilesHome');
|
||||
$node = $this->createTestNode('\OCA\DAV\Files\FilesHome', false);
|
||||
|
||||
$propFind = new \Sabre\DAV\PropFind(
|
||||
'/dummyPath',
|
||||
|
@ -190,9 +195,9 @@ class FilesPlugin extends \Test\TestCase {
|
|||
->disableOriginalConstructor()->getMock();
|
||||
$user->expects($this->never())->method('getUID');
|
||||
$user->expects($this->never())->method('getDisplayName');
|
||||
$node->expects($this->never())->method('getDirectDownload');
|
||||
$node->expects($this->never())->method('getOwner');
|
||||
$node->expects($this->never())->method('getSize');
|
||||
// Method does not exist: $node->expects($this->never())->method('getDirectDownload');
|
||||
// Method does not exist: $node->expects($this->never())->method('getOwner');
|
||||
// Method does not exist: $node->expects($this->never())->method('getSize');
|
||||
|
||||
$this->plugin->handleGetProperties(
|
||||
$propFind,
|
||||
|
@ -285,8 +290,7 @@ class FilesPlugin extends \Test\TestCase {
|
|||
0
|
||||
);
|
||||
|
||||
$node->expects($this->never())
|
||||
->method('getDirectDownload');
|
||||
// Method does not exist: $node->expects($this->never())->method('getDirectDownload');
|
||||
$node->expects($this->once())
|
||||
->method('getSize')
|
||||
->will($this->returnValue(1025));
|
||||
|
|
|
@ -27,6 +27,11 @@ namespace OCA\Encryption\Tests;
|
|||
use OCA\Encryption\Migration;
|
||||
use OCP\ILogger;
|
||||
|
||||
/**
|
||||
* Class MigrationTest
|
||||
* @package OCA\Encryption\Tests
|
||||
* @group DB
|
||||
*/
|
||||
class MigrationTest extends \Test\TestCase {
|
||||
|
||||
const TEST_ENCRYPTION_MIGRATION_USER1='test_encryption_user1';
|
||||
|
@ -39,7 +44,7 @@ class MigrationTest extends \Test\TestCase {
|
|||
private $recovery_key_id = 'recovery_key_id';
|
||||
private $moduleId;
|
||||
|
||||
/** @var PHPUnit_Framework_MockObject_MockObject | ILogger */
|
||||
/** @var \PHPUnit_Framework_MockObject_MockObject | ILogger */
|
||||
private $logger;
|
||||
|
||||
public static function setUpBeforeClass() {
|
||||
|
@ -512,12 +517,9 @@ class MigrationTest extends \Test\TestCase {
|
|||
*/
|
||||
public function testGetTargetDir($user, $keyPath, $filename, $trash, $systemMounts, $expected) {
|
||||
|
||||
$updater = $this->getMockBuilder('\OC\Files\Cache\Updater')
|
||||
->disableOriginalConstructor()->getMock();
|
||||
$view = $this->getMockBuilder('\OC\Files\View')
|
||||
->disableOriginalConstructor()->getMock();
|
||||
$view->expects($this->any())->method('file_exists')->willReturn(true);
|
||||
$view->expects($this->any())->method('getUpdater')->willReturn($updater);
|
||||
|
||||
|
||||
$m = $this->getMockBuilder('OCA\Encryption\Migration')
|
||||
|
|
|
@ -142,9 +142,6 @@ class EncryptionTest extends TestCase {
|
|||
$this->cryptMock->expects($this->any())
|
||||
->method('multiKeyEncrypt')
|
||||
->willReturn(true);
|
||||
$this->cryptMock->expects($this->any())
|
||||
->method('setAllFileKeys')
|
||||
->willReturn(true);
|
||||
|
||||
$this->instance->end('/foo/bar');
|
||||
}
|
||||
|
|
|
@ -668,7 +668,7 @@ class Share20OCSTest extends \Test\TestCase {
|
|||
$user = $this->getMock('\OCP\IUser');
|
||||
$this->userManager->method('userExists')->with('validUser')->willReturn(true);
|
||||
|
||||
$share->method('setPath')->with($path);
|
||||
$share->method('setNode')->with($path);
|
||||
$share->method('setPermissions')
|
||||
->with(
|
||||
\OCP\Constants::PERMISSION_ALL &
|
||||
|
@ -773,7 +773,7 @@ class Share20OCSTest extends \Test\TestCase {
|
|||
->method('allowGroupSharing')
|
||||
->willReturn(true);
|
||||
|
||||
$share->method('setPath')->with($path);
|
||||
$share->method('setNode')->with($path);
|
||||
$share->method('setPermissions')->with(\OCP\Constants::PERMISSION_ALL);
|
||||
$share->method('setShareType')->with(\OCP\Share::SHARE_TYPE_GROUP);
|
||||
$share->method('setSharedWith')->with('validGroup');
|
||||
|
@ -822,7 +822,7 @@ class Share20OCSTest extends \Test\TestCase {
|
|||
->method('allowGroupSharing')
|
||||
->willReturn(false);
|
||||
|
||||
$share->method('setPath')->with($path);
|
||||
$share->method('setNode')->with($path);
|
||||
|
||||
$expected = new \OC_OCS_Result(null, 404, 'group sharing is disabled by the administrator');
|
||||
$result = $this->ocs->createShare();
|
||||
|
|
|
@ -85,10 +85,6 @@ class ShareControllerTest extends \Test\TestCase {
|
|||
$this->userManager = $this->getMock('\OCP\IUserManager');
|
||||
$this->federatedShareProvider = $this->getMockBuilder('OCA\FederatedFileSharing\FederatedShareProvider')
|
||||
->disableOriginalConstructor()->getMock();
|
||||
$this->federatedShareProvider->expects($this->any())
|
||||
->method('isOutgoingServer2serverShareEnabled')->willReturn(true);
|
||||
$this->federatedShareProvider->expects($this->any())
|
||||
->method('isIncomingServer2serverShareEnabled')->willReturn(true);
|
||||
|
||||
$this->shareController = new \OCA\Files_Sharing\Controllers\ShareController(
|
||||
$this->appName,
|
||||
|
@ -476,4 +472,4 @@ class ShareControllerTest extends \Test\TestCase {
|
|||
$this->assertEquals($expectedResponse, $response);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -93,7 +93,7 @@ class AvatarControllerTest extends \Test\TestCase {
|
|||
$this->container['UserSession']->method('getUser')->willReturn($this->userMock);
|
||||
|
||||
$this->avatarFile = $this->getMock('OCP\Files\File');
|
||||
$this->avatarFile->method('getContnet')->willReturn('image data');
|
||||
$this->avatarFile->method('getContent')->willReturn('image data');
|
||||
$this->avatarFile->method('getMimeType')->willReturn('image type');
|
||||
$this->avatarFile->method('getEtag')->willReturn('my etag');
|
||||
}
|
||||
|
|
|
@ -236,7 +236,9 @@ class MapperTest extends MapperTestUtility {
|
|||
$entity->resetUpdatedFields();
|
||||
|
||||
$this->db->expects($this->never())
|
||||
->method('prepareQuery');
|
||||
->method('prepare');
|
||||
$this->db->expects($this->never())
|
||||
->method('prepare');
|
||||
|
||||
$this->mapper->update($entity);
|
||||
}
|
||||
|
|
|
@ -517,6 +517,7 @@ class NotificationTest extends TestCase {
|
|||
->setMethods([
|
||||
'isValidCommon',
|
||||
'getSubject',
|
||||
'getParsedSubject',
|
||||
])
|
||||
->getMock();
|
||||
|
||||
|
@ -547,6 +548,7 @@ class NotificationTest extends TestCase {
|
|||
$notification = $this->getMockBuilder('\OC\Notification\Notification')
|
||||
->setMethods([
|
||||
'isValidCommon',
|
||||
'getSubject',
|
||||
'getParsedSubject',
|
||||
])
|
||||
->getMock();
|
||||
|
|
|
@ -21,6 +21,11 @@
|
|||
|
||||
namespace Test\Preview;
|
||||
|
||||
/**
|
||||
* Class Movie
|
||||
* @package Test\Preview
|
||||
* @group DB
|
||||
*/
|
||||
class Movie extends Provider {
|
||||
|
||||
public function setUp() {
|
||||
|
|
|
@ -21,6 +21,11 @@
|
|||
|
||||
namespace Test\Preview;
|
||||
|
||||
/**
|
||||
* Class Office
|
||||
* @package Test\Preview
|
||||
* @group DB
|
||||
*/
|
||||
class Office extends Provider {
|
||||
|
||||
public function setUp() {
|
||||
|
|
|
@ -590,7 +590,7 @@ class ManagerTest extends \Test\TestCase {
|
|||
$share->method('getShareType')->willReturn($type);
|
||||
$share->method('getSharedWith')->willReturn($sharedWith);
|
||||
$share->method('getSharedBy')->willReturn($sharedBy);
|
||||
$share->method('getSharedOwner')->willReturn($shareOwner);
|
||||
$share->method('getShareOwner')->willReturn($shareOwner);
|
||||
$share->method('getNode')->willReturn($path);
|
||||
$share->method('getPermissions')->willReturn($permissions);
|
||||
$share->method('getExpirationDate')->willReturn($expireDate);
|
||||
|
|
Loading…
Reference in New Issue