Fix unit test for verifying enforced expire date too far in the future
The test should fail if no exception was thrown, and no exception was thrown due to a missing configuration parameter. However, the use of "addToAssertionCount(1)" made the test pass even if no exception was thrown and, therefore, to silently fail. Now the missing configuration parameter was added and the test will fail if the expected exception is not thrown. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
parent
94648f1ecd
commit
42782ceeba
|
@ -852,6 +852,9 @@ class ManagerTest extends \Test\TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testValidateExpirationDateEnforceTooFarIntoFuture() {
|
public function testValidateExpirationDateEnforceTooFarIntoFuture() {
|
||||||
|
$this->expectException(\OCP\Share\Exceptions\GenericShareException::class);
|
||||||
|
$this->expectExceptionMessage('Can’t set expiration date more than 3 days in the future');
|
||||||
|
|
||||||
$future = new \DateTime();
|
$future = new \DateTime();
|
||||||
$future->add(new \DateInterval('P7D'));
|
$future->add(new \DateInterval('P7D'));
|
||||||
|
|
||||||
|
@ -862,16 +865,10 @@ class ManagerTest extends \Test\TestCase {
|
||||||
->willReturnMap([
|
->willReturnMap([
|
||||||
['core', 'shareapi_enforce_expire_date', 'no', 'yes'],
|
['core', 'shareapi_enforce_expire_date', 'no', 'yes'],
|
||||||
['core', 'shareapi_expire_after_n_days', '7', '3'],
|
['core', 'shareapi_expire_after_n_days', '7', '3'],
|
||||||
|
['core', 'shareapi_default_expire_date', 'no', 'yes'],
|
||||||
]);
|
]);
|
||||||
|
|
||||||
try {
|
self::invokePrivate($this->manager, 'validateExpirationDate', [$share]);
|
||||||
self::invokePrivate($this->manager, 'validateExpirationDate', [$share]);
|
|
||||||
$this->addToAssertionCount(1);
|
|
||||||
} catch (\OCP\Share\Exceptions\GenericShareException $e) {
|
|
||||||
$this->assertEquals('Cannot set expiration date more than 3 days in the future', $e->getMessage());
|
|
||||||
$this->assertEquals('Cannot set expiration date more than 3 days in the future', $e->getHint());
|
|
||||||
$this->assertEquals(404, $e->getCode());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testValidateExpirationDateEnforceValid() {
|
public function testValidateExpirationDateEnforceValid() {
|
||||||
|
|
Loading…
Reference in New Issue