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

fix failed tests

Browse Source
This commit is contained in:
Mykhaylo
2021-09-24 13:08:55 +02:00
parent b2996ab784
commit 7140d4ca5c
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/java/org/dspace/content/WorkspaceItemServiceImpl.java
View File

@@ -121,8 +121,6 @@ public class WorkspaceItemServiceImpl implements WorkspaceItemService {
MetadataSchema metadataSchema = metadataField.getMetadataSchema();
itemService.addMetadata(context, item, metadataSchema.getName(), metadataField.getElement(),
metadataField.getQualifier(), original.getLanguage(), original.getValue());
} else {
itemService.addMetadata(context, item, "dspace", "entity", "type", null, Constants.UNSET_ENTITY_TYPE);
}
// Copy template if appropriate

33
dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java
View File

@@ -2989,14 +2989,14 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
Community community = CommunityBuilder.createCommunity(context)
.withName("Parent Community")
.build();
Collection collection = CollectionBuilder.createCollection(context, community).withName("Collection").build();
Collection collection = CollectionBuilder.createCollection(context, community).withName("Collection")
.withEntityType(person.getLabel()).build();
Item item = ItemBuilder.createItem(context, collection)
.withTitle("Author1")
.withIssueDate("2017-10-17")
.withAuthor("Smith, Donald")
.withPersonIdentifierLastName("Smith")
.withPersonIdentifierFirstName("Donald")
.withEntityType("Person")
.build();
context.restoreAuthSystemState();
@@ -3025,12 +3025,12 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
Community community = CommunityBuilder.createCommunity(context)
.withName("Parent Community")
.build();
Collection collection = CollectionBuilder.createCollection(context, community).withName("Collection").build();
Collection collection = CollectionBuilder.createCollection(context, community).withName("Collection")
.withEntityType(publication.getLabel()).build();
Item item = ItemBuilder.createItem(context, collection)
.withTitle("Publication1")
.withAuthor("Testy, TEst")
.withIssueDate("2015-01-01")
.withEntityType("Publication")
.build();
context.restoreAuthSystemState();
@@ -3041,7 +3041,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
.andExpect(jsonPath("$.entityType", is("Publication")));
String adminToken = getAuthToken(admin.getEmail(), password);
getClient(ePersonToken).perform(get("/api/core/items/" + item.getID()))
getClient(adminToken).perform(get("/api/core/items/" + item.getID()))
.andExpect(status().isOk())
.andExpect(jsonPath("$", ItemMatcher.matchItemProperties(item)))
.andExpect(jsonPath("$.entityType", is("Publication")));
@@ -3664,8 +3664,10 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
parentCommunity = CommunityBuilder.createCommunity(context)
.withName("Parent Community")
.build();
Collection col1 = CollectionBuilder
.createCollection(context, parentCommunity).withName("Collection 1").build();
Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1")
.withEntityType("Person").build();
Collection col2 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 2")
.withEntityType("Publication").build();
author1 = ItemBuilder.createItem(context, col1)
.withTitle("Author1")
@@ -3673,21 +3675,18 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
.withAuthor("Smith, Donald")
.withPersonIdentifierLastName("Smith")
.withPersonIdentifierFirstName("Donald")
.withEntityType("Person")
.build();
author2 = ItemBuilder.createItem(context, col1)
.withTitle("Author2")
.withIssueDate("2016-02-13")
.withAuthor("Smith, Maria")
.withEntityType("Person")
.build();
publication1 = ItemBuilder.createItem(context, col1)
publication1 = ItemBuilder.createItem(context, col2)
.withTitle("Publication1")
.withAuthor("Testy, TEst")
.withIssueDate("2015-01-01")
.withEntityType("Publication")
.build();
EntityType publication = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication").build();
@@ -3728,8 +3727,11 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
parentCommunity = CommunityBuilder.createCommunity(context)
.withName("Parent Community")
.build();
Collection col1 = CollectionBuilder
.createCollection(context, parentCommunity).withName("Collection 1").build();
Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1")
.withEntityType("Person").build();
Collection col2 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 2")
.withEntityType("Publication").build();
author1 = ItemBuilder.createItem(context, col1)
.withTitle("Author1")
@@ -3737,21 +3739,18 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
.withAuthor("Smith, Donald")
.withPersonIdentifierLastName("Smith")
.withPersonIdentifierFirstName("Donald")
.withEntityType("Person")
.build();
author2 = ItemBuilder.createItem(context, col1)
.withTitle("Author2")
.withIssueDate("2016-02-13")
.withAuthor("Smith, Maria")
.withEntityType("Person")
.build();
publication1 = ItemBuilder.createItem(context, col1)
publication1 = ItemBuilder.createItem(context, col2)
.withTitle("Publication1")
.withAuthor("Testy, TEst")
.withIssueDate("2015-01-01")
.withEntityType("Publication")
.build();
EntityType publication = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication").build();