fix mock builder for old phpunit versions
This commit is contained in:
parent
fbb5768587
commit
dff108e97b
|
@ -39,8 +39,12 @@ class TokenControllerTest extends TestCase {
|
|||
parent::setUp();
|
||||
|
||||
$this->request = $this->getMock('\OCP\IRequest');
|
||||
$this->userManager = $this->getMockWithoutInvokingTheOriginalConstructor('\OC\User\Manager');
|
||||
$this->tokenProvider = $this->getMockWithoutInvokingTheOriginalConstructor('\OC\Authentication\Token\DefaultTokenProvider');
|
||||
$this->userManager = $this->getMockBuilder('\OC\User\Manager')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$this->tokenProvider = $this->getMockBuilder('\OC\Authentication\Token\DefaultTokenProvider')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$this->secureRandom = $this->getMock('\OCP\Security\ISecureRandom');
|
||||
|
||||
$this->tokenController = new TokenController('core', $this->request, $this->userManager, $this->tokenProvider,
|
||||
|
|
|
@ -34,7 +34,9 @@ class DefaultTokenCleanupJobTest extends TestCase {
|
|||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
$this->tokenProvider = $this->getMockWithoutInvokingTheOriginalConstructor('\OC\Authentication\Token\DefaultTokenProvider');
|
||||
$this->tokenProvider = $this->getMockBuilder('\OC\Authentication\Token\DefaultTokenProvider')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$this->overwriteService('\OC\Authentication\Token\DefaultTokenProvider', $this->tokenProvider);
|
||||
$this->job = new DefaultTokenCleanupJob();
|
||||
}
|
||||
|
|
|
@ -40,7 +40,9 @@ class DefaultTokenProviderTest extends TestCase {
|
|||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
$this->mapper = $this->getMockWithoutInvokingTheOriginalConstructor('\OC\Authentication\Token\DefaultTokenMapper');
|
||||
$this->mapper = $this->getMock('\OC\Authentication\Token\DefaultTokenMapper')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$this->crypto = $this->getMock('\OCP\Security\ICrypto');
|
||||
$this->config = $this->getMock('\OCP\IConfig');
|
||||
$this->logger = $this->getMock('\OCP\ILogger');
|
||||
|
@ -81,7 +83,9 @@ class DefaultTokenProviderTest extends TestCase {
|
|||
}
|
||||
|
||||
public function testUpdateToken() {
|
||||
$tk = $this->getMockWithoutInvokingTheOriginalConstructor('\OC\Authentication\Token\DefaultTokenProvider');
|
||||
$tk = $this->getMockBuilder('\OC\Authentication\Token\DefaultTokenProvider')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$tk->expects($this->once())
|
||||
->method('setLastActivity')
|
||||
->with(time());
|
||||
|
@ -94,7 +98,9 @@ class DefaultTokenProviderTest extends TestCase {
|
|||
|
||||
public function testGetPassword() {
|
||||
$token = 'token1234';
|
||||
$tk = $this->getMockWithoutInvokingTheOriginalConstructor('\OC\Authentication\Token\DefaultToken');
|
||||
$tk = $this->getMockBuilder('\OC\Authentication\Token\DefaultToken')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$tk->expects($this->once())
|
||||
->method('getPassword')
|
||||
->will($this->returnValue('someencryptedvalue'));
|
||||
|
|
Loading…
Reference in New Issue