Skip to content

Commit 8aea17f

Browse files
fmbenhassinefmbenhassine
committed
Refactor tests in spring-batch-infrastructure
- Remove unused resources - Fix logging libraries conflicts - Merge duplicate data source configuration - Merge scattered DDL scripts - Replace usage of DataSourceInitializer with Spring JDBC test utilities
1 parent e6e9c4e commit 8aea17f

File tree

47 files changed

+156
-785
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+156
-785
lines changed

‎spring-batch-infrastructure/pom.xml

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@
103103
<groupId>com.fasterxml.jackson.core</groupId>
104104
<artifactId>jackson-core</artifactId>
105105
</exclusion>
106+
<exclusion>
107+
<groupId>org.slf4j</groupId>
108+
<artifactId>slf4j-api</artifactId>
109+
</exclusion>
106110
</exclusions>
107111
</dependency>
108112
<dependency>
@@ -146,18 +150,36 @@
146150
<artifactId>spring-data-commons</artifactId>
147151
<version>${spring-data-commons.version}</version>
148152
<optional>true</optional>
153+
<exclusions>
154+
<exclusion>
155+
<groupId>org.slf4j</groupId>
156+
<artifactId>slf4j-api</artifactId>
157+
</exclusion>
158+
</exclusions>
149159
</dependency>
150160
<dependency>
151161
<groupId>org.springframework.data</groupId>
152162
<artifactId>spring-data-mongodb</artifactId>
153163
<version>${spring-data-mongodb.version}</version>
154164
<optional>true</optional>
165+
<exclusions>
166+
<exclusion>
167+
<groupId>org.slf4j</groupId>
168+
<artifactId>slf4j-api</artifactId>
169+
</exclusion>
170+
</exclusions>
155171
</dependency>
156172
<dependency>
157173
<groupId>org.springframework.data</groupId>
158174
<artifactId>spring-data-jpa</artifactId>
159175
<version>${spring-data-jpa.version}</version>
160176
<optional>true</optional>
177+
<exclusions>
178+
<exclusion>
179+
<groupId>org.slf4j</groupId>
180+
<artifactId>slf4j-api</artifactId>
181+
</exclusion>
182+
</exclusions>
161183
</dependency>
162184
<dependency>
163185
<groupId>org.mongodb</groupId>
@@ -170,6 +192,12 @@
170192
<artifactId>spring-ldap-core</artifactId>
171193
<version>${spring-ldap.version}</version>
172194
<optional>true</optional>
195+
<exclusions>
196+
<exclusion>
197+
<groupId>org.slf4j</groupId>
198+
<artifactId>slf4j-api</artifactId>
199+
</exclusion>
200+
</exclusions>
173201
</dependency>
174202
<dependency>
175203
<groupId>org.springframework.ldap</groupId>
@@ -355,12 +383,6 @@
355383
<version>${mockito.version}</version>
356384
<scope>test</scope>
357385
</dependency>
358-
<dependency>
359-
<groupId>org.apache.logging.log4j</groupId>
360-
<artifactId>log4j-core</artifactId>
361-
<version>${log4j.version}</version>
362-
<scope>test</scope>
363-
</dependency>
364386
<dependency>
365387
<groupId>org.hibernate.validator</groupId>
366388
<artifactId>hibernate-validator</artifactId>

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractDatabaseItemStreamItemReaderTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 the original author or authors.
2+
* Copyright 2009-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ protected void tearDown() throws Exception {
5252
* Sub-classes can override this and create their own context.
5353
*/
5454
protected void initializeContext() throws Exception {
55-
ctx = new ClassPathXmlApplicationContext("org/springframework/batch/item/database/data-source-context.xml");
55+
ctx = new ClassPathXmlApplicationContext("data-source-context.xml");
5656
}
5757

5858
@Test

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractGenericDataSourceItemReaderIntegrationTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2022 the original author or authors.
2+
* Copyright 2010-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,8 +23,9 @@
2323
* from database. Uses a common test context and HSQLDB database.
2424
*
2525
* @author Thomas Risberg
26+
* @author Mahmoud Ben Hassine
2627
*/
27-
@SpringJUnitConfig(locations = "data-source-context.xml")
28+
@SpringJUnitConfig(locations = "classpath:data-source-context.xml")
2829
abstract class AbstractGenericDataSourceItemReaderIntegrationTests
2930
extends AbstractDataSourceItemReaderIntegrationTests {
3031

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorProjectionItemReaderIntegrationTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2008-2022 the original author or authors.
2+
* Copyright 2008-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -35,8 +35,9 @@
3535
* Tests for {@link HibernateCursorItemReader} using {@link StatelessSession}.
3636
*
3737
* @author Robert Kasanicky
38+
* @author Mahmoud Ben Hassine
3839
*/
39-
@SpringJUnitConfig(locations = "data-source-context.xml")
40+
@SpringJUnitConfig(locations = "classpath:data-source-context.xml")
4041
class HibernateCursorProjectionItemReaderIntegrationTests {
4142

4243
@Autowired

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaCursorItemReaderCommonTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020 the original author or authors.
2+
* Copyright 2020-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ public class JpaCursorItemReaderCommonTests extends AbstractDatabaseItemStreamIt
3030
protected ItemReader<Foo> getItemReader() throws Exception {
3131
LocalContainerEntityManagerFactoryBean factoryBean = new LocalContainerEntityManagerFactoryBean();
3232
factoryBean.setDataSource(getDataSource());
33-
factoryBean.setPersistenceUnitName("bar");
33+
factoryBean.setPersistenceUnitName("foo");
3434
factoryBean.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
3535
factoryBean.afterPropertiesSet();
3636

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2008-2021 the original author or authors.
2+
* Copyright 2008-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ protected ItemReader<Foo> createItemReader() throws Exception {
3737
LocalContainerEntityManagerFactoryBean factoryBean = new LocalContainerEntityManagerFactoryBean();
3838
factoryBean.setDataSource(dataSource);
3939
factoryBean.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
40-
factoryBean.setPersistenceUnitName("bar");
40+
factoryBean.setPersistenceUnitName("foo");
4141
factoryBean.afterPropertiesSet();
4242

4343
EntityManagerFactory entityManagerFactory = factoryBean.getObject();

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderNativeQueryIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2022 the original author or authors.
2+
* Copyright 2010-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -75,7 +75,7 @@ public static class JpaConfiguration {
7575
@Bean
7676
public DataSource dataSource() {
7777
return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL)
78-
.addScript("org/springframework/batch/item/database/init-foo-schema-hsqldb.sql")
78+
.addScript("org/springframework/batch/item/database/init-foo-schema.sql")
7979
.generateUniqueName(true)
8080
.build();
8181
}

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredProcedureItemReaderCommonTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.springframework.batch.item.database;
1717

1818
import org.hsqldb.types.Types;
19+
import org.junit.jupiter.api.Disabled;
1920
import org.junit.jupiter.api.Test;
2021
import org.springframework.batch.item.ExecutionContext;
2122
import org.springframework.batch.item.ItemReader;
@@ -26,6 +27,7 @@
2627

2728
import static org.junit.jupiter.api.Assertions.assertThrows;
2829

30+
@Disabled("see FIXME in init-foo-schema.sql")
2931
class StoredProcedureItemReaderCommonTests extends AbstractDatabaseItemStreamItemReaderTests {
3032

3133
@Override
@@ -41,8 +43,7 @@ protected ItemReader<Foo> getItemReader() throws Exception {
4143

4244
@Override
4345
protected void initializeContext() {
44-
ctx = new ClassPathXmlApplicationContext(
45-
"org/springframework/batch/item/database/stored-procedure-context.xml");
46+
ctx = new ClassPathXmlApplicationContext("data-source-context.xml");
4647
}
4748

4849
@Test

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredProcedureItemReaderIntegrationTests.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2022 the original author or authors.
2+
* Copyright 2010-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,15 +15,18 @@
1515
*/
1616
package org.springframework.batch.item.database;
1717

18+
import org.junit.jupiter.api.Disabled;
19+
1820
import org.springframework.batch.item.ItemReader;
1921
import org.springframework.batch.item.sample.Foo;
2022
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
2123

22-
@SpringJUnitConfig(locations = "stored-procedure-context.xml")
24+
@Disabled("see FIXME in init-foo-schema.sql")
25+
@SpringJUnitConfig(locations = "classpath:data-source-context.xml")
2326
public class StoredProcedureItemReaderIntegrationTests extends AbstractDataSourceItemReaderIntegrationTests {
2427

2528
@Override
26-
protected ItemReader<Foo> createItemReader() throws Exception {
29+
protected ItemReader<Foo> createItemReader() {
2730
StoredProcedureItemReader<Foo> reader = new StoredProcedureItemReader<>();
2831
reader.setDataSource(dataSource);
2932
reader.setProcedureName("read_foos");

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/HibernateCursorItemReaderBuilderTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017-2022 the original author or authors.
2+
* Copyright 2017-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -45,6 +45,7 @@
4545

4646
/**
4747
* @author Michael Minella
48+
* @author Mahmoud Ben Hassine
4849
*/
4950
class HibernateCursorItemReaderBuilderTests {
5051

@@ -219,8 +220,7 @@ public DataSourceInitializer initializer(DataSource dataSource) {
219220
DataSourceInitializer dataSourceInitializer = new DataSourceInitializer();
220221
dataSourceInitializer.setDataSource(dataSource);
221222

222-
Resource create = new ClassPathResource(
223-
"org/springframework/batch/item/database/init-foo-schema-hsqldb.sql");
223+
Resource create = new ClassPathResource("org/springframework/batch/item/database/init-foo-schema.sql");
224224
dataSourceInitializer.setDatabasePopulator(new ResourceDatabasePopulator(create));
225225

226226
return dataSourceInitializer;

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/HibernatePagingItemReaderBuilderTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017-2022 the original author or authors.
2+
* Copyright 2017-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -206,8 +206,7 @@ public DataSourceInitializer initializer(DataSource dataSource) {
206206
DataSourceInitializer dataSourceInitializer = new DataSourceInitializer();
207207
dataSourceInitializer.setDataSource(dataSource);
208208

209-
Resource create = new ClassPathResource(
210-
"org/springframework/batch/item/database/init-foo-schema-hsqldb.sql");
209+
Resource create = new ClassPathResource("org/springframework/batch/item/database/init-foo-schema.sql");
211210
dataSourceInitializer.setDatabasePopulator(new ResourceDatabasePopulator(create));
212211

213212
return dataSourceInitializer;

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JpaCursorItemReaderBuilderTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2021 the original author or authors.
2+
* Copyright 2020-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -223,8 +223,7 @@ public DataSourceInitializer initializer(DataSource dataSource) {
223223
DataSourceInitializer dataSourceInitializer = new DataSourceInitializer();
224224
dataSourceInitializer.setDataSource(dataSource);
225225

226-
Resource create = new ClassPathResource(
227-
"org/springframework/batch/item/database/init-foo-schema-hsqldb.sql");
226+
Resource create = new ClassPathResource("org/springframework/batch/item/database/init-foo-schema.sql");
228227
dataSourceInitializer.setDatabasePopulator(new ResourceDatabasePopulator(create));
229228

230229
return dataSourceInitializer;
@@ -235,7 +234,7 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
235234
LocalContainerEntityManagerFactoryBean entityManagerFactoryBean = new LocalContainerEntityManagerFactoryBean();
236235

237236
entityManagerFactoryBean.setDataSource(dataSource());
238-
entityManagerFactoryBean.setPersistenceUnitName("bar");
237+
entityManagerFactoryBean.setPersistenceUnitName("foo");
239238
entityManagerFactoryBean.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
240239

241240
return entityManagerFactoryBean;

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JpaPagingItemReaderBuilderTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,7 @@ public DataSourceInitializer initializer(DataSource dataSource) {
235235
DataSourceInitializer dataSourceInitializer = new DataSourceInitializer();
236236
dataSourceInitializer.setDataSource(dataSource);
237237

238-
Resource create = new ClassPathResource(
239-
"org/springframework/batch/item/database/init-foo-schema-hsqldb.sql");
238+
Resource create = new ClassPathResource("org/springframework/batch/item/database/init-foo-schema.sql");
240239
dataSourceInitializer.setDatabasePopulator(new ResourceDatabasePopulator(create));
241240

242241
return dataSourceInitializer;
@@ -247,7 +246,7 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory() throws Exce
247246
LocalContainerEntityManagerFactoryBean entityManagerFactoryBean = new LocalContainerEntityManagerFactoryBean();
248247

249248
entityManagerFactoryBean.setDataSource(dataSource());
250-
entityManagerFactoryBean.setPersistenceUnitName("bar");
249+
entityManagerFactoryBean.setPersistenceUnitName("foo");
251250
entityManagerFactoryBean.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
252251

253252
return entityManagerFactoryBean;

0 commit comments

Comments
 (0)