refactoring and tests

app/build.gradle.kts

@@ -1,5 +1,4 @@
 plugins {
-    id("java")
     application
     checkstyle
     jacoco

app/src/main/java/hexlet/code/App.java

@@ -29,26 +29,14 @@ public final class App implements Callable<Integer> {
     @Override
     public Integer call() throws Exception {
         System.out.println(Differ.generate(
-                getFilepath(),
-                getFilepath2(),
-                getFormat())
+                filepath,
+                filepath2,
+                format)
         );
         return 0;
     }
     public static void main(String[] args) {
         int exitCode = new CommandLine(new App()).execute(args);
         System.exit(exitCode);
     }
-
-    public String getFormat() {
-        return format;
-    }
-
-    public String getFilepath() {
-        return filepath;
-    }
-
-    public String getFilepath2() {
-        return filepath2;
-    }
 }

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

@@ -14,20 +14,8 @@ public static String generate(String pathToFile, String pathToFile2, String form
         Map<String, Object> mapFile = Parser.parse(filepath);
         Map<String, Object> mapFile2 = Parser.parse(filepath2);
 
-        IFormatter formatter = null;
+        IFormatter formatter;
         formatter = FormatterFactory.getFormatter(format);
         return formatter.format(DiffBuilder.build(mapFile, mapFile2));
     }
-
-    public static String generate(String pathToFile, String pathToFile2) throws Exception {
-        Path filepath = Paths.get(pathToFile).toAbsolutePath().normalize();
-        Path filepath2 = Paths.get(pathToFile2).toAbsolutePath().normalize();
-
-        Map<String, Object> mapFile = Parser.parse(filepath);
-        Map<String, Object> mapFile2 = Parser.parse(filepath2);
-
-        IFormatter formatter = null;
-        formatter = FormatterFactory.getFormatter("stylish");
-        return formatter.format(DiffBuilder.build(mapFile, mapFile2));
-    }
 }

app/src/test/java/DifferTests.java

@@ -1,6 +1,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import hexlet.code.Differ;
+import hexlet.code.Parser;
 import org.junit.jupiter.api.Test;
 
 import java.nio.file.Files;
@@ -9,15 +11,10 @@
 
 public class DifferTests {
 
-    private static final String YAML_PATH = "src/test/resources/test1.yml";
-    private static final String YAML_PATH2 = "src/test/resources/test2.yml";
-    private static final String JSON_PATH = "src/test/resources/test1.json";
-    private static final String JSON_PATH2 = "src/test/resources/test2.json";
-
-    @Test
-    public void jsonDiffTestStylish() {
-
-    }
+    private static final String YAML_PATH = "src/test/resources/fixtures/test1.yml";
+    private static final String YAML_PATH2 = "src/test/resources/fixtures/test2.yml";
+    private static final String JSON_PATH = "src/test/resources/fixtures/test1.json";
+    private static final String JSON_PATH2 = "src/test/resources/fixtures/test2.json";
 
     @Test
     public void jsonDiffTest() throws Exception {
@@ -35,6 +32,19 @@ public void jsonDiffTest() throws Exception {
         );
     }
 
+    @Test
+    public void unexpectedFormatTest() {
+        Exception exception = assertThrows(Exception.class,
+                () -> Differ.generate(JSON_PATH, JSON_PATH2, "unknown").trim());
+        Exception exception2 = assertThrows(Exception.class,
+                () -> Differ.generate(YAML_PATH, YAML_PATH2, "").trim());
+
+        assertEquals("Unexpected format 'unknown'. Possible formats: [stylish, plain, json]",
+                exception.getMessage());
+        assertEquals("Unexpected format ''. Possible formats: [stylish, plain, json]",
+                exception2.getMessage());
+    }
+
     @Test
     public void yamlDiffTest() throws Exception {
         assertEquals(
@@ -51,10 +61,23 @@ public void yamlDiffTest() throws Exception {
         );
     }
 
+    @Test
+    public void parserTest() {
+        assertEquals(Parser.parse(getPath("test1.json")),
+                Parser.parse(getPath("test1.yml"))
+        );
+        assertEquals(Parser.parse(getPath("test2.json")),
+                Parser.parse(getPath("test2.yml"))
+        );
+    }
+
     private static String readFixture(String fileName) throws Exception {
-        Path filePath = Paths.get("src", "test", "resources", "fixtures", fileName)
+        return Files.readString(getPath(fileName)).trim();
+    }
+
+    private static Path getPath(String fileName) {
+        return Paths.get("src", "test", "resources", "fixtures", fileName)
                 .toAbsolutePath().normalize();
-        return Files.readString(filePath).trim();
     }
 }