root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Fix schema file name for Batch auto-configuration tests 

Closes gh-29648
This commit is contained in:
Stephane Nicoll 2022-02-04 09:47:45 +01:00
parent 080de85e2e
commit 48649192cb
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -227,7 +227,7 @@ class BatchAutoConfigurationTests {
.withUserConfiguration(TestConfiguration.class, EmbeddedDataSourceConfiguration.class, .withUserConfiguration(TestConfiguration.class, EmbeddedDataSourceConfiguration.class,
HibernateJpaAutoConfiguration.class) HibernateJpaAutoConfiguration.class)
.withPropertyValues("spring.datasource.generate-unique-name=true", .withPropertyValues("spring.datasource.generate-unique-name=true",
"spring.batch.jdbc.schema:classpath:batch/custom-schema-hsql.sql", "spring.batch.jdbc.schema:classpath:batch/custom-schema.sql",
"spring.batch.jdbc.tablePrefix:PREFIX_") "spring.batch.jdbc.tablePrefix:PREFIX_")
.run(assertCustomTablePrefix()); .run(assertCustomTablePrefix());
} }
@ -239,8 +239,7 @@ class BatchAutoConfigurationTests {
.withUserConfiguration(TestConfiguration.class, EmbeddedDataSourceConfiguration.class, .withUserConfiguration(TestConfiguration.class, EmbeddedDataSourceConfiguration.class,
HibernateJpaAutoConfiguration.class) HibernateJpaAutoConfiguration.class)
.withPropertyValues("spring.datasource.generate-unique-name=true", .withPropertyValues("spring.datasource.generate-unique-name=true",
"spring.batch.schema:classpath:batch/custom-schema-hsql.sql", "spring.batch.schema:classpath:batch/custom-schema.sql", "spring.batch.tablePrefix:PREFIX_")
"spring.batch.tablePrefix:PREFIX_")
.run(assertCustomTablePrefix()); .run(assertCustomTablePrefix());
} }

7
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -75,7 +75,7 @@ class BatchAutoConfigurationWithoutJpaTests {
void jdbcWithCustomPrefix() { void jdbcWithCustomPrefix() {
this.contextRunner.withUserConfiguration(DefaultConfiguration.class, EmbeddedDataSourceConfiguration.class) this.contextRunner.withUserConfiguration(DefaultConfiguration.class, EmbeddedDataSourceConfiguration.class)
.withPropertyValues("spring.datasource.generate-unique-name=true", .withPropertyValues("spring.datasource.generate-unique-name=true",
"spring.batch.jdbc.schema:classpath:batch/custom-schema-hsql.sql", "spring.batch.jdbc.schema:classpath:batch/custom-schema.sql",
"spring.batch.jdbc.tablePrefix:PREFIX_") "spring.batch.jdbc.tablePrefix:PREFIX_")
.run(assertCustomPrefix()); .run(assertCustomPrefix());
} }
@ -85,8 +85,7 @@ class BatchAutoConfigurationWithoutJpaTests {
void jdbcWithCustomPrefixWithDeprecatedProperties() { void jdbcWithCustomPrefixWithDeprecatedProperties() {
this.contextRunner.withUserConfiguration(DefaultConfiguration.class, EmbeddedDataSourceConfiguration.class) this.contextRunner.withUserConfiguration(DefaultConfiguration.class, EmbeddedDataSourceConfiguration.class)
.withPropertyValues("spring.datasource.generate-unique-name=true", .withPropertyValues("spring.datasource.generate-unique-name=true",
"spring.batch.schema:classpath:batch/custom-schema-hsql.sql", "spring.batch.schema:classpath:batch/custom-schema.sql", "spring.batch.tablePrefix:PREFIX_")
"spring.batch.tablePrefix:PREFIX_")
.run(assertCustomPrefix()); .run(assertCustomPrefix());
} }

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/batch/custom-schema-hsql.sql → spring-boot-project/spring-boot-autoconfigure/src/test/resources/batch/custom-schema.sql
View File

@ -1,5 +1,3 @@
-- Autogenerated: do not edit this file
CREATE TABLE PREFIX_JOB_INSTANCE ( CREATE TABLE PREFIX_JOB_INSTANCE (
JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY , JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
VERSION BIGINT , VERSION BIGINT ,