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

Merge remote-tracking branch 'dspace/master' into w2p-65267_delete-in-relationshipservice manual fixes

Browse Source
This commit is contained in:
Peter Nijs
2019-11-12 14:12:49 +01:00
parent 61da3d13ab
commit 5e409ae0be
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipDeleteRestRepositoryIT.java
View File

@@ -126,7 +126,7 @@ public class RelationshipDeleteRestRepositoryIT extends AbstractEntityIntegratio
.withPersonIdentifierLastName("familyName")
.build();
relationshipType = relationshipTypeService
.findbyTypesAndLabels(context, entityTypeService.findByEntityType(context, "Publication"),
.findbyTypesAndTypeName(context, entityTypeService.findByEntityType(context, "Publication"),
entityTypeService.findByEntityType(context, "Person"),
"isAuthorOfPublication", "isPublicationOfAuthor");
relationship = RelationshipBuilder.createRelationshipBuilder(context, leftItem, rightItem, relationshipType)
@@ -150,7 +150,7 @@ public class RelationshipDeleteRestRepositoryIT extends AbstractEntityIntegratio
.withPublicationVolumeNumber("30")
.build();
relationshipType = relationshipTypeService
.findbyTypesAndLabels(context, entityTypeService.findByEntityType(context, "JournalIssue"),
.findbyTypesAndTypeName(context, entityTypeService.findByEntityType(context, "JournalIssue"),
entityTypeService.findByEntityType(context, "JournalVolume"),
"isJournalVolumeOfIssue", "isIssueOfJournalVolume");
relationship = RelationshipBuilder.createRelationshipBuilder(context, leftItem, rightItem, relationshipType)
@@ -176,12 +176,12 @@ public class RelationshipDeleteRestRepositoryIT extends AbstractEntityIntegratio
.withTitle("Publication 1")
.withRelationshipType("Publication")
.build();
personProjectRelationshipType = relationshipTypeService.findbyTypesAndLabels(context,
personProjectRelationshipType = relationshipTypeService.findbyTypesAndTypeName(context,
entityTypeService.findByEntityType(context, "Person"),
entityTypeService.findByEntityType(context, "Project"),
"isProjectOfPerson",
"isPersonOfProject");
publicationPersonRelationshipType = relationshipTypeService.findbyTypesAndLabels(context,
publicationPersonRelationshipType = relationshipTypeService.findbyTypesAndTypeName(context,
entityTypeService.findByEntityType(context, "Publication"),
entityTypeService.findByEntityType(context, "Person"),
"isAuthorOfPublication",