diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2016-09-07 20:24:06 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2016-09-07 20:42:38 +0200 |
| commit | 80c519fe89857cfead7344025f2123e3b69665a8 (patch) | |
| tree | 67aef1d1c9cec3e63a22fc14e863fc606e9438b0 /tests | |
| parent | 65409f53274e6dbbfdcac1726546b9fd32c99677 (diff) | |
| download | nextcloud-server-80c519fe89857cfead7344025f2123e3b69665a8.tar.gz nextcloud-server-80c519fe89857cfead7344025f2123e3b69665a8.zip | |
Fix getMock Share
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/Share/MailNotificationsTest.php | 9 | ||||
| -rw-r--r-- | tests/lib/Share20/ShareTest.php | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tests/lib/Share/MailNotificationsTest.php b/tests/lib/Share/MailNotificationsTest.php index 0c951d11f88..d56efe57c9d 100644 --- a/tests/lib/Share/MailNotificationsTest.php +++ b/tests/lib/Share/MailNotificationsTest.php @@ -60,7 +60,7 @@ class MailNotificationsTest extends \Test\TestCase { ->disableOriginalConstructor()->getMock(); $this->user = $this->getMockBuilder('\OCP\IUser') ->disableOriginalConstructor()->getMock(); - $this->urlGenerator = $this->getMock('\OCP\IURLGenerator'); + $this->urlGenerator = $this->createMock(IURLGenerator::class); $this->l10n->expects($this->any()) ->method('t') @@ -212,14 +212,17 @@ class MailNotificationsTest extends \Test\TestCase { $this->setupMailerMock('TestUser shared »welcome.txt« with you', ['recipient@owncloud.com' => 'Recipient'], false); /** @var MailNotifications | \PHPUnit_Framework_MockObject_MockObject $mailNotifications */ - $mailNotifications = $this->getMock('OC\Share\MailNotifications',['getItemSharedWithUser'], [ + $mailNotifications = $this->getMockBuilder(MailNotifications::class) + ->setMethods(['getItemSharedWithUser']) + ->setConstructorArgs([ $this->user, $this->l10n, $this->mailer, $this->logger, $this->defaults, $this->urlGenerator - ]); + ]) + ->getMock(); $mailNotifications->method('getItemSharedWithUser') ->withAnyParameters() diff --git a/tests/lib/Share20/ShareTest.php b/tests/lib/Share20/ShareTest.php index 91bd2fe84b6..fbdf8e5c15b 100644 --- a/tests/lib/Share20/ShareTest.php +++ b/tests/lib/Share20/ShareTest.php @@ -21,6 +21,7 @@ namespace Test\Share20; use OCP\Files\IRootFolder; +use OCP\IUserManager; /** * Class ShareTest @@ -35,8 +36,8 @@ class ShareTest extends \Test\TestCase { protected $share; public function setUp() { - $this->rootFolder = $this->getMock('\OCP\Files\IRootFolder'); - $this->userManager = $this->getMock('OCP\IUserManager'); + $this->rootFolder = $this->createMock(IRootFolder::class); + $this->userManager = $this->createMock(IUserManager::class); $this->share = new \OC\Share20\Share($this->rootFolder, $this->userManager); } |