hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

added tests that prove search links in facet values don't contain the configuration

Browse Source
This commit is contained in:
Mykhaylo
2021-03-16 16:09:28 +01:00
parent 2b4f22be65
commit 3961503fbf
2 changed files with 149 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java
View File

@@ -4960,4 +4960,141 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
))
.andExpect(jsonPath("$._links.self.href", containsString("/api/discover/search/objects")));
}
@Test
public void discoverSearchFacetValuesTest() throws Exception {
context.turnOffAuthorisationSystem();
parentCommunity = CommunityBuilder.createCommunity(context)
.withName("Parent Community").build();
Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
.withName("Sub Community").build();
Collection col1 = CollectionBuilder.createCollection(context, child1)
.withName("Collection 1").build();
Collection col2 = CollectionBuilder.createCollection(context, child1)
.withName("Collection 2").build();
ItemBuilder.createItem(context, col1)
.withTitle("Public Test Item")
.withIssueDate("2010-10-17")
.withAuthor("Smith, Donald")
.withSubject("ExtraEntry").build();
ItemBuilder.createItem(context, col2)
.withTitle("Withdrawn Test Item")
.withIssueDate("1990-02-13")
.withAuthor("Smith, Maria")
.withAuthor("Doe, Jane")
.withSubject("ExtraEntry")
.withdrawn().build();
ItemBuilder.createItem(context, col2)
.withTitle("Private Test Item")
.withIssueDate("2010-02-13")
.withAuthor("Smith, Maria")
.withAuthor("Doe, Jane")
.withSubject("AnotherTest")
.withSubject("ExtraEntry")
.makeUnDiscoverable().build();
context.restoreAuthSystemState();
String adminToken = getAuthToken(admin.getEmail(), password);
getClient(adminToken).perform(get("/api/discover/facets/discoverable")
.param("configuration", "administrativeView")
.param("sort", "score,DESC")
.param("page", "0")
.param("size", "10"))
.andExpect(status().isOk())
.andExpect(jsonPath("$._links.self.href",containsString(
"/api/discover/facets/discoverable?configuration=administrativeView&sort=score,DESC")))
.andExpect(jsonPath("$._embedded.values", Matchers.containsInAnyOrder(
SearchResultMatcher.matchEmbeddedFacetValues("true", 2, "discover",
"/api/discover/search/objects?configuration=administrativeView&f.discoverable=true,equals"),
SearchResultMatcher.matchEmbeddedFacetValues("false", 1, "discover",
"/api/discover/search/objects?configuration=administrativeView&f.discoverable=false,equals")
)));
}
@Test
public void discoverSearchFacetValuesPaginationTest() throws Exception {
context.turnOffAuthorisationSystem();
parentCommunity = CommunityBuilder.createCommunity(context)
.withName("Parent Community").build();
Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
.withName("Sub Community").build();
Collection col1 = CollectionBuilder.createCollection(context, child1)
.withName("Collection 1").build();
Collection col2 = CollectionBuilder.createCollection(context, child1)
.withName("Collection 2").build();
ItemBuilder.createItem(context, col1)
.withTitle("Public Test Item")
.withIssueDate("2010-10-17")
.withAuthor("Smith, Donald")
.withSubject("ExtraEntry").build();
ItemBuilder.createItem(context, col2)
.withTitle("Withdrawn Test Item")
.withIssueDate("1990-02-13")
.withAuthor("Smith, Maria")
.withAuthor("Doe, Jane")
.withSubject("ExtraEntry")
.withdrawn().build();
ItemBuilder.createItem(context, col2)
.withTitle("Private Test Item")
.withIssueDate("2010-02-13")
.withAuthor("Smith, Maria")
.withAuthor("Doe, Jane")
.withSubject("AnotherTest")
.withSubject("ExtraEntry")
.makeUnDiscoverable().build();
context.restoreAuthSystemState();
String adminToken = getAuthToken(admin.getEmail(), password);
getClient(adminToken).perform(get("/api/discover/facets/discoverable")
.param("configuration", "administrativeView")
.param("sort", "score,DESC")
.param("page", "0")
.param("size", "1"))
.andExpect(status().isOk())
.andExpect(jsonPath("$._links.self.href",containsString(
"/api/discover/facets/discoverable?configuration=administrativeView&sort=score,DESC")))
.andExpect(jsonPath("$._links.next.href",containsString(
"/api/discover/facets/discoverable?configuration=administrativeView&sort=score,DESC&page=1&size=1")))
.andExpect(jsonPath("$._embedded.values", Matchers.contains(
SearchResultMatcher.matchEmbeddedFacetValues("true", 2, "discover",
"/api/discover/search/objects?configuration=administrativeView&f.discoverable=true,equals")
)));
getClient(adminToken).perform(get("/api/discover/facets/discoverable")
.param("configuration", "administrativeView")
.param("sort", "score,DESC")
.param("page", "1")
.param("size", "1"))
.andExpect(status().isOk())
.andExpect(jsonPath("$._links.first.href",containsString(
"/api/discover/facets/discoverable?configuration=administrativeView&sort=score,DESC&page=0&size=1")))
.andExpect(jsonPath("$._links.prev.href",containsString(
"/api/discover/facets/discoverable?configuration=administrativeView&sort=score,DESC&page=0&size=1")))
.andExpect(jsonPath("$._links.self.href",containsString(
"/api/discover/facets/discoverable?configuration=administrativeView&sort=score,DESC&page=1&size=1")))
.andExpect(jsonPath("$._embedded.values", Matchers.contains(
SearchResultMatcher.matchEmbeddedFacetValues("false", 1, "discover",
"/api/discover/search/objects?configuration=administrativeView&f.discoverable=false,equals")
)));
}
}

12
dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SearchResultMatcher.java
View File

@@ -83,4 +83,16 @@ public class SearchResultMatcher {
))
);
}
public static Matcher<? super Object> matchEmbeddedFacetValues(String label, int count,
String type,
String search_href) {
return allOf(
hasJsonPath("$.label", is(label)),
hasJsonPath("$.count", is(count)),
hasJsonPath("$.type", is(type)),
hasJsonPath("$._links.search.href", containsString(search_href))
);
}
}