Deleted @transactional and added @AfterEach in tests

Author: Alina Tarasova

src/test/java/io/hexlet/blog/controller/api/PostsCommentsControllerTest.java

@@ -10,9 +10,11 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.hexlet.blog.dto.PostCommentDTO;
 import io.hexlet.blog.mapper.PostCommentMapper;
+import io.hexlet.blog.model.User;
 import org.assertj.core.api.Assertions;
 import org.instancio.Instancio;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -24,18 +26,16 @@
 import io.hexlet.blog.repository.PostCommentRepository;
 import io.hexlet.blog.repository.PostRepository;
 import io.hexlet.blog.util.ModelGenerator;
-import io.hexlet.blog.util.UserUtils;
-import jakarta.transaction.Transactional;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
+import io.hexlet.blog.repository.UserRepository;
 
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 
 
 @SpringBootTest
-@Transactional
 @AutoConfigureMockMvc
 public class PostsCommentsControllerTest {
 
@@ -55,7 +55,7 @@ public class PostsCommentsControllerTest {
     private PostCommentRepository postCommentRepository;
 
     @Autowired
-    private UserUtils userUtils;
+    private UserRepository userRepository;
 
     private JwtRequestPostProcessor token;
 
@@ -67,6 +67,8 @@ public class PostsCommentsControllerTest {
     @Autowired
     private PostCommentMapper postCommentMapper;
 
+    private User testUser;
+
 
     @BeforeEach
     public void setUp() {
@@ -75,29 +77,38 @@ public void setUp() {
                 .apply(springSecurity())
                 .build();
 
-        token = jwt().jwt(builder -> builder.subject("[email protected]"));
+        testUser = Instancio.of(modelGenerator.getUserModel()).create();
+        userRepository.save(testUser);
+        token = jwt().jwt(builder -> builder.subject(testUser.getEmail()));
 
         testPost = Instancio.of(modelGenerator.getPostModel())
                 .create();
-        testPost.setAuthor(userUtils.getTestUser());
+        testPost.setAuthor(testUser);
         postRepository.save(testPost);
 
         var testPost2 = Instancio.of(modelGenerator.getPostModel())
                 .create();
-        testPost2.setAuthor(userUtils.getTestUser());
+        testPost2.setAuthor(testUser);
         postRepository.save(testPost2);
 
         var testPostComment = Instancio.of(modelGenerator.getPostCommentModel()).create();
         testPostComment.setPost(testPost);
-        testPostComment.setAuthor(userUtils.getTestUser());
+        testPostComment.setAuthor(testUser);
         postCommentRepository.save(testPostComment);
 
         var testPostComment2 = Instancio.of(modelGenerator.getPostCommentModel()).create();
         testPostComment2.setPost(testPost2);
-        testPostComment2.setAuthor(userUtils.getTestUser());
+        testPostComment2.setAuthor(testUser);
         postCommentRepository.save(testPostComment2);
     }
 
+    @AfterEach
+    public void clean() {
+        postCommentRepository.deleteAll();
+        postRepository.deleteAll();
+        userRepository.deleteAll();
+    }
+
     @Test
     public void testIndex() throws Exception {
         var result = mockMvc.perform(get("/api/posts_comments").with(token))

src/test/java/io/hexlet/blog/controller/api/PostsControllerTest.java

@@ -13,8 +13,11 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import io.hexlet.blog.dto.PostDTO;
+import io.hexlet.blog.model.User;
+import io.hexlet.blog.repository.UserRepository;
 import org.assertj.core.api.Assertions;
 import org.instancio.Instancio;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openapitools.jackson.nullable.JsonNullable;
@@ -32,7 +35,6 @@
 import io.hexlet.blog.model.Post;
 import io.hexlet.blog.repository.PostRepository;
 import io.hexlet.blog.util.ModelGenerator;
-import io.hexlet.blog.util.UserUtils;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
@@ -63,12 +65,14 @@ public class PostsControllerTest {
     private PostRepository postRepository;
 
     @Autowired
-    private UserUtils userUtils;
+    private UserRepository userRepository;
 
     private JwtRequestPostProcessor token;
 
     private Post testPost;
 
+    private User testUser;
+
 
     @BeforeEach
     public void setUp() {
@@ -77,11 +81,19 @@ public void setUp() {
                 .apply(springSecurity())
                 .build();
 
-        token = jwt().jwt(builder -> builder.subject("[email protected]"));
+        testUser = Instancio.of(modelGenerator.getUserModel()).create();
+        userRepository.save(testUser);
+        token = jwt().jwt(builder -> builder.subject(testUser.getEmail()));
 
         testPost = Instancio.of(modelGenerator.getPostModel())
                 .create();
-        testPost.setAuthor(userUtils.getTestUser());
+        testPost.setAuthor(testUser);
+    }
+
+    @AfterEach
+    public void clean() {
+        postRepository.deleteAll();
+        userRepository.deleteAll();
     }
 
     @Test

src/test/java/io/hexlet/blog/controller/api/UsersControllerTest.java

@@ -19,6 +19,7 @@
 import io.hexlet.blog.mapper.UserMapper;
 import org.assertj.core.api.Assertions;
 import org.instancio.Instancio;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,11 +76,14 @@ public void setUp() {
                 .apply(springSecurity())
                 .build();
 
-        token = jwt().jwt(builder -> builder.subject("[email protected]"));
-
-        testUser = Instancio.of(modelGenerator.getUserModel())
-                .create();
+        testUser = Instancio.of(modelGenerator.getUserModel()).create();
         userRepository.save(testUser);
+        token = jwt().jwt(builder -> builder.subject(testUser.getEmail()));
+    }
+
+    @AfterEach
+    public void clean() {
+        userRepository.deleteAll();
     }
 
     @Test