Skip to content

Fix deprecated getMock warning #860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Aug 16, 2016
Merged

Fix deprecated getMock warning #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions apps/updatenotification/tests/Controller/AdminControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ class AdminControllerTest extends TestCase {
public function setUp() {
parent::setUp();

$this->request = $this->getMock('\\OCP\\IRequest');
$this->jobList = $this->getMock('\\OCP\\BackgroundJob\\IJobList');
$this->secureRandom = $this->getMock('\\OCP\\Security\\ISecureRandom');
$this->config = $this->getMock('\\OCP\\IConfig');
$this->timeFactory = $this->getMock('\\OCP\\AppFramework\\Utility\\ITimeFactory');
$this->l10n = $this->getMock('\\OCP\\IL10N');
$this->request = $this->getMockBuilder('\\OCP\\IRequest')->getMock();
$this->jobList = $this->getMockBuilder('\\OCP\\BackgroundJob\\IJobList')->getMock();
$this->secureRandom = $this->getMockBuilder('\\OCP\\Security\\ISecureRandom')->getMock();
$this->config = $this->getMockBuilder('\\OCP\\IConfig')->getMock();
$this->timeFactory = $this->getMockBuilder('\\OCP\\AppFramework\\Utility\\ITimeFactory')->getMock();
$this->l10n = $this->getMockBuilder('\\OCP\\IL10N')->getMock();
$this->updateChecker = $this->getMockBuilder('\\OCA\\UpdateNotification\\UpdateChecker')
->disableOriginalConstructor()->getMock();
$this->dateTimeFormatter = $this->getMock('\\OCP\\IDateTimeFormatter');
$this->dateTimeFormatter = $this->getMockBuilder('\\OCP\\IDateTimeFormatter')->getMock();

$this->adminController = new AdminController(
'updatenotification',
Expand Down
20 changes: 10 additions & 10 deletions apps/updatenotification/tests/Notification/BackgroundJobTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ class BackgroundJobTest extends TestCase {
public function setUp() {
parent::setUp();

$this->config = $this->getMock('OCP\IConfig');
$this->notificationManager = $this->getMock('OCP\Notification\IManager');
$this->groupManager = $this->getMock('OCP\IGroupManager');
$this->appManager = $this->getMock('OCP\App\IAppManager');
$this->client = $this->getMock('OCP\Http\Client\IClientService');
$this->urlGenerator = $this->getMock('OCP\IURLGenerator');
$this->config = $this->getMockBuilder('OCP\IConfig')->getMock();
$this->notificationManager = $this->getMockBuilder('OCP\Notification\IManager')->getMock();
$this->groupManager = $this->getMockBuilder('OCP\IGroupManager')->getMock();
$this->appManager = $this->getMockBuilder('OCP\App\IAppManager')->getMock();
$this->client = $this->getMockBuilder('OCP\Http\Client\IClientService')->getMock();
$this->urlGenerator = $this->getMockBuilder('OCP\IURLGenerator')->getMock();
}

/**
Expand Down Expand Up @@ -279,7 +279,7 @@ public function testCreateNotifications($app, $version, $url, $lastNotification,
}

if ($createNotification) {
$notification = $this->getMock('OCP\Notification\INotification');
$notification = $this->getMockBuilder('OCP\Notification\INotification')->getMock();
$notification->expects($this->once())
->method('setApp')
->with('updatenotification')
Expand Down Expand Up @@ -380,7 +380,7 @@ public function dataDeleteOutdatedNotifications() {
* @param string $version
*/
public function testDeleteOutdatedNotifications($app, $version) {
$notification = $this->getMock('OCP\Notification\INotification');
$notification = $this->getMockBuilder('OCP\Notification\INotification')->getMock();
$notification->expects($this->once())
->method('setApp')
->with('updatenotification')
Expand Down Expand Up @@ -408,7 +408,7 @@ public function testDeleteOutdatedNotifications($app, $version) {
protected function getUsers(array $userIds) {
$users = [];
foreach ($userIds as $uid) {
$user = $this->getMock('OCP\IUser');
$user = $this->getMockBuilder('OCP\IUser')->getMock();
$user->expects($this->any())
->method('getUID')
->willReturn($uid);
Expand All @@ -422,7 +422,7 @@ protected function getUsers(array $userIds) {
* @return \OCP\IGroup|\PHPUnit_Framework_MockObject_MockObject
*/
protected function getGroup($gid) {
$group = $this->getMock('OCP\IGroup');
$group = $this->getMockBuilder('OCP\IGroup')->getMock();
$group->expects($this->any())
->method('getGID')
->willReturn($gid);
Expand Down
6 changes: 3 additions & 3 deletions apps/updatenotification/tests/Notification/NotifierTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class NotifierTest extends TestCase {
public function setUp() {
parent::setUp();

$this->notificationManager = $this->getMock('OCP\Notification\IManager');
$this->l10nFactory = $this->getMock('OCP\L10n\IFactory');
$this->notificationManager = $this->getMockBuilder('OCP\Notification\IManager')->getMock();
$this->l10nFactory = $this->getMockBuilder('OCP\L10n\IFactory')->getMock();
}

/**
Expand Down Expand Up @@ -81,7 +81,7 @@ public function dataUpdateAlreadyInstalledCheck() {
public function testUpdateAlreadyInstalledCheck($versionNotification, $versionInstalled, $exception) {
$notifier = $this->getNotifier();

$notification = $this->getMock('OCP\Notification\INotification');
$notification = $this->getMockBuilder('OCP\Notification\INotification')->getMock();
$notification->expects($this->once())
->method('getObjectId')
->willReturn($versionNotification);
Expand Down
4 changes: 2 additions & 2 deletions apps/updatenotification/tests/ResetTokenBackgroundJobTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ class ResetTokenBackgroundJobTest extends TestCase {

public function setUp() {
parent::setUp();
$this->config = $this->getMock('\\OCP\\IConfig');
$this->timeFactory = $this->getMock('\\OCP\\AppFramework\\Utility\\ITimeFactory');
$this->config = $this->getMockBuilder('\\OCP\\IConfig')->getMock();
$this->timeFactory = $this->getMockBuilder('\\OCP\\AppFramework\\Utility\\ITimeFactory')->getMock();
$this->resetTokenBackgroundJob = new ResetTokenBackgroundJob($this->config, $this->timeFactory);
}

Expand Down