fixed problems

Author: DashProsh

.gradle/8.10/executionHistory/executionHistory.bin

@@ -6,22 +6,97 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Map;
+import java.util.Objects;
 
 public class Parser {
 
+    // Используется в тестах (ищет в resources/fixtures)
+    public static Map<String, Object> parseFromResources(String fileName) throws IOException {
+        ObjectMapper objectMapper;
+
+        if (fileName.endsWith(".json")) {
+            objectMapper = new ObjectMapper();
+        } else if (fileName.endsWith(".yaml") || fileName.endsWith(".yml")) {
+            objectMapper = new ObjectMapper(new YAMLFactory());
+        } else {
+            throw new IllegalArgumentException("Unsupported file format: " + fileName);
+        }
+
+        Path path;
+        try {
+            path = Paths.get(Objects.requireNonNull(
+                    Parser.class.getClassLoader().getResource("fixtures/" + fileName)).toURI());
+        } catch (URISyntaxException e) {
+            throw new RuntimeException("Invalid file path: " + fileName, e);
+        }
+
+        return objectMapper.readValue(path.toFile(), new TypeReference<Map<String, Object>>() {});
+    }
+
+    // Используется из CLI — напрямую с файловой системы
     public static Map<String, Object> parse(String filePath) throws IOException {
         ObjectMapper objectMapper;
 
         if (filePath.endsWith(".json")) {
             objectMapper = new ObjectMapper();
         } else if (filePath.endsWith(".yaml") || filePath.endsWith(".yml")) {
-            objectMapper = new ObjectMapper(new YAMLFactory()); // Используем YAML парсер
+            objectMapper = new ObjectMapper(new YAMLFactory());
         } else {
             throw new IllegalArgumentException("Unsupported file format: " + filePath);
         }
 
-        return objectMapper.readValue(new File("src/main/resources/fixtures/" + filePath),
-                new TypeReference<Map<String, Object>>() { });
+        return objectMapper.readValue(new File(filePath), new TypeReference<Map<String, Object>>() {});
     }
 }
+
+
+
+
+
+//package hexlet.code;
+//
+//import com.fasterxml.jackson.core.type.TypeReference;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+//
+//import java.io.File;
+//import java.io.IOException;
+//import java.net.URISyntaxException;
+//import java.nio.file.Path;
+//import java.nio.file.Paths;
+//import java.util.Map;
+//import java.util.Objects;
+//
+//public class Parser {
+//
+//    public static Map<String, Object> parse(String filePath) throws IOException {
+//        ObjectMapper objectMapper;
+//
+//        if (filePath.endsWith(".json")) {
+//            objectMapper = new ObjectMapper();
+//        } else if (filePath.endsWith(".yaml") || filePath.endsWith(".yml")) {
+//            objectMapper = new ObjectMapper(new YAMLFactory()); // Используем YAML парсер
+//        } else {
+//            throw new IllegalArgumentException("Unsupported file format: " + filePath);
+//        }
+//
+//        Path path;
+//        try {
+//            path = Paths.get(Objects.requireNonNull(
+//                    Parser.class.getClassLoader().getResource("fixtures/" + filePath)).toURI());
+//        } catch (URISyntaxException e) {
+//            throw new RuntimeException("Invalid file path: " + filePath, e);
+//        }
+//
+//        return objectMapper.readValue(path.toFile(), new TypeReference<Map<String, Object>>() {});
+//    }
+//}
+
+
+
+// return objectMapper.readValue(new File("src/main/resources/fixtures/" + filePath),
+//                new TypeReference<Map<String, Object>>() { });

.gradle/8.10/executionHistory/executionHistory.lock

@@ -1,5 +1,6 @@
 package hexlet.code;
 
+import hexlet.code.formatters.Formatter;
 import org.junit.jupiter.api.Test;
 import java.io.IOException;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -129,30 +130,32 @@ class DifferTest {
 
     @Test
     void testGenerateDiffForJsonStylish() throws IOException {
-        String filePath1 = "file1.json";
-        String filePath2 = "file2.json";
-        String actualDiff = Differ.generate(filePath1, filePath2);
-        assertEquals(EXPECTED_JSON_STYLISH.trim(), actualDiff.trim());
-        System.out.println("ВСЕ РАБОТАЕТ!");
+        var data1 = Parser.parseFromResources("file1.json");
+        var data2 = Parser.parseFromResources("file2.json");
+        var diff = Differ.calculateDiff(data1, data2);
+        var actual = Formatter.format(diff, "stylish");
+        assertEquals(EXPECTED_JSON_STYLISH.trim(), actual.trim());
+        System.out.println("ВСЕ РАБОТАЕТ!!!");
     }
 
     @Test
     void testGenerateDiffForJsonPlain() throws IOException {
-        String filePath1 = "file1.yml";
-        String filePath2 = "file2.yml";
-        String format2 = "plain";
-        String actualDiff = Differ.generate(filePath1, filePath2, format2);
-        assertEquals(EXPECTED_DIFF_PLAIN.trim(), actualDiff.trim());
-        System.out.println("ВСЕ РАБОТАЕТ! лала!");
+        var data1 = Parser.parseFromResources("file1.yml");
+        var data2 = Parser.parseFromResources("file2.yml");
+        var diff = Differ.calculateDiff(data1, data2);
+        var actual = Formatter.format(diff, "plain");
+        assertEquals(EXPECTED_DIFF_PLAIN.trim(), actual.trim());
+        System.out.println("ВСЕ РАБОТАЕТ! лала!!!");
     }
 
+
     @Test
     void testGenerateDiffForJsonJson() throws IOException {
-        String filePath1 = "file1.json";
-        String filePath2 = "file2.json";
-        String format3 = "json";
-        String actualJson = Differ.generate(filePath1, filePath2, format3 );
-        assertEquals(EXPECTED_JSON.trim(), actualJson.trim());
-        System.out.println("ВСЕ РАБОТАЕТ! дада");
+        var data1 = Parser.parseFromResources("file1.json");
+        var data2 = Parser.parseFromResources("file2.json");
+        var diff = Differ.calculateDiff(data1, data2);
+        var actual = Formatter.format(diff, "json");
+        assertEquals(EXPECTED_JSON.trim(), actual.trim());
+        System.out.println("ВСЕ РАБОТАЕТ! дада!!!");
     }
 }