From 809a11195f67b33fa7b6efacb3acc21225185b92 Mon Sep 17 00:00:00 2001 From: Salim Achouche Date: Tue, 26 Mar 2019 12:41:54 -0700 Subject: [PATCH] DATAJDBC-346: Fixed test failures when using MSSQL database --- .../ImmutableAggregateTemplateHsqlIntegrationTests.java | 8 +++++--- .../JdbcRepositoryCrossAggregateHsqlIntegrationTests.java | 4 +++- ...lectionsAndManuallyAssignedIdHsqlIntegrationTests.java | 2 ++ .../config/EnableJdbcAuditingHsqlIntegrationTests.java | 7 +++++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/ImmutableAggregateTemplateHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/ImmutableAggregateTemplateHsqlIntegrationTests.java index 9a7de9338d..f6cff17964 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/ImmutableAggregateTemplateHsqlIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/ImmutableAggregateTemplateHsqlIntegrationTests.java @@ -15,12 +15,12 @@ */ package org.springframework.data.jdbc.core; -import static java.util.Collections.*; -import static org.assertj.core.api.Assertions.*; +import static java.util.Collections.singletonList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.tuple; import lombok.Value; import lombok.experimental.Wither; - import org.assertj.core.api.SoftAssertions; import org.junit.ClassRule; import org.junit.Rule; @@ -34,6 +34,7 @@ import org.springframework.data.jdbc.testing.TestConfiguration; import org.springframework.data.relational.core.conversion.RelationalConverter; import org.springframework.data.relational.core.mapping.RelationalMappingContext; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.rules.SpringClassRule; import org.springframework.test.context.junit4.rules.SpringMethodRule; @@ -46,6 +47,7 @@ */ @ContextConfiguration @Transactional +@ActiveProfiles("hsql") public class ImmutableAggregateTemplateHsqlIntegrationTests { @ClassRule public static final SpringClassRule classRule = new SpringClassRule(); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryCrossAggregateHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryCrossAggregateHsqlIntegrationTests.java index 81e7efcbd5..2ff16e81e4 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryCrossAggregateHsqlIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryCrossAggregateHsqlIntegrationTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.jdbc.repository; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.ClassRule; import org.junit.Rule; @@ -33,6 +33,7 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.rules.SpringClassRule; import org.springframework.test.context.junit4.rules.SpringMethodRule; @@ -46,6 +47,7 @@ */ @ContextConfiguration @Transactional +@ActiveProfiles("hsql") public class JdbcRepositoryCrossAggregateHsqlIntegrationTests { private static final long TWO_ID = 23L; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsAndManuallyAssignedIdHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsAndManuallyAssignedIdHsqlIntegrationTests.java index 642e932f3e..0b4b939a29 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsAndManuallyAssignedIdHsqlIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsAndManuallyAssignedIdHsqlIntegrationTests.java @@ -40,6 +40,7 @@ import org.springframework.data.relational.core.mapping.event.BeforeSaveEvent; import org.springframework.data.repository.CrudRepository; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.rules.SpringClassRule; import org.springframework.test.context.junit4.rules.SpringMethodRule; @@ -52,6 +53,7 @@ */ @ContextConfiguration @Transactional +@ActiveProfiles("hsql") public class JdbcRepositoryWithCollectionsAndManuallyAssignedIdHsqlIntegrationTests { static AtomicLong id = new AtomicLong(0); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java index 57b2905024..5eaccd85d3 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java @@ -193,8 +193,10 @@ private > Consumer> configureRe return (Consumer test) -> { - try (ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(configurationClasses)) { - + try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext()) { + context.getEnvironment().setActiveProfiles("hsql"); + context.register(configurationClasses); + context.refresh(); test.accept(context.getBean(repositoryType)); softly.assertAll(); @@ -236,6 +238,7 @@ static class DummyEntity { @ComponentScan("org.springframework.data.jdbc.testing") @EnableJdbcRepositories(considerNestedRepositories = true) + @ActiveProfiles("hsql") static class TestConfiguration { @Bean