From afa1c9358594d9701b9f478e9d3aa1a5dc6b06eb Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 4 May 2017 17:24:28 -0400 Subject: [PATCH] Fix error in mock server test code --- .../web/client/AbstractMockWebServerTestCase.java | 6 +++--- spring-web/src/test/resources/log4j2-test.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-web/src/test/java/org/springframework/web/client/AbstractMockWebServerTestCase.java b/spring-web/src/test/java/org/springframework/web/client/AbstractMockWebServerTestCase.java index 4f0bf95b75..a233ae186b 100644 --- a/spring-web/src/test/java/org/springframework/web/client/AbstractMockWebServerTestCase.java +++ b/spring-web/src/test/java/org/springframework/web/client/AbstractMockWebServerTestCase.java @@ -121,9 +121,9 @@ public class AbstractMockWebServerTestCase { } private MockResponse multipartRequest(RecordedRequest request) { - String contentType = request.getHeader("Content-Type"); - assertTrue(contentType.startsWith("multipart/form-data")); - String boundary = contentType.split("boundary=")[1]; + MediaType mediaType = MediaType.parseMediaType(request.getHeader("Content-Type")); + assertTrue(mediaType.isCompatibleWith(MediaType.MULTIPART_FORM_DATA)); + String boundary = mediaType.getParameter("boundary"); Buffer body = request.getBody(); try { assertPart(body, "form-data", boundary, "name 1", "text/plain", "value 1"); diff --git a/spring-web/src/test/resources/log4j2-test.xml b/spring-web/src/test/resources/log4j2-test.xml index ea049cbca7..8f4217bde4 100644 --- a/spring-web/src/test/resources/log4j2-test.xml +++ b/spring-web/src/test/resources/log4j2-test.xml @@ -6,7 +6,7 @@ - +