honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix one more intermittent test

This commit is contained in:
James Agnew 2019-09-19 14:53:29 -04:00
parent 47805bceff
commit 6fde2879ef
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/ConsentEventsDaoR4Test.java
View File

@ -54,7 +54,6 @@ public class ConsentEventsDaoR4Test extends BaseJpaR4SystemTest {
private List<String> myObservationIdsEvenOnly;
private List<String> myObservationIdsWithVersions;
private List<String> myPatientIdsEvenOnly;
private List<String> myObservationIdsEvenOnlyWithVersions;
@After
public void after() {
@ -307,13 +306,15 @@ public class ConsentEventsDaoR4Test extends BaseJpaR4SystemTest {
// Fetch the first 10 (don't cross a fetch boundary)
List<IBaseResource> resources = outcome.getResources(0, 10);
List<String> returnedIdValues = toUnqualifiedVersionlessIdValues(resources);
ourLog.info("Returned values: {}", returnedIdValues);
/*
* Note: Each observation in the observation list will appear twice in the actual
* returned results because we create it then update it in create50Observations()
*/
assertEquals(1, hitCount.get());
assertEquals(myObservationIdsWithVersions.subList(90, myObservationIdsWithVersions.size()), sort(interceptedResourceIds));
assertEquals(myObservationIdsEvenOnlyWithVersions.subList(44, 50), sort(returnedIdValues));
returnedIdValues.forEach(t-> assertTrue(new IdType(t).getIdPartAsLong() % 2 == 0));
}
@ -393,11 +394,6 @@ public class ConsentEventsDaoR4Test extends BaseJpaR4SystemTest {
.stream()
.filter(t -> Long.parseLong(t.substring(t.indexOf('/') + 1)) % 2 == 0)
.collect(Collectors.toList());
myObservationIdsEvenOnlyWithVersions =
myObservationIdsWithVersions
.stream()
.filter(t -> Long.parseLong(t.substring(t.indexOf('/') + 1)) % 2 == 0)
.collect(Collectors.toList());
myObservationIdsOddOnly = ListUtils.removeAll(myObservationIds, myObservationIdsEvenOnly);
}