From 4264d0becd0ef614d52dd6384ef8e47cb88fb584 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 19 Aug 2022 16:02:10 +0200 Subject: [PATCH 1/2] Fix example in MockMvc Javadoc --- .../java/org/springframework/test/web/servlet/MockMvc.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java index 0c8a28c7fd6..0ffa5aa0b64 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ import org.springframework.web.servlet.DispatcherServlet; * * mockMvc.perform(get("/form")) * .andExpect(status().isOk()) - * .andExpect(content().mimeType("text/html")) + * .andExpect(content().contentType("text/html")) * .andExpect(forwardedUrl("/WEB-INF/layouts/main.jsp")); * * From 38f94799f4bd53b68a1409b02152b1d960e1f838 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 19 Aug 2022 16:05:31 +0200 Subject: [PATCH 2/2] Use andExpectAll() in example in MockMvc Javadoc --- .../org/springframework/test/web/servlet/MockMvc.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java index 0ffa5aa0b64..c0213c4559a 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java @@ -56,9 +56,11 @@ import org.springframework.web.servlet.DispatcherServlet; * MockMvc mockMvc = webAppContextSetup(wac).build(); * * mockMvc.perform(get("/form")) - * .andExpect(status().isOk()) - * .andExpect(content().contentType("text/html")) - * .andExpect(forwardedUrl("/WEB-INF/layouts/main.jsp")); + * .andExpectAll( + * status().isOk(), + * content().contentType("text/html"), + * forwardedUrl("/WEB-INF/layouts/main.jsp") + * ); * * * @author Rossen Stoyanchev