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

Fixed browse tests

Browse Source
This commit is contained in:
Raf Ponsaerts
2021-03-04 15:28:38 +01:00
parent a7db90c13a
commit 5f6ae856cd
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dspace-api/src/test/java/org/dspace/builder/ItemBuilder.java
View File

@@ -87,7 +87,8 @@ public class ItemBuilder extends AbstractDSpaceObjectBuilder<Item> {
}
public ItemBuilder withSubject(final String subject, final String authority, final int confidence) {
return addMetadataValue(item, MetadataSchemaEnum.DC.getName(), "subject", null, null, subject, authority, confidence);
return addMetadataValue(item, MetadataSchemaEnum.DC.getName(), "subject", null, null,
subject, authority, confidence);
}
public ItemBuilder withRelationshipType(final String relationshipType) {

24
dspace-server-webapp/src/test/java/org/dspace/app/rest/BrowsesResourceControllerIT.java
View File

@@ -250,24 +250,24 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
.withTitle("Public item 1")
.withIssueDate("2017-10-17")
.withAuthor("Smith, Donald").withAuthor("Doe, John")
.withSubject("ExtraEntry", "authority_1", 600)
.withSubject("History of religion", "VR110102", 600)
.build();
Item publicItem2 = ItemBuilder.createItem(context, col2)
.withTitle("Public item 2")
.withIssueDate("2016-02-13")
.withAuthor("Smith, Maria").withAuthor("Doe, Jane")
.withSubject("TestingForMore", "authority_2", 600)
.withSubject("ExtraEntry", "authority_1", 600)
.withSubject("Church studies", "VR110103", 600)
.withSubject("History of religion", "VR110102", 600)
.build();
Item publicItem3 = ItemBuilder.createItem(context, col2)
.withTitle("Public item 2")
.withIssueDate("2016-02-13")
.withAuthor("Smith, Maria").withAuthor("Doe, Jane")
.withSubject("AnotherTest", "authority_3", 600)
.withSubject("TestingForMore", "authority_2", 600)
.withSubject("ExtraEntry", "authority_1", 600)
.withSubject("Missionary studies", "VR110104", 600)
.withSubject("Church studies", "VR110103", 600)
.withSubject("History of religion", "VR110102", 600)
.build();
context.restoreAuthSystemState();
@@ -290,9 +290,9 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
//Check that the subject matches as expected
//Verify that they're sorted alphabetically
.andExpect(jsonPath("$._embedded.entries",
contains(BrowseEntryResourceMatcher.matchBrowseEntry("AnotherTest", "authority_3", 1),
BrowseEntryResourceMatcher.matchBrowseEntry("ExtraEntry", "authority_1", 3),
BrowseEntryResourceMatcher.matchBrowseEntry("TestingForMore", "authority_2", 2)
containsInAnyOrder(BrowseEntryResourceMatcher.matchBrowseEntry("Missionary studies", "VR110104", 1),
BrowseEntryResourceMatcher.matchBrowseEntry("History of religion", "VR110102", 3),
BrowseEntryResourceMatcher.matchBrowseEntry("Church studies", "VR110103", 2)
)));
getClient().perform(get("/api/discover/browses/subject/entries")
@@ -311,9 +311,9 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
//Check that the subject matches as expected
//Verify that they're sorted alphabetically
.andExpect(jsonPath("$._embedded.entries",
contains(BrowseEntryResourceMatcher.matchBrowseEntry("AnotherTest", "authority_3", 1),
BrowseEntryResourceMatcher.matchBrowseEntry("ExtraEntry", "authority_1", 3),
BrowseEntryResourceMatcher.matchBrowseEntry("TestingForMore", "authority_2", 2)
containsInAnyOrder(BrowseEntryResourceMatcher.matchBrowseEntry("Missionary studies", "VR110104", 1),
BrowseEntryResourceMatcher.matchBrowseEntry("History of religion", "VR110102", 3),
BrowseEntryResourceMatcher.matchBrowseEntry("Church studies", "VR110103", 2)
)));
}