From 08e91370b6a375b402b719c79a87bb636f295c87 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 13 Sep 2021 17:14:15 -0700 Subject: [PATCH] Replace all uses of Spring's @ContextConfiguration annotation in conjunction with STDG's GemFireMockObjectsApplicationContextInitializer with STDG's @GemFireUnitTests annotation. Optimize test class imports. Resolves gh-296. --- .../gemfire/IndexConflictsIntegrationTests.java | 8 ++++---- ...egionDataPolicyShortcutsIntegrationTests.java | 7 +++---- ...onShortcutToDataPolicyConverterUnitTests.java | 4 ++-- .../data/gemfire/SubRegionIntegrationTests.java | 7 +++---- .../client/ClientCachePoolIntegrationTests.java | 1 + ...eSecurityManagerSecurityIntegrationTests.java | 6 +++--- ...eExpirationConfigurationIntegrationTests.java | 2 +- ...xistWithCacheApplicationIntegrationTests.java | 6 +++--- ...BeanFactoryPostProcessorIntegrationTests.java | 7 +++---- ...AsyncEventQueueNamespaceIntegrationTests.java | 7 +++---- .../xml/CacheNamespaceIntegrationTests.java | 7 +++---- .../CacheServerNamespaceIntegrationTests.java | 7 +++---- .../xml/IndexNamespaceIntegrationTests.java | 5 ++--- .../LocalRegionNamespaceIntegrationTests.java | 7 +++---- ...ionPolicyActionNamespaceIntegrationTests.java | 7 +++---- .../config/xml/LuceneNamespaceUnitTests.java | 6 +++--- .../MembershipAttributesIntegrationTests.java | 7 +++---- ...itionUsingBeansNamespaceIntegrationTests.java | 7 +++---- ...ctionAttributesNamespaceIntegrationTests.java | 7 +++---- ...ationAttributesNamespaceIntegrationTests.java | 7 +++---- ...ptionAttributesNamespaceIntegrationTests.java | 7 +++---- ...sistenceEvictionSettingsIntegrationTests.java | 7 +++---- ...eplicatedRegionNamespaceIntegrationTests.java | 7 +++---- ...ateClientRegionNamespaceIntegrationTests.java | 8 ++++---- ...PartitionRegionNamespaceIntegrationTests.java | 7 +++---- ...TemplateRegionsNamespaceIntegrationTests.java | 7 +++---- ...TransactionEventHandlersIntegrationTests.java | 7 +++---- .../EvictionAttributesFactoryBeanTest.java | 8 ++++---- ...edExpirationConfigurationIntegrationTest.java | 7 +++---- .../function/BatchingResultSenderTest.java | 3 ++- .../FunctionArgumentResolverUnitTests.java | 4 ++-- ...ontextInjectingArgumentResolverUnitTests.java | 4 ++-- .../function/GemfireFunctionUtilsUnitTests.java | 4 ++-- .../config/FunctionsWithClientCacheTests.java | 16 +++++++++++++--- ...figuredFunctionExecutionIntegrationTests.java | 5 ++--- .../sample/SingleServerAdminFunctions.java | 4 ++-- ...ontainerXmlConfigurationIntegrationTests.java | 7 +++---- .../mapping/GemfireMappingContextUnitTests.java | 4 ++-- .../data/gemfire/repository/sample/Customer.java | 4 ++-- .../lucene/LuceneIndexFactoryBeanUnitTests.java | 11 ++++++----- .../search/lucene/LuceneOperationsUnitTests.java | 4 ++-- .../search/lucene/LuceneTemplateUnitTests.java | 14 +++++++------- .../ProjectingLuceneAccessorUnitTests.java | 10 +++++----- .../ProjectingLuceneOperationsUnitTests.java | 4 ++-- .../ProjectingLuceneTemplateUnitTests.java | 14 +++++++------- .../lucene/support/LucenePageUnitTests.java | 14 +++++++------- ...nstanceMethodInterceptorFactoryUnitTests.java | 7 ++++--- .../PdxInstanceMethodInterceptorUnitTests.java | 15 ++++++++------- .../AbstractFactoryBeanSupportUnitTests.java | 3 ++- ...ableSupportFunctionBasedIntegrationTests.java | 6 +++--- ...ctExceptionTransactionalIntegrationTests.java | 14 +++++++------- ...GemfireCacheTransactionsIntegrationTests.java | 6 +++--- ...tewayReceiverManualStartIntegrationTests.java | 7 +++---- 53 files changed, 182 insertions(+), 189 deletions(-) diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTests.java index 93d2603b..d7a794cf 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTests.java @@ -21,16 +21,16 @@ import static org.springframework.data.gemfire.util.CollectionUtils.nullSafeColl import java.util.Properties; import java.util.concurrent.atomic.AtomicBoolean; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.query.Index; import org.apache.geode.cache.query.IndexExistsException; import org.apache.geode.cache.query.IndexNameConflictException; import org.apache.geode.cache.query.QueryService; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTests.java index d2dda7ba..70cc15be 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTests.java @@ -29,9 +29,8 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionShortcut; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.data.gemfire.util.RegionUtils; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; /** @@ -43,13 +42,13 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.apache.geode.cache.Region * @see org.apache.geode.cache.RegionShortcut * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner * @since 1.4.0 */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class RegionDataPolicyShortcutsIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverterUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverterUnitTests.java index 23fa0087..85ff120b 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverterUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/RegionShortcutToDataPolicyConverterUnitTests.java @@ -18,11 +18,11 @@ package org.springframework.data.gemfire; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.Test; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.RegionShortcut; -import org.junit.Test; - /** * Unit tests for {@link RegionShortcutToDataPolicyConverter}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTests.java index f049f9b2..d3cdd742 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTests.java @@ -34,8 +34,7 @@ import org.apache.geode.cache.SubscriptionAttributes; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; /** @@ -46,13 +45,13 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.apache.geode.cache.Cache * @see org.apache.geode.cache.Region * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner * @since 1.4.0 */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings({ "rawtypes", "unused" }) public class SubRegionIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolIntegrationTests.java index a0c181c3..7cd139a1 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolIntegrationTests.java @@ -28,6 +28,7 @@ import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientCache; import org.springframework.data.gemfire.fork.ServerProcess; import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java index ada8cd38..d0c421cd 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java @@ -25,12 +25,12 @@ import java.util.HashSet; import java.util.Properties; import java.util.Set; -import org.apache.geode.security.AuthenticationFailedException; -import org.apache.geode.security.ResourcePermission; - import org.junit.BeforeClass; import org.junit.runner.RunWith; +import org.apache.geode.security.AuthenticationFailedException; +import org.apache.geode.security.ResourcePermission; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.test.context.ActiveProfiles; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationIntegrationTests.java index 8f971e88..912db7e9 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableExpirationConfigurationIntegrationTests.java @@ -32,9 +32,9 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.expiration.AnnotationBasedExpiration; +import org.springframework.data.gemfire.test.model.Person; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects; -import org.springframework.data.gemfire.test.model.Person; import org.springframework.stereotype.Service; /** diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationCannotCoexistWithCacheApplicationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationCannotCoexistWithCacheApplicationIntegrationTests.java index 5ab59a89..688b1fac 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationCannotCoexistWithCacheApplicationIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/LocatorApplicationCannotCoexistWithCacheApplicationIntegrationTests.java @@ -21,13 +21,13 @@ import static org.mockito.Mockito.mock; import java.util.Optional; +import org.junit.After; +import org.junit.Test; + import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.distributed.Locator; -import org.junit.After; -import org.junit.Test; - import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessorIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessorIntegrationTests.java index 46400258..8978061d 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessorIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/support/LuceneIndexRegionBeanFactoryPostProcessorIntegrationTests.java @@ -35,9 +35,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.data.gemfire.PeerRegionFactoryBean; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.lang.Nullable; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.Assert; @@ -49,13 +48,13 @@ import org.springframework.util.Assert; * @see org.apache.geode.cache.Region * @see org.springframework.data.gemfire.config.support.LuceneIndexRegionBeanFactoryPostProcessor * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner * @since 2.1.0 */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class LuceneIndexRegionBeanFactoryPostProcessorIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueNamespaceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueNamespaceIntegrationTests.java index 37fc799b..3a5848ea 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueNamespaceIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/AsyncEventQueueNamespaceIntegrationTests.java @@ -36,8 +36,7 @@ import org.apache.geode.cache.wan.GatewayQueueEvent; import org.apache.geode.cache.wan.GatewaySender; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; /** @@ -49,14 +48,14 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.apache.geode.cache.asyncqueue.AsyncEventQueue * @see org.springframework.data.gemfire.config.AsyncEventQueueParser * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.data.gemfire.wan.AsyncEventQueueFactoryBean * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner * @since 1.0.0 */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("all") public class AsyncEventQueueNamespaceIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheNamespaceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheNamespaceIntegrationTests.java index 3b59f09e..87672ea8 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheNamespaceIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheNamespaceIntegrationTests.java @@ -36,8 +36,7 @@ import org.springframework.core.io.Resource; import org.springframework.data.gemfire.CacheFactoryBean; import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; /** @@ -50,12 +49,12 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.data.gemfire.CacheFactoryBean * @see org.springframework.data.gemfire.config.xml.CacheParser * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest public class CacheNamespaceIntegrationTests extends IntegrationTestsSupport { @Autowired diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceIntegrationTests.java index 6235aa16..3a903b67 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceIntegrationTests.java @@ -26,8 +26,7 @@ import org.apache.geode.cache.server.ClientSubscriptionConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.StringUtils; @@ -41,12 +40,12 @@ import org.springframework.util.StringUtils; * @see org.apache.geode.cache.server.CacheServer * @see org.springframework.context.ApplicationContext * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class CacheServerNamespaceIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceIntegrationTests.java index 7c4f9dac..32204355 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceIntegrationTests.java @@ -29,12 +29,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.IndexFactoryBean; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings({ "deprecation", "unused" }) public class IndexNamespaceIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceIntegrationTests.java index 64993f34..4529f8c1 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceIntegrationTests.java @@ -37,8 +37,7 @@ import org.springframework.data.gemfire.ResolvableRegionFactoryBean; import org.springframework.data.gemfire.SimpleCacheListener; import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.ObjectUtils; @@ -53,12 +52,12 @@ import org.springframework.util.ObjectUtils; * @see org.springframework.data.gemfire.LocalRegionFactoryBean * @see org.springframework.data.gemfire.config.xml.LocalRegionParser * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class LocalRegionNamespaceIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceIntegrationTests.java index 55b3877c..a7b98da7 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceIntegrationTests.java @@ -28,8 +28,7 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.Scope; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; /** @@ -40,14 +39,14 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.junit.Test * @see org.apache.geode.cache.Region * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner * @since 1.5.0.M1 * @link https://jira.spring.io/browse/SGF-295 */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class LocalRegionWithEvictionPolicyActionNamespaceIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java index 68633a19..a58627eb 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java @@ -46,9 +46,8 @@ import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.data.gemfire.search.lucene.LuceneServiceFactoryBean; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.tests.mock.GemFireMockObjectsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.lang.Nullable; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; import lombok.SneakyThrows; @@ -65,12 +64,13 @@ import lombok.SneakyThrows; * @see org.springframework.data.gemfire.search.lucene.LuceneIndexFactoryBean * @see org.springframework.data.gemfire.search.lucene.LuceneServiceFactoryBean * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner * @since 2.1.0 */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class LuceneNamespaceUnitTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesIntegrationTests.java index aac60bb6..f812123f 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesIntegrationTests.java @@ -29,8 +29,7 @@ import org.apache.geode.cache.ResumptionAction; import org.apache.geode.distributed.Role; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; /** @@ -42,12 +41,12 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.apache.geode.cache.MembershipAttributes * @see org.apache.geode.cache.Region * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings({ "deprecation", "unused" }) public class MembershipAttributesIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceIntegrationTests.java index 34da50c8..2385d7f9 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceIntegrationTests.java @@ -32,8 +32,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.PeerRegionFactoryBean; import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; /** @@ -49,13 +48,13 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.data.gemfire.PartitionAttributesFactoryBean * @see org.springframework.data.gemfire.RegionAttributesFactoryBean * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner * @since 1.6.0 */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class RegionDefinitionUsingBeansNamespaceIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceIntegrationTests.java index f628acc6..6611f611 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceIntegrationTests.java @@ -29,8 +29,7 @@ import org.apache.geode.cache.EvictionAttributes; import org.apache.geode.cache.Region; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; /** @@ -42,13 +41,13 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.apache.geode.cache.EvictionAttributes * @see org.apache.geode.cache.Region * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner * @since 1.3.4 */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class RegionEvictionAttributesNamespaceIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceIntegrationTests.java index dffd57c7..5e796e41 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceIntegrationTests.java @@ -30,8 +30,7 @@ import org.apache.geode.cache.ExpirationAttributes; import org.apache.geode.cache.Region; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.Assert; @@ -44,13 +43,13 @@ import org.springframework.util.Assert; * @see org.apache.geode.cache.ExpirationAttributes * @see org.apache.geode.cache.Region * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner * @since 1.5.0 */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class RegionExpirationAttributesNamespaceIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceIntegrationTests.java index d71a45c4..e9c3cbb3 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceIntegrationTests.java @@ -28,8 +28,7 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.SubscriptionAttributes; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; /** @@ -43,13 +42,13 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.apache.geode.cache.SubscriptionAttributes * @see org.springframework.data.gemfire.SubscriptionAttributesFactoryBean * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner * @since 1.6.0 */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class RegionSubscriptionAttributesNamespaceIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsIntegrationTests.java index ed239537..c54fc856 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsIntegrationTests.java @@ -28,8 +28,7 @@ import org.apache.geode.cache.EvictionAction; import org.apache.geode.cache.Region; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; /** @@ -40,13 +39,13 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.junit.Test * @see org.apache.geode.cache.Region * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner * @since 1.4.0.RC1 */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class RegionsWithDiskStoreAndPersistenceEvictionSettingsIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceIntegrationTests.java index 50f08747..4a960b17 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceIntegrationTests.java @@ -39,8 +39,7 @@ import org.springframework.data.gemfire.ResolvableRegionFactoryBean; import org.springframework.data.gemfire.SimpleCacheListener; import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.ObjectUtils; @@ -55,12 +54,12 @@ import org.springframework.util.ObjectUtils; * @see org.springframework.data.gemfire.ReplicatedRegionFactoryBean * @see org.springframework.data.gemfire.config.xml.ReplicatedRegionParser * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings({ "rawtypes", "unused" }) public class ReplicatedRegionNamespaceIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceIntegrationTests.java index e50f23d9..24fe6aa2 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceIntegrationTests.java @@ -41,8 +41,7 @@ import org.apache.geode.cache.util.CacheWriterAdapter; import org.apache.geode.cache.util.ObjectSizer; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.StringUtils; @@ -53,13 +52,14 @@ import org.springframework.util.StringUtils; * @see org.junit.Test * @see org.apache.geode.cache.Region * @see org.apache.geode.cache.client.ClientCache - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner * @since 1.5.0 */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class TemplateClientRegionNamespaceIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceIntegrationTests.java index 8ed89ff2..e048c623 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceIntegrationTests.java @@ -35,9 +35,8 @@ import org.apache.geode.cache.Region; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.data.gemfire.tests.util.FileSystemUtils; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; /** @@ -49,14 +48,14 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.apache.geode.cache.Region * @see org.springframework.data.gemfire.PartitionedRegionFactoryBean * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner * @link https://jira.spring.io/browse/SGF-384 * @since 1.6.0 */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class TemplatePersistentPartitionRegionNamespaceIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceIntegrationTests.java index b2759293..ac290a28 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceIntegrationTests.java @@ -58,8 +58,7 @@ import org.springframework.beans.factory.BeanIsAbstractException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.StringUtils; @@ -71,13 +70,13 @@ import org.springframework.util.StringUtils; * @see org.junit.runner.RunWith * @see org.apache.geode.cache.Region * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner * @since 1.5.0 */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings({ "rawtypes", "unused"}) public class TemplateRegionsNamespaceIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TransactionEventHandlersIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TransactionEventHandlersIntegrationTests.java index 8540e44a..30f1c8e4 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TransactionEventHandlersIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/TransactionEventHandlersIntegrationTests.java @@ -28,8 +28,7 @@ import org.apache.geode.cache.TransactionWriter; import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; /** @@ -44,12 +43,12 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.apache.geode.cache.TransactionListener * @see org.apache.geode.cache.TransactionWriter * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class TransactionEventHandlersIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java index c7b1c327..d3f23d6d 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/eviction/EvictionAttributesFactoryBeanTest.java @@ -19,15 +19,15 @@ package org.springframework.data.gemfire.eviction; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + import org.apache.geode.cache.EvictionAction; import org.apache.geode.cache.EvictionAlgorithm; import org.apache.geode.cache.EvictionAttributes; import org.apache.geode.cache.util.ObjectSizer; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - /** * Unit Tests for {@link EvictionAttributesFactoryBean}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java index 9daf7a51..c20ac049 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/expiration/AnnotationBasedExpirationConfigurationIntegrationTest.java @@ -34,9 +34,8 @@ import org.apache.geode.cache.Region; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.expression.EvaluationException; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; /** @@ -52,13 +51,13 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.data.gemfire.expiration.AnnotationBasedExpiration * @see org.springframework.data.gemfire.expiration.ExpirationAttributesFactoryBean * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner * @since 1.7.0 */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class AnnotationBasedExpirationConfigurationIntegrationTest extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/BatchingResultSenderTest.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/BatchingResultSenderTest.java index 38fd57df..f92c3f64 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/BatchingResultSenderTest.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/BatchingResultSenderTest.java @@ -22,10 +22,11 @@ import java.util.List; import java.util.Optional; import java.util.stream.IntStream; +import org.junit.Test; + import org.apache.geode.cache.execute.ResultSender; import org.assertj.core.api.Assertions; -import org.junit.Test; /** * Unit tests for {@link BatchingResultSender}. diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverUnitTests.java index d804ba45..4fe86c6b 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverUnitTests.java @@ -21,13 +21,13 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.junit.Test; + import org.apache.geode.cache.Region; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.RegionFunctionContext; import org.apache.geode.cache.execute.ResultSender; -import org.junit.Test; - import org.springframework.data.gemfire.function.annotation.Filter; import org.springframework.data.gemfire.function.annotation.RegionData; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolverUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolverUnitTests.java index b38d6451..cadfaf73 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolverUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolverUnitTests.java @@ -20,11 +20,11 @@ import static org.assertj.core.api.Assertions.assertThat; import java.lang.reflect.Method; +import org.junit.Test; + import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.RegionFunctionContext; -import org.junit.Test; - import org.springframework.data.gemfire.function.annotation.GemfireFunction; import org.springframework.data.gemfire.util.ArrayUtils; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/GemfireFunctionUtilsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/GemfireFunctionUtilsUnitTests.java index 10b4fd4b..5302744c 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/GemfireFunctionUtilsUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/GemfireFunctionUtilsUnitTests.java @@ -21,10 +21,10 @@ import static org.assertj.core.api.Assertions.assertThat; import java.lang.reflect.Method; import java.util.Arrays; -import org.apache.geode.security.ResourcePermission; - import org.junit.Test; +import org.apache.geode.security.ResourcePermission; + import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.data.gemfire.function.annotation.GemfireFunction; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests.java index 5202dc46..a1084aae 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/FunctionsWithClientCacheTests.java @@ -15,17 +15,27 @@ package org.springframework.data.gemfire.function.config; import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.execute.Function; + import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; /** + * Integration Tests testing Apache Geode {@link Function} execution configuration using SDG's {@link Function} + * annotation configuration support. + * * @author David Turanski * @author John Blum + * @see org.junit.Test + * @see org.apache.geode.cache.execute.Function + * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest + * @see org.springframework.test.context.ContextConfiguration + * @see org.springframework.test.context.junit4.SpringRunner */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest public class FunctionsWithClientCacheTests extends IntegrationTestsSupport { @Test diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests.java index a72b3a5b..5ce18f5c 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests.java @@ -26,8 +26,7 @@ import org.springframework.data.gemfire.function.config.two.TestOnRegionFunction import org.springframework.data.gemfire.function.execution.GemfireOnRegionFunctionTemplate; import org.springframework.data.gemfire.function.execution.OnRegionFunctionProxyFactoryBean; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; /** @@ -35,7 +34,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @author John Blum */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class XmlConfiguredFunctionExecutionIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/sample/SingleServerAdminFunctions.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/sample/SingleServerAdminFunctions.java index c1601463..6159b17f 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/sample/SingleServerAdminFunctions.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/function/sample/SingleServerAdminFunctions.java @@ -16,11 +16,11 @@ */ package org.springframework.data.gemfire.function.sample; +import java.util.List; + import org.springframework.data.gemfire.function.annotation.FunctionId; import org.springframework.data.gemfire.function.annotation.OnServer; -import java.util.List; - /** * @author Patrick Johnson */ diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/adapter/ContainerXmlConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/adapter/ContainerXmlConfigurationIntegrationTests.java index a70efb92..5c094112 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/adapter/ContainerXmlConfigurationIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/listener/adapter/ContainerXmlConfigurationIntegrationTests.java @@ -28,8 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; /** @@ -44,12 +43,12 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.data.gemfire.fork.CqCacheServerProcess * @see org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class ContainerXmlConfigurationIntegrationTests extends IntegrationTestsSupport { diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextUnitTests.java index 85eec311..b8abbedc 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/mapping/GemfireMappingContextUnitTests.java @@ -21,12 +21,12 @@ import static org.assertj.core.api.Assertions.assertThat; import java.math.BigDecimal; import java.math.BigInteger; -import lombok.Data; - import org.junit.Test; import org.springframework.data.gemfire.mapping.annotation.Region; +import lombok.Data; + /** * Unit tests for {@link GemfireMappingContext} class. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java index ae0366d5..1f01d2ff 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/sample/Customer.java @@ -18,13 +18,13 @@ package org.springframework.data.gemfire.repository.sample; import java.util.Objects; -import lombok.Data; - import org.springframework.data.annotation.Id; import org.springframework.data.gemfire.mapping.annotation.Region; import org.springframework.data.gemfire.mapping.annotation.ReplicateRegion; import org.springframework.util.ObjectUtils; +import lombok.Data; + /** * The Customer class is a class abstraction modeling a Customer. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java index 9a9618fd..12521509 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java @@ -34,6 +34,12 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; import org.apache.geode.cache.lucene.LuceneIndex; @@ -42,11 +48,6 @@ import org.apache.geode.cache.lucene.LuceneSerializer; import org.apache.geode.cache.lucene.LuceneService; import org.apache.lucene.analysis.Analyzer; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java index 3c23195f..be5011a6 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java @@ -24,13 +24,13 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.apache.geode.cache.lucene.LuceneQueryProvider; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.lucene.LuceneQueryProvider; + /** * Unit tests for the {@link LuceneOperations} interface. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java index 00a218d3..e3669b5e 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java @@ -33,6 +33,13 @@ import static org.springframework.data.gemfire.search.lucene.LuceneAccessor.Luce import java.util.Collection; import java.util.List; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.junit.MockitoJUnitRunner; + import org.apache.geode.cache.lucene.LuceneQuery; import org.apache.geode.cache.lucene.LuceneQueryException; import org.apache.geode.cache.lucene.LuceneQueryFactory; @@ -41,13 +48,6 @@ import org.apache.geode.cache.lucene.LuceneResultStruct; import org.apache.geode.cache.lucene.LuceneService; import org.apache.geode.cache.lucene.PageableLuceneQueryResults; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.Spy; -import org.mockito.junit.MockitoJUnitRunner; - /** * Unit tests for {@link LuceneTemplate}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java index f8aa3554..02062c69 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java @@ -24,17 +24,17 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; -import org.apache.geode.cache.GemFireCache; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.lucene.LuceneIndex; -import org.apache.geode.cache.lucene.LuceneService; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.lucene.LuceneIndex; +import org.apache.geode.cache.lucene.LuceneService; + import org.springframework.beans.factory.BeanFactory; import org.springframework.data.gemfire.search.lucene.support.ProjectingLuceneAccessorSupport; import org.springframework.data.projection.ProjectionFactory; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java index 05c412c7..618868b7 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java @@ -24,13 +24,13 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.apache.geode.cache.lucene.LuceneQueryProvider; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.lucene.LuceneQueryProvider; + /** * Unit tests for {@link ProjectingLuceneOperations}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java index 87509ef9..6db74bfa 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java @@ -32,23 +32,23 @@ import static org.mockito.Mockito.when; import java.util.List; -import lombok.Data; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; - -import org.apache.geode.cache.lucene.LuceneQueryProvider; -import org.apache.geode.cache.lucene.LuceneResultStruct; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.lucene.LuceneQueryProvider; +import org.apache.geode.cache.lucene.LuceneResultStruct; + import org.springframework.data.annotation.Id; import org.springframework.data.gemfire.mapping.annotation.Region; import org.springframework.data.projection.ProjectionFactory; +import lombok.Data; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + /** * Unit tests for {@link ProjectingLuceneTemplate}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java index 679e0270..5a0bf224 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java @@ -36,21 +36,21 @@ import java.util.List; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; -import lombok.Data; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; - -import org.apache.geode.cache.lucene.LuceneResultStruct; -import org.apache.geode.cache.lucene.PageableLuceneQueryResults; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.cache.lucene.LuceneResultStruct; +import org.apache.geode.cache.lucene.PageableLuceneQueryResults; + import org.springframework.data.domain.Page; import org.springframework.data.gemfire.search.lucene.ProjectingLuceneAccessor; +import lombok.Data; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + /** * Unit tests for {@link LucenePage}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactoryUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactoryUnitTests.java index f351bc74..fdf1390f 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactoryUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactoryUnitTests.java @@ -19,14 +19,15 @@ package org.springframework.data.gemfire.search.lucene.support; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import org.apache.geode.pdx.PdxInstance; - -import org.aopalliance.intercept.MethodInterceptor; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.apache.geode.pdx.PdxInstance; + +import org.aopalliance.intercept.MethodInterceptor; + /** * Unit tests for {@link PdxInstanceMethodInterceptorFactory}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java index 4ec74eb1..45bd16dd 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java @@ -30,18 +30,19 @@ import static org.springframework.data.gemfire.search.lucene.support.PdxInstance import java.lang.reflect.Method; -import lombok.Data; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.apache.geode.pdx.PdxInstance; import org.apache.geode.pdx.WritablePdxInstance; import org.aopalliance.intercept.MethodInvocation; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; + +import lombok.Data; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; /** * Unit tests for {@link PdxInstanceMethodInterceptor}. diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupportUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupportUnitTests.java index 62ff332a..c71bfb0d 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupportUnitTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/AbstractFactoryBeanSupportUnitTests.java @@ -31,10 +31,11 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; -import org.slf4j.Logger; import org.springframework.beans.factory.BeanFactory; +import org.slf4j.Logger; + /** * Unit tests for {@link AbstractFactoryBeanSupport}. * diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportFunctionBasedIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportFunctionBasedIntegrationTests.java index 3247c801..08da8f6b 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportFunctionBasedIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/support/LazyWiringDeclarableSupportFunctionBasedIntegrationTests.java @@ -20,13 +20,13 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Properties; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionContext; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.gemfire.function.sample.HelloFunctionExecution; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/CommitConflictExceptionTransactionalIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/CommitConflictExceptionTransactionalIntegrationTests.java index 82906bfc..8a8649dc 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/CommitConflictExceptionTransactionalIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/CommitConflictExceptionTransactionalIntegrationTests.java @@ -27,18 +27,13 @@ import javax.transaction.Transactional; import edu.umd.cs.mtc.MultithreadedTestCase; import edu.umd.cs.mtc.TestFramework; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; +import org.junit.Test; +import org.junit.runner.RunWith; import org.apache.geode.cache.CacheTransactionManager; import org.apache.geode.cache.CommitConflictException; import org.apache.geode.cache.client.ClientRegionShortcut; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.data.annotation.Id; @@ -54,6 +49,11 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.Assert; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + /** * Integration tests asserting the proper configuration and behavior of Apache Geode/Pivotal GemFire * cache Transactions inside a Spring application context when using SDG to configure diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactionsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactionsIntegrationTests.java index 7bf53b20..fcb23926 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactionsIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactionsIntegrationTests.java @@ -20,12 +20,12 @@ import static org.assertj.core.api.Java6Assertions.assertThat; import javax.annotation.Resource; -import org.apache.geode.cache.GemFireCache; -import org.apache.geode.cache.Region; - import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.LocalRegionFactoryBean; diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverManualStartIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverManualStartIntegrationTests.java index 94decc10..41c91562 100644 --- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverManualStartIntegrationTests.java +++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverManualStartIntegrationTests.java @@ -27,8 +27,7 @@ import org.junit.runner.RunWith; import org.apache.geode.cache.wan.GatewayReceiver; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; -import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest; import org.springframework.test.context.junit4.SpringRunner; /** @@ -39,14 +38,14 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.junit.Test * @see org.apache.geode.cache.wan.GatewayReceiver * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport - * @see org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer + * @see org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest * @see org.springframework.data.gemfire.wan.GatewayReceiverFactoryBean * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner * @since 1.5.0 */ @RunWith(SpringRunner.class) -@ContextConfiguration(initializers = GemFireMockObjectsApplicationContextInitializer.class) +@GemFireUnitTest @SuppressWarnings("unused") public class GatewayReceiverManualStartIntegrationTests extends IntegrationTestsSupport {