Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREST-892 - Fixed integration tests checking for HTTP Content-Type headers.

Browse Source 
Spring 4.3 returns Content-Type headers including the character encoding. We needed to relax our assertions on the content type headers to only check for compatibility.
This commit is contained in:
Oliver Gierke
2016-09-10 22:53:18 +02:00
parent 4cb0632518
commit 360ed8a9b2
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-data-rest-tests/spring-data-rest-tests-core/src/test/java/org/springframework/data/rest/tests/CommonWebTests.java
View File

@@ -102,7 +102,7 @@ public abstract class CommonWebTests extends AbstractWebIntegrationTests {
public void servesHalWhenRequested() throws Exception {
mvc.perform(get("/")). //
andExpect(content().contentType(MediaTypes.HAL_JSON)). //
andExpect(content().contentTypeCompatibleWith(MediaTypes.HAL_JSON)). //
andExpect(jsonPath("$._links", notNullValue()));
}
@@ -211,7 +211,7 @@ public abstract class CommonWebTests extends AbstractWebIntegrationTests {
accept(ALPS_MEDIA_TYPE))
.//
andExpect(status().isOk()).//
andExpect(content().contentType(ALPS_MEDIA_TYPE));
andExpect(content().contentTypeCompatibleWith(ALPS_MEDIA_TYPE));
}
/**

3
spring-data-rest-tests/spring-data-rest-tests-core/src/test/java/org/springframework/data/rest/tests/TestMvcClient.java
View File

@@ -99,7 +99,7 @@ public class TestMvcClient {
public MockHttpServletResponse request(String href, MediaType contentType) throws Exception {
return mvc.perform(get(href).accept(contentType)). //
andExpect(status().isOk()). //
andExpect(content().contentType(contentType)). //
andExpect(content().contentTypeCompatibleWith(contentType)). //
andReturn().getResponse();
}
@@ -191,6 +191,7 @@ public class TestMvcClient {
/**
* Follow URL supplied as a string with a specific Accept header.
*
* @param href
* @param accept
* @return

5
spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/ProfileIntegrationTests.java
View File

@@ -32,7 +32,6 @@ import org.springframework.data.rest.webmvc.RestMediaTypes;
import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurerAdapter;
import org.springframework.hateoas.Link;
import org.springframework.hateoas.LinkDiscoverers;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.web.WebAppConfiguration;
@@ -115,10 +114,10 @@ public class ProfileIntegrationTests extends AbstractControllerIntegrationTests
Link profileLink = client.discoverUnique(peopleLink, ProfileResourceProcessor.PROFILE_REL);
client.follow(profileLink, RestMediaTypes.ALPS_JSON).andExpect(status().is2xxSuccessful())
.andExpect(header().string(HttpHeaders.CONTENT_TYPE, RestMediaTypes.ALPS_JSON_VALUE));
.andExpect(content().contentTypeCompatibleWith(RestMediaTypes.ALPS_JSON));
client.follow(profileLink, RestMediaTypes.SCHEMA_JSON).andExpect(status().is2xxSuccessful())
.andExpect(header().string(HttpHeaders.CONTENT_TYPE, RestMediaTypes.SCHEMA_JSON_VALUE));
.andExpect(content().contentTypeCompatibleWith(RestMediaTypes.SCHEMA_JSON));
}
}