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

88146: Bugfix: Add excludeTilted to RelationshipDAO#countByItem, add note to docs

Browse Source
This commit is contained in:
Bruno Roemers
2022-03-04 17:31:04 +01:00
parent 272fd35535
commit 85b2752565
6 changed files with 76 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplVersioningTest.java
View File

@@ -293,10 +293,14 @@ public class RelationshipServiceImplVersioningTest extends AbstractIntegrationTe
relationshipDAO.findByItem(context, person1, -1, -1, false, true)
);
assertEquals(1, relationshipDAO.countByItem(context, publication1, false));
assertEquals(1, relationshipDAO.countByItem(context, publication1, true));
assertEquals(1, relationshipDAO.countByItem(context, person1, false));
assertEquals(1, relationshipDAO.countByItem(context, person1, true));
assertEquals(1, relationshipDAO.countByItem(context, publication1, false, false));
assertEquals(1, relationshipDAO.countByItem(context, publication1, false, true));
assertEquals(1, relationshipDAO.countByItem(context, person1, false, false));
assertEquals(1, relationshipDAO.countByItem(context, person1, false, true));
assertEquals(1, relationshipDAO.countByItem(context, publication1, true, false));
assertEquals(1, relationshipDAO.countByItem(context, publication1, true, true));
assertEquals(1, relationshipDAO.countByItem(context, person1, true, false));
assertEquals(1, relationshipDAO.countByItem(context, person1, true, true));
assertRelationship(
relationship1,
@@ -490,10 +494,14 @@ public class RelationshipServiceImplVersioningTest extends AbstractIntegrationTe
assertEquals(1, relationshipService.countByItem(context, publication1));
assertEquals(1, relationshipService.countByItem(context, person1));
assertEquals(1, relationshipService.countByItem(context, publication1, false));
assertEquals(1, relationshipService.countByItem(context, publication1, true));
assertEquals(1, relationshipService.countByItem(context, person1, false));
assertEquals(1, relationshipService.countByItem(context, person1, true));
assertEquals(1, relationshipService.countByItem(context, publication1, false, false));
assertEquals(1, relationshipService.countByItem(context, publication1, false, true));
assertEquals(1, relationshipService.countByItem(context, person1, false, false));
assertEquals(1, relationshipService.countByItem(context, person1, false, true));
assertEquals(1, relationshipService.countByItem(context, publication1, true, false));
assertEquals(1, relationshipService.countByItem(context, publication1, true, true));
assertEquals(1, relationshipService.countByItem(context, person1, true, false));
assertEquals(1, relationshipService.countByItem(context, person1, true, true));
assertEquals(
0, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, false)
@@ -575,10 +583,14 @@ public class RelationshipServiceImplVersioningTest extends AbstractIntegrationTe
relationshipDAO.findByItem(context, person1, -1, -1, false, true)
);
assertEquals(1, relationshipDAO.countByItem(context, publication1, false));
assertEquals(0, relationshipDAO.countByItem(context, publication1, true));
assertEquals(1, relationshipDAO.countByItem(context, person1, false));
assertEquals(1, relationshipDAO.countByItem(context, person1, true));
assertEquals(1, relationshipDAO.countByItem(context, publication1, false, false));
assertEquals(0, relationshipDAO.countByItem(context, publication1, false, true));
assertEquals(1, relationshipDAO.countByItem(context, person1, false, false));
assertEquals(1, relationshipDAO.countByItem(context, person1, false, true));
assertEquals(1, relationshipDAO.countByItem(context, publication1, true, false));
assertEquals(0, relationshipDAO.countByItem(context, publication1, true, true));
assertEquals(1, relationshipDAO.countByItem(context, person1, true, false));
assertEquals(1, relationshipDAO.countByItem(context, person1, true, true));
assertRelationship(
relationship1,
@@ -762,10 +774,14 @@ public class RelationshipServiceImplVersioningTest extends AbstractIntegrationTe
assertEquals(0, relationshipService.countByItem(context, publication1));
assertEquals(1, relationshipService.countByItem(context, person1));
assertEquals(1, relationshipService.countByItem(context, publication1, false));
assertEquals(0, relationshipService.countByItem(context, publication1, true));
assertEquals(1, relationshipService.countByItem(context, person1, false));
assertEquals(1, relationshipService.countByItem(context, person1, true));
assertEquals(1, relationshipService.countByItem(context, publication1, false, false));
assertEquals(0, relationshipService.countByItem(context, publication1, false, true));
assertEquals(1, relationshipService.countByItem(context, person1, false, false));
assertEquals(1, relationshipService.countByItem(context, person1, false, true));
assertEquals(1, relationshipService.countByItem(context, publication1, true, false));
assertEquals(0, relationshipService.countByItem(context, publication1, true, true));
assertEquals(1, relationshipService.countByItem(context, person1, true, false));
assertEquals(1, relationshipService.countByItem(context, person1, true, true));
assertEquals(
0, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, false)
@@ -847,10 +863,14 @@ public class RelationshipServiceImplVersioningTest extends AbstractIntegrationTe
relationshipDAO.findByItem(context, person1, -1, -1, false, true)
);
assertEquals(1, relationshipDAO.countByItem(context, publication1, false));
assertEquals(1, relationshipDAO.countByItem(context, publication1, true));
assertEquals(1, relationshipDAO.countByItem(context, person1, false));
assertEquals(0, relationshipDAO.countByItem(context, person1, true));
assertEquals(1, relationshipDAO.countByItem(context, publication1, false, false));
assertEquals(1, relationshipDAO.countByItem(context, publication1, false, true));
assertEquals(1, relationshipDAO.countByItem(context, person1, false, false));
assertEquals(0, relationshipDAO.countByItem(context, person1, false, true));
assertEquals(1, relationshipDAO.countByItem(context, publication1, true, false));
assertEquals(1, relationshipDAO.countByItem(context, publication1, true, true));
assertEquals(1, relationshipDAO.countByItem(context, person1, true, false));
assertEquals(0, relationshipDAO.countByItem(context, person1, true, true));
assertRelationship(
relationship1,
@@ -1034,10 +1054,14 @@ public class RelationshipServiceImplVersioningTest extends AbstractIntegrationTe
assertEquals(1, relationshipService.countByItem(context, publication1));
assertEquals(0, relationshipService.countByItem(context, person1));
assertEquals(1, relationshipService.countByItem(context, publication1, false));
assertEquals(1, relationshipService.countByItem(context, publication1, true));
assertEquals(1, relationshipService.countByItem(context, person1, false));
assertEquals(0, relationshipService.countByItem(context, person1, true));
assertEquals(1, relationshipService.countByItem(context, publication1, false, false));
assertEquals(1, relationshipService.countByItem(context, publication1, false, true));
assertEquals(1, relationshipService.countByItem(context, person1, false, false));
assertEquals(0, relationshipService.countByItem(context, person1, false, true));
assertEquals(1, relationshipService.countByItem(context, publication1, true, false));
assertEquals(1, relationshipService.countByItem(context, publication1, true, true));
assertEquals(1, relationshipService.countByItem(context, person1, true, false));
assertEquals(0, relationshipService.countByItem(context, person1, true, true));
assertEquals(
0, relationshipService.countByItemAndRelationshipType(context, publication1, relationshipType, false)