Refactor infra.

Author: mp911de

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

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

@@ -19,7 +19,6 @@
 
 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.EntityWithAssignedId;
 import org.springframework.data.jpa.repository.sample.EntityWithAssignedIdRepository;
@@ -31,7 +30,8 @@
  * @author Oliver Drotbohm
  */
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration("classpath:config/namespace-application-context.xml")
+@ContextConfiguration(
+		locations = { "classpath:config/namespace-application-context.xml", "classpath:hibernate-infrastructure.xml" })
 @Transactional
 class EntityWithAssignedIdIntegrationTests {
 

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

@@ -31,11 +31,12 @@
  * @author Oliver Gierke
  * @author Eberhard Wolff
  */
-@ContextConfiguration(locations = "classpath:config/namespace-application-context.xml", inheritLocations = false)
+@ContextConfiguration(
+		locations = { "classpath:config/namespace-application-context.xml", "classpath:hibernate-infrastructure.xml" },
+		inheritLocations = false)
 class NamespaceUserRepositoryTests extends UserRepositoryTests {
 
-	@Autowired
-	ListableBeanFactory beanFactory;
+	@Autowired ListableBeanFactory beanFactory;
 
 	@Test
 	void registersPostProcessors() {

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

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.jpa.repository;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.*;
 
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
@@ -47,7 +47,8 @@
  */
 @Transactional
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration("classpath:config/namespace-application-context.xml")
+@ContextConfiguration(
+		locations = { "classpath:config/namespace-application-context.xml", "classpath:hibernate-infrastructure.xml" })
 class ParentRepositoryIntegrationTests {
 
 	@Autowired ParentRepository repository;

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

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.jpa.repository;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.*;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.criteria.CriteriaBuilder;
@@ -47,7 +47,8 @@
  * @since 3.0
  */
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration({ "classpath:hibernate.xml", "classpath:config/namespace-application-context.xml" })
+@ContextConfiguration({ "classpath:hibernate-infrastructure.xml",
+		"classpath:config/namespace-application-context.xml" })
 @Transactional
 class QueryByExampleIntegrationTests {
 

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

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.jpa.repository;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.*;
 
 import java.util.Map;
 
@@ -34,7 +34,8 @@
  * @author Krzysztof Krason
  */
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration("classpath:config/namespace-application-context.xml")
+@ContextConfiguration(
+		locations = { "classpath:config/namespace-application-context.xml", "classpath:hibernate-infrastructure.xml" })
 class SPR8954Tests {
 
 	@Autowired ApplicationContext context;

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

@@ -27,7 +27,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Limit;
@@ -61,7 +60,8 @@
  * @see QueryLookupStrategy
  */
 @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 UserRepositoryFinderTests {