Simplify all ObjectMothers

CodelyTV · Nov 13, 2020 · e0b66b1 · e0b66b1
1 parent f3eb51d
commit e0b66b1
Show file tree

Hide file tree

Showing 37 changed files with 141 additions and 210 deletions.
diff --git a/src/Shared/Domain/ValueObject/Enum.php b/src/Shared/Domain/ValueObject/Enum.php
@@ -48,7 +48,7 @@ public static function randomValue()
         return self::values()[array_rand(self::values())];
     }
 
-    public static function random(): self
+    public static function random(): static
     {
         return new static(self::randomValue());
     }

diff --git a/tests/Backoffice/Auth/Application/Authenticate/AuthenticateUserCommandHandlerTest.php b/tests/Backoffice/Auth/Application/Authenticate/AuthenticateUserCommandHandlerTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
     /** @test */
     public function it_should_authenticate_a_valid_user(): void
     {
-        $command  = AuthenticateUserCommandMother::random();
+        $command  = AuthenticateUserCommandMother::create();
         $authUser = AuthUserMother::fromCommand($command);
 
         $this->shouldSearch($authUser->username(), $authUser);
@@ -39,7 +39,7 @@ public function it_should_throw_an_exception_when_the_user_does_not_exist(): voi
     {
         $this->expectException(InvalidAuthUsername::class);
 
-        $command  = AuthenticateUserCommandMother::random();
+        $command  = AuthenticateUserCommandMother::create();
         $username = AuthUsernameMother::create($command->username());
 
         $this->shouldSearch($username);
@@ -52,8 +52,8 @@ public function it_should_throw_an_exception_when_the_password_does_not_math():
     {
         $this->expectException(InvalidAuthCredentials::class);
 
-        $command  = AuthenticateUserCommandMother::random();
-        $authUser = AuthUserMother::withUsername(AuthUsernameMother::create($command->username()));
+        $command  = AuthenticateUserCommandMother::create();
+        $authUser = AuthUserMother::create(username: AuthUsernameMother::create($command->username()));
 
         $this->shouldSearch($authUser->username(), $authUser);
 

diff --git a/tests/Backoffice/Auth/Application/Authenticate/AuthenticateUserCommandMother.php b/tests/Backoffice/Auth/Application/Authenticate/AuthenticateUserCommandMother.php
@@ -12,13 +12,13 @@
 
 final class AuthenticateUserCommandMother
 {
-    public static function create(AuthUsername $username, AuthPassword $password): AuthenticateUserCommand
-    {
-        return new AuthenticateUserCommand($username->value(), $password->value());
-    }
-
-    public static function random(): AuthenticateUserCommand
-    {
-        return self::create(AuthUsernameMother::random(), AuthPasswordMother::random());
+    public static function create(
+        ?AuthUsername $username = null,
+        ?AuthPassword $password = null
+    ): AuthenticateUserCommand {
+        return new AuthenticateUserCommand(
+            $username?->value() ?? AuthUsernameMother::create()->value(),
+            $password?->value() ?? AuthPasswordMother::create()->value()
+        );
     }
 }
diff --git a/tests/Backoffice/Auth/Domain/AuthPasswordMother.php b/tests/Backoffice/Auth/Domain/AuthPasswordMother.php
@@ -9,13 +9,8 @@
 
 final class AuthPasswordMother
 {
-    public static function create(string $value): AuthPassword
+    public static function create(?string $value = null): AuthPassword
     {
-        return new AuthPassword($value);
-    }
-
-    public static function random(): AuthPassword
-    {
-        return self::create(UuidMother::random());
+        return new AuthPassword($value ?? UuidMother::create());
     }
 }
diff --git a/tests/Backoffice/Auth/Domain/AuthUserMother.php b/tests/Backoffice/Auth/Domain/AuthUserMother.php
@@ -11,9 +11,9 @@
 
 final class AuthUserMother
 {
-    public static function create(AuthUsername $username, AuthPassword $password): AuthUser
+    public static function create(?AuthUsername $username = null, ?AuthPassword $password = null): AuthUser
     {
-        return new AuthUser($username, $password);
+        return new AuthUser($username ?? AuthUsernameMother::create(), $password ?? AuthPasswordMother::create());
     }
 
     public static function fromCommand(AuthenticateUserCommand $command): AuthUser
@@ -23,9 +23,4 @@ public static function fromCommand(AuthenticateUserCommand $command): AuthUser
             AuthPasswordMother::create($command->password())
         );
     }
-
-    public static function withUsername(AuthUsername $username): AuthUser
-    {
-        return self::create($username, AuthPasswordMother::random());
-    }
 }
diff --git a/tests/Backoffice/Auth/Domain/AuthUsernameMother.php b/tests/Backoffice/Auth/Domain/AuthUsernameMother.php
@@ -9,13 +9,8 @@
 
 final class AuthUsernameMother
 {
-    public static function create(string $value): AuthUsername
+    public static function create(?string $value = null): AuthUsername
     {
-        return new AuthUsername($value);
-    }
-
-    public static function random(): AuthUsername
-    {
-        return self::create(WordMother::random());
+        return new AuthUsername($value ?? WordMother::create());
     }
 }
diff --git a/tests/Backoffice/Courses/Domain/BackofficeCourseMother.php b/tests/Backoffice/Courses/Domain/BackofficeCourseMother.php
@@ -14,18 +14,9 @@ final class BackofficeCourseMother
     public static function create(?string $id = null, ?string $name = null, ?string $duration = null): BackofficeCourse
     {
         return new BackofficeCourse(
-            $id ?? CourseIdMother::random()->value(),
-            $name ?? CourseNameMother::random()->value(),
-            $duration ?? CourseDurationMother::random()->value()
-        );
-    }
-
-    public static function random(): BackofficeCourse
-    {
-        return self::create(
-            CourseIdMother::random()->value(),
-            CourseNameMother::random()->value(),
-            CourseDurationMother::random()->value()
+            $id ?? CourseIdMother::create()->value(),
+            $name ?? CourseNameMother::create()->value(),
+            $duration ?? CourseDurationMother::create()->value()
         );
     }
 }
diff --git a/...office/Courses/Infrastructure/Persistence/ElasticsearchBackofficeCourseRepositoryTest.php b/...office/Courses/Infrastructure/Persistence/ElasticsearchBackofficeCourseRepositoryTest.php
@@ -14,14 +14,14 @@ final class ElasticsearchBackofficeCourseRepositoryTest extends BackofficeCourse
     /** @test */
     public function it_should_save_a_valid_course(): void
     {
-        $this->elasticRepository()->save(BackofficeCourseMother::random());
+        $this->elasticRepository()->save(BackofficeCourseMother::create());
     }
 
     /** @test */
     public function it_should_search_all_existing_courses(): void
     {
-        $existingCourse        = BackofficeCourseMother::random();
-        $anotherExistingCourse = BackofficeCourseMother::random();
+        $existingCourse        = BackofficeCourseMother::create();
+        $anotherExistingCourse = BackofficeCourseMother::create();
         $existingCourses       = [$existingCourse, $anotherExistingCourse];
 
         $this->elasticRepository()->save($existingCourse);
@@ -33,8 +33,8 @@ public function it_should_search_all_existing_courses(): void
     /** @test */
     public function it_should_search_all_existing_courses_with_an_empty_criteria(): void
     {
-        $existingCourse        = BackofficeCourseMother::random();
-        $anotherExistingCourse = BackofficeCourseMother::random();
+        $existingCourse        = BackofficeCourseMother::create();
+        $anotherExistingCourse = BackofficeCourseMother::create();
         $existingCourses       = [$existingCourse, $anotherExistingCourse];
 
         $this->elasticRepository()->save($existingCourse);

diff --git a/tests/Backoffice/Courses/Infrastructure/Persistence/MySqlBackofficeCourseRepositoryTest.php b/tests/Backoffice/Courses/Infrastructure/Persistence/MySqlBackofficeCourseRepositoryTest.php
@@ -14,14 +14,14 @@ final class MySqlBackofficeCourseRepositoryTest extends BackofficeCoursesModuleI
     /** @test */
     public function it_should_save_a_valid_course(): void
     {
-        $this->mySqlRepository()->save(BackofficeCourseMother::random());
+        $this->mySqlRepository()->save(BackofficeCourseMother::create());
     }
 
     /** @test */
     public function it_should_search_all_existing_courses(): void
     {
-        $existingCourse        = BackofficeCourseMother::random();
-        $anotherExistingCourse = BackofficeCourseMother::random();
+        $existingCourse        = BackofficeCourseMother::create();
+        $anotherExistingCourse = BackofficeCourseMother::create();
         $existingCourses       = [$existingCourse, $anotherExistingCourse];
 
         $this->mySqlRepository()->save($existingCourse);
@@ -33,8 +33,8 @@ public function it_should_search_all_existing_courses(): void
     /** @test */
     public function it_should_search_all_existing_courses_with_an_empty_criteria(): void
     {
-        $existingCourse        = BackofficeCourseMother::random();
-        $anotherExistingCourse = BackofficeCourseMother::random();
+        $existingCourse        = BackofficeCourseMother::create();
+        $anotherExistingCourse = BackofficeCourseMother::create();
         $existingCourses       = [$existingCourse, $anotherExistingCourse];
 
         $this->mySqlRepository()->save($existingCourse);

diff --git a/tests/Mooc/Courses/Application/Create/CreateCourseCommandHandlerTest.php b/tests/Mooc/Courses/Application/Create/CreateCourseCommandHandlerTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     /** @test */
     public function it_should_create_a_valid_course(): void
     {
-        $command = CreateCourseCommandMother::random();
+        $command = CreateCourseCommandMother::create();
 
         $course      = CourseMother::fromRequest($command);
         $domainEvent = CourseCreatedDomainEventMother::fromCourse($course);

diff --git a/tests/Mooc/Courses/Application/Create/CreateCourseCommandMother.php b/tests/Mooc/Courses/Application/Create/CreateCourseCommandMother.php
@@ -14,13 +14,15 @@
 
 final class CreateCourseCommandMother
 {
-    public static function create(CourseId $id, CourseName $name, CourseDuration $duration): CreateCourseCommand
-    {
-        return new CreateCourseCommand($id->value(), $name->value(), $duration->value());
-    }
-
-    public static function random(): CreateCourseCommand
-    {
-        return self::create(CourseIdMother::random(), CourseNameMother::random(), CourseDurationMother::random());
+    public static function create(
+        ?CourseId $id = null,
+        ?CourseName $name = null,
+        ?CourseDuration $duration = null
+    ): CreateCourseCommand {
+        return new CreateCourseCommand(
+            $id?->value() ?? CourseIdMother::create()->value(),
+            $name?->value() ?? CourseNameMother::create()->value(),
+            $duration?->value() ?? CourseDurationMother::create()->value()
+        );
     }
 }
diff --git a/tests/Mooc/Courses/Application/Update/CourseRenamerTest.php b/tests/Mooc/Courses/Application/Update/CourseRenamerTest.php
@@ -26,8 +26,8 @@ protected function setUp(): void
     /** @test */
     public function it_should_rename_an_existing_course(): void
     {
-        $course        = CourseMother::random();
-        $newName       = CourseNameMother::random();
+        $course        = CourseMother::create();
+        $newName       = CourseNameMother::create();
         $renamedCourse = DuplicatorMother::with($course, ['name' => $newName]);
 
         $this->shouldSearch($course->id(), $course);
@@ -42,10 +42,10 @@ public function it_should_throw_an_exception_when_the_course_not_exist(): void
     {
         $this->expectException(CourseNotExist::class);
 
-        $id = CourseIdMother::random();
+        $id = CourseIdMother::create();
 
         $this->shouldSearch($id, null);
 
-        $this->renamer->__invoke($id, CourseNameMother::random());
+        $this->renamer->__invoke($id, CourseNameMother::create());
     }
 }
diff --git a/tests/Mooc/Courses/Domain/CourseCreatedDomainEventMother.php b/tests/Mooc/Courses/Domain/CourseCreatedDomainEventMother.php
@@ -12,18 +12,20 @@
 
 final class CourseCreatedDomainEventMother
 {
-    public static function create(CourseId $id, CourseName $name, CourseDuration $duration): CourseCreatedDomainEvent
-    {
-        return new CourseCreatedDomainEvent($id->value(), $name->value(), $duration->value());
+    public static function create(
+        ?CourseId $id = null,
+        ?CourseName $name = null,
+        ?CourseDuration $duration = null
+    ): CourseCreatedDomainEvent {
+        return new CourseCreatedDomainEvent(
+            $id?->value() ?? CourseIdMother::create()->value(),
+            $name?->value() ?? CourseNameMother::create()->value(),
+            $duration?->value() ?? CourseDurationMother::create()->value()
+        );
     }
 
     public static function fromCourse(Course $course): CourseCreatedDomainEvent
     {
         return self::create($course->id(), $course->name(), $course->duration());
     }
-
-    public static function random(): CourseCreatedDomainEvent
-    {
-        return self::create(CourseIdMother::random(), CourseNameMother::random(), CourseDurationMother::random());
-    }
 }
diff --git a/tests/Mooc/Courses/Domain/CourseDurationMother.php b/tests/Mooc/Courses/Domain/CourseDurationMother.php
@@ -10,19 +10,17 @@
 
 final class CourseDurationMother
 {
-    public static function create(string $value): CourseDuration
+    public static function create(?string $value = null): CourseDuration
     {
-        return new CourseDuration($value);
+        return new CourseDuration($value ?? self::random());
     }
 
-    public static function random(): CourseDuration
+    private static function random(): string
     {
-        return self::create(
-            sprintf(
-                '%s %s',
-                IntegerMother::lessThan(100),
-                RandomElementPicker::from('months', 'years', 'days', 'hours', 'minutes', 'seconds')
-            )
+        return sprintf(
+            '%s %s',
+            IntegerMother::lessThan(100),
+            RandomElementPicker::from('months', 'years', 'days', 'hours', 'minutes', 'seconds')
         );
     }
 }
diff --git a/tests/Mooc/Courses/Domain/CourseIdMother.php b/tests/Mooc/Courses/Domain/CourseIdMother.php
@@ -9,18 +9,8 @@
 
 final class CourseIdMother
 {
-    public static function create(string $value): CourseId
+    public static function create(?string $value = null): CourseId
     {
-        return new CourseId($value);
-    }
-
-    public static function creator(): callable
-    {
-        return static fn() => self::random();
-    }
-
-    public static function random(): CourseId
-    {
-        return self::create(UuidMother::random());
+        return new CourseId($value ?? UuidMother::create());
     }
 }
diff --git a/tests/Mooc/Courses/Domain/CourseMother.php b/tests/Mooc/Courses/Domain/CourseMother.php
@@ -12,9 +12,16 @@
 
 final class CourseMother
 {
-    public static function create(CourseId $id, CourseName $name, CourseDuration $duration): Course
-    {
-        return new Course($id, $name, $duration);
+    public static function create(
+        ?CourseId $id = null,
+        ?CourseName $name = null,
+        ?CourseDuration $duration = null
+    ): Course {
+        return new Course(
+            $id ?? CourseIdMother::create(),
+            $name ?? CourseNameMother::create(),
+            $duration ?? CourseDurationMother::create()
+        );
     }
 
     public static function fromRequest(CreateCourseCommand $request): Course
@@ -25,9 +32,4 @@ public static function fromRequest(CreateCourseCommand $request): Course
             CourseDurationMother::create($request->duration())
         );
     }
-
-    public static function random(): Course
-    {
-        return self::create(CourseIdMother::random(), CourseNameMother::random(), CourseDurationMother::random());
-    }
 }
diff --git a/tests/Mooc/Courses/Domain/CourseNameMother.php b/tests/Mooc/Courses/Domain/CourseNameMother.php
@@ -9,13 +9,8 @@
 
 final class CourseNameMother
 {
-    public static function create(string $value): CourseName
+    public static function create(?string $value = null): CourseName
     {
-        return new CourseName($value);
-    }
-
-    public static function random(): CourseName
-    {
-        return self::create(WordMother::random());
+        return new CourseName($value ?? WordMother::create());
     }
 }
diff --git a/tests/Mooc/Courses/Infrastructure/Persistence/CourseRepositoryTest.php b/tests/Mooc/Courses/Infrastructure/Persistence/CourseRepositoryTest.php
@@ -13,15 +13,15 @@ final class CourseRepositoryTest extends CoursesModuleInfrastructureTestCase
     /** @test */
     public function it_should_save_a_course(): void
     {
-        $course = CourseMother::random();
+        $course = CourseMother::create();
 
         $this->repository()->save($course);
     }
 
     /** @test */
     public function it_should_return_an_existing_course(): void
     {
-        $course = CourseMother::random();
+        $course = CourseMother::create();
 
         $this->repository()->save($course);
 
@@ -31,6 +31,6 @@ public function it_should_return_an_existing_course(): void
     /** @test */
     public function it_should_not_return_a_non_existing_course(): void
     {
-        $this->assertNull($this->repository()->search(CourseIdMother::random()));
+        $this->assertNull($this->repository()->search(CourseIdMother::create()));
     }
 }