Skip to content

Commit 9c36eb9

Browse files
committed
Fix MS Sql Server integration tests.
Closes #1638
1 parent 64eeecd commit 9c36eb9

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/DatabaseType.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
* Supported database types. Types are defined to express against which database a particular test is expected to run.
2222
*
2323
* @author Mark Paluch
24+
* @author Jens Schauder
2425
*/
2526
public enum DatabaseType {
2627

27-
DB2, HSQL, H2, MARIADB, MYSQL, ORACLE, POSTGRES, SQL_SEVER("mssql");
28+
DB2, HSQL, H2, MARIADB, MYSQL, ORACLE, POSTGRES, SQL_SERVER("mssql");
2829

2930
private final String profile;
3031

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/LicenseListener.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void prepareTestInstance(TestContext testContext) {
4343
assumeLicenseAccepted(Db2DataSourceConfiguration.DOCKER_IMAGE_NAME);
4444
}
4545

46-
if (environment.matchesProfiles(DatabaseType.SQL_SEVER.getProfile())) {
46+
if (environment.matchesProfiles(DatabaseType.SQL_SERVER.getProfile())) {
4747
assumeLicenseAccepted(MS_SQL_SERVER_VERSION);
4848
}
4949
}

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MsSqlDataSourceConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@
3131
*
3232
* @author Thomas Lang
3333
* @author Mark Paluch
34+
* @author Jens Schauder
3435
* @see <a href="https://github.com/testcontainers/testcontainers-java/tree/master/modules/mssqlserver"></a>
3536
*/
3637
@Configuration(proxyBeanMethods = false)
37-
@ConditionalOnDatabase(DatabaseType.MARIADB)
38+
@ConditionalOnDatabase(DatabaseType.SQL_SERVER)
3839
public class MsSqlDataSourceConfiguration extends DataSourceConfiguration {
3940

4041
public static final String MS_SQL_SERVER_VERSION = "mcr.microsoft.com/mssql/server:2022-CU5-ubuntu-20.04";

0 commit comments

Comments
 (0)