From a84d28ee1437016a087d258e213f1fb44f709518 Mon Sep 17 00:00:00 2001 From: matthew Date: Tue, 24 Jun 2025 10:33:30 +0900 Subject: [PATCH 1/2] feat: refactoring-about-model-test --- tests/ModelTest.php | 62 ++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/tests/ModelTest.php b/tests/ModelTest.php index 8fcd0b272..1ba32b348 100644 --- a/tests/ModelTest.php +++ b/tests/ModelTest.php @@ -49,7 +49,13 @@ class ModelTest extends TestCase { - public function tearDown(): void + protected function setUp(): void + { + parent::setUp(); + Carbon::setTestNow(); + } + + protected function tearDown(): void { Carbon::setTestNow(); DB::connection('mongodb')->getCollection('users')->drop(); @@ -83,12 +89,24 @@ public function testQualifyColumn(): void $this->assertEquals('users.name', $sqlUser->qualifyColumn('name')); } + private function makeUser(array $overrides = []): User + { + $defaults = [ + 'name' => 'John Doe', + 'title' => 'admin', + 'age' => 35, + ]; + + $user = new User(); + foreach (array_merge($defaults, $overrides) as $key => $value) { + $user->$key = $value; + } + return $user; + } + public function testInsert(): void { - $user = new User(); - $user->name = 'John Doe'; - $user->title = 'admin'; - $user->age = 35; + $user = $this->makeUser(); $user->save(); @@ -130,10 +148,7 @@ public function testInsertNonIncrementable(): void public function testUpdate(): void { - $user = new User(); - $user->name = 'John Doe'; - $user->title = 'admin'; - $user->age = 35; + $user = $this->makeUser(); $user->save(); $raw = $user->getAttributes(); @@ -264,10 +279,7 @@ public function testManualIntId(): void public function testDelete(): void { - $user = new User(); - $user->name = 'John Doe'; - $user->title = 'admin'; - $user->age = 35; + $user = $this->makeUser(); $user->save(); $this->assertTrue($user->exists); @@ -280,10 +292,7 @@ public function testDelete(): void public function testAll(): void { - $user = new User(); - $user->name = 'John Doe'; - $user->title = 'admin'; - $user->age = 35; + $user = $this->makeUser(); $user->save(); $user = new User(); @@ -301,10 +310,7 @@ public function testAll(): void public function testFind(): void { - $user = new User(); - $user->name = 'John Doe'; - $user->title = 'admin'; - $user->age = 35; + $user = $this->makeUser(); $user->save(); $check = User::find($user->id); @@ -384,10 +390,7 @@ public function testCreate(): void public function testDestroy(): void { - $user = new User(); - $user->name = 'John Doe'; - $user->title = 'admin'; - $user->age = 35; + $user = $this->makeUser(); $user->save(); User::destroy((string) $user->id); @@ -397,10 +400,7 @@ public function testDestroy(): void public function testTouch(): void { - $user = new User(); - $user->name = 'John Doe'; - $user->title = 'admin'; - $user->age = 35; + $user = $this->makeUser(); $user->save(); $old = $user->updated_at; @@ -1089,7 +1089,7 @@ public function testChunkById(): void $this->assertEquals(['fork', 'spork', 'spoon'], $names); } - public function testTruncateModel() + public function testTruncateModel(): void { User::create(['name' => 'John Doe']); @@ -1098,7 +1098,7 @@ public function testTruncateModel() $this->assertEquals(0, User::count()); } - public function testGuardedModel() + public function testGuardedModel(): void { $model = new Guarded(); From aa3b3dcbc8b2bef03de11edca1fa8abc958eda05 Mon Sep 17 00:00:00 2001 From: matthew Date: Wed, 25 Jun 2025 18:09:37 +0900 Subject: [PATCH 2/2] fix: review-fix --- tests/ModelTest.php | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/tests/ModelTest.php b/tests/ModelTest.php index 1ba32b348..665b645af 100644 --- a/tests/ModelTest.php +++ b/tests/ModelTest.php @@ -52,6 +52,7 @@ class ModelTest extends TestCase protected function setUp(): void { parent::setUp(); + Carbon::setTestNow(); } @@ -89,18 +90,15 @@ public function testQualifyColumn(): void $this->assertEquals('users.name', $sqlUser->qualifyColumn('name')); } - private function makeUser(array $overrides = []): User + private function makeUser(): User { - $defaults = [ - 'name' => 'John Doe', - 'title' => 'admin', - 'age' => 35, - ]; - $user = new User(); - foreach (array_merge($defaults, $overrides) as $key => $value) { - $user->$key = $value; - } + $user->name = 'John Doe'; + $user->title = 'admin'; + $user->age = 35; + + $user->save(); + return $user; } @@ -108,8 +106,6 @@ public function testInsert(): void { $user = $this->makeUser(); - $user->save(); - $this->assertTrue($user->exists); $this->assertEquals(1, User::count()); @@ -149,7 +145,6 @@ public function testInsertNonIncrementable(): void public function testUpdate(): void { $user = $this->makeUser(); - $user->save(); $raw = $user->getAttributes(); $this->assertInstanceOf(ObjectID::class, $raw['id']); @@ -280,7 +275,6 @@ public function testManualIntId(): void public function testDelete(): void { $user = $this->makeUser(); - $user->save(); $this->assertTrue($user->exists); $this->assertEquals(1, User::count()); @@ -293,7 +287,6 @@ public function testDelete(): void public function testAll(): void { $user = $this->makeUser(); - $user->save(); $user = new User(); $user->name = 'Jane Doe'; @@ -311,7 +304,6 @@ public function testAll(): void public function testFind(): void { $user = $this->makeUser(); - $user->save(); $check = User::find($user->id); $this->assertInstanceOf(User::class, $check); @@ -391,7 +383,6 @@ public function testCreate(): void public function testDestroy(): void { $user = $this->makeUser(); - $user->save(); User::destroy((string) $user->id); @@ -401,7 +392,6 @@ public function testDestroy(): void public function testTouch(): void { $user = $this->makeUser(); - $user->save(); $old = $user->updated_at; sleep(1);