Test fixes

Author: jamesagnew

hapi-fhir-storage-batch2-jobs/src/test/java/ca/uhn/fhir/batch2/jobs/bulkmodify/patch/BulkPatchProviderTest.java

@@ -1,6 +1,7 @@
 package ca.uhn.fhir.batch2.jobs.bulkmodify.patch;
 
 import ca.uhn.fhir.batch2.api.IJobCoordinator;
+import ca.uhn.fhir.batch2.api.IJobPartitionProvider;
 import ca.uhn.fhir.batch2.jobs.bulkmodify.framework.base.BaseBulkModifyJobParameters;
 import ca.uhn.fhir.batch2.jobs.bulkmodify.framework.common.BulkModifyResourcesResultsJson;
 import ca.uhn.fhir.batch2.jobs.bulkmodify.patchrewrite.BulkPatchRewriteJobAppCtx;
@@ -91,6 +92,8 @@ public class BulkPatchProviderTest {
 	static HttpClientExtension ourHttpClient = new HttpClientExtension();
 	@Mock
 	private IJobCoordinator myJobCoordinator;
+	@Mock
+	private IJobPartitionProvider myJobPartitionProvider;
 	@Captor
 	private ArgumentCaptor<JobInstanceStartRequest> myStartRequestCaptor;
 
@@ -99,6 +102,7 @@ void beforeEach() {
 		ourProvider.setContextForUnitTest(ourCtx);
 		ourProvider.setJobCoordinatorForUnitTest(myJobCoordinator);
 		ourProvider.setPartitionSettingsForUnitTest(new PartitionSettings());
+		ourProvider.setJobPartitionProviderForUnitTest(myJobPartitionProvider);
 	}
 
 	@ParameterizedTest
@@ -108,6 +112,7 @@ void testInitiateJob(boolean theDryRun) throws IOException {
 		Batch2JobStartResponse startResponse = new Batch2JobStartResponse();
 		startResponse.setInstanceId(MY_INSTANCE_ID);
 		when(myJobCoordinator.startInstance(any(), any())).thenReturn(startResponse);
+		when(myJobPartitionProvider.getPartitionedUrls(any(), any())).thenCallRealMethod();
 
 		Parameters patch = new Parameters();
 		patch.setId("PATCH");

hapi-fhir-storage-batch2-jobs/src/test/java/ca/uhn/fhir/batch2/jobs/bulkmodify/patchrewrite/BulkPatchRewriteProviderTest.java

@@ -1,6 +1,7 @@
 package ca.uhn.fhir.batch2.jobs.bulkmodify.patchrewrite;
 
 import ca.uhn.fhir.batch2.api.IJobCoordinator;
+import ca.uhn.fhir.batch2.api.IJobPartitionProvider;
 import ca.uhn.fhir.batch2.jobs.bulkmodify.patch.BulkPatchProviderTest;
 import ca.uhn.fhir.batch2.model.JobInstance;
 import ca.uhn.fhir.batch2.model.JobInstanceStartRequest;
@@ -63,6 +64,8 @@ class BulkPatchRewriteProviderTest {
 	static HttpClientExtension ourHttpClient = new HttpClientExtension();
 	@Mock
 	private IJobCoordinator myJobCoordinator;
+	@Mock
+	private IJobPartitionProvider myJobPartitionProvider;
 	@Captor
 	private ArgumentCaptor<JobInstanceStartRequest> myStartRequestCaptor;
 
@@ -71,6 +74,7 @@ void beforeEach() {
 		ourProvider.setContextForUnitTest(ourCtx);
 		ourProvider.setJobCoordinatorForUnitTest(myJobCoordinator);
 		ourProvider.setPartitionSettingsForUnitTest(new PartitionSettings());
+		ourProvider.setJobPartitionProviderForUnitTest(myJobPartitionProvider);
 	}
 
 	@Test
@@ -79,6 +83,7 @@ void testInitiateJob() throws IOException {
 		Batch2JobStartResponse startResponse = new Batch2JobStartResponse();
 		startResponse.setInstanceId(MY_INSTANCE_ID);
 		when(myJobCoordinator.startInstance(any(), any())).thenReturn(startResponse);
+		when(myJobPartitionProvider.getPartitionedUrls(any(), any())).thenCallRealMethod();
 
 		Parameters patch = new Parameters();
 		patch.setId("PATCH");

hapi-fhir-storage-batch2-jobs/src/test/java/ca/uhn/fhir/batch2/jobs/bulkmodify/reindex/ReindexProviderTest.java

@@ -182,7 +182,7 @@ public void testReindex_withDefaults() {
 				.execute();
 
 		// Verify
-		String expectedPollUrl = "http://localhost:" + myServerExtension.getPort() + "/$hapi.fhir.bulk-patch-status?_jobId=test-job-id";
+		String expectedPollUrl = "http://localhost:" + myServerExtension.getPort() + "/$hapi.fhir.reindex-status?_jobId=test-job-id";
 
 		String serializedOutput = myCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(response.getOperationOutcome());
 		ourLog.info(serializedOutput);