2525use OCA \Mail \Service \MailManager ;
2626use OCA \Mail \Util \ServerVersion ;
2727use OCP \Calendar \IManager ;
28+ use OCP \ServerVersion as OCPServerVersion ;
2829use PHPUnit \Framework \MockObject \MockObject ;
2930use Psr \Log \LoggerInterface ;
3031
@@ -50,6 +51,8 @@ class IMipServiceTest extends TestCase {
5051
5152 private ServerVersion |MockObject $ serverVersion ;
5253
54+ private OCPServerVersion $ OCPServerVersion ;
55+
5356 protected function setUp (): void {
5457 parent ::setUp ();
5558
@@ -60,6 +63,7 @@ protected function setUp(): void {
6063 $ this ->mailManager = $ this ->createMock (MailManager::class);
6164 $ this ->messageMapper = $ this ->createMock (MessageMapper::class);
6265 $ this ->serverVersion = $ this ->createMock (ServerVersion::class);
66+ $ this ->OCPServerVersion = new OCPServerVersion ();
6367
6468 $ this ->service = new IMipService (
6569 $ this ->accountService ,
@@ -432,6 +436,10 @@ public function testIsCancel(): void {
432436 }
433437
434438 public function testIsRequestServerVersion33 (): void {
439+ if ($ this ->OCPServerVersion ->getMajorVersion () < 33 ) {
440+ $ this ->markTestSkipped ('Requires Nextcloud 33 or higher ' );
441+ }
442+
435443 $ message = new Message ();
436444 $ message ->setImipMessage (true );
437445 $ message ->setUid (1 );
@@ -494,6 +502,10 @@ public function testIsRequestServerVersion33(): void {
494502 }
495503
496504 public function testIsReplyServerVersion33 (): void {
505+ if ($ this ->OCPServerVersion ->getMajorVersion () < 33 ) {
506+ $ this ->markTestSkipped ('Requires Nextcloud 33 or higher ' );
507+ }
508+
497509 $ message = new Message ();
498510 $ message ->setImipMessage (true );
499511 $ message ->setUid (1 );
@@ -556,6 +568,10 @@ public function testIsReplyServerVersion33(): void {
556568 }
557569
558570 public function testIsCancelServerVersion33 (): void {
571+ if ($ this ->OCPServerVersion ->getMajorVersion () < 33 ) {
572+ $ this ->markTestSkipped ('Requires Nextcloud 33 or higher ' );
573+ }
574+
559575 $ message = new Message ();
560576 $ message ->setImipMessage (true );
561577 $ message ->setUid (1 );
@@ -588,7 +604,7 @@ public function testIsCancelServerVersion33(): void {
588604 ->willReturn ([$ imapMessage ]);
589605 $ this ->serverVersion ->expects (self ::once ())
590606 ->method ('getMajorVersion ' )
591- ->willReturn (32 );
607+ ->willReturn (33 );
592608 $ imapMessage ->expects (self ::once ())
593609 ->method ('getUid ' )
594610 ->willReturn (1 );
0 commit comments