Fixup merge problem

pull/5644/merge
Phillip Webb 9 years ago
parent ae249f7568
commit 84e091676b

@ -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

Loading…
Cancel
Save