Fixup merge problem

This commit is contained in:
Phillip Webb
2016-04-10 00:05:28 -07:00
parent ae249f7568
commit 84e091676b

View File

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