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

Fix test to check for exact ordering of Processes

Browse Source
This commit is contained in:
Tim Donohue
2020-09-02 12:04:33 -05:00
parent 6a3ec14d26
commit e7348159b7
1 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
dspace-server-webapp/src/test/java/org/dspace/app/rest/ProcessRestRepositoryIT.java
View File

@@ -160,39 +160,40 @@ public class ProcessRestRepositoryIT extends AbstractControllerIntegrationTest {
getClient(token).perform(get("/api/system/processes/")) getClient(token).perform(get("/api/system/processes/"))
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(jsonPath("$._embedded.processes", containsInAnyOrder( // Expect all processes to be returned, newest to oldest
ProcessMatcher.matchProcess(process.getName(), String.valueOf(process.getEPerson().getID()), .andExpect(jsonPath("$._embedded.processes", contains(
process.getID(), parameters, ProcessStatus.SCHEDULED), ProcessMatcher.matchProcess(newProcess9.getName(),
ProcessMatcher.matchProcess(newProcess.getName(), String.valueOf(newProcess9.getEPerson().getID()),
String.valueOf(newProcess.getEPerson().getID()), newProcess9.getID(), parameters, ProcessStatus.SCHEDULED),
newProcess.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(newProcess1.getName(),
String.valueOf(newProcess1.getEPerson().getID()),
newProcess1.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(newProcess2.getName(),
String.valueOf(newProcess2.getEPerson().getID()),
newProcess2.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(newProcess3.getName(),
String.valueOf(newProcess3.getEPerson().getID()),
newProcess3.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(newProcess4.getName(),
String.valueOf(newProcess4.getEPerson().getID()),
newProcess4.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(newProcess5.getName(),
String.valueOf(newProcess5.getEPerson().getID()),
newProcess5.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(newProcess6.getName(),
String.valueOf(newProcess6.getEPerson().getID()),
newProcess6.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(newProcess7.getName(),
String.valueOf(newProcess7.getEPerson().getID()),
newProcess7.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(newProcess8.getName(), ProcessMatcher.matchProcess(newProcess8.getName(),
String.valueOf(newProcess8.getEPerson().getID()), String.valueOf(newProcess8.getEPerson().getID()),
newProcess8.getID(), parameters, ProcessStatus.SCHEDULED), newProcess8.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(newProcess9.getName(), ProcessMatcher.matchProcess(newProcess7.getName(),
String.valueOf(newProcess9.getEPerson().getID()), String.valueOf(newProcess7.getEPerson().getID()),
newProcess9.getID(), parameters, ProcessStatus.SCHEDULED) newProcess7.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(newProcess6.getName(),
String.valueOf(newProcess6.getEPerson().getID()),
newProcess6.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(newProcess5.getName(),
String.valueOf(newProcess5.getEPerson().getID()),
newProcess5.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(newProcess4.getName(),
String.valueOf(newProcess4.getEPerson().getID()),
newProcess4.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(newProcess3.getName(),
String.valueOf(newProcess3.getEPerson().getID()),
newProcess3.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(newProcess2.getName(),
String.valueOf(newProcess2.getEPerson().getID()),
newProcess2.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(newProcess1.getName(),
String.valueOf(newProcess1.getEPerson().getID()),
newProcess1.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(newProcess.getName(),
String.valueOf(newProcess.getEPerson().getID()),
newProcess.getID(), parameters, ProcessStatus.SCHEDULED),
ProcessMatcher.matchProcess(process.getName(), String.valueOf(process.getEPerson().getID()),
process.getID(), parameters, ProcessStatus.SCHEDULED)
))) )))
.andExpect(jsonPath("$.page", is( .andExpect(jsonPath("$.page", is(
PageMatcher.pageEntryWithTotalPagesAndElements(0, 20, 1, 11)))); PageMatcher.pageEntryWithTotalPagesAndElements(0, 20, 1, 11))));