From 67da65f83bb07b0fc3b83ec4a2c2c93292a1040a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 2 Mar 2017 12:27:59 +0100 Subject: [PATCH] Add a unit test for the broken case Signed-off-by: Joas Schilling --- .../unit/CalDAV/AbstractCalDavBackendTest.php | 3 ++- .../tests/unit/CalDAV/CalDavBackendTest.php | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php index d15be72c77b..ffdba9c5c8a 100644 --- a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php @@ -55,6 +55,7 @@ abstract class AbstractCalDavBackendTest extends TestCase { const UNIT_TEST_USER = 'principals/users/caldav-unit-test'; const UNIT_TEST_USER1 = 'principals/users/caldav-unit-test1'; const UNIT_TEST_GROUP = 'principals/groups/caldav-unit-test-group'; + const UNIT_TEST_GROUP2 = 'principals/groups/caldav-unit-test-group2'; public function setUp() { parent::setUp(); @@ -71,7 +72,7 @@ abstract class AbstractCalDavBackendTest extends TestCase { ]); $this->principal->expects($this->any())->method('getGroupMembership') ->withAnyParameters() - ->willReturn([self::UNIT_TEST_GROUP]); + ->willReturn([self::UNIT_TEST_GROUP, self::UNIT_TEST_GROUP2]); $db = \OC::$server->getDatabaseConnection(); $this->random = \OC::$server->getSecureRandom(); diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php index bd6c9f27886..fe40689e45d 100644 --- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php @@ -83,6 +83,26 @@ class CalDavBackendTest extends AbstractCalDavBackendTest { 'readOnly' => true ] ]], + [true, true, true, false, [ + [ + 'href' => 'principal:' . self::UNIT_TEST_GROUP, + 'readOnly' => true, + ], + [ + 'href' => 'principal:' . self::UNIT_TEST_GROUP2, + 'readOnly' => false, + ], + ]], + [true, true, true, true, [ + [ + 'href' => 'principal:' . self::UNIT_TEST_GROUP, + 'readOnly' => false, + ], + [ + 'href' => 'principal:' . self::UNIT_TEST_GROUP2, + 'readOnly' => true, + ], + ]], [true, false, false, false, [ [ 'href' => 'principal:' . self::UNIT_TEST_USER1, -- 2.39.5