honeymoose/hapi-fhir
1
0
Fork 0
mirror of https://github.com/hapifhir/hapi-fhir.git synced 2025-02-13 16:35:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing the tests

Browse Source
This commit is contained in:
leif stawnyczy 2023-08-11 16:16:21 -04:00
parent cc30b6a32d
commit 146c100502
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/tasks/SearchTask.java
View File

@ -393,14 +393,13 @@ public class SearchTask implements Callable<Void> {
} else {
if (nonSkippedCount == 0) {
// no skipped resources in this query
if (myParams.getCount() == null) {
// no supplied count, either
// if there's no additional thresholds remaining, we're done
return !myAdditionalPrefetchThresholdsRemaining;
} else {
if (myParams.getCount() != null) {
// count supplied
// if the count is > what we've fetched -> we've exhausted the query
return myParams.getCount() > totalFetched;
} else {
// legacy - we have no skipped resources - we are done
return true;
}
}
// skipped resources means we have more to fetch

6
hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatientEverythingPaginationR4Test.java
View File

@ -6,6 +6,7 @@ import ca.uhn.fhir.parser.StrictErrorHandler;
import ca.uhn.fhir.rest.api.Constants;
import ca.uhn.fhir.rest.api.EncodingEnum;
import ca.uhn.fhir.rest.api.server.SystemRequestDetails;
import ca.uhn.fhir.rest.server.BasePagingProvider;
import ca.uhn.fhir.util.BundleUtil;
import com.google.common.base.Charsets;
import org.apache.commons.io.IOUtils;
@ -15,7 +16,6 @@ import org.hl7.fhir.r4.model.Bundle;
import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@ -62,7 +62,7 @@ public class PatientEverythingPaginationR4Test extends BaseResourceProviderR4Tes
* Notice that the issue is not gateway related. Is a plain server issue.
*/
@Test
public void testEverythingPaginatesThroughAllPatients() throws IOException {
public void testEverythingPaginatesThroughAllPatients_whenCountIsEqualToMaxPageSize() throws IOException {
// setup
int totalPatients = 54;
for (int i = 0; i < totalPatients; i++) {
@ -72,7 +72,7 @@ public class PatientEverythingPaginationR4Test extends BaseResourceProviderR4Tes
}
// test
Bundle bundle = fetchBundle(myServerBase + "/Patient/$everything?_format=json");
Bundle bundle = fetchBundle(myServerBase + "/Patient/$everything?_format=json&_count=" + BasePagingProvider.DEFAULT_MAX_PAGE_SIZE);
// verify
List<Patient> patientsFirstPage = BundleUtil.toListOfResourcesOfType(myFhirContext, bundle, Patient.class);