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

Merge branch 'main' into tilted_rels

Browse Source
This commit is contained in:
Bruno Roemers
2021-04-07 14:54:11 +02:00
parent 8785e5d56b 206f6bdc63
commit 9a0ace4ce4
113 changed files with 7463 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dspace-api/src/test/java/org/dspace/content/RelationshipMetadataServiceIT.java
View File

@@ -90,8 +90,8 @@ public class RelationshipMetadataServiceIT extends AbstractIntegrationTestWithDa
context.turnOffAuthorisationSystem();
EntityType publicationEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication").build();
EntityType authorEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Author").build();
leftItem = ItemBuilder.createItem(context, col).withRelationshipType("Publication").build();
rightItem = ItemBuilder.createItem(context, col).withRelationshipType("Author")
leftItem = ItemBuilder.createItem(context, col).withEntityType("Publication").build();
rightItem = ItemBuilder.createItem(context, col).withEntityType("Author")
.withPersonIdentifierLastName("familyName")
.withPersonIdentifierFirstName("firstName").build();
isAuthorOfPublicationRelationshipType =
@@ -114,8 +114,8 @@ public class RelationshipMetadataServiceIT extends AbstractIntegrationTestWithDa
context.turnOffAuthorisationSystem();
EntityType publicationEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication").build();
EntityType authorEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "Author").build();
leftItem = ItemBuilder.createItem(context, col).withRelationshipType("Publication").build();
rightItem = ItemBuilder.createItem(context, col).withRelationshipType("Author")
leftItem = ItemBuilder.createItem(context, col).withEntityType("Publication").build();
rightItem = ItemBuilder.createItem(context, col).withEntityType("Author")
.withPersonIdentifierLastName("familyName")
.withPersonIdentifierFirstName("firstName").build();
RelationshipType isAuthorOfPublication =
@@ -138,9 +138,9 @@ public class RelationshipMetadataServiceIT extends AbstractIntegrationTestWithDa
EntityType journalIssueEntityType = EntityTypeBuilder.createEntityTypeBuilder(context, "JournalIssue").build();
EntityType publicationVolumeEntityType =
EntityTypeBuilder.createEntityTypeBuilder(context, "JournalVolume").build();
leftItem = ItemBuilder.createItem(context, col).withRelationshipType("JournalIssue")
leftItem = ItemBuilder.createItem(context, col).withEntityType("JournalIssue")
.withPublicationIssueNumber("2").build();
rightItem = ItemBuilder.createItem(context, col).withRelationshipType("JournalVolume")
rightItem = ItemBuilder.createItem(context, col).withEntityType("JournalVolume")
.withPublicationVolumeNumber("30").build();
RelationshipType isIssueOfVolume =
RelationshipTypeBuilder
@@ -610,7 +610,7 @@ public class RelationshipMetadataServiceIT extends AbstractIntegrationTestWithDa
Community community = CommunityBuilder.createCommunity(context).build();
Collection col = CollectionBuilder.createCollection(context, community).build();
Item secondItem = ItemBuilder.createItem(context, col).withRelationshipType("Publication").build();
Item secondItem = ItemBuilder.createItem(context, col).withEntityType("Publication").build();
RelationshipBuilder.createRelationshipBuilder(context, secondItem, rightItem,
isAuthorOfPublicationRelationshipType).build();
context.restoreAuthSystemState();
@@ -629,7 +629,7 @@ public class RelationshipMetadataServiceIT extends AbstractIntegrationTestWithDa
Community community = CommunityBuilder.createCommunity(context).build();
Collection col = CollectionBuilder.createCollection(context, community).build();
Item secondAuthor = ItemBuilder.createItem(context, col).withRelationshipType("Author")
Item secondAuthor = ItemBuilder.createItem(context, col).withEntityType("Author")
.withPersonIdentifierFirstName("firstName")
.withPersonIdentifierLastName("familyName").build();
@@ -669,13 +669,13 @@ public class RelationshipMetadataServiceIT extends AbstractIntegrationTestWithDa
Community community = CommunityBuilder.createCommunity(context).build();
Collection collection = CollectionBuilder.createCollection(context, community).build();
Item journalIssue = ItemBuilder.createItem(context, collection).withRelationshipType("JournalIssue").build();
Item journalIssue = ItemBuilder.createItem(context, collection).withEntityType("JournalIssue").build();
Item journalVolume = ItemBuilder.createItem(context, collection)
.withPublicationVolumeNumber("30")
.withRelationshipType("JournalVolume").build();
.withEntityType("JournalVolume").build();
Item journal = ItemBuilder.createItem(context, collection)
.withMetadata("creativeworkseries", "issn", null, "issn journal")
.withRelationshipType("Journal").build();
.withEntityType("Journal").build();
RelationshipBuilder.createRelationshipBuilder(context, journalIssue, journalVolume,
isJournalVolumeOfIssueRelationshipType).build();
RelationshipBuilder.createRelationshipBuilder(context, journalVolume, journal,
@@ -683,7 +683,7 @@ public class RelationshipMetadataServiceIT extends AbstractIntegrationTestWithDa
Item publication = ItemBuilder.createItem(context, collection)
.withTitle("Pub 1")
.withRelationshipType("Publication").build();
.withEntityType("Publication").build();
RelationshipBuilder.createRelationshipBuilder(context, publication, journalIssue,
isJournalIssueOfPublicationRelationshipType).build();