From 9658ac166825528ba90e009e6bb193f8fc8fa005 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Thu, 15 Oct 2020 10:09:55 +0200 Subject: [PATCH] DATAJDBC-616 - Migrates to JUnit 5. MockitoRunner -> MockitoExtension. SpringRunner, SpringClassRule & SpringMethodRule -> SpringExtension. --- ...eChangeIdGenerationImmutableUnitTests.java | 6 ++-- .../AggregateChangeIdGenerationUnitTests.java | 2 +- ...AggregateTemplateHsqlIntegrationTests.java | 9 +++--- ...angeExecutorContextImmutableUnitTests.java | 2 +- ...gregateChangeExecutorContextUnitTests.java | 2 +- ...JdbcAggregateTemplateIntegrationTests.java | 7 ++-- ...gregateTemplateSchemaIntegrationTests.java | 9 +++--- .../core/JdbcAggregateTemplateUnitTests.java | 13 ++++---- ...sistentPropertyPathExtensionUnitTests.java | 2 +- .../convert/BasicJdbcConverterUnitTests.java | 2 +- ...lConverterAggregateReferenceUnitTests.java | 2 +- .../CascadingDataAccessStrategyUnitTests.java | 2 +- .../DefaultDataAccessStrategyUnitTests.java | 6 ++-- .../convert/EntityRowMapperUnitTests.java | 2 +- .../core/convert/IdentifierUnitTests.java | 2 +- ...terableOfEntryToMapConverterUnitTests.java | 2 +- .../JdbcIdentifierBuilderUnitTests.java | 2 +- ...orContextBasedNamingStrategyUnitTests.java | 2 +- .../SqlGeneratorEmbeddedUnitTests.java | 10 +++--- ...GeneratorFixedNamingStrategyUnitTests.java | 2 +- .../core/convert/SqlGeneratorUnitTests.java | 17 +++++----- ...SqlIdentifierParameterSourceUnitTests.java | 2 +- .../BasicJdbcPersistentPropertyUnitTests.java | 2 +- .../mapping/IdOnlyAggregateReferenceTest.java | 2 +- .../data/jdbc/degraph/DependencyTests.java | 5 ++- .../model/NamingStrategyUnitTests.java | 2 +- .../jdbc/mybatis/MyBatisContextUnitTests.java | 2 +- ...tomizingNamespaceHsqlIntegrationTests.java | 12 +++---- .../MyBatisDataAccessStrategyUnitTests.java | 6 ++-- .../mybatis/MyBatisHsqlIntegrationTests.java | 9 +++--- ...RepositoryConcurrencyIntegrationTests.java | 20 ++++++------ ...oryCrossAggregateHsqlIntegrationTests.java | 12 +++---- ...itoryCustomConversionIntegrationTests.java | 9 +++--- ...toryEmbeddedImmutableIntegrationTests.java | 18 +++-------- ...dbcRepositoryEmbeddedIntegrationTests.java | 27 ++++++++-------- ...dedNotInAggregateRootIntegrationTests.java | 9 +++--- ...mbeddedWithCollectionIntegrationTests.java | 17 ++++------ ...EmbeddedWithReferenceIntegrationTests.java | 8 ++--- ...epositoryIdGenerationIntegrationTests.java | 12 +++---- .../JdbcRepositoryIntegrationTests.java | 13 ++++---- ...oryPropertyConversionIntegrationTests.java | 14 ++++---- ...oryResultSetExtractorIntegrationTests.java | 10 +++--- ...anuallyAssignedIdHsqlIntegrationTests.java | 12 +++---- ...sitoryWithCollectionsIntegrationTests.java | 11 +++---- ...bcRepositoryWithListsIntegrationTests.java | 11 +++---- ...dbcRepositoryWithMapsIntegrationTests.java | 12 +++---- .../SimpleJdbcRepositoryEventsUnitTests.java | 6 ++-- ...yMappingConfigurationIntegrationTests.java | 12 +++---- ...ractJdbcConfigurationIntegrationTests.java | 2 +- .../ConfigurableRowMapperMapUnitTests.java | 2 +- ...nableJdbcAuditingHsqlIntegrationTests.java | 2 +- ...nableJdbcRepositoriesIntegrationTests.java | 11 ++++--- ...dbcRepositoryConfigExtensionUnitTests.java | 2 +- ...atisJdbcConfigurationIntegrationTests.java | 2 +- .../query/JdbcQueryMethodUnitTests.java | 6 ++-- .../query/PartTreeJdbcQueryUnitTests.java | 12 +++---- .../QueryAnnotationHsqlIntegrationTests.java | 12 +++---- .../query/QueryMapperUnitTests.java | 2 +- .../query/StringBasedJdbcQueryUnitTests.java | 7 ++-- .../JdbcQueryLookupStrategyUnitTests.java | 7 ++-- .../JdbcRepositoryFactoryBeanUnitTests.java | 25 +++++++++------ .../SimpleJdbcRepositoryUnitTests.java | 10 +++--- .../BasicRelationalConverterUnitTests.java | 6 ++-- .../DbActionExecutionExceptionUnitTests.java | 4 +-- ...RelationalEntityDeleteWriterUnitTests.java | 32 +++++++++++-------- ...RelationalEntityInsertWriterUnitTests.java | 8 ++--- ...RelationalEntityUpdateWriterUnitTests.java | 8 ++--- .../RelationalEntityWriterUnitTests.java | 10 +++--- .../core/dialect/EscaperUnitTests.java | 2 +- .../core/dialect/HsqlDbDialectUnitTests.java | 2 +- .../MySqlDialectRenderingUnitTests.java | 6 ++-- .../core/dialect/MySqlDialectUnitTests.java | 2 +- .../PostgresDialectRenderingUnitTests.java | 6 ++-- .../dialect/PostgresDialectUnitTests.java | 2 +- .../SqlServerDialectRenderingUnitTests.java | 6 ++-- .../dialect/SqlServerDialectUnitTests.java | 2 +- ...RelationalPersistentPropertyUnitTests.java | 4 +-- .../DerivedSqlIdentifierUnitTests.java | 2 +- .../core/mapping/NamingStrategyUnitTests.java | 3 +- .../RelationalMappingContextUnitTests.java | 2 +- ...lationalPersistentEntityImplUnitTests.java | 2 +- ...tractRelationalEventListenerUnitTests.java | 2 +- .../core/query/CriteriaUnitTests.java | 2 +- .../relational/core/query/QueryUnitTests.java | 2 +- .../core/query/UpdateUnitTests.java | 2 +- .../DefaultIdentifierProcessingUnitTests.java | 5 +-- .../core/sql/DeleteBuilderUnitTests.java | 2 +- .../core/sql/DeleteValidatorUnitTests.java | 2 +- .../core/sql/InsertBuilderUnitTests.java | 4 +-- .../core/sql/SelectBuilderUnitTests.java | 2 +- .../core/sql/SelectValidatorUnitTests.java | 4 +-- .../core/sql/SqlIdentifierUnitTests.java | 4 +-- .../core/sql/UpdateBuilderUnitTests.java | 4 +-- .../render/ConditionRendererUnitTests.java | 2 +- .../sql/render/DeleteRendererUnitTests.java | 2 +- .../sql/render/InsertRendererUnitTests.java | 2 +- .../render/OrderByClauseVisitorUnitTests.java | 2 +- .../sql/render/SelectRendererUnitTests.java | 2 +- .../sql/render/UpdateRendererUnitTests.java | 2 +- .../relational/degraph/DependencyTests.java | 5 ++- .../ParameterMetadataProviderUnitTests.java | 2 +- 101 files changed, 292 insertions(+), 351 deletions(-) diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateChangeIdGenerationImmutableUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateChangeIdGenerationImmutableUnitTests.java index 5a97c38a..6f92f244 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateChangeIdGenerationImmutableUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateChangeIdGenerationImmutableUnitTests.java @@ -32,8 +32,8 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.jdbc.core.convert.DataAccessStrategy; import org.springframework.data.jdbc.core.convert.JdbcConverter; @@ -54,7 +54,7 @@ import org.springframework.lang.Nullable; * @author Jens Schauder * @author Myeonghyeon-Lee */ -@Ignore +@Disabled public class AggregateChangeIdGenerationImmutableUnitTests { DummyEntity entity = new DummyEntity(); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateChangeIdGenerationUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateChangeIdGenerationUnitTests.java index 3b6ec2a9..c736323c 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateChangeIdGenerationUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateChangeIdGenerationUnitTests.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.Set; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.data.annotation.Id; 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 9e4b12d5..8fa8c545 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 @@ -22,10 +22,9 @@ import lombok.Value; import lombok.With; import org.assertj.core.api.SoftAssertions; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; @@ -38,6 +37,7 @@ import org.springframework.data.jdbc.testing.TestConfiguration; 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.junit.jupiter.SpringExtension; import org.springframework.test.context.junit4.rules.SpringClassRule; import org.springframework.test.context.junit4.rules.SpringMethodRule; import org.springframework.transaction.annotation.Transactional; @@ -51,10 +51,9 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration @Transactional @ActiveProfiles("hsql") +@ExtendWith(SpringExtension.class) public class ImmutableAggregateTemplateHsqlIntegrationTests { - @ClassRule public static final SpringClassRule classRule = new SpringClassRule(); - @Rule public SpringMethodRule methodRule = new SpringMethodRule(); @Autowired JdbcAggregateOperations template; @Test // DATAJDBC-241 diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextImmutableUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextImmutableUnitTests.java index 4a8dfed5..f06153f3 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextImmutableUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextImmutableUnitTests.java @@ -26,7 +26,7 @@ import lombok.With; import java.util.List; import org.jetbrains.annotations.NotNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Version; import org.springframework.data.jdbc.core.convert.BasicJdbcConverter; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextUnitTests.java index bf57dc47..83a67483 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextUnitTests.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import org.jetbrains.annotations.NotNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Version; import org.springframework.data.jdbc.core.convert.BasicJdbcConverter; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateIntegrationTests.java index 63f8d921..4243c331 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateIntegrationTests.java @@ -37,9 +37,9 @@ import java.util.function.Function; import java.util.stream.IntStream; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; @@ -65,6 +65,7 @@ import org.springframework.data.relational.core.mapping.Table; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; @@ -83,7 +84,7 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration @Transactional @TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS) -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) public class JdbcAggregateTemplateIntegrationTests { @Autowired JdbcAggregateOperations template; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateSchemaIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateSchemaIntegrationTests.java index 0ee9b7f9..d92570e4 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateSchemaIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateSchemaIntegrationTests.java @@ -19,9 +19,8 @@ import static org.assertj.core.api.Assertions.*; import static org.springframework.data.jdbc.testing.TestDatabaseFeatures.Feature.*; import static org.springframework.test.context.TestExecutionListeners.MergeMode.*; -import org.junit.Test; -import org.junit.runner.RunWith; - +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; @@ -38,7 +37,7 @@ import org.springframework.data.relational.core.mapping.RelationalMappingContext import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; /** @@ -49,7 +48,7 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration @Transactional @TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS) -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) public class JdbcAggregateTemplateSchemaIntegrationTests { @Autowired JdbcAggregateOperations template; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateUnitTests.java index 3eeebd59..50e8db8f 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateUnitTests.java @@ -23,12 +23,11 @@ import static org.mockito.Mockito.*; import lombok.AllArgsConstructor; import lombok.Data; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.annotation.Id; import org.springframework.data.domain.PageRequest; @@ -56,7 +55,7 @@ import org.springframework.data.relational.core.mapping.event.BeforeSaveCallback * @author Mark Paluch * @author Milan Milanov */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class JdbcAggregateTemplateUnitTests { JdbcAggregateOperations template; @@ -66,7 +65,7 @@ public class JdbcAggregateTemplateUnitTests { @Mock RelationResolver relationResolver; @Mock EntityCallbacks callbacks; - @Before + @BeforeEach public void setUp() { RelationalMappingContext mappingContext = new RelationalMappingContext(NamingStrategy.INSTANCE); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/PersistentPropertyPathExtensionUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/PersistentPropertyPathExtensionUnitTests.java index 054b845f..90ebecc0 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/PersistentPropertyPathExtensionUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/PersistentPropertyPathExtensionUnitTests.java @@ -20,7 +20,7 @@ import static org.springframework.data.relational.core.sql.SqlIdentifier.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.mapping.PersistentPropertyPath; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverterUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverterUnitTests.java index 98dc6f04..69a31f67 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverterUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverterUnitTests.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.UUID; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.jdbc.core.mapping.AggregateReference; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicRelationalConverterAggregateReferenceUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicRelationalConverterAggregateReferenceUnitTests.java index 4e50ed03..57250ce6 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicRelationalConverterAggregateReferenceUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicRelationalConverterAggregateReferenceUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.jdbc.core.mapping.AggregateReference; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/CascadingDataAccessStrategyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/CascadingDataAccessStrategyUnitTests.java index 271430c5..f37bf771 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/CascadingDataAccessStrategyUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/CascadingDataAccessStrategyUnitTests.java @@ -23,7 +23,7 @@ import junit.framework.AssertionFailedError; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.jdbc.core.convert.FunctionCollector.CombinedDataAccessException; import org.springframework.data.mapping.PersistentPropertyPath; import org.springframework.data.relational.core.sql.SqlIdentifier; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java index 014b39b7..fb5284f4 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java @@ -32,8 +32,8 @@ import java.util.HashMap; import java.util.List; import org.jetbrains.annotations.NotNull; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.springframework.core.convert.converter.Converter; import org.springframework.data.annotation.Id; @@ -75,7 +75,7 @@ public class DefaultDataAccessStrategyUnitTests { JdbcConverter converter; DefaultDataAccessStrategy accessStrategy; - @Before + @BeforeEach public void before() { DelegatingDataAccessStrategy relationResolver = new DelegatingDataAccessStrategy(); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/EntityRowMapperUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/EntityRowMapperUnitTests.java index 2345816a..f73533f0 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/EntityRowMapperUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/EntityRowMapperUnitTests.java @@ -44,7 +44,7 @@ import java.util.stream.Stream; import javax.naming.OperationNotSupportedException; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/IdentifierUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/IdentifierUnitTests.java index 691f9cd8..70ccb9f2 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/IdentifierUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/IdentifierUnitTests.java @@ -26,7 +26,7 @@ import java.util.Map; import org.assertj.core.api.Assertions; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.IdentifierProcessing; import org.springframework.data.relational.core.sql.SqlIdentifier; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/IterableOfEntryToMapConverterUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/IterableOfEntryToMapConverterUnitTests.java index 95db242f..b40b28da 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/IterableOfEntryToMapConverterUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/IterableOfEntryToMapConverterUnitTests.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.core.convert.TypeDescriptor; /** diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/JdbcIdentifierBuilderUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/JdbcIdentifierBuilderUnitTests.java index 8375046c..be12b0bc 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/JdbcIdentifierBuilderUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/JdbcIdentifierBuilderUnitTests.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.relational.core.mapping.PersistentPropertyPathExtension; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorContextBasedNamingStrategyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorContextBasedNamingStrategyUnitTests.java index 8834fe8b..76a8cb94 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorContextBasedNamingStrategyUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorContextBasedNamingStrategyUnitTests.java @@ -23,8 +23,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.jdbc.core.mapping.PersistentPropertyPathTestUtils; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorEmbeddedUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorEmbeddedUnitTests.java index fb62c756..7c5bc1c3 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorEmbeddedUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorEmbeddedUnitTests.java @@ -19,9 +19,9 @@ import static java.util.Collections.*; import static org.assertj.core.api.Assertions.*; import org.assertj.core.api.SoftAssertions; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.jdbc.core.PropertyPathTestingUtils; import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; @@ -48,7 +48,7 @@ public class SqlGeneratorEmbeddedUnitTests { }); private SqlGenerator sqlGenerator; - @Before + @BeforeEach public void setUp() { this.context.setForceQuote(false); this.sqlGenerator = createSqlGenerator(DummyEntity.class); @@ -173,7 +173,7 @@ public class SqlGeneratorEmbeddedUnitTests { } @Test // DATAJDBC-340 - @Ignore // this is just broken right now + @Disabled // this is just broken right now public void deleteByPath() { final String sql = sqlGenerator diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorFixedNamingStrategyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorFixedNamingStrategyUnitTests.java index df7ff695..3ca84fc3 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorFixedNamingStrategyUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorFixedNamingStrategyUnitTests.java @@ -18,7 +18,7 @@ package org.springframework.data.jdbc.core.convert; import static org.assertj.core.api.Assertions.*; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorUnitTests.java index ec1c8c1e..f15e1e6e 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorUnitTests.java @@ -23,8 +23,8 @@ import java.util.Map; import java.util.Set; import org.assertj.core.api.SoftAssertions; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.ReadOnlyProperty; import org.springframework.data.annotation.Version; @@ -35,8 +35,8 @@ import org.springframework.data.jdbc.core.PropertyPathTestingUtils; import org.springframework.data.jdbc.core.mapping.AggregateReference; import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.jdbc.core.mapping.PersistentPropertyPathTestUtils; -import org.springframework.data.relational.core.dialect.AnsiDialect; import org.springframework.data.mapping.PersistentPropertyPath; +import org.springframework.data.relational.core.dialect.AnsiDialect; import org.springframework.data.relational.core.dialect.Dialect; import org.springframework.data.relational.core.mapping.Column; import org.springframework.data.relational.core.mapping.NamingStrategy; @@ -72,7 +72,7 @@ public class SqlGeneratorUnitTests { throw new UnsupportedOperationException(); }); - @Before + @BeforeEach public void setUp() { this.sqlGenerator = createSqlGenerator(DummyEntity.class); } @@ -223,8 +223,8 @@ public class SqlGeneratorUnitTests { @Test // DATAJDBC-101 public void findAllSortedByMultipleFields() { - String sql = sqlGenerator.getFindAll( - Sort.by(new Sort.Order(Sort.Direction.DESC, "name"), new Sort.Order(Sort.Direction.ASC, "other"))); + String sql = sqlGenerator + .getFindAll(Sort.by(new Sort.Order(Sort.Direction.DESC, "name"), new Sort.Order(Sort.Direction.ASC, "other"))); assertThat(sql).contains("SELECT", // "dummy_entity.id1 AS id1", // @@ -350,9 +350,10 @@ public class SqlGeneratorUnitTests { + "WHERE dummy_entity.backref = :backref"); } - @Test(expected = IllegalArgumentException.class) // DATAJDBC-130 + @Test // DATAJDBC-130 public void findAllByPropertyOrderedWithoutKey() { - sqlGenerator.getFindAllByProperty(BACKREF, null, true); + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> sqlGenerator.getFindAllByProperty(BACKREF, null, true)); } @Test // DATAJDBC-131, DATAJDBC-111 diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlIdentifierParameterSourceUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlIdentifierParameterSourceUnitTests.java index aa172034..18e3ee7e 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlIdentifierParameterSourceUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlIdentifierParameterSourceUnitTests.java @@ -16,7 +16,7 @@ package org.springframework.data.jdbc.core.convert; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.IdentifierProcessing; import org.springframework.data.relational.core.sql.SqlIdentifier; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentPropertyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentPropertyUnitTests.java index 04b897f7..819b8dbf 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentPropertyUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentPropertyUnitTests.java @@ -27,7 +27,7 @@ import java.util.Date; import java.util.List; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.mapping.PersistentPropertyPath; import org.springframework.data.relational.core.mapping.BasicRelationalPersistentProperty; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/IdOnlyAggregateReferenceTest.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/IdOnlyAggregateReferenceTest.java index 7ff7251e..5c224edf 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/IdOnlyAggregateReferenceTest.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/IdOnlyAggregateReferenceTest.java @@ -2,7 +2,7 @@ package org.springframework.data.jdbc.core.mapping; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.jdbc.core.mapping.AggregateReference.IdOnlyAggregateReference; /** diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/degraph/DependencyTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/degraph/DependencyTests.java index 64156c01..62aae271 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/degraph/DependencyTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/degraph/DependencyTests.java @@ -16,13 +16,12 @@ package org.springframework.data.jdbc.degraph; import static de.schauderhaft.degraph.check.JCheck.*; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.*; import de.schauderhaft.degraph.check.JCheck; +import org.junit.jupiter.api.Test; import scala.runtime.AbstractFunction1; -import org.junit.Test; - /** * Test package dependencies for violations. * diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mapping/model/NamingStrategyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mapping/model/NamingStrategyUnitTests.java index 7fb11e10..45cae041 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mapping/model/NamingStrategyUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mapping/model/NamingStrategyUnitTests.java @@ -22,7 +22,7 @@ import lombok.Data; import java.time.LocalDateTime; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisContextUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisContextUnitTests.java index 808f3bda..560dc4f6 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisContextUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisContextUnitTests.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.jdbc.core.convert.Identifier; import org.springframework.data.relational.core.sql.SqlIdentifier; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisCustomizingNamespaceHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisCustomizingNamespaceHsqlIntegrationTests.java index be8c18e4..431da7cb 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisCustomizingNamespaceHsqlIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisCustomizingNamespaceHsqlIntegrationTests.java @@ -24,9 +24,8 @@ import java.io.IOException; import org.apache.ibatis.session.Configuration; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; +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; @@ -45,8 +44,7 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; 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; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; /** @@ -59,11 +57,9 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration @ActiveProfiles("hsql") @Transactional +@ExtendWith(SpringExtension.class) public class MyBatisCustomizingNamespaceHsqlIntegrationTests { - @ClassRule public static final SpringClassRule classRule = new SpringClassRule(); - @Rule public SpringMethodRule methodRule = new SpringMethodRule(); - @Autowired SqlSessionFactory sqlSessionFactory; @Autowired DummyEntityRepository repository; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategyUnitTests.java index 406afb73..cc46ea83 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategyUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategyUnitTests.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.*; import static org.springframework.data.relational.core.sql.SqlIdentifier.*; import org.apache.ibatis.session.SqlSession; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; @@ -58,7 +58,7 @@ public class MyBatisDataAccessStrategyUnitTests { PersistentPropertyPath path = PropertyPathTestingUtils.toPath("one.two", DummyEntity.class, context); - @Before + @BeforeEach public void before() { doReturn(false).when(session).selectOne(any(), any()); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java index a6f7d884..e45eacf9 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java @@ -22,9 +22,8 @@ import junit.framework.AssertionFailedError; import org.apache.ibatis.session.Configuration; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; +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; @@ -42,6 +41,7 @@ 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.test.context.junit4.rules.SpringClassRule; import org.springframework.test.context.junit4.rules.SpringMethodRule; import org.springframework.transaction.annotation.Transactional; @@ -56,10 +56,9 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration @ActiveProfiles("hsql") @Transactional +@ExtendWith(SpringExtension.class) public class MyBatisHsqlIntegrationTests { - @ClassRule public static final SpringClassRule classRule = new SpringClassRule(); - @Rule public SpringMethodRule methodRule = new SpringMethodRule(); @Autowired SqlSessionFactory sqlSessionFactory; @Autowired DummyEntityRepository repository; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryConcurrencyIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryConcurrencyIntegrationTests.java index de0227a0..07f9e473 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryConcurrencyIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryConcurrencyIntegrationTests.java @@ -31,11 +31,10 @@ import java.util.concurrent.CountDownLatch; import java.util.function.UnaryOperator; import org.assertj.core.api.Assertions; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.junit.platform.commons.util.ExceptionUtils; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -48,9 +47,8 @@ import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory; import org.springframework.data.jdbc.testing.TestConfiguration; import org.springframework.data.repository.CrudRepository; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.context.junit4.rules.SpringClassRule; -import org.springframework.test.context.junit4.rules.SpringMethodRule; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.support.TransactionTemplate; @@ -60,7 +58,7 @@ import org.springframework.transaction.support.TransactionTemplate; * @author Myeonghyeon Lee * @author Jens Schauder */ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) public class JdbcRepositoryConcurrencyIntegrationTests { @Configuration @@ -90,7 +88,7 @@ public class JdbcRepositoryConcurrencyIntegrationTests { TransactionTemplate transactionTemplate; List exceptions; - @BeforeClass + @BeforeAll public static void beforeClass() { Assertions.registerFormatterForType(CopyOnWriteArrayList.class, l -> { @@ -99,7 +97,7 @@ public class JdbcRepositoryConcurrencyIntegrationTests { l.forEach(e -> { if (e instanceof Throwable) { - printThrowable(joiner,(Throwable) e); + printThrowable(joiner, (Throwable) e); } else { joiner.add(e.toString()); } @@ -119,7 +117,7 @@ public class JdbcRepositoryConcurrencyIntegrationTests { } } - @Before + @BeforeEach public void before() { entity = repository.save(createDummyEntity()); 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 f70f09d0..bb8e5533 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 @@ -17,9 +17,8 @@ package org.springframework.data.jdbc.repository; import static org.assertj.core.api.Assertions.*; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -35,8 +34,7 @@ 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; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.jdbc.JdbcTestUtils; import org.springframework.transaction.annotation.Transactional; @@ -50,6 +48,7 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration @Transactional @ActiveProfiles("hsql") +@ExtendWith(SpringExtension.class) public class JdbcRepositoryCrossAggregateHsqlIntegrationTests { private static final long TWO_ID = 23L; @@ -67,9 +66,6 @@ public class JdbcRepositoryCrossAggregateHsqlIntegrationTests { } } - @ClassRule public static final SpringClassRule classRule = new SpringClassRule(); - @Rule public SpringMethodRule methodRule = new SpringMethodRule(); - @Autowired NamedParameterJdbcTemplate template; @Autowired Ones ones; @Autowired RelationalMappingContext context; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryCustomConversionIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryCustomConversionIntegrationTests.java index 35d5d3ca..7c025e8b 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryCustomConversionIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryCustomConversionIntegrationTests.java @@ -24,9 +24,8 @@ import java.sql.JDBCType; import java.util.Date; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; -import org.junit.runner.RunWith; - +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -43,7 +42,7 @@ import org.springframework.data.jdbc.testing.TestConfiguration; import org.springframework.data.repository.CrudRepository; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; /** @@ -55,7 +54,7 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration @Transactional @TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS) -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) public class JdbcRepositoryCustomConversionIntegrationTests { @Configuration diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedImmutableIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedImmutableIntegrationTests.java index c6703964..3c00e7f2 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedImmutableIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedImmutableIntegrationTests.java @@ -15,16 +15,13 @@ */ package org.springframework.data.jdbc.repository; -import static java.util.Arrays.*; import static org.assertj.core.api.Assertions.*; -import lombok.Data; - import lombok.Value; import lombok.With; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -35,12 +32,9 @@ import org.springframework.data.jdbc.testing.TestConfiguration; import org.springframework.data.relational.core.mapping.Embedded; import org.springframework.data.relational.core.mapping.Embedded.OnEmpty; import org.springframework.data.repository.CrudRepository; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.rules.SpringClassRule; -import org.springframework.test.context.junit4.rules.SpringMethodRule; -import org.springframework.test.jdbc.JdbcTestUtils; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; /** @@ -50,6 +44,7 @@ import org.springframework.transaction.annotation.Transactional; */ @ContextConfiguration @Transactional +@ExtendWith(SpringExtension.class) public class JdbcRepositoryEmbeddedImmutableIntegrationTests { @Configuration @@ -70,9 +65,6 @@ public class JdbcRepositoryEmbeddedImmutableIntegrationTests { } - @ClassRule public static final SpringClassRule classRule = new SpringClassRule(); - @Rule public SpringMethodRule methodRule = new SpringMethodRule(); - @Autowired NamedParameterJdbcTemplate template; @Autowired DummyEntityRepository repository; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedIntegrationTests.java index 516b7f8c..a71d1ae0 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedIntegrationTests.java @@ -20,9 +20,8 @@ import static org.assertj.core.api.Assertions.*; import lombok.Data; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -36,8 +35,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.ContextConfiguration; -import org.springframework.test.context.junit4.rules.SpringClassRule; -import org.springframework.test.context.junit4.rules.SpringMethodRule; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.jdbc.JdbcTestUtils; import org.springframework.transaction.annotation.Transactional; @@ -49,6 +47,7 @@ import org.springframework.transaction.annotation.Transactional; */ @ContextConfiguration @Transactional +@ExtendWith(SpringExtension.class) public class JdbcRepositoryEmbeddedIntegrationTests { @Configuration @@ -69,9 +68,6 @@ public class JdbcRepositoryEmbeddedIntegrationTests { } - @ClassRule public static final SpringClassRule classRule = new SpringClassRule(); - @Rule public SpringMethodRule methodRule = new SpringMethodRule(); - @Autowired NamedParameterJdbcTemplate template; @Autowired DummyEntityRepository repository; @@ -92,9 +88,11 @@ public class JdbcRepositoryEmbeddedIntegrationTests { assertThat(repository.findById(entity.getId())).hasValueSatisfying(it -> { assertThat(it.getId()).isEqualTo(entity.getId()); assertThat(it.getPrefixedEmbeddable().getTest()).isEqualTo(entity.getPrefixedEmbeddable().getTest()); - assertThat(it.getPrefixedEmbeddable().getEmbeddable().getAttr()).isEqualTo(entity.getPrefixedEmbeddable().getEmbeddable().getAttr()); + assertThat(it.getPrefixedEmbeddable().getEmbeddable().getAttr()) + .isEqualTo(entity.getPrefixedEmbeddable().getEmbeddable().getAttr()); assertThat(it.getEmbeddable().getTest()).isEqualTo(entity.getEmbeddable().getTest()); - assertThat(it.getEmbeddable().getEmbeddable().getAttr()).isEqualTo(entity.getEmbeddable().getEmbeddable().getAttr()); + assertThat(it.getEmbeddable().getEmbeddable().getAttr()) + .isEqualTo(entity.getEmbeddable().getEmbeddable().getAttr()); }); } @@ -129,7 +127,8 @@ public class JdbcRepositoryEmbeddedIntegrationTests { assertThat(repository.findById(entity.getId())).hasValueSatisfying(it -> { assertThat(it.getPrefixedEmbeddable().getTest()).isEqualTo(saved.getPrefixedEmbeddable().getTest()); - assertThat(it.getPrefixedEmbeddable().getEmbeddable().getAttr()).isEqualTo(saved.getPrefixedEmbeddable().getEmbeddable().getAttr()); + assertThat(it.getPrefixedEmbeddable().getEmbeddable().getAttr()) + .isEqualTo(saved.getPrefixedEmbeddable().getEmbeddable().getAttr()); }); } @@ -153,7 +152,8 @@ public class JdbcRepositoryEmbeddedIntegrationTests { assertThat(repository.findAll()) // .extracting(d -> d.getPrefixedEmbeddable().getEmbeddable().getAttr()) // - .containsExactlyInAnyOrder(entity.getPrefixedEmbeddable().getEmbeddable().getAttr(), other.getPrefixedEmbeddable().getEmbeddable().getAttr()); + .containsExactlyInAnyOrder(entity.getPrefixedEmbeddable().getEmbeddable().getAttr(), + other.getPrefixedEmbeddable().getEmbeddable().getAttr()); } @Test // DATAJDBC-111 @@ -260,8 +260,7 @@ public class JdbcRepositoryEmbeddedIntegrationTests { static class CascadedEmbeddable { String test; - @Embedded(onEmpty = OnEmpty.USE_NULL, prefix = "PREFIX2_") - Embeddable embeddable; + @Embedded(onEmpty = OnEmpty.USE_NULL, prefix = "PREFIX2_") Embeddable embeddable; } @Data diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedNotInAggregateRootIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedNotInAggregateRootIntegrationTests.java index ee3a1e44..13fbe16a 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedNotInAggregateRootIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedNotInAggregateRootIntegrationTests.java @@ -23,9 +23,8 @@ import lombok.Data; import java.sql.SQLException; -import org.junit.Test; -import org.junit.runner.RunWith; - +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -44,7 +43,7 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.jdbc.JdbcTestUtils; import org.springframework.transaction.annotation.Transactional; @@ -56,7 +55,7 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration @Transactional @TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS) -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) public class JdbcRepositoryEmbeddedNotInAggregateRootIntegrationTests { @Autowired NamedParameterJdbcTemplate template; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedWithCollectionIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedWithCollectionIntegrationTests.java index 0244b482..12baaba1 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedWithCollectionIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedWithCollectionIntegrationTests.java @@ -24,9 +24,8 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -37,15 +36,14 @@ import org.springframework.data.jdbc.testing.TestConfiguration; import org.springframework.data.relational.core.dialect.Dialect; import org.springframework.data.relational.core.mapping.Column; import org.springframework.data.relational.core.mapping.Embedded; -import org.springframework.data.relational.core.mapping.Embedded.OnEmpty; import org.springframework.data.relational.core.mapping.MappedCollection; +import org.springframework.data.relational.core.mapping.Embedded.OnEmpty; import org.springframework.data.relational.core.sql.SqlIdentifier; import org.springframework.data.repository.CrudRepository; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.rules.SpringClassRule; -import org.springframework.test.context.junit4.rules.SpringMethodRule; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.jdbc.JdbcTestUtils; import org.springframework.transaction.annotation.Transactional; @@ -56,6 +54,7 @@ import org.springframework.transaction.annotation.Transactional; */ @ContextConfiguration @Transactional +@ExtendWith(SpringExtension.class) public class JdbcRepositoryEmbeddedWithCollectionIntegrationTests { @Configuration @@ -76,9 +75,6 @@ public class JdbcRepositoryEmbeddedWithCollectionIntegrationTests { } - @ClassRule public static final SpringClassRule classRule = new SpringClassRule(); - @Rule public SpringMethodRule methodRule = new SpringMethodRule(); - @Autowired NamedParameterJdbcTemplate template; @Autowired DummyEntityRepository repository; @Autowired Dialect dialect; @@ -260,8 +256,7 @@ public class JdbcRepositoryEmbeddedWithCollectionIntegrationTests { @Data private static class DummyEntity { - @Column("ID") - @Id Long id; + @Column("ID") @Id Long id; String test; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedWithReferenceIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedWithReferenceIntegrationTests.java index de8d21d2..aa31fe62 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedWithReferenceIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedWithReferenceIntegrationTests.java @@ -23,9 +23,8 @@ import lombok.Data; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; - +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -44,6 +43,7 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.jdbc.JdbcTestUtils; import org.springframework.transaction.annotation.Transactional; @@ -57,7 +57,7 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration @Transactional @TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS) -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) public class JdbcRepositoryEmbeddedWithReferenceIntegrationTests { @Autowired NamedParameterJdbcTemplate template; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java index 75a353bb..0ffe9d7b 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java @@ -24,9 +24,8 @@ import lombok.experimental.FieldDefaults; import java.util.concurrent.atomic.AtomicLong; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -41,8 +40,7 @@ import org.springframework.data.relational.core.mapping.event.BeforeConvertCallb import org.springframework.data.repository.CrudRepository; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.rules.SpringClassRule; -import org.springframework.test.context.junit4.rules.SpringMethodRule; +import org.springframework.test.context.junit.jupiter.SpringExtension; /** * Testing special cases for id generation with {@link SimpleJdbcRepository}. @@ -51,6 +49,7 @@ import org.springframework.test.context.junit4.rules.SpringMethodRule; * @author Greg Turnquist */ @ContextConfiguration +@ExtendWith(SpringExtension.class) public class JdbcRepositoryIdGenerationIntegrationTests { @Configuration @@ -65,9 +64,6 @@ public class JdbcRepositoryIdGenerationIntegrationTests { } } - @ClassRule public static final SpringClassRule classRule = new SpringClassRule(); - @Rule public SpringMethodRule methodRule = new SpringMethodRule(); - @Autowired NamedParameterJdbcTemplate template; @Autowired ReadOnlyIdEntityRepository readOnlyIdrepository; @Autowired PrimitiveIdEntityRepository primitiveIdRepository; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIntegrationTests.java index 28d04403..61c19e57 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIntegrationTests.java @@ -28,10 +28,9 @@ import java.time.Instant; import java.util.ArrayList; import java.util.List; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - +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.beans.factory.config.PropertiesFactoryBean; import org.springframework.context.ApplicationListener; @@ -54,7 +53,7 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.test.context.TestExecutionListeners; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.jdbc.JdbcTestUtils; import org.springframework.transaction.annotation.Transactional; @@ -66,7 +65,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Transactional @TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS) -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) public class JdbcRepositoryIntegrationTests { @Autowired NamedParameterJdbcTemplate template; @@ -81,7 +80,7 @@ public class JdbcRepositoryIntegrationTests { return entity; } - @Before + @BeforeEach public void before() { eventListener.events.clear(); } diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java index 49549fc4..b940fffa 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java @@ -33,8 +33,8 @@ import java.util.Set; import org.assertj.core.api.Condition; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.Bean; @@ -50,7 +50,7 @@ import org.springframework.data.relational.core.mapping.event.BeforeSaveEvent; import org.springframework.data.repository.CrudRepository; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; /** @@ -64,7 +64,7 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration @Transactional @TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS) -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) public class JdbcRepositoryPropertyConversionIntegrationTests { @Autowired DummyEntityRepository repository; @@ -197,11 +197,9 @@ public class JdbcRepositoryPropertyConversionIntegrationTests { Date date; LocalDateTime localDateTime; // ensures conversion on id querying - @Id - private LocalDateTime idTimestamp; + @Id private LocalDateTime idTimestamp; - @MappedCollection(idColumn = "ID_TIMESTAMP") - Set relation; + @MappedCollection(idColumn = "ID_TIMESTAMP") Set relation; } // DATAJDBC-349 diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryResultSetExtractorIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryResultSetExtractorIntegrationTests.java index 82b6fe60..6d48a6d6 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryResultSetExtractorIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryResultSetExtractorIntegrationTests.java @@ -28,9 +28,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -46,6 +45,7 @@ import org.springframework.jdbc.core.ResultSetExtractor; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit4.rules.SpringClassRule; import org.springframework.test.context.junit4.rules.SpringMethodRule; import org.springframework.transaction.annotation.Transactional; @@ -57,6 +57,7 @@ import org.springframework.transaction.annotation.Transactional; */ @ContextConfiguration @Transactional +@ExtendWith(SpringExtension.class) public class JdbcRepositoryResultSetExtractorIntegrationTests { @Configuration @@ -77,9 +78,6 @@ public class JdbcRepositoryResultSetExtractorIntegrationTests { } - @ClassRule public static final SpringClassRule classRule = new SpringClassRule(); - @Rule public SpringMethodRule methodRule = new SpringMethodRule(); - @Autowired NamedParameterJdbcTemplate template; @Autowired PersonRepository personRepository; 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 cccb248f..d2bc5c5b 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 @@ -26,9 +26,8 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.atomic.AtomicLong; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.Bean; @@ -42,8 +41,7 @@ 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; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; /** @@ -54,6 +52,7 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration @Transactional @ActiveProfiles("hsql") +@ExtendWith(SpringExtension.class) public class JdbcRepositoryWithCollectionsAndManuallyAssignedIdHsqlIntegrationTests { static AtomicLong id = new AtomicLong(0); @@ -94,9 +93,6 @@ public class JdbcRepositoryWithCollectionsAndManuallyAssignedIdHsqlIntegrationTe } } - @ClassRule public static final SpringClassRule classRule = new SpringClassRule(); - @Rule public SpringMethodRule methodRule = new SpringMethodRule(); - @Autowired NamedParameterJdbcTemplate template; @Autowired DummyEntityRepository repository; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsIntegrationTests.java index 5d20f2dc..1554215b 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsIntegrationTests.java @@ -27,10 +27,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Set; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -44,9 +42,8 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.context.junit4.rules.SpringClassRule; -import org.springframework.test.context.junit4.rules.SpringMethodRule; import org.springframework.transaction.annotation.Transactional; /** @@ -58,7 +55,7 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration @Transactional @TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS) -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) public class JdbcRepositoryWithCollectionsIntegrationTests { @Autowired NamedParameterJdbcTemplate template; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithListsIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithListsIntegrationTests.java index 3343c3ae..58699591 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithListsIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithListsIntegrationTests.java @@ -27,9 +27,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -43,8 +42,7 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; -import org.springframework.test.context.junit4.rules.SpringClassRule; -import org.springframework.test.context.junit4.rules.SpringMethodRule; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; /** @@ -56,10 +54,9 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration @Transactional @TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS) +@ExtendWith(SpringExtension.class) public class JdbcRepositoryWithListsIntegrationTests { - @ClassRule public static final SpringClassRule classRule = new SpringClassRule(); - @Rule public SpringMethodRule methodRule = new SpringMethodRule(); @Autowired NamedParameterJdbcTemplate template; @Autowired DummyEntityRepository repository; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithMapsIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithMapsIntegrationTests.java index 1217178f..d3435fc5 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithMapsIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithMapsIntegrationTests.java @@ -26,10 +26,8 @@ import lombok.RequiredArgsConstructor; import java.util.HashMap; import java.util.Map; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -43,9 +41,7 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.context.junit4.rules.SpringClassRule; -import org.springframework.test.context.junit4.rules.SpringMethodRule; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; /** @@ -57,7 +53,7 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration @Transactional @TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS) -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) public class JdbcRepositoryWithMapsIntegrationTests { @Configuration diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java index 42bf4811..61564f8c 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java @@ -29,8 +29,8 @@ import java.util.HashMap; import java.util.List; import org.assertj.core.groups.Tuple; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.annotation.Id; @@ -83,7 +83,7 @@ public class SimpleJdbcRepositoryEventsUnitTests { DummyEntityRepository repository; DefaultDataAccessStrategy dataAccessStrategy; - @Before + @BeforeEach public void before() { RelationalMappingContext context = new JdbcMappingContext(); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/StringBasedJdbcQueryMappingConfigurationIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/StringBasedJdbcQueryMappingConfigurationIntegrationTests.java index 8d0c33b1..726ecc8b 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/StringBasedJdbcQueryMappingConfigurationIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/StringBasedJdbcQueryMappingConfigurationIntegrationTests.java @@ -26,9 +26,8 @@ import java.sql.SQLException; import java.util.Arrays; import java.util.List; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -44,8 +43,7 @@ import org.springframework.jdbc.core.ResultSetExtractor; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.rules.SpringClassRule; -import org.springframework.test.context.junit4.rules.SpringMethodRule; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; /** @@ -56,6 +54,7 @@ import org.springframework.transaction.annotation.Transactional; */ @ContextConfiguration @Transactional +@ExtendWith(SpringExtension.class) public class StringBasedJdbcQueryMappingConfigurationIntegrationTests { private final static String CAR_MODEL = "ResultSetExtractor Car"; @@ -147,9 +146,6 @@ public class StringBasedJdbcQueryMappingConfigurationIntegrationTests { List findByNameWithRowMapperBean(); } - @ClassRule public static final SpringClassRule classRule = new SpringClassRule(); - @Rule public SpringMethodRule methodRule = new SpringMethodRule(); - @Autowired NamedParameterJdbcTemplate template; @Autowired CarRepository carRepository; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfigurationIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfigurationIntegrationTests.java index c0159db3..0d58190e 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfigurationIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfigurationIntegrationTests.java @@ -22,7 +22,7 @@ import java.util.Arrays; import java.util.List; import java.util.function.Consumer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/ConfigurableRowMapperMapUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/ConfigurableRowMapperMapUnitTests.java index e8874f54..dd8570a0 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/ConfigurableRowMapperMapUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/ConfigurableRowMapperMapUnitTests.java @@ -18,7 +18,7 @@ package org.springframework.data.jdbc.repository.config; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.jdbc.repository.QueryMappingConfiguration; import org.springframework.jdbc.core.RowMapper; 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 35283996..4183523a 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 @@ -27,7 +27,7 @@ import java.util.function.Consumer; import org.assertj.core.api.SoftAssertions; import org.jetbrains.annotations.NotNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.ApplicationListener; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositoriesIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositoriesIntegrationTests.java index 13859305..830f16a1 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositoriesIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositoriesIntegrationTests.java @@ -25,9 +25,9 @@ import java.util.Optional; import javax.sql.DataSource; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; @@ -50,6 +50,7 @@ import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.ReflectionUtils; @@ -61,7 +62,7 @@ import org.springframework.util.ReflectionUtils; * @author Evgeni Dimitrov * @author Fei Dong */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestConfiguration.class) public class EnableJdbcRepositoriesIntegrationTests { @@ -80,7 +81,7 @@ public class EnableJdbcRepositoriesIntegrationTests { @Autowired @Qualifier("qualifierJdbcOperations") NamedParameterJdbcOperations qualifierJdbcOperations; @Autowired @Qualifier("qualifierDataAccessStrategy") DataAccessStrategy qualifierDataAccessStrategy; - @BeforeClass + @BeforeAll public static void setup() { MAPPER_MAP.setAccessible(true); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/JdbcRepositoryConfigExtensionUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/JdbcRepositoryConfigExtensionUnitTests.java index 68ee837b..e89ce322 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/JdbcRepositoryConfigExtensionUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/JdbcRepositoryConfigExtensionUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.Collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.core.env.Environment; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/MyBatisJdbcConfigurationIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/MyBatisJdbcConfigurationIntegrationTests.java index bf373417..e82c866e 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/MyBatisJdbcConfigurationIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/MyBatisJdbcConfigurationIntegrationTests.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.*; import java.util.List; import org.apache.ibatis.session.SqlSession; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.jdbc.core.convert.CascadingDataAccessStrategy; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethodUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethodUnitTests.java index 809a8aaf..54defd3b 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethodUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethodUnitTests.java @@ -24,8 +24,8 @@ import java.sql.ResultSet; import java.util.Properties; import org.jetbrains.annotations.NotNull; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.projection.ProjectionFactory; @@ -54,7 +54,7 @@ public class JdbcQueryMethodUnitTests { NamedQueries namedQueries; RepositoryMetadata metadata; - @Before + @BeforeEach public void before() { Properties properties = new Properties(); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/PartTreeJdbcQueryUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/PartTreeJdbcQueryUnitTests.java index 281bf2e1..0fd97ae0 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/PartTreeJdbcQueryUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/PartTreeJdbcQueryUnitTests.java @@ -27,9 +27,9 @@ import java.util.Date; import java.util.List; import java.util.Properties; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.data.annotation.Id; import org.springframework.data.jdbc.core.convert.BasicJdbcConverter; import org.springframework.data.jdbc.core.convert.JdbcConverter; @@ -57,7 +57,7 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; * @author Jens Schauder * @author Myeonghyeon Lee */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class PartTreeJdbcQueryUnitTests { private static final String TABLE = "\"users\""; @@ -556,8 +556,8 @@ public class PartTreeJdbcQueryUnitTests { PartTreeJdbcQuery jdbcQuery = createQuery(queryMethod); ParametrizedQuery query = jdbcQuery.createQuery((getAccessor(queryMethod, new Object[] { "John" }))); - assertThat(query.getQuery()).isEqualTo( - "SELECT COUNT(*) FROM " + TABLE + " WHERE " + TABLE + ".\"FIRST_NAME\" = :first_name"); + assertThat(query.getQuery()) + .isEqualTo("SELECT COUNT(*) FROM " + TABLE + " WHERE " + TABLE + ".\"FIRST_NAME\" = :first_name"); } private PartTreeJdbcQuery createQuery(JdbcQueryMethod queryMethod) { diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/QueryAnnotationHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/QueryAnnotationHsqlIntegrationTests.java index e90cc12f..ddafa63a 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/QueryAnnotationHsqlIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/QueryAnnotationHsqlIntegrationTests.java @@ -26,9 +26,8 @@ import java.util.Optional; import java.util.stream.Stream; import org.assertj.core.api.SoftAssertions; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -41,8 +40,7 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; import org.springframework.lang.Nullable; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.rules.SpringClassRule; -import org.springframework.test.context.junit4.rules.SpringMethodRule; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; /** @@ -54,6 +52,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Transactional @ActiveProfiles("hsql") +@ExtendWith(SpringExtension.class) public class QueryAnnotationHsqlIntegrationTests { @Configuration @@ -69,9 +68,6 @@ public class QueryAnnotationHsqlIntegrationTests { @Autowired DummyEntityRepository repository; - @ClassRule public static final SpringClassRule classRule = new SpringClassRule(); - @Rule public SpringMethodRule methodRule = new SpringMethodRule(); - @Test // DATAJDBC-164 public void executeCustomQueryWithoutParameter() { diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/QueryMapperUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/QueryMapperUnitTests.java index 3a55bd13..0b33dce4 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/QueryMapperUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/QueryMapperUnitTests.java @@ -22,7 +22,7 @@ import static org.springframework.data.domain.Sort.Order.*; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Sort; import org.springframework.data.jdbc.core.convert.BasicJdbcConverter; import org.springframework.data.jdbc.core.convert.JdbcConverter; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQueryUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQueryUnitTests.java index 22a76e4b..eb7a7b2f 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQueryUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQueryUnitTests.java @@ -22,10 +22,9 @@ import java.sql.ResultSet; import org.assertj.core.api.Assertions; import org.jetbrains.annotations.NotNull; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.BeanFactory; import org.springframework.dao.DataAccessException; import org.springframework.data.jdbc.core.convert.BasicJdbcConverter; import org.springframework.data.jdbc.core.convert.JdbcConverter; @@ -56,7 +55,7 @@ public class StringBasedJdbcQueryUnitTests { RelationalMappingContext context; JdbcConverter converter; - @Before + @BeforeEach public void setup() throws NoSuchMethodException { this.queryMethod = mock(JdbcQueryMethod.class); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java index 5556af94..e3ad88be 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java @@ -21,10 +21,9 @@ import static org.mockito.Mockito.*; import java.lang.reflect.Method; import java.text.NumberFormat; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.BeanFactory; import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.jdbc.core.convert.JdbcConverter; import org.springframework.data.jdbc.repository.QueryMappingConfiguration; @@ -65,7 +64,7 @@ public class JdbcQueryLookupStrategyUnitTests { NamedQueries namedQueries = mock(NamedQueries.class); NamedParameterJdbcOperations operations = mock(NamedParameterJdbcOperations.class); - @Before + @BeforeEach public void setup() { this.metadata = mock(RepositoryMetadata.class); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java index a975ebc2..02977a32 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java @@ -20,12 +20,14 @@ import static org.mockito.Mockito.*; import java.util.function.Supplier; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.mockito.stubbing.Answer; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.ListableBeanFactory; @@ -53,7 +55,8 @@ import org.springframework.test.util.ReflectionTestUtils; * @author Mark Paluch * @author Evgeni Dimitrov */ -@RunWith(MockitoJUnitRunner.Silent.class) +@MockitoSettings(strictness = Strictness.LENIENT) +@ExtendWith(MockitoExtension.class) public class JdbcRepositoryFactoryBeanUnitTests { JdbcRepositoryFactoryBean factoryBean; @@ -65,7 +68,7 @@ public class JdbcRepositoryFactoryBeanUnitTests { RelationalMappingContext mappingContext; - @Before + @BeforeEach public void setUp() { this.mappingContext = new JdbcMappingContext(); @@ -95,15 +98,17 @@ public class JdbcRepositoryFactoryBeanUnitTests { assertThat(factoryBean.getObject()).isNotNull(); } - @Test(expected = IllegalArgumentException.class) // DATAJDBC-151 + @Test // DATAJDBC-151 public void requiresListableBeanFactory() { - factoryBean.setBeanFactory(mock(BeanFactory.class)); + + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> factoryBean.setBeanFactory(mock(BeanFactory.class))); } - @Test(expected = IllegalArgumentException.class) // DATAJDBC-155 + @Test // DATAJDBC-155 public void afterPropertiesThrowsExceptionWhenNoMappingContextSet() { - factoryBean.setMappingContext(null); + assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> factoryBean.setMappingContext(null)); } @Test // DATAJDBC-155 diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepositoryUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepositoryUnitTests.java index 13faccb4..42027397 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepositoryUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepositoryUnitTests.java @@ -16,13 +16,13 @@ package org.springframework.data.jdbc.repository.support; import static org.assertj.core.api.Assertions.*; -import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.data.jdbc.core.JdbcAggregateOperations; import org.springframework.data.relational.core.mapping.RelationalPersistentEntity; @@ -31,7 +31,7 @@ import org.springframework.data.relational.core.mapping.RelationalPersistentEnti * * @author Oliver Gierke */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class SimpleJdbcRepositoryUnitTests { @Mock JdbcAggregateOperations operations; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/BasicRelationalConverterUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/BasicRelationalConverterUnitTests.java index deca7d2e..a27dc144 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/BasicRelationalConverterUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/BasicRelationalConverterUnitTests.java @@ -22,8 +22,8 @@ import lombok.Value; import java.util.Set; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.core.convert.converter.GenericConverter; import org.springframework.data.convert.ConverterBuilder; @@ -44,7 +44,7 @@ public class BasicRelationalConverterUnitTests { RelationalMappingContext context = new RelationalMappingContext(); RelationalConverter converter; - @Before + @BeforeEach public void before() throws Exception { Set converters = ConverterBuilder.writing(MyValue.class, String.class, MyValue::getFoo) diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/DbActionExecutionExceptionUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/DbActionExecutionExceptionUnitTests.java index 17ad24f1..07c80ece 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/DbActionExecutionExceptionUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/DbActionExecutionExceptionUnitTests.java @@ -15,9 +15,9 @@ */ package org.springframework.data.relational.core.conversion; -import static org.mockito.Mockito.*; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import static org.mockito.Mockito.*; /** * Unit test for {@link DbActionExecutionException}. diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/RelationalEntityDeleteWriterUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/RelationalEntityDeleteWriterUnitTests.java index 81fabaad..3107a718 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/RelationalEntityDeleteWriterUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/RelationalEntityDeleteWriterUnitTests.java @@ -16,25 +16,31 @@ package org.springframework.data.relational.core.conversion; import lombok.Data; -import org.assertj.core.api.Assertions; -import org.assertj.core.groups.Tuple; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; -import org.springframework.data.annotation.Id; -import org.springframework.data.relational.core.conversion.DbAction.*; -import org.springframework.data.relational.core.mapping.RelationalMappingContext; import java.util.ArrayList; import java.util.List; +import org.assertj.core.api.Assertions; +import org.assertj.core.groups.Tuple; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.data.annotation.Id; +import org.springframework.data.relational.core.conversion.DbAction.AcquireLockAllRoot; +import org.springframework.data.relational.core.conversion.DbAction.AcquireLockRoot; +import org.springframework.data.relational.core.conversion.DbAction.Delete; +import org.springframework.data.relational.core.conversion.DbAction.DeleteAll; +import org.springframework.data.relational.core.conversion.DbAction.DeleteAllRoot; +import org.springframework.data.relational.core.conversion.DbAction.DeleteRoot; +import org.springframework.data.relational.core.mapping.RelationalMappingContext; + /** * Unit tests for the {@link org.springframework.data.relational.core.conversion.RelationalEntityDeleteWriter} * * @author Jens Schauder * @author Myeonghyeon Lee */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class RelationalEntityDeleteWriterUnitTests { RelationalEntityDeleteWriter converter = new RelationalEntityDeleteWriter(new RelationalMappingContext()); @@ -68,8 +74,8 @@ public class RelationalEntityDeleteWriterUnitTests { converter.write(entity.id, aggregateChange); Assertions.assertThat(extractActions(aggregateChange)) - .extracting(DbAction::getClass, DbAction::getEntityType, DbActionTestSupport::extractPath) // - .containsExactly(Tuple.tuple(DeleteRoot.class, SingleEntity.class, "")); + .extracting(DbAction::getClass, DbAction::getEntityType, DbActionTestSupport::extractPath) // + .containsExactly(Tuple.tuple(DeleteRoot.class, SingleEntity.class, "")); } @Test // DATAJDBC-188 @@ -97,8 +103,8 @@ public class RelationalEntityDeleteWriterUnitTests { converter.write(null, aggregateChange); Assertions.assertThat(extractActions(aggregateChange)) - .extracting(DbAction::getClass, DbAction::getEntityType, DbActionTestSupport::extractPath) // - .containsExactly(Tuple.tuple(DeleteAllRoot.class, SingleEntity.class, "")); + .extracting(DbAction::getClass, DbAction::getEntityType, DbActionTestSupport::extractPath) // + .containsExactly(Tuple.tuple(DeleteAllRoot.class, SingleEntity.class, "")); } private List> extractActions(MutableAggregateChange aggregateChange) { diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/RelationalEntityInsertWriterUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/RelationalEntityInsertWriterUnitTests.java index 9c4b9d9f..0ca4b717 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/RelationalEntityInsertWriterUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/RelationalEntityInsertWriterUnitTests.java @@ -22,9 +22,9 @@ import lombok.RequiredArgsConstructor; import java.util.ArrayList; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.data.annotation.Id; import org.springframework.data.relational.core.conversion.DbAction.InsertRoot; import org.springframework.data.relational.core.mapping.RelationalMappingContext; @@ -34,7 +34,7 @@ import org.springframework.data.relational.core.mapping.RelationalMappingContext * * @author Thomas Lang */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class RelationalEntityInsertWriterUnitTests { public static final long SOME_ENTITY_ID = 23L; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/RelationalEntityUpdateWriterUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/RelationalEntityUpdateWriterUnitTests.java index 4a1cac2f..051a14b7 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/RelationalEntityUpdateWriterUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/RelationalEntityUpdateWriterUnitTests.java @@ -22,9 +22,9 @@ import lombok.RequiredArgsConstructor; import java.util.ArrayList; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.data.annotation.Id; import org.springframework.data.relational.core.mapping.RelationalMappingContext; @@ -34,7 +34,7 @@ import org.springframework.data.relational.core.mapping.RelationalMappingContext * @author Thomas Lang * @author Myeonghyeon Lee */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class RelationalEntityUpdateWriterUnitTests { public static final long SOME_ENTITY_ID = 23L; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/RelationalEntityWriterUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/RelationalEntityWriterUnitTests.java index 0ca00f6b..1aa9197b 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/RelationalEntityWriterUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/conversion/RelationalEntityWriterUnitTests.java @@ -26,9 +26,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.data.annotation.Id; import org.springframework.data.mapping.PersistentPropertyPath; import org.springframework.data.mapping.PersistentPropertyPaths; @@ -37,9 +37,9 @@ import org.springframework.data.relational.core.conversion.DbAction.Insert; import org.springframework.data.relational.core.conversion.DbAction.InsertRoot; import org.springframework.data.relational.core.conversion.DbAction.UpdateRoot; import org.springframework.data.relational.core.mapping.Embedded; -import org.springframework.data.relational.core.mapping.Embedded.OnEmpty; import org.springframework.data.relational.core.mapping.RelationalMappingContext; import org.springframework.data.relational.core.mapping.RelationalPersistentProperty; +import org.springframework.data.relational.core.mapping.Embedded.OnEmpty; import org.springframework.lang.Nullable; /** @@ -50,7 +50,7 @@ import org.springframework.lang.Nullable; * @author Mark Paluch * @author Myeonghyeon Lee */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class RelationalEntityWriterUnitTests { static final long SOME_ENTITY_ID = 23L; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/EscaperUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/EscaperUnitTests.java index a751010d..c2605893 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/EscaperUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/EscaperUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.relational.core.dialect; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link Escaper}. diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/HsqlDbDialectUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/HsqlDbDialectUnitTests.java index e7b6cfd4..22db5529 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/HsqlDbDialectUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/HsqlDbDialectUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.relational.core.dialect; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.From; import org.springframework.data.relational.core.sql.LockMode; import org.springframework.data.relational.core.sql.LockOptions; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/MySqlDialectRenderingUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/MySqlDialectRenderingUnitTests.java index 9d660ff8..2f352fa1 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/MySqlDialectRenderingUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/MySqlDialectRenderingUnitTests.java @@ -17,8 +17,8 @@ package org.springframework.data.relational.core.dialect; import static org.assertj.core.api.Assertions.*; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.LockMode; import org.springframework.data.relational.core.sql.Select; @@ -38,7 +38,7 @@ public class MySqlDialectRenderingUnitTests { private final RenderContextFactory factory = new RenderContextFactory(MySqlDialect.INSTANCE); - @Before + @BeforeEach public void before() { factory.setNamingStrategy(NamingStrategies.asIs()); } diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/MySqlDialectUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/MySqlDialectUnitTests.java index f8170d5f..ceebcdd8 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/MySqlDialectUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/MySqlDialectUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.relational.core.dialect; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.From; import org.springframework.data.relational.core.sql.LockMode; import org.springframework.data.relational.core.sql.LockOptions; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/PostgresDialectRenderingUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/PostgresDialectRenderingUnitTests.java index 0325a7a0..f30c07b6 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/PostgresDialectRenderingUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/PostgresDialectRenderingUnitTests.java @@ -17,8 +17,8 @@ package org.springframework.data.relational.core.dialect; import static org.assertj.core.api.Assertions.*; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.LockMode; import org.springframework.data.relational.core.sql.Select; @@ -38,7 +38,7 @@ public class PostgresDialectRenderingUnitTests { private final RenderContextFactory factory = new RenderContextFactory(PostgresDialect.INSTANCE); - @Before + @BeforeEach public void before() throws Exception { factory.setNamingStrategy(NamingStrategies.asIs()); } diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/PostgresDialectUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/PostgresDialectUnitTests.java index bd3678b7..b56fd147 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/PostgresDialectUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/PostgresDialectUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.SoftAssertions.*; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.From; import org.springframework.data.relational.core.sql.LockMode; import org.springframework.data.relational.core.sql.LockOptions; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/SqlServerDialectRenderingUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/SqlServerDialectRenderingUnitTests.java index da78c1c0..150ae848 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/SqlServerDialectRenderingUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/SqlServerDialectRenderingUnitTests.java @@ -17,8 +17,8 @@ package org.springframework.data.relational.core.dialect; import static org.assertj.core.api.Assertions.*; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.LockMode; import org.springframework.data.relational.core.sql.Select; @@ -38,7 +38,7 @@ public class SqlServerDialectRenderingUnitTests { private final RenderContextFactory factory = new RenderContextFactory(SqlServerDialect.INSTANCE); - @Before + @BeforeEach public void before() { factory.setNamingStrategy(NamingStrategies.asIs()); } diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/SqlServerDialectUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/SqlServerDialectUnitTests.java index 5bc65263..b5e3caac 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/SqlServerDialectUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/SqlServerDialectUnitTests.java @@ -18,7 +18,7 @@ package org.springframework.data.relational.core.dialect; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.From; import org.springframework.data.relational.core.sql.LockMode; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentPropertyUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentPropertyUnitTests.java index 2d0e4686..7df927c9 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentPropertyUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentPropertyUnitTests.java @@ -28,12 +28,10 @@ import java.util.List; import java.util.UUID; import java.util.function.BiConsumer; -import org.assertj.core.api.Assertions; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.mapping.PersistentPropertyPath; -import org.springframework.data.mapping.PropertyHandler; import org.springframework.data.relational.core.mapping.Embedded.OnEmpty; /** diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/DerivedSqlIdentifierUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/DerivedSqlIdentifierUnitTests.java index 469ca888..edd49687 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/DerivedSqlIdentifierUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/DerivedSqlIdentifierUnitTests.java @@ -18,7 +18,7 @@ package org.springframework.data.relational.core.mapping; import static org.assertj.core.api.Assertions.*; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.IdentifierProcessing; import org.springframework.data.relational.core.sql.IdentifierProcessing.LetterCasing; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/NamingStrategyUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/NamingStrategyUnitTests.java index 92eae345..2c58a282 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/NamingStrategyUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/NamingStrategyUnitTests.java @@ -20,8 +20,7 @@ import static org.assertj.core.api.Assertions.*; import java.time.LocalDateTime; import java.util.List; -import org.junit.Test; - +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.relational.core.mapping.RelationalPersistentEntityImplUnitTests.DummySubEntity; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/RelationalMappingContextUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/RelationalMappingContextUnitTests.java index 859f2a79..c73f35cb 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/RelationalMappingContextUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/RelationalMappingContextUnitTests.java @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.mapping.model.SimpleTypeHolder; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/RelationalPersistentEntityImplUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/RelationalPersistentEntityImplUnitTests.java index ddf9adcb..d2d068d0 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/RelationalPersistentEntityImplUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/RelationalPersistentEntityImplUnitTests.java @@ -18,7 +18,7 @@ package org.springframework.data.relational.core.mapping; import static org.assertj.core.api.Assertions.*; import static org.springframework.data.relational.core.sql.SqlIdentifier.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; import org.springframework.data.relational.core.sql.IdentifierProcessing; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/event/AbstractRelationalEventListenerUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/event/AbstractRelationalEventListenerUnitTests.java index a21994c4..5e1c554e 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/event/AbstractRelationalEventListenerUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/event/AbstractRelationalEventListenerUnitTests.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.conversion.MutableAggregateChange; /** diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/query/CriteriaUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/query/CriteriaUnitTests.java index 944fc5ab..0653c897 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/query/CriteriaUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/query/CriteriaUnitTests.java @@ -21,7 +21,7 @@ import static org.springframework.data.relational.core.query.Criteria.*; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.SqlIdentifier; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/query/QueryUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/query/QueryUnitTests.java index ecc1a44a..12fe1223 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/query/QueryUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/query/QueryUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.relational.core.query; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/query/UpdateUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/query/UpdateUnitTests.java index 64068ba8..28ddef26 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/query/UpdateUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/query/UpdateUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.relational.core.query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.*; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/DefaultIdentifierProcessingUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/DefaultIdentifierProcessingUnitTests.java index 93fd61d1..fbcb93b7 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/DefaultIdentifierProcessingUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/DefaultIdentifierProcessingUnitTests.java @@ -17,10 +17,7 @@ package org.springframework.data.relational.core.sql; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; - -import org.springframework.data.relational.core.sql.DefaultIdentifierProcessing; -import org.springframework.data.relational.core.sql.IdentifierProcessing; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.IdentifierProcessing.LetterCasing; import org.springframework.data.relational.core.sql.IdentifierProcessing.Quoting; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/DeleteBuilderUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/DeleteBuilderUnitTests.java index 10afde98..99c45594 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/DeleteBuilderUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/DeleteBuilderUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.relational.core.sql; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link DeleteBuilder}. diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/DeleteValidatorUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/DeleteValidatorUnitTests.java index c455e7c1..59874466 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/DeleteValidatorUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/DeleteValidatorUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.relational.core.sql; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link DeleteValidator}. diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/InsertBuilderUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/InsertBuilderUnitTests.java index 797d8f02..f084165c 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/InsertBuilderUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/InsertBuilderUnitTests.java @@ -15,9 +15,9 @@ */ package org.springframework.data.relational.core.sql; -import static org.assertj.core.api.Assertions.*; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import static org.assertj.core.api.Assertions.*; /** * Unit tests for {@link InsertBuilder}. diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/SelectBuilderUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/SelectBuilderUnitTests.java index 66918f83..0197ea7f 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/SelectBuilderUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/SelectBuilderUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.OptionalLong; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.Join.JoinType; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/SelectValidatorUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/SelectValidatorUnitTests.java index c51ab42c..5233bd86 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/SelectValidatorUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/SelectValidatorUnitTests.java @@ -15,9 +15,9 @@ */ package org.springframework.data.relational.core.sql; -import static org.assertj.core.api.Assertions.*; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import static org.assertj.core.api.Assertions.*; /** * Unit tests for {@link SelectValidator}. diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/SqlIdentifierUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/SqlIdentifierUnitTests.java index 4c1aef4c..f6502e4c 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/SqlIdentifierUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/SqlIdentifierUnitTests.java @@ -19,12 +19,10 @@ import static org.assertj.core.api.Assertions.*; import static org.springframework.data.relational.core.sql.SqlIdentifier.*; import org.assertj.core.api.SoftAssertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import org.springframework.data.relational.core.sql.IdentifierProcessing; import org.springframework.data.relational.core.sql.IdentifierProcessing.LetterCasing; import org.springframework.data.relational.core.sql.IdentifierProcessing.Quoting; -import org.springframework.data.relational.core.sql.SqlIdentifier; /** * Unit tests for {@link SqlIdentifier}. diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/UpdateBuilderUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/UpdateBuilderUnitTests.java index 31c46557..a45f7176 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/UpdateBuilderUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/UpdateBuilderUnitTests.java @@ -15,9 +15,9 @@ */ package org.springframework.data.relational.core.sql; -import static org.assertj.core.api.Assertions.*; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import static org.assertj.core.api.Assertions.*; /** * Unit tests for {@link UpdateBuilder}. diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/ConditionRendererUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/ConditionRendererUnitTests.java index b9be32cd..1197c132 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/ConditionRendererUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/ConditionRendererUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.relational.core.sql.render; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.Column; import org.springframework.data.relational.core.sql.Conditions; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/DeleteRendererUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/DeleteRendererUnitTests.java index 84dad022..7992c7ba 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/DeleteRendererUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/DeleteRendererUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.relational.core.sql.render; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.Delete; import org.springframework.data.relational.core.sql.SQL; import org.springframework.data.relational.core.sql.Table; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/InsertRendererUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/InsertRendererUnitTests.java index 834c29a4..2ddc5a23 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/InsertRendererUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/InsertRendererUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.relational.core.sql.render; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.Insert; import org.springframework.data.relational.core.sql.SQL; import org.springframework.data.relational.core.sql.Table; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/OrderByClauseVisitorUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/OrderByClauseVisitorUnitTests.java index 0817eb63..2972c40c 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/OrderByClauseVisitorUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/OrderByClauseVisitorUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.relational.core.sql.render; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.Column; import org.springframework.data.relational.core.sql.OrderByField; import org.springframework.data.relational.core.sql.SQL; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java index db32a22e..b582cad6 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.relational.core.sql.render; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.dialect.PostgresDialect; import org.springframework.data.relational.core.dialect.RenderContextFactory; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/UpdateRendererUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/UpdateRendererUnitTests.java index 8b891a01..50d3de37 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/UpdateRendererUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/UpdateRendererUnitTests.java @@ -17,7 +17,7 @@ package org.springframework.data.relational.core.sql.render; import static org.assertj.core.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.relational.core.sql.Column; import org.springframework.data.relational.core.sql.SQL; diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/degraph/DependencyTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/degraph/DependencyTests.java index 5af2d83e..878a8824 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/degraph/DependencyTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/degraph/DependencyTests.java @@ -16,13 +16,12 @@ package org.springframework.data.relational.degraph; import static de.schauderhaft.degraph.check.JCheck.*; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.*; import de.schauderhaft.degraph.check.JCheck; +import org.junit.jupiter.api.Test; import scala.runtime.AbstractFunction1; -import org.junit.Test; - /** * Test package dependencies for violations. * diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/repository/query/ParameterMetadataProviderUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/repository/query/ParameterMetadataProviderUnitTests.java index e38007bf..29c5d919 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/repository/query/ParameterMetadataProviderUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/repository/query/ParameterMetadataProviderUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.lang.reflect.Method; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.projection.ProjectionFactory; import org.springframework.data.projection.SpelAwareProxyProjectionFactory;