Skip to content

Commit 9658ac1

Browse files
committed
DATAJDBC-616 - Migrates to JUnit 5.
MockitoRunner -> MockitoExtension. SpringRunner, SpringClassRule & SpringMethodRule -> SpringExtension.
1 parent 8fef3d3 commit 9658ac1

File tree

101 files changed

+291
-350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+291
-350
lines changed

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateChangeIdGenerationImmutableUnitTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import java.util.stream.Collectors;
3333
import java.util.stream.Stream;
3434

35-
import org.junit.Ignore;
36-
import org.junit.Test;
35+
import org.junit.jupiter.api.Disabled;
36+
import org.junit.jupiter.api.Test;
3737
import org.springframework.data.annotation.Id;
3838
import org.springframework.data.jdbc.core.convert.DataAccessStrategy;
3939
import org.springframework.data.jdbc.core.convert.JdbcConverter;
@@ -54,7 +54,7 @@
5454
* @author Jens Schauder
5555
* @author Myeonghyeon-Lee
5656
*/
57-
@Ignore
57+
@Disabled
5858
public class AggregateChangeIdGenerationImmutableUnitTests {
5959

6060
DummyEntity entity = new DummyEntity();

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateChangeIdGenerationUnitTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.Set;
2828

2929
import org.assertj.core.api.SoftAssertions;
30-
import org.junit.Test;
30+
import org.junit.jupiter.api.Test;
3131
import org.mockito.invocation.InvocationOnMock;
3232
import org.mockito.stubbing.Answer;
3333
import org.springframework.data.annotation.Id;

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/ImmutableAggregateTemplateHsqlIntegrationTests.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222
import lombok.With;
2323

2424
import org.assertj.core.api.SoftAssertions;
25-
import org.junit.ClassRule;
26-
import org.junit.Rule;
27-
import org.junit.Test;
2825

26+
import org.junit.jupiter.api.Test;
27+
import org.junit.jupiter.api.extension.ExtendWith;
2928
import org.springframework.beans.factory.annotation.Autowired;
3029
import org.springframework.context.ApplicationEventPublisher;
3130
import org.springframework.context.annotation.Bean;
@@ -38,6 +37,7 @@
3837
import org.springframework.data.relational.core.mapping.RelationalMappingContext;
3938
import org.springframework.test.context.ActiveProfiles;
4039
import org.springframework.test.context.ContextConfiguration;
40+
import org.springframework.test.context.junit.jupiter.SpringExtension;
4141
import org.springframework.test.context.junit4.rules.SpringClassRule;
4242
import org.springframework.test.context.junit4.rules.SpringMethodRule;
4343
import org.springframework.transaction.annotation.Transactional;
@@ -51,10 +51,9 @@
5151
@ContextConfiguration
5252
@Transactional
5353
@ActiveProfiles("hsql")
54+
@ExtendWith(SpringExtension.class)
5455
public class ImmutableAggregateTemplateHsqlIntegrationTests {
5556

56-
@ClassRule public static final SpringClassRule classRule = new SpringClassRule();
57-
@Rule public SpringMethodRule methodRule = new SpringMethodRule();
5857
@Autowired JdbcAggregateOperations template;
5958

6059
@Test // DATAJDBC-241

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextImmutableUnitTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.util.List;
2727

2828
import org.jetbrains.annotations.NotNull;
29-
import org.junit.Test;
29+
import org.junit.jupiter.api.Test;
3030
import org.springframework.data.annotation.Id;
3131
import org.springframework.data.annotation.Version;
3232
import org.springframework.data.jdbc.core.convert.BasicJdbcConverter;

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextUnitTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.List;
2424

2525
import org.jetbrains.annotations.NotNull;
26-
import org.junit.Test;
26+
import org.junit.jupiter.api.Test;
2727
import org.springframework.data.annotation.Id;
2828
import org.springframework.data.annotation.Version;
2929
import org.springframework.data.jdbc.core.convert.BasicJdbcConverter;

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateIntegrationTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
import java.util.stream.IntStream;
3838

3939
import org.assertj.core.api.SoftAssertions;
40-
import org.junit.Test;
41-
import org.junit.runner.RunWith;
4240

41+
import org.junit.jupiter.api.Test;
42+
import org.junit.jupiter.api.extension.ExtendWith;
4343
import org.springframework.beans.factory.annotation.Autowired;
4444
import org.springframework.context.ApplicationEventPublisher;
4545
import org.springframework.context.annotation.Bean;
@@ -65,6 +65,7 @@
6565
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
6666
import org.springframework.test.context.ContextConfiguration;
6767
import org.springframework.test.context.TestExecutionListeners;
68+
import org.springframework.test.context.junit.jupiter.SpringExtension;
6869
import org.springframework.test.context.junit4.SpringRunner;
6970
import org.springframework.transaction.annotation.Transactional;
7071

@@ -83,7 +84,7 @@
8384
@ContextConfiguration
8485
@Transactional
8586
@TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS)
86-
@RunWith(SpringRunner.class)
87+
@ExtendWith(SpringExtension.class)
8788
public class JdbcAggregateTemplateIntegrationTests {
8889

8990
@Autowired JdbcAggregateOperations template;

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateSchemaIntegrationTests.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
import static org.springframework.data.jdbc.testing.TestDatabaseFeatures.Feature.*;
2020
import static org.springframework.test.context.TestExecutionListeners.MergeMode.*;
2121

22-
import org.junit.Test;
23-
import org.junit.runner.RunWith;
24-
22+
import org.junit.jupiter.api.Test;
23+
import org.junit.jupiter.api.extension.ExtendWith;
2524
import org.springframework.beans.factory.annotation.Autowired;
2625
import org.springframework.context.ApplicationEventPublisher;
2726
import org.springframework.context.annotation.Bean;
@@ -38,7 +37,7 @@
3837
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
3938
import org.springframework.test.context.ContextConfiguration;
4039
import org.springframework.test.context.TestExecutionListeners;
41-
import org.springframework.test.context.junit4.SpringRunner;
40+
import org.springframework.test.context.junit.jupiter.SpringExtension;
4241
import org.springframework.transaction.annotation.Transactional;
4342

4443
/**
@@ -49,7 +48,7 @@
4948
@ContextConfiguration
5049
@Transactional
5150
@TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS)
52-
@RunWith(SpringRunner.class)
51+
@ExtendWith(SpringExtension.class)
5352
public class JdbcAggregateTemplateSchemaIntegrationTests {
5453

5554
@Autowired JdbcAggregateOperations template;

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateUnitTests.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@
2323
import lombok.AllArgsConstructor;
2424
import lombok.Data;
2525

26-
import org.junit.Before;
27-
import org.junit.Test;
28-
import org.junit.runner.RunWith;
26+
import org.junit.jupiter.api.BeforeEach;
27+
import org.junit.jupiter.api.Test;
28+
import org.junit.jupiter.api.extension.ExtendWith;
2929
import org.mockito.Mock;
30-
import org.mockito.junit.MockitoJUnitRunner;
31-
30+
import org.mockito.junit.jupiter.MockitoExtension;
3231
import org.springframework.context.ApplicationEventPublisher;
3332
import org.springframework.data.annotation.Id;
3433
import org.springframework.data.domain.PageRequest;
@@ -56,7 +55,7 @@
5655
* @author Mark Paluch
5756
* @author Milan Milanov
5857
*/
59-
@RunWith(MockitoJUnitRunner.class)
58+
@ExtendWith(MockitoExtension.class)
6059
public class JdbcAggregateTemplateUnitTests {
6160

6261
JdbcAggregateOperations template;
@@ -66,7 +65,7 @@ public class JdbcAggregateTemplateUnitTests {
6665
@Mock RelationResolver relationResolver;
6766
@Mock EntityCallbacks callbacks;
6867

69-
@Before
68+
@BeforeEach
7069
public void setUp() {
7170

7271
RelationalMappingContext mappingContext = new RelationalMappingContext(NamingStrategy.INSTANCE);

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/PersistentPropertyPathExtensionUnitTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import java.util.List;
2222

23-
import org.junit.Test;
23+
import org.junit.jupiter.api.Test;
2424
import org.springframework.data.annotation.Id;
2525
import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
2626
import org.springframework.data.mapping.PersistentPropertyPath;

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverterUnitTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.util.UUID;
2727

2828
import org.assertj.core.api.SoftAssertions;
29-
import org.junit.Test;
29+
import org.junit.jupiter.api.Test;
3030

3131
import org.springframework.data.annotation.Id;
3232
import org.springframework.data.jdbc.core.mapping.AggregateReference;

0 commit comments

Comments
 (0)