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

Fixup merge problem

This commit is contained in:
Phillip Webb 2016-04-10 00:05:28 -07:00
parent ae249f7568
commit 84e091676b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
View File

@ -341,10 +341,10 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
this.container = factory.getEmbeddedServletContainer(exampleServletRegistration(), this.container = factory.getEmbeddedServletContainer(exampleServletRegistration(),
errorServletRegistration()); errorServletRegistration());
this.container.start(); this.container.start();
assertThat(getResponse(getLocalUrl("/hello"), HttpMethod.PUT), assertThat(getResponse(getLocalUrl("/hello"), HttpMethod.PUT))
equalTo("Hello World")); .isEqualTo("Hello World");
assertThat(getResponse(getLocalUrl("/bang"), HttpMethod.PUT), assertThat(getResponse(getLocalUrl("/bang"), HttpMethod.PUT))
equalTo("Hello World")); .isEqualTo("Hello World");
} }
@Test @Test