Refactor infra.

Author: mp911de

spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/JpaSortTests.java

@@ -46,7 +46,7 @@
  * @author Jens Schauder
  */
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration("classpath:infrastructure.xml")
+@ContextConfiguration("classpath:hibernate-infrastructure.xml")
 class JpaSortTests {
 
 	private static final @Nullable Attribute<?, ?> NULL_ATTRIBUTE = null;

spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/support/QueryByExampleWithOptionalEmptyTests.java

@@ -64,7 +64,7 @@ void queryByExampleTreatsEmptyOptionalsLikeNulls() {
 
 	@Configuration
 	@EnableJpaRepositories(basePackageClasses = UserWithOptionalFieldRepository.class)
-	@ImportResource("classpath:infrastructure.xml")
+	@ImportResource("classpath:hibernate-infrastructure.xml")
 	static class JpaRepositoryConfig {}
 
 }

spring-data-jpa/src/test/java/org/springframework/data/jpa/infrastructure/MetamodelIntegrationTests.java

@@ -47,7 +47,7 @@
  * @author Jens Schauder
  */
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration({ "classpath:infrastructure.xml" })
+@ContextConfiguration("classpath:hibernate-infrastructure.xml")
 abstract class MetamodelIntegrationTests {
 
 	@PersistenceContext EntityManager em;

spring-data-jpa/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextIntegrationTests.java

@@ -189,7 +189,7 @@ void traversesEmbeddablesButNoOtherMappingAnnotations() {
 	}
 
 	@Configuration
-	@ImportResource("classpath:infrastructure.xml")
+	@ImportResource("classpath:hibernate-infrastructure.xml")
 	@EnableJpaRepositories(basePackageClasses = CategoryRepository.class, //
 			includeFilters = @Filter(value = { CategoryRepository.class, ProductRepository.class },
 					type = FilterType.ASSIGNABLE_TYPE))

spring-data-jpa/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderIntegrationTests.java

@@ -84,7 +84,7 @@ public Void doInTransaction(TransactionStatus status) {
 	}
 
 	@Configuration
-	@ImportResource("classpath:infrastructure.xml")
+	@ImportResource("classpath:hibernate-infrastructure.xml")
 	@EnableJpaRepositories(basePackageClasses = CategoryRepository.class, //
 			includeFilters = @Filter(value = { CategoryRepository.class, ProductRepository.class },
 					type = FilterType.ASSIGNABLE_TYPE))

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/AotUserRepositoryTests.java

@@ -53,7 +53,7 @@
 class AotUserRepositoryTests extends UserRepositoryTests {
 
 	@Configuration
-	@ImportResource("classpath:/infrastructure.xml")
+	@ImportResource("classpath:hibernate-infrastructure.xml")
 	static class Config {
 
 		@PersistenceContext EntityManager entityManager;

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/CustomerRepositoryProjectionTests.java

@@ -22,7 +22,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.sample.Country;
 import org.springframework.data.jpa.domain.sample.Customer;
@@ -37,7 +36,8 @@
  * @author Mark Paluch
  */
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration(locations = "classpath:config/namespace-application-context-h2.xml")
+@ContextConfiguration(
+		locations = { "classpath:config/namespace-application-context.xml", "classpath:hibernate-h2-infrastructure.xml" })
 @Transactional
 class CustomerRepositoryProjectionTests {
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/EclipseLinkQueryByExampleIntegrationTests.java

@@ -41,7 +41,8 @@
  * @since 3.0
  */
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration({ "classpath:eclipselink.xml", "classpath:config/namespace-application-context.xml" })
+@ContextConfiguration({ "classpath:eclipselink-infrastructure.xml",
+		"classpath:config/namespace-application-context.xml" })
 @Transactional
 class EclipseLinkQueryByExampleIntegrationTests {
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/EclipseLinkUserRepositoryFinderTests.java

@@ -25,7 +25,8 @@
  * @author Oliver Gierke
  * @author Greg Turnquist
  */
-@ContextConfiguration("classpath:eclipselink-h2.xml")
+@ContextConfiguration(value = { "classpath:config/namespace-application-context.xml", "classpath:eclipselink.xml",
+		"classpath:h2.xml", "classpath:infrastructure.xml" }, inheritLocations = false)
 class EclipseLinkUserRepositoryFinderTests extends UserRepositoryFinderTests {
 
 	@Disabled

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/EclipseLinkUserRepositoryProjectionTests.java

@@ -22,7 +22,9 @@
  * @author Oliver Gierke
  * @author Greg Turnquist
  */
-@ContextConfiguration("classpath:eclipselink-h2.xml")
+@ContextConfiguration(
+		value = { "classpath:config/namespace-application-context.xml", "classpath:eclipselink-infrastructure.xml" },
+		inheritLocations = false)
 class EclipseLinkUserRepositoryProjectionTests extends UserRepositoryProjectionTests {
 
 	@Disabled