Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adapt to new test infrastructure.

Browse Source 
Originial pull request #1222
See #1220
See #1620
This commit is contained in:
Jens Schauder
2023-10-10 08:25:29 +02:00
parent 3b2e8c7a7e
commit ddec3cc531
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisCustomizingNamespaceHsqlIntegrationTests.java
View File

@@ -37,6 +37,10 @@ import org.springframework.data.jdbc.core.convert.BasicJdbcConverter;
import org.springframework.data.jdbc.core.convert.JdbcConverter;
import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
import org.springframework.data.jdbc.testing.DatabaseType;
import org.springframework.data.jdbc.testing.EnabledOnDatabase;
import org.springframework.data.jdbc.testing.IntegrationTest;
import org.springframework.data.jdbc.testing.TestClass;
import org.springframework.data.jdbc.testing.TestConfiguration;
import org.springframework.data.relational.core.dialect.HsqlDbDialect;
import org.springframework.data.relational.core.mapping.RelationalMappingContext;
@@ -54,10 +58,8 @@ import org.springframework.transaction.annotation.Transactional;
* @author Jens Schauder
* @author Tyler Van Gorder
*/
@ContextConfiguration
@ActiveProfiles("hsql")
@Transactional
@ExtendWith(SpringExtension.class)
@IntegrationTest
@EnabledOnDatabase(DatabaseType.HSQL)
public class MyBatisCustomizingNamespaceHsqlIntegrationTests {
@Autowired SqlSessionFactory sqlSessionFactory;
@@ -84,8 +86,8 @@ public class MyBatisCustomizingNamespaceHsqlIntegrationTests {
static class Config {
@Bean
Class<?> testClass() {
return MyBatisCustomizingNamespaceHsqlIntegrationTests.class;
TestClass testClass() {
return TestClass.of(MyBatisCustomizingNamespaceHsqlIntegrationTests.class);
}
@Bean

19
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java
View File

@@ -23,7 +23,6 @@ import org.apache.ibatis.session.Configuration;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.SqlSessionTemplate;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,16 +32,16 @@ import org.springframework.context.annotation.Primary;
import org.springframework.data.jdbc.core.convert.DataAccessStrategy;
import org.springframework.data.jdbc.core.convert.JdbcConverter;
import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
import org.springframework.data.jdbc.testing.DatabaseType;
import org.springframework.data.jdbc.testing.EnabledOnDatabase;
import org.springframework.data.jdbc.testing.IntegrationTest;
import org.springframework.data.jdbc.testing.TestClass;
import org.springframework.data.jdbc.testing.TestConfiguration;
import org.springframework.data.relational.core.dialect.HsqlDbDialect;
import org.springframework.data.relational.core.mapping.RelationalMappingContext;
import org.springframework.data.repository.CrudRepository;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional;
/**
* Tests the integration with Mybatis.
@@ -51,10 +50,8 @@ import org.springframework.transaction.annotation.Transactional;
* @author Greg Turnquist
* @author Mark Paluch
*/
@ContextConfiguration
@ActiveProfiles("hsql")
@Transactional
@ExtendWith(SpringExtension.class)
@IntegrationTest
@EnabledOnDatabase(DatabaseType.HSQL)
public class MyBatisHsqlIntegrationTests {
@Autowired SqlSessionFactory sqlSessionFactory;
@@ -91,8 +88,8 @@ public class MyBatisHsqlIntegrationTests {
static class Config {
@Bean
Class<?> testClass() {
return MyBatisHsqlIntegrationTests.class;
TestClass testClass() {
return TestClass.of(MyBatisHsqlIntegrationTests.class);
}
@Bean