From 9a5d6c2ff13e2ef3db311e3cb234a11019a97cc3 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 ecfcb2b6a..292a23f92 100644 --- a/tests/ModelTest.php +++ b/tests/ModelTest.php @@ -48,7 +48,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(); @@ -81,12 +87,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(); @@ -108,10 +126,7 @@ public function testInsert(): 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(); @@ -227,10 +242,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); @@ -243,10 +255,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(); @@ -264,10 +273,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); @@ -347,10 +353,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); @@ -360,10 +363,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; @@ -1052,7 +1052,7 @@ public function testChunkById(): void $this->assertEquals(['fork', 'spork', 'spoon'], $names); } - public function testTruncateModel() + public function testTruncateModel(): void { User::create(['name' => 'John Doe']); @@ -1061,7 +1061,7 @@ public function testTruncateModel() $this->assertEquals(0, User::count()); } - public function testGuardedModel() + public function testGuardedModel(): void { $model = new Guarded(); From 6ecd5279422805597c2caa1713672ca4bf35f133 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 | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/tests/ModelTest.php b/tests/ModelTest.php index 292a23f92..374e32ca2 100644 --- a/tests/ModelTest.php +++ b/tests/ModelTest.php @@ -87,18 +87,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; } @@ -106,8 +103,6 @@ public function testInsert(): void { $user = $this->makeUser(); - $user->save(); - $this->assertTrue($user->exists); $this->assertEquals(1, User::count()); @@ -127,7 +122,6 @@ public function testInsert(): void public function testUpdate(): void { $user = $this->makeUser(); - $user->save(); $raw = $user->getAttributes(); $this->assertInstanceOf(ObjectID::class, $raw['id']); @@ -243,7 +237,6 @@ public function testManualIntId(): void public function testDelete(): void { $user = $this->makeUser(); - $user->save(); $this->assertTrue($user->exists); $this->assertEquals(1, User::count()); @@ -256,7 +249,6 @@ public function testDelete(): void public function testAll(): void { $user = $this->makeUser(); - $user->save(); $user = new User(); $user->name = 'Jane Doe'; @@ -274,7 +266,6 @@ public function testAll(): void public function testFind(): void { $user = $this->makeUser(); - $user->save(); $check = User::find($user->id); $this->assertInstanceOf(User::class, $check); @@ -354,7 +345,6 @@ public function testCreate(): void public function testDestroy(): void { $user = $this->makeUser(); - $user->save(); User::destroy((string) $user->id); @@ -364,7 +354,6 @@ public function testDestroy(): void public function testTouch(): void { $user = $this->makeUser(); - $user->save(); $old = $user->updated_at; sleep(1);