root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch '2.2.x'

This commit is contained in:
Stephane Nicoll 2020-03-08 17:23:56 +01:00
parent c28d793eeb 1fdb08300b
commit 278f769f80
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/StatusTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,7 +16,7 @@
package org.springframework.boot.actuate.health; package org.springframework.boot.actuate.health;
import com.couchbase.client.deps.com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -72,7 +72,7 @@ class StatusTests {
Status status = new Status("spring", "boot"); Status status = new Status("spring", "boot");
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
String json = mapper.writeValueAsString(status); String json = mapper.writeValueAsString(status);
assertThat(json).isEqualTo("{\"code\":\"spring\",\"description\":\"boot\"}"); assertThat(json).isEqualTo("{\"description\":\"boot\",\"status\":\"spring\"}");
} }
} }