Skip to content

Commit f23b987

Browse files
schauderschauder
committed
DATAJDBC-616 - Polishing.
Corrected name since AssumeFeatureRule is not a Rule but an ExecutionListener.
1 parent 18100b4 commit f23b987

11 files changed

+21
-24
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
import org.springframework.data.domain.Sort;
5555
import org.springframework.data.jdbc.core.convert.DataAccessStrategy;
5656
import org.springframework.data.jdbc.core.convert.JdbcConverter;
57-
import org.springframework.data.jdbc.testing.AssumeFeatureRule;
57+
import org.springframework.data.jdbc.testing.AssumeFeatureTestExecutionListener;
5858
import org.springframework.data.jdbc.testing.EnabledOnFeature;
5959
import org.springframework.data.jdbc.testing.TestConfiguration;
6060
import org.springframework.data.jdbc.testing.TestDatabaseFeatures;
@@ -66,7 +66,6 @@
6666
import org.springframework.test.context.ContextConfiguration;
6767
import org.springframework.test.context.TestExecutionListeners;
6868
import org.springframework.test.context.junit.jupiter.SpringExtension;
69-
import org.springframework.test.context.junit4.SpringRunner;
7069
import org.springframework.transaction.annotation.Transactional;
7170

7271
/**
@@ -83,7 +82,7 @@
8382
*/
8483
@ContextConfiguration
8584
@Transactional
86-
@TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS)
85+
@TestExecutionListeners(value = AssumeFeatureTestExecutionListener.class, mergeMode = MERGE_WITH_DEFAULTS)
8786
@ExtendWith(SpringExtension.class)
8887
public class JdbcAggregateTemplateIntegrationTests {
8988

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.data.annotation.Id;
3030
import org.springframework.data.jdbc.core.convert.DataAccessStrategy;
3131
import org.springframework.data.jdbc.core.convert.JdbcConverter;
32-
import org.springframework.data.jdbc.testing.AssumeFeatureRule;
32+
import org.springframework.data.jdbc.testing.AssumeFeatureTestExecutionListener;
3333
import org.springframework.data.jdbc.testing.EnabledOnFeature;
3434
import org.springframework.data.jdbc.testing.TestConfiguration;
3535
import org.springframework.data.relational.core.mapping.NamingStrategy;
@@ -47,7 +47,7 @@
4747
*/
4848
@ContextConfiguration
4949
@Transactional
50-
@TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS)
50+
@TestExecutionListeners(value = AssumeFeatureTestExecutionListener.class, mergeMode = MERGE_WITH_DEFAULTS)
5151
@ExtendWith(SpringExtension.class)
5252
public class JdbcAggregateTemplateSchemaIntegrationTests {
5353

‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryCustomConversionIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.springframework.data.jdbc.core.convert.JdbcCustomConversions;
3838
import org.springframework.data.jdbc.core.convert.JdbcValue;
3939
import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
40-
import org.springframework.data.jdbc.testing.AssumeFeatureRule;
40+
import org.springframework.data.jdbc.testing.AssumeFeatureTestExecutionListener;
4141
import org.springframework.data.jdbc.testing.TestConfiguration;
4242
import org.springframework.data.repository.CrudRepository;
4343
import org.springframework.test.context.ContextConfiguration;
@@ -53,7 +53,7 @@
5353
*/
5454
@ContextConfiguration
5555
@Transactional
56-
@TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS)
56+
@TestExecutionListeners(value = AssumeFeatureTestExecutionListener.class, mergeMode = MERGE_WITH_DEFAULTS)
5757
@ExtendWith(SpringExtension.class)
5858
public class JdbcRepositoryCustomConversionIntegrationTests {
5959

‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedNotInAggregateRootIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.springframework.context.annotation.Import;
3232
import org.springframework.data.annotation.Id;
3333
import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
34-
import org.springframework.data.jdbc.testing.AssumeFeatureRule;
34+
import org.springframework.data.jdbc.testing.AssumeFeatureTestExecutionListener;
3535
import org.springframework.data.jdbc.testing.TestConfiguration;
3636
import org.springframework.data.relational.core.dialect.Dialect;
3737
import org.springframework.data.relational.core.mapping.Column;
@@ -54,7 +54,7 @@
5454
*/
5555
@ContextConfiguration
5656
@Transactional
57-
@TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS)
57+
@TestExecutionListeners(value = AssumeFeatureTestExecutionListener.class, mergeMode = MERGE_WITH_DEFAULTS)
5858
@ExtendWith(SpringExtension.class)
5959
public class JdbcRepositoryEmbeddedNotInAggregateRootIntegrationTests {
6060

‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryEmbeddedWithReferenceIntegrationTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.springframework.context.annotation.Import;
3232
import org.springframework.data.annotation.Id;
3333
import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
34-
import org.springframework.data.jdbc.testing.AssumeFeatureRule;
34+
import org.springframework.data.jdbc.testing.AssumeFeatureTestExecutionListener;
3535
import org.springframework.data.jdbc.testing.TestConfiguration;
3636
import org.springframework.data.relational.core.dialect.Dialect;
3737
import org.springframework.data.relational.core.mapping.Column;
@@ -44,7 +44,6 @@
4444
import org.springframework.test.context.ContextConfiguration;
4545
import org.springframework.test.context.TestExecutionListeners;
4646
import org.springframework.test.context.junit.jupiter.SpringExtension;
47-
import org.springframework.test.context.junit4.SpringRunner;
4847
import org.springframework.test.jdbc.JdbcTestUtils;
4948
import org.springframework.transaction.annotation.Transactional;
5049

@@ -56,7 +55,7 @@
5655
*/
5756
@ContextConfiguration
5857
@Transactional
59-
@TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS)
58+
@TestExecutionListeners(value = AssumeFeatureTestExecutionListener.class, mergeMode = MERGE_WITH_DEFAULTS)
6059
@ExtendWith(SpringExtension.class)
6160
public class JdbcRepositoryEmbeddedWithReferenceIntegrationTests {
6261

‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.springframework.data.annotation.Id;
4242
import org.springframework.data.jdbc.repository.query.Query;
4343
import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
44-
import org.springframework.data.jdbc.testing.AssumeFeatureRule;
44+
import org.springframework.data.jdbc.testing.AssumeFeatureTestExecutionListener;
4545
import org.springframework.data.jdbc.testing.TestConfiguration;
4646
import org.springframework.data.relational.core.mapping.event.AbstractRelationalEvent;
4747
import org.springframework.data.relational.core.mapping.event.AfterLoadEvent;
@@ -64,7 +64,7 @@
6464
* @author Mark Paluch
6565
*/
6666
@Transactional
67-
@TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS)
67+
@TestExecutionListeners(value = AssumeFeatureTestExecutionListener.class, mergeMode = MERGE_WITH_DEFAULTS)
6868
@ExtendWith(SpringExtension.class)
6969
public class JdbcRepositoryIntegrationTests {
7070

‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import org.springframework.context.annotation.Import;
4343
import org.springframework.data.annotation.Id;
4444
import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
45-
import org.springframework.data.jdbc.testing.AssumeFeatureRule;
45+
import org.springframework.data.jdbc.testing.AssumeFeatureTestExecutionListener;
4646
import org.springframework.data.jdbc.testing.EnabledOnFeature;
4747
import org.springframework.data.jdbc.testing.TestConfiguration;
4848
import org.springframework.data.relational.core.mapping.MappedCollection;
@@ -63,7 +63,7 @@
6363
*/
6464
@ContextConfiguration
6565
@Transactional
66-
@TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS)
66+
@TestExecutionListeners(value = AssumeFeatureTestExecutionListener.class, mergeMode = MERGE_WITH_DEFAULTS)
6767
@ExtendWith(SpringExtension.class)
6868
public class JdbcRepositoryPropertyConversionIntegrationTests {
6969

‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsIntegrationTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,14 @@
3535
import org.springframework.context.annotation.Import;
3636
import org.springframework.data.annotation.Id;
3737
import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
38-
import org.springframework.data.jdbc.testing.AssumeFeatureRule;
38+
import org.springframework.data.jdbc.testing.AssumeFeatureTestExecutionListener;
3939
import org.springframework.data.jdbc.testing.EnabledOnFeature;
4040
import org.springframework.data.jdbc.testing.TestConfiguration;
4141
import org.springframework.data.repository.CrudRepository;
4242
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
4343
import org.springframework.test.context.ContextConfiguration;
4444
import org.springframework.test.context.TestExecutionListeners;
4545
import org.springframework.test.context.junit.jupiter.SpringExtension;
46-
import org.springframework.test.context.junit4.SpringRunner;
4746
import org.springframework.transaction.annotation.Transactional;
4847

4948
/**
@@ -54,7 +53,7 @@
5453
*/
5554
@ContextConfiguration
5655
@Transactional
57-
@TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS)
56+
@TestExecutionListeners(value = AssumeFeatureTestExecutionListener.class, mergeMode = MERGE_WITH_DEFAULTS)
5857
@ExtendWith(SpringExtension.class)
5958
public class JdbcRepositoryWithCollectionsIntegrationTests {
6059

‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithListsIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.springframework.context.annotation.Import;
3636
import org.springframework.data.annotation.Id;
3737
import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
38-
import org.springframework.data.jdbc.testing.AssumeFeatureRule;
38+
import org.springframework.data.jdbc.testing.AssumeFeatureTestExecutionListener;
3939
import org.springframework.data.jdbc.testing.EnabledOnFeature;
4040
import org.springframework.data.jdbc.testing.TestConfiguration;
4141
import org.springframework.data.repository.CrudRepository;
@@ -53,7 +53,7 @@
5353
*/
5454
@ContextConfiguration
5555
@Transactional
56-
@TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS)
56+
@TestExecutionListeners(value = AssumeFeatureTestExecutionListener.class, mergeMode = MERGE_WITH_DEFAULTS)
5757
@ExtendWith(SpringExtension.class)
5858
public class JdbcRepositoryWithListsIntegrationTests {
5959

‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithMapsIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.springframework.context.annotation.Import;
3535
import org.springframework.data.annotation.Id;
3636
import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory;
37-
import org.springframework.data.jdbc.testing.AssumeFeatureRule;
37+
import org.springframework.data.jdbc.testing.AssumeFeatureTestExecutionListener;
3838
import org.springframework.data.jdbc.testing.EnabledOnFeature;
3939
import org.springframework.data.jdbc.testing.TestConfiguration;
4040
import org.springframework.data.repository.CrudRepository;
@@ -52,7 +52,7 @@
5252
*/
5353
@ContextConfiguration
5454
@Transactional
55-
@TestExecutionListeners(value = AssumeFeatureRule.class, mergeMode = MERGE_WITH_DEFAULTS)
55+
@TestExecutionListeners(value = AssumeFeatureTestExecutionListener.class, mergeMode = MERGE_WITH_DEFAULTS)
5656
@ExtendWith(SpringExtension.class)
5757
public class JdbcRepositoryWithMapsIntegrationTests {
5858

‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/AssumeFeatureRule.java renamed to ‎spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/AssumeFeatureTestExecutionListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @author Jens Schauder
3030
* @author Mark Paluch
3131
*/
32-
public class AssumeFeatureRule implements TestExecutionListener {
32+
public class AssumeFeatureTestExecutionListener implements TestExecutionListener {
3333

3434
@Override
3535
public void beforeTestMethod(TestContext testContext) {

0 commit comments

Comments
 (0)