update consoleApp

Author: Alexsey-VR

src/ConsoleApp.php

@@ -8,27 +8,14 @@ class ConsoleApp
     private CommandInterface $currentCommand;
     private CommandInterface $nextCommand;
     private CommandFactoryInterface $commandFactory;
-
-    public function __construct()
-    {
-        $this->docopt = <<<'DOCOPT'
-        gendiff -h
-
-        Generate diff
-
-        Usage:
-          gendiff (-h|--help)
-          gendiff (-v|--version)
-          gendiff [Options]... FILE1 FILE2
-
-        Options:
-          -h --help                  Show this screen
-          -v --version               Show version
-          --format <fmt>             Report format [default: stylish]
-
-        DOCOPT;
-
-        $this->commandFactory = new CommandFactory($this->docopt);
+    private FileReaderInterface $fileReader;
+
+    public function __construct(
+      CommandFactoryInterface $commandFactory,
+      FileReaderInterface $fileReader
+    ) {      
+      $this->commandFactory = $commandFactory;
+      $this->fileReader = $fileReader;
     }
 
     public function run(): void
@@ -39,13 +26,11 @@ public function run(): void
 
         $this->currentCommand = $this->commandFactory->getCommand("difference");
         $this->nextCommand = $this->currentCommand
-                                  ->setFileNames($this->nextCommand)
-                                  ->setFileReader(new FileReader())
-                                  ->execute();
+                                  ->setFileReader($this->fileReader)
+                                  ->execute($this->nextCommand);
 
         $this->currentCommand = $this->commandFactory->getCommand("show");
         $this->currentCommand
-             ->execute($this->nextCommand)
-             ->showDiffsToConsole();
+             ->execute($this->nextCommand);
     }
 }

tests/ConsoleAppTest.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Differ;
+
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\CoversMethod;
+use Differ\CommandFactory;
+use Differ\DisplayCommand;
+use Differ\FilesDiffCommand;
+use Differ\FileReader;
+
+#[CoversClass(ConsoleApp::class)]
+#[CoversClass(CommandFactory::class)]
+#[CoversClass(DisplayCommand::class)]
+#[CoversClass(FilesDiffCommand::class)]
+#[CoversClass(FileReader::class)]
+#[CoversMethod(ConsoleApp::class, 'run')]
+class ConsoleAppTest extends TestCase
+{
+    public function testConsoleAppRunning()
+    {
+        $outputString = "{\n" .
+        "    hexlet.io\n" .
+        "  - 50\n" .
+        "  + 20\n" .
+        "  - 123.234.53.22\n" .
+        "  - \n" .
+        "}\n";
+
+        $commandLineParserStubToGetContent = $this->createConfiguredStub(
+            CommandLineParser::class,
+            [
+                'getFileNames' => [
+                    'FILE1' => __DIR__ . "/../file1.json",
+                    'FILE2' => __DIR__ . "/../file2.json"
+                ]
+            ]
+        );
+        $cmdLineParserStub = $this->createConfiguredStub(
+            CommandLineParser::class,
+            [
+                'execute' => $commandLineParserStubToGetContent
+            ]
+        );
+
+        $filesDiffCommand = new FilesDiffCommand();
+        $displayCommand = new DisplayCommand();
+
+        $commandFactoryMock = $this->createMock(CommandFactory::class);
+        $commandFactoryMock->expects($this->exactly(3))
+                           ->method('getCommand')
+                           ->willReturnMap([
+                                ['parse', $cmdLineParserStub],
+                                ['difference', $filesDiffCommand],
+                                ['show', $displayCommand]
+                           ]);
+        $fileReader = new FileReader();
+
+        $consoleApp = new ConsoleApp($commandFactoryMock, $fileReader);
+        $consoleApp->run();
+
+        $this->expectOutputString($outputString);
+    }
+}