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

DS-3489: Fixing tests after rebase part 1

Browse Source
This commit is contained in:
Tom Desair
2018-07-02 17:31:02 +02:00
parent 3dc2024265
commit ad1a3310f0
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dspace-spring-rest/src/main/java/org/dspace/app/rest/converter/query/SearchQueryConverter.java
View File

@@ -2,18 +2,18 @@
* The contents of this file are subject to the license and copyright * The contents of this file are subject to the license and copyright
* detailed in the LICENSE and NOTICE files at the root of the source * detailed in the LICENSE and NOTICE files at the root of the source
* tree and available online at * tree and available online at
* <p> *
* http://www.dspace.org/license/ * http://www.dspace.org/license/
*/ */
package org.dspace.app.rest.converter.query; package org.dspace.app.rest.converter.query;
import java.util.LinkedList;
import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.dspace.app.rest.model.query.RestSearchOperator; import org.dspace.app.rest.model.query.RestSearchOperator;
import org.dspace.app.rest.parameter.SearchFilter; import org.dspace.app.rest.parameter.SearchFilter;
import org.apache.commons.collections4.CollectionUtils;
import java.util.LinkedList;
import java.util.List;
public class SearchQueryConverter { public class SearchQueryConverter {

5
dspace-spring-rest/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java
View File

@@ -209,9 +209,8 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
.andExpect(jsonPath("$.name", is("author"))) .andExpect(jsonPath("$.name", is("author")))
//The facetType has to be 'text' because that's how the author facet is configured by default //The facetType has to be 'text' because that's how the author facet is configured by default
.andExpect(jsonPath("$.facetType", is("text"))) .andExpect(jsonPath("$.facetType", is("text")))
//Because we've constructed such a structure so that we have more than 2 (size) authors, there //We only request value starting with "smith", so we expect to only receive one page
// needs to be a next link .andExpect(jsonPath("$._links.next").doesNotExist())
.andExpect(jsonPath("$._links.next.href", containsString("api/discover/facets/author?prefix=smith&page")))
//There always needs to be a self link //There always needs to be a self link
.andExpect(jsonPath("$._links.self.href", containsString("api/discover/facets/author?prefix=smith"))) .andExpect(jsonPath("$._links.self.href", containsString("api/discover/facets/author?prefix=smith")))
//Because there are more authors than is represented (because of the size param), hasMore has to //Because there are more authors than is represented (because of the size param), hasMore has to

2
dspace-spring-rest/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java
View File

@@ -95,7 +95,7 @@ public class AbstractControllerIntegrationTest extends AbstractIntegrationTestWi
DefaultMockMvcBuilder mockMvcBuilder = webAppContextSetup(webApplicationContext) DefaultMockMvcBuilder mockMvcBuilder = webAppContextSetup(webApplicationContext)
//Always log the response to debug //Always log the response to debug
.alwaysDo(MockMvcResultHandlers.log()) .alwaysDo(MockMvcResultHandlers.print())
//Add all filter implementations //Add all filter implementations
.addFilters(new ErrorPageFilter()) .addFilters(new ErrorPageFilter())
.addFilters(requestFilters.toArray(new Filter[requestFilters.size()])); .addFilters(requestFilters.toArray(new Filter[requestFilters.size()]));