From 8f1fff40e8c2026d9dd9e7fcbef6c0f6a532fece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= <danxuliu@gmail.com>
Date: Wed, 11 Nov 2020 20:50:23 +0100
Subject: [PATCH] Fix unit test for verifying enforced expire date too far in
the future
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
tests/lib/Share20/ManagerTest.php | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php
index f351412c958..aaeceff0997 100644
--- a/tests/lib/Share20/ManagerTest.php
+++ b/tests/lib/Share20/ManagerTest.php
@@ -855,6 +855,9 @@ class ManagerTest extends \Test\TestCase {
}
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->add(new \DateInterval('P7D'));
@@ -865,16 +868,10 @@ class ManagerTest extends \Test\TestCase {
->willReturnMap([
['core', 'shareapi_enforce_expire_date', 'no', 'yes'],
['core', 'shareapi_expire_after_n_days', '7', '3'],
+ ['core', 'shareapi_default_expire_date', 'no', 'yes'],
]);
- try {
- 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());
- }
+ self::invokePrivate($this->manager, 'validateExpirationDate', [$share]);
}
public function testValidateExpirationDateEnforceValid() {
--
GitLab