Test fix

Author: tatevikg1

tests/Unit/Domain/Messaging/Service/Builder/MessageBuilderTest.php

@@ -4,8 +4,8 @@
 
 namespace PhpList\Core\Tests\Unit\Domain\Messaging\Service\Builder;
 
-use InvalidArgumentException;
 use PhpList\Core\Domain\Identity\Model\Administrator;
+use PhpList\Core\Domain\Messaging\Exception\InvalidContextTypeException;
 use PhpList\Core\Domain\Messaging\Model\Dto\CreateMessageDto;
 use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageContentDto;
 use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageFormatDto;
@@ -14,6 +14,8 @@
 use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageScheduleDto;
 use PhpList\Core\Domain\Messaging\Model\Dto\MessageContext;
 use PhpList\Core\Domain\Messaging\Model\Message;
+use PhpList\Core\Domain\Messaging\Model\Message\MessageContent;
+use PhpList\Core\Domain\Messaging\Model\Message\MessageSchedule;
 use PhpList\Core\Domain\Messaging\Repository\TemplateRepository;
 use PhpList\Core\Domain\Messaging\Service\Builder\MessageBuilder;
 use PhpList\Core\Domain\Messaging\Service\Builder\MessageContentBuilder;
@@ -40,11 +42,11 @@ protected function setUp(): void
         $this->optionsBuilder = $this->createMock(MessageOptionsBuilder::class);
 
         $this->builder = new MessageBuilder(
-            $templateRepository,
-            $this->formatBuilder,
-            $this->scheduleBuilder,
-            $this->contentBuilder,
-            $this->optionsBuilder
+            templateRepository: $templateRepository,
+            messageFormatBuilder: $this->formatBuilder,
+            messageScheduleBuilder: $this->scheduleBuilder,
+            messageContentBuilder: $this->contentBuilder,
+            messageOptionsBuilder: $this->optionsBuilder
         );
     }
 
@@ -92,12 +94,12 @@ private function mockBuildCalls(CreateMessageDto $createMessageDto): void
         $this->scheduleBuilder->expects($this->once())
             ->method('build')
             ->with($createMessageDto->schedule)
-            ->willReturn($this->createMock(\PhpList\Core\Domain\Messaging\Model\Message\MessageSchedule::class));
+            ->willReturn($this->createMock(MessageSchedule::class));
 
         $this->contentBuilder->expects($this->once())
             ->method('build')
             ->with($createMessageDto->content)
-            ->willReturn($this->createMock(\PhpList\Core\Domain\Messaging\Model\Message\MessageContent::class));
+            ->willReturn($this->createMock(MessageContent::class));
 
         $this->optionsBuilder->expects($this->once())
             ->method('build')
@@ -113,12 +115,12 @@ public function testBuildsNewMessage(): void
 
         $this->mockBuildCalls($request);
 
-        $this->builder->build($request, $context);
+        $this->builder->build(createMessageDto: $request, context: $context);
     }
 
     public function testThrowsExceptionOnInvalidContext(): void
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(InvalidContextTypeException::class);
 
         $this->builder->build($this->createMock(CreateMessageDto::class), new \stdClass());
     }
@@ -139,11 +141,11 @@ public function testUpdatesExistingMessage(): void
         $existingMessage
             ->expects($this->once())
             ->method('setSchedule')
-            ->with($this->isInstanceOf(\PhpList\Core\Domain\Messaging\Model\Message\MessageSchedule::class));
+            ->with($this->isInstanceOf(MessageSchedule::class));
         $existingMessage
             ->expects($this->once())
             ->method('setContent')
-            ->with($this->isInstanceOf(\PhpList\Core\Domain\Messaging\Model\Message\MessageContent::class));
+            ->with($this->isInstanceOf(MessageContent::class));
         $existingMessage
             ->expects($this->once())
             ->method('setOptions')

tests/Unit/Domain/Messaging/Service/Builder/MessageContentBuilderTest.php

@@ -4,7 +4,7 @@
 
 namespace PhpList\Core\Tests\Unit\Domain\Messaging\Service\Builder;
 
-use InvalidArgumentException;
+use PhpList\Core\Domain\Messaging\Exception\InvalidDtoTypeException;
 use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageContentDto;
 use PhpList\Core\Domain\Messaging\Service\Builder\MessageContentBuilder;
 use PHPUnit\Framework\TestCase;
@@ -37,7 +37,7 @@ public function testBuildsMessageContentSuccessfully(): void
 
     public function testThrowsExceptionOnInvalidDto(): void
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(InvalidDtoTypeException::class);
 
         $invalidDto = new \stdClass();
         $this->builder->build($invalidDto);

tests/Unit/Domain/Messaging/Service/Builder/MessageFormatBuilderTest.php

@@ -4,7 +4,7 @@
 
 namespace PhpList\Core\Tests\Unit\Domain\Messaging\Service\Builder;
 
-use InvalidArgumentException;
+use PhpList\Core\Domain\Messaging\Exception\InvalidDtoTypeException;
 use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageFormatDto;
 use PhpList\Core\Domain\Messaging\Service\Builder\MessageFormatBuilder;
 use PHPUnit\Framework\TestCase;
@@ -30,7 +30,7 @@ public function testBuildsMessageFormatSuccessfully(): void
 
     public function testThrowsExceptionOnInvalidDto(): void
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(InvalidDtoTypeException::class);
 
         $invalidDto = new \stdClass();
         $this->builder->build($invalidDto);

tests/Unit/Domain/Messaging/Service/Builder/MessageOptionsBuilderTest.php

@@ -4,7 +4,7 @@
 
 namespace PhpList\Core\Tests\Unit\Domain\Messaging\Service\Builder;
 
-use InvalidArgumentException;
+use PhpList\Core\Domain\Messaging\Exception\InvalidDtoTypeException;
 use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageOptionsDto;
 use PhpList\Core\Domain\Messaging\Service\Builder\MessageOptionsBuilder;
 use PHPUnit\Framework\TestCase;
@@ -37,7 +37,7 @@ public function testBuildsMessageOptionsSuccessfully(): void
 
     public function testThrowsExceptionOnInvalidDto(): void
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(InvalidDtoTypeException::class);
 
         $invalidDto = new \stdClass();
         $this->builder->build($invalidDto);

tests/Unit/Domain/Messaging/Service/Builder/MessageScheduleBuilderTest.php

@@ -5,7 +5,7 @@
 namespace PhpList\Core\Tests\Unit\Domain\Messaging\Service\Builder;
 
 use DateTime;
-use InvalidArgumentException;
+use PhpList\Core\Domain\Messaging\Exception\InvalidDtoTypeException;
 use PhpList\Core\Domain\Messaging\Model\Dto\Message\MessageScheduleDto;
 use PhpList\Core\Domain\Messaging\Service\Builder\MessageScheduleBuilder;
 use PHPUnit\Framework\TestCase;
@@ -40,7 +40,7 @@ public function testBuildsMessageScheduleSuccessfully(): void
 
     public function testThrowsExceptionOnInvalidDto(): void
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(InvalidDtoTypeException::class);
 
         $invalidDto = new \stdClass();
         $this->builder->build($invalidDto);