Refactoring tests, Formatters

artengin · Sep 28, 2024 · 34b0d4d · 34b0d4d
1 parent 74eaa7b
commit 34b0d4d
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 45 deletions.
diff --git a/src/Differ.php b/src/Differ.php
@@ -21,7 +21,12 @@ function genDiff(string $file1, string $file2, string $format = 'stylish'): stri
     $valueFile2 = parser($extension2, $contentFile2);
 
     $valueDiff = buildDiff($valueFile1, $valueFile2);
-    return format($valueDiff, $format);
+
+    $testt = [
+        'type' => 'root',
+        'children' => $valueDiff,
+    ];
+    return format($testt, $format);
 }
 function getContents(string $path): array
 {

diff --git a/src/Formatters/Json.php b/src/Formatters/Json.php
@@ -4,7 +4,6 @@
 
 function render(array $data): string
 {
-    $root = '{"type":"root","children":';
     $jsonData = json_encode($data, JSON_THROW_ON_ERROR);
-    return $root . $jsonData . '}';
+    return $jsonData;
 }
diff --git a/src/Formatters/Plain.php b/src/Formatters/Plain.php
@@ -18,13 +18,14 @@
 
 function render(array $data): string
 {
-    $result = iter($data);
+    $result = iter($data['children']);
     return rtrim(implode($result), " \n");
 }
 
 function iter(array $value, array $acc = []): array
 {
     $func = function ($val) use ($acc) {
+
         if (!is_array($val)) {
             return toString($val);
         }

diff --git a/src/Formatters/Stylish.php b/src/Formatters/Stylish.php
@@ -20,7 +20,7 @@
 
 function render(array $data): string
 {
-    $result = iter($data);
+    $result = iter($data['children']);
     return $result;
 }
 

diff --git a/tests/DiffTest.php b/tests/DiffTest.php
@@ -27,68 +27,58 @@ protected function getSecondFilePath(string $type): string
     public static function dataProvider(): array
     {
         return [
-            'stylish format, json - json' => [
-                'stylish',
+            'json - json' => [
                 'json',
                 'json',
             ],
-            'stylish format, yml - json' => [
-                'stylish',
-                'yml',
-                'json',
-            ],
-            'stylish format, yml - yml' => [
-                'stylish',
-                'yml',
-                'yml',
-            ],
-            'plain format, json - json' => [
-                'plain',
-                'json',
-                'json',
-            ],
-            'plain format, json - yml' => [
-                'plain',
-                'json',
-                'yml',
-            ],
-            'plain format, yml - yml' => [
-                'plain',
-                'yml',
-                'yml',
-            ],
-            'json format, json - json' => [
-                'json',
-                'json',
-                'json',
-            ],
-            'json format, json - yml' => [
-                'json',
+            'json - yml' => [
                 'json',
                 'yml',
             ],
-            'json format, yml - yml' => [
-                'json',
+            'yml - yml' => [
                 'yml',
                 'yml',
             ],
         ];
     }
+
+    #[DataProvider('dataProvider')]
+    public function testDefault(string $firstFileType, string $secondFileType): void
+    {
+        $formatter = "stylish";
+        $first = $this->getFirstFilePath($firstFileType);
+        $second = $this->getSecondFilePath($secondFileType);
+        $expected = file_get_contents($this->getExpectedPath($formatter));
+        $this->assertEquals($expected, genDiff($first, $second));
+    }
+
+    #[DataProvider('dataProvider')]
+    public function testStylish(string $firstFileType, string $secondFileType): void
+    {
+        $formatter = "stylish";
+        $first = $this->getFirstFilePath($firstFileType);
+        $second = $this->getSecondFilePath($secondFileType);
+        $expected = file_get_contents($this->getExpectedPath($formatter));
+        $this->assertEquals($expected, genDiff($first, $second, $formatter));
+    }
+
     #[DataProvider('dataProvider')]
-    public function testDiff(string $formatter, string $firstFileType, string $secondFileType): void
+    public function testJson(string $firstFileType, string $secondFileType): void
     {
+        $formatter = "json";
         $first = $this->getFirstFilePath($firstFileType);
         $second = $this->getSecondFilePath($secondFileType);
         $expected = file_get_contents($this->getExpectedPath($formatter));
         $this->assertEquals($expected, genDiff($first, $second, $formatter));
     }
+
     #[DataProvider('dataProvider')]
-    public function testDiffDefault(string $formatter, string $firstFileType, string $secondFileType): void
+    public function testPlain(string $firstFileType, string $secondFileType): void
     {
-        $formatter = "stylish";
+        $formatter = "plain";
         $first = $this->getFirstFilePath($firstFileType);
         $second = $this->getSecondFilePath($secondFileType);
         $expected = file_get_contents($this->getExpectedPath($formatter));
-        $this->assertEquals($expected, genDiff($first, $second));
+        $this->assertEquals($expected, genDiff($first, $second, $formatter));
     }
 }