hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-15 14:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9220 from ksankeerth/dev-9215

Browse Source 
fix: Failure of org.dspace.app.rest.SitemapRestControllerIT when running locally
This commit is contained in:
Alan Orth
2023-12-08 10:37:49 +03:00
committed by GitHub
parent b2dfa9f018 44fc15f74b
commit 344d79bfde
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dspace-server-webapp/src/test/java/org/dspace/app/rest/SitemapRestControllerIT.java
View File

@@ -216,7 +216,12 @@ public class SitemapRestControllerIT extends AbstractControllerIntegrationTest {
//** THEN ** //** THEN **
.andExpect(status().isOk()) .andExpect(status().isOk())
//We expect the content type to match //We expect the content type to match
.andExpect(content().contentType("application/xml;charset=UTF-8")) .andExpect(res -> {
String actual = res.getResponse().getContentType();
assertTrue("Content Type",
"text/xml;charset=UTF-8".equals(actual) ||
"application/xml;charset=UTF-8".equals(actual));
})
.andReturn(); .andReturn();
String response = result.getResponse().getContentAsString(); String response = result.getResponse().getContentAsString();
@@ -232,7 +237,12 @@ public class SitemapRestControllerIT extends AbstractControllerIntegrationTest {
//** THEN ** //** THEN **
.andExpect(status().isOk()) .andExpect(status().isOk())
//We expect the content type to match //We expect the content type to match
.andExpect(content().contentType("application/xml;charset=UTF-8")) .andExpect(res -> {
String actual = res.getResponse().getContentType();
assertTrue("Content Type",
"text/xml;charset=UTF-8".equals(actual) ||
"application/xml;charset=UTF-8".equals(actual));
})
.andReturn(); .andReturn();
String response = result.getResponse().getContentAsString(); String response = result.getResponse().getContentAsString();