You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/07/11 16:13:36 UTC
[geode] 29/46: GEODE-5363: Cleanup unit tests.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c4a5128178bb06e5cdf15a0f0078091590c5d728
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 16:46:59 2018 -0700
GEODE-5363: Cleanup unit tests.
---
.../util/ClassLoaderObjectInputStreamTest.java | 2 --
.../cli/commands/StartLocatorCommandTest.java | 2 --
.../cli/commands/StartServerCommandTest.java | 2 --
.../geode/test/junit/rules/GfshRuleTest.java | 1 -
.../geode/annotations/ExperimentalJUnitTest.java | 2 --
.../geode/connectors/jdbc/JdbcAsyncWriterTest.java | 2 --
.../jdbc/JdbcConnectorExceptionTest.java | 2 --
.../geode/connectors/jdbc/JdbcLoaderTest.java | 2 --
.../geode/connectors/jdbc/JdbcWriterTest.java | 2 --
.../jdbc/internal/AbstractJdbcCallbackTest.java | 2 --
.../connectors/jdbc/internal/ColumnDataTest.java | 2 --
.../jdbc/internal/DataSourceManagerUnitTest.java | 2 --
.../jdbc/internal/JdbcConnectorServiceTest.java | 2 --
.../jdbc/internal/RegionMappingTest.java | 2 --
.../connectors/jdbc/internal/SqlHandlerTest.java | 2 --
.../jdbc/internal/SqlStatementFactoryTest.java | 2 --
.../jdbc/internal/SqlToPdxInstanceCreatorTest.java | 2 --
.../jdbc/internal/TableMetaDataManagerTest.java | 2 --
.../internal/cli/AlterConnectionCommandTest.java | 2 --
.../internal/cli/AlterConnectionFunctionTest.java | 2 --
.../jdbc/internal/cli/AlterMappingCommandTest.java | 2 --
.../internal/cli/AlterMappingFunctionTest.java | 2 --
.../internal/cli/CreateConnectionFunctionTest.java | 2 --
.../internal/cli/CreateMappingFunctionTest.java | 2 --
.../cli/DescribeConnectionCommandTest.java | 2 --
.../cli/DescribeConnectionFunctionTest.java | 2 --
.../internal/cli/DescribeMappingCommandTest.java | 2 --
.../internal/cli/DescribeMappingFunctionTest.java | 2 --
.../cli/DestroyConnectionFunctionTest.java | 2 --
.../cli/DestroyMappingCommandFunctionTest.java | 2 --
.../cli/FunctionContextArgumentProviderTest.java | 2 --
.../internal/cli/JDBCCommandsAvailabilityTest.java | 2 --
.../internal/cli/ListConnectionCommandTest.java | 2 --
.../internal/cli/ListConnectionFunctionTest.java | 2 --
.../jdbc/internal/cli/ListMappingCommandTest.java | 2 --
.../jdbc/internal/cli/ListMappingFunctionTest.java | 2 --
.../configuration/ConnectorServiceTest.java | 2 --
.../jdbc/internal/xml/ElementTypeTest.java | 2 --
.../xml/JdbcConnectorServiceXmlParserTest.java | 2 --
.../internal/xml/JdbcServiceConfigurationTest.java | 2 --
.../geode/distributed/LocatorLauncherTest.java | 2 --
.../internal/deadlock/DeadlockDetectorTest.java | 2 --
.../fixed/FixedPartitioningTestBaseJUnitTest.java | 2 --
.../dunit/rules/tests/MemberStarterRuleTest.java | 2 --
.../internal/ProductUseLogJUnitTest.java | 1 -
.../java/org/apache/geode/DataSerializerTest.java | 1 -
.../java/org/apache/geode/InstantiatorTest.java | 2 --
.../org/apache/geode/SystemFailureJUnitTest.java | 1 -
.../apache/geode/admin/AlertLevelJUnitTest.java | 2 --
.../geode/admin/RegionSubRegionSnapshotTest.java | 2 --
.../geode/cache/AttributesFactoryJUnitTest.java | 2 --
.../geode/cache/DiskAccessExceptionTest.java | 2 --
.../geode/cache/ExpirationAttributesTest.java | 2 --
...cArrayShouldNotCauseSegFaultRegressionTest.java | 2 --
...hipAttributesAreSerializableRegressionTest.java | 1 -
.../org/apache/geode/cache/OperationJUnitTest.java | 2 --
.../geode/cache/RegionNameValidationJUnitTest.java | 2 --
.../org/apache/geode/cache/RegionShortcutTest.java | 2 --
.../apache/geode/cache/RoleExceptionJUnitTest.java | 2 --
.../cache/client/internal/AbstractOpTest.java | 1 -
.../client/internal/ConnectionConnectorTest.java | 2 --
.../internal/ConnectionFactoryJUnitTest.java | 2 --
.../client/internal/OpExecutorImplJUnitTest.java | 1 -
.../internal/QueueConnectionImplJUnitTest.java | 1 -
.../client/internal/ServerBlackListJUnitTest.java | 1 -
...pClientExecutorSubmitTaskWithExceptionTest.java | 1 -
.../cache/client/internal/TXFailoverOpTest.java | 2 --
.../locator/LocatorStatusResponseJUnitTest.java | 1 -
.../geode/cache/configuration/CacheConfigTest.java | 2 --
.../cache/configuration/DeclarableTypeTest.java | 2 --
.../cache/execute/FunctionAdapterJUnitTest.java | 2 --
.../geode/cache/execute/FunctionExceptionTest.java | 2 --
.../apache/geode/cache/query/IndexTypeTest.java | 1 -
.../functional/JavaSerializationJUnitTest.java | 2 --
.../CompiledAggregateFunctionJUnitTest.java | 2 --
.../cache/query/internal/CompiledInJUnitTest.java | 2 --
.../internal/CompiledIteratorDefJUnitTest.java | 2 --
.../query/internal/NWayMergeResultsJUnitTest.java | 2 --
.../internal/QueryExecutionContextJUnitTest.java | 2 --
.../QueryObjectSerializationJUnitTest.java | 2 --
.../RestrictedMethodInvocationAuthorizerTest.java | 1 -
.../cache/query/internal/ResultsBagJUnitTest.java | 2 --
.../ResultsBagLimitBehaviourJUnitTest.java | 2 --
.../ResultsCollectionWrapperLimitJUnitTest.java | 2 --
.../internal/SelectResultsComparatorJUnitTest.java | 2 --
.../internal/StructBagLimitBehaviourJUnitTest.java | 2 --
.../cache/query/internal/StructSetJUnitTest.java | 2 --
.../internal/aggregate/AggregatorJUnitTest.java | 2 --
.../internal/cq/CqAttributesImplJUnitTest.java | 2 --
.../internal/index/HashIndexSetJUnitTest.java | 2 --
.../internal/index/IndexElemArrayJUnitTest.java | 2 --
.../internal/index/MemoryIndexStoreJUnitTest.java | 2 --
...IndexStoreWithInplaceModificationJUnitTest.java | 2 --
.../cache/query/internal/parse/OQLParserTest.java | 2 --
.../query/internal/types/TypeUtilsJUnitTest.java | 2 --
.../internal/ConnectionCountProbeJUnitTest.java | 2 --
.../cache/server/internal/LoadMonitorTest.java | 2 --
.../StringPrefixPartitionResolverJUnitTest.java | 2 --
.../AbstractLauncherServiceStateTest.java | 2 --
.../geode/distributed/AbstractLauncherTest.java | 2 --
.../distributed/DistributedSystemJUnitTest.java | 1 -
.../distributed/LocatorLauncherBuilderTest.java | 2 --
.../apache/geode/distributed/LocatorStateTest.java | 2 --
.../distributed/ServerLauncherBuilderTest.java | 2 --
.../geode/distributed/ServerLauncherTest.java | 2 --
...erverLauncherWaitOnServerMultiThreadedTest.java | 2 --
.../AtomicLongWithTerminalStateJUnitTest.java | 2 --
.../internal/ClusterDistributionManagerTest.java | 2 --
.../internal/DistributionAdvisorTest.java | 2 --
.../internal/DistributionConfigJUnitTest.java | 1 -
.../internal/DistributionMessageTest.java | 1 -
...nternalConfigurationPersistenceServiceTest.java | 2 --
.../internal/LocatorLoadSnapshotJUnitTest.java | 1 -
.../distributed/internal/ReplyProcessor21Test.java | 1 -
.../internal/ServerLocatorJUnitTest.java | 1 -
.../internal/StartupMessageDataJUnitTest.java | 1 -
.../deadlock/DependencyGraphJUnitTest.java | 2 --
.../deadlock/UnsafeThreadLocalJUnitTest.java | 2 --
.../internal/membership/InternalRoleJUnitTest.java | 1 -
.../internal/membership/NetViewJUnitTest.java | 1 -
.../membership/gms/GMSMemberJUnitTest.java | 1 -
.../gms/auth/AbstractGMSAuthenticatorTestCase.java | 0
.../GMSAuthenticatorWithAuthenticatorTest.java | 1 -
.../GMSAuthenticatorWithSecurityManagerTest.java | 1 -
.../gms/membership/StatRecorderJUnitTest.java | 1 -
.../apache/geode/internal/AbstractConfigTest.java | 2 --
.../org/apache/geode/internal/AssertJUnitTest.java | 2 --
.../apache/geode/internal/ClassPathLoaderTest.java | 2 --
.../geode/internal/ConfigSourceJUnitTest.java | 2 --
.../internal/CopyOnWriteHashSetJUnitTest.java | 2 --
.../java/org/apache/geode/internal/DSCODETest.java | 1 -
.../geode/internal/DataSerializableJUnitTest.java | 1 -
.../internal/DataSerializerHolderJUnitTest.java | 2 --
.../geode/internal/GemFireVersionJUnitTest.java | 2 --
.../internal/HeapDataOutputStreamJUnitTest.java | 1 -
.../geode/internal/HeapDataOutputStreamTest.java | 1 -
.../internal/InternalDataSerializerJUnitTest.java | 1 -
...InternalDataSerializerQuickcheckStringTest.java | 1 -
...alDataSerializerSerializationWhitelistTest.java | 1 -
.../geode/internal/LineWrapUnitJUnitTest.java | 2 --
.../apache/geode/internal/NanoTimerJUnitTest.java | 2 --
.../geode/internal/ObjIdConcurrentMapTest.java | 2 --
.../apache/geode/internal/ObjIdMapJUnitTest.java | 2 --
.../internal/OneTaskOnlyDecoratorJUnitTest.java | 2 --
.../internal/PutAllOperationContextJUnitTest.java | 2 --
.../geode/internal/UniqueIdGeneratorJUnitTest.java | 2 --
.../apache/geode/internal/VersionJUnitTest.java | 2 --
.../remote/DistributionLocatorIdJUnitTest.java | 2 --
.../admin/remote/RemoteGfManagerAgentTest.java | 2 --
.../internal/cache/AbstractDiskRegionTest.java | 2 --
.../cache/AbstractOplogDiskRegionEntryTest.java | 2 --
.../internal/cache/AbstractRegionJUnitTest.java | 2 --
.../internal/cache/AbstractRegionMapTest.java | 2 --
.../cache/AbstractRegionMapTxApplyDestroyTest.java | 2 --
.../geode/internal/cache/AbstractRegionTest.java | 2 --
.../geode/internal/cache/BucketAdvisorTest.java | 2 --
.../cache/BucketPersistenceAdvisorTest.java | 2 --
.../cache/BucketRedundancyTrackerTest.java | 2 --
.../internal/cache/BucketRegionJUnitTest.java | 3 ---
.../internal/cache/CacheOperationMessageTest.java | 2 --
.../geode/internal/cache/CacheProfileTest.java | 2 --
.../cache/CacheServerLauncherJUnitTest.java | 2 --
.../geode/internal/cache/ColocationHelperTest.java | 2 --
.../geode/internal/cache/DestroyMessageTest.java | 2 --
.../geode/internal/cache/DiskIdJUnitTest.java | 2 --
.../geode/internal/cache/DiskStoreMonitorTest.java | 2 --
.../apache/geode/internal/cache/DiskUsageTest.java | 2 --
.../cache/DiskWriteAttributesJUnitTest.java | 2 --
.../internal/cache/DistPeerTXStateStubTest.java | 2 --
.../cache/DistributedCacheOperationTest.java | 2 --
.../cache/DistributedPutAllOperationTest.java | 2 --
...tributedRegionFunctionStreamingMessageTest.java | 2 --
.../internal/cache/DistributedRegionJUnitTest.java | 2 --
.../DistributedRegionSearchLoadJUnitTest.java | 2 --
.../internal/cache/DistributedRegionTest.java | 2 --
.../cache/DistributedRemoveAllOperationTest.java | 2 --
.../geode/internal/cache/EntryEventImplTest.java | 2 --
.../cache/EntryEventSerializationTest.java | 2 --
.../internal/cache/EnumListenerEventJUnitTest.java | 2 --
.../internal/cache/EvictionAttributesImplTest.java | 2 --
.../geode/internal/cache/ExpiryTaskTest.java | 2 --
.../FilterProfileNullCqBaseRegionJUnitTest.java | 2 --
.../geode/internal/cache/FlusherThreadTest.java | 2 --
.../geode/internal/cache/GemFireCacheImplTest.java | 2 --
.../geode/internal/cache/GridProfileTest.java | 2 --
.../internal/cache/InitialImageOperationTest.java | 2 --
.../cache/InternalCacheForClientAccessTest.java | 2 --
.../cache/JtaAfterCompletionMessageTest.java | 2 --
.../cache/JtaBeforeCompletionMessageTest.java | 2 --
.../geode/internal/cache/LocalDataSetTest.java | 2 --
.../cache/MemberFunctionStreamingMessageTest.java | 2 --
.../internal/cache/NonLocalRegionEntryTest.java | 2 --
.../cache/OffHeapValueWrapperJUnitTest.java | 2 --
.../geode/internal/cache/OldVLJUnitTest.java | 2 --
.../internal/cache/OplogEntryIdMapJUnitTest.java | 2 --
.../internal/cache/OplogEntryIdSetJUnitTest.java | 2 --
.../org/apache/geode/internal/cache/OplogTest.java | 2 --
.../cache/OrderedTombstoneMapJUnitTest.java | 2 --
.../cache/PartitionAttributesImplJUnitTest.java | 2 --
.../cache/PartitionRegionConfigJUnitTest.java | 2 --
.../internal/cache/PartitionRegionConfigTest.java | 2 --
.../cache/PartitionedRegionDataStoreTest.java | 2 --
.../cache/PartitionedRegionHelperJUnitTest.java | 2 --
.../cache/PartitionedRegionQueryEvaluatorTest.java | 2 --
.../PartitionedRegionRedundancyTrackerTest.java | 2 --
.../internal/cache/PlaceHolderDiskRegionTest.java | 2 --
.../internal/cache/ProxyBucketRegionTest.java | 2 --
.../geode/internal/cache/RegionCommitTest.java | 2 --
.../cache/RequestFilterInfoMessageTest.java | 2 --
.../internal/cache/RequestImageMessageTest.java | 2 --
.../internal/cache/RequestRVVMessageTest.java | 2 --
.../cache/SearchLoadAndWriteProcessorTest.java | 2 --
.../internal/cache/StateMarkerMessageTest.java | 2 --
.../apache/geode/internal/cache/TXEventTest.java | 2 --
.../geode/internal/cache/TXManagerImplTest.java | 2 --
.../apache/geode/internal/cache/TXMessageTest.java | 2 --
.../cache/TXRegionLockRequestImplTest.java | 2 --
.../geode/internal/cache/TXStateProxyImplTest.java | 2 --
.../geode/internal/cache/TXStateStubTest.java | 2 --
.../cache/TXSynchronizationRunnableTest.java | 2 --
.../geode/internal/cache/TxCommitMessageTest.java | 2 --
.../apache/geode/internal/cache/VLJUnitTest.java | 2 --
.../geode/internal/cache/VMLRURegionMapTest.java | 2 --
.../cache/backup/AbortBackupFactoryTest.java | 2 --
.../cache/backup/AbortBackupRequestTest.java | 2 --
.../internal/cache/backup/AbortBackupStepTest.java | 2 --
.../backup/AbstractBackupWriterConfigTest.java | 2 --
.../cache/backup/BackupDefinitionTest.java | 2 --
.../cache/backup/BackupReplyProcessorTest.java | 2 --
.../internal/cache/backup/BackupServiceTest.java | 2 --
.../cache/backup/BackupWriterFactoryTest.java | 2 --
.../backup/FileSystemBackupWriterConfigTest.java | 2 --
.../FileSystemIncrementalBackupLocationTest.java | 2 --
.../cache/backup/FinishBackupFactoryTest.java | 2 --
.../cache/backup/FinishBackupRequestTest.java | 2 --
.../cache/backup/FinishBackupStepTest.java | 2 --
.../cache/backup/FlushToDiskFactoryTest.java | 2 --
.../cache/backup/FlushToDiskRequestTest.java | 2 --
.../internal/cache/backup/FlushToDiskStepTest.java | 2 --
.../cache/backup/PrepareBackupFactoryTest.java | 2 --
.../cache/backup/PrepareBackupRequestTest.java | 2 --
.../cache/backup/PrepareBackupStepTest.java | 2 --
.../cache/backup/TemporaryBackupFilesTest.java | 2 --
.../cache/control/FilterByPathJUnitTest.java | 2 --
.../cache/control/MemoryThresholdsJUnitTest.java | 2 --
.../cache/control/ResourceAdvisorTest.java | 2 --
.../cache/entries/AbstractRegionEntryTest.java | 2 --
.../cache/event/DistributedEventTrackerTest.java | 2 --
.../cache/event/EventTrackerExpiryTaskTest.java | 2 --
.../event/NonDistributedEventTrackerTest.java | 2 --
.../cache/eviction/AbstractEvictionListTest.java | 2 --
.../cache/eviction/EvictionListBuilderTest.java | 2 --
.../internal/cache/eviction/LIFOListTest.java | 2 --
.../eviction/LRUListWithAsyncSortingTest.java | 2 --
.../cache/eviction/LRUListWithSyncSortingTest.java | 2 --
.../extension/SimpleExtensionPointJUnitTest.java | 2 --
.../cache/ha/EventIdOptimizationJUnitTest.java | 1 -
.../geode/internal/cache/ha/HARegionQueueTest.java | 1 -
.../cache/ha/ThreadIdentifierJUnitTest.java | 1 -
.../cache/map/AbstractRegionMapPutTest.java | 2 --
.../internal/cache/map/RegionMapCommitPutTest.java | 2 --
.../internal/cache/map/RegionMapDestroyTest.java | 2 --
.../geode/internal/cache/map/RegionMapPutTest.java | 2 --
.../cache/partitioned/BucketBackupMessageTest.java | 2 --
.../ColocatedRegionDetailsJUnitTest.java | 2 --
.../DeposePrimaryBucketMessageTest.java | 2 --
.../partitioned/FetchEntriesMessageJUnitTest.java | 2 --
.../cache/partitioned/FetchEntryMessageTest.java | 2 --
.../cache/partitioned/FetchKeysMessageTest.java | 2 --
.../FetchPartitionDetailsMessageTest.java | 2 --
.../ManageBackupBucketReplyMessageTest.java | 2 --
.../cache/partitioned/MoveBucketMessageTest.java | 2 --
.../OfflineMembersDetailsJUnitTest.java | 2 --
.../cache/partitioned/PartitionMessageTest.java | 2 --
.../partitioned/PutPutReplyMessageJUnitTest.java | 3 ---
.../partitioned/RemotePutMessageJUnitTest.java | 2 --
.../cache/partitioned/RemoveAllPRMessageTest.java | 2 --
.../cache/partitioned/RemoveBucketMessageTest.java | 2 --
.../cache/partitioned/SizeMessageTest.java | 2 --
.../rebalance/BucketOperatorImplTest.java | 2 --
.../rebalance/BucketOperatorWrapperTest.java | 2 --
.../PartitionedRegionLoadModelJUnitTest.java | 2 --
.../cache/persistence/DefaultDiskDirsTest.java | 2 --
.../PersistenceInitialImageAdvisorTest.java | 2 --
.../query/TemporaryResultSetFactoryJUnitTest.java | 2 --
.../entry/RegionEntryFactoryBuilderJUnitTest.java | 2 --
.../cache/snapshot/ClientExporterTest.java | 2 --
.../snapshot/ParallelSnapshotFileMapperTest.java | 2 --
.../internal/cache/tier/sockets/CCUStatsTest.java | 1 -
.../tier/sockets/ClientHealthMonitorJUnitTest.java | 1 -
.../cache/tier/sockets/FilterProfileJUnitTest.java | 1 -
.../internal/cache/tier/sockets/HandshakeTest.java | 1 -
.../cache/tier/sockets/MessageIdExtractorTest.java | 1 -
.../cache/tier/sockets/MessageJUnitTest.java | 1 -
.../tier/sockets/ObjectPartListJUnitTest.java | 1 -
.../internal/cache/tier/sockets/PartTest.java | 1 -
.../tier/sockets/ServerConnectionFactoryTest.java | 1 -
.../cache/tier/sockets/ServerConnectionTest.java | 1 -
.../cache/tier/sockets/TcpServerFactoryTest.java | 1 -
.../tier/sockets/command/CommitCommandTest.java | 1 -
.../tier/sockets/command/ContainsKey66Test.java | 1 -
.../tier/sockets/command/ContainsKeyTest.java | 1 -
.../tier/sockets/command/CreateRegionTest.java | 1 -
.../cache/tier/sockets/command/Destroy65Test.java | 1 -
.../tier/sockets/command/DestroyRegionTest.java | 1 -
.../cache/tier/sockets/command/DestroyTest.java | 1 -
.../sockets/command/ExecuteFunction65Test.java | 1 -
.../sockets/command/ExecuteFunction66Test.java | 1 -
.../tier/sockets/command/ExecuteFunctionTest.java | 1 -
.../cache/tier/sockets/command/Get70Test.java | 1 -
.../cache/tier/sockets/command/GetAll651Test.java | 1 -
.../cache/tier/sockets/command/GetAll70Test.java | 1 -
.../cache/tier/sockets/command/GetAllTest.java | 1 -
.../sockets/command/GetAllWithCallbackTest.java | 1 -
.../GetClientPartitionAttributesCommand66Test.java | 1 -
.../GetClientPartitionAttributesCommandTest.java | 1 -
.../cache/tier/sockets/command/InvalidateTest.java | 1 -
.../cache/tier/sockets/command/KeySetTest.java | 1 -
.../cache/tier/sockets/command/Put61Test.java | 1 -
.../cache/tier/sockets/command/Put65Test.java | 1 -
.../cache/tier/sockets/command/PutTest.java | 1 -
.../sockets/command/RegisterInterest61Test.java | 1 -
.../command/RegisterInterestList61Test.java | 1 -
.../command/RegisterInterestList66Test.java | 1 -
.../sockets/command/RegisterInterestListTest.java | 1 -
.../tier/sockets/command/RegisterInterestTest.java | 1 -
.../cache/tier/sockets/command/RemoveAllTest.java | 1 -
.../cache/tier/sockets/command/RequestTest.java | 1 -
.../sockets/command/TXFailoverCommandTest.java | 1 -
.../sockets/command/UnregisterInterestTest.java | 1 -
.../cache/tx/AbstractPeerTXRegionStubTest.java | 2 --
.../internal/cache/tx/ClientTXStateStubTest.java | 2 --
.../cache/tx/RemoteFetchEntryMessageTest.java | 2 --
.../cache/tx/RemoteOperationMessageTest.java | 2 --
.../cache/tx/RemoteOperationResponseTest.java | 2 --
.../internal/cache/tx/RemotePutAllMessageTest.java | 2 --
.../internal/cache/tx/RemotePutMessageTest.java | 2 --
.../cache/tx/RemotePutReplyMessageJUnitTest.java | 3 ---
.../cache/tx/RemoteRemoveAllMessageTest.java | 2 --
.../cache/versions/RVVExceptionJUnitTest.java | 2 --
.../versions/RegionVersionHolder2JUnitTest.java | 2 --
.../versions/RegionVersionHolderJUnitTest.java | 2 --
.../RegionVersionHolderRandomJUnitTest.java | 2 --
.../RegionVersionHolderSmallBitSetJUnitTest.java | 2 --
.../cache/versions/RegionVersionVectorTest.java | 21 ++++++++++-----
.../internal/cache/versions/VMVersionTagTest.java | 2 --
...rallelGatewaySenderEventProcessorJUnitTest.java | 2 --
.../ParallelGatewaySenderQueueJUnitTest.java | 2 --
.../ParallelQueueRemovalMessageJUnitTest.java | 2 --
...SerialGatewaySenderEventProcessorJUnitTest.java | 2 --
.../cache/wan/serial/DestroyMessageTest.java | 2 --
...SerialGatewaySenderEventProcessorJUnitTest.java | 2 --
.../cache/xmlcache/AbstractXmlParserJUnitTest.java | 2 --
.../cache/xmlcache/CacheCreationJUnitTest.java | 2 --
.../CacheTransactionManagerCreationTest.java | 2 --
.../cache/xmlcache/CacheXmlVersionJUnitTest.java | 2 --
.../cache/xmlcache/DefaultEntityResolver2Test.java | 2 --
.../xmlcache/GeodeEntityResolverJUnitTest.java | 2 --
.../xmlcache/PivotalEntityResolverJUnitTest.java | 2 --
.../cache/xmlcache/RegionCreationJUnitTest.java | 2 --
.../cache/xmlcache/XmlGeneratorUtilsJUnitTest.java | 2 --
.../geode/internal/config/JAXBServiceTest.java | 2 --
.../io/CompositeOutputStreamJUnitTest.java | 2 --
.../geode/internal/jndi/ContextJUnitTest.java | 2 --
.../geode/internal/lang/ClassUtilsJUnitTest.java | 2 --
.../internal/lang/InOutParameterJUnitTest.java | 2 --
.../geode/internal/lang/ObjectUtilsJUnitTest.java | 2 --
.../geode/internal/lang/StringUtilsJUnitTest.java | 2 --
.../internal/lang/SystemPropertyHelperTest.java | 2 --
.../geode/internal/lang/SystemUtilsJUnitTest.java | 2 --
.../geode/internal/lang/ThrowableUtilsTest.java | 2 --
.../internal/logging/LogServiceJUnitTest.java | 2 --
.../internal/logging/LogWriterImplJUnitTest.java | 2 --
.../internal/logging/SortLogFileJUnitTest.java | 2 --
.../logging/log4j/AlertAppenderJUnitTest.java | 2 --
.../logging/log4j/FastLoggerJUnitTest.java | 2 --
.../logging/log4j/LocalizedMessageJUnitTest.java | 2 --
.../geode/internal/logging/log4j/LogLevelTest.java | 2 --
.../logging/log4j/LogWriterAppenderJUnitTest.java | 2 --
.../net/SSLConfigurationFactoryJUnitTest.java | 1 -
.../geode/internal/net/SocketCloserJUnitTest.java | 1 -
.../net/SocketCloserWithWaitJUnitTest.java | 1 -
.../net/SocketCreatorFactoryJUnitTest.java | 1 -
.../geode/internal/net/SocketCreatorJUnitTest.java | 1 -
.../geode/internal/net/SocketUtilsJUnitTest.java | 1 -
.../geode/internal/offheap/DataTypeJUnitTest.java | 2 --
...nectingOutOfOffHeapMemoryListenerJUnitTest.java | 2 --
.../geode/internal/offheap/FragmentJUnitTest.java | 2 --
.../internal/offheap/FreeListManagerTest.java | 2 --
.../offheap/LifecycleListenerJUnitTest.java | 2 --
.../MemoryAllocatorFillPatternJUnitTest.java | 2 --
.../internal/offheap/MemoryAllocatorJUnitTest.java | 2 --
.../internal/offheap/MemoryBlockNodeJUnitTest.java | 2 --
.../offheap/MemoryInspectorImplJUnitTest.java | 2 --
.../internal/offheap/OffHeapHelperJUnitTest.java | 2 --
.../offheap/OffHeapRegionEntryHelperJUnitTest.java | 2 --
.../internal/offheap/OffHeapStorageJUnitTest.java | 2 --
.../OffHeapStoredObjectAddressStackJUnitTest.java | 2 --
.../offheap/OffHeapStoredObjectJUnitTest.java | 2 --
.../offheap/OffHeapStoredObjectSliceJUnitTest.java | 2 --
.../OffHeapStoredObjectWithHeapFormJUnitTest.java | 2 --
.../OffHeapWriteObjectAsByteArrayJUnitTest.java | 2 --
.../offheap/RefCountChangeInfoJUnitTest.java | 2 --
.../offheap/ReferenceCountHelperImplTest.java | 2 --
.../offheap/ReferenceCountHelperJUnitTest.java | 2 --
.../internal/offheap/TinyMemoryBlockJUnitTest.java | 2 --
.../offheap/TinyStoredObjectJUnitTest.java | 2 --
.../internal/process/AttachProcessUtilsTest.java | 2 --
.../process/FileProcessControllerTest.java | 2 --
.../internal/process/NativeProcessUtilsTest.java | 2 --
.../process/ProcessControllerFactoryTest.java | 2 --
.../process/ProcessLauncherContextTest.java | 2 --
.../geode/internal/process/StartupStatusTest.java | 2 --
.../internal/process/lang/AvailablePidTest.java | 2 --
.../AbstractSignalNotificationHandlerTest.java | 2 --
.../security/CallbackInstantiatorTest.java | 1 -
.../IntegratedSecurityServiceConstructorTest.java | 2 --
.../security/IntegratedSecurityServiceTest.java | 2 --
.../security/LegacySecurityServiceTest.java | 2 --
.../security/SecurityServiceFactoryTest.java | 1 -
.../internal/security/SecurityServiceTest.java | 1 -
.../geode/internal/size/ObjectSizerJUnitTest.java | 2 --
.../internal/size/ObjectTraverserJUnitTest.java | 2 --
.../size/ReflectionObjectSizerJUnitTest.java | 2 --
.../size/SizeClassOnceObjectSizerJUnitTest.java | 2 --
.../size/WellKnownClassSizerJUnitTest.java | 2 --
.../internal/statistics/CallbackSamplerTest.java | 2 --
.../internal/statistics/ResourceInstTest.java | 2 --
.../internal/statistics/SampleCollectorTest.java | 2 --
.../internal/statistics/StatArchiveWriterTest.java | 2 --
.../statistics/StatMonitorHandlerTest.java | 2 --
...MonitorHandlerWithEnabledMonitorThreadTest.java | 2 --
.../internal/statistics/StatisticsImplTest.java | 2 --
.../internal/statistics/StatisticsMonitorTest.java | 2 --
.../geode/internal/tcp/ConnectionJUnitTest.java | 1 -
.../geode/internal/tcp/ConnectionTableTest.java | 1 -
.../apache/geode/internal/tcp/ConnectionTest.java | 1 -
.../util/AbortableTaskServiceJUnitTest.java | 2 --
.../internal/util/ArgumentRedactorJUnitTest.java | 2 --
.../apache/geode/internal/util/ArrayUtilsTest.java | 2 --
.../apache/geode/internal/util/BlobHelperTest.java | 2 --
...BlobHelperWithThreadContextClassLoaderTest.java | 2 --
.../internal/util/CollectionUtilsJUnitTest.java | 2 --
.../internal/util/DelayedActionJUnitTest.java | 2 --
.../apache/geode/internal/util/HostNameTest.java | 2 --
.../geode/internal/util/IOUtilsJUnitTest.java | 2 --
.../geode/internal/util/PasswordUtilJUnitTest.java | 1 -
.../geode/internal/util/PluckStacksUnitTest.java | 2 --
.../CompactConcurrentHashSetJUnitTest.java | 2 --
.../util/concurrent/FutureResultJUnitTest.java | 2 --
.../concurrent/ReentrantSemaphoreJUnitTest.java | 2 --
.../SemaphoreReadWriteLockJUnitTest.java | 2 --
.../geode/management/DiskBackupStatusTest.java | 2 --
.../management/bean/stats/StatsRateJUnitTest.java | 2 --
.../internal/CompositeBuilderViaFromTest.java | 2 --
.../internal/CompositeBuilderViaProxyTest.java | 2 --
.../management/internal/IdentityConverterTest.java | 2 --
.../management/internal/JettyHelperJUnitTest.java | 2 --
...ServerBridgeClientMembershipRegressionTest.java | 2 --
.../beans/DistributedSystemBridgeJUnitTest.java | 2 --
.../internal/beans/FileUploaderTest.java | 2 --
.../QueryDataFunctionApplyLimitClauseTest.java | 2 --
.../beans/stats/MBeanStatsMonitorTest.java | 2 --
.../cli/ClasspathScanLoadHelperJUnitTest.java | 2 --
.../geode/management/internal/cli/CliUtilTest.java | 2 --
.../internal/cli/CommandManagerJUnitTest.java | 2 --
.../cli/CommandSeparatorEscapeJUnitTest.java | 2 --
.../internal/cli/DataCommandJsonJUnitTest.java | 2 --
.../internal/cli/GfshParserJUnitTest.java | 2 --
.../commands/AlterAsyncEventQueueCommandTest.java | 2 --
.../cli/commands/AlterDiskStoreJUnitTest.java | 2 --
.../cli/commands/AlterRegionCommandTest.java | 2 --
.../commands/CommandAvailabilityIndicatorTest.java | 2 --
.../cli/commands/ConfigurePDXCommandTest.java | 2 --
.../internal/cli/commands/ConnectCommandTest.java | 2 --
.../commands/CreateAsyncEventQueueCommandTest.java | 2 --
.../commands/CreateDefinedIndexesCommandTest.java | 2 --
.../commands/CreateGatewayReceiverCommandTest.java | 2 --
.../commands/CreateGatewaySenderCommandTest.java | 2 --
.../cli/commands/CreateIndexCommandTest.java | 2 --
.../cli/commands/CreateJndiBindingCommandTest.java | 2 --
.../cli/commands/CreateRegionCommandTest.java | 2 --
.../internal/cli/commands/DeployCommandTest.java | 2 --
.../cli/commands/DescribeConfigCommandTest.java | 2 --
.../cli/commands/DescribeRegionJUnitTest.java | 2 --
.../DestroyAsyncEventQueueCommandTest.java | 2 --
.../DestroyGatewayReceiverCommandTest.java | 2 --
.../commands/DestroyGatewaySenderCommandTest.java | 2 --
.../commands/DestroyJndiBindingCommandTest.java | 2 --
.../cli/commands/DestroyRegionCommandTest.java | 2 --
.../cli/commands/DiskStoreCommandsJUnitTest.java | 2 --
.../cli/commands/ExecuteFunctionCommandTest.java | 2 --
.../cli/commands/ExportConfigCommandTest.java | 2 --
.../cli/commands/ExportDataCommandTest.java | 2 --
.../cli/commands/ExportLogsCommandTest.java | 2 --
.../commands/ExportLogsInterceptorJUnitTest.java | 2 --
.../cli/commands/ExportStackTraceCommandTest.java | 2 --
.../cli/commands/GfshCommandJUnitTest.java | 2 --
.../cli/commands/ImportDataCommandTest.java | 2 --
.../cli/commands/ListAsyncEventQueuesTest.java | 1 -
.../cli/commands/ListGatewayCommandTest.java | 2 --
.../cli/commands/ListIndexCommandJUnitTest.java | 2 --
.../cli/commands/ListJndiBindingCommandTest.java | 2 --
.../cli/commands/ListMembersCommandTest.java | 2 --
.../cli/commands/LogLevelInterceptorTest.java | 2 --
.../cli/commands/ShowMetricsJUnitTest.java | 2 --
.../cli/commands/UserInputPropertyTest.java | 2 --
.../lifecycle/StartJConsoleCommandTest.java | 2 --
.../converters/BaseStringConverterJUnitTest.java | 2 --
.../cli/converters/ClassNameConverterTest.java | 2 --
.../converters/ConfigPropertyConverterTest.java | 2 --
.../cli/converters/IndexTypeConverterTest.java | 2 --
.../cli/converters/LogLevelConverterTest.java | 2 --
.../converters/RegionPathConverterJUnitTest.java | 2 --
.../internal/cli/domain/ClassNameTest.java | 2 --
.../cli/domain/RegionDescriptionJUnitTest.java | 2 --
.../cli/functions/CliFunctionResultTest.java | 2 --
.../CreateDefinedIndexesFunctionTest.java | 2 --
.../DescribeDiskStoreFunctionJUnitTest.java | 2 --
.../DestroyAsyncEventQueueFunctionTest.java | 2 --
.../DestroyGatewayReceiverFunctionTest.java | 2 --
.../cli/functions/ExpirationAttrsTest.java | 2 --
.../cli/functions/ExportLogsFunctionTest.java | 2 --
.../GatewayReceiverCreateFunctionTest.java | 2 --
.../GatewaySenderDestroyFunctionTest.java | 2 --
.../cli/functions/GetRegionsFunctionJUnitTest.java | 2 --
.../cli/functions/GetRegionsFunctionTest.java | 2 --
.../functions/ListDiskStoresFunctionJUnitTest.java | 2 --
.../cli/functions/ListIndexFunctionJUnitTest.java | 2 --
.../cli/functions/RegionDestroyFunctionTest.java | 2 --
.../cli/functions/RegionFunctionArgsTest.java | 2 --
.../ShowMissingDiskStoresFunctionJUnitTest.java | 2 --
.../internal/cli/help/HelpBlockUnitTest.java | 2 --
.../internal/cli/help/HelperUnitTest.java | 2 --
.../internal/cli/json/GfJsonArrayTest.java | 2 --
.../internal/cli/json/GfJsonObjectTest.java | 2 --
.../internal/cli/json/TypedJsonTest.java | 2 --
.../internal/cli/remote/CommandExecutorTest.java | 2 --
.../cli/remote/OnlineCommandProcessorTest.java | 2 --
.../internal/cli/result/CommandResultTest.java | 2 --
.../cli/result/CompositeResultDataTest.java | 2 --
.../cli/result/DownloadFileResultTest.java | 2 --
.../internal/cli/result/ErrorResultDataTest.java | 2 --
.../internal/cli/result/FileResultTest.java | 2 --
.../internal/cli/result/InfoResultDataTest.java | 2 --
.../internal/cli/result/ResultBuilderTest.java | 2 --
.../internal/cli/result/TabularResultDataTest.java | 2 --
.../model/LegacyVsResultModelComparisonTest.java | 2 --
.../internal/cli/result/model/ResultModelTest.java | 2 --
.../cli/result/model/TabularResultModelTest.java | 2 --
.../cli/shell/GfshExecutionStrategyTest.java | 2 --
.../internal/cli/shell/GfshInitFileJUnitTest.java | 2 --
.../internal/cli/shell/GfshJunitTest.java | 2 --
.../internal/cli/util/BytesToStringTest.java | 2 --
.../internal/cli/util/CommentSkipHelperTest.java | 2 --
.../cli/util/ExportLogsCacheWriterUnitTest.java | 2 --
.../internal/cli/util/HostUtilsTest.java | 2 --
.../internal/cli/util/HyphenFormatterTest.java | 2 --
.../management/internal/cli/util/JdkToolTest.java | 2 --
.../internal/cli/util/LogFilterTest.java | 2 --
.../internal/cli/util/LogLevelExtractorTest.java | 2 --
.../management/internal/cli/util/LogSizerTest.java | 2 --
.../cli/util/ThreePhraseGeneratorTest.java | 2 --
.../domain/CacheElementJUnitTest.java | 2 --
.../GetClusterConfigurationFunctionTest.java | 2 --
.../configuration/utils/XmlUtilsJUnitTest.java | 2 --
.../internal/security/ResourcePermissionTest.java | 1 -
.../geode/pdx/internal/PdxInstanceImplTest.java | 1 -
.../executor/AbstractScanExecutorTest.java | 1 -
.../security/GemFireSecurityExceptionTest.java | 1 -
.../geode/security/NotAuthorizedExceptionTest.java | 1 -
.../geode/security/SimpleSecurityManagerTest.java | 1 -
.../security/templates/PKCSPrincipalTest.java | 1 -
.../security/templates/UsernamePrincipalTest.java | 1 -
.../geode/test/process/MainLauncherJUnitTest.java | 2 --
.../query/internal/cq/CqServiceImplJUnitTest.java | 2 --
.../cache/query/internal/cq/CqServiceUnitTest.java | 2 --
.../cache/tier/sockets/command/CloseCQTest.java | 2 --
.../tier/sockets/command/ExecuteCQ61Test.java | 2 --
.../cache/tier/sockets/command/StopCQTest.java | 2 --
.../experimental/driver/ValueEncoderTest.java | 1 -
.../test/compiler/ClassNameExtractorTest.java | 2 --
.../test/compiler/UncompiledSourceCodeTest.java | 2 --
.../dunit/standalone/VersionManagerJUnitTest.java | 1 -
.../test/junit/rules/ExecutorServiceRuleTest.java | 2 --
.../test/junit/rules/ExpectedTimeoutRuleTest.java | 2 --
.../test/junit/rules/IgnoreUntilRuleTest.java | 2 --
.../geode/test/junit/rules/RepeatRuleTest.java | 2 --
.../test/junit/rules/RestoreLocaleRuleTest.java | 2 --
.../junit/rules/RetryRuleGlobalWithErrorTest.java | 2 --
.../rules/RetryRuleGlobalWithExceptionTest.java | 2 --
.../junit/rules/RetryRuleLocalWithErrorTest.java | 2 --
.../rules/RetryRuleLocalWithExceptionTest.java | 2 --
.../geode/test/junit/rules/RuleListTest.java | 2 --
.../examples/RepeatingTestCasesExampleTest.java | 2 --
.../junit/rules/examples/RetryRuleExampleTest.java | 2 --
.../junit/rules/examples/RuleAndClassRuleTest.java | 2 --
.../SerializableExternalResourceTest.java | 2 --
.../serializable/SerializableRuleListTest.java | 2 --
.../SerializableTemporaryFolderTest.java | 2 --
.../serializable/SerializableTestNameTest.java | 2 --
.../serializable/SerializableTestWatcherTest.java | 2 --
.../serializable/SerializableTimeoutTest.java | 2 --
...CategoryWithParameterizedRunnerFactoryTest.java | 6 ++---
.../lucene/FlatFormatPdxSerializerJunitTest.java | 1 -
.../lucene/FlatFormatSerializerJUnitTest.java | 1 -
.../internal/LuceneEventListenerJUnitTest.java | 1 -
.../LuceneIndexCreationProfileJUnitTest.java | 1 -
.../internal/LuceneIndexFactoryImplJUnitTest.java | 1 -
.../LuceneIndexForPartitionedRegionTest.java | 1 -
.../lucene/internal/LuceneIndexImplJUnitTest.java | 1 -
.../lucene/internal/LuceneIndexStatsJUnitTest.java | 1 -
.../internal/LuceneQueryFactoryImplJUnitTest.java | 1 -
.../lucene/internal/LuceneQueryImplJUnitTest.java | 1 -
.../internal/LuceneRegionListenerJUnitTest.java | 1 -
.../internal/LuceneResultStructImpJUnitTest.java | 1 -
.../internal/LuceneServiceImplJUnitTest.java | 1 -
.../PageableLuceneQueryResultsImplJUnitTest.java | 1 -
.../PartitionedRepositoryManagerJUnitTest.java | 1 -
.../internal/StringQueryProviderJUnitTest.java | 1 -
.../internal/ValidateCommandParametersTest.java | 1 -
.../internal/cli/LuceneIndexCommandsJUnitTest.java | 1 -
.../LuceneCreateIndexFunctionJUnitTest.java | 1 -
.../LuceneDescribeIndexFunctionJUnitTest.java | 1 -
.../LuceneDestroyIndexFunctionJUnitTest.java | 1 -
.../LuceneListIndexFunctionJUnitTest.java | 1 -
.../LuceneSearchIndexFunctionJUnitTest.java | 1 -
.../directory/DumpDirectoryFilesJUnitTest.java | 1 -
.../directory/RegionDirectoryJUnitTest.java | 1 -
.../distributed/DistributedScoringJUnitTest.java | 1 -
.../internal/distributed/EntryScoreJUnitTest.java | 1 -
.../LuceneQueryFunctionContextJUnitTest.java | 1 -
.../distributed/LuceneQueryFunctionJUnitTest.java | 1 -
.../distributed/TopEntriesCollectorJUnitTest.java | 1 -
.../TopEntriesFunctionCollectorJUnitTest.java | 1 -
.../internal/distributed/TopEntriesJUnitTest.java | 1 -
.../WaitUntilFlushedFunctionJUnitTest.java | 1 -
.../internal/filesystem/ChunkKeyJUnitTest.java | 1 -
.../lucene/internal/filesystem/FileJUnitTest.java | 1 -
.../internal/filesystem/FileSystemJUnitTest.java | 1 -
.../filesystem/FileSystemStatsJUnitTest.java | 1 -
.../BucketTargetingFixedResolverTest.java | 1 -
.../internal/partition/BucketTargetingMapTest.java | 1 -
.../HeterogeneousLuceneSerializerJUnitTest.java | 1 -
.../serializer/PdxFieldMapperJUnitTest.java | 1 -
.../serializer/ReflectionFieldMapperJUnitTest.java | 1 -
.../results/LuceneGetPageFunctionJUnitTest.java | 1 -
.../internal/results/PageEntryJUnitTest.java | 1 -
.../internal/results/PageResultsJUnitTest.java | 1 -
.../xml/LuceneIndexXmlGeneratorJUnitTest.java | 1 -
.../xml/LuceneIndexXmlParserJUnitTest.java | 1 -
.../OutputCapturingServerConnectionTest.java | 1 -
.../tier/sockets/ProtobufServerConnectionTest.java | 1 -
.../protobuf/ProtobufStreamProcessorTest.java | 1 -
.../protobuf/security/SecureCacheImplTest.java | 1 -
.../security/SecureFunctionServiceImplTest.java | 1 -
.../v1/ProtobufProtocolServiceJUnitTest.java | 1 -
.../ClearRequestOperationHandlerJUnitTest.java | 1 -
...ionOnGroupRequestOperationHandlerJUnitTest.java | 1 -
...onOnMemberRequestOperationHandlerJUnitTest.java | 1 -
...onOnRegionRequestOperationHandlerJUnitTest.java | 1 -
.../GetAllRequestOperationHandlerJUnitTest.java | 1 -
...egionNamesRequestOperationHandlerJUnitTest.java | 1 -
.../GetRequestOperationHandlerJUnitTest.java | 1 -
.../GetServerOperationHandlerJUnitTest.java | 1 -
.../GetSizeRequestOperationHandlerJUnitTest.java | 1 -
.../KeySetOperationHandlerJUnitTest.java | 1 -
.../v1/operations/OperationHandlerJUnitTest.java | 1 -
...ueryRequestOperationHandlerIntegrationTest.java | 1 -
.../OqlQueryRequestOperationHandlerJUnitTest.java | 1 -
.../ProtocolVersionHandlerJUnitTest.java | 1 -
.../PutAllRequestOperationHandlerJUnitTest.java | 1 -
...utIfAbsentRequestOperationHandlerJUnitTest.java | 1 -
.../PutRequestOperationHandlerJUnitTest.java | 1 -
.../RemoveRequestOperationHandlerJUnitTest.java | 1 -
.../v1/operations/VersionValidatorJUnitTest.java | 1 -
.../codec/JsonPdxConverterJUnitTest.java | 1 -
.../ProtobufProtocolSerializerJUnitTest.java | 1 -
.../v1/utilities/ProtobufUtilitiesJUnitTest.java | 1 -
.../tools/pulse/internal/PulseAppListenerTest.java | 2 --
.../data/JMXDataUpdaterGetDoubleAttributeTest.java | 2 --
.../internal/security/LogoutHandlerUnitTest.java | 2 --
.../cache/wan/AckReaderThreadJUnitTest.java | 2 --
.../wan/GatewayReceiverFactoryImplJUnitTest.java | 2 --
.../cache/wan/GatewayReceiverImplJUnitTest.java | 2 --
...atewaySenderEventRemoteDispatcherJUnitTest.java | 2 --
.../AbstractBaseControllerJUnitTest.java | 1 -
.../web/controllers/support/RegionDataTest.java | 1 -
.../support/LoginHandlerInterceptorJUnitTest.java | 2 --
...inHandlerInterceptorRequestHeaderJUnitTest.java | 2 --
.../web/domain/QueryParameterSourceJUnitTest.java | 2 --
...lizableObjectHttpMessageConverterJUnitTest.java | 2 --
gradle/test.gradle | 30 ++--------------------
693 files changed, 18 insertions(+), 1241 deletions(-)
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java
index 99d369a..60900e6 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java
@@ -35,10 +35,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import org.apache.geode.test.junit.categories.UnitTest;
@SuppressWarnings("unused")
public class ClassLoaderObjectInputStreamTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandTest.java
index acb0965..e520374 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandTest.java
@@ -36,13 +36,11 @@ import java.util.Set;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.distributed.LocatorLauncher;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.lang.SystemUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StartLocatorCommandTest {
private StartLocatorCommand locatorCommands;
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandTest.java
index 2d26916..30ffb7a 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandTest.java
@@ -35,13 +35,11 @@ import java.util.Set;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.distributed.ServerLauncher;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.pdx.PdxSerializer;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StartServerCommandTest {
private StartServerCommand serverCommands;
diff --git a/geode-assembly/src/test/java/org/apache/geode/test/junit/rules/GfshRuleTest.java b/geode-assembly/src/test/java/org/apache/geode/test/junit/rules/GfshRuleTest.java
index 9d02a5b..6f28cae 100644
--- a/geode-assembly/src/test/java/org/apache/geode/test/junit/rules/GfshRuleTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/test/junit/rules/GfshRuleTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.dunit.standalone.VersionManager;
import org.apache.geode.test.junit.categories.GfshTest;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
@Category({GfshTest.class})
diff --git a/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java b/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
index 97f6eca..7e8ed6a 100755
--- a/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
+++ b/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
@@ -19,11 +19,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.lang.reflect.AnnotatedElement;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.annotations.experimentalpackage.ClassInExperimentalPackage;
import org.apache.geode.experimental.nonexperimentalpackage.ClassInNonExperimentalPackage;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for the <tt>Experimental</tt> annotation. Verifies that the annotation can be applied
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java
index fc80d53..69c17df 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java
@@ -29,7 +29,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.asyncqueue.AsyncEvent;
@@ -37,7 +36,6 @@ import org.apache.geode.connectors.jdbc.internal.SqlHandler;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JdbcAsyncWriterTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java
index dd5ae27..e5cd35d 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java
@@ -20,10 +20,8 @@ import java.sql.SQLException;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JdbcConnectorExceptionTest {
@Rule
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java
index 71eada9..0a6e4f1 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java
@@ -22,14 +22,12 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.LoaderHelper;
import org.apache.geode.connectors.jdbc.internal.SqlHandler;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JdbcLoaderTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java
index 56275f3..5963015 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.Operation;
@@ -37,7 +36,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JdbcWriterTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java
index 174d733..eb2ee54 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java
@@ -24,12 +24,10 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Operation;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractJdbcCallbackTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ColumnDataTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ColumnDataTest.java
index 82b9a31..d79720c 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ColumnDataTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ColumnDataTest.java
@@ -20,9 +20,7 @@ import java.sql.JDBCType;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ColumnDataTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/DataSourceManagerUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/DataSourceManagerUnitTest.java
index ab4c283..a470c90 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/DataSourceManagerUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/DataSourceManagerUnitTest.java
@@ -23,10 +23,8 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DataSourceManagerUnitTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java
index da5a38c..1913930 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java
@@ -21,12 +21,10 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.extension.ExtensionPoint;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JdbcConnectorServiceTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
index a98458e..9416c51 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
@@ -25,7 +25,6 @@ import java.util.HashSet;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.connectors.jdbc.JdbcConnectorException;
@@ -33,7 +32,6 @@ import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
import org.apache.geode.pdx.internal.PdxField;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.TypeRegistry;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionMappingTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
index f936f3e..f27fa32 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
@@ -39,7 +39,6 @@ import junitparams.JUnitParamsRunner;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
@@ -51,7 +50,6 @@ import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.internal.PdxInstanceImpl;
import org.apache.geode.pdx.internal.PdxType;
-import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(JUnitParamsRunner.class)
public class SqlHandlerTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlStatementFactoryTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlStatementFactoryTest.java
index ec8d1fd..e4ccc4b 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlStatementFactoryTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlStatementFactoryTest.java
@@ -21,9 +21,7 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class SqlStatementFactoryTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java
index 3d11dc1..693d257 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java
@@ -38,7 +38,6 @@ import junitparams.Parameters;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
@@ -51,7 +50,6 @@ import org.apache.geode.pdx.PdxInstanceFactory;
import org.apache.geode.pdx.internal.PdxField;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.TypeRegistry;
-import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(JUnitParamsRunner.class)
public class SqlToPdxInstanceCreatorTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
index f7be757..9390263 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
@@ -33,10 +33,8 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.connectors.jdbc.JdbcConnectorException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TableMetaDataManagerTest {
private static final String TABLE_NAME = "testTable";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandTest.java
index f173d9c..2c25ab6 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandTest.java
@@ -30,7 +30,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
@@ -38,7 +37,6 @@ import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class AlterConnectionCommandTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java
index c003c14..cb30d07 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java
@@ -31,7 +31,6 @@ import java.util.Map;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -43,7 +42,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AlterConnectionFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandTest.java
index 0a7be6d..a0eba4a 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandTest.java
@@ -30,7 +30,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
@@ -38,7 +37,6 @@ import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class AlterMappingCommandTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
index ce1a92c..d515985 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
@@ -31,7 +31,6 @@ import java.util.List;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -44,7 +43,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AlterMappingFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java
index d1bf869..eabaf36 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java
@@ -28,7 +28,6 @@ import java.io.Serializable;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -40,7 +39,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CreateConnectionFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
index b90e3c4..335d3f4 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
@@ -28,7 +28,6 @@ import java.io.Serializable;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -41,7 +40,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CreateMappingFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandTest.java
index 55c7c82..03e3b20 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandTest.java
@@ -28,7 +28,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.cache.execute.ResultCollector;
@@ -37,7 +36,6 @@ import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class DescribeConnectionCommandTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java
index 0c6878c..baf003e 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java
@@ -27,7 +27,6 @@ import java.io.Serializable;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -38,7 +37,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DescribeConnectionFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
index d8a1bb4..3e859fb 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
@@ -28,7 +28,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.cache.execute.ResultCollector;
@@ -37,7 +36,6 @@ import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
index 08afb85..2a0c546 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
@@ -27,7 +27,6 @@ import java.io.Serializable;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -38,7 +37,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DescribeMappingFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunctionTest.java
index dbdd1c8..19397da 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunctionTest.java
@@ -26,7 +26,6 @@ import java.io.Serializable;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -37,7 +36,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DestroyConnectionFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java
index 84d2c19..c0b8c42 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java
@@ -26,7 +26,6 @@ import java.io.Serializable;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -37,7 +36,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DestroyMappingCommandFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProviderTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProviderTest.java
index 717e8b7..3ef5081 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProviderTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProviderTest.java
@@ -21,7 +21,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
@@ -29,7 +28,6 @@ import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FunctionContextArgumentProviderTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCCommandsAvailabilityTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCCommandsAvailabilityTest.java
index fc56be6..f572248 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCCommandsAvailabilityTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCCommandsAvailabilityTest.java
@@ -23,12 +23,10 @@ import java.util.Set;
import java.util.stream.Collectors;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.shell.core.CommandMarker;
import org.apache.geode.management.internal.cli.CommandManager;
import org.apache.geode.management.internal.cli.commands.CommandAvailabilityIndicatorTest;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JDBCCommandsAvailabilityTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java
index 0779389..2bf865f 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java
@@ -28,7 +28,6 @@ import java.util.stream.Stream;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.cache.execute.ResultCollector;
@@ -37,7 +36,6 @@ import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java
index c49b595..8a467b4 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java
@@ -28,7 +28,6 @@ import java.util.Set;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -39,7 +38,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ListConnectionFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
index 02efbc4..b050ffa 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
@@ -28,7 +28,6 @@ import java.util.stream.Stream;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.cache.execute.ResultCollector;
@@ -37,7 +36,6 @@ import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java
index d924e61..4814592 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java
@@ -28,7 +28,6 @@ import java.util.Set;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -39,7 +38,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ListMappingFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorServiceTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorServiceTest.java
index b4c66d6..1d83270 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorServiceTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorServiceTest.java
@@ -24,12 +24,10 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.config.JAXBService;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ConnectorServiceTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
index d875932..0a5c175 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
@@ -38,7 +38,6 @@ import java.util.Stack;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.xml.sax.Attributes;
import org.apache.geode.cache.Cache;
@@ -47,7 +46,6 @@ import org.apache.geode.connectors.jdbc.internal.TableMetaDataView;
import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
import org.apache.geode.internal.cache.extension.ExtensionPoint;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ElementTypeTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java
index 26bbfd3..4f8beb2 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java
@@ -25,13 +25,11 @@ import java.util.Stack;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.xml.sax.Attributes;
import org.apache.geode.cache.Cache;
import org.apache.geode.internal.cache.extension.ExtensionPoint;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JdbcConnectorServiceXmlParserTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java
index a64a5d0..3a3cf38 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java
@@ -22,12 +22,10 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JdbcServiceConfigurationTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherTest.java
index e32b0da..d7ba3c5 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherTest.java
@@ -19,10 +19,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.InternalLocator;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link LocatorLauncher}.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java
index fa394e3..4fe5cbb 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java
@@ -27,9 +27,7 @@ import java.util.concurrent.CountDownLatch;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DeadlockDetectorTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
index aef5677..d43fba7 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
@@ -21,9 +21,7 @@ import java.lang.reflect.Method;
import java.util.Date;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* FixedPartitioningTestBase Tester.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java
index d9e2cb3..018c5e4 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java
@@ -19,9 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
public class MemberStarterRuleTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
similarity index 98%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
index 3bb600f..b08d6d9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
@@ -29,7 +29,6 @@ import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({MembershipTest.class}) // Fails on Windows -- see GEODE-373
public class ProductUseLogJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java b/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
index 78ab8e8..bab9d10 100644
--- a/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
@@ -26,7 +26,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SerializationTest.class})
public class DataSerializerTest {
diff --git a/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java b/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java
index 3779567..072dc82 100644
--- a/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java
@@ -21,11 +21,9 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
-import org.apache.geode.test.junit.categories.UnitTest;
public class InstantiatorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java b/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
index 9f87dec..be35819 100644
--- a/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
@@ -26,7 +26,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({MembershipTest.class})
public class SystemFailureJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java b/geode-core/src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java
index b4b7aed..0d5e0b0 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java
@@ -21,9 +21,7 @@ import static org.junit.Assert.assertFalse;
import java.lang.reflect.Constructor;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* AlertLevel Tester.
diff --git a/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java b/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java
index 3894899..75ed6b9 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java
@@ -23,9 +23,7 @@ import static org.mockito.Mockito.when;
import java.util.Collections;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionSubRegionSnapshotTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java
index 2d6198a..a1d39e1 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java
@@ -25,12 +25,10 @@ import java.io.File;
import java.util.Arrays;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.cache.util.CacheWriterAdapter;
import org.apache.geode.compression.SnappyCompressor;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the functionality of the {@link AttributesFactory} class.
diff --git a/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java b/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java
index 3ed9358..1baac6b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DiskAccessExceptionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ExpirationAttributesTest.java b/geode-core/src/test/java/org/apache/geode/cache/ExpirationAttributesTest.java
index 872f6f0..e00c757 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/ExpirationAttributesTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ExpirationAttributesTest.java
@@ -18,9 +18,7 @@ package org.apache.geode.cache;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ExpirationAttributesTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java b/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java
index 8c475d1..1315a85 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java
@@ -21,9 +21,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Asserts fixes for bug JDK-8076152 in JDK 1.8.0u20 to 1.8.0.u45.
diff --git a/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableRegressionTest.java b/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableRegressionTest.java
index 87ba4b1..ef80e5a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableRegressionTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests MembershipAttributes and SubscriptionAttributes to make sure they are Serializable
diff --git a/geode-core/src/test/java/org/apache/geode/cache/OperationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/OperationJUnitTest.java
index 7d9cafa..9272ac7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/OperationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/OperationJUnitTest.java
@@ -18,9 +18,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OperationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RegionNameValidationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/RegionNameValidationJUnitTest.java
index 573a86b..64c1076 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/RegionNameValidationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RegionNameValidationJUnitTest.java
@@ -20,11 +20,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionNameValidationJUnitTest {
private static final Pattern NAME_PATTERN = Pattern.compile("[aA-zZ0-9-_.]+");
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RegionShortcutTest.java b/geode-core/src/test/java/org/apache/geode/cache/RegionShortcutTest.java
index e8f16ad..233800b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/RegionShortcutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RegionShortcutTest.java
@@ -20,9 +20,7 @@ package org.apache.geode.cache;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionShortcutTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java
index 7ca30ab..4179d9e 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java
@@ -27,10 +27,8 @@ import java.util.Iterator;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalRole;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the subclasses of RoleException to make sure they are Serializable
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AbstractOpTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AbstractOpTest.java
index 08744b6..5327a21 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AbstractOpTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AbstractOpTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class AbstractOpTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionConnectorTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionConnectorTest.java
index 50d5d8d..bc21ad5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionConnectorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionConnectorTest.java
@@ -28,7 +28,6 @@ import java.io.IOException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.PoolCancelledException;
@@ -37,7 +36,6 @@ import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.security.GemFireSecurityException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ConnectionConnectorTest {
private CancelCriterion cancelCriterion;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionFactoryJUnitTest.java
index 1022417..40857ea 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionFactoryJUnitTest.java
@@ -25,14 +25,12 @@ import java.util.Set;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
import org.apache.geode.distributed.PoolCancelledException;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.net.SocketCreatorFactory;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ConnectionFactoryJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
index 7a2bbbc..4cdd354 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
@@ -46,7 +46,6 @@ import org.apache.geode.internal.cache.tier.sockets.ServerQueueStatus;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class OpExecutorImplJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueConnectionImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueConnectionImplJUnitTest.java
index 6bb7332..b72663b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueConnectionImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueConnectionImplJUnitTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.client.internal.pooling.ConnectionDestroyedException;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class QueueConnectionImplJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
index b982c8f..1386e05 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.cache.client.internal.ServerBlackList.FailureTracker;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.util.StopWatch;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class ServerBlackListJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java
index 11109be..617ff61 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SingleHopClientExecutorSubmitTaskWithExceptionTest.java
@@ -23,7 +23,6 @@ import org.junit.contrib.java.lang.system.SystemErrRule;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test if exceptions are logged when thread is submitted using
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/TXFailoverOpTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/TXFailoverOpTest.java
index 288a5df..92c89d3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/TXFailoverOpTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/TXFailoverOpTest.java
@@ -22,7 +22,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.CancelCriterion;
@@ -30,7 +29,6 @@ import org.apache.geode.cache.TransactionException;
import org.apache.geode.cache.client.ServerConnectivityException;
import org.apache.geode.cache.client.internal.pooling.ConnectionManager;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TXFailoverOpTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
index 67b03e0..3ae374e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The LocatorStatusResponseJUnitTest class is a test suite of test cases testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/cache/configuration/CacheConfigTest.java b/geode-core/src/test/java/org/apache/geode/cache/configuration/CacheConfigTest.java
index b578ed2..056e544 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/configuration/CacheConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/configuration/CacheConfigTest.java
@@ -22,10 +22,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.config.JAXBService;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CacheConfigTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/configuration/DeclarableTypeTest.java b/geode-core/src/test/java/org/apache/geode/cache/configuration/DeclarableTypeTest.java
index ded2ba2..42c3608 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/configuration/DeclarableTypeTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/configuration/DeclarableTypeTest.java
@@ -20,9 +20,7 @@ package org.apache.geode.cache.configuration;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DeclarableTypeTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
index d7e1092..aa6e2bc 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
@@ -24,12 +24,10 @@ import java.io.FileInputStream;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.VersionedDataInputStream;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.util.test.TestUtil;
public class FunctionAdapterJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java
index b30a9bb..87206f6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java
@@ -25,9 +25,7 @@ import java.util.Collections;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FunctionExceptionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java
index 6a1ef74..c695331 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java
@@ -21,7 +21,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({OQLIndexTest.class})
public class IndexTypeTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/JavaSerializationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/JavaSerializationJUnitTest.java
index 8a83e0e..2484bbf 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/JavaSerializationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/JavaSerializationJUnitTest.java
@@ -20,14 +20,12 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.internal.StructImpl;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JavaSerializationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
index 9012987..1b337bd 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
@@ -26,7 +26,6 @@ import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.Aggregator;
import org.apache.geode.cache.query.internal.aggregate.Avg;
@@ -45,7 +44,6 @@ import org.apache.geode.cache.query.internal.aggregate.SumDistinct;
import org.apache.geode.cache.query.internal.aggregate.SumDistinctPRQueryNode;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CompiledAggregateFunctionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledInJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledInJUnitTest.java
index b1dfcf2..9003730 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledInJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledInJUnitTest.java
@@ -28,13 +28,11 @@ import java.util.Collection;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.internal.index.IndexProtocol;
import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.EnumInfo.PdxInstanceEnumInfo;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CompiledInJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledIteratorDefJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledIteratorDefJUnitTest.java
index 467fe35..3336df3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledIteratorDefJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledIteratorDefJUnitTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.query.internal.types.TypeUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CompiledIteratorDefJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/NWayMergeResultsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/NWayMergeResultsJUnitTest.java
index ef26d66..dff18f7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/NWayMergeResultsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/NWayMergeResultsJUnitTest.java
@@ -31,13 +31,11 @@ import java.util.SortedSet;
import java.util.TreeSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.test.junit.categories.UnitTest;
public class NWayMergeResultsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryExecutionContextJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryExecutionContextJUnitTest.java
index ae0eceb..d1e15de 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryExecutionContextJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryExecutionContextJUnitTest.java
@@ -18,9 +18,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class QueryExecutionContextJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObjectSerializationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObjectSerializationJUnitTest.java
index d22716a..024411d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObjectSerializationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObjectSerializationJUnitTest.java
@@ -29,13 +29,11 @@ import java.util.Collection;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.internal.cache.CachePerfStats;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the Serialization of the Query related class.
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java
index fda8a2f..7370e0d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.internal.cache.EntrySnapshot;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SecurityTest.class})
public class RestrictedMethodInvocationAuthorizerTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java
index a5ea788..c1c92be 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java
@@ -24,14 +24,12 @@ import java.util.NoSuchElementException;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test ResultsBag, including null elements
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java
index c38ed73..77f1ed2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java
@@ -30,13 +30,11 @@ import java.util.NoSuchElementException;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test ResultsBag Limit behaviour
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
index afdb2f5..802b70e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
@@ -29,10 +29,8 @@ import java.util.Set;
import java.util.TreeSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ResultsCollectionWrapperLimitJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java
index cac20c0..11f087d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java
@@ -26,11 +26,9 @@ import java.util.SortedSet;
import java.util.TreeSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class SelectResultsComparatorJUnitTest implements OQLLexerTokenTypes {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
index fa6e9c6..94b5f25 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
@@ -21,14 +21,12 @@ import static org.junit.Assert.assertTrue;
import java.util.Iterator;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test StructBag Limit behaviour
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructSetJUnitTest.java
index 68142da..ef489cd 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructSetJUnitTest.java
@@ -25,14 +25,12 @@ import static org.junit.Assert.assertTrue;
import java.util.Iterator;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.internal.types.TypeUtils;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StructSetJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/aggregate/AggregatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/aggregate/AggregatorJUnitTest.java
index 56a39a8..66526ab 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/aggregate/AggregatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/aggregate/AggregatorJUnitTest.java
@@ -20,9 +20,7 @@ import java.util.HashSet;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AggregatorJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java
index 3b58864..00838d0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java
@@ -19,10 +19,8 @@ import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.CqListener;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CqAttributesImplJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java
index 6bc255a..1d97d5d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java
@@ -32,13 +32,11 @@ import java.util.Set;
import java.util.stream.IntStream;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.UnitTest;
public class HashIndexSetJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexElemArrayJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexElemArrayJUnitTest.java
index cc58bdc..0b7b0ac 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexElemArrayJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexElemArrayJUnitTest.java
@@ -30,10 +30,8 @@ import java.util.stream.IntStream;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.MultithreadedTester;
-import org.apache.geode.test.junit.categories.UnitTest;
public class IndexElemArrayJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java
index 3f69b4f..0706877 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java
@@ -28,7 +28,6 @@ import java.util.stream.IntStream;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.QueryService;
@@ -36,7 +35,6 @@ import org.apache.geode.cache.query.internal.index.AbstractIndex.InternalIndexSt
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MemoryIndexStoreJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreWithInplaceModificationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreWithInplaceModificationJUnitTest.java
index c7f8881..bf55dd2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreWithInplaceModificationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreWithInplaceModificationJUnitTest.java
@@ -18,12 +18,10 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.After;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MemoryIndexStoreWithInplaceModificationJUnitTest extends MemoryIndexStoreJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/parse/OQLParserTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/parse/OQLParserTest.java
index 4582c19..ff83c8a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/parse/OQLParserTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/parse/OQLParserTest.java
@@ -19,9 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringReader;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* TODO: class created to fix GEODE-3938. Add more tests for other queries, parameters, etc.
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilsJUnitTest.java
index a32ed70..2553370 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilsJUnitTest.java
@@ -56,7 +56,6 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -75,7 +74,6 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.pdx.internal.PdxInstanceEnum;
import org.apache.geode.pdx.internal.PdxString;
-import org.apache.geode.test.junit.categories.UnitTest;
@PowerMockIgnore("*.UnitTest")
@RunWith(PowerMockRunner.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/server/internal/ConnectionCountProbeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/server/internal/ConnectionCountProbeJUnitTest.java
index 3b6f024..f4013bf 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/server/internal/ConnectionCountProbeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/server/internal/ConnectionCountProbeJUnitTest.java
@@ -17,10 +17,8 @@ package org.apache.geode.cache.server.internal;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.ServerLoad;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ConnectionCountProbeJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/server/internal/LoadMonitorTest.java b/geode-core/src/test/java/org/apache/geode/cache/server/internal/LoadMonitorTest.java
index 14c7ea2..6d4cff2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/server/internal/LoadMonitorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/server/internal/LoadMonitorTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.ServerLoadProbe;
import org.apache.geode.internal.cache.tier.CommunicationMode;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LoadMonitorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/util/StringPrefixPartitionResolverJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/util/StringPrefixPartitionResolverJUnitTest.java
index 1b3f754..62b1f11 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/util/StringPrefixPartitionResolverJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/util/StringPrefixPartitionResolverJUnitTest.java
@@ -18,11 +18,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EntryOperation;
import org.apache.geode.internal.cache.EntryOperationImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StringPrefixPartitionResolverJUnitTest {
static final String DELIMITER = StringPrefixPartitionResolver.DEFAULT_DELIMITER;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
similarity index 98%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
index 1db8fe7..f2f328e 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
@@ -26,14 +26,12 @@ import java.util.List;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.internal.process.ProcessUtils;
import org.apache.geode.management.internal.cli.json.GfJsonArray;
import org.apache.geode.management.internal.cli.json.GfJsonException;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link AbstractLauncher.ServiceState}. Tests marshalling of ServiceState to and
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
index 45989c6..c7b9c2c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
@@ -32,9 +32,7 @@ import java.util.Properties;
import org.apache.commons.lang.StringUtils;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link AbstractLauncher}.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
similarity index 98%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
index cb79b4a..2da8834 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
@@ -22,7 +22,6 @@ import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for DistributedSystem class.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java
index cb3f0b7..363edda 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java
@@ -27,12 +27,10 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.LocatorLauncher.Builder;
import org.apache.geode.distributed.LocatorLauncher.Command;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link LocatorLauncher.Builder}. Extracted from {@link LocatorLauncherTest}.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorStateTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorStateTest.java
similarity index 98%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorStateTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/LocatorStateTest.java
index 933219f..e9709ee 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorStateTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorStateTest.java
@@ -25,14 +25,12 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.AbstractLauncher.ServiceState;
import org.apache.geode.distributed.AbstractLauncher.Status;
import org.apache.geode.distributed.LocatorLauncher.LocatorState;
import org.apache.geode.management.internal.cli.json.GfJsonException;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link LocatorLauncher.LocatorState}.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java
index 009c0e6..df4493c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java
@@ -26,13 +26,11 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.ServerLauncher.Builder;
import org.apache.geode.distributed.ServerLauncher.Command;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ServerLauncher.Builder}. Extracted from {@link ServerLauncherTest}.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
index 5cb9453..879096f 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
@@ -29,14 +29,12 @@ import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.ServerLauncher.Builder;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.CacheConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ServerLauncher}.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java
similarity index 97%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java
index 4606ccb..a8c9eca 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java
@@ -25,10 +25,8 @@ import edu.umd.cs.mtc.MultithreadedTestCase;
import edu.umd.cs.mtc.TestFramework;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Multithreaded unit tests for {@link ServerLauncher}. Extracted from {@link ServerLauncherTest}.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java
similarity index 92%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java
index b70eb32..5a21f79 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java
@@ -17,9 +17,7 @@ package org.apache.geode.distributed.internal;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AtomicLongWithTerminalStateJUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java
similarity index 94%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java
index 8808ba0..1cf3ad5 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java
@@ -23,10 +23,8 @@ import static org.mockito.Mockito.when;
import java.util.concurrent.Executor;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ClusterDistributionManagerTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
similarity index 92%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
index 486ca02..e92459c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributionAdvisorTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
index 312b65e..e0c45e6 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
@@ -60,7 +60,6 @@ import org.apache.geode.internal.ConfigSource;
import org.apache.geode.security.TestPostProcessor;
import org.apache.geode.security.TestSecurityManager;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({MembershipTest.class})
public class DistributionConfigJUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionMessageTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
similarity index 96%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
index 0488c8c..91027e1 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
@@ -22,7 +22,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({MembershipTest.class})
public class DistributionMessageTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
similarity index 98%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
index 21b1dc1..e658fc9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
@@ -31,7 +31,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.configuration.CacheConfig;
@@ -42,7 +41,6 @@ import org.apache.geode.internal.config.JAXBServiceTest.ElementOne;
import org.apache.geode.internal.config.JAXBServiceTest.ElementTwo;
import org.apache.geode.internal.lang.SystemPropertyHelper;
import org.apache.geode.management.internal.configuration.domain.Configuration;
-import org.apache.geode.test.junit.categories.UnitTest;
public class InternalConfigurationPersistenceServiceTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
index 41b5ccc..5a38b28 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.ServerLoad;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the functionality of the LocatorLoadSnapshot, which is the data structure that is used in
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
similarity index 96%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
index b41b76c..093034e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
@@ -22,7 +22,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({MembershipTest.class})
public class ReplyProcessor21Test {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
similarity index 97%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
index 2091900..124ddb7 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.i18n.LogWriterI18n;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The ServerLocatorJUnitTest class is a test suite of test cases testing the contract and
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
index 0f88dfb..63e4248 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.internal.ByteArrayData;
import org.apache.geode.internal.admin.remote.DistributionLocatorId;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests {@link StartupMessageData}.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java
similarity index 96%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java
index b123621..957623d 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java
@@ -20,9 +20,7 @@ import java.util.HashSet;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DependencyGraphJUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java
similarity index 95%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java
index 312a3e5..5738b92 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java
@@ -21,9 +21,7 @@ import java.util.concurrent.CountDownLatch;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class UnsafeThreadLocalJUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
similarity index 96%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
index a578b02..9eb763e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
@@ -20,7 +20,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* InternalRole Tester.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
index 7a65700..d026977 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
@@ -33,7 +33,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({MembershipTest.class})
public class NetViewJUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
index 14bca45..3f903f3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.VersionedDataInputStream;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SecurityTest.class})
public class GMSMemberJUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java
index 3a63b34..bacf349 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java
@@ -28,7 +28,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.i18n.StringId;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.RestoreLocaleRule;
/**
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
index 4629edf..5c72ac3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.i18n.StringId;
import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.RestoreLocaleRule;
/**
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
index 0abf401..c7eebc0 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
@@ -48,7 +48,6 @@ import org.apache.geode.distributed.internal.membership.gms.messenger.JGroupsMes
import org.apache.geode.distributed.internal.membership.gms.messenger.StatRecorder;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* This class tests the GMS StatRecorder class, which records JGroups messaging statistics
diff --git a/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java b/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java
index f111d2d..9ad7403 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractConfigTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/AssertJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/AssertJUnitTest.java
index a3ba920..2e4aa97 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/AssertJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/AssertJUnitTest.java
@@ -18,9 +18,7 @@ package org.apache.geode.internal;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AssertJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java b/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java
index 17978f0..90303db 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java
@@ -38,11 +38,9 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.test.compiler.ClassBuilder;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ClassPathLoader}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ConfigSourceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/ConfigSourceJUnitTest.java
index c14c910..dd4193a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ConfigSourceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ConfigSourceJUnitTest.java
@@ -19,9 +19,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ConfigSourceJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/CopyOnWriteHashSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/CopyOnWriteHashSetJUnitTest.java
index 372d315..f7fa32b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/CopyOnWriteHashSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/CopyOnWriteHashSetJUnitTest.java
@@ -28,9 +28,7 @@ import java.util.Iterator;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CopyOnWriteHashSetJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/DSCODETest.java b/geode-core/src/test/java/org/apache/geode/internal/DSCODETest.java
index 72035d8..7bc7684 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/DSCODETest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/DSCODETest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SerializationTest.class})
public class DSCODETest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
index 0df01f2..b73b0f7 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
@@ -71,7 +71,6 @@ import org.apache.geode.SystemFailure;
import org.apache.geode.internal.statistics.StatArchiveWriter;
import org.apache.geode.internal.tcp.ByteBufferInputStream;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the functionality of the {@link DataSerializable} class.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/DataSerializerHolderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/DataSerializerHolderJUnitTest.java
index 448d629..eb089d2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/DataSerializerHolderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/DataSerializerHolderJUnitTest.java
@@ -26,10 +26,8 @@ import java.util.stream.Collectors;
import junit.framework.TestCase;
import org.junit.After;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DataSerializerHolderJUnitTest extends TestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/GemFireVersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/GemFireVersionJUnitTest.java
index 22ba473..b684c82 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/GemFireVersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/GemFireVersionJUnitTest.java
@@ -21,10 +21,8 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* This test prints out the version information obtained from the {@link GemFireVersion} class. It
diff --git a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java
index be91e8f..b2c327b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.DataSerializer;
import org.apache.geode.internal.cache.UnitTestValueHolder;
import org.apache.geode.pdx.internal.TypeRegistry;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test of methods on HeapDataOutputStream
diff --git a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
index 77de04b..4638fa0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/HeapDataOutputStreamTest.java
@@ -22,7 +22,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SerializationTest.class})
public class HeapDataOutputStreamTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerJUnitTest.java
index 4c40ca0..6d0f1c9 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerJUnitTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.examples.security.ExampleSecurityManager;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the functionality of the {@link InternalDataSerializer} class.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerQuickcheckStringTest.java b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerQuickcheckStringTest.java
index c37fa15..ff74e61 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerQuickcheckStringTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerQuickcheckStringTest.java
@@ -30,7 +30,6 @@ import org.junit.runner.RunWith;
import org.apache.geode.DataSerializer;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the serialization and deserialization of randomly generated Strings.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerSerializationWhitelistTest.java b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerSerializationWhitelistTest.java
index 0a42787..6a601a4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerSerializationWhitelistTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerSerializationWhitelistTest.java
@@ -21,7 +21,6 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.internal.lang.ClassUtils;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
diff --git a/geode-core/src/test/java/org/apache/geode/internal/LineWrapUnitJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/LineWrapUnitJUnitTest.java
index 05edced..937957d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/LineWrapUnitJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/LineWrapUnitJUnitTest.java
@@ -20,9 +20,7 @@ import java.util.Arrays;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LineWrapUnitJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/NanoTimerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/NanoTimerJUnitTest.java
index 6a1b0b8..028e774 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/NanoTimerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/NanoTimerJUnitTest.java
@@ -19,10 +19,8 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.NanoTimer.TimeService;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for NanoTimer.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java b/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java
index d43f990..9052fbf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java
@@ -20,10 +20,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.ObjIdConcurrentMap.Segment;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ObjIdConcurrentMapTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ObjIdMapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/ObjIdMapJUnitTest.java
index c46e515..78ffe93 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ObjIdMapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ObjIdMapJUnitTest.java
@@ -30,9 +30,7 @@ import java.util.List;
import java.util.Random;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* This class tests the functionality of the {@link ObjIdMap} class.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/OneTaskOnlyDecoratorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/OneTaskOnlyDecoratorJUnitTest.java
index 9071507..ac5e5fd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/OneTaskOnlyDecoratorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/OneTaskOnlyDecoratorJUnitTest.java
@@ -25,9 +25,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OneTaskOnlyDecoratorJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PutAllOperationContextJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PutAllOperationContextJUnitTest.java
index c9d96be..bb1c79e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PutAllOperationContextJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PutAllOperationContextJUnitTest.java
@@ -26,13 +26,11 @@ import java.util.Map;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.operations.PutAllOperationContext;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.CachedDeserializableFactory;
import org.apache.geode.internal.cache.Token;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PutAllOperationContextJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java
index 8db169b..c844486 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java
@@ -18,9 +18,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests UniqueIdGenerator.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
index b9802b9..a82c73a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
@@ -18,11 +18,9 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.UnsupportedVersionException;
import org.apache.geode.internal.cache.tier.sockets.CommandInitializer;
-import org.apache.geode.test.junit.categories.UnitTest;
public class VersionJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/admin/remote/DistributionLocatorIdJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/admin/remote/DistributionLocatorIdJUnitTest.java
index 8f1012f..f0f9ec7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/admin/remote/DistributionLocatorIdJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/admin/remote/DistributionLocatorIdJUnitTest.java
@@ -21,9 +21,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* DistributionLocatorId Tester.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgentTest.java b/geode-core/src/test/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgentTest.java
index 64c1e56..242924a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgentTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgentTest.java
@@ -26,14 +26,12 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.gms.Services;
import org.apache.geode.internal.admin.GfManagerAgentConfig;
import org.apache.geode.internal.logging.InternalLogWriter;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemoteGfManagerAgentTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java
index 1dd9915..0a311cc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java
@@ -20,9 +20,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractDiskRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java
index 9c6cb9e..75743a3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java
@@ -19,10 +19,8 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.entries.AbstractOplogDiskRegionEntry;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractOplogDiskRegionEntryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionJUnitTest.java
index edbdd87..41c79f0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionJUnitTest.java
@@ -18,12 +18,10 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.spy;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.extension.ExtensionPoint;
import org.apache.geode.internal.cache.extension.SimpleExtensionPoint;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link AbstractRegion}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
index 6d1bba7..5ac359f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
@@ -37,7 +37,6 @@ import java.util.List;
import org.junit.After;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.EntryNotFoundException;
@@ -59,7 +58,6 @@ import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.util.concurrent.ConcurrentMapWithReusableEntries;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractRegionMapTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTxApplyDestroyTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTxApplyDestroyTest.java
index ba4fd9d..3cd2de0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTxApplyDestroyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTxApplyDestroyTest.java
@@ -40,7 +40,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.mockito.Mock;
@@ -54,7 +53,6 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.util.concurrent.ConcurrentMapWithReusableEntries;
-import org.apache.geode.test.junit.categories.UnitTest;
@SuppressWarnings("unchecked")
public class AbstractRegionMapTxApplyDestroyTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java
index c84b747..42b5b0b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java
index c452aab..26a89b6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java
@@ -24,14 +24,12 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.partitioned.Bucket;
import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BucketAdvisorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketPersistenceAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketPersistenceAdvisorTest.java
index 3669cca..cb4232e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketPersistenceAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketPersistenceAdvisorTest.java
@@ -20,14 +20,12 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedLockService;
import org.apache.geode.internal.cache.PartitionedRegion.BucketLock;
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
import org.apache.geode.internal.cache.persistence.PersistentMemberView;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BucketPersistenceAdvisorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRedundancyTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRedundancyTrackerTest.java
index 41a067d..f6c2102 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRedundancyTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRedundancyTrackerTest.java
@@ -23,9 +23,7 @@ import static org.mockito.Mockito.verify;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BucketRedundancyTrackerTest {
private static final int TARGET_COPIES = 2;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java
index 6e6d1c4..314378d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java
@@ -31,10 +31,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache.RegionAttributes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BucketRegionJUnitTest extends DistributedRegionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java
index 3a885a0..7beced8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java
@@ -22,11 +22,9 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.DistributedCacheOperation.CacheOperationMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CacheOperationMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheProfileTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheProfileTest.java
index 3eb5dd0..9b7340a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheProfileTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheProfileTest.java
@@ -21,11 +21,9 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.CacheDistributionAdvisor.CacheProfile;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CacheProfileTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServerLauncherJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServerLauncherJUnitTest.java
index db40e76..e9aef8a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServerLauncherJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServerLauncherJUnitTest.java
@@ -18,9 +18,7 @@ import static org.apache.geode.internal.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* CacheServerLauncher Tester.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java
index 8942795..5e5d522 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java
@@ -30,7 +30,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.PartitionAttributes;
@@ -38,7 +37,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.i18n.StringId;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.RestoreLocaleRule;
public class ColocationHelperTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java
index 1b73497..d967f18 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java
@@ -20,10 +20,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.DestroyOperation.DestroyMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DestroyMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIdJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIdJUnitTest.java
index 3e3b42d..b8cca1f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIdJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIdJUnitTest.java
@@ -20,9 +20,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test verifies the setting and getting of disk id values are correctly
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskStoreMonitorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskStoreMonitorTest.java
index 2368921..6c5bded 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskStoreMonitorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskStoreMonitorTest.java
@@ -22,9 +22,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DiskStoreMonitorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskUsageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskUsageTest.java
index 0ae0b48..58eb7d2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskUsageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskUsageTest.java
@@ -23,11 +23,9 @@ import static org.mockito.Mockito.when;
import java.io.File;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.DiskStoreMonitor.DiskState;
import org.apache.geode.internal.cache.DiskStoreMonitor.DiskUsage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DiskUsageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskWriteAttributesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskWriteAttributesJUnitTest.java
index 4e27716..b989bed 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskWriteAttributesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskWriteAttributesJUnitTest.java
@@ -18,11 +18,9 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DiskWriteAttributes;
import org.apache.geode.cache.DiskWriteAttributesFactory;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests if DiskWriteAttributeFactory returns the correct DWA object with the desired values
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java
index a6f6a66..79250c5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java
@@ -21,10 +21,8 @@ import static org.mockito.Mockito.when;
import java.util.ArrayList;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.tx.DistTxEntryEvent;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistPeerTXStateStubTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java
index 2c0d063..a97fecc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java
@@ -26,13 +26,11 @@ import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheEvent;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DistributedCacheOperation.CacheOperationMessage;
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributedCacheOperationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java
index d3689f7..a06920e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributedPutAllOperationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java
index 15bb817..a5752b7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java
@@ -20,10 +20,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributedRegionFunctionStreamingMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java
index bbedb64..12f9dfe 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java
@@ -29,7 +29,6 @@ import static org.mockito.Mockito.verify;
import java.util.concurrent.ConcurrentMap;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.RegionAttributes;
@@ -39,7 +38,6 @@ import org.apache.geode.internal.cache.event.EventTracker;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributedRegionJUnitTest extends AbstractDistributedRegionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java
index 624dabc..f260c3f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java
@@ -28,7 +28,6 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -47,7 +46,6 @@ import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationExcep
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("*.UnitTest")
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java
index d9864bc..731082b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java
@@ -21,9 +21,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributedRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java
index 33cff8a..bd84116 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributedRemoveAllOperationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java
index fdbad8f..fb02950 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java
@@ -31,7 +31,6 @@ import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.SerializedCacheValue;
@@ -40,7 +39,6 @@ import org.apache.geode.internal.cache.EntryEventImpl.NewValueImporter;
import org.apache.geode.internal.cache.EntryEventImpl.OldValueImporter;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.offheap.StoredObject;
-import org.apache.geode.test.junit.categories.UnitTest;
public class EntryEventImplTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventSerializationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventSerializationTest.java
index 95fabb1..0594394 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventSerializationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventSerializationTest.java
@@ -33,13 +33,11 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.SerializationException;
import org.apache.geode.cache.Scope;
import org.apache.geode.pdx.internal.PdxInstanceImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
public class EntryEventSerializationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EnumListenerEventJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EnumListenerEventJUnitTest.java
index 2fdc0ac..edb6f72 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EnumListenerEventJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EnumListenerEventJUnitTest.java
@@ -17,9 +17,7 @@ package org.apache.geode.internal.cache;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class EnumListenerEventJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionAttributesImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionAttributesImplTest.java
index 555b384..9d68123 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionAttributesImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionAttributesImplTest.java
@@ -18,10 +18,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.util.BlobHelper;
-import org.apache.geode.test.junit.categories.UnitTest;
public class EvictionAttributesImplTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java
index edf3ea3..0783139 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ExpiryTaskTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileNullCqBaseRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileNullCqBaseRegionJUnitTest.java
index 47ce409..00d272d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileNullCqBaseRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileNullCqBaseRegionJUnitTest.java
@@ -26,14 +26,12 @@ import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.CqException;
import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache.query.internal.CqStateImpl;
import org.apache.geode.cache.query.internal.cq.CqService;
import org.apache.geode.cache.query.internal.cq.ServerCQ;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FilterProfileNullCqBaseRegionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FlusherThreadTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/FlusherThreadTest.java
index 0e117b0..ad81413 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/FlusherThreadTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/FlusherThreadTest.java
@@ -26,10 +26,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DiskAccessException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FlusherThreadTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
index 731c78e..0d356be 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
@@ -34,7 +34,6 @@ import org.awaitility.Awaitility;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.SerializationException;
import org.apache.geode.cache.CacheClosedException;
@@ -47,7 +46,6 @@ import org.apache.geode.internal.cache.eviction.HeapEvictor;
import org.apache.geode.internal.cache.eviction.OffHeapEvictor;
import org.apache.geode.pdx.internal.TypeRegistry;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GemFireCacheImplTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java
index d07e361..5a5a255 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java
@@ -24,13 +24,11 @@ import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
import org.apache.geode.distributed.internal.DistributionAdvisor.ProfileId;
import org.apache.geode.internal.cache.GridAdvisor.GridProfile;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GridProfileTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/InitialImageOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/InitialImageOperationTest.java
index a597b39..840379a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/InitialImageOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/InitialImageOperationTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
-import org.apache.geode.test.junit.categories.UnitTest;
public class InitialImageOperationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/InternalCacheForClientAccessTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/InternalCacheForClientAccessTest.java
index 0b8b531..888d4f3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/InternalCacheForClientAccessTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/InternalCacheForClientAccessTest.java
@@ -27,12 +27,10 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.security.NotAuthorizedException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class InternalCacheForClientAccessTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/JtaAfterCompletionMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/JtaAfterCompletionMessageTest.java
index 4f02bb2..25a1438 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/JtaAfterCompletionMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/JtaAfterCompletionMessageTest.java
@@ -21,11 +21,9 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JtaAfterCompletionMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessageTest.java
index f46359e..8036d2d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessageTest.java
@@ -20,12 +20,10 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JtaBeforeCompletionMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/LocalDataSetTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/LocalDataSetTest.java
index a1ffa6a..572fd91 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/LocalDataSetTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/LocalDataSetTest.java
@@ -25,10 +25,8 @@ import static org.mockito.Mockito.when;
import java.util.Collections;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Operation;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LocalDataSetTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java
index e2aff0e..a081046 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java
@@ -19,10 +19,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MemberFunctionStreamingMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java
index 267a174..53c2e49 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java
@@ -20,9 +20,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class NonLocalRegionEntryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapValueWrapperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapValueWrapperJUnitTest.java
index 5ceb472..7f28eb1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapValueWrapperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapValueWrapperJUnitTest.java
@@ -23,7 +23,6 @@ import java.nio.ByteBuffer;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.entries.DiskEntry.Helper.Flushable;
import org.apache.geode.internal.cache.entries.DiskEntry.Helper.OffHeapValueWrapper;
@@ -32,7 +31,6 @@ import org.apache.geode.internal.offheap.NullOffHeapMemoryStats;
import org.apache.geode.internal.offheap.NullOutOfOffHeapMemoryListener;
import org.apache.geode.internal.offheap.SlabImpl;
import org.apache.geode.internal.offheap.StoredObject;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OffHeapValueWrapperJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OldVLJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OldVLJUnitTest.java
index 6185db8..ba5474e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OldVLJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OldVLJUnitTest.java
@@ -25,10 +25,8 @@ import java.io.DataOutputStream;
import java.io.IOException;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OldVLJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdMapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdMapJUnitTest.java
index 8407701..54361f8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdMapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdMapJUnitTest.java
@@ -18,10 +18,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.Oplog.OplogEntryIdMap;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests DiskStoreImpl.OplogEntryIdMap
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdSetJUnitTest.java
index a521352..5b57803 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdSetJUnitTest.java
@@ -18,10 +18,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.DiskStoreImpl.OplogEntryIdSet;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests DiskStoreImpl.OplogEntryIdSet
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogTest.java
index 75713e7..d33345d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogTest.java
@@ -27,9 +27,7 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OplogTest {
private final DiskStoreImpl.OplogCompactor compactor = mock(DiskStoreImpl.OplogCompactor.class);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OrderedTombstoneMapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OrderedTombstoneMapJUnitTest.java
index 9312249..88cb947 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OrderedTombstoneMapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OrderedTombstoneMapJUnitTest.java
@@ -17,11 +17,9 @@ package org.apache.geode.internal.cache;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OrderedTombstoneMapJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionAttributesImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionAttributesImplJUnitTest.java
index ec32d17..3810766 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionAttributesImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionAttributesImplJUnitTest.java
@@ -30,7 +30,6 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.EntryOperation;
@@ -40,7 +39,6 @@ import org.apache.geode.cache.PartitionResolver;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.partition.PartitionListener;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit test suite for PartitionAttributesImpl.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigJUnitTest.java
index d462ed3..1925e67 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigJUnitTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PartitionRegionConfigJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigTest.java
index acacf1f..8a63784 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigTest.java
@@ -23,7 +23,6 @@ import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.ExpirationAttributes;
@@ -31,7 +30,6 @@ import org.apache.geode.cache.PartitionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Scope;
import org.apache.geode.internal.util.BlobHelper;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PartitionRegionConfigTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreTest.java
index 48ff5f1..5e0d480 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreTest.java
@@ -25,10 +25,8 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mock;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PartitionedRegionDataStoreTest {
@Mock
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHelperJUnitTest.java
index 0e251e1..1c08144 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHelperJUnitTest.java
@@ -17,9 +17,7 @@ package org.apache.geode.internal.cache;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PartitionedRegionHelperJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorTest.java
index 5f67276..f040b9f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorTest.java
@@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.query.QueryException;
@@ -50,7 +49,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PartitionedRegionQueryEvaluatorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTrackerTest.java
index e5623a4..3ee96dc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTrackerTest.java
@@ -24,9 +24,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PartitionedRegionRedundancyTrackerTest {
private static final int TARGET_COPIES = 2;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java
index 01d5b00..1dfa2e8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PlaceHolderDiskRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java
index c1bb112..2c30f80 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ProxyBucketRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionCommitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RegionCommitTest.java
index 2c2ed13..193faf2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionCommitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RegionCommitTest.java
@@ -20,12 +20,10 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.TXCommitMessage.RegionCommit;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionCommitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java
index 8c508ef..b86eb27 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java
@@ -22,11 +22,9 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.InitialImageOperation.RequestFilterInfoMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RequestFilterInfoMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java
index ff9d703..9c20331 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java
@@ -19,10 +19,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InitialImageOperation.RequestImageMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RequestImageMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java
index 0cf6cb8..d89fd8f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java
@@ -19,10 +19,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InitialImageOperation.RequestRVVMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RequestRVVMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java
index 31edd50..a5a92bc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java
@@ -28,7 +28,6 @@ import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.DataPolicy;
@@ -41,7 +40,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.offheap.StoredObject;
-import org.apache.geode.test.junit.categories.UnitTest;
public class SearchLoadAndWriteProcessorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java
index e874ba6..0fe3bed 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java
@@ -23,13 +23,11 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.GemFireIOException;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.StateFlushOperation.StateMarkerMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StateMarkerMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java
index 3413d8d..6f92bd2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java
@@ -19,10 +19,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TXEventTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
index 97eef1f..91ba412 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
@@ -30,13 +30,11 @@ import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.partitioned.DestroyMessage;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TXManagerImplTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java
index 6fea7e8..d0b9630 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java
@@ -19,10 +19,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TXMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXRegionLockRequestImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXRegionLockRequestImplTest.java
index ffd52db..91346b0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXRegionLockRequestImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXRegionLockRequestImplTest.java
@@ -23,12 +23,10 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
import org.apache.geode.cache.CacheClosedException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TXRegionLockRequestImplTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateProxyImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateProxyImplTest.java
index 95c3320..1113246 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateProxyImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateProxyImplTest.java
@@ -20,12 +20,10 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.LocalRegion.NonTXEntry;
import org.apache.geode.internal.cache.region.entry.RegionEntryFactoryBuilder;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TXStateProxyImplTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java
index 294c7b7..b09ccfd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java
@@ -20,10 +20,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.tx.TXRegionStub;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TXStateStubTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXSynchronizationRunnableTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXSynchronizationRunnableTest.java
index 6e27021..0210874 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXSynchronizationRunnableTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXSynchronizationRunnableTest.java
@@ -21,12 +21,10 @@ import static org.mockito.Mockito.mock;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.internal.cache.tier.sockets.CommBufferPool;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TXSynchronizationRunnableTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TxCommitMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TxCommitMessageTest.java
index 5bd5174..dab050a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TxCommitMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TxCommitMessageTest.java
@@ -27,7 +27,6 @@ import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.internal.DistributionManager;
@@ -35,7 +34,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.Version;
import org.apache.geode.internal.VersionedDataStream;
import org.apache.geode.internal.cache.versions.VersionSource;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for TxCommitMessage.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java
index 7354d68..3d76321 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java
@@ -25,10 +25,8 @@ import java.io.DataOutputStream;
import java.io.IOException;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test for the new variable length format
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/VMLRURegionMapTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/VMLRURegionMapTest.java
index 188f864..dbfacdb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/VMLRURegionMapTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/VMLRURegionMapTest.java
@@ -21,9 +21,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class VMLRURegionMapTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupFactoryTest.java
index 3171f6d..2e7e96b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupFactoryTest.java
@@ -23,14 +23,12 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbortBackupFactoryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupRequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupRequestTest.java
index a545a58..c2cfaa5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupRequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupRequestTest.java
@@ -26,12 +26,10 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbortBackupRequestTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupStepTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupStepTest.java
index ef0bfd2..480c836 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupStepTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupStepTest.java
@@ -29,7 +29,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.mockito.stubbing.Answer;
@@ -39,7 +38,6 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbortBackupStepTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbstractBackupWriterConfigTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbstractBackupWriterConfigTest.java
index c1c8ece..ebd32e1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbstractBackupWriterConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbstractBackupWriterConfigTest.java
@@ -25,9 +25,7 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractBackupWriterConfigTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDefinitionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDefinitionTest.java
index a74865e..ca84aa6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDefinitionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDefinitionTest.java
@@ -23,10 +23,8 @@ import java.nio.file.Paths;
import java.util.Collections;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DiskStore;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BackupDefinitionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupReplyProcessorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupReplyProcessorTest.java
index b8a3292..ffd637d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupReplyProcessorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupReplyProcessorTest.java
@@ -26,7 +26,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.persistence.PersistentID;
@@ -34,7 +33,6 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BackupReplyProcessorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupServiceTest.java
index 8074648..9c4979c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupServiceTest.java
@@ -26,13 +26,11 @@ import java.util.HashSet;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BackupServiceTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupWriterFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupWriterFactoryTest.java
index fd0b407..6b12dff 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupWriterFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupWriterFactoryTest.java
@@ -27,9 +27,7 @@ import java.nio.file.Paths;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BackupWriterFactoryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterConfigTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterConfigTest.java
index 2da3b20..7f7c80f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterConfigTest.java
@@ -24,9 +24,7 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FileSystemBackupWriterConfigTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemIncrementalBackupLocationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemIncrementalBackupLocationTest.java
index 2756a1d..9d02fb5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemIncrementalBackupLocationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemIncrementalBackupLocationTest.java
@@ -32,13 +32,11 @@ import java.util.Set;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.cache.DiskStore;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FileSystemIncrementalBackupLocationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupFactoryTest.java
index 3a3f999..19650e6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupFactoryTest.java
@@ -23,14 +23,12 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FinishBackupFactoryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupRequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupRequestTest.java
index 9a7940d..19ee880 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupRequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupRequestTest.java
@@ -27,14 +27,12 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.persistence.PersistentID;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.admin.remote.AdminFailureResponse;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FinishBackupRequestTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupStepTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupStepTest.java
index 151c884..04c2a19 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupStepTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupStepTest.java
@@ -30,7 +30,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.mockito.stubbing.Answer;
@@ -40,7 +39,6 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FinishBackupStepTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskFactoryTest.java
index b63ff55..7995de4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskFactoryTest.java
@@ -23,14 +23,12 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FlushToDiskFactoryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskRequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskRequestTest.java
index d0e1e68..09aa2e8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskRequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskRequestTest.java
@@ -26,12 +26,10 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FlushToDiskRequestTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskStepTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskStepTest.java
index 33d2866..056244e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskStepTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskStepTest.java
@@ -27,7 +27,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.apache.geode.cache.CacheClosedException;
@@ -35,7 +34,6 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FlushToDiskStepTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java
index f0c8956..24bdd22 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java
@@ -24,14 +24,12 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PrepareBackupFactoryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupRequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupRequestTest.java
index 00336f9..7ddd284 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupRequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupRequestTest.java
@@ -29,14 +29,12 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.persistence.PersistentID;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.admin.remote.AdminFailureResponse;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PrepareBackupRequestTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupStepTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupStepTest.java
index c2a54f5..797dc42 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupStepTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupStepTest.java
@@ -32,7 +32,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.mockito.stubbing.Answer;
@@ -42,7 +41,6 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PrepareBackupStepTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/TemporaryBackupFilesTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/TemporaryBackupFilesTest.java
index fb5167e..0c04042 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/TemporaryBackupFilesTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/TemporaryBackupFilesTest.java
@@ -25,12 +25,10 @@ import java.nio.file.Path;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.cache.DiskStore;
import org.apache.geode.internal.cache.DirectoryHolder;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TemporaryBackupFilesTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/FilterByPathJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/FilterByPathJUnitTest.java
index 36a9ad2..c5ab00b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/FilterByPathJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/FilterByPathJUnitTest.java
@@ -23,10 +23,8 @@ import java.lang.reflect.Proxy;
import java.util.HashSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FilterByPathJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryThresholdsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryThresholdsJUnitTest.java
index bc57437..557fe76 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryThresholdsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryThresholdsJUnitTest.java
@@ -20,10 +20,8 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.control.MemoryThresholds.MemoryState;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MemoryThresholdsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java
index 65cc575..3b9219f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java
@@ -20,10 +20,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ResourceAdvisorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/entries/AbstractRegionEntryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/entries/AbstractRegionEntryTest.java
index 560bbac..b1684ac 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/entries/AbstractRegionEntryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/entries/AbstractRegionEntryTest.java
@@ -30,7 +30,6 @@ import java.io.IOException;
import org.assertj.core.api.Assertions;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.QueryException;
@@ -51,7 +50,6 @@ import org.apache.geode.internal.offheap.SlabImpl;
import org.apache.geode.internal.offheap.StoredObject;
import org.apache.geode.internal.offheap.annotations.Unretained;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractRegionEntryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java
index 729d63b..1f3b877 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java
@@ -30,7 +30,6 @@ import java.util.concurrent.ConcurrentMap;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.DataPolicy;
@@ -46,7 +45,6 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributedEventTrackerTest {
LocalRegion region;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerExpiryTaskTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerExpiryTaskTest.java
index 7c7306c..eeaebaf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerExpiryTaskTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerExpiryTaskTest.java
@@ -19,12 +19,10 @@ import static org.mockito.Mockito.mock;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
-import org.apache.geode.test.junit.categories.UnitTest;
public class EventTrackerExpiryTaskTest {
private static final long TIME_TO_LIVE = 100;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/event/NonDistributedEventTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/event/NonDistributedEventTrackerTest.java
index a141997..e6c2df6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/event/NonDistributedEventTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/event/NonDistributedEventTrackerTest.java
@@ -23,12 +23,10 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.InternalCacheEvent;
-import org.apache.geode.test.junit.categories.UnitTest;
public class NonDistributedEventTrackerTest {
private NonDistributedEventTracker tracker = NonDistributedEventTracker.getInstance();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/AbstractEvictionListTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/AbstractEvictionListTest.java
index 8a4bb9e..858f834 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/AbstractEvictionListTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/AbstractEvictionListTest.java
@@ -23,12 +23,10 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.versions.RegionVersionVector;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractEvictionListTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionListBuilderTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionListBuilderTest.java
index 36cd9eb..6c9f7b6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionListBuilderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionListBuilderTest.java
@@ -23,10 +23,8 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.ClearSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EvictionAlgorithm;
-import org.apache.geode.test.junit.categories.UnitTest;
public class EvictionListBuilderTest {
private static final String EVICTION_PROPERTY_NAME = "geode." + EVICTION_SCAN_ASYNC;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LIFOListTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LIFOListTest.java
index 0b572c6..189c358 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LIFOListTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LIFOListTest.java
@@ -22,10 +22,8 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.BucketRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LIFOListTest {
private BucketRegion bucketRegion;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingTest.java
index 3cc356c..5dbe9af 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingTest.java
@@ -33,13 +33,11 @@ import java.util.stream.IntStream;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.lang.SystemPropertyHelper;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LRUListWithAsyncSortingTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingTest.java
index 1ddb3ae..4a61e68 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingTest.java
@@ -24,12 +24,10 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.lang.SystemPropertyHelper;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LRUListWithSyncSortingTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java
index 728ced4..8d77bb6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java
@@ -25,12 +25,10 @@ import java.util.NoSuchElementException;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SimpleExtensionPoint}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
index 51d9ba6..e04feab 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.internal.VersionedDataInputStream;
import org.apache.geode.internal.VersionedDataOutputStream;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* This test verifies that eventId, while being sent across the network ( client to server, server
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueTest.java
index 1e0cc52..081a3e5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.internal.cache.HARegion;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.util.concurrent.StoppableReentrantReadWriteLock;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientSubscriptionTest.class})
public class HARegionQueueTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
index 8155cd1..c467e4e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
@@ -29,7 +29,6 @@ import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.ha.ThreadIdentifier.WanType;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class ThreadIdentifierJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/map/AbstractRegionMapPutTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/map/AbstractRegionMapPutTest.java
index c5e4781..a02c35a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/map/AbstractRegionMapPutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/map/AbstractRegionMapPutTest.java
@@ -33,7 +33,6 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.apache.geode.cache.DiskAccessException;
@@ -43,7 +42,6 @@ import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.internal.cache.RegionEntryFactory;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractRegionMapPutTest {
private final InternalRegion internalRegion = mock(InternalRegion.class);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapCommitPutTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapCommitPutTest.java
index d99aee3..023cebc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapCommitPutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapCommitPutTest.java
@@ -34,7 +34,6 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.TransactionId;
@@ -52,7 +51,6 @@ import org.apache.geode.internal.cache.TXEntryState;
import org.apache.geode.internal.cache.TXRmtEvent;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionMapCommitPutTest {
private final InternalRegion internalRegion = mock(InternalRegion.class);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapDestroyTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapDestroyTest.java
index 4e2c122..774f090 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapDestroyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapDestroyTest.java
@@ -30,7 +30,6 @@ import static org.mockito.Mockito.when;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.EntryNotFoundException;
@@ -53,7 +52,6 @@ import org.apache.geode.internal.cache.eviction.EvictionCounters;
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionMapDestroyTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapPutTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapPutTest.java
index 1abd7d9..e525785 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapPutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapPutTest.java
@@ -37,7 +37,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheWriter;
import org.apache.geode.cache.DiskAccessException;
@@ -57,7 +56,6 @@ import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationExcep
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionMapPutTest {
private final InternalRegion internalRegion = mock(InternalRegion.class);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java
index 1a6e2fe..e4e7573 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BucketBackupMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java
index 5637bfe..4e3c706 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java
@@ -27,9 +27,7 @@ import java.io.DataOutput;
import java.io.DataOutputStream;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ColocatedRegionDetailsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
index e1cb981..ae92fd2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DeposePrimaryBucketMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
index 55e2112..dfc4b77 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
@@ -23,7 +23,6 @@ import static org.mockito.Mockito.mock;
import java.io.IOException;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -36,7 +35,6 @@ import org.apache.geode.internal.cache.partitioned.FetchEntriesMessage.FetchEntr
import org.apache.geode.internal.cache.partitioned.FetchEntriesMessage.FetchEntriesResponse;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FetchEntriesMessageJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
index 46b7029..e57a026 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
@@ -22,11 +22,9 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FetchEntryMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessageTest.java
index 3ea3be3..547144a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessageTest.java
@@ -30,7 +30,6 @@ import static org.mockito.MockitoAnnotations.initMocks;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.InOrder;
@@ -45,7 +44,6 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.TXId;
import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TXStateProxy;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FetchKeysMessageTest {
@Mock(answer = RETURNS_DEEP_STUBS)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
index 587adac..d24f4bc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FetchPartitionDetailsMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketReplyMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketReplyMessageTest.java
index 728e0cf..d4dd278 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketReplyMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketReplyMessageTest.java
@@ -24,7 +24,6 @@ import static org.mockito.MockitoAnnotations.initMocks;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
@@ -35,7 +34,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionDataStore;
import org.apache.geode.internal.cache.PartitionedRegionStats;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ManageBackupBucketReplyMessageTest {
@Mock
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
index b6e2606..ab5763f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MoveBucketMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/OfflineMembersDetailsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/OfflineMembersDetailsJUnitTest.java
index 8bae667..76721bb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/OfflineMembersDetailsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/OfflineMembersDetailsJUnitTest.java
@@ -24,11 +24,9 @@ import java.util.HashSet;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OfflineMembersDetailsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java
index 19cf462..1014863 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java
@@ -24,7 +24,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.DistributionAdvisor;
@@ -35,7 +34,6 @@ import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TXStateProxy;
import org.apache.geode.internal.cache.TXStateProxyImpl;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PartitionMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PutPutReplyMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PutPutReplyMessageJUnitTest.java
index ea56652..39f76a4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PutPutReplyMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PutPutReplyMessageJUnitTest.java
@@ -18,14 +18,11 @@ import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache.Operation;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.cache.EntryEventImpl.OldValueImporter;
import org.apache.geode.internal.cache.OldValueImporterTestBase;
import org.apache.geode.internal.cache.partitioned.PutMessage.PutReplyMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PutPutReplyMessageJUnitTest extends OldValueImporterTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemotePutMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemotePutMessageJUnitTest.java
index c52b407..17dd397 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemotePutMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemotePutMessageJUnitTest.java
@@ -24,7 +24,6 @@ import java.util.HashSet;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.cache.Operation;
@@ -32,7 +31,6 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EventID;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemotePutMessageJUnitTest {
static final int UNKNOWN_REGION = 234;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
index f5c4040..e9e4fb0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemoveAllPRMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
index bea842b..4f3acb3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemoveBucketMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
index 544dca5..90f23e5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class SizeMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorImplTest.java
index eb19d52..9602002 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorImplTest.java
@@ -29,14 +29,12 @@ import java.util.Map;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.control.InternalResourceManager;
import org.apache.geode.internal.cache.partitioned.PartitionedRegionRebalanceOp;
import org.apache.geode.internal.cache.partitioned.rebalance.BucketOperator.Completion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BucketOperatorImplTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorWrapperTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorWrapperTest.java
index ba49ff8..3f7b920 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorWrapperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorWrapperTest.java
@@ -36,7 +36,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -45,7 +44,6 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.control.PartitionRebalanceDetailsImpl;
import org.apache.geode.internal.cache.control.ResourceManagerStats;
import org.apache.geode.internal.cache.partitioned.rebalance.BucketOperator.Completion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BucketOperatorWrapperTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModelJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModelJUnitTest.java
index 31940ec..4d32913 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModelJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModelJUnitTest.java
@@ -34,7 +34,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.partition.PartitionMemberInfo;
@@ -47,7 +46,6 @@ import org.apache.geode.internal.cache.partitioned.rebalance.BucketOperator.Comp
import org.apache.geode.internal.cache.partitioned.rebalance.model.AddressComparor;
import org.apache.geode.internal.cache.partitioned.rebalance.model.PartitionedRegionLoadModel;
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PartitionedRegionLoadModelJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsTest.java
index 78139c2..588dc81 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsTest.java
@@ -27,9 +27,7 @@ import java.io.File;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DefaultDiskDirsTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java
index 650b8eb..f976fd3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java
@@ -43,7 +43,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.apache.geode.CancelCriterion;
@@ -54,7 +53,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.CacheDistributionAdvisor;
import org.apache.geode.internal.cache.CacheDistributionAdvisor.InitialImageAdvice;
import org.apache.geode.internal.lang.SystemPropertyHelper;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PersistenceInitialImageAdvisorTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java
index 03c5ec7..410d3d8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java
@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.TreeMap;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.persistence.query.IndexMap.IndexEntry;
@@ -31,7 +30,6 @@ import org.apache.geode.internal.cache.persistence.query.mock.IndexMapImpl;
import org.apache.geode.internal.cache.persistence.query.mock.NaturalComparator;
import org.apache.geode.internal.cache.persistence.query.mock.Pair;
import org.apache.geode.internal.cache.persistence.query.mock.PairComparator;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TemporaryResultSetFactoryJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
index cb9ccd0..cf22315 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
@@ -20,10 +20,8 @@ import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(JUnitParamsRunner.class)
public class RegionEntryFactoryBuilderJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ClientExporterTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ClientExporterTest.java
index 640d9d3..5a8aff0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ClientExporterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ClientExporterTest.java
@@ -22,7 +22,6 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -30,7 +29,6 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.internal.cache.execute.FunctionContextImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ClientExporterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ParallelSnapshotFileMapperTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ParallelSnapshotFileMapperTest.java
index 8212622..df96a4c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ParallelSnapshotFileMapperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ParallelSnapshotFileMapperTest.java
@@ -25,11 +25,9 @@ import java.net.UnknownHostException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ParallelSnapshotFileMapperTest {
private static final int PORT = 1234;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java
index ce62a49..88a713c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.tier.sockets.CacheClientUpdater.CCUStats;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientSubscriptionTest.class})
public class CCUStatsTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
index 50bf246..42a7124 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
@@ -29,7 +29,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* This is a functional-test for <code>ClientHealthMonitor</code>.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java
index b987318..a711a7c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.InterestType;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientSubscriptionTest.class})
public class FilterProfileJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HandshakeTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HandshakeTest.java
index f244b92..71579d2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HandshakeTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HandshakeTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class HandshakeTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageIdExtractorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageIdExtractorTest.java
index 218ce16..e11bcbd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageIdExtractorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageIdExtractorTest.java
@@ -34,7 +34,6 @@ import org.mockito.MockitoAnnotations;
import org.apache.geode.internal.cache.tier.Encryptor;
import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class MessageIdExtractorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
index b0f4223..c2a9139 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
@@ -37,7 +37,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.Version;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class MessageJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
index dea2fde..c1f8880 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
@@ -26,7 +26,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.CopyHelper;
import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class ObjectPartListJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/PartTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/PartTest.java
index c73b6ba..2684685 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/PartTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/PartTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class PartTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java
index 6832f33..4931f8d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.CommunicationMode;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* We don't test the path where the service providing protobufProtocolHandler is actually present,
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java
index c1b0e8f..f55f41a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionTest.java
@@ -47,7 +47,6 @@ import org.apache.geode.internal.cache.tier.ServerSideHandshake;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.RestoreLocaleRule;
@Category({ClientServerTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactoryTest.java
index e4b2d52..ec2bea7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactoryTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.tcpserver.TcpServer;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({MembershipTest.class})
public class TcpServerFactoryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java
index 2143e79..e77c533 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java
@@ -42,7 +42,6 @@ import org.apache.geode.internal.cache.tier.ServerSideHandshake;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Exposes GEODE-537: NPE in JTA AFTER_COMPLETION command processing
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java
index ff60cf0..c859c2e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java
@@ -40,7 +40,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class ContainsKey66Test {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java
index e3681e7..540accd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class ContainsKeyTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java
index d57a434..93134d3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java
@@ -42,7 +42,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class CreateRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java
index 64f240f..68315ab 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java
@@ -44,7 +44,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class Destroy65Test {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java
index 2b91d74..b1146dc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class DestroyRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java
index 678f1e1..13ed684 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class DestroyTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java
index c83e18d..0ba095d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction65Test.java
@@ -60,7 +60,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
@RunWith(PowerMockRunner.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java
index 9e3810f..a61e49f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction66Test.java
@@ -58,7 +58,6 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.internal.security.ResourcePermissions;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
@RunWith(PowerMockRunner.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java
index 88f4fef..d9fd4aa 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunctionTest.java
@@ -58,7 +58,6 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.internal.security.ResourcePermissions;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
@RunWith(PowerMockRunner.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java
index db90063..51bf52f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java
@@ -45,7 +45,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class Get70Test {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java
index 54956a6..dc49e7d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java
@@ -49,7 +49,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class GetAll651Test {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java
index 2a03e2f..6bc3a9c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java
@@ -49,7 +49,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class GetAll70Test {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java
index 67028d0..fbd5c6c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java
@@ -48,7 +48,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class GetAllTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java
index 539ebc9..a71dac5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java
@@ -46,7 +46,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class GetAllWithCallbackTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
index 694b2dc..abc7d50 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
@@ -34,7 +34,6 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class GetClientPartitionAttributesCommand66Test {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
index 002587d..0141363 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class GetClientPartitionAttributesCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java
index 9e4e050..40f75cf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java
@@ -47,7 +47,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class InvalidateTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java
index 0a1bc57..81f549b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java
@@ -50,7 +50,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class KeySetTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java
index 343337c..34a97f4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java
@@ -47,7 +47,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class Put61Test {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
index 53e3c7d..2f31f0d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
@@ -48,7 +48,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class Put65Test {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
index 7515b1e..34dd0ee 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
@@ -49,7 +49,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class PutTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
index bf73cd5..e6ab019 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
@@ -49,7 +49,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class RegisterInterest61Test {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java
index 6277237..789c1f9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java
@@ -48,7 +48,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class RegisterInterestList61Test {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
index 8d841e8..15fb326 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
@@ -50,7 +50,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class RegisterInterestList66Test {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java
index 7976057..cb8d6b3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java
@@ -48,7 +48,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class RegisterInterestListTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
index 9c578f1..c6bcf109 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
@@ -47,7 +47,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class RegisterInterestTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
index e16632a..8ebe735 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
@@ -45,7 +45,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class RemoveAllTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
index 5407e08..85c23bd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
@@ -45,7 +45,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class RequestTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommandTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommandTest.java
index dbd1427..e8105db 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/TXFailoverCommandTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class TXFailoverCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
index fec92c6..c27175d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
@@ -54,7 +54,6 @@ import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(PowerMockRunner.class)
@PowerMockIgnore({"*.UnitTest"})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java
index 7a6b232..aa3cbc8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java
@@ -26,7 +26,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.mockito.Mockito;
@@ -50,7 +49,6 @@ import org.apache.geode.internal.cache.RemoteOperationException;
import org.apache.geode.internal.cache.TXStateStub;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractPeerTXRegionStubTest {
private AbstractPeerTXRegionStub txrStub;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/ClientTXStateStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/ClientTXStateStubTest.java
index c33c162..443bbbb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/ClientTXStateStubTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/ClientTXStateStubTest.java
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.apache.geode.CancelCriterion;
@@ -45,7 +44,6 @@ import org.apache.geode.internal.cache.TXLockRequest;
import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TXRegionLockRequestImpl;
import org.apache.geode.internal.cache.TXStateProxy;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ClientTXStateStubTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteFetchEntryMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteFetchEntryMessageTest.java
index 7963de0..bba0003 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteFetchEntryMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteFetchEntryMessageTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemoteFetchEntryMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationMessageTest.java
index f7222ad..145d711 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationMessageTest.java
@@ -31,7 +31,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.CacheClosedException;
@@ -49,7 +48,6 @@ import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TXStateProxy;
import org.apache.geode.internal.cache.TXStateProxyImpl;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemoteOperationMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationResponseTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationResponseTest.java
index 4ed9acb..3778a6b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationResponseTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationResponseTest.java
@@ -27,7 +27,6 @@ import static org.mockito.Mockito.when;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelException;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -38,7 +37,6 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.RemoteOperationException;
import org.apache.geode.internal.cache.tx.RemoteOperationMessage.RemoteOperationResponse;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemoteOperationResponseTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutAllMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutAllMessageTest.java
index 6f33951..0413504 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutAllMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutAllMessageTest.java
@@ -21,9 +21,7 @@ import static org.mockito.Mockito.verify;
import java.io.DataInput;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemotePutAllMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
index e7b1d4d..f5a8c1f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
@@ -22,7 +22,6 @@ import java.util.HashSet;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -35,7 +34,6 @@ import org.apache.geode.internal.cache.CacheDistributionAdvisor;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.RemoteOperationException;
-import org.apache.geode.test.junit.categories.UnitTest;
@PowerMockIgnore("*.UnitTest")
@RunWith(PowerMockRunner.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutReplyMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutReplyMessageJUnitTest.java
index 96f9897..1855e42 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutReplyMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutReplyMessageJUnitTest.java
@@ -18,14 +18,11 @@ import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache.Operation;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.cache.EntryEventImpl.OldValueImporter;
import org.apache.geode.internal.cache.OldValueImporterTestBase;
import org.apache.geode.internal.cache.tx.RemotePutMessage.PutReplyMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemotePutReplyMessageJUnitTest extends OldValueImporterTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteRemoveAllMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteRemoveAllMessageTest.java
index f445eb4..ce476a5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteRemoveAllMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteRemoveAllMessageTest.java
@@ -21,9 +21,7 @@ import static org.mockito.Mockito.verify;
import java.io.DataInput;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemoteRemoveAllMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RVVExceptionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RVVExceptionJUnitTest.java
index 4918c32..88a7a19 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RVVExceptionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RVVExceptionJUnitTest.java
@@ -17,9 +17,7 @@ package org.apache.geode.internal.cache.versions;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RVVExceptionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolder2JUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolder2JUnitTest.java
index 266fcfd..97189fa 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolder2JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolder2JUnitTest.java
@@ -18,9 +18,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionVersionHolder2JUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
index 341385d..38f1397 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
@@ -24,12 +24,10 @@ import java.util.BitSet;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.versions.RVVException.ReceivedVersionsIterator;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionVersionHolderJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
index e6231a3..b36535b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
@@ -24,9 +24,7 @@ import java.util.Random;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* A test of the region version holder, where all of the test methods will now build there RVV by
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java
index cf6f3da..4676348 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java
@@ -14,9 +14,7 @@
*/
package org.apache.geode.internal.cache.versions;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* A test of the region version holder, but using a smaller bit set so that we test the merging of
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java
similarity index 98%
rename from geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java
rename to geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java
index 96932a6..deb7d4e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java
@@ -30,6 +30,7 @@ import java.io.DataInputStream;
import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.IOException;
+import java.net.UnknownHostException;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -38,7 +39,6 @@ import java.util.concurrent.Future;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.DataSerializer;
@@ -48,8 +48,7 @@ import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
-import org.apache.geode.test.dunit.NetworkUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
public class RegionVersionVectorTest {
@@ -66,7 +65,7 @@ public class RegionVersionVectorTest {
*/
@Test
public void testSynchronizationVectorContainsAllVersionsForOwnerAndNonTarget() {
- final String local = NetworkUtils.getIPLiteral();
+ final String local = getIPLiteral();
InternalDistributedMember server1 = new InternalDistributedMember(local, 101);
InternalDistributedMember server2 = new InternalDistributedMember(local, 102);
InternalDistributedMember server3 = new InternalDistributedMember(local, 103);
@@ -120,7 +119,7 @@ public class RegionVersionVectorTest {
public void testRegionVersionVectors() throws Exception {
// this is just a quick set of unit tests for basic RVV functionality
- final String local = NetworkUtils.getIPLiteral();
+ final String local = getIPLiteral();
InternalDistributedMember server1 = new InternalDistributedMember(local, 101);
InternalDistributedMember server2 = new InternalDistributedMember(local, 102);
InternalDistributedMember server3 = new InternalDistributedMember(local, 103);
@@ -592,7 +591,7 @@ public class RegionVersionVectorTest {
public void testRecordVersionDuringRegionInit() {
LocalRegion mockRegion = mock(LocalRegion.class);
when(mockRegion.isInitialized()).thenReturn(false);
- final String local = NetworkUtils.getIPLiteral();
+ final String local = getIPLiteral();
InternalDistributedMember ownerId = new InternalDistributedMember(local, 101);
VMVersionTag tag = new VMVersionTag();
tag.setRegionVersion(1L);
@@ -606,7 +605,7 @@ public class RegionVersionVectorTest {
public void testRecordVersionAfterRegionInitThrowsException() {
LocalRegion mockRegion = mock(LocalRegion.class);
when(mockRegion.isInitialized()).thenReturn(true);
- final String local = NetworkUtils.getIPLiteral();
+ final String local = getIPLiteral();
InternalDistributedMember ownerId = new InternalDistributedMember(local, 101);
VMVersionTag tag = new VMVersionTag();
tag.setRegionVersion(1L);
@@ -741,6 +740,14 @@ public class RegionVersionVectorTest {
}
}
+ private static String getIPLiteral() {
+ try {
+ return SocketCreator.getLocalHost().getHostAddress();
+ } catch (UnknownHostException e) {
+ throw new Error("Problem determining host IP address", e);
+ }
+ }
+
private static class VersionRaceConditionRegionVersionVector extends TestableRegionVersionVector {
VersionRaceConditionRegionVersionVector(VersionSource<InternalDistributedMember> ownerId,
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/VMVersionTagTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/VMVersionTagTest.java
index cb37bc2..7a4971e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/VMVersionTagTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/VMVersionTagTest.java
@@ -14,9 +14,7 @@
*/
package org.apache.geode.internal.cache.versions;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class VMVersionTagTest extends AbstractVersionTagTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessorJUnitTest.java
index 27eda0a..920c399 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessorJUnitTest.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Operation;
import org.apache.geode.internal.cache.GemFireCacheImpl;
@@ -33,7 +32,6 @@ import org.apache.geode.internal.cache.wan.AbstractGatewaySenderEventProcessor;
import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
import org.apache.geode.internal.cache.wan.GatewaySenderStats;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ParallelGatewaySenderEventProcessorJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java
index a0adacd..d03a15c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java
@@ -30,7 +30,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
@@ -48,7 +47,6 @@ import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
import org.apache.geode.internal.cache.wan.GatewaySenderStats;
import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue.MetaRegionFactory;
import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue.ParallelGatewaySenderQueueMetaRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ParallelGatewaySenderQueueJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
index 88c35af..7633044 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
@@ -32,7 +32,6 @@ import java.util.concurrent.LinkedBlockingQueue;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -68,7 +67,6 @@ import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
import org.apache.geode.internal.cache.wan.GatewaySenderStats;
import org.apache.geode.internal.statistics.DummyStatisticsFactory;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ParallelQueueRemovalMessageJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java
index 4901bdf..afb379e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.RegionQueue;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ConcurrentSerialGatewaySenderEventProcessorJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
index c091ce6..1aa67f2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
@@ -20,12 +20,10 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.InternalCacheEvent;
import org.apache.geode.internal.cache.wan.serial.BatchDestroyOperation.DestroyMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DestroyMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessorJUnitTest.java
index 20844af..2f15517 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessorJUnitTest.java
@@ -26,7 +26,6 @@ import java.util.Map;
import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.test.util.ReflectionTestUtils;
import org.apache.geode.cache.Operation;
@@ -38,7 +37,6 @@ import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
import org.apache.geode.internal.cache.wan.GatewaySenderStats;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.UnitTest;
public class SerialGatewaySenderEventProcessorJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
index 275ab24..7d529d4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
@@ -19,12 +19,10 @@ import static org.junit.Assert.assertSame;
import java.util.Stack;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link AbstractXmlParser}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
index 0bdd6cd..6fa5cbc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
@@ -35,7 +35,6 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -49,7 +48,6 @@ import org.apache.geode.cache.wan.GatewayReceiverFactory;
import org.apache.geode.internal.cache.CacheServerImpl;
import org.apache.geode.internal.cache.CacheServerLauncher;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CacheCreationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java
index 2f94665..721479e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java
@@ -21,11 +21,9 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.TransactionListener;
import org.apache.geode.cache.TransactionWriter;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CacheTransactionManagerCreationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
index b4c856a..9947be6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
@@ -34,9 +34,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* @since GemFire 8.1
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
index b18128f..11c3ce4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
@@ -20,10 +20,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.xml.sax.InputSource;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DefaultEntityResolver2Test {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java
index a3ef878..4746947 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java
@@ -15,10 +15,8 @@
package org.apache.geode.internal.cache.xmlcache;
import org.junit.Before;
-import org.junit.experimental.categories.Category;
import org.xml.sax.EntityResolver;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit test for {@link GeodeEntityResolver} and {@link DefaultEntityResolver2}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
index 0c5f2b5..9017429 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
@@ -15,10 +15,8 @@
package org.apache.geode.internal.cache.xmlcache;
import org.junit.Before;
-import org.junit.experimental.categories.Category;
import org.xml.sax.EntityResolver;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit test for {@link PivotalEntityResolver} and {@link DefaultEntityResolver2}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
index 9bf61c0..8984ffe 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
@@ -18,13 +18,11 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.extension.ExtensionPoint;
import org.apache.geode.internal.cache.extension.SimpleExtensionPoint;
import org.apache.geode.internal.cache.extension.SimpleExtensionPointJUnitTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit test for {@link RegionCreation}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
index 91342eb..fd6cd0d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
@@ -23,14 +23,12 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.xml.XMLConstants;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit Tests for {@link XmlGeneratorUtils}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java
index 15bcb71..311022a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java
@@ -30,12 +30,10 @@ import javax.xml.bind.annotation.XmlType;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.cache.configuration.CacheElement;
import org.apache.geode.cache.configuration.RegionConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JAXBServiceTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
index 5c5714e..d5d73b7 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
@@ -29,9 +29,7 @@ import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for CompositeOutputStream.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java
index 9afb8d4..3d33697 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java
@@ -35,9 +35,7 @@ import javax.naming.NoPermissionException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests all basic methods of ContextImpl.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
index b18cd87..ad118ef 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
@@ -23,9 +23,7 @@ import java.util.Calendar;
import java.util.Date;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The ClassUtilsJUnitTest class is a test suite with test cases to test the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java
index fdc92e6..3a95eee 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java
@@ -18,9 +18,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The InOutParameterJUnitTest class is a test suite with test cases to test the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
index 70a1ab4..279ac18 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
@@ -20,9 +20,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The ObjectUtilsJUnitTest class is a test suite of test cases for testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java
index b6e1ac2..c4c23f3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java
@@ -24,12 +24,10 @@ import java.io.DataOutputStream;
import java.io.IOException;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.CachedDeserializableFactory;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The StringUtilsJUnitTest is a test suite containing test cases for testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemPropertyHelperTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemPropertyHelperTest.java
index 2bc0056..5193003 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemPropertyHelperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemPropertyHelperTest.java
@@ -17,9 +17,7 @@ package org.apache.geode.internal.lang;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class SystemPropertyHelperTest {
private String restoreSetOperationTransactionBehavior = "restoreSetOperationTransactionBehavior";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
index 0bc4cfd..999cba1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
@@ -46,9 +46,7 @@ import static org.junit.Assume.assumeNotNull;
import java.lang.management.ManagementFactory;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The SystemUtilsJUnitTest class is a test suite of test cases for testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java
index c97b8c3..e1f107a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java
@@ -19,9 +19,7 @@ import static com.googlecode.catchexception.CatchException.caughtException;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ThrowableUtils}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java
index 4f0d8bd..42cca54 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java
@@ -26,12 +26,10 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.logging.log4j.AppenderContext;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for LogService
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterImplJUnitTest.java
index 79074f5..f899ae5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterImplJUnitTest.java
@@ -17,9 +17,7 @@ package org.apache.geode.internal.logging;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LogWriterImplJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/SortLogFileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/SortLogFileJUnitTest.java
index 1c0ba77..3792f04 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/SortLogFileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/SortLogFileJUnitTest.java
@@ -27,10 +27,8 @@ import java.util.Date;
import java.util.Random;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the functionality of the {@link SortLogFile} program.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java
index 6d5a026..3bef251 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java
@@ -31,14 +31,12 @@ import org.apache.logging.log4j.core.config.LoggerConfig;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DurableClientAttributes;
import org.apache.geode.distributed.Role;
import org.apache.geode.internal.admin.Alert;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the AlertAppender.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java
index 5bc039b..7ef021a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java
@@ -31,9 +31,7 @@ import org.apache.logging.log4j.message.ParameterizedMessageFactory;
import org.apache.logging.log4j.spi.ExtendedLogger;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests the FastLogger class which wraps and delegates to an actual Logger with optimizations
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LocalizedMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LocalizedMessageJUnitTest.java
index b7ddedb..b41a055 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LocalizedMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LocalizedMessageJUnitTest.java
@@ -20,10 +20,8 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.i18n.StringId;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests for LocalizedMessage which bridges our StringId LocalizedStrings for Log4J2 usage.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogLevelTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogLevelTest.java
index eff451f..85663d9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogLevelTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogLevelTest.java
@@ -20,10 +20,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.apache.logging.log4j.Level;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.logging.InternalLogWriter;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LogLevelTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java
index 5f3d2ec..0bb4192 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java
@@ -31,12 +31,10 @@ import org.apache.logging.log4j.message.ParameterizedMessage;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.PureLogWriter;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the LogWriterAppender.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
index c09df5e..b2c5d59 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
@@ -50,7 +50,6 @@ import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.internal.admin.SSLConfig;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({MembershipTest.class})
public class SSLConfigurationFactoryJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserJUnitTest.java
index 50e86e3..5c0398c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserJUnitTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the default SocketCloser.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserWithWaitJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserWithWaitJUnitTest.java
index 4e48bc5..7776003 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserWithWaitJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCloserWithWaitJUnitTest.java
@@ -19,7 +19,6 @@ import java.util.concurrent.TimeUnit;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests SocketCloser with a wait time. The default SocketCloser does not wait. This test configures
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java
index d0f45ba..6d2c807 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java
@@ -85,7 +85,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.util.test.TestUtil;
@Category({MembershipTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java
index 49c84de..df7cd47 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.admin.SSLConfig;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.util.test.TestUtil;
@Category({MembershipTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
index e82511a..226eea4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java
@@ -32,7 +32,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The SocketUtilsJUnitTest class is a test suite of test cases testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
index fa710ed..90b5532 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
@@ -50,7 +50,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -68,7 +67,6 @@ import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.InternalInstantiator;
import org.apache.geode.internal.admin.remote.ShutdownAllResponse;
import org.apache.geode.internal.cache.execute.data.CustId;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the DataType support for off-heap MemoryInspector.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java
index 1996fe0..69e3757 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java
@@ -24,13 +24,11 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
import org.apache.geode.OutOfOffHeapMemoryException;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DisconnectingOutOfOffHeapMemoryListenerJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/FragmentJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/FragmentJUnitTest.java
index 875f1f3..1007815 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/FragmentJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/FragmentJUnitTest.java
@@ -26,10 +26,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FragmentJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java
index c882054..8d1373a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java
@@ -31,10 +31,8 @@ import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FreeListManagerTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
index 492906c..5de48a7 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
@@ -23,9 +23,7 @@ import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests LifecycleListener
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
index ca230b8..4a3c508 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
@@ -22,10 +22,8 @@ import static org.junit.Assert.assertTrue;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests fill pattern validation for the {@link MemoryAllocatorImpl}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java
index 55daf58..44ae3bf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java
@@ -31,11 +31,9 @@ import java.util.concurrent.atomic.AtomicReference;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.OutOfOffHeapMemoryException;
import org.apache.geode.cache.CacheClosedException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MemoryAllocatorJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
index 6c605d2..f2e9bc1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
@@ -32,7 +32,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.ProvideSystemProperty;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.cache.CacheClosedException;
@@ -40,7 +39,6 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.DSCODE;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.offheap.MemoryBlock.State;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MemoryBlockNodeJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryInspectorImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryInspectorImplJUnitTest.java
index 4302aed..891e328 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryInspectorImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryInspectorImplJUnitTest.java
@@ -27,9 +27,7 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MemoryInspectorImplJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java
index 6b53963..1c72e11 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java
@@ -29,11 +29,9 @@ import java.nio.ByteBuffer;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.VMCachedDeserializable;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OffHeapHelperJUnitTest extends AbstractStoredObjectTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
index c29fa92..897cfb4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
@@ -29,7 +29,6 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
@@ -48,7 +47,6 @@ import org.apache.geode.internal.cache.VMCachedDeserializable;
import org.apache.geode.internal.cache.entries.DiskEntry;
import org.apache.geode.internal.cache.entries.OffHeapRegionEntry;
import org.apache.geode.internal.cache.entries.VersionedStatsDiskRegionEntryOffHeap;
-import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("*.UnitTest")
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java
index 1b761c0..4481ddb 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java
@@ -24,7 +24,6 @@ import static org.mockito.Mockito.verify;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.OutOfOffHeapMemoryException;
import org.apache.geode.StatisticsFactory;
@@ -34,7 +33,6 @@ import org.apache.geode.distributed.internal.DistributionStats;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.statistics.LocalStatisticsFactory;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OffHeapStorageJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java
index 00c67b7..f742804 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java
@@ -22,11 +22,9 @@ import static org.mockito.Mockito.withSettings;
import org.apache.logging.log4j.Logger;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.listeners.InvocationListener;
import org.mockito.listeners.MethodInvocationReport;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OffHeapStoredObjectAddressStackJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java
index 92bf770..87b5f1f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java
@@ -35,7 +35,6 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.compression.Compressor;
import org.apache.geode.internal.DSCODE;
@@ -46,7 +45,6 @@ import org.apache.geode.internal.cache.CachePerfStats;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.offheap.MemoryBlock.State;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OffHeapStoredObjectJUnitTest extends AbstractStoredObjectTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java
index d65bbbe..302f27b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java
@@ -18,9 +18,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OffHeapStoredObjectSliceJUnitTest extends OffHeapStoredObjectJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java
index 28da0ba..a74d7e5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java
@@ -21,9 +21,7 @@ import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OffHeapStoredObjectWithHeapFormJUnitTest extends OffHeapStoredObjectJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java
index fa07c34..420f30d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java
@@ -25,12 +25,10 @@ import java.io.IOException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.cache.EntryEventImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OffHeapWriteObjectAsByteArrayJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java
index f61378e..f9bcc52 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java
@@ -19,9 +19,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RefCountChangeInfoJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java
index 781c030..03fac15 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java
@@ -28,7 +28,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.SystemOutRule;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -36,7 +35,6 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.test.junit.categories.UnitTest;
/*
* PowerMock used in this test to verify static method MemoryAllocatorImpl.debugLog
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java
index baf9c81..a7ca6101 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
@@ -35,7 +34,6 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
-import org.apache.geode.test.junit.categories.UnitTest;
/*
* This test simply verifies the static class delegates properly to the impl
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java
index 59354a1..1d58f95 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java
@@ -24,12 +24,10 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.offheap.MemoryBlock.State;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TinyMemoryBlockJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java
index 7507144..d4f311c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java
@@ -27,7 +27,6 @@ import static org.mockito.Mockito.when;
import java.nio.ByteBuffer;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.compression.Compressor;
import org.apache.geode.internal.DSCODE;
@@ -35,7 +34,6 @@ import org.apache.geode.internal.cache.BytesAndBitsForCompactor;
import org.apache.geode.internal.cache.CachePerfStats;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TinyStoredObjectJUnitTest extends AbstractStoredObjectTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/AttachProcessUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/AttachProcessUtilsTest.java
index a05f9da..b6e8ec9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/AttachProcessUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/AttachProcessUtilsTest.java
@@ -21,11 +21,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.process.lang.AvailablePid;
import org.apache.geode.test.junit.Retry;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.RetryRule;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerTest.java
index da4796c..adaa02d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerTest.java
@@ -25,10 +25,8 @@ import java.util.concurrent.TimeUnit;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.lang.AttachAPINotFoundException;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link FileProcessController}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsTest.java
index 904b061..65ab647 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsTest.java
@@ -20,11 +20,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.process.lang.AvailablePid;
import org.apache.geode.test.junit.Retry;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.RetryRule;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/ProcessControllerFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/ProcessControllerFactoryTest.java
index 9af22a8..dbd1932 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/process/ProcessControllerFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/ProcessControllerFactoryTest.java
@@ -24,9 +24,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ProcessControllerFactory}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/ProcessLauncherContextTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/ProcessLauncherContextTest.java
index cbc632f..d301d43 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/ProcessLauncherContextTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/ProcessLauncherContextTest.java
@@ -31,9 +31,7 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ProcessLauncherContext}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/StartupStatusTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/StartupStatusTest.java
index 8f8ad64..011806f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/StartupStatusTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/StartupStatusTest.java
@@ -29,10 +29,8 @@ import java.util.List;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.i18n.StringId;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StartupStatusTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/lang/AvailablePidTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/lang/AvailablePidTest.java
index 012371b..b8227cb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/lang/AvailablePidTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/lang/AvailablePidTest.java
@@ -36,10 +36,8 @@ import com.google.common.base.Stopwatch;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.Timeout;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link AvailablePid}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerTest.java
index 909f0eb..ad08a86 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerTest.java
@@ -24,10 +24,8 @@ import static org.mockito.Mockito.verify;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.util.CollectionUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link AbstractSignalNotificationHandler}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/CallbackInstantiatorTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/CallbackInstantiatorTest.java
index 5edf3ba..5e72310 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/CallbackInstantiatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/CallbackInstantiatorTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SecurityTest.class})
public class CallbackInstantiatorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceConstructorTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceConstructorTest.java
index 0c9ed4c..cc603ce 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceConstructorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceConstructorTest.java
@@ -23,12 +23,10 @@ import org.apache.shiro.SecurityUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.security.shiro.SecurityManagerProvider;
import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SecurityManager;
-import org.apache.geode.test.junit.categories.UnitTest;
public class IntegratedSecurityServiceConstructorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
index e9b1939..f1aa2eb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
@@ -31,13 +31,11 @@ import org.apache.shiro.util.ThreadState;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.security.shiro.SecurityManagerProvider;
import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SecurityManager;
-import org.apache.geode.test.junit.categories.UnitTest;
public class IntegratedSecurityServiceTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/LegacySecurityServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/LegacySecurityServiceTest.java
index 91b6c23..a832a1c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/LegacySecurityServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/LegacySecurityServiceTest.java
@@ -18,9 +18,7 @@ package org.apache.geode.internal.security;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LegacySecurityServiceTest {
private LegacySecurityService service;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java
index 5819e48..1f70b04 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SimpleTestSecurityManager;
import org.apache.geode.security.TestPostProcessor;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SecurityTest.class})
public class SecurityServiceFactoryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceTest.java
index aae6763..055cace 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.security.TestSecurityManager;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SecurityTest.class})
public class SecurityServiceTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java
index babbf1d..66ee786 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java
@@ -20,9 +20,7 @@ import static org.apache.geode.internal.size.SizeTestUtil.roundup;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ObjectSizerJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java
index 6b0c138..5502baa 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java
@@ -25,10 +25,8 @@ import java.util.Set;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ObjectTraverserJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java
index df352bd..0415253 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java
@@ -19,11 +19,9 @@ import static org.junit.Assert.assertNotEquals;
import static org.mockito.Mockito.mock;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ReflectionObjectSizerJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java
index 64a3b93b..0a93778 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java
@@ -20,10 +20,8 @@ import static org.apache.geode.internal.size.SizeTestUtil.roundup;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.util.ObjectSizer;
-import org.apache.geode.test.junit.categories.UnitTest;
public class SizeClassOnceObjectSizerJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/WellKnownClassSizerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/WellKnownClassSizerJUnitTest.java
index e2859c5..3e6756f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/WellKnownClassSizerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/WellKnownClassSizerJUnitTest.java
@@ -19,10 +19,8 @@ import static org.apache.geode.internal.size.SizeTestUtil.roundup;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.util.ObjectSizer;
-import org.apache.geode.test.junit.categories.UnitTest;
public class WellKnownClassSizerJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/CallbackSamplerTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/CallbackSamplerTest.java
index 93c5b84..4cfcd52 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/CallbackSamplerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/CallbackSamplerTest.java
@@ -26,14 +26,12 @@ import java.util.concurrent.TimeUnit;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link CallbackSampler}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/ResourceInstTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/ResourceInstTest.java
index f5118df..4488d7c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/ResourceInstTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/ResourceInstTest.java
@@ -21,13 +21,11 @@ import java.lang.reflect.Field;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mock;
import org.apache.geode.internal.statistics.StatArchiveReader.ResourceInst;
import org.apache.geode.internal.statistics.StatArchiveReader.ResourceType;
import org.apache.geode.internal.statistics.StatArchiveReader.StatArchiveFile;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ResourceInst}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java
index 515d5fd..ebbd8ba 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java
@@ -28,7 +28,6 @@ import java.util.List;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.StatisticDescriptor;
import org.apache.geode.Statistics;
@@ -39,7 +38,6 @@ import org.apache.geode.internal.statistics.TestSampleHandler.Info;
import org.apache.geode.internal.statistics.TestSampleHandler.ResourceInstanceInfo;
import org.apache.geode.internal.statistics.TestSampleHandler.ResourceTypeInfo;
import org.apache.geode.internal.statistics.TestSampleHandler.SampledInfo;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SampleCollector}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
index 62743d7..d2fec96 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
@@ -21,9 +21,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StatArchiveWriterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerTest.java
index 30c45e5..9b6c39e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerTest.java
@@ -24,11 +24,9 @@ import java.util.Collections;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.NanoTimer;
import org.apache.geode.internal.util.StopWatch;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link StatMonitorHandler}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java
index 05f5961..60b4bff 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java
@@ -25,12 +25,10 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.NanoTimer;
import org.apache.geode.internal.statistics.StatMonitorHandler.StatMonitorNotifier;
import org.apache.geode.internal.util.StopWatch;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Extracted tests from StatMonitorHandlerTest that require enableMonitorThread
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
index 7d0fff5..8ce0dd8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
@@ -33,10 +33,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link StatisticsImpl}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java
index d50793f..68533c6 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java
@@ -28,11 +28,9 @@ import java.util.List;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.NanoTimer;
import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for the StatisticsMonitor class. No disk IO.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
index 0b5ebc2..075b252 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.distributed.internal.membership.MembershipManager;
import org.apache.geode.internal.net.SocketCloser;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({MembershipTest.class})
public class ConnectionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTableTest.java b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTableTest.java
index 7a3e4f3..ff46493 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTableTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTableTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({MembershipTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java
index f2b0741..e7928b9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionTest.java
@@ -26,7 +26,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({MembershipTest.class})
public class ConnectionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/AbortableTaskServiceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/AbortableTaskServiceJUnitTest.java
index 985b1b9..adb9cfd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/AbortableTaskServiceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/AbortableTaskServiceJUnitTest.java
@@ -32,10 +32,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.util.AbortableTaskService.AbortableTask;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
public class AbortableTaskServiceJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/ArgumentRedactorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/ArgumentRedactorJUnitTest.java
index a45fe00..2b968bb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/ArgumentRedactorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/ArgumentRedactorJUnitTest.java
@@ -30,10 +30,8 @@ import java.util.Arrays;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.Banner;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ArgumentRedactorJUnitTest {
private static final String someProperty = "redactorTest.someProperty";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java
index 9d5f08e..015b00d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java
@@ -26,10 +26,8 @@ import java.util.List;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ArrayUtils}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java
index 295bce6..b2f9030 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java
@@ -29,14 +29,12 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.ByteArrayDataInput;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.offheap.StoredObject;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit Tests for {@link BlobHelper}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
index 5109980..b6fc58a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
@@ -40,9 +40,7 @@ import org.apache.bcel.generic.Type;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link BlobHelper} with Thread Context ClassLoader.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java
index ca9f430..cc378e4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java
@@ -41,9 +41,7 @@ import java.util.Vector;
import org.apache.commons.lang.StringUtils;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The CollectionUtilsJUnitTest class is a test suite of test cases testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/DelayedActionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/DelayedActionJUnitTest.java
index b4b1d8a..ad6f5f5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/DelayedActionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/DelayedActionJUnitTest.java
@@ -23,9 +23,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DelayedActionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
index 5d2c31f..2aa1df6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
@@ -31,10 +31,8 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.EnvironmentVariables;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(JUnitParamsRunner.class)
public class HostNameTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
index 4f9ba53..a396aa9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
@@ -37,9 +37,7 @@ import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test class for testing the contract and functionality of the IOUtils class.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/PasswordUtilJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/PasswordUtilJUnitTest.java
index 1bd78d7..d28a844 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/PasswordUtilJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/PasswordUtilJUnitTest.java
@@ -21,7 +21,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SecurityTest.class})
public class PasswordUtilJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/PluckStacksUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/PluckStacksUnitTest.java
index 5229d89..6d07b88 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/PluckStacksUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/PluckStacksUnitTest.java
@@ -23,9 +23,7 @@ import java.util.List;
import java.util.Map;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.util.test.TestUtil;
public class PluckStacksUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CompactConcurrentHashSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CompactConcurrentHashSetJUnitTest.java
index d7bdb85..df8dfb7 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CompactConcurrentHashSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CompactConcurrentHashSetJUnitTest.java
@@ -23,10 +23,8 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.concurrent.CompactConcurrentHashSet2;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CompactConcurrentHashSetJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/FutureResultJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/FutureResultJUnitTest.java
index ca1af84..e50951c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/FutureResultJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/FutureResultJUnitTest.java
@@ -20,11 +20,9 @@ import java.util.concurrent.CancellationException;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.DistributedSystemDisconnectedException;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link FutureResult}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphoreJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphoreJUnitTest.java
index ac33adc..cf2c2d4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphoreJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphoreJUnitTest.java
@@ -26,10 +26,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.Timeout;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ReentrantSemaphoreJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java
index b54ec9c..cbd4283 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java
@@ -27,10 +27,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.Timeout;
-import org.apache.geode.test.junit.categories.UnitTest;
public class SemaphoreReadWriteLockJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/DiskBackupStatusTest.java b/geode-core/src/test/java/org/apache/geode/management/DiskBackupStatusTest.java
index 2a19a6d..400cb1a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/DiskBackupStatusTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/DiskBackupStatusTest.java
@@ -24,12 +24,10 @@ import java.util.Map;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.persistence.PersistentID;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.management.internal.DiskBackupStatusImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DiskBackupStatusTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/StatsRateJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/bean/stats/StatsRateJUnitTest.java
index c4b462a..b6403b6 100644
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/StatsRateJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/StatsRateJUnitTest.java
@@ -18,13 +18,11 @@ import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.Statistics;
import org.apache.geode.management.internal.beans.stats.MBeanStatsMonitor;
import org.apache.geode.management.internal.beans.stats.StatType;
import org.apache.geode.management.internal.beans.stats.StatsRate;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StatsRateJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java
index 4c46065..21ada46 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java
@@ -22,10 +22,8 @@ import static org.mockito.Mockito.when;
import javax.management.openmbean.CompositeData;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.OpenTypeConverter.CompositeBuilderViaFrom;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CompositeBuilderViaFromTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java
index cc35a04..ff440f9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java
@@ -22,10 +22,8 @@ import static org.mockito.Mockito.when;
import javax.management.openmbean.CompositeData;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.OpenTypeConverter.CompositeBuilderViaProxy;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CompositeBuilderViaProxyTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java
index 80ff3b2..0d10834 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class IdentityConverterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/JettyHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/JettyHelperJUnitTest.java
index 4fe177b..2ea00a7 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/JettyHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/JettyHelperJUnitTest.java
@@ -25,13 +25,11 @@ import org.eclipse.jetty.server.ServerConnector;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.GemFireConfigException;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.internal.net.SSLConfigurationFactory;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The JettyHelperJUnitTest class is a test suite of test cases testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/CacheServerBridgeClientMembershipRegressionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/CacheServerBridgeClientMembershipRegressionTest.java
index 8a7acae..0e53284 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/CacheServerBridgeClientMembershipRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/CacheServerBridgeClientMembershipRegressionTest.java
@@ -29,7 +29,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.query.internal.InternalQueryService;
@@ -38,7 +37,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.management.internal.beans.stats.MBeanStatsMonitor;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* JMX and membership should not deadlock on CacheFactory.getAnyInstance.
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java
index d40dc51..a0e12e4 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java
@@ -35,7 +35,6 @@ import javax.management.ObjectName;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.apache.geode.distributed.internal.DistributionManager;
@@ -50,7 +49,6 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
import org.apache.geode.management.GatewaySenderMXBean;
import org.apache.geode.management.internal.FederationComponent;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributedSystemBridgeJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/FileUploaderTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/FileUploaderTest.java
index 18f5135..a1f554c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/FileUploaderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/FileUploaderTest.java
@@ -27,11 +27,9 @@ import org.apache.commons.io.FileUtils;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.security.GemFireSecurityException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FileUploaderTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/QueryDataFunctionApplyLimitClauseTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/QueryDataFunctionApplyLimitClauseTest.java
index edcda31..cf8e97b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/QueryDataFunctionApplyLimitClauseTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/QueryDataFunctionApplyLimitClauseTest.java
@@ -20,9 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class QueryDataFunctionApplyLimitClauseTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/stats/MBeanStatsMonitorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/stats/MBeanStatsMonitorTest.java
index 8654e8e..573d8ca 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/stats/MBeanStatsMonitorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/stats/MBeanStatsMonitorTest.java
@@ -28,7 +28,6 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.mockito.InjectMocks;
import org.mockito.Mock;
@@ -42,7 +41,6 @@ import org.apache.geode.i18n.LogWriterI18n;
import org.apache.geode.internal.statistics.FakeValueMonitor;
import org.apache.geode.internal.statistics.ValueMonitor;
import org.apache.geode.management.internal.beans.stats.MBeanStatsMonitor.DefaultHashMap;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MBeanStatsMonitorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/ClasspathScanLoadHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/ClasspathScanLoadHelperJUnitTest.java
index 714004a..0972054 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/ClasspathScanLoadHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/ClasspathScanLoadHelperJUnitTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertTrue;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.util.Versionable;
import org.apache.geode.management.internal.cli.domain.AbstractImpl;
@@ -29,7 +28,6 @@ import org.apache.geode.management.internal.cli.domain.Impl12;
import org.apache.geode.management.internal.cli.domain.Interface1;
import org.apache.geode.management.internal.cli.domain.Interface2;
import org.apache.geode.management.internal.cli.util.ClasspathScanLoadHelper;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ClasspathScanLoadHelperJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilTest.java
index cef0550..3f1aeb9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilTest.java
@@ -25,10 +25,8 @@ import java.util.List;
import org.apache.commons.io.FileUtils;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CliUtilTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandManagerJUnitTest.java
index 8409648..2d7b193 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandManagerJUnitTest.java
@@ -23,7 +23,6 @@ import java.util.Properties;
import com.examples.UserGfshCommand;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.shell.core.CommandMarker;
import org.springframework.shell.core.Completion;
import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
@@ -38,7 +37,6 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* CommandManagerTest - Includes tests to check the CommandManager functions
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandSeparatorEscapeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandSeparatorEscapeJUnitTest.java
index 6504510..aa983a9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandSeparatorEscapeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandSeparatorEscapeJUnitTest.java
@@ -20,9 +20,7 @@ import static org.junit.Assert.assertEquals;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CommandSeparatorEscapeJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/DataCommandJsonJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/DataCommandJsonJUnitTest.java
index dd7acc3..bcb83be 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/DataCommandJsonJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/DataCommandJsonJUnitTest.java
@@ -23,11 +23,9 @@ import java.util.HashMap;
import java.util.HashSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.dto.Car;
import org.apache.geode.management.internal.cli.util.JsonUtil;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DataCommandJsonJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserJUnitTest.java
index 455f0e4..57bb490 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserJUnitTest.java
@@ -22,9 +22,7 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* GfshParserJUnitTest - Includes tests to check the parsing and auto-completion capabilities of
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandTest.java
index 86f86b1..15e9285 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandTest.java
@@ -34,7 +34,6 @@ import java.util.stream.Collectors;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -43,7 +42,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.configuration.domain.Configuration;
import org.apache.geode.management.internal.configuration.utils.XmlUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java
index 4574d06..f2f0440 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java
@@ -20,12 +20,10 @@ import static org.mockito.Mockito.spy;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class AlterDiskStoreJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandTest.java
index 7e95d4c..d8d6725 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandTest.java
@@ -23,12 +23,10 @@ import static org.mockito.Mockito.spy;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.domain.ClassName;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java
index 7ce9d5f..9f3a41c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java
@@ -21,7 +21,6 @@ import java.lang.reflect.Method;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.shell.core.CommandMarker;
import org.springframework.shell.core.annotation.CliCommand;
@@ -29,7 +28,6 @@ import org.apache.geode.internal.cache.extension.mock.MockExtensionCommands;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.CommandManager;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CommandAvailabilityIndicatorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java
index d0ad9fd..e190127 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java
@@ -32,12 +32,10 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class ConfigurePDXCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java
index cb6f9ed..97aadc0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java
@@ -37,7 +37,6 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.management.cli.Result;
@@ -45,7 +44,6 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.management.internal.cli.shell.OperationInvoker;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class ConnectCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java
index 8e78dc3..754c634 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java
@@ -43,7 +43,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
@@ -51,7 +50,6 @@ import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult.StatusState;
import org.apache.geode.management.internal.cli.remote.CommandExecutor;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandTest.java
index f7cf7de..2fb692d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandTest.java
@@ -36,7 +36,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import org.apache.geode.cache.execute.ResultCollector;
@@ -45,7 +44,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.result.CommandResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class CreateDefinedIndexesCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommandTest.java
index 171271b..1742bea 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommandTest.java
@@ -31,14 +31,12 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java
index cb4b796..c15ae97 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java
@@ -32,7 +32,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
@@ -42,7 +41,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommandTest.java
index d70b729..483fd02 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommandTest.java
@@ -30,7 +30,6 @@ import java.util.Collections;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.configuration.CacheConfig;
@@ -38,7 +37,6 @@ import org.apache.geode.cache.configuration.RegionConfig;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.management.internal.cli.result.CommandResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class CreateIndexCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java
index 04f8117..a65e4b3 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java
@@ -38,7 +38,6 @@ import javax.xml.parsers.ParserConfigurationException;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.xml.sax.SAXException;
@@ -50,7 +49,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.functions.CreateJndiBindingFunction;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class CreateJndiBindingCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandTest.java
index d046fa8..4d68704 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandTest.java
@@ -30,7 +30,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.RegionShortcut;
@@ -46,7 +45,6 @@ import org.apache.geode.management.internal.cli.domain.ClassName;
import org.apache.geode.management.internal.cli.functions.RegionFunctionArgs;
import org.apache.geode.management.internal.cli.functions.RegionFunctionArgs.ExpirationAttrs;
import org.apache.geode.management.internal.cli.result.CommandResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class CreateRegionCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandTest.java
index 80c595b..f7cccb1 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandTest.java
@@ -20,9 +20,7 @@ import static org.mockito.Mockito.spy;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class DeployCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandTest.java
index b476e33..b9e7c34 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandTest.java
@@ -19,9 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionJUnitTest.java
index e28f372..836ec67 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionJUnitTest.java
@@ -32,12 +32,10 @@ import java.util.Map;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.domain.RegionDescriptionPerMember;
import org.apache.geode.test.junit.assertions.CommandResultAssert;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class DescribeRegionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommandTest.java
index e5ce26b..461109e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommandTest.java
@@ -31,7 +31,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.ResultCollector;
@@ -42,7 +41,6 @@ import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.functions.DestroyAsyncEventQueueFunction;
import org.apache.geode.management.internal.cli.functions.DestroyAsyncEventQueueFunctionArgs;
import org.apache.geode.management.internal.configuration.domain.Configuration;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class DestroyAsyncEventQueueCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommandTest.java
index 40f14fa..c19869f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommandTest.java
@@ -28,7 +28,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
@@ -38,7 +37,6 @@ import org.apache.geode.management.internal.cli.exceptions.UserErrorException;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.test.junit.assertions.CommandResultAssert;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class DestroyGatewayReceiverCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommandTest.java
index 7db09eb..28daa69 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommandTest.java
@@ -30,13 +30,11 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java
index 628618f..a69bbd0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java
@@ -35,7 +35,6 @@ import java.util.function.UnaryOperator;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.Region;
@@ -48,7 +47,6 @@ import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.functions.CreateJndiBindingFunction;
import org.apache.geode.management.internal.cli.functions.DestroyJndiBindingFunction;
import org.apache.geode.management.internal.configuration.domain.Configuration;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class DestroyJndiBindingCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandTest.java
index 015ad70..b393275 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandTest.java
@@ -32,7 +32,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
@@ -41,7 +40,6 @@ import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class DestroyRegionCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
index ac3a991..7cee1b8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
@@ -33,7 +33,6 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.Execution;
@@ -48,7 +47,6 @@ import org.apache.geode.management.internal.cli.exceptions.EntityNotFoundExcepti
import org.apache.geode.management.internal.cli.functions.DescribeDiskStoreFunction;
import org.apache.geode.management.internal.cli.functions.ListDiskStoresFunction;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The DiskStoreCommandsJUnitTest class is a test suite of test cases testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandTest.java
index 3b98ec0..a8b977b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandTest.java
@@ -20,9 +20,7 @@ import static org.mockito.Mockito.spy;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class ExecuteFunctionCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandTest.java
index 7c73e3b..419acd7 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandTest.java
@@ -21,10 +21,8 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class ExportConfigCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataCommandTest.java
index ffb6812..619ab75 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataCommandTest.java
@@ -19,10 +19,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.GfshParseResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java
index 0f35d87..f7ccb4c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java
@@ -32,7 +32,6 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Matchers;
import org.apache.geode.cache.Cache;
@@ -47,7 +46,6 @@ import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.functions.SizeExportLogsFunction;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.util.BytesToString;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ExportLogsCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptorJUnitTest.java
index 20cd8ff..dbcfdf3 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptorJUnitTest.java
@@ -20,12 +20,10 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.GfshParseResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ExportLogsInterceptorJUnitTest {
private ExportLogsInterceptor interceptor;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommandTest.java
index cec2dbd..e046154 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommandTest.java
@@ -27,10 +27,8 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java
index 55d35aa..cef8bfd 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java
@@ -25,14 +25,12 @@ import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.exceptions.EntityNotFoundException;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.shell.Gfsh;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GfshCommandJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataCommandTest.java
index 5d5efac..fa9f41d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataCommandTest.java
@@ -19,9 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesTest.java
index c99100d..56ab979 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.management.internal.cli.domain.AsyncEventQueueDetails;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.test.junit.categories.AEQTest;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
@Category({AEQTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java
index 90d12ee..5d0c31f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java
@@ -30,7 +30,6 @@ import org.json.JSONObject;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.management.DistributedSystemMXBean;
@@ -39,7 +38,6 @@ import org.apache.geode.management.internal.SystemManagementService;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CompositeResultData;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class ListGatewayCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java
index 3c223c0..1cc8098 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java
@@ -32,7 +32,6 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.Execution;
@@ -44,7 +43,6 @@ import org.apache.geode.internal.cache.execute.AbstractExecution;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.internal.cli.domain.IndexDetails;
import org.apache.geode.management.internal.cli.functions.ListIndexFunction;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The ListIndexCommandJUnitTest class is a test suite of test cases testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandTest.java
index 688aa09..cba392a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandTest.java
@@ -27,11 +27,9 @@ import java.util.Collections;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandTest.java
index 07b0a1b..27a43c5 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandTest.java
@@ -30,11 +30,9 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.management.internal.cli.result.CommandResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LogLevelInterceptorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LogLevelInterceptorTest.java
index 95d29ef..6cd337c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LogLevelInterceptorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LogLevelInterceptorTest.java
@@ -23,13 +23,11 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor;
import org.apache.geode.management.internal.cli.GfshParseResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LogLevelInterceptorTest {
private List<AbstractCliAroundInterceptor> interceptors = new ArrayList<>();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsJUnitTest.java
index 7cac276..00f6979 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsJUnitTest.java
@@ -19,11 +19,9 @@ import static org.mockito.Mockito.spy;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.CommandResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class ShowMetricsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserInputPropertyTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserInputPropertyTest.java
index a1faec2..7a9c8ae 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserInputPropertyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserInputPropertyTest.java
@@ -24,10 +24,8 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.shell.Gfsh;
-import org.apache.geode.test.junit.categories.UnitTest;
public class UserInputPropertyTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommandTest.java
index 7b2744d..9b4733e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommandTest.java
@@ -17,10 +17,8 @@ package org.apache.geode.management.internal.cli.commands.lifecycle;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StartJConsoleCommandTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/BaseStringConverterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/BaseStringConverterJUnitTest.java
index 558795d..2d5dd47 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/BaseStringConverterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/BaseStringConverterJUnitTest.java
@@ -23,11 +23,9 @@ import java.util.stream.Collectors;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
import org.apache.geode.test.junit.rules.GfshParserRule.CommandCandidate;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ClassNameConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ClassNameConverterTest.java
index 37288b1..f00985a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ClassNameConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ClassNameConverterTest.java
@@ -20,10 +20,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.domain.ClassName;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ClassNameConverterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverterTest.java
index 2bf1640..ba22113 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverterTest.java
@@ -19,10 +19,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.JndiBindingsType;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ConfigPropertyConverterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/IndexTypeConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/IndexTypeConverterTest.java
index b953df4..8cc0437 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/IndexTypeConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/IndexTypeConverterTest.java
@@ -20,11 +20,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.IndexType;
import org.apache.geode.management.cli.ConverterHint;
-import org.apache.geode.test.junit.categories.UnitTest;
public class IndexTypeConverterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/LogLevelConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/LogLevelConverterTest.java
index 8e4f2ab..03ad5ac 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/LogLevelConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/LogLevelConverterTest.java
@@ -23,10 +23,8 @@ import java.util.List;
import org.apache.logging.log4j.Level;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.shell.core.Completion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LogLevelConverterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
index e45449b..943b5e5 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
@@ -24,10 +24,8 @@ import java.util.stream.Collectors;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.ConverterHint;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
import org.apache.geode.test.junit.rules.GfshParserRule.CommandCandidate;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/ClassNameTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/ClassNameTest.java
index 98e6dd0..4d4d9eb 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/ClassNameTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/ClassNameTest.java
@@ -21,9 +21,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ClassNameTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/RegionDescriptionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/RegionDescriptionJUnitTest.java
index a868499..2c4ec1f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/RegionDescriptionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/RegionDescriptionJUnitTest.java
@@ -27,9 +27,7 @@ import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionDescriptionJUnitTest {
private static final String evictionKeyShared = "sharedEvictionKey";
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CliFunctionResultTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CliFunctionResultTest.java
index 2f1aeb0..097b76c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CliFunctionResultTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CliFunctionResultTest.java
@@ -18,9 +18,7 @@ package org.apache.geode.management.internal.cli.functions;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CliFunctionResultTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunctionTest.java
index 3214d95..cc02a41 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunctionTest.java
@@ -31,7 +31,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
@@ -49,7 +48,6 @@ import org.apache.geode.cache.query.internal.index.HashIndex;
import org.apache.geode.cache.query.internal.index.PrimaryKeyIndex;
import org.apache.geode.internal.cache.execute.FunctionContextImpl;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CreateDefinedIndexesFunctionTest {
private Cache cache;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
index ff6e9e7..5ea34cb 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
@@ -37,7 +37,6 @@ import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
@@ -60,7 +59,6 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.internal.cli.domain.DiskStoreDetails;
import org.apache.geode.management.internal.cli.exceptions.EntityNotFoundException;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The DescribeDiskStoreFunctionJUnitTest test suite class tests the contract and functionality of
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyAsyncEventQueueFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyAsyncEventQueueFunctionTest.java
index 179c50e..86b9190 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyAsyncEventQueueFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyAsyncEventQueueFunctionTest.java
@@ -24,7 +24,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
@@ -34,7 +33,6 @@ import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DestroyAsyncEventQueueFunctionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyGatewayReceiverFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyGatewayReceiverFunctionTest.java
index 44e92b9..6b48442 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyGatewayReceiverFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyGatewayReceiverFunctionTest.java
@@ -27,7 +27,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -35,7 +34,6 @@ import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.cache.wan.GatewayReceiver;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DestroyGatewayReceiverFunctionTest {
private DestroyGatewayReceiverFunction function;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExpirationAttrsTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExpirationAttrsTest.java
index c92b48c..fdd02fe 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExpirationAttrsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExpirationAttrsTest.java
@@ -19,12 +19,10 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.ExpirationAction;
import org.apache.geode.cache.ExpirationAttributes;
import org.apache.geode.management.internal.cli.functions.RegionFunctionArgs.ExpirationAttrs;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ExpirationAttrsTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionTest.java
index 4ee6cba..721dbe3 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionTest.java
@@ -22,11 +22,9 @@ import static org.junit.Assert.assertTrue;
import org.apache.logging.log4j.Level;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.logging.log4j.LogLevel;
import org.apache.geode.management.internal.cli.commands.ExportLogsCommand;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ExportLogsFunctionTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunctionTest.java
index cbd1712..d2b7026 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunctionTest.java
@@ -24,14 +24,12 @@ import static org.mockito.Mockito.verify;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.cache.wan.GatewayReceiver;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GatewayReceiverCreateFunctionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunctionTest.java
index c90b3ed..2fba310 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunctionTest.java
@@ -24,14 +24,12 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GatewaySenderDestroyFunctionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionJUnitTest.java
index cc5bbae..e6b8bcc 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionJUnitTest.java
@@ -22,7 +22,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -39,7 +38,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.control.InternalResourceManager;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GetRegionsFunctionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionTest.java
index 0007c98..3a7181a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionTest.java
@@ -26,13 +26,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.awaitility.core.ConditionTimeoutException;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GetRegionsFunctionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
index b4b3107..bcd3444 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
@@ -34,7 +34,6 @@ import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
@@ -44,7 +43,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.domain.DiskStoreDetails;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The ListDiskStoreFunctionJUnitTest test suite class tests the contract and functionality of the
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
index 4b791aa..ecbaf27 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
@@ -34,7 +34,6 @@ import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
@@ -51,7 +50,6 @@ import org.apache.geode.internal.lang.ObjectUtils;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.internal.cli.domain.IndexDetails;
import org.apache.geode.management.internal.cli.domain.IndexDetails.IndexStatisticsDetails;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The ListIndexFunctionJUnitTest class is test suite of test cases testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunctionTest.java
index 0a114b2..4bfcbd9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunctionTest.java
@@ -25,7 +25,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.Region;
@@ -33,7 +32,6 @@ import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionDestroyFunctionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionFunctionArgsTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionFunctionArgsTest.java
index a9495dc..de22efb 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionFunctionArgsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionFunctionArgsTest.java
@@ -19,12 +19,10 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAlgorithm;
import org.apache.geode.cache.EvictionAttributes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionFunctionArgsTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
index f0c0a3e..a07aefc 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
@@ -39,7 +39,6 @@ import org.apache.logging.log4j.core.Logger;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.mockito.ArgumentCaptor;
@@ -59,7 +58,6 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberID;
import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ShowMissingDiskStoresFunctionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java
index 0530111..25f5e8c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java
@@ -19,10 +19,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.GfshParser;
-import org.apache.geode.test.junit.categories.UnitTest;
public class HelpBlockUnitTest {
private HelpBlock firstBlock, secondBlock, thirdBlock;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java
index f89c63a..757c419 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java
@@ -25,13 +25,11 @@ import java.lang.reflect.Method;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.shell.core.CommandMarker;
import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
import org.springframework.shell.core.annotation.CliCommand;
import org.springframework.shell.core.annotation.CliOption;
-import org.apache.geode.test.junit.categories.UnitTest;
public class HelperUnitTest {
private Helper helper;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonArrayTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonArrayTest.java
index dd2d098..0b62275 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonArrayTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonArrayTest.java
@@ -24,9 +24,7 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GfJsonArrayTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonObjectTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonObjectTest.java
index 82b2fc1..0f5082a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonObjectTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonObjectTest.java
@@ -20,9 +20,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GfJsonObjectTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonTest.java
index ed1c3ec..625cc26 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonTest.java
@@ -27,9 +27,7 @@ import java.util.List;
import java.util.Map;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Extracted from {@link TypedJsonPdxIntegrationTest}.
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/CommandExecutorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/CommandExecutorTest.java
index 52b264b..fb21824 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/CommandExecutorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/CommandExecutorTest.java
@@ -25,7 +25,6 @@ import static org.mockito.Mockito.spy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.GfshParseResult;
@@ -33,7 +32,6 @@ import org.apache.geode.management.internal.cli.exceptions.EntityNotFoundExcepti
import org.apache.geode.management.internal.cli.exceptions.UserErrorException;
import org.apache.geode.management.internal.cli.result.model.ResultModel;
import org.apache.geode.security.NotAuthorizedException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CommandExecutorTest {
GfshParseResult parseResult;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/OnlineCommandProcessorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/OnlineCommandProcessorTest.java
index be1d532..4c3d27d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/OnlineCommandProcessorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/OnlineCommandProcessorTest.java
@@ -26,14 +26,12 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.security.NotAuthorizedException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OnlineCommandProcessorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CommandResultTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CommandResultTest.java
index 9e5508b..e186dae 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CommandResultTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CommandResultTest.java
@@ -22,9 +22,7 @@ import java.nio.file.Paths;
import org.assertj.core.api.Assertions;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CommandResultTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CompositeResultDataTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CompositeResultDataTest.java
index 83b2f59..19ae683 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CompositeResultDataTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CompositeResultDataTest.java
@@ -18,10 +18,8 @@ package org.apache.geode.management.internal.cli.result;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CompositeResultDataTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/DownloadFileResultTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/DownloadFileResultTest.java
index b332fe4..ec668c2 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/DownloadFileResultTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/DownloadFileResultTest.java
@@ -19,9 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DownloadFileResultTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ErrorResultDataTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ErrorResultDataTest.java
index 25be25c..445dc28 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ErrorResultDataTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ErrorResultDataTest.java
@@ -18,10 +18,8 @@ package org.apache.geode.management.internal.cli.result;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.Result;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ErrorResultDataTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/FileResultTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/FileResultTest.java
index ba47cb1..b4fee14 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/FileResultTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/FileResultTest.java
@@ -21,9 +21,7 @@ import java.io.File;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FileResultTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/InfoResultDataTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/InfoResultDataTest.java
index 40df6fb..eecc99c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/InfoResultDataTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/InfoResultDataTest.java
@@ -18,9 +18,7 @@ package org.apache.geode.management.internal.cli.result;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class InfoResultDataTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ResultBuilderTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ResultBuilderTest.java
index 54538a5..30aa4ff 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ResultBuilderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ResultBuilderTest.java
@@ -20,10 +20,8 @@ import java.util.List;
import java.util.Map;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.Result;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ResultBuilderTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/TabularResultDataTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/TabularResultDataTest.java
index 3d08e6d..a3e7ec0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/TabularResultDataTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/TabularResultDataTest.java
@@ -19,9 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TabularResultDataTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/LegacyVsResultModelComparisonTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/LegacyVsResultModelComparisonTest.java
index 44d40c1..72712ed 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/LegacyVsResultModelComparisonTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/LegacyVsResultModelComparisonTest.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.CommandResponseBuilder;
@@ -30,7 +29,6 @@ import org.apache.geode.management.internal.cli.result.CompositeResultData;
import org.apache.geode.management.internal.cli.result.ErrorResultData;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.result.TabularResultData;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LegacyVsResultModelComparisonTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/ResultModelTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/ResultModelTest.java
index 959a0bf..9f11da4 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/ResultModelTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/ResultModelTest.java
@@ -25,11 +25,9 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ResultModelTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/TabularResultModelTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/TabularResultModelTest.java
index dd0de03..4ff70ad 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/TabularResultModelTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/TabularResultModelTest.java
@@ -22,9 +22,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TabularResultModelTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategyTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategyTest.java
index c36a96e..695f162 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategyTest.java
@@ -21,7 +21,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.shell.core.CommandMarker;
import org.apache.geode.management.cli.CliMetaData;
@@ -33,7 +32,6 @@ import org.apache.geode.management.internal.cli.LogWrapper;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.result.model.ResultModel;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* GfshExecutionStrategyTest - Includes tests to for GfshExecutionStrategyTest
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshInitFileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshInitFileJUnitTest.java
index caad990..a533aeb 100755
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshInitFileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshInitFileJUnitTest.java
@@ -40,11 +40,9 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.management.internal.cli.LogWrapper;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for supplying an init file to Gfsh.
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java
index 7927217..31a4847 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java
@@ -23,9 +23,7 @@ import java.util.logging.Logger;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GfshJunitTest {
private String testString;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/BytesToStringTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/BytesToStringTest.java
index 8702c1d..d96b4d8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/BytesToStringTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/BytesToStringTest.java
@@ -18,9 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BytesToStringTest {
private static long KB = 1024;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/CommentSkipHelperTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/CommentSkipHelperTest.java
index e075ad1..972b502 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/CommentSkipHelperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/CommentSkipHelperTest.java
@@ -19,9 +19,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CommentSkipHelperTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriterUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriterUnitTest.java
index c703a6a..ad51dbf 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriterUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriterUnitTest.java
@@ -20,10 +20,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ExportLogsCacheWriterUnitTest {
private ExportLogsCacheWriter writer = new ExportLogsCacheWriter();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HostUtilsTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HostUtilsTest.java
index 46bdae4..351822a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HostUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HostUtilsTest.java
@@ -17,11 +17,9 @@ package org.apache.geode.management.internal.cli.util;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.internal.DistributionLocator;
-import org.apache.geode.test.junit.categories.UnitTest;
public class HostUtilsTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HyphenFormatterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HyphenFormatterTest.java
index fb4ebdc..79674b7 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HyphenFormatterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HyphenFormatterTest.java
@@ -21,9 +21,7 @@ import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class HyphenFormatterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/JdkToolTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/JdkToolTest.java
index 88db77e..a1d841e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/JdkToolTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/JdkToolTest.java
@@ -20,11 +20,9 @@ import static org.junit.Assert.assertEquals;
import java.util.Stack;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.GemFireException;
import org.apache.geode.internal.util.IOUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JdkToolTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogFilterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogFilterTest.java
index c1896a5..fee27db 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogFilterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogFilterTest.java
@@ -32,9 +32,7 @@ import java.time.LocalDateTime;
import org.apache.logging.log4j.Level;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LogFilterTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogLevelExtractorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogLevelExtractorTest.java
index 61d7422..04bc6c8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogLevelExtractorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogLevelExtractorTest.java
@@ -21,9 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.logging.log4j.Level;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LogLevelExtractorTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogSizerTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogSizerTest.java
index c637693..9668c01 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogSizerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogSizerTest.java
@@ -27,13 +27,11 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
import org.apache.geode.management.internal.cli.functions.ExportLogsFunction;
import org.apache.geode.management.internal.cli.functions.SizeExportLogsFunction;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LogSizerTest {
private LogFilter logFilter;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ThreePhraseGeneratorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ThreePhraseGeneratorTest.java
index fb1795e..a74543b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ThreePhraseGeneratorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ThreePhraseGeneratorTest.java
@@ -19,9 +19,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ThreePhraseGeneratorTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.java
index 2e7ccbe..63c29da 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.java
@@ -26,7 +26,6 @@ import java.util.Map.Entry;
import javax.xml.XMLConstants;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.XMLReader;
@@ -37,7 +36,6 @@ import org.apache.geode.internal.cache.xmlcache.CacheXmlParser;
import org.apache.geode.internal.cache.xmlcache.CacheXmlVersion;
import org.apache.geode.management.internal.configuration.utils.XmlUtils;
import org.apache.geode.management.internal.configuration.utils.XmlUtils.XPathContext;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test cases for {@link CacheElement}.
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/functions/GetClusterConfigurationFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/functions/GetClusterConfigurationFunctionTest.java
index 9fd874e..2f0f4ab 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/functions/GetClusterConfigurationFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/functions/GetClusterConfigurationFunctionTest.java
@@ -29,7 +29,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.powermock.api.mockito.PowerMockito;
@@ -42,7 +41,6 @@ import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.management.internal.configuration.messages.ConfigurationResponse;
-import org.apache.geode.test.junit.categories.UnitTest;
@PowerMockIgnore("*.UnitTest")
@RunWith(PowerMockRunner.class)
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java
index dfe8f9b..77576fa 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java
@@ -34,7 +34,6 @@ import javax.xml.xpath.XPathExpressionException;
import org.apache.commons.io.IOUtils;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -43,7 +42,6 @@ import org.w3c.dom.NodeList;
import org.apache.geode.internal.cache.xmlcache.CacheXml;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
import org.apache.geode.management.internal.configuration.utils.XmlUtils.XPathContext;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link XmlUtils}. See Also {@link XmlUtilsAddNewNodeJUnitTest} for tests related
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/ResourcePermissionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/ResourcePermissionTest.java
index c61f734..44b4f7b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/ResourcePermissionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/ResourcePermissionTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.security.ResourcePermission.Target;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SecurityTest.class})
public class ResourcePermissionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java b/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java
index db93fcc..59f19af 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.FieldType;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SerializationTest.class})
public class PdxInstanceImplTest {
diff --git a/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java b/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java
index e8d8b10..a7a17f0 100644
--- a/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/redis/internal/executor/AbstractScanExecutorTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.RedisTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({RedisTest.class})
public class AbstractScanExecutorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java b/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java
index 9c7f4fe..e42654e 100644
--- a/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link GemFireSecurityException}.
diff --git a/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java b/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java
index a549e24..0d20f90 100644
--- a/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java
@@ -33,7 +33,6 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link NotAuthorizedException}.
diff --git a/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java b/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java
index c9a1d3c..1a7c5c9 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java
@@ -28,7 +28,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SecurityTest.class})
public class SimpleSecurityManagerTest {
diff --git a/geode-core/src/test/java/org/apache/geode/security/templates/PKCSPrincipalTest.java b/geode-core/src/test/java/org/apache/geode/security/templates/PKCSPrincipalTest.java
index 6d4c656..b591926 100644
--- a/geode-core/src/test/java/org/apache/geode/security/templates/PKCSPrincipalTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/templates/PKCSPrincipalTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link PKCSPrincipal}
diff --git a/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipalTest.java b/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipalTest.java
index a73afe7..742371f 100644
--- a/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipalTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipalTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link UsernamePrincipal}
diff --git a/geode-core/src/test/java/org/apache/geode/test/process/MainLauncherJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/process/MainLauncherJUnitTest.java
index a2ad73f..8503d24 100755
--- a/geode-core/src/test/java/org/apache/geode/test/process/MainLauncherJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/process/MainLauncherJUnitTest.java
@@ -26,9 +26,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.TextFromStandardInputStream;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
/**
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceImplJUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceImplJUnitTest.java
index 6f676f2..1a644b0 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceImplJUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceImplJUnitTest.java
@@ -20,7 +20,6 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.query.CqException;
@@ -29,7 +28,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
... 1623 lines suppressed ...