feat(engine): Tests

related to #4334

Author: punitdarira

engine/src/main/java/org/camunda/bpm/engine/impl/RestartProcessInstancesJobHandler.java

@@ -31,9 +31,6 @@
 import org.camunda.bpm.engine.impl.persistence.entity.JobEntity;
 import org.camunda.bpm.engine.impl.persistence.entity.MessageEntity;
 import org.camunda.bpm.engine.impl.persistence.entity.ProcessDefinitionEntity;
-import org.camunda.bpm.engine.impl.util.JsonUtil;
-
-import static org.camunda.bpm.engine.impl.RestartProcessInstancesBatchConfigurationJsonConverter.PROCESS_DEFINITION_ID;
 
 /**
  *

engine/src/test/java/org/camunda/bpm/engine/test/api/history/BatchHistoricDecisionInstanceDeletionTest.java

@@ -16,6 +16,7 @@
  */
 package org.camunda.bpm.engine.test.api.history;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -147,6 +148,19 @@ public void removeBatches() {
     ClockUtil.reset();
   }
 
+  @Test
+  public void shouldCreateProcessInstanceRelatedBatchJobsForSingleInvocations(){
+    // when
+    Batch batch = historyService.deleteHistoricDecisionInstancesAsync(decisionInstanceIds, null);
+    helper.executeSeedJob(batch);
+
+    //then
+    //Making sure that processInstanceId is set in execution jobs #4205
+    assertThat(helper.getExecutionJobs(batch))
+            .extracting("processInstanceId")
+            .containsExactlyInAnyOrder(decisionInstanceIds.toArray());
+  }
+
   @Test
   public void createBatchDeletionByIds() {
     // when

engine/src/test/java/org/camunda/bpm/engine/test/api/history/removaltime/batch/BatchSetRemovalTimeTest.java

@@ -420,6 +420,34 @@ public void shouldSetRemovalTimeForBatch_MultipleInvocationsPerBatchJob() {
     assertThat(historicBatches.get(1).getRemovalTime()).isEqualTo(REMOVAL_TIME);
   }
 
+  @Test
+  public void shouldCreateProcessInstanceRelatedBatchJobsForSingleInvocations() {
+    // given
+    testRule.getProcessEngineConfiguration().setInvocationsPerBatchJob(1);
+
+    String processInstanceIdOne = testRule.process().userTask().deploy().start();
+    String processInstanceIdTwo = testRule.process().userTask().deploy().start();
+
+    // when
+    HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery();
+    Batch batch = historyService.setRemovalTimeToHistoricProcessInstances()
+            .absoluteRemovalTime(REMOVAL_TIME)
+            .byQuery(query)
+            .executeAsync();
+
+    testRule.executeSeedJobs(batch);
+
+    // then
+    //Making sure that processInstanceId is set in execution jobs #4205
+    List<Job> executionJobs = testRule.getExecutionJobs(batch);
+    assertThat(executionJobs)
+            .extracting("processInstanceId")
+            .containsExactlyInAnyOrder(processInstanceIdOne, processInstanceIdTwo);
+
+    // clear
+    managementService.deleteBatch(batch.getId(), true);
+  }
+
   @Test
   public void shouldSetRemovalTime_SingleInvocationPerBatchJob() {
     // given
@@ -2835,6 +2863,9 @@ public void shouldSetExecutionStartTimeInBatchAndHistoryForDecisions() {
                 .putValue("temperature", 32)
                 .putValue("dayType", "Weekend")
         ).evaluate();
+
+    HistoricDecisionInstanceQuery query = historyService.createHistoricDecisionInstanceQuery();
+
     Batch batch = historyService.setRemovalTimeToHistoricDecisionInstances()
         .absoluteRemovalTime(CURRENT_DATE)
         .byQuery(historyService.createHistoricDecisionInstanceQuery())
@@ -2851,6 +2882,11 @@ public void shouldSetExecutionStartTimeInBatchAndHistoryForDecisions() {
 
     assertThat(batch.getExecutionStartTime()).isEqualToIgnoringMillis(CURRENT_DATE);
     assertThat(historicBatch.getExecutionStartTime()).isEqualToIgnoringMillis(CURRENT_DATE);
+
+    //Making sure that processInstanceId is set in execution jobs #4205
+    assertThat(executionJobs)
+            .extracting("processInstanceId")
+            .containsExactlyInAnyOrder(query.list().stream().map(HistoricDecisionInstance::getId).toArray());
   }
 
 }

engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/CorrelateAllMessageBatchTest.java

@@ -580,6 +580,7 @@ public void shouldCreateProcessInstanceRelatedBatchJobsForSingleInvocations() {
     rule.executeSeedJobs(batch);
 
     // then
+    //Making sure that processInstanceId is set in execution jobs #4205
     List<Job> executionJobs = rule.getExecutionJobs(batch);
     assertThat(executionJobs)
       .extracting("processInstanceId")

engine/src/test/java/org/camunda/bpm/engine/test/api/runtime/SetVariablesBatchTest.java

@@ -685,6 +685,7 @@ public void shouldCreateProcessInstanceRelatedBatchJobsForSingleInvocations() {
     rule.executeSeedJobs(batch);
 
     // then
+    //Making sure that processInstanceId is set in execution jobs #4205
     List<Job> executionJobs = rule.getExecutionJobs(batch);
     assertThat(executionJobs)
         .extracting("processInstanceId")