Improves tests

Author: raphaelstolt

tests/Commands/InitCommandTest.php

@@ -14,17 +14,11 @@
 use Stolt\LeanPackage\Presets\PhpPreset;
 use Stolt\LeanPackage\Tests\CommandTester;
 use Stolt\LeanPackage\Tests\TestCase;
-use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class InitCommandTest extends TestCase
 {
-    /**
-     * @var Application
-     */
-    private $application;
-
     /**
      * Set up test environment.
      */
@@ -34,7 +28,7 @@ protected function setUp(): void
         if (!\defined('WORKING_DIRECTORY')) {
             \define('WORKING_DIRECTORY', $this->temporaryDirectory);
         }
-        $this->application = $this->getApplication();
+        $this->application = $this->getApplication(new InitCommand(new Analyser(new Finder(new PhpPreset()))));
     }
 
     /**
@@ -237,15 +231,4 @@ public function existingDefaultLpvFileIsOverwrittenWhenDesired(): void
         $commandTester->assertCommandIsSuccessful();
         $this->assertFileExists($expectedDefaultLpvFile);
     }
-
-    /**
-     * @return Application
-     */
-    protected function getApplication(): Application
-    {
-        $application = new Application();
-        $application->add(new InitCommand(new Analyser(new Finder(new PhpPreset()))));
-
-        return $application;
-    }
 }

tests/Commands/TreeCommandTest.php

@@ -11,25 +11,20 @@
 use Stolt\LeanPackage\Tests\CommandTester;
 use Stolt\LeanPackage\Tests\TestCase;
 use Stolt\LeanPackage\Tree;
-use Symfony\Component\Console\Application;
 
 class TreeCommandTest extends TestCase
 {
-    /**
-     * @var Application
-     */
-    private Application $application;
-
     /**
      * Set up test environment.
+     * @throws GitNotAvailable
      */
     protected function setUp(): void
     {
         $this->setUpTemporaryDirectory();
         if (!\defined('WORKING_DIRECTORY')) {
             \define('WORKING_DIRECTORY', $this->temporaryDirectory);
         }
-        $this->application = $this->getApplication();
+        $this->application = $this->getApplication(new TreeCommand(new Tree(new Archive(WORKING_DIRECTORY))));
     }
 
     /**
@@ -43,7 +38,6 @@ protected function tearDown(): void
             $this->removeDirectory($this->temporaryDirectory);
         }
     }
-
     #[Test]
     public function displaysExpectedSrcTree(): void
     {
@@ -71,16 +65,4 @@ public function displaysExpectedSrcTree(): void
         $this->assertStringContainsString('5 directories, 2 files', $commandTester->getDisplay());
         $commandTester->assertCommandIsSuccessful();
     }
-
-    /**
-     * @throws GitNotAvailable
-     * @return Application
-     */
-    protected function getApplication(): Application
-    {
-        $application = new Application();
-        $application->add(new TreeCommand(new Tree(new Archive(WORKING_DIRECTORY))));
-
-        return $application;
-    }
 }

tests/Commands/ValidateCommandTest.php

@@ -12,7 +12,6 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\Attributes\Ticket;
-use SebastianBergmann\CodeCoverage\Driver\WriteOperationFailedException;
 use Stolt\LeanPackage\Analyser;
 use Stolt\LeanPackage\Archive;
 use Stolt\LeanPackage\Archive\Validator;
@@ -32,11 +31,6 @@ class ValidateCommandTest extends TestCase
 {
     use InteractsWithConsole;
 
-    /**
-     * @var Application
-     */
-    private Application $application;
-
     /**
      * Set up test environment.
      */
@@ -46,7 +40,13 @@ protected function setUp(): void
         if (!\defined('WORKING_DIRECTORY')) {
             \define('WORKING_DIRECTORY', $this->temporaryDirectory);
         }
-        $this->application = $this->getApplication();
+
+        $analyserCommand = new ValidateCommand(
+            new Analyser(new Finder(new PhpPreset())),
+            new Validator(new Archive($this->temporaryDirectory))
+        );
+
+        $this->application = $this->getApplication($analyserCommand);
     }
 
     /**
@@ -2246,24 +2246,4 @@ protected function getApplicationWithMockedArchiveValidator(MockInterface $mocke
 
         return $application;
     }
-
-    /**
-     * @return Application
-     */
-    protected function getApplication(): Application
-    {
-        $application = new Application();
-        $archive = new Archive(
-            $this->temporaryDirectory
-        );
-
-        $analyserCommand = new ValidateCommand(
-            new Analyser(new Finder(new PhpPreset())),
-            new Validator($archive)
-        );
-
-        $application->add($analyserCommand);
-
-        return $application;
-    }
 }

tests/TestCase.php

@@ -5,10 +5,20 @@
 namespace Stolt\LeanPackage\Tests;
 
 use PHPUnit\Framework\TestCase as PHPUnit;
+use Stolt\LeanPackage\Analyser;
+use Stolt\LeanPackage\Commands\InitCommand;
 use Stolt\LeanPackage\Helpers\Str as OsHelper;
+use Stolt\LeanPackage\Presets\Finder;
+use Stolt\LeanPackage\Presets\PhpPreset;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
 
 class TestCase extends PHPUnit
 {
+    /**
+     * @var Application
+     */
+    protected Application $application;
     protected string $temporaryDirectory;
 
     /**
@@ -134,4 +144,16 @@ protected function createTemporaryGlobPatternFile($content)
 
         return file_put_contents($temporaryLpvFile, $content) > 0;
     }
+
+    /**
+     * @param Command $command
+     * @return Application
+     */
+    protected function getApplication(Command $command): Application
+    {
+        $application = new Application();
+        $application->add($command);
+
+        return $application;
+    }
 }