changed tests

Author: sergeycherkasovv

src/test/java/telegram/bot/contributeStatisticService/ContributeStatisticServiceTest.java

@@ -1,5 +1,6 @@
 package telegram.bot.contributeStatisticService;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import telegram.bot.services.contributeStatisticService.ContributeStatisticService;
@@ -10,17 +11,22 @@
 public class ContributeStatisticServiceTest {
     private ContributeStatisticService service;
     private String directory;
+    private ObjectMapper om;
+    private FileReaderForTest read;
 
     @BeforeEach
     void setUp() {
+        read = new FileReaderForTest();
+        om = new ObjectMapper();
         service = new ContributeStatisticService();
         directory = "src/test/resources/fixtures/contributeStatistic/";
     }
 
     @Test
     void create() throws Exception {
-        var file = FileReaderForTest.readJsonNodeFromFile(directory + "create.json");
-        var contribute = service.create(file);
+        var file = read.readJsonNodeFromFile(directory + "create.json");
+        var json = om.readTree(file);
+        var contribute = service.create(json);
 
         assertEquals(25, contribute.getCodeReviews());
         assertEquals(25, contribute.getIssues());
@@ -30,8 +36,9 @@ void create() throws Exception {
 
     @Test
     void crateZeroCount() throws Exception {
-        var file = FileReaderForTest.readJsonNodeFromFile(directory + "zeroCounts.json");
-        var contribute = service.create(file);
+        var file = read.readJsonNodeFromFile(directory + "zeroCounts.json");
+        var json = om.readTree(file);
+        var contribute = service.create(json);
 
         assertEquals(0, contribute.getCodeReviews());
         assertEquals(0, contribute.getIssues());

src/test/java/telegram/bot/services/basicStatisticService/FollowerServiceTest.java

@@ -1,5 +1,6 @@
 package telegram.bot.services.basicStatisticService;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import telegram.bot.util.FileReaderForTest;
@@ -9,18 +10,23 @@
 class FollowerServiceTest {
     private FollowerService service;
     private String directory;
+    private ObjectMapper om;
+    private FileReaderForTest read;
 
     @BeforeEach
     void setUp() {
+        read = new FileReaderForTest();
+        om = new ObjectMapper();
         service = new FollowerService();
         directory = "src/test/resources/fixtures/follower/";
     }
 
     @Test
-    void create() throws Exception{
+    void create() throws Exception {
 
-        var file = FileReaderForTest.readJsonNodeFromFile(directory + "create.json");
-        var follower = service.create(file);
+        var file = read.readJsonNodeFromFile(directory + "create.json");
+        var json = om.readTree(file);
+        var follower = service.create(json);
 
         assertEquals(10, follower.getFollowers());
         assertEquals(5, follower.getFollowing());
@@ -29,8 +35,9 @@ void create() throws Exception{
     @Test
     void createZeroCounts() throws Exception {
 
-        var file = FileReaderForTest.readJsonNodeFromFile(directory + "zeroCounts.json");
-        var follower = service.create(file);
+        var file = read.readJsonNodeFromFile(directory + "zeroCounts.json");
+        var json = om.readTree(file);
+        var follower = service.create(json);
 
         assertEquals(0, follower.getFollowers());
         assertEquals(0, follower.getFollowing());

src/test/java/telegram/bot/services/basicStatisticService/MetricsRepositoriesServiceTest.java

@@ -1,5 +1,6 @@
 package telegram.bot.services.basicStatisticService;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import telegram.bot.util.FileReaderForTest;
@@ -9,17 +10,22 @@
 public class MetricsRepositoriesServiceTest {
     private MetricsRepositoriesService service;
     private String directory;
+    private ObjectMapper om;
+    private FileReaderForTest read;
 
     @BeforeEach
     void setUp() {
+        read = new FileReaderForTest();
+        om = new ObjectMapper();
         service = new MetricsRepositoriesService();
         directory = "src/test/resources/fixtures/metricsRepositories/";
     }
 
     @Test
     void create() throws Exception {
-        var file = FileReaderForTest.readJsonNodeFromFile(directory + "create.json");
-        var metrics = service.create(file);
+        var file = read.readJsonNodeFromFile(directory + "create.json");
+        var json = om.readTree(file);
+        var metrics = service.create(json);
 
         assertEquals(25, metrics.getPublicRepos());
         assertEquals(15, metrics.getForkCount());
@@ -29,8 +35,9 @@ void create() throws Exception {
 
     @Test
     void createZeroCount() throws Exception {
-        var file = FileReaderForTest.readJsonNodeFromFile(directory + "zeroCounts.json");
-        var metrics = service.create(file);
+        var file = read.readJsonNodeFromFile(directory + "zeroCounts.json");
+        var json = om.readTree(file);
+        var metrics = service.create(json);
 
         assertEquals(0, metrics.getPublicRepos());
         assertEquals(0, metrics.getForkCount());

src/test/java/telegram/bot/services/basicStatisticService/UserServiceTest.java

@@ -1,5 +1,6 @@
 package telegram.bot.services.basicStatisticService;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import telegram.bot.util.FileReaderForTest;
@@ -10,17 +11,22 @@
 public class UserServiceTest {
     private UserService service;
     private String directory;
+    private ObjectMapper om;
+    private FileReaderForTest read;
 
     @BeforeEach
     void setUp() {
+        read = new FileReaderForTest();
+        om = new ObjectMapper();
         service = new UserService();
         directory = "src/test/resources/fixtures/user/";
     }
 
     @Test
-    void create() throws Exception{
-        var file = FileReaderForTest.readJsonNodeFromFile(directory + "create.json");
-        var user = service.create(file);
+    void create() throws Exception {
+        var file = read.readJsonNodeFromFile(directory + "create.json");
+        var json = om.readTree(file);
+        var user = service.create(json);
 
         assertThat(user.getFullName()).isEqualTo("Mister Smith");
         assertThat(user.getEmail()).isEqualTo("[email protected]");
@@ -30,8 +36,9 @@ void create() throws Exception{
 
     @Test
     void createNotPublic() throws Exception {
-        var file = FileReaderForTest.readJsonNodeFromFile(directory + "notPublic.json");
-        var user = service.create(file);
+        var file = read.readJsonNodeFromFile(directory + "notPublic.json");
+        var json = om.readTree(file);
+        var user = service.create(json);
 
         assertThat(user.getFullName()).isEqualTo(NOT_PUBLIC.getMessage());
         assertThat(user.getEmail()).isEqualTo(NOT_PUBLIC.getMessage());

src/test/java/telegram/bot/util/FileReaderForTest.java

@@ -1,24 +1,20 @@
 package telegram.bot.util;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.AllArgsConstructor;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+@AllArgsConstructor
 public class FileReaderForTest {
-    private static final ObjectMapper objectMapper = new ObjectMapper();
-
-    private static Path normalizeFilePath(String fileName) {
+    private Path normalizeFilePath(String fileName) {
         return Paths.get(fileName)
                 .toAbsolutePath().normalize();
     }
 
-    public static JsonNode readJsonNodeFromFile(String fileName) throws Exception {
+    public String readJsonNodeFromFile(String fileName) throws Exception {
         Path path = normalizeFilePath(fileName);
-        String content = Files.readString(path).trim();
-
-        return objectMapper.readTree(content);
+        return Files.readString(path).trim();
     }
 }