Rework the tests and fix a JDK 11 issue

Author: jeffgbutler

src/test/java/examples/springbatch/NoPersistenceBatchConfigurer.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.springbatch;
+package examples.springbatch.common;
 
 public class Person {
     private Integer id;

src/test/java/examples/springbatch/Person.java renamed to src/test/java/examples/springbatch/common/Person.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.springbatch;
+package examples.springbatch.common;
 
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.annotation.BeforeChunk;

src/test/java/examples/springbatch/PersonProcessor.java renamed to src/test/java/examples/springbatch/common/PersonProcessor.java

@@ -13,9 +13,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.springbatch;
+package examples.springbatch.common;
 
-import static examples.springbatch.PersonDynamicSqlSupport.*;
+import static examples.springbatch.mapper.PersonDynamicSqlSupport.*;
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
 
 import org.mybatis.dynamic.sql.render.RenderingStrategy;

src/test/java/examples/springbatch/UpdateStatementConvertor.java renamed to src/test/java/examples/springbatch/common/UpdateStatementConvertor.java

@@ -13,10 +13,11 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.springbatch;
+package examples.springbatch.cursor;
 
-import static examples.springbatch.PersonDynamicSqlSupport.*;
-import static org.mybatis.dynamic.sql.SqlBuilder.*;
+import static examples.springbatch.mapper.PersonDynamicSqlSupport.lastName;
+import static examples.springbatch.mapper.PersonDynamicSqlSupport.person;
+import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
 
 import javax.sql.DataSource;
 
@@ -37,19 +38,23 @@
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.test.JobLauncherTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import examples.springbatch.common.Person;
+import examples.springbatch.mapper.PersonMapper;
 
 @EnableBatchProcessing
 @Configuration
-@ComponentScan("examples.springbatch")
-@MapperScan("examples.springbatch")
+@ComponentScan("examples.springbatch.common")
+@MapperScan("examples.springbatch.mapper")
 public class CursorReaderBatchConfiguration {
 
     @Autowired
@@ -62,23 +67,25 @@ public class CursorReaderBatchConfiguration {
     public DataSource dataSource() {
         return new EmbeddedDatabaseBuilder()
                 .setType(EmbeddedDatabaseType.HSQL)
+                .addScript("classpath:/org/springframework/batch/core/schema-drop-hsqldb.sql")
+                .addScript("classpath:/org/springframework/batch/core/schema-hsqldb.sql")
                 .addScript("classpath:/examples/springbatch/schema.sql")
                 .addScript("classpath:/examples/springbatch/data.sql")
                 .build();
     }
 
     @Bean
-    public SqlSessionFactoryBean sqlSessionFactoryBean(DataSource dataSource) {
-        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
-        bean.setDataSource(dataSource);
-        return bean;
+    public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception {
+        SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+        sessionFactory.setDataSource(dataSource);
+        return sessionFactory.getObject();
     }
-
+    
     @Bean
-    public JobLauncherTestUtils jobLauncherTestUtils() {
-        return new JobLauncherTestUtils();
+    public PlatformTransactionManager dtm(DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
     }
-    
+
     @Bean
     public MyBatisCursorItemReader<Person> reader(SqlSessionFactory sqlSessionFactory) {
         SelectStatementProvider selectStatement =  SpringBatchUtility.selectForCursor(person.allColumns())

src/test/java/examples/springbatch/CursorReaderBatchConfiguration.java renamed to src/test/java/examples/springbatch/cursor/CursorReaderBatchConfiguration.java

@@ -13,34 +13,37 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.springbatch;
+package examples.springbatch.cursor;
 
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
-
-import static examples.springbatch.PersonDynamicSqlSupport.*;
+import static examples.springbatch.mapper.PersonDynamicSqlSupport.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
 import org.junit.jupiter.api.Test;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.SelectDSL;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
-import org.mybatis.spring.SqlSessionFactoryBean;
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.context.SpringBatchTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
+import examples.springbatch.mapper.PersonMapper;
+
+@SpringBatchTest
 @SpringJUnitConfig(classes=CursorReaderBatchConfiguration.class)
 public class SpringBatchCursorTest {
 
     @Autowired
     private JobLauncherTestUtils jobLauncherTestUtils;
 
     @Autowired
-    private SqlSessionFactoryBean sqlSessionFactory;
+    private SqlSessionFactory sqlSessionFactory;
 
     @Test
     public void testThatRowsAreTransformedToUpperCase() throws Exception {
@@ -63,7 +66,7 @@ private int numberOfRowsProcessed(JobExecution jobExecution) {
     }
 
     private long upperCaseRowCount() throws Exception {
-        try (SqlSession sqlSession = sqlSessionFactory.getObject().openSession()) {
+        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
             PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
 
             SelectStatementProvider selectStatement = SelectDSL.select(count())

src/test/java/examples/springbatch/SpringBatchCursorTest.java renamed to src/test/java/examples/springbatch/cursor/SpringBatchCursorTest.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.springbatch;
+package examples.springbatch.mapper;
 
 import java.sql.JDBCType;
 

src/test/java/examples/springbatch/PersonDynamicSqlSupport.java renamed to src/test/java/examples/springbatch/mapper/PersonDynamicSqlSupport.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.springbatch;
+package examples.springbatch.mapper;
 
 import java.util.List;
 import java.util.Map;
@@ -28,6 +28,8 @@
 import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 import org.mybatis.dynamic.sql.util.springbatch.SpringBatchProviderAdapter;
 
+import examples.springbatch.common.Person;
+
 @Mapper
 public interface PersonMapper {
 

src/test/java/examples/springbatch/PersonMapper.java renamed to src/test/java/examples/springbatch/mapper/PersonMapper.java

@@ -13,9 +13,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.springbatch;
+package examples.springbatch.paging;
 
-import static examples.springbatch.PersonDynamicSqlSupport.*;
+import static examples.springbatch.mapper.PersonDynamicSqlSupport.*;
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
 
 import javax.sql.DataSource;
@@ -37,19 +37,22 @@
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.test.JobLauncherTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 
+import examples.springbatch.common.Person;
+import examples.springbatch.mapper.PersonMapper;
+
 @EnableBatchProcessing
 @Configuration
-@ComponentScan("examples.springbatch")
-@MapperScan("examples.springbatch")
+@ComponentScan("examples.springbatch.common")
+@MapperScan("examples.springbatch.mapper")
 public class PagingReaderBatchConfiguration {
 
     @Autowired
@@ -62,23 +65,25 @@ public class PagingReaderBatchConfiguration {
     public DataSource dataSource() {
         return new EmbeddedDatabaseBuilder()
                 .setType(EmbeddedDatabaseType.HSQL)
+                .addScript("classpath:/org/springframework/batch/core/schema-drop-hsqldb.sql")
+                .addScript("classpath:/org/springframework/batch/core/schema-hsqldb.sql")
                 .addScript("classpath:/examples/springbatch/schema.sql")
                 .addScript("classpath:/examples/springbatch/data.sql")
                 .build();
     }
 
     @Bean
-    public SqlSessionFactoryBean sqlSessionFactoryBean(DataSource dataSource) {
-        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
-        bean.setDataSource(dataSource);
-        return bean;
+    public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception {
+        SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+        sessionFactory.setDataSource(dataSource);
+        return sessionFactory.getObject();
     }
 
     @Bean
-    public JobLauncherTestUtils jobLauncherTestUtils() {
-        return new JobLauncherTestUtils();
+    public DataSourceTransactionManager dtm(DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
     }
-    
+
     @Bean
     public MyBatisPagingItemReader<Person> reader(SqlSessionFactory sqlSessionFactory) {
         SelectStatementProvider selectStatement =  SpringBatchUtility.selectForPaging(person.allColumns())

src/test/java/examples/springbatch/PagingReaderBatchConfiguration.java renamed to src/test/java/examples/springbatch/paging/PagingReaderBatchConfiguration.java

@@ -13,34 +13,37 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package examples.springbatch;
+package examples.springbatch.paging;
 
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
-
-import static examples.springbatch.PersonDynamicSqlSupport.*;
+import static examples.springbatch.mapper.PersonDynamicSqlSupport.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
 import org.junit.jupiter.api.Test;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.SelectDSL;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
-import org.mybatis.spring.SqlSessionFactoryBean;
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.context.SpringBatchTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
+import examples.springbatch.mapper.PersonMapper;
+
+@SpringBatchTest
 @SpringJUnitConfig(classes=PagingReaderBatchConfiguration.class)
 public class SpringBatchPagingTest {
 
     @Autowired
     private JobLauncherTestUtils jobLauncherTestUtils;
 
     @Autowired
-    private SqlSessionFactoryBean sqlSessionFactory;
+    private SqlSessionFactory sqlSessionFactory;
 
     @Test
     public void testThatRowsAreTransformedToUpperCase() throws Exception {
@@ -71,7 +74,7 @@ private int numberOfChunks(JobExecution jobExecution) {
     }
 
     private long upperCaseRowCount() throws Exception {
-        try (SqlSession sqlSession = sqlSessionFactory.getObject().openSession()) {
+        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
             PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
 
             SelectStatementProvider selectStatement = SelectDSL.select(count())

src/test/java/examples/springbatch/SpringBatchPagingTest.java renamed to src/test/java/examples/springbatch/paging/SpringBatchPagingTest.java

@@ -20,7 +20,7 @@
 <configuration>
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d [acct] %-5level %logger{36} - %msg%n</pattern>
+      <pattern>%d %-5level %logger{36} - %msg%n</pattern>
     </encoder>
   </appender>