diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-08-18 15:10:18 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2016-08-24 08:50:25 +0200 |
| commit | 53182fb780dbec9ac98f1e6f137201c6348a99cc (patch) | |
| tree | d62bb38050771d701c3ee7150efa3b09961d56a4 /apps/dav/tests/unit | |
| parent | 2f1b17d44a854221a4b3c461df80d0522ac3c8b5 (diff) | |
| download | nextcloud-server-53182fb780dbec9ac98f1e6f137201c6348a99cc.tar.gz nextcloud-server-53182fb780dbec9ac98f1e6f137201c6348a99cc.zip | |
Better displaynames for shared calendars
Diffstat (limited to 'apps/dav/tests/unit')
| -rw-r--r-- | apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php | 8 | ||||
| -rw-r--r-- | apps/dav/tests/unit/Migration/ClassificationTest.php | 11 |
2 files changed, 7 insertions, 12 deletions
diff --git a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php index 2b7424272e2..0e2e1b0ee51 100644 --- a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php @@ -49,6 +49,9 @@ abstract class AbstractCalDavBackendTest extends TestCase { /** @var Principal | \PHPUnit_Framework_MockObject_MockObject */ protected $principal; + /** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject */ + protected $userManager; + 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'; @@ -56,6 +59,9 @@ abstract class AbstractCalDavBackendTest extends TestCase { public function setUp() { parent::setUp(); + $this->userManager = $this->getMockBuilder('OCP\IUserManager') + ->disableOriginalConstructor() + ->getMock(); $this->principal = $this->getMockBuilder('OCA\DAV\Connector\Sabre\Principal') ->disableOriginalConstructor() ->setMethods(['getPrincipalByPath', 'getGroupMembership']) @@ -69,7 +75,7 @@ abstract class AbstractCalDavBackendTest extends TestCase { ->willReturn([self::UNIT_TEST_GROUP]); $db = \OC::$server->getDatabaseConnection(); - $this->backend = new CalDavBackend($db, $this->principal); + $this->backend = new CalDavBackend($db, $this->principal, $this->userManager); $this->tearDown(); } diff --git a/apps/dav/tests/unit/Migration/ClassificationTest.php b/apps/dav/tests/unit/Migration/ClassificationTest.php index f19702e9cb2..1960fa031e1 100644 --- a/apps/dav/tests/unit/Migration/ClassificationTest.php +++ b/apps/dav/tests/unit/Migration/ClassificationTest.php @@ -35,17 +35,6 @@ use OCP\IUser; * @package OCA\DAV\Tests\unit\DAV */ class ClassificationTest extends AbstractCalDavBackendTest { - - /** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\IUserManager */ - private $userManager; - - public function setUp() { - parent::setUp(); - - $this->userManager = $this->getMockBuilder('OCP\IUserManager') - ->disableOriginalConstructor()->getMock(); - } - public function test() { // setup data $calendarId = $this->createTestCalendar(); |