diff options
author | Joas Schilling <coding@schilljs.com> | 2018-10-10 11:17:56 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2018-10-10 13:42:20 +0300 |
commit | 78cc4171ee410660771bccc479a64e8d50139c24 (patch) | |
tree | f4fff61ac0edd5fbd3bca265130fe1d90375858e /apps/files_versions/tests | |
parent | 840dd4b39c4dbcc5518f1e64ee9795085e76caad (diff) |
Fix mock of ITimeFactory
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/files_versions/tests')
-rw-r--r-- | apps/files_versions/tests/ExpirationTest.php | 53 |
1 files changed, 12 insertions, 41 deletions
diff --git a/apps/files_versions/tests/ExpirationTest.php b/apps/files_versions/tests/ExpirationTest.php index 8cd288d75cc..a7c34b7ac70 100644 --- a/apps/files_versions/tests/ExpirationTest.php +++ b/apps/files_versions/tests/ExpirationTest.php @@ -25,7 +25,9 @@ namespace OCA\Files_Versions\Tests; use \OCA\Files_Versions\Expiration; +use OCP\AppFramework\Utility\ITimeFactory; use OCP\IConfig; +use PHPUnit\Framework\MockObject\MockObject; class ExpirationTest extends \Test\TestCase { const SECONDS_PER_DAY = 86400; //60*60*24 @@ -151,58 +153,27 @@ class ExpirationTest extends \Test\TestCase { } /** - * * @param int $time - * @return \OCP\AppFramework\Utility\ITimeFactory + * @return ITimeFactory|MockObject */ private function getMockedTimeFactory($time){ - $mockedTimeFactory = $this->getMockBuilder('\OCP\AppFramework\Utility\ITimeFactory') - ->disableOriginalConstructor() - ->setMethods(['getTime']) - ->getMock() - ; - $mockedTimeFactory->expects($this->any())->method('getTime')->will( - $this->returnValue($time) - ); + $mockedTimeFactory = $this->createMock(ITimeFactory::class); + $mockedTimeFactory->expects($this->any()) + ->method('getTime') + ->willReturn($time); return $mockedTimeFactory; } /** - * * @param string $returnValue - * @return \OCP\IConfig + * @return IConfig|MockObject */ private function getMockedConfig($returnValue){ - $mockedConfig = $this->getMockBuilder(IConfig::class) - ->disableOriginalConstructor() - ->setMethods( - [ - 'setSystemValues', - 'setSystemValue', - 'getSystemValue', - 'getFilteredSystemValue', - 'deleteSystemValue', - 'getAppKeys', - 'setAppValue', - 'getAppValue', - 'deleteAppValue', - 'deleteAppValues', - 'setUserValue', - 'getUserValue', - 'getUserValueForUsers', - 'getUserKeys', - 'deleteUserValue', - 'deleteAllUserValues', - 'deleteAppFromAllUsers', - 'getUsersForUserValue' - ] - ) - ->getMock() - ; - $mockedConfig->expects($this->any())->method('getSystemValue')->will( - $this->returnValue($returnValue) - ); + $mockedConfig = $this->createMock(IConfig::class); + $mockedConfig->expects($this->any()) + ->method('getSystemValue') + ->willReturn($returnValue); return $mockedConfig; } |