Merge pull request #14 from staudenmeir/code

Improve /tests code

Author: liam-wiltshire

tests/Concerns/AutoloadsRelationshipsTest.php

@@ -8,7 +8,6 @@
 
 namespace LiamWiltshire\LaravelJitLoader\Tests\Concerns;
 
-use Illuminate\Log\LogManager;
 use LiamWiltshire\LaravelJitLoader\Tests\TestCase;
 use LiamWiltshire\LaravelJitLoader\Tests\TraitlessModel;
 use LiamWiltshire\LaravelJitLoader\Tests\TraitModel;
@@ -27,7 +26,7 @@ public function testGetRelationshipFromMethodWithNonExistentRelationshipThrowsEx
     public function testGetRelationshipFromMethodAfterDisableAutoLoadCalledDoesntAutoLoad()
     {
         $models = TraitModel::all();
-        $related = $models[0]->disableAutoload()->myRelationship;
+        $models[0]->disableAutoload()->myRelationship;
 
         $this->assertFalse($models[1]->relationLoaded('myRelationship'));
     }
@@ -36,7 +35,7 @@ public function testGetRelationshipFromMethodOverThresholdDoesntAutoLoad()
     {
         $models = TraitModel::all();
         $models[0]->setAutoloadThreshold(2);
-        $related = $models[0]->myRelationship;
+        $models[0]->myRelationship;
 
         $this->assertFalse($models[1]->relationLoaded('myRelationship'));
     }
@@ -45,14 +44,13 @@ public function testGetRelationshipFromMethodOverThresholdDoesntAutoLoad()
     public function testGetRelationshipFromMethodUnderThresholdDoesAutoLoad()
     {
         $models = TraitModel::all();
-        $related = $models[0]->myRelationship;
+        $models[0]->myRelationship;
 
         $this->assertTrue($models[1]->relationLoaded('myRelationship'));
     }
 
     public function testGetRelationshipFromMethodUnderThresholdDoesAutoLoadWithLogging()
     {
-
         $message = "[LARAVEL-JIT-LOADER] Relationship " . TraitModel::class . "::myRelationship was JIT-loaded. Called in " . __FILE__ . " on line " . (__LINE__ + 12);
 
         $driver = $this->getMockBuilder(LoggerInterface::class)->getMock();
@@ -65,7 +63,7 @@ public function testGetRelationshipFromMethodUnderThresholdDoesAutoLoadWithLoggi
         $models = TraitModel::all();
         $models[0]->setLogging('jitLogger', $driver);
 
-        $related = $models[0]->myRelationship;
+        $models[0]->myRelationship;
 
         $this->assertTrue($models[1]->relationLoaded('myRelationship'));
     }
@@ -116,4 +114,4 @@ public function testPerformance()
         $this->assertTrue($traitedCount < $traitlessCount);
         $this->assertTrue($traitedTime < $traitlessTime);
     }
-}
+}

tests/CoverageCheck.php

@@ -28,4 +28,4 @@
     exit(1);
 }
 
-echo 'Code coverage is ' . $coverage . '% - OK!' . PHP_EOL;
+echo 'Code coverage is ' . $coverage . '% - OK!' . PHP_EOL;

tests/DummyModel.php

@@ -2,11 +2,10 @@
 
 namespace LiamWiltshire\LaravelJitLoader\Tests;
 
-
 use LiamWiltshire\LaravelJitLoader\Model;
 
-class DummyModel extends Model {
-
+class DummyModel extends Model
+{
     protected $fillable = ['dummy_model_id'];
 
     public function myRelationship()
@@ -23,4 +22,4 @@ public function setAutoloadThreshold(int $autoloadThreshold)
     {
         $this->autoloadThreshold = $autoloadThreshold;
     }
-}
+}

tests/ModelTest.php

@@ -2,7 +2,6 @@
 
 namespace LiamWiltshire\LaravelJitLoader\Tests;
 
-
 class ModelTest extends TestCase
 {
     public function testGetRelationshipFromMethodWithNonExistentRelationshipThrowsException()
@@ -16,7 +15,7 @@ public function testGetRelationshipFromMethodWithNonExistentRelationshipThrowsEx
     public function testGetRelationshipFromMethodAfterDisableAutoLoadCalledDoesntAutoLoad()
     {
         $models = DummyModel::all();
-        $related = $models[0]->disableAutoload()->myRelationship;
+        $models[0]->disableAutoload()->myRelationship;
 
         $this->assertFalse($models[1]->relationLoaded('myRelationship'));
     }
@@ -25,7 +24,7 @@ public function testGetRelationshipFromMethodOverThresholdDoesntAutoLoad()
     {
         $models = DummyModel::all();
         $models[0]->setAutoloadThreshold(2);
-        $related = $models[0]->myRelationship;
+        $models[0]->myRelationship;
 
         $this->assertFalse($models[1]->relationLoaded('myRelationship'));
     }
@@ -34,10 +33,8 @@ public function testGetRelationshipFromMethodOverThresholdDoesntAutoLoad()
     public function testGetRelationshipFromMethodUnderThresholdDoesAutoLoad()
     {
         $models = DummyModel::all();
-        $related = $models[0]->myRelationship;
+        $models[0]->myRelationship;
 
         $this->assertTrue($models[1]->relationLoaded('myRelationship'));
     }
 }
-
-

tests/TestCase.php

@@ -8,14 +8,10 @@
 
 namespace LiamWiltshire\LaravelJitLoader\Tests;
 
-
-use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Database\Capsule\Manager;
 
 class TestCase extends \PHPUnit\Framework\TestCase
 {
-
     public $db;
 
     public $messages = [];
@@ -44,7 +40,7 @@ protected function configureDatabase()
 
     public function migrateIdentitiesTable()
     {
-        Manager::schema()->create('dummy_models', function($table) {
+        Manager::schema()->create('dummy_models', function ($table) {
             $table->increments('id');
             $table->integer('dummy_model_id');
             $table->timestamps();
@@ -56,7 +52,7 @@ public function migrateIdentitiesTable()
             $x--;
         }
 
-        Manager::schema()->create('trait_models', function($table) {
+        Manager::schema()->create('trait_models', function ($table) {
             $table->increments('id');
             $table->integer('trait_model_id');
             $table->timestamps();
@@ -68,7 +64,7 @@ public function migrateIdentitiesTable()
             $x--;
         }
 
-        Manager::schema()->create('traitless_models', function($table) {
+        Manager::schema()->create('traitless_models', function ($table) {
             $table->increments('id');
             $table->integer('traitless_model_id');
             $table->timestamps();
@@ -79,7 +75,6 @@ public function migrateIdentitiesTable()
             TraitlessModel::create(array('traitless_model_id' => $x));
             $x--;
         }
-
     }
 
     public function __destruct()
@@ -91,4 +86,4 @@ public function __destruct()
         }
         parent::tearDown(); // TODO: Change the autogenerated stub
     }
-}
+}

tests/TraitModel.php

@@ -2,13 +2,12 @@
 
 namespace LiamWiltshire\LaravelJitLoader\Tests;
 
-
 use Illuminate\Database\Eloquent\Model;
 use LiamWiltshire\LaravelJitLoader\Concerns\AutoloadsRelationships;
 use Psr\Log\LoggerInterface;
 
-class TraitModel extends Model {
-
+class TraitModel extends Model
+{
     use AutoloadsRelationships;
 
     protected $fillable = ['trait_model_id'];
@@ -33,4 +32,4 @@ public function setLogging(string $channel, LoggerInterface $logger)
         $this->logChannel = $channel;
         $this->logDriver = $logger;
     }
-}
+}

tests/TraitlessModel.php

@@ -2,13 +2,11 @@
 
 namespace LiamWiltshire\LaravelJitLoader\Tests;
 
-
 use Illuminate\Database\Eloquent\Model;
-use LiamWiltshire\LaravelJitLoader\Concerns\AutoloadsRelationships;
 use Psr\Log\LoggerInterface;
 
-class TraitlessModel extends Model {
-
+class TraitlessModel extends Model
+{
     protected $fillable = ['traitless_model_id'];
 
     public function myRelationship()
@@ -31,4 +29,4 @@ public function setLogging(string $channel, LoggerInterface $logger)
         $this->logChannel = $channel;
         $this->logDriver = $logger;
     }
-}
+}