From 999df24173a5dcda13dfabd26c680d4e2169b31c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <xpokorn8@fi.muni.cz>
Date: Sat, 6 May 2023 23:26:48 +0200
Subject: [PATCH] fixing tests
---
.../user/UserControllerTest.java | 34 ++++++++-----------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserControllerTest.java b/application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserControllerTest.java
index 607b3c43..0f250d2e 100644
--- a/application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserControllerTest.java
+++ b/application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserControllerTest.java
@@ -5,11 +5,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.fuseri.model.dto.course.CourseDto;
import org.fuseri.model.dto.course.LanguageTypeDto;
import org.fuseri.model.dto.course.ProficiencyLevelDto;
-import org.fuseri.model.dto.exercise.QuestionCreateDto;
import org.fuseri.model.dto.user.UserAddLanguageDto;
import org.fuseri.model.dto.user.UserCreateDto;
import org.fuseri.model.dto.user.UserDto;
-import org.fuseri.model.dto.user.UserLoginDto;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
@@ -40,21 +38,17 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@AutoConfigureMockMvc
class UserControllerTest {
+ private final UserCreateDto USER_CREATE_DTO = new UserCreateDto(
+ "xnovak", "xnovak@emample.com", "Peter", "Novak");
+ private final UserDto USER_DTO = new UserDto(
+ "xnovak", "xnovak@emample.com", "Peter", "Novak", new HashMap<>());
@Autowired
private ObjectMapper objectMapper;
-
@Autowired
private MockMvc mockMvc;
-
@MockBean
private UserFacade userFacade;
- private final UserCreateDto USER_CREATE_DTO = new UserCreateDto(
- "xnovak", "xnovak@emample.com", "Peter", "Novak");
-
- private final UserDto USER_DTO = new UserDto(
- "xnovak", "xnovak@emample.com", "Peter", "Novak",new HashMap<>());
-
private static Stream<UserCreateDto> invalidUsers() {
return Stream.of(
new UserCreateDto("", "xnovak@emample.com", "Peter", "Novak"),
@@ -68,6 +62,10 @@ class UserControllerTest {
);
}
+ private static String asJsonString(final Object obj) throws JsonProcessingException {
+ return new ObjectMapper().writeValueAsString(obj);
+ }
+
@WithMockUser(authorities = {"SCOPE_test_1"})
@Test
void createUser() throws Exception {
@@ -120,7 +118,7 @@ class UserControllerTest {
.andExpect(status().isNoContent());
}
- @WithMockUser(authorities = {})
+ @WithMockUser(authorities = {"SCOPE_test_1"})
@Test
void update() throws Exception {
Long id = 1L;
@@ -138,7 +136,7 @@ class UserControllerTest {
Long id = 1L;
String name = "History Spanish";
List<CourseDto> courses = List.of(
- new CourseDto( name, 10, LanguageTypeDto.SPANISH, ProficiencyLevelDto.B2)
+ new CourseDto(name, 10, LanguageTypeDto.SPANISH, ProficiencyLevelDto.B2)
);
Mockito.when(userFacade.getFinished(id)).thenReturn(courses);
mockMvc.perform(get("/users/{id}/finished-courses", 1L))
@@ -162,7 +160,7 @@ class UserControllerTest {
.andExpect(jsonPath("$[0].name", equalTo(name)));
}
- @WithMockUser(authorities = {})
+ @WithMockUser(authorities = {"SCOPE_test_1"})
@Test
void addLanguage() throws Exception {
Long id = 1L;
@@ -172,14 +170,10 @@ class UserControllerTest {
UserDto userWithLanguages = USER_DTO;
userWithLanguages.setLanguageProficiency(Map.of(language, proficiency));
- Mockito.when(userFacade.addLanguageProficiency(ArgumentMatchers.isA(Long.class),ArgumentMatchers.isA(UserAddLanguageDto.class))).thenReturn(userWithLanguages);
+ Mockito.when(userFacade.addLanguageProficiency(ArgumentMatchers.isA(Long.class), ArgumentMatchers.isA(UserAddLanguageDto.class))).thenReturn(userWithLanguages);
mockMvc.perform(put("/users/{id}/languages", id)
- .contentType(MediaType.APPLICATION_JSON)
- .content(asJsonString(languageDto)))
+ .contentType(MediaType.APPLICATION_JSON)
+ .content(asJsonString(languageDto)))
.andExpect(status().isOk());
}
-
- private static String asJsonString(final Object obj) throws JsonProcessingException {
- return new ObjectMapper().writeValueAsString(obj);
- }
}
\ No newline at end of file
--
GitLab