SNA-17. Add tests to validate non-reentrant save and optimistic update

Author: valb3r

neo4j-adapter/src/test/java/com/github/valb3r/springbatch/adapters/dao/repository/JobExecutionDaoTest.java

@@ -21,12 +21,14 @@
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.dao.OptimisticLockingFailureException;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 @SpringBootTest(classes = Neo4jTestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.NONE)
 class JobExecutionDaoTest {
@@ -74,6 +76,15 @@ void saveJobExecution() {
         assertThat(exec.getJobParameters()).isEqualToComparingFieldByField(newExec.getJobParameters());
     }
 
+    @Test
+    void saveSameJobExecutionThrows() {
+        var newExec = execution();
+        execDao.saveJobExecution(newExec);
+
+        assertThatThrownBy(() -> execDao.saveJobExecution(newExec))
+                .isInstanceOf(IllegalStateException.class);
+    }
+
     @Test
     void updateJobExecution() {
         var newExec = execution();
@@ -94,7 +105,23 @@ void updateJobExecution() {
         assertThat(exec.getStatus()).isEqualTo(BatchStatus.ABANDONED);
         assertThat(exec.getExecutionContext()).isEqualTo(params());
         assertThat(exec.getJobParameters()).isEqualToComparingFieldByField(newExec.getJobParameters());
+    }
+
+    @Test
+    void updateOldVersionThrows() {
+        var newExec = execution();
+        execDao.saveJobExecution(newExec);
+
+        ExecutionContext newCtx = new ExecutionContext(params());
+        newExec.setExitStatus(ExitStatus.COMPLETED);
+        newExec.setStatus(BatchStatus.ABANDONED);
+        newExec.setExecutionContext(newCtx);
 
+        execDao.updateJobExecution(newExec);
+        newExec.setVersion(newExec.getVersion() - 1);
+
+        assertThatThrownBy(() ->  execDao.updateJobExecution(newExec))
+                .isInstanceOf(OptimisticLockingFailureException.class);
     }
 
     /**
@@ -186,6 +213,22 @@ void synchronizeStatus() {
             .isEqualTo(BatchStatus.ABANDONED);
     }
 
+    @Test
+    void synchronizeStatusDoesNotUpdateSame() {
+        JobParameters parameters = new JobParametersBuilder().addLong(PARAM, LONG_PARAM_VAL).toJobParameters();
+        val instance = instanceDao.createJobInstance(JOB_NAME, parameters);
+
+        var execToSave = execution(instance);
+        execToSave.setStartTime(new Date());
+        execDao.saveJobExecution(execToSave);
+
+        execToSave.setStatus(BatchStatus.ABANDONED);
+        execDao.synchronizeStatus(execToSave);
+
+        assertThat(execDao.getJobExecution(execToSave.getId())).extracting(JobExecution::getStatus)
+                .isEqualTo(BatchStatus.STARTING);
+    }
+
     private JobExecution execution(JobInstance instance) {
         JobParameters parameters = new JobParametersBuilder().addLong(PARAM, LONG_PARAM_VAL).toJobParameters();
         return new JobExecution(instance, parameters);

neo4j-adapter/src/test/java/com/github/valb3r/springbatch/adapters/dao/repository/StepExecutionDaoTest.java

@@ -6,6 +6,7 @@
 import com.github.valb3r.springbatch.adapters.testconfig.common.DbDropper;
 import com.github.valb3r.springbatch.adapters.testconfig.neo4j.Neo4jTestApplication;
 import lombok.val;
+import lombok.var;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.batch.core.BatchStatus;
@@ -16,12 +17,15 @@
 import org.springframework.batch.core.repository.dao.JobExecutionDao;
 import org.springframework.batch.core.repository.dao.JobInstanceDao;
 import org.springframework.batch.core.repository.dao.StepExecutionDao;
+import org.springframework.batch.item.ExecutionContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.dao.OptimisticLockingFailureException;
 
 import java.util.Arrays;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 @SpringBootTest(classes = Neo4jTestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.NONE)
 class StepExecutionDaoTest {
@@ -65,6 +69,16 @@ void saveStepExecution() {
             .isEqualTo(execution.getId());
     }
 
+    @Test
+    void saveSameStepExecutionThrows() {
+        val execution = execution();
+        val stepExecution = new StepExecution(STEP_NAME, execution);
+        execDao.saveStepExecution(stepExecution);
+
+        assertThatThrownBy(() -> execDao.saveStepExecution(stepExecution))
+                .isInstanceOf(IllegalStateException.class);
+    }
+
     @Test
     void saveStepExecutions() {
         val execution = execution();
@@ -105,6 +119,22 @@ void updateStepExecution() {
         assertThat(step).isEqualToIgnoringGivenFields(stepExec, "jobExecution", "executionContext");
     }
 
+    @Test
+    void updateOldVersionThrows() {
+        val execution = execution();
+        val stepExec = new StepExecution(STEP_NAME, execution);
+        execDao.saveStepExecution(stepExec);
+
+        stepExec.setCommitCount(99);
+        stepExec.setStatus(BatchStatus.ABANDONED);
+        stepExec.setExitStatus(ExitStatus.FAILED);
+        execDao.updateStepExecution(stepExec);
+        stepExec.setVersion(stepExec.getVersion() - 1);
+
+        assertThatThrownBy(() ->  execDao.updateStepExecution(stepExec))
+                .isInstanceOf(OptimisticLockingFailureException.class);
+    }
+
     @Test
     void getStepExecution() {
         val execution = execution();