From 21820e689dbba3b2982d3af05f3b573cbbf4ba5d Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 23 Mar 2021 13:00:12 -0700 Subject: [PATCH] Remove unnecessary use of Spring's @DirtiesContext annotation. Fix compiler wwarnings; make immutable instance fields final. Rearrange Spring test annotation declarations. --- .../caching/AutoConfiguredCachingIntegrationTests.java | 2 -- ...nvironmentApplyToPeerCacheApplicationIntegrationTests.java | 1 - ...rtiesFromEnvironmentAutoConfigurationIntegrationTests.java | 1 - ...rePropertiesFromEnvironmentAutoConfigurationUnitTests.java | 2 +- .../configuration/GemFirePropertiesIntegrationTests.java | 2 +- ...VsSpringDataGeodePropertiesPrecedenceIntegrationTests.java | 2 -- .../SpringSessionPropertiesIntegrationTests.java | 4 +++- 7 files changed, 5 insertions(+), 9 deletions(-) diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java index f65e5c01..3b51fdde 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java @@ -33,7 +33,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.gemfire.config.annotation.EnableCachingDefinedRegions; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.util.RegionUtils; -import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; import org.assertj.core.api.Assertions; @@ -58,7 +57,6 @@ import example.app.books.service.support.CachingBookService; * @see org.springframework.test.context.junit4.SpringRunner * @since 1.0.0 */ -@DirtiesContext @RunWith(SpringRunner.class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentApplyToPeerCacheApplicationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentApplyToPeerCacheApplicationIntegrationTests.java index f5b29ea0..f0482bbb 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentApplyToPeerCacheApplicationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentApplyToPeerCacheApplicationIntegrationTests.java @@ -56,7 +56,6 @@ import org.springframework.test.context.junit4.SpringRunner; * @since 1.3.0 */ @ActiveProfiles("peer-application-gemfire-properties") -@DirtiesContext @RunWith(SpringRunner.class) @SpringBootTest(properties = { "spring.application.name=GemFirePropertiesFromEnvironmentApplyToPeerCacheApplicationIntegrationTests", diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentAutoConfigurationIntegrationTests.java index 6c384e3e..15bb1a45 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentAutoConfigurationIntegrationTests.java @@ -51,7 +51,6 @@ import org.springframework.test.context.junit4.SpringRunner; * @since 1.3.0 */ @ActiveProfiles("application-gemfire-properties") -@DirtiesContext @RunWith(SpringRunner.class) @SpringBootTest(properties = { "gemfire.distributed-system-id=123", diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentAutoConfigurationUnitTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentAutoConfigurationUnitTests.java index 1e3cc03d..b709eede 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentAutoConfigurationUnitTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesFromEnvironmentAutoConfigurationUnitTests.java @@ -66,7 +66,7 @@ import org.slf4j.Logger; @RunWith(MockitoJUnitRunner.class) public class GemFirePropertiesFromEnvironmentAutoConfigurationUnitTests { - private TestEnvironmentSourcedGemFirePropertiesAutoConfiguration configuration = + private final TestEnvironmentSourcedGemFirePropertiesAutoConfiguration configuration = spy(new TestEnvironmentSourcedGemFirePropertiesAutoConfiguration()); @Test diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesIntegrationTests.java index b53af065..44babcf3 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GemFirePropertiesIntegrationTests.java @@ -65,8 +65,8 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.test.context.junit4.SpringRunner * @since 1.0.0 */ -@RunWith(SpringRunner.class) @ActiveProfiles("gemfire-config-test") +@RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) @SuppressWarnings("unused") public class GemFirePropertiesIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GeodePropertiesVsSpringDataGeodePropertiesPrecedenceIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GeodePropertiesVsSpringDataGeodePropertiesPrecedenceIntegrationTests.java index c9ac6c3f..39b68eec 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GeodePropertiesVsSpringDataGeodePropertiesPrecedenceIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GeodePropertiesVsSpringDataGeodePropertiesPrecedenceIntegrationTests.java @@ -30,7 +30,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Profile; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; -import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; @@ -54,7 +53,6 @@ import org.springframework.test.context.junit4.SpringRunner; * @since 1.3.0 */ @ActiveProfiles("spring-gemfire-property-precedence") -@DirtiesContext @RunWith(SpringRunner.class) @SpringBootTest(properties = { "spring.data.gemfire.cache.client.durable-client-id=987", diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionPropertiesIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionPropertiesIntegrationTests.java index 97cadd22..f0000c52 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionPropertiesIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionPropertiesIntegrationTests.java @@ -56,9 +56,9 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.test.context.junit4.SpringRunner * @since 1.0.0 */ +@ActiveProfiles("session-config-test") @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK) -@ActiveProfiles("session-config-test") @SuppressWarnings("unused") public class SpringSessionPropertiesIntegrationTests extends IntegrationTestsSupport { @@ -67,6 +67,7 @@ public class SpringSessionPropertiesIntegrationTests extends IntegrationTestsSup @Autowired @Qualifier("MockSessionSerializer") + @SuppressWarnings("rawtypes") private SessionSerializer mockSessionSerializer; @Autowired @@ -143,6 +144,7 @@ public class SpringSessionPropertiesIntegrationTests extends IntegrationTestsSup } @Bean("MockSessionSerializer") + @SuppressWarnings("rawtypes") SessionSerializer mockSessionSerializer() { return mock(SessionSerializer.class); }