Skip to content

Commit aa9cc4a

Browse files
committed
Fix errors accidentally added to InfoEndpointDocumentationTests
1 parent 64aefcb commit aa9cc4a

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointDocumentationTests.java

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@
3838
import org.springframework.restdocs.payload.JsonFieldType;
3939
import org.springframework.restdocs.payload.ResponseFieldsSnippet;
4040

41-
import static org.assertj.core.api.Assertions.assertThat;
4241
import static org.springframework.restdocs.payload.PayloadDocumentation.beneathPath;
4342
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
4443
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
44+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
45+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
4546

4647
/**
4748
* Tests for generating documentation describing the {@link InfoEndpoint}.
@@ -51,9 +52,10 @@
5152
class InfoEndpointDocumentationTests extends MockMvcEndpointDocumentationTests {
5253

5354
@Test
54-
void info() {
55-
assertThat(this.mvc.get().uri("/actuator/info")).hasStatusOk()
56-
.apply(MockMvcRestDocumentation.document("info", gitInfo(), buildInfo(), osInfo(), processInfo()));
55+
void info() throws Exception {
56+
this.mockMvc.perform(get("/actuator/info"))
57+
.andExpect(status().isOk())
58+
.andDo(MockMvcRestDocumentation.document("info", gitInfo(), buildInfo(), osInfo(), processInfo()));
5759
}
5860

5961
private ResponseFieldsSnippet gitInfo() {
@@ -95,20 +97,7 @@ private ResponseFieldsSnippet processInfo() {
9597
fieldWithPath("parentPid").description("Parent Process ID (or -1).").type(JsonFieldType.NUMBER),
9698
fieldWithPath("owner").description("Process owner.").type(JsonFieldType.STRING),
9799
fieldWithPath("cpus").description("Number of CPUs available to the process.")
98-
.type(JsonFieldType.NUMBER),
99-
fieldWithPath("memory").description("Memory information."),
100-
fieldWithPath("memory.heap").description("Heap memory."),
101-
fieldWithPath("memory.heap.init").description("The number of bytes initially requested by the JVM."),
102-
fieldWithPath("memory.heap.used").description("The number of bytes currently being used."),
103-
fieldWithPath("memory.heap.committed").description("The number of bytes committed for JVM use."),
104-
fieldWithPath("memory.heap.max")
105-
.description("The maximum number of bytes that can be used by the JVM (or -1)."),
106-
fieldWithPath("memory.nonHeap").description("Non-heap memory."),
107-
fieldWithPath("memory.nonHeap.init").description("The number of bytes initially requested by the JVM."),
108-
fieldWithPath("memory.nonHeap.used").description("The number of bytes currently being used."),
109-
fieldWithPath("memory.nonHeap.committed").description("The number of bytes committed for JVM use."),
110-
fieldWithPath("memory.nonHeap.max")
111-
.description("The maximum number of bytes that can be used by the JVM (or -1)."));
100+
.type(JsonFieldType.NUMBER));
112101
}
113102

114103
@Configuration(proxyBeanMethods = false)

0 commit comments

Comments
 (0)