BAEL-21543: Fix integration tests in spring-boot

kwoyke · kwoyke · commit e8dba2ffd659 · 2020-01-27T20:04:21.000+01:00
diff --git a/spring-boot/src/test/java/com/baeldung/beanvalidation/application/UserControllerIntegrationTest.java b/spring-boot/src/test/java/com/baeldung/beanvalidation/application/UserControllerIntegrationTest.java
@@ -2,9 +2,6 @@
 
 import com.baeldung.beanvalidation.application.controllers.UserController;
 import com.baeldung.beanvalidation.application.repositories.UserRepository;
-
-import java.nio.charset.Charset;
-import static org.assertj.core.api.Assertions.assertThat;
 import org.hamcrest.core.Is;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -18,6 +15,10 @@
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 
+import java.nio.charset.Charset;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 @RunWith(SpringRunner.class)
 @WebMvcTest
 @AutoConfigureMockMvc
@@ -40,9 +41,9 @@ public void whenUserControllerInjected_thenNotNull() throws Exception {
     @Test
     public void whenGetRequestToUsers_thenCorrectResponse() throws Exception {
         mockMvc.perform(MockMvcRequestBuilders.get("/users")
-                .contentType(MediaType.APPLICATION_JSON_UTF8))
+                .contentType(MediaType.APPLICATION_JSON))
                 .andExpect(MockMvcResultMatchers.status().isOk())
-                .andExpect(MockMvcResultMatchers.content().contentType(MediaType.APPLICATION_JSON_UTF8));
+                .andExpect(MockMvcResultMatchers.content().contentType(MediaType.APPLICATION_JSON));
     
     }
     
@@ -52,7 +53,7 @@ public void whenPostRequestToUsersAndValidUser_thenCorrectResponse() throws Exce
         String user = "{\"name\": \"bob\", \"email\" : \"bob@domain.com\"}";
         mockMvc.perform(MockMvcRequestBuilders.post("/users")
                 .content(user)
-                .contentType(MediaType.APPLICATION_JSON_UTF8))
+                .contentType(MediaType.APPLICATION_JSON))
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andExpect(MockMvcResultMatchers.content().contentType(textPlainUtf8));
     }
@@ -62,9 +63,9 @@ public void whenPostRequestToUsersAndInValidUser_thenCorrectReponse() throws Exc
         String user = "{\"name\": \"\", \"email\" : \"bob@domain.com\"}";
         mockMvc.perform(MockMvcRequestBuilders.post("/users")
                 .content(user)
-                .contentType(MediaType.APPLICATION_JSON_UTF8))
+                .contentType(MediaType.APPLICATION_JSON))
                 .andExpect(MockMvcResultMatchers.status().isBadRequest())
                 .andExpect(MockMvcResultMatchers.jsonPath("$.name", Is.is("Name is mandatory")))
-                .andExpect(MockMvcResultMatchers.content().contentType(MediaType.APPLICATION_JSON_UTF8));
+                .andExpect(MockMvcResultMatchers.content().contentType(MediaType.APPLICATION_JSON));
     }
 }
