Remove unnecessary use of Spring's @DirtiesContext annotation.
Fix compiler wwarnings; make immutable instance fields final. Rearrange Spring test annotation declarations.
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user