mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Upgrade to Spring Batch 3.0.4 snapshots
Closes gh-2712
This commit is contained in:
parent
c51277f6eb
commit
8b1022effa
@ -23,7 +23,6 @@ import javax.persistence.EntityManagerFactory;
|
||||
import javax.sql.DataSource;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.rules.ExpectedException;
|
||||
@ -85,7 +84,6 @@ public class BatchAutoConfigurationTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("Due to the removal of ParameterizedRowMapper, Spring Batch is incompatible with Spring Framework 4.2")
|
||||
public void testDefaultContext() throws Exception {
|
||||
this.context = new AnnotationConfigApplicationContext();
|
||||
this.context.register(TestConfiguration.class,
|
||||
@ -122,7 +120,6 @@ public class BatchAutoConfigurationTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("Due to the removal of ParameterizedRowMapper, Spring Batch is incompatible with Spring Framework 4.2")
|
||||
public void testDefinesAndLaunchesJob() throws Exception {
|
||||
this.context = new AnnotationConfigApplicationContext();
|
||||
this.context.register(JobConfiguration.class,
|
||||
@ -136,7 +133,6 @@ public class BatchAutoConfigurationTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("Due to the removal of ParameterizedRowMapper, Spring Batch is incompatible with Spring Framework 4.2")
|
||||
public void testDefinesAndLaunchesNamedJob() throws Exception {
|
||||
this.context = new AnnotationConfigApplicationContext();
|
||||
EnvironmentTestUtils.addEnvironment(this.context,
|
||||
@ -153,7 +149,6 @@ public class BatchAutoConfigurationTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("Due to the removal of ParameterizedRowMapper, Spring Batch is incompatible with Spring Framework 4.2")
|
||||
public void testDefinesAndLaunchesLocalJob() throws Exception {
|
||||
this.context = new AnnotationConfigApplicationContext();
|
||||
EnvironmentTestUtils.addEnvironment(this.context,
|
||||
@ -169,7 +164,6 @@ public class BatchAutoConfigurationTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("Due to the removal of ParameterizedRowMapper, Spring Batch is incompatible with Spring Framework 4.2")
|
||||
public void testDisableLaunchesJob() throws Exception {
|
||||
this.context = new AnnotationConfigApplicationContext();
|
||||
EnvironmentTestUtils.addEnvironment(this.context,
|
||||
@ -183,7 +177,6 @@ public class BatchAutoConfigurationTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("Due to the removal of ParameterizedRowMapper, Spring Batch is incompatible with Spring Framework 4.2")
|
||||
public void testDisableSchemaLoader() throws Exception {
|
||||
this.context = new AnnotationConfigApplicationContext();
|
||||
EnvironmentTestUtils.addEnvironment(this.context,
|
||||
@ -200,7 +193,6 @@ public class BatchAutoConfigurationTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("Due to the removal of ParameterizedRowMapper, Spring Batch is incompatible with Spring Framework 4.2")
|
||||
public void testUsingJpa() throws Exception {
|
||||
this.context = new AnnotationConfigApplicationContext();
|
||||
// The order is very important here: DataSource -> Hibernate -> Batch
|
||||
|
@ -63,7 +63,6 @@ public class SampleIntegrationTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("Due to the removal of ParameterizedRowMapper, Spring Batch is incompatible with Spring Framework 4.2")
|
||||
public void jobSample() throws Exception {
|
||||
String output = this.cli.run("job.groovy", "foo=bar");
|
||||
assertTrue("Wrong output: " + output,
|
||||
@ -82,7 +81,6 @@ public class SampleIntegrationTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("Spring Batch is incompatible with Spring Framework 4.2")
|
||||
public void jobWebSample() throws Exception {
|
||||
String output = this.cli.run("job.groovy", "web.groovy", "foo=bar");
|
||||
assertTrue("Wrong output: " + output,
|
||||
|
@ -118,7 +118,7 @@
|
||||
<spring.version>4.2.0.BUILD-SNAPSHOT</spring.version>
|
||||
<spring-amqp.version>1.4.4.RELEASE</spring-amqp.version>
|
||||
<spring-cloud-connectors.version>1.1.1.RELEASE</spring-cloud-connectors.version>
|
||||
<spring-batch.version>3.0.3.RELEASE</spring-batch.version>
|
||||
<spring-batch.version>3.0.4.BUILD-SNAPSHOT</spring-batch.version>
|
||||
<spring-data-releasetrain.version>Fowler-RC1</spring-data-releasetrain.version>
|
||||
<spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version>
|
||||
<spring-integration.version>4.1.3.RELEASE</spring-integration.version>
|
||||
|
@ -16,7 +16,6 @@
|
||||
|
||||
package sample.batch;
|
||||
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
@ -25,7 +24,6 @@ import org.springframework.boot.test.OutputCapture;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
@Ignore("Due to the removal of ParameterizedRowMapper, Spring Batch is incompatible with Spring Framework 4.2")
|
||||
public class SampleBatchApplicationTests {
|
||||
|
||||
@Rule
|
||||
|
Loading…
Reference in New Issue
Block a user