Skip to content

Restore disabled JdbcJobDaoTests #5174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
quaff wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −22
Open

Restore disabled JdbcJobDaoTests #5174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 5 additions & 21 deletions ...core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobDaoTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
/**
* @author Dave Syer
* @author Mahmoud Ben Hassine
* @author Yanming Zhou
*
*/
public abstract class AbstractJobDaoTests {
Expand Down Expand Up @@ -92,7 +93,7 @@ void onSetUpInTransaction() {

// Create an execution
jobExecutionStartTime = LocalDateTime.now();
jobExecution = new JobExecution(1L, jobInstance, jobParameters);
jobExecution = jobExecutionDao.createJobExecution(jobInstance, jobParameters);
jobExecution.setStartTime(jobExecutionStartTime);
jobExecution.setStatus(BatchStatus.STARTED);
jobExecutionDao.updateJobExecution(jobExecution);
Expand All @@ -112,7 +113,7 @@ void testVersionIsNotNullForJobExecution() {
int version = jdbcTemplate.queryForObject(
"select version from BATCH_JOB_EXECUTION where JOB_EXECUTION_ID=" + jobExecution.getId(),
Integer.class);
assertEquals(0, version);
assertEquals(1, version);
}

@Transactional
Expand Down Expand Up @@ -193,7 +194,7 @@ void testUpdateInvalidJobExecution() {
// id is invalid
JobExecution execution = new JobExecution(29432L, jobInstance, jobParameters);
execution.incrementVersion();
assertThrows(NoSuchObjectException.class, () -> jobExecutionDao.updateJobExecution(execution));
assertThrows(RuntimeException.class, () -> jobExecutionDao.updateJobExecution(execution));
}

@Transactional
Expand Down Expand Up @@ -254,10 +255,8 @@ private void validateJobExecution(JobExecution lhs, JobExecution rhs) {
@Transactional
@Test
void testGetLastJobExecution() {
assertEquals(null, jobExecutionDao.getLastJobExecution(jobInstance));

JobExecution lastExecution = new JobExecution(1L, jobInstance, jobParameters);
lastExecution.setStatus(BatchStatus.STARTED);
JobExecution lastExecution = jobExecutionDao.getLastJobExecution(jobInstance);

int JUMP_INTO_FUTURE = 1000; // makes sure start time is 'greatest'
lastExecution.setCreateTime(LocalDateTime.now().plus(JUMP_INTO_FUTURE, ChronoUnit.MILLIS));
Expand Down Expand Up @@ -291,21 +290,6 @@ void testCreationAddsVersion() {
assertNotNull(jobInstance.getVersion());
}

@Transactional
@Test
void testSaveAddsVersionAndId() {

JobExecution jobExecution = new JobExecution(1L, jobInstance, jobParameters);

assertNull(jobExecution.getId());
assertNull(jobExecution.getVersion());

jobExecutionDao.updateJobExecution(jobExecution);

assertNotNull(jobExecution.getId());
assertNotNull(jobExecution.getVersion());
}

@Transactional
@Test
void testUpdateIncrementsVersion() {
Expand Down
1 change: 0 additions & 1 deletion ...ore/src/test/java/org/springframework/batch/core/repository/dao/jdbc/JdbcJobDaoTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

@SpringJUnitConfig(locations = { "sql-dao-test.xml" })
// TODO refactor using black-box testing instead of white-box testing
@Disabled
public class JdbcJobDaoTests extends AbstractJobDaoTests {

public static final String LONG_STRING = "A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String ";
Expand Down