Consistently use generated name in embedded databases

sbrannen · sbrannen · commit 9cac5eeeabf5 · 2023-10-16T21:38:47.000+02:00
... to avoid database name conflicts when test classes are executed in a different order. See gh-29122
diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/DataSourceOnlySqlScriptsTests.java b/spring-test/src/test/java/org/springframework/test/context/jdbc/DataSourceOnlySqlScriptsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -82,8 +82,8 @@ static class Config {
 
 		@Bean
 		DataSource dataSource() {
-			return new EmbeddedDatabaseBuilder()//
-					.setName("empty-sql-scripts-without-tx-mgr-test-db")//
+			return new EmbeddedDatabaseBuilder()
+					.generateUniqueName(true)
 					.build();
 		}
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/EmptyDatabaseConfig.java b/spring-test/src/test/java/org/springframework/test/context/jdbc/EmptyDatabaseConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,9 +46,9 @@ PlatformTransactionManager transactionManager(DataSource dataSource) {
 
 	@Bean
 	DataSource dataSource() {
-		return new EmbeddedDatabaseBuilder()//
-		.setName("empty-sql-scripts-test-db")//
-		.build();
+		return new EmbeddedDatabaseBuilder()
+				.generateUniqueName(true)
+				.build();
 	}
 
 }
diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/InferredDataSourceTransactionalSqlScriptsTests.java b/spring-test/src/test/java/org/springframework/test/context/jdbc/InferredDataSourceTransactionalSqlScriptsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -97,20 +97,20 @@ PlatformTransactionManager txMgr2() {
 
 		@Bean
 		DataSource dataSource1() {
-			return new EmbeddedDatabaseBuilder()//
-			.setName("database1")//
-			.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql")//
-			.addScript("classpath:/org/springframework/test/context/jdbc/data.sql")//
-			.build();
+			return new EmbeddedDatabaseBuilder()
+					.generateUniqueName(true)
+					.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql")
+					.addScript("classpath:/org/springframework/test/context/jdbc/data.sql")
+					.build();
 		}
 
 		@Bean
 		DataSource dataSource2() {
-			return new EmbeddedDatabaseBuilder()//
-			.setName("database2")//
-			.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql")//
-			.addScript("classpath:/org/springframework/test/context/jdbc/data.sql")//
-			.build();
+			return new EmbeddedDatabaseBuilder()
+					.generateUniqueName(true)
+					.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql")
+					.addScript("classpath:/org/springframework/test/context/jdbc/data.sql")
+					.build();
 		}
 	}
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/InfrastructureProxyTransactionalSqlScriptsTests.java b/spring-test/src/test/java/org/springframework/test/context/jdbc/InfrastructureProxyTransactionalSqlScriptsTests.java
@@ -81,7 +81,7 @@ PlatformTransactionManager transactionManager(DataSource dataSource) {
 		@Bean
 		DataSource dataSource() {
 			return new EmbeddedDatabaseBuilder()//
-					.setName("empty-sql-scripts-test-db")//
+					.generateUniqueName(true)
 					.build();
 		}
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/MultipleDataSourcesAndTransactionManagersSqlScriptsTests.java b/spring-test/src/test/java/org/springframework/test/context/jdbc/MultipleDataSourcesAndTransactionManagersSqlScriptsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -93,20 +93,20 @@ PlatformTransactionManager txMgr2() {
 
 		@Bean
 		DataSource dataSource1() {
-			return new EmbeddedDatabaseBuilder()//
-			.setName("database1")//
-			.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql")//
-			.addScript("classpath:/org/springframework/test/context/jdbc/data.sql")//
-			.build();
+			return new EmbeddedDatabaseBuilder()
+					.generateUniqueName(true)
+					.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql")
+					.addScript("classpath:/org/springframework/test/context/jdbc/data.sql")
+					.build();
 		}
 
 		@Bean
 		DataSource dataSource2() {
-			return new EmbeddedDatabaseBuilder()//
-			.setName("database2")//
-			.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql")//
-			.addScript("classpath:/org/springframework/test/context/jdbc/data.sql")//
-			.build();
+			return new EmbeddedDatabaseBuilder()
+					.generateUniqueName(true)
+					.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql")
+					.addScript("classpath:/org/springframework/test/context/jdbc/data.sql")
+					.build();
 		}
 
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/MultipleDataSourcesAndTransactionManagersTransactionalSqlScriptsTests.java b/spring-test/src/test/java/org/springframework/test/context/jdbc/MultipleDataSourcesAndTransactionManagersTransactionalSqlScriptsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,20 +94,20 @@ PlatformTransactionManager txMgr2() {
 
 		@Bean
 		DataSource dataSource1() {
-			return new EmbeddedDatabaseBuilder()//
-			.setName("database1")//
-			.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql")//
-			.addScript("classpath:/org/springframework/test/context/jdbc/data.sql")//
-			.build();
+			return new EmbeddedDatabaseBuilder()
+					.generateUniqueName(true)
+					.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql")
+					.addScript("classpath:/org/springframework/test/context/jdbc/data.sql")
+					.build();
 		}
 
 		@Bean
 		DataSource dataSource2() {
-			return new EmbeddedDatabaseBuilder()//
-			.setName("database2")//
-			.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql")//
-			.addScript("classpath:/org/springframework/test/context/jdbc/data.sql")//
-			.build();
+			return new EmbeddedDatabaseBuilder()
+					.generateUniqueName(true)
+					.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql")
+					.addScript("classpath:/org/springframework/test/context/jdbc/data.sql")
+					.build();
 		}
 
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/PopulatedSchemaDatabaseConfig.java b/spring-test/src/test/java/org/springframework/test/context/jdbc/PopulatedSchemaDatabaseConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,10 +42,10 @@ PlatformTransactionManager transactionManager() {
 
 	@Bean
 	DataSource dataSource() {
-		return new EmbeddedDatabaseBuilder()//
-		.generateUniqueName(true)
-		.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql") //
-		.build();
+		return new EmbeddedDatabaseBuilder()
+				.generateUniqueName(true)
+				.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql")
+				.build();
 	}
 
 	@Bean
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/EmbeddedPersonDatabaseTestsConfig.java b/spring-test/src/test/java/org/springframework/test/context/junit4/EmbeddedPersonDatabaseTestsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,10 +41,10 @@ public PlatformTransactionManager txMgr() {
 
 	@Bean
 	public DataSource dataSource() {
-		return new EmbeddedDatabaseBuilder()//
-		.generateUniqueName(true)//
-		.addScript("classpath:/org/springframework/test/jdbc/schema.sql") //
-		.build();
+		return new EmbeddedDatabaseBuilder()
+				.generateUniqueName(true)
+				.addScript("classpath:/org/springframework/test/jdbc/schema.sql")
+				.build();
 	}
 
 }
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/ProgrammaticTxMgmtSpringRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/ProgrammaticTxMgmtSpringRuleTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -286,10 +286,10 @@ PlatformTransactionManager transactionManager() {
 
 		@Bean
 		DataSource dataSource() {
-			return new EmbeddedDatabaseBuilder()//
-			.generateUniqueName(true)//
-			.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql") //
-			.build();
+			return new EmbeddedDatabaseBuilder()
+					.generateUniqueName(true)
+					.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql")
+					.build();
 		}
 	}
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -183,10 +183,11 @@ PlatformTransactionManager transactionManager() {
 
 		@Bean
 		DataSource dataSource() {
-			return new EmbeddedDatabaseBuilder()//
-			.addScript("classpath:/org/springframework/test/jdbc/schema.sql")//
-			.addScript("classpath:/org/springframework/test/jdbc/data.sql")//
-			.build();
+			return new EmbeddedDatabaseBuilder()
+					.generateUniqueName(true)
+					.addScript("classpath:/org/springframework/test/jdbc/schema.sql")
+					.addScript("classpath:/org/springframework/test/jdbc/data.sql")
+					.build();
 		}
 
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/transaction/programmatic/ProgrammaticTxMgmtTestNGTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/transaction/programmatic/ProgrammaticTxMgmtTestNGTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -257,10 +257,10 @@ public PlatformTransactionManager transactionManager() {
 
 		@Bean
 		public DataSource dataSource() {
-			return new EmbeddedDatabaseBuilder()//
-			.setName("programmatic-tx-mgmt-test-db")//
-			.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql") //
-			.build();
+			return new EmbeddedDatabaseBuilder()
+					.generateUniqueName(true)
+					.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql")
+					.build();
 		}
 	}
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/transaction/programmatic/ProgrammaticTxMgmtTests.java b/spring-test/src/test/java/org/springframework/test/context/transaction/programmatic/ProgrammaticTxMgmtTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -277,10 +277,10 @@ PlatformTransactionManager transactionManager() {
 
 		@Bean
 		DataSource dataSource() {
-			return new EmbeddedDatabaseBuilder()//
-			.generateUniqueName(true)//
-			.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql") //
-			.build();
+			return new EmbeddedDatabaseBuilder()
+					.generateUniqueName(true)
+					.addScript("classpath:/org/springframework/test/context/jdbc/schema.sql")
+					.build();
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2019 the original author or authors.`
	`2`	`+ * Copyright 2002-2023 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -82,8 +82,8 @@ static class Config {`
`82`	`82`
`83`	`83`	`@Bean`
`84`	`84`	`DataSource dataSource() {`
`85`		`- return new EmbeddedDatabaseBuilder()//`
`86`		`- .setName("empty-sql-scripts-without-tx-mgr-test-db")//`
	`85`	`+ return new EmbeddedDatabaseBuilder()`
	`86`	`+ .generateUniqueName(true)`
`87`	`87`	`.build();`
`88`	`88`	`}`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2022 the original author or authors.`
	`2`	`+ * Copyright 2002-2023 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -46,9 +46,9 @@ PlatformTransactionManager transactionManager(DataSource dataSource) {`
`46`	`46`
`47`	`47`	`@Bean`
`48`	`48`	`DataSource dataSource() {`
`49`		`- return new EmbeddedDatabaseBuilder()//`
`50`		`- .setName("empty-sql-scripts-test-db")//`
`51`		`- .build();`
	`49`	`+ return new EmbeddedDatabaseBuilder()`
	`50`	`+ .generateUniqueName(true)`
	`51`	`+ .build();`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ PlatformTransactionManager transactionManager(DataSource dataSource) {`
`81`	`81`	`@Bean`
`82`	`82`	`DataSource dataSource() {`
`83`	`83`	`return new EmbeddedDatabaseBuilder()//`
`84`		`- .setName("empty-sql-scripts-test-db")//`
	`84`	`+ .generateUniqueName(true)`
`85`	`85`	`.build();`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2015 the original author or authors.`
	`2`	`+ * Copyright 2002-2023 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -41,10 +41,10 @@ public PlatformTransactionManager txMgr() {`
`41`	`41`
`42`	`42`	`@Bean`
`43`	`43`	`public DataSource dataSource() {`
`44`		`- return new EmbeddedDatabaseBuilder()//`
`45`		`- .generateUniqueName(true)//`
`46`		`- .addScript("classpath:/org/springframework/test/jdbc/schema.sql") //`
`47`		`- .build();`
	`44`	`+ return new EmbeddedDatabaseBuilder()`
	`45`	`+ .generateUniqueName(true)`
	`46`	`+ .addScript("classpath:/org/springframework/test/jdbc/schema.sql")`
	`47`	`+ .build();`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`}`