From 84e091676b0feff6e31c722724c4a44577fdbb63 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sun, 10 Apr 2016 00:05:28 -0700 Subject: [PATCH] Fixup merge problem --- .../AbstractEmbeddedServletContainerFactoryTests.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java index efef94b3e9..70508de2f3 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java @@ -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