1313import com .cf .cfteam .repositories .jpa .codeforces .GroupRepository ;
1414import com .cf .cfteam .repositories .jpa .security .UserRepository ;
1515import lombok .SneakyThrows ;
16- import org .junit .jupiter .api .AfterEach ;
17- import org .junit .jupiter .api .BeforeEach ;
1816import org .junit .jupiter .api .Test ;
1917import org .springframework .beans .factory .annotation .Autowired ;
2018import org .springframework .http .MediaType ;
@@ -48,22 +46,12 @@ public class TeamControllerIntegrationTest extends BaseIntegrationTest {
4846 @ Autowired
4947 private TeamMapper teamMapper ;
5048
51- private static User user ;
52-
53- @ BeforeEach
54- void init () {
55- user = createUser ();
56- user = userRepository .save (user );
57- }
58-
59- @ AfterEach
60- void postDelete () {
61- deleteUserFromDb (user );
62- }
63-
6449 @ Test
6550 @ SneakyThrows
6651 public void getAllGroupsByUser_notEmpty_success () {
52+ User user = createUser ("getAllGroupsByUser_notEmpty_success" );
53+ user = userRepository .save (user );
54+
6755 Group group = createGroup (user );
6856 group = groupRepository .save (group );
6957
@@ -109,6 +97,9 @@ void getAllTeamsByGroup_shouldThrowGroupNotFoundException_whenGroupNotFound() {
10997 @ Test
11098 @ SneakyThrows
11199 public void getTeamById_notEmpty () {
100+ User user = createUser ("getTeamById_notEmpty" );
101+ user = userRepository .save (user );
102+
112103 Group group = createGroup (user );
113104 group = groupRepository .save (group );
114105
@@ -149,6 +140,9 @@ void getTeamById_shouldThrowTeamNotFoundException_whenTeamNotFoundE() {
149140 @ Test
150141 @ SneakyThrows
151142 public void addTeamToGroup_success () {
143+ User user = createUser ("addTeamToGroup_success" );
144+ user = userRepository .save (user );
145+
152146 Group group = createGroup (user );
153147 group = groupRepository .save (group );
154148
@@ -199,6 +193,9 @@ void addTeamToGroup_shouldThrowGroupNotFoundException_whenGroupNotFound() {
199193 @ Test
200194 @ SneakyThrows
201195 public void updateTeam_success () {
196+ User user = createUser ("updateTeam_success" );
197+ user = userRepository .save (user );
198+
202199 Group group = createGroup (user );
203200 group = groupRepository .save (group );
204201
@@ -254,6 +251,9 @@ void updateTeam_shouldThrowTeamNotFoundException_whenTeamNotFound() {
254251 @ Test
255252 @ SneakyThrows
256253 public void deleteTeam_success () {
254+ User user = createUser ("deleteTeam_success" );
255+ user = userRepository .save (user );
256+
257257 Group group = createGroup (user );
258258 group = groupRepository .save (group );
259259
@@ -277,6 +277,9 @@ public void deleteTeam_success() {
277277 @ Test
278278 @ SneakyThrows
279279 public void deleteAllTeamsByGroup_success () {
280+ User user = createUser ("deleteAllTeamsByGroup_success" );
281+ user = userRepository .save (user );
282+
280283 Group group = createGroup (user );
281284 group = groupRepository .save (group );
282285
@@ -335,10 +338,10 @@ private TeamPayload createTeamPayload(String name, String description) {
335338 .build ();
336339 }
337340
338- private User createUser () {
341+ private User createUser (String login ) {
339342 return User .builder ()
340- .name ("User name" )
341- .login ("User login" )
343+ .name ("Team controller User name" )
344+ .login (login )
342345 .hashedPassword ("Password" )
343346 .role (Role .USER )
344347 .build ();
0 commit comments