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/EclipselinkRepositoryWithCompositeKeyTests.java

@@ -29,7 +29,7 @@
 @ContextConfiguration
 class EclipselinkRepositoryWithCompositeKeyTests extends RepositoryWithCompositeKeyTests {
 
-	@ImportResource({ "classpath:infrastructure.xml", "classpath:eclipselink.xml" })
+	@ImportResource({ "classpath:hibernate-infrastructure.xml", "classpath:eclipselink.xml" })
 	static class TestConfig extends RepositoryWithIdClassKeyTests.Config {}
 
 	@Override

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

@@ -90,7 +90,7 @@ void testQueryWithCTE() {
 		assertThat(result.getTotalElements()).isEqualTo(3);
 	}
 
-	@ImportResource({ "classpath:infrastructure.xml" })
+	@ImportResource({ "classpath:hibernate-infrastructure.xml" })
 	@Configuration
 	@EnableJpaRepositories(basePackageClasses = HibernateRepositoryTests.class, considerNestedRepositories = true,
 			includeFilters = @ComponentScan.Filter(

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

@@ -58,7 +58,7 @@
 class JavaConfigUserRepositoryTests extends UserRepositoryTests {
 
 	@Configuration
-	@ImportResource("classpath:infrastructure.xml")
+	@ImportResource("classpath:hibernate-infrastructure.xml")
 	static class Config {
 
 		@PersistenceContext EntityManager entityManager;
@@ -115,6 +115,6 @@ void doesNotPickUpJpaRepository() {
 
 	@Configuration
 	@EnableJpaRepositories(basePackageClasses = UserRepository.class)
-	@ImportResource("classpath:infrastructure.xml")
+	@ImportResource("classpath:hibernate-infrastructure.xml")
 	static class JpaRepositoryConfig {}
 }

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

@@ -32,7 +32,7 @@
  * @author Jens Schauder
  */
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration(locations = "classpath:infrastructure.xml")
+@ContextConfiguration(locations = "classpath:hibernate-infrastructure.xml")
 class ORMInfrastructureTests {
 
 	@Autowired ApplicationContext context;