moar tests

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/ReplaceReferencesSvcImpl.java

@@ -123,11 +123,11 @@ private IBaseParameters replaceReferencesPreferSync(
 				.execute(() -> getAllPidsWithLimit(theReplaceReferencesRequest));
 
 		if (accumulator.isTruncated()) {
-			throw new PreconditionFailedException("Number of resources with references to " +
-				theReplaceReferencesRequest.sourceId +
-				" exceeds the resource-limit " +
-				theReplaceReferencesRequest.resourceLimit +
-				". Submit the request asynchronsly by adding the HTTP Header 'Prefer: respond-async'.");
+			throw new PreconditionFailedException(
+					"Number of resources with references to " + theReplaceReferencesRequest.sourceId
+							+ " exceeds the resource-limit "
+							+ theReplaceReferencesRequest.resourceLimit
+							+ ". Submit the request asynchronsly by adding the HTTP Header 'Prefer: respond-async'.");
 		}
 
 		Bundle result = myReplaceReferencesPatchBundleSvc.patchReferencingResources(

hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatientMergeR4Test.java

@@ -8,6 +8,7 @@
 import ca.uhn.fhir.rest.gclient.IOperationUntypedWithInput;
 import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
+import ca.uhn.fhir.rest.server.exceptions.PreconditionFailedException;
 import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
 import jakarta.annotation.Nonnull;
 import jakarta.servlet.http.HttpServletResponse;
@@ -226,6 +227,20 @@ public void testMerge(boolean withDelete, boolean withInputResultPatient, boolea
 		}
 	}
 
+	@Test
+	void testMerge_smallResourceLimit() {
+		ReplaceReferencesTestHelper.PatientMergeInputParameters inParams = new ReplaceReferencesTestHelper.PatientMergeInputParameters();
+		myTestHelper.setSourceAndTarget(inParams);
+
+		inParams.resourceLimit = 5;
+		Parameters inParameters = inParams.asParametersResource();
+
+		// exec
+		assertThatThrownBy(() -> callMergeOperation(inParameters, false))
+			.isInstanceOf(PreconditionFailedException.class)
+			.satisfies(ex -> assertThat(extractFailureMessage((BaseServerResponseException) ex)).isEqualTo("Number of resources with references to "+ myTestHelper.getSourcePatientId() + " exceeds the resource-limit 5. Submit the request asynchronsly by adding the HTTP Header 'Prefer: respond-async'."));
+	}
+
 	@Test
 	void testMerge_SourceResourceCannotBeDeletedBecauseAnotherResourceReferencingSourceWasAddedWhileJobIsRunning_JobFails() {
 		ReplaceReferencesTestHelper.PatientMergeInputParameters inParams = new ReplaceReferencesTestHelper.PatientMergeInputParameters();

hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ProviderConstants.java

@@ -265,7 +265,6 @@ public class ProviderConstants {
 	 * exceeds this amount, the operation will fail with 412 Precondition Failed.
 	 */
 
-	// FIXME KHS change tests and var names
 	public static final String OPERATION_REPLACE_REFERENCES_RESOURCE_LIMIT = "resource-limit";
 
 	/**