mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #860 from nextcloud/fix_updatenotifcations_warnings 

Fix deprecated getMock warning
This commit is contained in:
Roeland Jago Douma 2016-08-16 14:50:31 +02:00 committed by GitHub
parent f7bc5ad43b 3b948f7694
commit d14c6ef78c
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/updatenotification/tests/Controller/AdminControllerTest.php
View File

@ -59,15 +59,15 @@ class AdminControllerTest extends TestCase {
public function setUp() { public function setUp() {
parent::setUp(); parent::setUp();
$this->request = $this->getMock('\\OCP\\IRequest'); $this->request = $this->getMockBuilder('\\OCP\\IRequest')->getMock();
$this->jobList = $this->getMock('\\OCP\\BackgroundJob\\IJobList'); $this->jobList = $this->getMockBuilder('\\OCP\\BackgroundJob\\IJobList')->getMock();
$this->secureRandom = $this->getMock('\\OCP\\Security\\ISecureRandom'); $this->secureRandom = $this->getMockBuilder('\\OCP\\Security\\ISecureRandom')->getMock();
$this->config = $this->getMock('\\OCP\\IConfig'); $this->config = $this->getMockBuilder('\\OCP\\IConfig')->getMock();
$this->timeFactory = $this->getMock('\\OCP\\AppFramework\\Utility\\ITimeFactory'); $this->timeFactory = $this->getMockBuilder('\\OCP\\AppFramework\\Utility\\ITimeFactory')->getMock();
$this->l10n = $this->getMock('\\OCP\\IL10N'); $this->l10n = $this->getMockBuilder('\\OCP\\IL10N')->getMock();
$this->updateChecker = $this->getMockBuilder('\\OCA\\UpdateNotification\\UpdateChecker') $this->updateChecker = $this->getMockBuilder('\\OCA\\UpdateNotification\\UpdateChecker')
->disableOriginalConstructor()->getMock(); ->disableOriginalConstructor()->getMock();
$this->dateTimeFormatter = $this->getMock('\\OCP\\IDateTimeFormatter'); $this->dateTimeFormatter = $this->getMockBuilder('\\OCP\\IDateTimeFormatter')->getMock();
$this->adminController = new AdminController( $this->adminController = new AdminController(
'updatenotification', 'updatenotification',

20
apps/updatenotification/tests/Notification/BackgroundJobTest.php
View File

@ -51,12 +51,12 @@ class BackgroundJobTest extends TestCase {
public function setUp() { public function setUp() {
parent::setUp(); parent::setUp();
$this->config = $this->getMock('OCP\IConfig'); $this->config = $this->getMockBuilder('OCP\IConfig')->getMock();
$this->notificationManager = $this->getMock('OCP\Notification\IManager'); $this->notificationManager = $this->getMockBuilder('OCP\Notification\IManager')->getMock();
$this->groupManager = $this->getMock('OCP\IGroupManager'); $this->groupManager = $this->getMockBuilder('OCP\IGroupManager')->getMock();
$this->appManager = $this->getMock('OCP\App\IAppManager'); $this->appManager = $this->getMockBuilder('OCP\App\IAppManager')->getMock();
$this->client = $this->getMock('OCP\Http\Client\IClientService'); $this->client = $this->getMockBuilder('OCP\Http\Client\IClientService')->getMock();
$this->urlGenerator = $this->getMock('OCP\IURLGenerator'); $this->urlGenerator = $this->getMockBuilder('OCP\IURLGenerator')->getMock();
} }
/** /**
@ -279,7 +279,7 @@ class BackgroundJobTest extends TestCase {
} }
if ($createNotification) { if ($createNotification) {
$notification = $this->getMock('OCP\Notification\INotification'); $notification = $this->getMockBuilder('OCP\Notification\INotification')->getMock();
$notification->expects($this->once()) $notification->expects($this->once())
->method('setApp') ->method('setApp')
->with('updatenotification') ->with('updatenotification')
@ -380,7 +380,7 @@ class BackgroundJobTest extends TestCase {
* @param string $version * @param string $version
*/ */
public function testDeleteOutdatedNotifications($app, $version) { public function testDeleteOutdatedNotifications($app, $version) {
$notification = $this->getMock('OCP\Notification\INotification'); $notification = $this->getMockBuilder('OCP\Notification\INotification')->getMock();
$notification->expects($this->once()) $notification->expects($this->once())
->method('setApp') ->method('setApp')
->with('updatenotification') ->with('updatenotification')
@ -408,7 +408,7 @@ class BackgroundJobTest extends TestCase {
protected function getUsers(array $userIds) { protected function getUsers(array $userIds) {
$users = []; $users = [];
foreach ($userIds as $uid) { foreach ($userIds as $uid) {
$user = $this->getMock('OCP\IUser'); $user = $this->getMockBuilder('OCP\IUser')->getMock();
$user->expects($this->any()) $user->expects($this->any())
->method('getUID') ->method('getUID')
->willReturn($uid); ->willReturn($uid);
@ -422,7 +422,7 @@ class BackgroundJobTest extends TestCase {
* @return \OCP\IGroup|\PHPUnit_Framework_MockObject_MockObject * @return \OCP\IGroup|\PHPUnit_Framework_MockObject_MockObject
*/ */
protected function getGroup($gid) { protected function getGroup($gid) {
$group = $this->getMock('OCP\IGroup'); $group = $this->getMockBuilder('OCP\IGroup')->getMock();
$group->expects($this->any()) $group->expects($this->any())
->method('getGID') ->method('getGID')
->willReturn($gid); ->willReturn($gid);

6
apps/updatenotification/tests/Notification/NotifierTest.php
View File

@ -38,8 +38,8 @@ class NotifierTest extends TestCase {
public function setUp() { public function setUp() {
parent::setUp(); parent::setUp();
$this->notificationManager = $this->getMock('OCP\Notification\IManager'); $this->notificationManager = $this->getMockBuilder('OCP\Notification\IManager')->getMock();
$this->l10nFactory = $this->getMock('OCP\L10n\IFactory'); $this->l10nFactory = $this->getMockBuilder('OCP\L10n\IFactory')->getMock();
} }
/** /**
@ -81,7 +81,7 @@ class NotifierTest extends TestCase {
public function testUpdateAlreadyInstalledCheck($versionNotification, $versionInstalled, $exception) { public function testUpdateAlreadyInstalledCheck($versionNotification, $versionInstalled, $exception) {
$notifier = $this->getNotifier(); $notifier = $this->getNotifier();
$notification = $this->getMock('OCP\Notification\INotification'); $notification = $this->getMockBuilder('OCP\Notification\INotification')->getMock();
$notification->expects($this->once()) $notification->expects($this->once())
->method('getObjectId') ->method('getObjectId')
->willReturn($versionNotification); ->willReturn($versionNotification);

4
apps/updatenotification/tests/ResetTokenBackgroundJobTest.php
View File

@ -37,8 +37,8 @@ class ResetTokenBackgroundJobTest extends TestCase {
public function setUp() { public function setUp() {
parent::setUp(); parent::setUp();
$this->config = $this->getMock('\\OCP\\IConfig'); $this->config = $this->getMockBuilder('\\OCP\\IConfig')->getMock();
$this->timeFactory = $this->getMock('\\OCP\\AppFramework\\Utility\\ITimeFactory'); $this->timeFactory = $this->getMockBuilder('\\OCP\\AppFramework\\Utility\\ITimeFactory')->getMock();
$this->resetTokenBackgroundJob = new ResetTokenBackgroundJob($this->config, $this->timeFactory); $this->resetTokenBackgroundJob = new ResetTokenBackgroundJob($this->config, $this->timeFactory);
} }