From 3fc278688c06bf9d02eaec1897db56f6469ebcbd Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 1 Apr 2019 11:16:53 -0400 Subject: [PATCH] Fix HttpProxyScenarioTests for proper date format https://build.spring.io/browse/INT-MASTERSPRING40-663/ https://build.spring.io/browse/INT-FATS5IC-832/ **Cherry-pick to 5.1.x & 5.0.x** --- .../integration/http/HttpProxyScenarioTests.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java index 3627ed8efe..397dd941f0 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java @@ -25,6 +25,7 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.Calendar; +import java.util.Locale; import org.junit.Test; import org.junit.runner.RunWith; @@ -46,8 +47,7 @@ import org.springframework.messaging.PollableChannel; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; @@ -61,10 +61,10 @@ import org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter; /** * @author Artem Bilan * @author Gary Russell + * * @since 3.0 */ -@ContextConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @DirtiesContext public class HttpProxyScenarioTests { @@ -86,8 +86,9 @@ public class HttpProxyScenarioTests { @Test public void testHttpProxyScenario() throws Exception { - DateTimeFormatter dateTimeFormatter = DateTimeFormatter.RFC_1123_DATE_TIME; ZoneId GMT = ZoneId.of("GMT"); + DateTimeFormatter dateTimeFormatter = + DateTimeFormatter.ofPattern("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US).withZone(GMT); Calendar c = Calendar.getInstance(); c.set(Calendar.MILLISECOND, 0); @@ -129,7 +130,7 @@ public class HttpProxyScenarioTests { assertThat(httpHeaders.getFirst("If-Unmodified-Since")).isEqualTo(ifUnmodifiedSinceValue); assertThat(httpHeaders.getFirst("Connection")).isEqualTo("Keep-Alive"); - MultiValueMap responseHeaders = new LinkedMultiValueMap(httpHeaders); + MultiValueMap responseHeaders = new LinkedMultiValueMap<>(httpHeaders); responseHeaders.set("Connection", "close"); responseHeaders.set("Content-Disposition", contentDispositionValue); return new ResponseEntity<>(responseHeaders, HttpStatus.OK); @@ -186,7 +187,7 @@ public class HttpProxyScenarioTests { assertThat(entity.getBody()).isInstanceOf(byte[].class); assertThat(new String((byte[]) entity.getBody())).isEqualTo("foo"); - MultiValueMap responseHeaders = new LinkedMultiValueMap(httpHeaders); + MultiValueMap responseHeaders = new LinkedMultiValueMap<>(httpHeaders); responseHeaders.set("Connection", "close"); responseHeaders.set("Content-Type", "text/plain"); return new ResponseEntity(responseHeaders, HttpStatus.OK);