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

Fix datasource initialization in remote partitioning samples

Browse Source
This commit is contained in:
Mahmoud Ben Hassine
2021-08-11 14:06:04 +02:00
parent 7bbbd4f667
commit b9790d11ba
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-batch-samples/src/test/java/org/springframework/batch/sample/RemotePartitioningJobFunctionalTests.java
View File

@@ -15,6 +15,8 @@
*/
package org.springframework.batch.sample;
import javax.sql.DataSource;
import org.apache.activemq.broker.BrokerService;
import org.junit.After;
import org.junit.Assert;
@@ -29,8 +31,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.PropertySource;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
import org.springframework.core.io.ClassPathResource;
import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
import org.springframework.test.context.junit4.SpringRunner;
/**
@@ -50,9 +52,10 @@ public abstract class RemotePartitioningJobFunctionalTests {
@Autowired
protected JobLauncherTestUtils jobLauncherTestUtils;
private BrokerService brokerService;
@Autowired
private DataSource dataSource;
private EmbeddedDatabase embeddedDatabase;
private BrokerService brokerService;
private AnnotationConfigApplicationContext workerApplicationContext;
@@ -64,11 +67,10 @@ public abstract class RemotePartitioningJobFunctionalTests {
this.brokerService.addConnector(this.brokerUrl);
this.brokerService.setDataDirectory(BROKER_DATA_DIRECTORY);
this.brokerService.start();
this.embeddedDatabase = new EmbeddedDatabaseBuilder()
.addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql")
.addScript("/org/springframework/batch/core/schema-hsqldb.sql")
.generateUniqueName(true)
.build();
ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator();
databasePopulator.addScript(new ClassPathResource("/org/springframework/batch/core/schema-drop-hsqldb.sql"));
databasePopulator.addScript(new ClassPathResource("/org/springframework/batch/core/schema-hsqldb.sql"));
databasePopulator.execute(this.dataSource);
this.workerApplicationContext = new AnnotationConfigApplicationContext(getWorkerConfigurationClass());
}
@@ -86,7 +88,6 @@ public abstract class RemotePartitioningJobFunctionalTests {
public void tearDown() throws Exception {
this.workerApplicationContext.close();
this.brokerService.stop();
this.embeddedDatabase.shutdown();
}
}