Skip to content

browse - Updated IT according to updated cfg #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
milanmajchrak merged 2 commits into from
Jun 22, 2023
Merged

browse - Updated IT according to updated cfg #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e69174
Removed not defined search options.
milanmajchrak Jun 22, 2023
e7efae9
Updated IT according to a cfg updates.
milanmajchrak Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions dspace-server-webapp/src/test/java/org/dspace/app/rest/BrowsesResourceControllerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,19 @@ public void findAll() throws Exception {
//Our default Discovery config has 4 browse indexes so we expect this to be reflected in the page
// object
.andExpect(jsonPath("$.page.size", is(20)))
.andExpect(jsonPath("$.page.totalElements", is(8)))
.andExpect(jsonPath("$.page.totalElements", is(4)))
.andExpect(jsonPath("$.page.totalPages", is(1)))
.andExpect(jsonPath("$.page.number", is(0)))

//The array of browse index should have a size 8
.andExpect(jsonPath("$._embedded.browses", hasSize(8)))
//The array of browse index should have a size 4
.andExpect(jsonPath("$._embedded.browses", hasSize(4)))

//Check that all (and only) the default browse indexes are present
.andExpect(jsonPath("$._embedded.browses", containsInAnyOrder(
BrowseIndexMatcher.dateIssuedBrowseIndex("asc"),
BrowseIndexMatcher.contributorBrowseIndex("asc"),
BrowseIndexMatcher.titleBrowseIndex("asc"),
BrowseIndexMatcher.subjectBrowseIndex("asc"),
BrowseIndexMatcher.publisherBrowseIndex("asc"),
BrowseIndexMatcher.languageBrowseIndex("asc"),
BrowseIndexMatcher.itemtypeBrowseIndex("asc"),
BrowseIndexMatcher.rightsBrowseIndex("asc")
BrowseIndexMatcher.subjectBrowseIndex("asc")
)))
;
}
Expand Down
4 changes: 0 additions & 4 deletions dspace/config/dspace.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,10 +1068,6 @@ webui.browse.index.1 = dateissued:item:dateissued
webui.browse.index.2 = author:metadata:dc.contributor.*\,dc.creator:text
webui.browse.index.3 = title:item:title
webui.browse.index.4 = subject:metadata:dc.subject.*:text
webui.browse.index.5 = publisher:metadata:dc.publisher:text
webui.browse.index.6 = language:metadata:dc.language.iso:iso_lang
webui.browse.index.7 = itemtype:metadata:dc.type:text
webui.browse.index.8 = rights:metadata:dc.rights.label:text

## example of authority-controlled browse category - see authority control config
#webui.browse.index.5 = lcAuthor:metadataAuthority:dc.contributor.author:authority
Expand Down