diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BrowsesResourceControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BrowsesResourceControllerIT.java index 202c2a6ae799..9a0be3e40681 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BrowsesResourceControllerIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BrowsesResourceControllerIT.java @@ -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") ))) ; } diff --git a/dspace/config/dspace.cfg b/dspace/config/dspace.cfg index fec6a36afe14..99838f2fcd88 100644 --- a/dspace/config/dspace.cfg +++ b/dspace/config/dspace.cfg @@ -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