add

Author: AlexSorb

app/src/main/java/hexlet/code/source/Differ.java

@@ -10,6 +10,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -38,13 +39,22 @@ public static String generate(String filePath1, String filePath2, String format)
 
         Map<String, Difference> differenceTreeMap = new TreeMap<>();
 
+        Map<String, List<Object>> difference = new TreeMap<>();
+
         dataFile1.forEach((key, value) -> {
             var currentDifference = new Difference();
             currentDifference.setKey(key);
+
+
             var addValue = value == null ? "null" : value;
             currentDifference.setOldValue(addValue);
             currentDifference.setState(DEL);
             differenceTreeMap.put(key, currentDifference);
+
+            //====================================================
+            var listValues = difference.getOrDefault(key, new ArrayList<>());
+            listValues.add(DEL + " " + addValue);
+            difference.put(key, listValues);
         });
 
         dataFile2.forEach((key, value) -> {
@@ -60,6 +70,11 @@ public static String generate(String filePath1, String filePath2, String format)
             }
             currentDifference.setState(addStage);
             differenceTreeMap.put(key, currentDifference);
+
+
+            //====================================================
+            var listValues = difference.getOrDefault(key, new ArrayList<>());
+
         });
 
 

app/src/main/java/hexlet/code/source/Difference.java

@@ -5,6 +5,10 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
 @Getter
 @Setter
 @NoArgsConstructor
@@ -15,6 +19,8 @@ public class Difference {
     private Object newValue;
     private String state;
 
+
+
     @Override
     public String toString() {
         return "Difference{"

app/src/test/java/fixtures/Stylish_same_file

@@ -0,0 +1,14 @@
+{
+  chars1: [a, b, c]
+  chars2: [d, e, f]
+  checked: false
+  default: null
+  id: 45
+  key1: value1
+  numbers1: [1, 2, 3, 4]
+  numbers2: [2, 3, 4, 5]
+  numbers3: [3, 4, 5]
+  setting1: Some value
+  setting2: 200
+  setting3: true
+}

app/src/test/java/source/TestJsonDiffer.java

@@ -17,10 +17,18 @@ public class TestJsonDiffer {
     static final String PLAIN_REPORT_PATH = "src/test/java/fixtures/Plain";
     static final String JSON_REPORT_PATH = "src/test/java/fixtures/Json";
 
-    static String differsStylish;
-    static String differsPlain;
-    static String differsJson;
 
+    private static String differsStylish;
+    private static String differsPlain;
+    private static String differsJson;
+
+    private final String file1 = "src/test/java/resources/File1.json";
+    private final String file2 = "src/test/java/resources/File2.json";
+    private final String wrongFile = "src/test/java/wrongFIle.json";
+
+    private final String firstTestFilePath = "src/test/java/resources/TestYamlFile1.yml";
+    private final String secondTestFilePath = "src/test/java/resources/TestYamlFile2.yml";
+    private final String wrongTestFilePath = "src/test/resources/WrongYamlFile.yml";
 
     @BeforeAll
     public static void readFixtures() throws IOException {
@@ -32,77 +40,59 @@ public static void readFixtures() throws IOException {
 
 
     @Test
-    public void testGenerateStylish() {
-        var file1 = "src/test/java/resources/File1.json";
-        var file2 = "src/test/java/resources/File2.json";
-        var formant = "stylish";
-        String result = "";
-        try {
-            result = Differ.generate(file1, file2, formant);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        assertEquals(differsStylish, result);
+    public void testGenerateStylish() throws IOException {
+        var format = "stylish";
+
+        var differenceJson = Differ.generate(file1, file2, format);
+        assertEquals(differsStylish, differenceJson);
+
+        String differenceYaml = Differ.generate(firstTestFilePath, secondTestFilePath, format);
+        assertEquals(differenceYaml, differsStylish);
     }
 
     @Test
-    public void testGeneratePlain() {
-        var file1 = "src/test/java/resources/File1.json";
-        var file2 = "src/test/java/resources/File2.json";
-        var formant = "plain";
-        String result = "";
-        try {
-            result = Differ.generate(file1, file2, formant);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        assertEquals(differsPlain, result, formant);
+    public void testGeneratePlain() throws IOException {
+        var format = "plain";
+        var differenceJson = Differ.generate(file1, file2, format);
+        assertEquals(differsPlain, differenceJson, format);
+
+        String differenceYaml = Differ.generate(firstTestFilePath, secondTestFilePath, format);
+        assertEquals(differenceYaml, differsPlain);
     }
 
     @Test
-    public void testGenerateJson() {
-        var file1 = "src/test/java/resources/File1.json";
-        var file2 = "src/test/java/resources/File2.json";
-        var formant = "json";
-        String result = "";
-        try {
-            result = Differ.generate(file1, file2, formant);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        assertEquals(differsJson, result, formant);
+    public void testGenerateJson() throws IOException {
+        var format = "json";
+        var differenceJson = Differ.generate(file1, file2, format);
+        assertEquals(differsJson, differenceJson, format);
+
+        String difference = Differ.generate(firstTestFilePath, secondTestFilePath, format);
+        assertEquals(difference, differsJson);
     }
 
     @Test
     public void testWrongPathFile() {
-        var file1 = "src/test/java/resources/File1.json";
-        var wrongFile = "src/test/java/wrongFIle.json";
-        var formant = "stylish";
-
+        var format = "stylish";
         var thrownFirstArg = assertThrows(FileNotFoundException.class, () -> {
-            Differ.generate(wrongFile, file1, formant);
+            Differ.generate(wrongFile, file1, format);
         });
         assertEquals("Файл для чтения не найден", thrownFirstArg.getMessage());
 
         var thrownSecondArg = assertThrows(FileNotFoundException.class, () -> {
-            Differ.generate(file1, wrongFile, formant);
+            Differ.generate(file1, wrongFile, format);
         });
         assertEquals("Файл для чтения не найден", thrownSecondArg.getMessage());
     }
 
-
     @Test
-    public void testGenerateWithoutFormat() {
-        var file1 = "src/test/java/resources/File1.json";
-        var file2 = "src/test/java/resources/File2.json";
+    public void testGenerateWithSomeFile() throws IOException {
+        String differs = readReroptAsString(Path.of("src/test/java/fixtures/Stylish_same_file"));
         var formant = "stylish";
-        String result = "";
-        try {
-            result = Differ.generate(file1, file2, formant);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        assertEquals(differsStylish, result);
+        String differenceJson = Differ.generate(file1, file1, formant);
+        assertEquals(differenceJson, differs);
+
+        String differenceYaml= Differ.generate(firstTestFilePath, firstTestFilePath, formant);
+        assertEquals(differenceYaml, differs);
     }