Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-2178: allow injection of custom JdbcOperations implementation in

Browse Source 
JobRepositoryFactoryBean and JobExplorerFactoryBean
This commit is contained in:
jpraet
2014-02-21 21:05:26 +01:00
committed by Michael Minella
parent ac81a97d0d
commit 08aa9eb589
4 changed files with 96 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBeanTests.java
View File

@@ -15,6 +15,7 @@
*/
package org.springframework.batch.core.explore.support;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.fail;
import static org.mockito.Mockito.mock;
@@ -26,6 +27,9 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.explore.support.JobExplorerFactoryBean;
import org.springframework.jdbc.core.JdbcOperations;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.test.util.ReflectionTestUtils;
/**
* @author Dave Syer
@@ -49,6 +53,24 @@ public class JobExplorerFactoryBeanTests {
factory.setTablePrefix(tablePrefix);
}
@Test
public void testDefaultJdbcOperations() throws Exception {
factory.afterPropertiesSet();
JdbcOperations jdbcOperations = (JdbcOperations) ReflectionTestUtils.getField(factory, "jdbcOperations");
assertTrue(jdbcOperations instanceof JdbcTemplate);
}
@Test
public void testCustomJdbcOperations() throws Exception {
JdbcOperations customJdbcOperations = mock(JdbcOperations.class);
factory.setJdbcOperations(customJdbcOperations);
factory.afterPropertiesSet();
assertEquals(customJdbcOperations, ReflectionTestUtils.getField(factory, "jdbcOperations"));
}
@Test
public void testMissingDataSource() throws Exception {

40
spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBeanTests.java
View File

@@ -40,6 +40,8 @@ import org.springframework.batch.core.repository.dao.XStreamExecutionContextStri
import org.springframework.batch.item.database.support.DataFieldMaxValueIncrementerFactory;
import org.springframework.core.serializer.Serializer;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.JdbcOperations;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
import org.springframework.jdbc.support.lob.DefaultLobHandler;
import org.springframework.jdbc.support.lob.LobHandler;
@@ -173,7 +175,45 @@ public class JobRepositoryFactoryBeanTests {
factory.afterPropertiesSet();
assertEquals(customSerializer, ReflectionTestUtils.getField(factory, "serializer"));
}
@Test
public void testDefaultJdbcOperations() throws Exception {
factory.setDatabaseType("ORACLE");
incrementerFactory = mock(DataFieldMaxValueIncrementerFactory.class);
when(incrementerFactory.isSupportedIncrementerType("ORACLE")).thenReturn(true);
when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_SEQ")).thenReturn(new StubIncrementer());
when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_EXECUTION_SEQ")).thenReturn(new StubIncrementer());
when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "STEP_EXECUTION_SEQ")).thenReturn(new StubIncrementer());
factory.setIncrementerFactory(incrementerFactory);
factory.afterPropertiesSet();
JdbcOperations jdbcOperations = (JdbcOperations) ReflectionTestUtils.getField(factory, "jdbcOperations");
assertTrue(jdbcOperations instanceof JdbcTemplate);
}
@Test
public void testCustomJdbcOperations() throws Exception {
factory.setDatabaseType("ORACLE");
incrementerFactory = mock(DataFieldMaxValueIncrementerFactory.class);
when(incrementerFactory.isSupportedIncrementerType("ORACLE")).thenReturn(true);
when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_SEQ")).thenReturn(new StubIncrementer());
when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_EXECUTION_SEQ")).thenReturn(new StubIncrementer());
when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "STEP_EXECUTION_SEQ")).thenReturn(new StubIncrementer());
factory.setIncrementerFactory(incrementerFactory);
JdbcOperations customJdbcOperations = mock(JdbcOperations.class);
factory.setJdbcOperations(customJdbcOperations);
factory.afterPropertiesSet();
assertEquals(customJdbcOperations, ReflectionTestUtils.getField(factory, "jdbcOperations"));
}
@Test
public void testMissingDataSource() throws Exception {