Commit 80da80f9 authored by Stephane Nicoll's avatar Stephane Nicoll

Make sure that test data sources are unique

parent 941c53dc
...@@ -62,6 +62,7 @@ public class AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests { ...@@ -62,6 +62,7 @@ public class AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests {
@Primary @Primary
public DataSource dataSource() { public DataSource dataSource() {
EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
.generateUniqueName(true)
.setType(EmbeddedDatabaseType.HSQL); .setType(EmbeddedDatabaseType.HSQL);
return builder.build(); return builder.build();
} }
...@@ -69,6 +70,7 @@ public class AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests { ...@@ -69,6 +70,7 @@ public class AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests {
@Bean @Bean
public DataSource secondaryDataSource() { public DataSource secondaryDataSource() {
EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
.generateUniqueName(true)
.setType(EmbeddedDatabaseType.HSQL); .setType(EmbeddedDatabaseType.HSQL);
return builder.build(); return builder.build();
} }
......
...@@ -34,6 +34,7 @@ public class ExampleJdbcApplication { ...@@ -34,6 +34,7 @@ public class ExampleJdbcApplication {
@Bean @Bean
public DataSource dataSource() { public DataSource dataSource() {
EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
.generateUniqueName(true)
.setType(EmbeddedDatabaseType.HSQL); .setType(EmbeddedDatabaseType.HSQL);
return builder.build(); return builder.build();
} }
......
...@@ -61,6 +61,7 @@ public class JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTest ...@@ -61,6 +61,7 @@ public class JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTest
@Bean @Bean
public DataSource dataSource() { public DataSource dataSource() {
EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
.generateUniqueName(true)
.setType(EmbeddedDatabaseType.H2); .setType(EmbeddedDatabaseType.H2);
return builder.build(); return builder.build();
} }
......
...@@ -93,6 +93,7 @@ public class TestDatabaseAutoConfigurationTests { ...@@ -93,6 +93,7 @@ public class TestDatabaseAutoConfigurationTests {
@Bean @Bean
public DataSource dataSource() { public DataSource dataSource() {
EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
.generateUniqueName(true)
.setType(EmbeddedDatabaseType.HSQL); .setType(EmbeddedDatabaseType.HSQL);
return builder.build(); return builder.build();
} }
......
...@@ -76,6 +76,7 @@ public class DataJpaTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationT ...@@ -76,6 +76,7 @@ public class DataJpaTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationT
@Bean @Bean
public DataSource dataSource() { public DataSource dataSource() {
EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
.generateUniqueName(true)
.setType(EmbeddedDatabaseType.H2); .setType(EmbeddedDatabaseType.H2);
return builder.build(); return builder.build();
} }
......
...@@ -34,6 +34,7 @@ public class ExampleDataJpaApplication { ...@@ -34,6 +34,7 @@ public class ExampleDataJpaApplication {
@Bean @Bean
public DataSource dataSource() { public DataSource dataSource() {
EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
.generateUniqueName(true)
.setType(EmbeddedDatabaseType.HSQL); .setType(EmbeddedDatabaseType.HSQL);
return builder.build(); return builder.build();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment