fixup! Use recurrence instance to build iMip email

Author: miaulalala

apps/dav/tests/unit/CalDAV/Schedule/IMipServiceTest.php

@@ -41,6 +41,7 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VEvent;
+use Sabre\VObject\Property\ICalendar\DateTime;
 use Test\TestCase;
 
 class IMipServiceTest extends TestCase
@@ -171,30 +172,57 @@ public function testBuildBodyDataUpdate(): void
 		$this->assertEquals($expected, $actual);
 	}
 
-//	public function testGenerateWhenStringHourlyEvent(): void {
+	public function testGenerateWhenStringHourlyEvent(): void {
+		$vCalendar = new VCalendar();
+		$vevent = new VEvent($vCalendar, 'two', [
+			'UID' => 'uid-1234',
+			'SEQUENCE' => 1,
+			'LAST-MODIFIED' => 456789,
+			'SUMMARY' => 'Elevenses',
+			'TZID' => 'Europe/Vienna',
+			'DTSTART' => (new \DateTime('2016-01-01 08:00:00'))->setTimezone(new \DateTimeZone('Europe/Vienna')),
+			'DTEND' => (new \DateTime('2016-01-01 09:00:00'))->setTimezone(new \DateTimeZone('Europe/Vienna')),
+		]);
+
+		$this->l10n->expects(self::exactly(3))
+			->method('l')
+			->withConsecutive(
+				['weekdayName', (new \DateTime('2016-01-01 08:00:00'))->setTimezone(new \DateTimeZone('Europe/Vienna')), ['width' => 'abbreviated']],
+				['datetime', (new \DateTime('2016-01-01 08:00:00'))->setTimezone(new \DateTimeZone('Europe/Vienna')), ['width' => 'medium|short']],
+				['time', (new \DateTime('2016-01-01 09:00:00'))->setTimezone(new \DateTimeZone('Europe/Vienna')), ['width' => 'short']]
+			)->willReturnOnConsecutiveCalls(
+				'Fr.',
+				'01.01. 08:00',
+				'09:00'
+			);
+
+		$expected = 'Fr., 01.01. 08:00 - 09:00 (Europe/Vienna)';
+		$actual = $this->service->generateWhenString($vevent);
+		$this->assertEquals($expected, $actual);
+	}
+
+//	public function testGenerateWhenStringAllDayEvent(): void {
 //
 //		$vCalendar = new VCalendar();
 //		$vevent = new VEvent($vCalendar, 'two', [
 //			'UID' => 'uid-1234',
 //			'SEQUENCE' => 1,
 //			'LAST-MODIFIED' => 456789,
 //			'SUMMARY' => 'Elevenses',
-//			'TZID' => 'Europe/Vienna'
+//			'TZID' => 'Europe/Vienna',
+//			'DTSTART' => new \DateTime('2016-01-01'),
+//			'DTEND' => new \DateTime('2016-01-02'),
 //		]);
-//		$start = (new DateTime($vevent,'start', null))->setValue('2016-01-01 08:00:00');
-//		$end = new DateTime($vevent,'end', '2016-01-01 09:00:00');
-//		$vevent->add($start);
-//		$vevent->add($end);
 //		$this->l10n->expects(self::exactly(3))
 //			->method('l')
 //			->withConsecutive(
-//				['weekdayName', $start->getDateTime(), ['width' => 'abbreviated']],
-//				['datetime', $start->getDateTime(), ['width' => 'medium|short']],
-//				['time', $end->getDateTime(), ['width' => 'medium|short']]
+//				['weekdayName', new \DateTime('2016-01-01'), ['width' => 'abbreviated']],
+//				['datetime', new \DateTime('2016-01-01'), ['width' => 'medium|short']],
+//				['time', new \DateTime('2016-01-01 09:00:00'), ['width' => 'short']]
 //			)->willReturnOnConsecutiveCalls(
-//				['Fr.'],
-//				['01.01. 08:00'],
-//				['09:00']
+//				'Fr.',
+//				'01.01. 08:00',
+//				'09:00'
 //			);
 //		// Fr., 06.01.2023, 11:00
 //		// 12:00