Try to fix intermittent testfailure

This commit is contained in:
jamesagnew 2019-09-25 05:39:00 -04:00
parent 51b7186aa1
commit 4c064186a9
1 changed files with 9 additions and 0 deletions

View File

@ -98,6 +98,7 @@ public class ConsentEventsDaoR4Test extends BaseJpaR4SystemTest {
assertEquals(myObservationIds.subList(0, 20), interceptedResourceIds); assertEquals(myObservationIds.subList(0, 20), interceptedResourceIds);
// Fetch the next 30 (do cross a fetch boundary) // Fetch the next 30 (do cross a fetch boundary)
outcome = myPagingProvider.retrieveResultList(mySrd, outcome.getUuid());
resources = outcome.getResources(10, 40); resources = outcome.getResources(10, 40);
returnedIdValues = toUnqualifiedVersionlessIdValues(resources); returnedIdValues = toUnqualifiedVersionlessIdValues(resources);
assertEquals(myObservationIds.subList(10, 40), returnedIdValues); assertEquals(myObservationIds.subList(10, 40), returnedIdValues);
@ -129,6 +130,7 @@ public class ConsentEventsDaoR4Test extends BaseJpaR4SystemTest {
assertEquals(myObservationIds.subList(0, 20), interceptedResourceIds); assertEquals(myObservationIds.subList(0, 20), interceptedResourceIds);
// Fetch the next 30 (do cross a fetch boundary) // Fetch the next 30 (do cross a fetch boundary)
outcome = myPagingProvider.retrieveResultList(mySrd, outcome.getUuid());
resources = outcome.getResources(10, 40); resources = outcome.getResources(10, 40);
returnedIdValues = toUnqualifiedVersionlessIdValues(resources); returnedIdValues = toUnqualifiedVersionlessIdValues(resources);
assertEquals(myObservationIdsEvenOnly.subList(10, 25), returnedIdValues); assertEquals(myObservationIdsEvenOnly.subList(10, 25), returnedIdValues);
@ -160,6 +162,7 @@ public class ConsentEventsDaoR4Test extends BaseJpaR4SystemTest {
assertEquals(myObservationIds, interceptedResourceIds); assertEquals(myObservationIds, interceptedResourceIds);
// Fetch the next 30 (do cross a fetch boundary) // Fetch the next 30 (do cross a fetch boundary)
outcome = myPagingProvider.retrieveResultList(mySrd, outcome.getUuid());
resources = outcome.getResources(10, 40); resources = outcome.getResources(10, 40);
returnedIdValues = toUnqualifiedVersionlessIdValues(resources); returnedIdValues = toUnqualifiedVersionlessIdValues(resources);
assertEquals(myObservationIdsEvenOnly.subList(10, 25), returnedIdValues); assertEquals(myObservationIdsEvenOnly.subList(10, 25), returnedIdValues);
@ -184,6 +187,7 @@ public class ConsentEventsDaoR4Test extends BaseJpaR4SystemTest {
ourLog.info("Search UUID: {}", outcome.getUuid()); ourLog.info("Search UUID: {}", outcome.getUuid());
// Fetch the first 10 (don't cross a fetch boundary) // Fetch the first 10 (don't cross a fetch boundary)
outcome = myPagingProvider.retrieveResultList(mySrd, outcome.getUuid());
List<IBaseResource> resources = outcome.getResources(0, 100); List<IBaseResource> resources = outcome.getResources(0, 100);
List<String> returnedIdValues = toUnqualifiedVersionlessIdValues(resources); List<String> returnedIdValues = toUnqualifiedVersionlessIdValues(resources);
assertEquals(sort(myPatientIdsEvenOnly, myObservationIdsEvenOnly), sort(returnedIdValues)); assertEquals(sort(myPatientIdsEvenOnly, myObservationIdsEvenOnly), sort(returnedIdValues));
@ -209,6 +213,7 @@ public class ConsentEventsDaoR4Test extends BaseJpaR4SystemTest {
ourLog.info("Search UUID: {}", outcome.getUuid()); ourLog.info("Search UUID: {}", outcome.getUuid());
// Fetch the first 10 (don't cross a fetch boundary) // Fetch the first 10 (don't cross a fetch boundary)
outcome = myPagingProvider.retrieveResultList(mySrd, outcome.getUuid());
List<IBaseResource> resources = outcome.getResources(0, 100); List<IBaseResource> resources = outcome.getResources(0, 100);
List<String> returnedIdValues = toUnqualifiedVersionlessIdValues(resources); List<String> returnedIdValues = toUnqualifiedVersionlessIdValues(resources);
assertEquals(sort(myPatientIdsEvenOnly, myObservationIdsEvenOnly), sort(returnedIdValues)); assertEquals(sort(myPatientIdsEvenOnly, myObservationIdsEvenOnly), sort(returnedIdValues));
@ -232,6 +237,7 @@ public class ConsentEventsDaoR4Test extends BaseJpaR4SystemTest {
ourLog.info("Search UUID: {}", outcome.getUuid()); ourLog.info("Search UUID: {}", outcome.getUuid());
// Fetch the first 10 (don't cross a fetch boundary) // Fetch the first 10 (don't cross a fetch boundary)
outcome = myPagingProvider.retrieveResultList(mySrd, outcome.getUuid());
List<IBaseResource> resources = outcome.getResources(0, 100); List<IBaseResource> resources = outcome.getResources(0, 100);
List<String> returnedIdValues = toUnqualifiedVersionlessIdValues(resources); List<String> returnedIdValues = toUnqualifiedVersionlessIdValues(resources);
assertEquals(sort(myPatientIdsEvenOnly, myObservationIdsEvenOnly), sort(returnedIdValues)); assertEquals(sort(myPatientIdsEvenOnly, myObservationIdsEvenOnly), sort(returnedIdValues));
@ -257,6 +263,7 @@ public class ConsentEventsDaoR4Test extends BaseJpaR4SystemTest {
ourLog.info("Search UUID: {}", outcome.getUuid()); ourLog.info("Search UUID: {}", outcome.getUuid());
// Fetch the first 10 (don't cross a fetch boundary) // Fetch the first 10 (don't cross a fetch boundary)
outcome = myPagingProvider.retrieveResultList(mySrd, outcome.getUuid());
List<IBaseResource> resources = outcome.getResources(0, 100); List<IBaseResource> resources = outcome.getResources(0, 100);
List<String> returnedIdValues = toUnqualifiedVersionlessIdValues(resources); List<String> returnedIdValues = toUnqualifiedVersionlessIdValues(resources);
assertEquals(sort(myPatientIds, myObservationIds), sort(returnedIdValues)); assertEquals(sort(myPatientIds, myObservationIds), sort(returnedIdValues));
@ -281,6 +288,7 @@ public class ConsentEventsDaoR4Test extends BaseJpaR4SystemTest {
ourLog.info("Search UUID: {}", outcome.getUuid()); ourLog.info("Search UUID: {}", outcome.getUuid());
// Fetch the first 10 (don't cross a fetch boundary) // Fetch the first 10 (don't cross a fetch boundary)
outcome = myPagingProvider.retrieveResultList(mySrd, outcome.getUuid());
List<IBaseResource> resources = outcome.getResources(0, 100); List<IBaseResource> resources = outcome.getResources(0, 100);
List<String> returnedIdValues = toUnqualifiedVersionlessIdValues(resources); List<String> returnedIdValues = toUnqualifiedVersionlessIdValues(resources);
assertEquals(sort(myPatientIdsEvenOnly, myObservationIdsEvenOnly), sort(returnedIdValues)); assertEquals(sort(myPatientIdsEvenOnly, myObservationIdsEvenOnly), sort(returnedIdValues));
@ -304,6 +312,7 @@ public class ConsentEventsDaoR4Test extends BaseJpaR4SystemTest {
ourLog.info("Search UUID: {}", outcome.getUuid()); ourLog.info("Search UUID: {}", outcome.getUuid());
// Fetch the first 10 (don't cross a fetch boundary) // Fetch the first 10 (don't cross a fetch boundary)
outcome = myPagingProvider.retrieveResultList(mySrd, outcome.getUuid());
List<IBaseResource> resources = outcome.getResources(0, 10); List<IBaseResource> resources = outcome.getResources(0, 10);
List<String> returnedIdValues = toUnqualifiedVersionlessIdValues(resources); List<String> returnedIdValues = toUnqualifiedVersionlessIdValues(resources);
ourLog.info("Returned values: {}", returnedIdValues); ourLog.info("Returned values: {}", returnedIdValues);