diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-04-21 09:35:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-21 09:35:01 +0200 |
| commit | e9b00f84b85e97283b83cf951f9bd262e627ae9a (patch) | |
| tree | bcc89a56e67397461a1afd54e0836315fd06e08a /apps/dav/tests | |
| parent | c4bd01456b7fc8e531af1e8cc37dbff4f1ca8578 (diff) | |
| parent | 73b6cd1061480078ec252c1e5e1d97ac48ea892a (diff) | |
| download | nextcloud-server-e9b00f84b85e97283b83cf951f9bd262e627ae9a.tar.gz nextcloud-server-e9b00f84b85e97283b83cf951f9bd262e627ae9a.zip | |
Merge pull request #4406 from nextcloud/fix-unit-test-problems
Fix unit test problems
Diffstat (limited to 'apps/dav/tests')
| -rw-r--r-- | apps/dav/tests/unit/CalDAV/CalendarTest.php | 8 | ||||
| -rw-r--r-- | apps/dav/tests/unit/CalDAV/PublicCalendarTest.php | 16 |
2 files changed, 17 insertions, 7 deletions
diff --git a/apps/dav/tests/unit/CalDAV/CalendarTest.php b/apps/dav/tests/unit/CalDAV/CalendarTest.php index b80d510356e..4ede886d31e 100644 --- a/apps/dav/tests/unit/CalDAV/CalendarTest.php +++ b/apps/dav/tests/unit/CalDAV/CalendarTest.php @@ -225,8 +225,8 @@ class CalendarTest extends TestCase { /** * @dataProvider providesConfidentialClassificationData - * @param $expectedChildren - * @param $isShared + * @param int $expectedChildren + * @param bool $isShared */ public function testPrivateClassification($expectedChildren, $isShared) { @@ -268,8 +268,8 @@ class CalendarTest extends TestCase { /** * @dataProvider providesConfidentialClassificationData - * @param $expectedChildren - * @param $isShared + * @param int $expectedChildren + * @param bool $isShared */ public function testConfidentialClassification($expectedChildren, $isShared) { $start = '20160609'; diff --git a/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php b/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php index 85a6a4c5614..6b2bf58d392 100644 --- a/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php +++ b/apps/dav/tests/unit/CalDAV/PublicCalendarTest.php @@ -28,7 +28,12 @@ use Sabre\VObject\Reader; class PublicCalendarTest extends CalendarTest { - public function testPrivateClassification() { + /** + * @dataProvider providesConfidentialClassificationData + * @param int $expectedChildren + * @param bool $isShared + */ + public function testPrivateClassification($expectedChildren, $isShared) { $calObject0 = ['uri' => 'event-0', 'classification' => CalDavBackend::CLASSIFICATION_PUBLIC]; $calObject1 = ['uri' => 'event-1', 'classification' => CalDavBackend::CLASSIFICATION_CONFIDENTIAL]; @@ -63,7 +68,12 @@ class PublicCalendarTest extends CalendarTest { $this->assertFalse($c->childExists('event-2')); } - public function testConfidentialClassification() { + /** + * @dataProvider providesConfidentialClassificationData + * @param int $expectedChildren + * @param bool $isShared + */ + public function testConfidentialClassification($expectedChildren, $isShared) { $start = '20160609'; $end = '20160610'; @@ -150,4 +160,4 @@ EOD; $this->assertArrayNotHasKey('DESCRIPTION', $event->VEVENT); $this->assertArrayNotHasKey('ORGANIZER', $event->VEVENT); } -}
\ No newline at end of file +} |