IGNITE-10715 Remove boilerplate of settings 'TcpDiscoveryVmIpFinder' in tests
Signed-off-by: Anton Vinogradov <a...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7868e667 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7868e667 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7868e667 Branch: refs/heads/master Commit: 7868e6679be2fee4b35986124af8815777f47f35 Parents: e87aa51 Author: Vyacheslav Daradur <daradu...@gmail.com> Authored: Mon Dec 24 14:43:11 2018 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Mon Dec 24 14:43:11 2018 +0300 ---------------------------------------------------------------------- .../apache/ignite/gridify/AbstractAopTest.java | 8 ----- .../ClientAbstractMultiThreadedSelfTest.java | 12 ------- .../client/ClientDefaultCacheSelfTest.java | 12 ------- .../ClientAbstractMultiNodeSelfTest.java | 12 ------- .../integration/ClientAbstractSelfTest.java | 12 ------- .../integration/ClientPreferDirectSelfTest.java | 12 ------- .../client/router/ClientFailedInitSelfTest.java | 12 ------- .../client/router/RouterFactorySelfTest.java | 7 +--- .../jdbc2/JdbcComplexQuerySelfTest.java | 12 ------- .../internal/jdbc2/JdbcConnectionSelfTest.java | 12 ------- .../jdbc2/JdbcDistributedJoinsQueryTest.java | 12 ------- .../internal/jdbc2/JdbcEmptyCacheSelfTest.java | 12 ------- .../internal/jdbc2/JdbcLocalCachesSelfTest.java | 12 ------- .../internal/jdbc2/JdbcMetadataSelfTest.java | 12 ------- .../internal/jdbc2/JdbcNoDefaultCacheTest.java | 12 ------- .../jdbc2/JdbcPreparedStatementSelfTest.java | 12 ------- .../internal/jdbc2/JdbcResultSetSelfTest.java | 12 ------- .../internal/jdbc2/JdbcStatementSelfTest.java | 12 ------- .../rest/AbstractRestProcessorSelfTest.java | 12 ------- .../rest/ChangeStateCommandHandlerTest.java | 12 ------- .../rest/RestBinaryProtocolSelfTest.java | 12 ------- .../rest/RestMemcacheProtocolSelfTest.java | 12 ------- .../rest/RestProcessorStartSelfTest.java | 7 +--- .../rest/TaskCommandHandlerSelfTest.java | 12 ------- .../tcp/redis/RedisCommonAbstractTest.java | 12 ------- .../jdbc/AbstractJdbcPojoQuerySelfTest.java | 11 ------ .../ignite/jdbc/JdbcComplexQuerySelfTest.java | 12 ------- .../ignite/jdbc/JdbcConnectionSelfTest.java | 12 ------- .../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 12 ------- .../ignite/jdbc/JdbcLocalCachesSelfTest.java | 12 ------- .../ignite/jdbc/JdbcMetadataSelfTest.java | 12 ------- .../ignite/jdbc/JdbcNoDefaultCacheTest.java | 12 ------- .../jdbc/JdbcPreparedStatementSelfTest.java | 12 ------- .../ignite/jdbc/JdbcResultSetSelfTest.java | 12 ------- .../ignite/jdbc/JdbcStatementSelfTest.java | 12 ------- .../JdbcThinAbstractDmlStatementSelfTest.java | 12 ------- .../JdbcThinAuthenticateConnectionSelfTest.java | 12 ------- .../thin/JdbcThinAutoCloseServerCursorTest.java | 12 ------- .../thin/JdbcThinComplexDmlDdlSelfTest.java | 12 ------- .../jdbc/thin/JdbcThinComplexQuerySelfTest.java | 12 ------- ...JdbcThinConnectionMultipleAddressesTest.java | 12 ------- .../JdbcThinConnectionMvccEnabledSelfTest.java | 12 ------- .../jdbc/thin/JdbcThinConnectionSSLTest.java | 12 ------- .../jdbc/thin/JdbcThinConnectionSelfTest.java | 12 ------- .../jdbc/thin/JdbcThinDataSourceSelfTest.java | 12 ------- .../jdbc/thin/JdbcThinEmptyCacheSelfTest.java | 12 ------- .../jdbc/thin/JdbcThinMetadataSelfTest.java | 20 ----------- .../JdbcThinMissingLongArrayResultsTest.java | 12 ------- .../jdbc/thin/JdbcThinNoDefaultSchemaTest.java | 12 ------- .../thin/JdbcThinPreparedStatementSelfTest.java | 12 ------- .../jdbc/thin/JdbcThinResultSetSelfTest.java | 12 ------- .../jdbc/thin/JdbcThinSchemaCaseTest.java | 12 ------- .../thin/JdbcThinSelectAfterAlterTable.java | 12 ------- .../jdbc/thin/JdbcThinStatementSelfTest.java | 12 ------- .../jdbc/thin/JdbcThinTransactionsSelfTest.java | 12 ------- ...ThinTransactionsWithMvccEnabledSelfTest.java | 12 ------- .../GridCacheAffinityBackupsSelfTest.java | 8 ----- .../cache/IgniteWarmupClosureSelfTest.java | 12 ------- .../ignite/cache/ResetLostPartitionTest.java | 8 ----- .../affinity/AffinityClientNodeSelfTest.java | 8 ----- ...ityFunctionBackupFilterAbstractSelfTest.java | 10 ------ ...unctionExcludeNeighborsAbstractSelfTest.java | 7 +--- .../affinity/AffinityHistoryCleanupTest.java | 8 ----- .../local/LocalAffinityFunctionTest.java | 8 ----- ...cheStoreSessionListenerAbstractSelfTest.java | 20 ----------- ...heStoreSessionListenerLifecycleSelfTest.java | 12 ------- .../store/StoreResourceInjectionSelfTest.java | 12 ------- .../CacheJdbcPojoStoreAbstractSelfTest.java | 12 ------- ...eJdbcStoreAbstractMultithreadedSelfTest.java | 12 ------- ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 12 ------- .../igfs/IgfsFragmentizerAbstractSelfTest.java | 12 ------- .../ClusterBaselineNodesMetricsSelfTest.java | 8 ----- .../internal/ClusterGroupAbstractTest.java | 7 +--- .../internal/ClusterNodeMetricsSelfTest.java | 12 ------- .../internal/ClusterNodeMetricsUpdateTest.java | 8 ----- .../ComputeJobCancelWithServiceSelfTest.java | 16 --------- .../ignite/internal/GridAffinityMappedTest.java | 12 ------- .../internal/GridAffinityP2PSelfTest.java | 12 ------- .../ignite/internal/GridAffinitySelfTest.java | 12 ------- ...chePartitionExchangeManagerHistSizeTest.java | 8 ----- .../internal/GridDiscoveryEventSelfTest.java | 13 ------- .../ignite/internal/GridDiscoverySelfTest.java | 12 ------- ...ridFailFastNodeFailureDetectionSelfTest.java | 10 +----- .../GridJobMasterLeaveAwareSelfTest.java | 11 ------ .../internal/GridJobServicesAddNodeTest.java | 12 ------- .../internal/GridMultipleJobsSelfTest.java | 12 ------- .../GridProjectionForCachesSelfTest.java | 20 ----------- ...ectionLocalJobMultipleArgumentsSelfTest.java | 12 ------- .../internal/GridReleaseTypeSelfTest.java | 7 +--- .../GridTaskFailoverAffinityRunTest.java | 7 ---- .../IgniteClientReconnectAbstractTest.java | 7 +--- .../IgniteComputeEmptyClusterGroupTest.java | 12 ------- ...onnectionConcurrentReserveAndRemoveTest.java | 12 ------- .../IgniteSlowClientDetectionSelfTest.java | 6 ---- ...UpdateNotifierPerClusterSettingSelfTest.java | 8 ----- .../ignite/internal/TaskNodeRestartTest.java | 8 ----- .../TransactionMetricsMxBeanImplTest.java | 8 ----- .../internal/TransactionsMXBeanImplTest.java | 8 ----- .../binary/BinaryObjectExceptionSelfTest.java | 7 ---- .../binary/BinaryObjectToStringSelfTest.java | 7 ---- .../BinaryObjectTypeCompatibilityTest.java | 16 --------- .../binary/GridBinaryAffinityKeySelfTest.java | 8 ----- ...GridManagerLocalMessageListenerSelfTest.java | 12 ------- .../managers/IgniteDiagnosticMessagesTest.java | 8 ----- .../GridCheckpointManagerAbstractSelfTest.java | 12 ------- .../checkpoint/GridCheckpointTaskSelfTest.java | 19 ---------- .../GridCommunicationSendMessageSelfTest.java | 12 ------- .../IgniteCommunicationBalanceTest.java | 8 ----- .../communication/IgniteIoTestMessagesTest.java | 8 ----- .../IgniteVariousConnectionNumberTest.java | 8 ----- ...mentRequestOfUnknownClassProcessingTest.java | 12 ------- .../GridDeploymentMessageCountSelfTest.java | 12 ------- .../GridDiscoveryManagerAliveCacheSelfTest.java | 9 +---- .../GridDiscoveryManagerAttributesSelfTest.java | 11 ------ .../IgniteTopologyPrintFormatSelfTest.java | 12 +------ .../OptimizedMarshallerNodeFailoverTest.java | 12 ------- .../GridCacheTxLoadFromStoreOnLockSelfTest.java | 12 ------- .../GridAffinityProcessorAbstractSelfTest.java | 12 +------ .../GridAffinityProcessorMemoryLeakTest.java | 13 +------ .../Authentication1kUsersNodeRestartTest.java | 12 ------- .../AuthenticationConfigurationClusterTest.java | 12 ------- .../AuthenticationOnNotActiveClusterTest.java | 12 ------- .../AuthenticationProcessorNPEOnStartTest.java | 12 ------- .../AuthenticationProcessorNodeRestartTest.java | 12 ------- .../AuthenticationProcessorSelfTest.java | 12 ------- .../cache/CacheAffinityCallSelfTest.java | 13 +------ .../CacheAtomicSingleMessageCountSelfTest.java | 12 +------ .../cache/CacheClientStoreSelfTest.java | 12 ------- .../cache/CacheConcurrentReadThroughTest.java | 8 ----- .../cache/CacheConnectionLeakStoreTxTest.java | 11 ------ .../cache/CacheEnumOperationsAbstractTest.java | 8 ----- ...CacheExchangeMessageDuplicatedStateTest.java | 8 ----- .../cache/CacheFutureExceptionSelfTest.java | 12 ------- .../cache/CacheGroupsMetricsRebalanceTest.java | 8 ----- ...torPartitionCounterRandomOperationsTest.java | 8 ----- .../cache/CacheMetricsManageTest.java | 8 ----- .../cache/CacheNearReaderUpdateTest.java | 8 ----- ...cheOptimisticTransactionsWithFilterTest.java | 8 ----- .../CachePutEventListenerErrorSelfTest.java | 12 ------- .../processors/cache/CachePutIfAbsentTest.java | 16 --------- .../cache/CacheReadThroughRestartSelfTest.java | 12 ------- .../CacheSerializableTransactionsTest.java | 8 ----- .../cache/CacheStopAndDestroySelfTest.java | 6 ---- .../CacheStoreUsageMultinodeAbstractTest.java | 8 ----- .../processors/cache/CacheTxFastFinishTest.java | 8 ----- .../CacheTxNotAllowReadFromBackupTest.java | 7 ---- .../processors/cache/CrossCacheLockTest.java | 8 ----- .../cache/CrossCacheTxRandomOperationsTest.java | 8 ----- ...idAbstractCacheInterceptorRebalanceTest.java | 8 ----- ...ridCacheAbstractByteArrayValuesSelfTest.java | 20 ----------- .../GridCacheAbstractLocalStoreSelfTest.java | 12 ------- .../GridCacheAbstractRemoveFailureTest.java | 7 +--- ...acheAbstractUsersAffinityMapperSelfTest.java | 12 ------- .../cache/GridCacheAffinityRoutingSelfTest.java | 12 ------- ...eAtomicEntryProcessorDeploymentSelfTest.java | 12 ------- .../GridCacheAtomicMessageCountSelfTest.java | 12 +------ .../cache/GridCacheBasicStoreAbstractTest.java | 12 ------- .../cache/GridCacheClearAllSelfTest.java | 12 ------- .../cache/GridCacheClearLocallySelfTest.java | 12 ------- .../cache/GridCacheClearSelfTest.java | 20 ----------- ...GridCacheConcurrentGetCacheOnClientTest.java | 16 --------- .../cache/GridCacheConcurrentMapSelfTest.java | 12 ------- .../GridCacheConcurrentTxMultiNodeLoadTest.java | 12 ------- .../GridCacheConditionalDeploymentSelfTest.java | 12 ------- ...idCacheConfigurationConsistencySelfTest.java | 12 ------- ...ridCacheConfigurationValidationSelfTest.java | 12 ------- .../GridCacheDaemonNodeAbstractSelfTest.java | 12 ------- .../cache/GridCacheDeploymentSelfTest.java | 12 ------- .../cache/GridCacheEntryMemorySizeSelfTest.java | 12 ------- .../cache/GridCacheEntryVersionSelfTest.java | 12 ------- .../GridCacheEvictionEventAbstractTest.java | 12 ------- ...idCacheGetAndTransformStoreAbstractTest.java | 12 ------- .../cache/GridCacheIncrementTransformTest.java | 12 ------- .../GridCacheInterceptorAbstractSelfTest.java | 12 ------- .../cache/GridCacheIteratorPerformanceTest.java | 12 ------- .../cache/GridCacheKeyCheckSelfTest.java | 12 ------- .../processors/cache/GridCacheLeakTest.java | 12 ------- .../GridCacheMarshallerTxAbstractTest.java | 20 ----------- .../GridCacheMarshallingNodeJoinSelfTest.java | 12 ------- ...GridCacheMixedPartitionExchangeSelfTest.java | 7 +--- .../cache/GridCacheMultiUpdateLockSelfTest.java | 12 ------- .../cache/GridCacheMvccManagerSelfTest.java | 12 ------- .../cache/GridCacheMvccPartitionedSelfTest.java | 12 ------- .../processors/cache/GridCacheMvccSelfTest.java | 12 ------- .../cache/GridCacheNestedTxAbstractTest.java | 20 ----------- .../cache/GridCacheObjectToStringSelfTest.java | 10 ------ .../GridCacheOnCopyFlagAbstractSelfTest.java | 12 ------- .../GridCacheOrderedPreloadingSelfTest.java | 12 ------- .../cache/GridCacheP2PUndeploySelfTest.java | 12 ------- .../cache/GridCachePartitionedGetSelfTest.java | 19 ---------- ...hePartitionedProjectionAffinitySelfTest.java | 12 ------- .../GridCachePreloadingEvictionsSelfTest.java | 12 ------- .../cache/GridCachePutAllFailoverSelfTest.java | 8 +---- .../GridCacheReferenceCleanupSelfTest.java | 9 ----- ...ridCacheReplicatedSynchronousCommitTest.java | 12 ------- .../cache/GridCacheSlowTxWarnTest.java | 12 ------- .../processors/cache/GridCacheStopSelfTest.java | 12 ------- ...ridCacheStoreManagerDeserializationTest.java | 12 ------- .../cache/GridCacheStoreValueBytesSelfTest.java | 12 ------- .../GridCacheTtlManagerEvictionSelfTest.java | 12 ------- .../GridCacheTtlManagerNotificationTest.java | 12 ------- .../cache/GridCacheTtlManagerSelfTest.java | 12 ------- .../GridCacheVariableTopologySelfTest.java | 12 ------- .../GridCacheVersionTopologyChangeTest.java | 16 --------- ...StorageConfigurationConsistencySelfTest.java | 11 ------ ...ProjectionForCachesOnDaemonNodeSelfTest.java | 20 ----------- .../IgniteCacheAbstractStopBusySelfTest.java | 7 +--- .../cache/IgniteCacheAbstractTest.java | 9 ++--- ...IgniteCacheBinaryEntryProcessorSelfTest.java | 8 ----- .../IgniteCacheBinaryObjectsScanSelfTest.java | 11 ------ ...teCacheConfigurationDefaultTemplateTest.java | 8 ----- .../IgniteCacheConfigurationTemplateTest.java | 7 +--- .../cache/IgniteCacheCreateRestartSelfTest.java | 8 ----- ...niteCacheEntryListenerExpiredEventsTest.java | 16 --------- .../IgniteCacheEntryProcessorCallTest.java | 8 ----- .../IgniteCacheEntryProcessorNodeJoinTest.java | 12 ------- ...niteCacheExpireAndUpdateConsistencyTest.java | 8 ----- ...IgniteCacheGetCustomCollectionsSelfTest.java | 12 ------- .../processors/cache/IgniteCacheGroupsTest.java | 8 ----- .../cache/IgniteCacheIncrementTxTest.java | 8 ----- ...gniteCacheInvokeReadThroughAbstractTest.java | 8 ----- ...gniteCacheLoadRebalanceEvictionSelfTest.java | 12 ------- .../cache/IgniteCacheNearLockValueSelfTest.java | 7 +--- .../cache/IgniteCacheNoSyncForGetTest.java | 8 ----- .../IgniteCachePartitionMapUpdateTest.java | 8 ----- .../cache/IgniteCachePutAllRestartTest.java | 8 ----- .../IgniteCachePutStackOverflowSelfTest.java | 20 ----------- .../IgniteCacheReadThroughStoreCallTest.java | 8 ----- ...iteCacheScanPredicateDeploymentSelfTest.java | 12 ------- .../cache/IgniteCacheSerializationSelfTest.java | 8 ----- .../processors/cache/IgniteCacheStartTest.java | 8 ----- .../cache/IgniteCacheStoreCollectionTest.java | 8 ----- .../cache/IgniteCacheTxPreloadNoWriteTest.java | 12 ------- .../IgniteClientAffinityAssignmentSelfTest.java | 8 ----- .../IgniteClientCacheStartFailoverTest.java | 8 ----- .../IgniteClusterActivateDeactivateTest.java | 7 +--- .../IgniteDaemonNodeMarshallerCacheTest.java | 8 ----- .../cache/IgniteDynamicCacheAndNodeStop.java | 15 -------- .../cache/IgniteDynamicCacheFilterTest.java | 8 ----- .../cache/IgniteDynamicCacheMultinodeTest.java | 8 ----- ...ynamicCacheStartCoordinatorFailoverTest.java | 11 ------ ...eDynamicCacheStartNoExchangeTimeoutTest.java | 8 ----- .../cache/IgniteDynamicCacheStartSelfTest.java | 7 ---- ...niteDynamicCacheStartStopConcurrentTest.java | 16 --------- ...niteDynamicCacheWithConfigStartSelfTest.java | 12 ------- .../IgniteDynamicClientCacheStartSelfTest.java | 8 ----- ...IgniteGetNonPlainKeyReadThroughSelfTest.java | 7 ---- .../cache/IgniteInternalCacheTypesTest.java | 8 ----- ...eMarshallerCacheConcurrentReadWriteTest.java | 8 ----- .../cache/IgniteNearClientCacheCloseTest.java | 8 ----- .../cache/IgniteOnePhaseCommitInvokeTest.java | 8 ----- .../IgniteOnePhaseCommitNearReadersTest.java | 8 ----- .../IgniteStartCacheInTransactionSelfTest.java | 8 ----- .../cache/IgniteSystemCacheOnClientTest.java | 8 ----- .../processors/cache/IgniteTxAbstractTest.java | 20 ----------- .../IgniteTxConcurrentGetAbstractTest.java | 20 ----------- .../cache/IgniteTxConfigCacheSelfTest.java | 8 ----- .../cache/IgniteTxMultiNodeAbstractTest.java | 20 ----------- .../cache/IgniteTxReentryAbstractSelfTest.java | 11 ------ .../MarshallerCacheJobRunNodeRestartTest.java | 8 ----- ...AffinityCoordinatorDynamicStartStopTest.java | 9 ----- .../SetTxTimeoutOnPartitionMapExchangeTest.java | 16 --------- .../WalModeChangeCommonAbstractSelfTest.java | 7 ---- .../binary/BinaryMetadataUpdatesFlowTest.java | 7 +--- .../CacheKeepBinaryWithInterceptorTest.java | 8 ----- ...naryObjectMetadataExchangeMultinodeTest.java | 7 +--- ...acheBinaryObjectUserClassloaderSelfTest.java | 12 ------- ...aryObjectsAbstractMultiThreadedSelfTest.java | 8 ----- .../GridCacheBinaryObjectsAbstractSelfTest.java | 12 ------- .../GridCacheBinaryStoreAbstractSelfTest.java | 12 ------- ...ntNodeBinaryObjectMetadataMultinodeTest.java | 7 +--- .../GridDataStreamerImplSelfTest.java | 11 ------ .../GridCacheQueueClientDisconnectTest.java | 13 +------ ...ridCacheQueueJoinedNodeSelfAbstractTest.java | 5 --- .../IgniteAtomicsAbstractTest.java | 12 ------- .../IgniteClientDataStructuresAbstractTest.java | 7 ---- .../IgniteCollectionAbstractTest.java | 12 ------- .../IgniteDataStructureWithJobTest.java | 16 --------- .../IgniteSequenceInternalCleanupTest.java | 12 ------- .../SemaphoreFailoverNoWaitingAcquirerTest.java | 12 ------- ...SemaphoreFailoverSafeReleasePermitsTest.java | 12 ------- ...achePartitionedAtomicSequenceTxSelfTest.java | 12 ------- ...idCachePartitionedNodeRestartTxSelfTest.java | 12 ------- .../distributed/CacheAffinityEarlyTest.java | 11 ------ .../distributed/CacheAsyncOperationsTest.java | 8 ----- .../distributed/CacheBaselineTopologyTest.java | 10 ------ .../CacheClientsConcurrentStartTest.java | 7 ---- .../CacheDiscoveryDataConcurrentJoinTest.java | 7 +--- .../distributed/CacheExchangeMergeTest.java | 8 ----- .../CacheGetFutureHangsSelfTest.java | 8 ----- .../CacheGetInsideLockChangingTopologyTest.java | 7 ---- .../distributed/CacheGroupsPreloadTest.java | 8 ----- ...ffinityAssignmentNodeJoinValidationTest.java | 8 ----- .../CacheLateAffinityAssignmentTest.java | 10 +----- .../CacheLockReleaseNodeLeaveTest.java | 8 ----- .../CacheOperationsInterruptTest.java | 8 ----- .../distributed/CacheParallelStartTest.java | 11 ------ .../distributed/CachePartitionStateTest.java | 8 ----- .../CacheRentingStateRepairTest.java | 11 ------ ...CacheResultIsNotNullOnPartitionLossTest.java | 7 ---- .../cache/distributed/CacheStartOnJoinTest.java | 7 +--- .../CacheTryLockMultithreadedTest.java | 8 ----- .../GridCacheAbstractJobExecutionTest.java | 20 ----------- .../GridCacheAbstractNodeRestartSelfTest.java | 11 +----- .../GridCacheAbstractPrimarySyncSelfTest.java | 12 ------- .../GridCacheBasicOpAbstractTest.java | 20 ----------- .../distributed/GridCacheLockAbstractTest.java | 12 ------- .../GridCacheMultiNodeAbstractTest.java | 20 ----------- .../GridCacheMultiNodeLockAbstractTest.java | 12 ------- ...dCacheMultithreadedFailoverAbstractTest.java | 11 ------ .../GridCacheNodeFailureAbstractTest.java | 12 ------- ...ridCachePartitionNotLoadedEventSelfTest.java | 10 ------ ...chePartitionedReloadAllAbstractSelfTest.java | 12 ------- .../GridCachePreloadEventsAbstractSelfTest.java | 10 ------ .../GridCachePreloadLifecycleAbstractTest.java | 12 ------- ...GridCachePreloadRestartAbstractSelfTest.java | 11 ------ .../GridCacheTransformEventSelfTest.java | 11 ------ ...yMetadataUpdateChangingTopologySelfTest.java | 12 ------- ...niteBinaryMetadataUpdateNodeRestartTest.java | 8 ----- .../distributed/IgniteCache150ClientsTest.java | 6 ---- ...heClientMultiNodeUpdateTopologyLockTest.java | 8 ----- ...niteCacheClientNodeChangingTopologyTest.java | 7 +--- .../IgniteCacheClientNodeConcurrentStart.java | 8 ----- ...teCacheClientNodePartitionsExchangeTest.java | 7 +--- .../IgniteCacheClientReconnectTest.java | 7 ---- .../IgniteCacheConnectionRecoveryTest.java | 8 ----- .../IgniteCacheCreatePutMultiNodeSelfTest.java | 11 ------ .../distributed/IgniteCacheCreatePutTest.java | 11 ------ .../distributed/IgniteCacheGetRestartTest.java | 8 ----- ...eCacheGroupsPartitionLossPolicySelfTest.java | 8 ----- .../distributed/IgniteCacheManyClientsTest.java | 6 ---- ...eCacheMessageRecoveryIdleConnectionTest.java | 8 ----- .../IgniteCacheMessageWriteTimeoutTest.java | 8 ----- .../IgniteCacheNearRestartRollbackSelfTest.java | 12 +------ .../IgniteCachePartitionLossPolicySelfTest.java | 8 ----- .../distributed/IgniteCachePrimarySyncTest.java | 8 ----- .../IgniteCacheReadFromBackupTest.java | 8 ----- .../IgniteCacheServerNodeConcurrentStart.java | 6 ---- .../IgniteCacheSingleGetMessageTest.java | 8 ----- .../IgniteCacheSizeFailoverTest.java | 8 ----- .../IgniteCacheThreadLocalTxTest.java | 8 ----- .../IgniteMvccTxTimeoutAbstractTest.java | 12 ------- .../IgniteRejectConnectOnNodeStopTest.java | 7 +--- .../IgniteTxCachePrimarySyncTest.java | 8 ----- ...teSynchronizationModesMultithreadedTest.java | 8 ----- .../IgniteTxConcurrentRemoveObjectsTest.java | 16 --------- ...iteTxConsistencyRestartAbstractSelfTest.java | 12 ------- .../IgniteTxTimeoutAbstractTest.java | 12 ------- .../dht/CacheGetReadFromBackupFailoverTest.java | 7 ---- ...heAbstractTransformWriteThroughSelfTest.java | 12 ------- .../dht/GridCacheColocatedDebugTest.java | 12 ------- ...eColocatedOptimisticTransactionSelfTest.java | 11 ------ ...dCacheColocatedTxSingleThreadedSelfTest.java | 12 ------- .../dht/GridCacheDhtEntrySelfTest.java | 12 ------- ...GridCacheDhtEvictionNearReadersSelfTest.java | 12 ------- .../GridCacheDhtEvictionsDisabledSelfTest.java | 12 ------- .../dht/GridCacheDhtMappingSelfTest.java | 11 ------ .../dht/GridCacheDhtPreloadBigDataSelfTest.java | 11 ------ .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 11 ------ .../GridCacheDhtPreloadDisabledSelfTest.java | 11 ------ .../GridCacheDhtPreloadMessageCountTest.java | 11 ------ ...ridCacheDhtPreloadMultiThreadedSelfTest.java | 8 ----- .../dht/GridCacheDhtPreloadPerformanceTest.java | 12 ------- .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 11 ------ .../dht/GridCacheDhtPreloadSelfTest.java | 11 ------ .../GridCacheDhtPreloadStartStopSelfTest.java | 11 ------ .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 11 ------ ...dCachePartitionedTopologyChangeSelfTest.java | 13 ------- ...ridCachePartitionedUnloadEventsSelfTest.java | 10 ------ .../dht/GridCacheTxNodeFailureSelfTest.java | 8 ----- ...gniteAtomicLongChangingTopologySelfTest.java | 11 +----- .../IgniteCacheClearDuringRebalanceTest.java | 12 ------- .../IgniteCacheCommitDelayTxRecoveryTest.java | 8 ----- .../dht/IgniteCacheConcurrentPutGetRemove.java | 16 --------- .../IgniteCacheCrossCacheTxFailoverTest.java | 8 ----- .../dht/IgniteCacheMultiTxLockSelfTest.java | 12 ------- .../IgniteCachePutRetryAbstractSelfTest.java | 8 ----- .../dht/IgniteCacheTxRecoveryRollbackTest.java | 8 ----- .../dht/IgniteCrossCacheTxAbstractSelfTest.java | 16 --------- .../AtomicPutAllChangingTopologyTest.java | 16 --------- ...eAtomicInvalidPartitionHandlingSelfTest.java | 7 +--- .../atomic/IgniteCacheAtomicProtocolTest.java | 7 ---- .../near/GridCacheGetStoreErrorSelfTest.java | 12 ------- .../near/GridCacheNearClientHitTest.java | 14 -------- .../near/GridCacheNearEvictionSelfTest.java | 12 ------- .../near/GridCacheNearMultiGetSelfTest.java | 20 ----------- .../near/GridCacheNearMultiNodeSelfTest.java | 12 ------- .../near/GridCacheNearOnlyTopologySelfTest.java | 12 +------ .../GridCacheNearPartitionedClearSelfTest.java | 12 ------- .../near/GridCacheNearReadersSelfTest.java | 12 ------- .../near/GridCacheNearTxForceKeyTest.java | 8 ----- .../near/GridCacheNearTxMultiNodeSelfTest.java | 12 ------- ...AffinityExcludeNeighborsPerformanceTest.java | 12 ------- .../GridCachePartitionedAffinitySelfTest.java | 11 ------ ...ePartitionedBasicStoreMultiNodeSelfTest.java | 12 ------- .../GridCachePartitionedEvictionSelfTest.java | 12 ------- ...titionedExplicitLockNodeFailureSelfTest.java | 12 ------- ...GridCachePartitionedFilteredPutSelfTest.java | 19 ---------- ...idCachePartitionedHitsAndMissesSelfTest.java | 11 ------ .../GridCachePartitionedLoadCacheSelfTest.java | 12 ------- ...achePartitionedMultiNodeCounterSelfTest.java | 12 ------- ...ePartitionedMultiThreadedPutGetSelfTest.java | 12 ------- .../GridCachePartitionedStorePutSelfTest.java | 19 ---------- ...CachePartitionedTxMultiThreadedSelfTest.java | 12 ------- .../GridCachePartitionedTxSalvageSelfTest.java | 13 ------- ...achePartitionedTxSingleThreadedSelfTest.java | 12 ------- .../near/GridPartitionedBackupLoadSelfTest.java | 19 ---------- .../near/NearCacheMultithreadedUpdateTest.java | 8 ----- .../near/NearCachePutAllMultinodeTest.java | 12 ------- .../near/NearCacheSyncUpdateTest.java | 16 --------- .../rebalancing/CacheManualRebalancingTest.java | 7 ---- ...cingDelayedPartitionMapExchangeSelfTest.java | 5 --- .../GridCacheRebalancingCancelTest.java | 8 ----- .../GridCacheRebalancingSyncCheckDataTest.java | 8 ----- .../GridCacheRebalancingSyncSelfTest.java | 6 ---- ...eRebalancingUnmarshallingFailedSelfTest.java | 5 --- ...balanceOnCachesStoppingOrDestroyingTest.java | 15 -------- .../GridCacheSyncReplicatedPreloadSelfTest.java | 12 ------- .../GridCacheReplicatedPreloadSelfTest.java | 12 ------- ...eplicatedPreloadStartStopEventsSelfTest.java | 8 ----- .../cache/eviction/EvictionAbstractTest.java | 12 ------- .../EvictionPolicyFactoryAbstractTest.java | 12 ------- ...heConcurrentEvictionConsistencySelfTest.java | 12 ------- .../GridCacheConcurrentEvictionsSelfTest.java | 12 ------- .../GridCacheEmptyEntriesAbstractSelfTest.java | 12 ------- .../GridCacheEvictionFilterSelfTest.java | 12 ------- .../GridCacheEvictionLockUnlockSelfTest.java | 12 ------- .../GridCacheEvictionTouchSelfTest.java | 12 ------- .../lru/LruNearEvictionPolicySelfTest.java | 12 ------- .../LruNearOnlyNearEvictionPolicySelfTest.java | 7 +--- .../paged/PageEvictionAbstractTest.java | 8 ----- .../expiry/IgniteCacheLargeValueExpireTest.java | 8 ----- .../cache/mvcc/CacheMvccAbstractTest.java | 8 ----- .../cache/mvcc/CacheMvccClusterRestartTest.java | 8 ----- .../CacheMvccConfigurationValidationTest.java | 15 -------- .../cache/mvcc/CacheMvccTxFailoverTest.java | 6 ---- .../IgniteDataStorageMetricsSelfTest.java | 8 ----- .../IgnitePdsBinarySortObjectFieldsTest.java | 8 ----- ...gnitePdsCacheAssignmentNodeRestartsTest.java | 8 ----- ...heConfigurationFileConsistencyCheckTest.java | 10 +----- ...cheObjectBinaryProcessorOnDiscoveryTest.java | 10 +----- .../IgnitePdsCacheRebalancingAbstractTest.java | 11 ------ ...dsContinuousRestartTestWithExpiryPolicy.java | 9 ----- ...ousRestartTestWithSharedGroupAndIndexes.java | 9 ----- .../IgnitePdsDestroyCacheAbstractTest.java | 10 +----- .../IgnitePdsExchangeDuringCheckpointTest.java | 12 ------- ...gnitePdsRecoveryAfterFileCorruptionTest.java | 11 ------ .../IgnitePdsRemoveDuringRebalancingTest.java | 11 ------ .../IgnitePersistentStoreCacheGroupsTest.java | 8 ----- ...IgnitePersistentStoreDataStructuresTest.java | 8 ----- ...teRebalanceScheduleResendPartitionsTest.java | 7 ---- ...hangeDuringRebalanceOnNonNodeAssignTest.java | 8 ----- .../db/CheckpointBufferDeadlockTest.java | 8 ----- .../db/IgnitePdsCacheRestoreTest.java | 8 ----- .../db/IgnitePdsDataRegionMetricsTest.java | 8 ----- .../db/IgnitePdsMultiNodePutGetRestartTest.java | 8 ----- .../db/IgnitePdsPageEvictionTest.java | 11 ------ .../db/IgnitePdsPartitionPreloadTest.java | 8 ----- .../db/IgnitePdsReserveWalSegmentsTest.java | 8 ----- .../db/IgnitePdsTransactionsHangTest.java | 10 ------ .../persistence/db/IgnitePdsWithTtlTest.java | 10 ------ ...SlowHistoricalRebalanceSmallHistoryTest.java | 11 ------ ...faultPageSizeBackwardsCompatibilityTest.java | 9 ----- .../db/file/IgnitePdsCacheIntegrationTest.java | 8 ----- ...ckpointSimulationWithRealCpDisabledTest.java | 12 ------- .../wal/FsyncWalRolloverDoesNotBlockTest.java | 8 ----- .../IgniteNodeStoppedDuringDisableWALTest.java | 8 ----- ...IsReachedDuringIterationOverArchiveTest.java | 8 ----- ...gniteWalIteratorExceptionDuringReadTest.java | 8 ----- .../db/wal/IgniteWalSerializerVersionTest.java | 8 ----- .../db/wal/WalCompactionAfterRestartTest.java | 8 ----- .../persistence/db/wal/WalCompactionTest.java | 8 ----- .../db/wal/WalRolloverRecordLoggingTest.java | 8 ----- .../db/wal/WalRolloverTypesTest.java | 8 ----- ...IgniteAbstractWalIteratorInvalidCrcTest.java | 7 ---- .../db/wal/reader/IgniteWalReaderTest.java | 8 ----- .../metastorage/IgniteMetaStorageBasicTest.java | 12 ------- .../pagemem/FillFactorMetricTest.java | 6 ---- .../pagemem/PagesWriteThrottleSandboxTest.java | 9 ----- .../pagemem/PagesWriteThrottleSmokeTest.java | 9 ----- .../AbstractNodeJoinTemplate.java | 9 ----- .../IgniteNoParrallelClusterIsAllowedTest.java | 5 --- .../IgniteStandByClusterTest.java | 8 ----- .../StandaloneWalRecordsIteratorTest.java | 9 ----- .../GridCacheQueryTransformerSelfTest.java | 7 ---- .../cache/query/IndexingSpiQuerySelfTest.java | 8 ----- .../continuous/CacheContinuousBatchAckTest.java | 12 ------- ...heContinuousBatchForceServerModeAckTest.java | 37 ++------------------ ...eContinuousQueryAsyncFilterListenerTest.java | 8 ----- ...nuousQueryConcurrentPartitionUpdateTest.java | 8 ----- ...CacheContinuousQueryCounterAbstractTest.java | 12 ------- ...ContinuousQueryFailoverAbstractSelfTest.java | 6 ---- .../CacheContinuousQueryLostPartitionTest.java | 11 ------ ...ontinuousQueryOperationFromCallbackTest.java | 7 ---- .../CacheContinuousQueryOperationP2PTest.java | 8 ----- .../CacheContinuousQueryOrderingEventTest.java | 7 ---- ...acheContinuousQueryRandomOperationsTest.java | 7 ---- ...heContinuousWithTransformerFailoverTest.java | 8 ----- ...eEntryProcessorExternalizableFailedTest.java | 7 ---- .../CacheEntryProcessorNonSerializableTest.java | 7 ---- .../CacheKeepBinaryIterationTest.java | 7 ---- .../ContinuousQueryReassignmentTest.java | 16 --------- ...ridCacheContinuousQueryAbstractSelfTest.java | 12 ------- .../GridCacheContinuousQueryConcurrentTest.java | 8 ----- ...eContinuousQueryMultiNodesFilteringTest.java | 8 ----- ...dCacheContinuousQueryNodesFilteringTest.java | 8 ----- ...eContinuousQueryReplicatedTxOneNodeTest.java | 12 ------- ...niteCacheContinuousQueryBackupQueueTest.java | 8 ----- .../IgniteCacheContinuousQueryClientTest.java | 8 ----- ...eCacheContinuousQueryImmutableEntryTest.java | 8 ----- ...teCacheContinuousQueryNoUnsubscribeTest.java | 8 ----- ...BehindStorePartitionedMultiNodeSelfTest.java | 12 ------- .../AbstractTransactionIntergrityTest.java | 8 ----- .../cache/transactions/TxOnCachesStartTest.java | 16 --------- .../TxOptimisticDeadlockDetectionTest.java | 17 ++------- ...OptimisticPrepareOnUnstableTopologyTest.java | 12 ------- .../cache/transactions/TxRollbackAsyncTest.java | 7 ---- .../TxRollbackOnTimeoutOnePhaseCommitTest.java | 7 ---- .../transactions/TxRollbackOnTimeoutTest.java | 7 ---- .../TxRollbackOnTopologyChangeTest.java | 7 ---- ...WithSmallTimeoutAndContentionOneKeyTest.java | 8 ----- .../closure/GridClosureProcessorSelfTest.java | 12 ------- ...ComputeJobExecutionErrorToLogManualTest.java | 20 ----------- ...puteCustomExecutorConfigurationSelfTest.java | 19 ---------- .../continuous/GridEventConsumeSelfTest.java | 12 ------- .../IgniteNoCustomEventsOnNodeStart.java | 10 ------ .../database/IgniteDbAbstractTest.java | 11 ------ .../DataStreamProcessorSelfTest.java | 12 ------- ...rClientReconnectAfterClusterRestartTest.java | 7 ---- .../datastreamer/DataStreamerImplSelfTest.java | 11 ------ .../DataStreamerMultiThreadedSelfTest.java | 11 ------ .../DataStreamerMultinodeCreateCacheTest.java | 7 ---- .../DataStreamerUpdateAfterLoadTest.java | 8 ----- .../IgniteDataStreamerPerformanceTest.java | 12 ------- .../igfs/IgfsDataManagerSelfTest.java | 12 ------- .../igfs/IgfsMetaManagerSelfTest.java | 12 ------- .../processors/igfs/IgfsMetricsSelfTest.java | 8 ----- .../processors/igfs/IgfsProcessorSelfTest.java | 13 ------- .../igfs/IgfsProcessorValidationSelfTest.java | 12 ------- ...IpcEndpointRegistrationAbstractSelfTest.java | 16 --------- .../processors/igfs/IgfsSizeSelfTest.java | 8 ----- .../processors/igfs/IgfsStartCacheTest.java | 12 ------- .../processors/igfs/IgfsStreamsSelfTest.java | 12 ------- .../processors/igfs/IgfsTaskSelfTest.java | 11 ------ .../IgfsAbstractRecordResolverSelfTest.java | 11 ------ .../service/ClosureServiceClientsNodesTest.java | 8 ----- .../service/GridServiceClientNodeTest.java | 8 ----- .../GridServiceProcessorAbstractSelfTest.java | 12 ------- ...GridServiceProcessorBatchDeploySelfTest.java | 20 ----------- ...GridServiceProxyClientReconnectSelfTest.java | 8 ----- .../GridServiceProxyNodeStopSelfTest.java | 16 --------- .../GridServiceSerializationSelfTest.java | 16 --------- ...yment2ClassLoadersDefaultMarshallerTest.java | 12 ------- ...oymentClassLoadingDefaultMarshallerTest.java | 12 ------- .../IgniteServiceDynamicCachesSelfTest.java | 20 ----------- .../service/IgniteServiceReassignmentTest.java | 8 ----- .../ServiceDeploymentOnActivationTest.java | 10 ------ .../ServiceDeploymentOutsideBaselineTest.java | 10 ------ .../ServicePredicateAccessCacheTest.java | 8 ----- .../service/SystemCacheNotConfiguredTest.java | 11 ------ .../nio/IgniteExceptionInNioWorkerSelfTest.java | 10 ------ .../loadtests/GridCacheMultiNodeLoadTest.java | 12 ------- .../communication/GridIoManagerBenchmark0.java | 12 ------- .../GridCachePartitionedAtomicLongLoadTest.java | 12 ------- .../GridMarshallerMappingConsistencyTest.java | 11 ------ .../ignite/messaging/GridMessagingSelfTest.java | 16 --------- .../messaging/IgniteMessagingSendAsyncTest.java | 16 --------- .../IgniteMessagingWithClientTest.java | 7 ---- .../GridP2PContinuousDeploymentSelfTest.java | 12 ------- .../p2p/GridP2PDoubleDeploymentSelfTest.java | 12 ------- .../GridP2PMissedResourceCacheSizeSelfTest.java | 12 ------- .../p2p/GridP2PSameClassLoaderSelfTest.java | 8 ----- .../services/ServiceThreadPoolSelfTest.java | 15 -------- .../CacheCheckpointSpiSecondCacheSelfTest.java | 12 ------- .../communication/GridCacheMessageSelfTest.java | 12 ------- .../tcp/GridCacheDhtLockBackupSelfTest.java | 12 ------- .../tcp/TcpCommunicationSpiDropNodesTest.java | 10 ------ .../TcpCommunicationSpiFaultyClientTest.java | 11 +----- .../tcp/TcpCommunicationStatisticsTest.java | 8 ----- .../FilterDataForClientNodeDiscoveryTest.java | 7 +--- .../IgniteDiscoveryCacheReuseSelfTest.java | 16 --------- .../discovery/tcp/IgniteClientConnectTest.java | 10 +----- ...gniteClientReconnectMassiveShutdownTest.java | 7 ---- ...pClientDiscoveryMarshallerCheckSelfTest.java | 9 ----- .../TcpDiscoveryClientSuspensionSelfTest.java | 11 ------ .../tcp/TcpDiscoveryConcurrentStartTest.java | 7 ---- .../TcpDiscoveryMarshallerCheckSelfTest.java | 11 ------ .../tcp/TcpDiscoveryMultiThreadedTest.java | 11 ++---- ...DiscoveryNodeConfigConsistentIdSelfTest.java | 7 ---- .../TcpDiscoveryNodeConsistentIdSelfTest.java | 7 ---- .../TcpDiscoveryPendingMessageDeliveryTest.java | 7 +--- .../discovery/tcp/TcpDiscoveryRestartTest.java | 10 ------ .../tcp/TcpDiscoverySpiRandomStartStopTest.java | 12 ------- .../tcp/TcpDiscoverySpiWildcardSelfTest.java | 10 ------ .../vm/TcpDiscoveryVmIpFinderSelfTest.java | 16 ++++----- .../stream/socket/SocketStreamerSelfTest.java | 12 ------- .../util/AttributeNodeFilterSelfTest.java | 8 ----- .../GridInternalTaskUnusedWalSegmentsTest.java | 8 ----- .../util/GridTopologyHeapSizeSelfTest.java | 20 ----------- .../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 8 ----- .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 11 ------ .../hibernate/HibernateL2CacheSelfTest.java | 12 ------- .../hibernate/HibernateL2CacheSelfTest.java | 12 ------- ...MetadataConcurrentUpdateWithIndexesTest.java | 6 +--- ...CacheAbstractQueryDetailMetricsSelfTest.java | 12 ------- .../CacheAbstractQueryMetricsSelfTest.java | 12 ------- .../CacheBinaryKeyConcurrentQueryTest.java | 8 ----- .../cache/CacheIndexStreamerTest.java | 16 --------- .../CacheOffheapBatchIndexingBaseTest.java | 8 ----- .../cache/CacheQueryBuildValueTest.java | 8 ----- .../cache/CacheQueryFilterExpiredTest.java | 16 --------- .../cache/CacheQueryNewClientSelfTest.java | 16 --------- .../CacheRandomOperationsMultithreadedTest.java | 8 ----- ...CacheScanPartitionQueryFallbackSelfTest.java | 9 +---- .../cache/CacheSqlQueryValueCopySelfTest.java | 8 ----- .../cache/DdlTransactionSelfTest.java | 11 ------ .../cache/GridCacheCrossCacheQuerySelfTest.java | 12 ------- .../cache/GridCacheFullTextQuerySelfTest.java | 12 ------- ...GridCacheLazyQueryPartitionsReleaseTest.java | 12 ------- .../cache/GridCacheOffHeapSelfTest.java | 12 ------- .../GridCacheOffheapIndexEntryEvictTest.java | 12 ------- .../cache/GridCacheOffheapIndexGetSelfTest.java | 12 ------- .../GridCacheQueryIndexDisabledSelfTest.java | 12 ------- .../GridCacheQuerySerializationSelfTest.java | 12 ------- .../cache/GridCacheQuerySimpleBenchmark.java | 12 ------- .../cache/GridIndexingWithNoopSwapSelfTest.java | 12 ------- .../IgniteBinaryObjectFieldsQuerySelfTest.java | 12 ------- .../IgniteBinaryObjectQueryArgumentsTest.java | 8 ----- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 18 ---------- ...niteCacheAbstractInsertSqlQuerySelfTest.java | 12 ------- .../cache/IgniteCacheAbstractQuerySelfTest.java | 7 +--- .../IgniteCacheAbstractSqlDmlQuerySelfTest.java | 12 ------- .../IgniteCacheCollocatedQuerySelfTest.java | 12 ------- ...acheConfigurationPrimitiveTypesSelfTest.java | 20 ----------- .../IgniteCacheCrossCacheJoinRandomTest.java | 10 ------ ...acheDistributedJoinCollocatedAndNotTest.java | 10 ------ ...acheDistributedJoinCustomAffinityMapper.java | 8 ----- .../IgniteCacheDistributedJoinNoIndexTest.java | 10 ------ ...ributedJoinPartitionedAndReplicatedTest.java | 10 ------ ...CacheDistributedJoinQueryConditionsTest.java | 10 ------ .../cache/IgniteCacheDistributedJoinTest.java | 10 ------ ...cheDuplicateEntityConfigurationSelfTest.java | 20 ----------- .../IgniteCacheFieldsQueryNoDataSelfTest.java | 12 ------- ...teCacheFullTextQueryNodeJoiningSelfTest.java | 12 ------- .../cache/IgniteCacheGroupsSqlTest.java | 16 --------- .../IgniteCacheInsertSqlQuerySelfTest.java | 12 ------- ...PartitionedAndReplicatedCollocationTest.java | 10 ------ ...teCacheJoinPartitionedAndReplicatedTest.java | 10 ------ ...IgniteCacheJoinQueryWithAffinityKeyTest.java | 8 ----- .../cache/IgniteCacheLargeResultSelfTest.java | 12 ------- .../cache/IgniteCacheNoClassQuerySelfTest.java | 7 +--- .../cache/IgniteCacheOffheapEvictQueryTest.java | 12 ------- .../cache/IgniteCacheOffheapIndexScanTest.java | 12 ------- ...hePartitionedQueryMultiThreadedSelfTest.java | 12 ------- ...IgniteCachePrimitiveFieldsQuerySelfTest.java | 12 ------- .../cache/IgniteCacheQueriesLoadTest1.java | 8 ----- .../cache/IgniteCacheQueryLoadSelfTest.java | 12 ------- .../IgniteCacheQueryMultiThreadedSelfTest.java | 12 ------- ...gniteCacheSqlQueryMultiThreadedSelfTest.java | 12 ------- ...CheckClusterStateBeforeExecuteQueryTest.java | 9 ----- .../cache/IgniteCrossCachesJoinsQueryTest.java | 8 ----- .../cache/IgniteErrorOnRebalanceTest.java | 8 ----- .../authentication/SqlUserCommandSelfTest.java | 12 ------- ...lientQueryReplicatedNodeRestartSelfTest.java | 12 ------- ...stributedPartitionQueryAbstractSelfTest.java | 10 ------ ...niteCacheDistributedQueryCancelSelfTest.java | 7 ---- ...butedQueryStopOnCancelOrTimeoutSelfTest.java | 7 ---- ...cheQueryAbstractDistributedJoinSelfTest.java | 12 ------- .../IgniteCacheQueryNoRebalanceSelfTest.java | 8 ----- .../near/IgniteCacheQueryNodeFailTest.java | 8 ----- .../IgniteCacheQueryNodeRestartSelfTest.java | 12 ------- .../IgniteCacheQueryNodeRestartSelfTest2.java | 12 ------- .../near/IgniteSqlQueryWithBaselineTest.java | 12 ------- .../cache/index/AbstractSchemaSelfTest.java | 8 ----- .../processors/cache/index/BasicIndexTest.java | 10 ------ .../cache/index/DynamicColumnsAbstractTest.java | 8 ----- .../index/DynamicIndexAbstractSelfTest.java | 8 ----- .../index/IoStatisticsBasicIndexSelfTest.java | 10 ------ .../index/MvccEmptyTransactionSelfTest.java | 7 ---- .../cache/index/SchemaExchangeSelfTest.java | 7 ---- .../cache/ttl/CacheTtlAbstractSelfTest.java | 8 ----- ...oreQueryWithMultipleClassesPerCacheTest.java | 8 ----- .../IgnitePersistentStoreSchemaLoadTest.java | 8 ----- .../query/IgniteCachelessQueriesSelfTest.java | 12 ------- .../query/IgniteQueryDedicatedPoolTest.java | 9 ----- .../query/IgniteSqlDefaultValueTest.java | 11 +----- .../query/IgniteSqlDistributedJoinSelfTest.java | 12 ------- .../IgniteSqlEntryCacheModeAgnosticTest.java | 12 ------- .../IgniteSqlGroupConcatCollocatedTest.java | 12 ------- .../IgniteSqlGroupConcatNotCollocatedTest.java | 12 ------- .../query/IgniteSqlKeyValueFieldsTest.java | 12 ------- .../query/IgniteSqlNotNullConstraintTest.java | 12 ------- .../query/IgniteSqlParameterizedQueryTest.java | 11 ------ .../query/IgniteSqlQueryParallelismTest.java | 12 ------- .../processors/query/IgniteSqlRoutingTest.java | 11 ------ .../query/IgniteSqlSchemaIndexingTest.java | 12 ------- .../query/IgniteSqlSegmentedIndexSelfTest.java | 12 ------- ...teSqlSkipReducerOnUpdateDmlFlagSelfTest.java | 11 ------ ...IgniteSqlSkipReducerOnUpdateDmlSelfTest.java | 11 ------ .../query/IgniteSqlSplitterSelfTest.java | 12 ------- .../query/h2/IgniteSqlQueryMinMaxTest.java | 9 ----- .../h2/sql/AbstractH2CompareQueryTest.java | 12 ------- .../query/h2/sql/GridQueryParsingTest.java | 12 ------- .../h2/twostep/CacheQueryMemoryLeakTest.java | 7 ---- .../tcp/GridOrderedMessageCancelSelfTest.java | 12 ------- ...QueryJsr310Java8DateTimeApiAbstractTest.java | 16 --------- .../spark/JavaEmbeddedIgniteRDDSelfTest.java | 9 ----- .../spring/GridSpringCacheManagerSelfTest.java | 12 ------- .../ignite/internal/GridFactorySelfTest.java | 14 -------- .../GridSpringBeanSerializationSelfTest.java | 12 ------- .../p2p/GridP2PUserVersionChangeSelfTest.java | 12 ------- .../GridSpringTransactionManagerSelfTest.java | 12 ------- 712 files changed, 64 insertions(+), 7577 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java index f5f061f..0bb6068 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java @@ -28,9 +28,6 @@ import org.apache.ignite.events.Event; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.spi.deployment.local.LocalDeploymentSpi; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestClassLoader; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; @@ -47,9 +44,6 @@ import static org.apache.ignite.events.EventType.EVT_TASK_DEPLOYED; @RunWith(JUnit4.class) public abstract class AbstractAopTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - - /** */ private DeploymentMode depMode = DeploymentMode.PRIVATE; /** {@inheritDoc} */ @@ -58,8 +52,6 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest { cfg.setDeploymentSpi(new LocalDeploymentSpi()); - ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER); - cfg.setMetricsUpdateFrequency(500); cfg.setDeploymentMode(depMode); http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java index 2ba00c3..4a1967f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java @@ -43,9 +43,6 @@ import org.apache.ignite.internal.client.ssl.GridSslContextFactory; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.resources.IgniteInstanceResource; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; import org.junit.Test; @@ -63,9 +60,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; */ @RunWith(JUnit4.class) public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbstractTest { - /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** Partitioned cache name. */ protected static final String PARTITIONED_CACHE_NAME = "partitioned"; @@ -177,12 +171,6 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst c.setConnectorConfiguration(clientCfg); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - c.setDiscoverySpi(disco); - c.setCacheConfiguration(cacheConfiguration(DEFAULT_CACHE_NAME), cacheConfiguration(PARTITIONED_CACHE_NAME), cacheConfiguration(REPLICATED_CACHE_NAME), cacheConfiguration(PARTITIONED_ASYNC_BACKUP_CACHE_NAME), cacheConfiguration(REPLICATED_ASYNC_CACHE_NAME)); http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java index 7e4e4f0..5004b87 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java @@ -37,9 +37,6 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.rest.GridRestCommand; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.SB; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -55,9 +52,6 @@ public class ClientDefaultCacheSelfTest extends GridCommonAbstractTest { /** Path to jetty config configured with SSL. */ private static final String REST_JETTY_CFG = "modules/clients/src/test/resources/jetty/rest-jetty.xml"; - /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** Host. */ private static final String HOST = "127.0.0.1"; @@ -108,12 +102,6 @@ public class ClientDefaultCacheSelfTest extends GridCommonAbstractTest { cfg.setConnectorConfiguration(clientCfg); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - CacheConfiguration cLoc = new CacheConfiguration(DEFAULT_CACHE_NAME); cLoc.setName(LOCAL_CACHE); http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java index 077381a..5ee0637 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java @@ -68,9 +68,6 @@ import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; @@ -92,9 +89,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; */ @RunWith(JUnit4.class) public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstractTest { - /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** Partitioned cache name. */ private static final String PARTITIONED_CACHE_NAME = "partitioned"; @@ -181,12 +175,6 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract c.setConnectorConfiguration(clientCfg); } - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - c.setDiscoverySpi(disco); - TestCommunicationSpi spi = new TestCommunicationSpi(); spi.setLocalPort(GridTestUtils.getNextCommPort(getClass())); http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java index eee73f7..79a9092 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java @@ -66,9 +66,6 @@ import org.apache.ignite.internal.client.ssl.GridSslContextFactory; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiInClosure; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -89,9 +86,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @RunWith(JUnit4.class) public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - - /** */ private static final String CACHE_NAME = "cache"; /** */ @@ -237,12 +231,6 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { cfg.setConnectorConfiguration(clientCfg); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - cfg.setCacheConfiguration(cacheConfiguration(DEFAULT_CACHE_NAME), cacheConfiguration("replicated"), cacheConfiguration("partitioned"), cacheConfiguration(CACHE_NAME)); http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java index e99d93d..40f35eb 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java @@ -36,9 +36,6 @@ import org.apache.ignite.internal.client.balancer.GridClientLoadBalancer; import org.apache.ignite.internal.client.balancer.GridClientRandomBalancer; import org.apache.ignite.internal.client.balancer.GridClientRoundRobinBalancer; import org.apache.ignite.resources.IgniteInstanceResource; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -53,9 +50,6 @@ import static org.apache.ignite.internal.client.integration.ClientAbstractMultiN */ @RunWith(JUnit4.class) public class ClientPreferDirectSelfTest extends GridCommonAbstractTest { - /** VM ip finder for TCP discovery. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** */ private static final int NODES_CNT = 6; @@ -68,12 +62,6 @@ public class ClientPreferDirectSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration c = super.getConfiguration(igniteInstanceName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - c.setDiscoverySpi(disco); - c.setLocalHost(HOST); assert c.getConnectorConfiguration() == null; http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java index 86fc9a6..cc9fad1 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java @@ -38,9 +38,6 @@ import org.apache.ignite.internal.client.GridClientProtocol; import org.apache.ignite.internal.client.GridServerUnreachableException; import org.apache.ignite.internal.client.impl.connection.GridClientConnectionResetException; import org.apache.ignite.internal.util.typedef.X; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -70,9 +67,6 @@ public class ClientFailedInitSelfTest extends GridCommonAbstractTest { /** */ private static final int ROUTER_JETTY_PORT = 8081; - /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { GridClientFactory.stopAll(); @@ -95,12 +89,6 @@ public class ClientFailedInitSelfTest extends GridCommonAbstractTest { cfg.setConnectorConfiguration(clientCfg); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java index 09ff380..7a292a1 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/RouterFactorySelfTest.java @@ -24,8 +24,6 @@ import java.util.HashSet; import java.util.Iterator; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -38,9 +36,6 @@ import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT; */ @RunWith(JUnit4.class) public class RouterFactorySelfTest extends GridCommonAbstractTest { - /** Shared IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** */ private static final int GRID_HTTP_PORT = 11087; @@ -48,7 +43,7 @@ public class RouterFactorySelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(IP_FINDER); + discoSpi.setIpFinder(sharedStaticIpFinder); IgniteConfiguration cfg = new IgniteConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java index 93d74c1..e802759 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java @@ -28,9 +28,6 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; import org.junit.Test; @@ -47,9 +44,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; */ @RunWith(JUnit4.class) public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { - /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** JDBC URL. */ private static final String BASE_URL = CFG_URL_PREFIX + "cache=pers@modules/clients/src/test/config/jdbc-config.xml"; @@ -64,12 +58,6 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { cacheConfiguration("pers", AffinityKey.class, Person.class), cacheConfiguration("org", String.class, Organization.class)); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - cfg.setConnectorConfiguration(new ConnectorConfiguration()); return cfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java index 0fb66bc..999ca2f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java @@ -25,9 +25,6 @@ import java.util.concurrent.Callable; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; @@ -42,9 +39,6 @@ import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX; */ @RunWith(JUnit4.class) public class JdbcConnectionSelfTest extends GridCommonAbstractTest { - /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** Custom cache name. */ private static final String CUSTOM_CACHE_NAME = "custom-cache"; @@ -70,12 +64,6 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cacheConfiguration(DEFAULT_CACHE_NAME), cacheConfiguration(CUSTOM_CACHE_NAME)); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - cfg.setDaemon(daemon); cfg.setClientMode(client); http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java index 59e3bf4..763e69b 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java @@ -27,9 +27,6 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -45,9 +42,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; */ @RunWith(JUnit4.class) public class JdbcDistributedJoinsQueryTest extends GridCommonAbstractTest { - /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** JDBC URL. */ private static final String BASE_URL = CFG_URL_PREFIX + "cache=default:distributedJoins=true@modules/clients/src/test/config/jdbc-config.xml"; @@ -68,12 +62,6 @@ public class JdbcDistributedJoinsQueryTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - cfg.setConnectorConfiguration(new ConnectorConfiguration()); return cfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java index 13c4df3..5fc9f75 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java @@ -18,9 +18,6 @@ package org.apache.ignite.internal.jdbc2; import org.apache.ignite.configuration.*; -import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import java.sql.*; @@ -37,9 +34,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ @RunWith(JUnit4.class) public class JdbcEmptyCacheSelfTest extends GridCommonAbstractTest { - /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** Cache name. */ private static final String CACHE_NAME = "cache"; @@ -66,12 +60,6 @@ public class JdbcEmptyCacheSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - cfg.setConnectorConfiguration(new ConnectorConfiguration()); return cfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java index 56ebb90..4174975 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java @@ -25,9 +25,6 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -43,9 +40,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; */ @RunWith(JUnit4.class) public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest { - /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** Cache name. */ private static final String CACHE_NAME = "cache"; @@ -69,12 +63,6 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - cfg.setConnectorConfiguration(new ConnectorConfiguration()); return cfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java index e718cb6..10cf725 100755 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java @@ -47,9 +47,6 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteVersionUtils; import org.apache.ignite.internal.processors.query.QueryEntityEx; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; import org.junit.Test; @@ -70,9 +67,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; */ @RunWith(JUnit4.class) public class JdbcMetadataSelfTest extends GridCommonAbstractTest { - /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** JDBC URL. */ private static final String BASE_URL = CFG_URL_PREFIX + "cache=pers@modules/clients/src/test/config/jdbc-config.xml"; @@ -103,12 +97,6 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { cacheConfiguration("metaTest").setQueryEntities(Arrays.asList( new QueryEntity(AffinityKey.class, MetaTest.class)))); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - cfg.setConnectorConfiguration(new ConnectorConfiguration()); return cfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java index 5e6cac6..34207eb 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java @@ -26,9 +26,6 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; @@ -43,9 +40,6 @@ import static org.apache.ignite.IgniteJdbcDriver.CFG_URL_PREFIX; */ @RunWith(JUnit4.class) public class JdbcNoDefaultCacheTest extends GridCommonAbstractTest { - /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** First cache name. */ private static final String CACHE1_NAME = "cache1"; @@ -64,12 +58,6 @@ public class JdbcNoDefaultCacheTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cacheConfiguration(CACHE1_NAME), cacheConfiguration(CACHE2_NAME)); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java index 30f2fad..4349987 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java @@ -33,9 +33,6 @@ import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -64,9 +61,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; */ @RunWith(JUnit4.class) public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { - /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** JDBC URL. */ private static final String BASE_URL = CFG_URL_PREFIX + "cache=default@modules/clients/src/test/config/jdbc-config.xml"; @@ -91,12 +85,6 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - cfg.setConnectorConfiguration(new ConnectorConfiguration()); return cfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java index 3cbd461..f8d2d76 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java @@ -40,9 +40,6 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; @@ -60,9 +57,6 @@ import static org.apache.ignite.jdbc.JdbcResultSetSelfTest.assertEqualsToStringR @SuppressWarnings("FloatingPointEquality") @RunWith(JUnit4.class) public class JdbcResultSetSelfTest extends GridCommonAbstractTest { - /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** JDBC URL. */ private static final String BASE_URL = CFG_URL_PREFIX + "cache=default@modules/clients/src/test/config/jdbc-config.xml"; @@ -91,12 +85,6 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - cfg.setConnectorConfiguration(new ConnectorConfiguration()); return cfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java index 2e5ce85..b26dd38 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java @@ -28,9 +28,6 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -45,9 +42,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; */ @RunWith(JUnit4.class) public class JdbcStatementSelfTest extends GridCommonAbstractTest { - /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** JDBC URL. */ private static final String BASE_URL = CFG_URL_PREFIX + "cache=default:multipleStatementsAllowed=true@modules/clients/src/test/config/jdbc-config.xml"; @@ -76,12 +70,6 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - cfg.setConnectorConfiguration(new ConnectorConfiguration()); return cfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java index e5c658c..d765718 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java @@ -21,18 +21,12 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** * Abstract class for REST protocols tests. */ public abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTest { - /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** Local host. */ protected static final String LOC_HOST = "127.0.0.1"; @@ -84,12 +78,6 @@ public abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTe cfg.setConnectorConfiguration(clientCfg); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - CacheConfiguration ccfg = defaultCacheConfiguration(); ccfg.setStatisticsEnabled(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java index a012139..c73833a 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java @@ -26,9 +26,6 @@ import org.apache.ignite.internal.client.GridClientClusterState; import org.apache.ignite.internal.client.GridClientConfiguration; import org.apache.ignite.internal.client.GridClientException; import org.apache.ignite.internal.client.GridClientFactory; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -42,9 +39,6 @@ import static org.apache.ignite.internal.client.GridClientProtocol.TCP; @RunWith(JUnit4.class) public class ChangeStateCommandHandlerTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - - /** */ public static final String HOST = "127.0.0.1"; /** */ @@ -65,12 +59,6 @@ public class ChangeStateCommandHandlerTest extends GridCommonAbstractTest { cfg.setConnectorConfiguration(clientCfg); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/7868e667/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java index 3fe693d..249e273 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java @@ -39,9 +39,6 @@ import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.processors.rest.client.message.GridClientNodeBean; import org.apache.ignite.internal.processors.rest.client.message.GridClientTaskResultBean; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; @@ -59,9 +56,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @RunWith(JUnit4.class) public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - - /** */ private static final String CACHE_NAME = "cache"; /** */ @@ -105,12 +99,6 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { cfg.setConnectorConfiguration(clientCfg); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - - disco.setIpFinder(IP_FINDER); - - cfg.setDiscoverySpi(disco); - cfg.setCacheConfiguration(cacheConfiguration(DEFAULT_CACHE_NAME), cacheConfiguration(CACHE_NAME)); return cfg;
