diff options
| author | Roeland Jago Douma <rullzer@owncloud.com> | 2016-01-11 20:29:48 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <rullzer@owncloud.com> | 2016-01-11 20:29:48 +0100 |
| commit | 07fd3889b1e7752131dc0bc746abec7646c89d01 (patch) | |
| tree | 65ce673433c82224f763aec573fd87f07db8c275 /tests | |
| parent | 876fb83ddcf7ae6c1b63e7d7a1636893c52284b6 (diff) | |
| download | nextcloud-server-07fd3889b1e7752131dc0bc746abec7646c89d01.tar.gz nextcloud-server-07fd3889b1e7752131dc0bc746abec7646c89d01.zip | |
Fix unit tests
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/core/lostpassword/controller/lostcontrollertest.php | 10 | ||||
| -rw-r--r-- | tests/lib/appframework/http/RequestTest.php | 9 |
2 files changed, 1 insertions, 18 deletions
diff --git a/tests/core/lostpassword/controller/lostcontrollertest.php b/tests/core/lostpassword/controller/lostcontrollertest.php index eb0447f278b..0843d82da3f 100644 --- a/tests/core/lostpassword/controller/lostcontrollertest.php +++ b/tests/core/lostpassword/controller/lostcontrollertest.php @@ -167,7 +167,6 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase { } public function testEmailSuccessful() { - $randomToken = $this->secureRandom; $this->secureRandom ->expects($this->once()) ->method('generate') @@ -187,10 +186,6 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase { ->expects($this->once()) ->method('getTime') ->will($this->returnValue(12348)); - $this->secureRandom - ->expects($this->once()) - ->method('getMediumStrengthGenerator') - ->will($this->returnValue($randomToken)); $this->config ->expects($this->once()) ->method('setUserValue') @@ -233,7 +228,6 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase { } public function testEmailCantSendException() { - $randomToken = $this->secureRandom; $this->secureRandom ->expects($this->once()) ->method('generate') @@ -249,10 +243,6 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase { ->method('get') ->with('ExistingUser') ->willReturn($this->existingUser); - $this->secureRandom - ->expects($this->once()) - ->method('getMediumStrengthGenerator') - ->will($this->returnValue($randomToken)); $this->config ->expects($this->once()) ->method('setUserValue') diff --git a/tests/lib/appframework/http/RequestTest.php b/tests/lib/appframework/http/RequestTest.php index 32603d0da59..ab79eb498fa 100644 --- a/tests/lib/appframework/http/RequestTest.php +++ b/tests/lib/appframework/http/RequestTest.php @@ -352,18 +352,11 @@ class RequestTest extends \Test\TestCase { } public function testGetIdWithoutModUnique() { - $lowRandomSource = $this->getMockBuilder('\OCP\Security\ISecureRandom') - ->disableOriginalConstructor()->getMock(); - $lowRandomSource->expects($this->once()) + $this->secureRandom->expects($this->once()) ->method('generate') ->with('20') ->will($this->returnValue('GeneratedByOwnCloudItself')); - $this->secureRandom - ->expects($this->once()) - ->method('getLowStrengthGenerator') - ->will($this->returnValue($lowRandomSource)); - $request = new Request( [], $this->secureRandom, |