SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to fix issues introduced in Boot 2.0.0.M1

Browse Source
This commit is contained in:
Dave Syer
2017-05-16 18:16:14 +01:00
parent 021a77d997
commit 3f005ab238
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-context/src/test/java/org/springframework/cloud/context/environment/EnvironmentManagerIntegrationTests.java
View File

@@ -21,6 +21,7 @@ import javax.servlet.ServletException;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -61,18 +62,20 @@ public class EnvironmentManagerIntegrationTests {
public void testRefresh() throws Exception {
assertEquals("Hello scope!", properties.getMessage());
// Change the dynamic property source...
this.mvc.perform(post("/application/env").param("message", "Foo")).andExpect(status().isOk()).andExpect(
content().string("{\"message\":\"Foo\"}"));
this.mvc.perform(post("/application/env").param("message", "Foo"))
.andExpect(status().isOk())
.andExpect(content().string("{\"message\":\"Foo\"}"));
assertEquals("Foo", properties.getMessage());
}
@Test
public void testRefreshFails() throws Exception {
try {
this.mvc.perform(post("/application/env").param("delay", "foo")).andExpect(
status().is5xxServerError());
this.mvc.perform(post("/application/env").param("delay", "foo"))
.andExpect(status().is5xxServerError());
fail("expected ServletException");
} catch (ServletException e) {
}
catch (ServletException e) {
// The underlying BindException is not handled by the dispatcher servlet
}
assertEquals(0, properties.getDelay());