You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/05/06 15:23:28 UTC
[1/6] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-5' into ignite-709_2
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-836_2 cff3c6644 -> 0bfd42b44
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-709_2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/619a644f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/619a644f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/619a644f
Branch: refs/heads/ignite-836_2
Commit: 619a644f73449a1385825f437f56e819e46b00aa
Parents: f9f7662 5f8f6f4
Author: sevdokimov <se...@gridgain.com>
Authored: Tue May 5 16:43:56 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Tue May 5 16:43:56 2015 +0300
----------------------------------------------------------------------
.../streaming/wordcount/CacheConfig.java | 5 -
.../config/grid-client-config.properties | 50 +-
.../ClientPropertiesConfigurationSelfTest.java | 12 +-
.../java/org/apache/ignite/IgniteCache.java | 5 +
.../org/apache/ignite/IgniteJdbcDriver.java | 81 ++-
.../ignite/compute/ComputeTaskAdapter.java | 14 +-
.../client/GridClientConfiguration.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 503 +++++++++----------
.../processors/cache/GridCacheProcessor.java | 109 ++--
.../apache/ignite/lang/IgniteAsyncSupport.java | 4 +-
.../cache/GridCacheSwapReloadSelfTest.java | 20 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 15 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 2 +-
...idFileSwapSpaceSpiMultithreadedLoadTest.java | 4 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 11 +-
.../cache/GridCacheOffHeapSelfTest.java | 11 +-
pom.xml | 39 +-
17 files changed, 438 insertions(+), 449 deletions(-)
----------------------------------------------------------------------
[3/6] incubator-ignite git commit: # ignite-664: split
IgniteCacheTestSuite on 4 parts
Posted by se...@apache.org.
# ignite-664: split IgniteCacheTestSuite on 4 parts
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/acb9f1c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/acb9f1c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/acb9f1c6
Branch: refs/heads/ignite-836_2
Commit: acb9f1c6b5f5775b18e881f2a8d3a49e31d83cce
Parents: 6f1d642
Author: Artem Shutak <as...@gridgain.com>
Authored: Wed May 6 16:09:21 2015 +0300
Committer: Artem Shutak <as...@gridgain.com>
Committed: Wed May 6 16:09:21 2015 +0300
----------------------------------------------------------------------
.../ignite/testsuites/IgniteCacheTestSuite.java | 296 -------------------
.../testsuites/IgniteCacheTestSuite2.java | 141 +++++++++
.../testsuites/IgniteCacheTestSuite3.java | 143 +++++++++
.../testsuites/IgniteCacheTestSuite4.java | 131 ++++++++
4 files changed, 415 insertions(+), 296 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/acb9f1c6/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index bb019ae..9fd4e88 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -23,17 +23,11 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.fair.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.cache.store.jdbc.*;
-import org.apache.ignite.internal.processors.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.context.*;
import org.apache.ignite.internal.processors.cache.distributed.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.distributed.replicated.*;
-import org.apache.ignite.internal.processors.cache.distributed.replicated.preloader.*;
-import org.apache.ignite.internal.processors.cache.integration.*;
-import org.apache.ignite.internal.processors.cache.local.*;
import org.apache.ignite.internal.processors.datastreamer.*;
/**
@@ -159,296 +153,6 @@ public class IgniteCacheTestSuite extends TestSuite {
// suite.addTestSuite(GridCacheNearTxExceptionSelfTest.class);
// suite.addTestSuite(GridCacheStopSelfTest.class); TODO IGNITE-257
- // Local cache.
- suite.addTestSuite(GridCacheLocalBasicApiSelfTest.class);
- suite.addTestSuite(GridCacheLocalBasicStoreSelfTest.class);
- suite.addTestSuite(GridCacheLocalAtomicBasicStoreSelfTest.class);
- suite.addTestSuite(GridCacheLocalGetAndTransformStoreSelfTest.class);
- suite.addTestSuite(GridCacheLocalAtomicGetAndTransformStoreSelfTest.class);
- suite.addTestSuite(GridCacheLocalLoadAllSelfTest.class);
- suite.addTestSuite(GridCacheLocalLockSelfTest.class);
- suite.addTestSuite(GridCacheLocalMultithreadedSelfTest.class);
- suite.addTestSuite(GridCacheLocalTxSingleThreadedSelfTest.class);
- suite.addTestSuite(GridCacheLocalTxTimeoutSelfTest.class);
- suite.addTestSuite(GridCacheLocalEventSelfTest.class);
- suite.addTestSuite(GridCacheLocalEvictionEventSelfTest.class);
- suite.addTestSuite(GridCacheVariableTopologySelfTest.class);
- suite.addTestSuite(GridCacheLocalTxMultiThreadedSelfTest.class);
- suite.addTestSuite(GridCacheTransformEventSelfTest.class);
- suite.addTestSuite(GridCacheLocalIsolatedNodesSelfTest.class);
-
- // Partitioned cache.
- suite.addTestSuite(GridCachePartitionedGetSelfTest.class);
- suite.addTest(new TestSuite(GridCachePartitionedBasicApiTest.class));
- suite.addTest(new TestSuite(GridCacheNearMultiGetSelfTest.class));
- suite.addTest(new TestSuite(GridCacheNearJobExecutionSelfTest.class));
- suite.addTest(new TestSuite(GridCacheNearOneNodeSelfTest.class));
- suite.addTest(new TestSuite(GridCacheNearMultiNodeSelfTest.class));
- suite.addTest(new TestSuite(GridCacheAtomicNearMultiNodeSelfTest.class));
- suite.addTest(new TestSuite(GridCacheNearReadersSelfTest.class));
- suite.addTest(new TestSuite(GridCacheAtomicNearReadersSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedAffinitySelfTest.class));
- suite.addTest(new TestSuite(GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest.class));
- suite.addTest(new TestSuite(GridCacheRendezvousAffinityClientSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedProjectionAffinitySelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedBasicOpSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedBasicStoreSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedGetAndTransformStoreSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedAtomicGetAndTransformStoreSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedBasicStoreMultiNodeSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedEventSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedLockSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedMultiNodeLockSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedMultiNodeSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedMultiThreadedPutGetSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedNodeFailureSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedExplicitLockNodeFailureSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedTxSingleThreadedSelfTest.class));
- suite.addTest(new TestSuite(GridCacheColocatedTxSingleThreadedSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedTxTimeoutSelfTest.class));
- suite.addTest(new TestSuite(GridCacheFinishPartitionsSelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtEntrySelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtInternalEntrySelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtMappingSelfTest.class));
-// suite.addTest(new TestSuite(GridCachePartitionedTxMultiThreadedSelfTest.class)); TODO-gg-4066
- suite.addTest(new TestSuite(GridCacheDhtPreloadSelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtPreloadOffHeapSelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtPreloadBigDataSelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtPreloadPutGetSelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtPreloadDisabledSelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtPreloadMultiThreadedSelfTest.class));
- suite.addTest(new TestSuite(GridCacheColocatedPreloadRestartSelfTest.class));
- suite.addTest(new TestSuite(GridCacheNearPreloadRestartSelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtPreloadStartStopSelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtPreloadUnloadSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedAffinityFilterSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedPreloadLifecycleSelfTest.class));
- suite.addTest(new TestSuite(CacheLoadingConcurrentGridStartSelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtPreloadDelayedSelfTest.class));
- suite.addTest(new TestSuite(GridPartitionedBackupLoadSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedLoadCacheSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionNotLoadedEventSelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtEvictionsDisabledSelfTest.class));
- suite.addTest(new TestSuite(GridCacheNearEvictionEventSelfTest.class));
- suite.addTest(new TestSuite(GridCacheAtomicNearEvictionEventSelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtEvictionSelfTest.class));
- suite.addTest(new TestSuite(GridCacheReplicatedEvictionSelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtEvictionNearReadersSelfTest.class));
- suite.addTest(new TestSuite(GridCacheDhtAtomicEvictionNearReadersSelfTest.class));
-// suite.addTest(new TestSuite(GridCachePartitionedTopologyChangeSelfTest.class)); TODO-gg-5489
- suite.addTest(new TestSuite(GridCachePartitionedPreloadEventsSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedUnloadEventsSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedAffinityHashIdResolverSelfTest.class));
- suite.addTest(new TestSuite(GridCacheColocatedOptimisticTransactionSelfTest.class));
- suite.addTestSuite(GridCacheAtomicMessageCountSelfTest.class);
- suite.addTest(new TestSuite(GridCacheNearPartitionedClearSelfTest.class));
-
- suite.addTest(new TestSuite(GridCacheDhtExpiredEntriesPreloadSelfTest.class));
- suite.addTest(new TestSuite(GridCacheNearExpiredEntriesPreloadSelfTest.class));
- suite.addTest(new TestSuite(GridCacheAtomicExpiredEntriesPreloadSelfTest.class));
-
- suite.addTest(new TestSuite(GridCacheOffheapUpdateSelfTest.class));
-
- // TODO: GG-7242, GG-7243: Enabled when fixed.
-// suite.addTest(new TestSuite(GridCacheDhtRemoveFailureTest.class));
-// suite.addTest(new TestSuite(GridCacheNearRemoveFailureTest.class));
- // TODO: GG-7201: Enable when fixed.
- //suite.addTest(new TestSuite(GridCacheDhtAtomicRemoveFailureTest.class));
-
- suite.addTest(new TestSuite(GridCacheNearPrimarySyncSelfTest.class));
- suite.addTest(new TestSuite(GridCacheColocatedPrimarySyncSelfTest.class));
-
- // Value consistency tests.
- suite.addTestSuite(GridCacheValueConsistencyAtomicSelfTest.class);
- suite.addTestSuite(GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.class);
- suite.addTestSuite(GridCacheValueConsistencyAtomicNearEnabledSelfTest.class);
- suite.addTestSuite(GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.class);
- suite.addTestSuite(GridCacheValueConsistencyTransactionalSelfTest.class);
- suite.addTestSuite(GridCacheValueConsistencyTransactionalNearEnabledSelfTest.class);
- suite.addTestSuite(GridCacheValueBytesPreloadingSelfTest.class);
-
- // Replicated cache.
- suite.addTestSuite(GridCacheReplicatedBasicApiTest.class);
- suite.addTestSuite(GridCacheReplicatedBasicOpSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedBasicStoreSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedGetAndTransformStoreSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedAtomicGetAndTransformStoreSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedEventSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedSynchronousCommitTest.class);
-
- // TODO: GG-7437.
- // suite.addTestSuite(GridCacheReplicatedInvalidateSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedLockSelfTest.class);
- // TODO: enable when GG-7437 is fixed.
- //suite.addTestSuite(GridCacheReplicatedMultiNodeLockSelfTest.class);
- //suite.addTestSuite(GridCacheReplicatedMultiNodeSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedNodeFailureSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedTxSingleThreadedSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedTxTimeoutSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedPreloadSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedPreloadOffHeapSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedPreloadLifecycleSelfTest.class);
- suite.addTestSuite(GridCacheSyncReplicatedPreloadSelfTest.class);
-
- suite.addTestSuite(GridCacheDeploymentSelfTest.class);
- suite.addTestSuite(GridCacheDeploymentOffHeapSelfTest.class);
-
- suite.addTestSuite(GridCachePutArrayValueSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedUnswapAdvancedSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedEvictionEventSelfTest.class);
- // TODO: GG-7569.
- // suite.addTestSuite(GridCacheReplicatedTxMultiThreadedSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedPreloadEventsSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedPreloadStartStopEventsSelfTest.class);
- // TODO: GG-7434
- // suite.addTestSuite(GridReplicatedTxPreloadTest.class);
-
- suite.addTestSuite(IgniteTxReentryNearSelfTest.class);
- suite.addTestSuite(IgniteTxReentryColocatedSelfTest.class);
-
- suite.addTestSuite(GridCacheOrderedPreloadingSelfTest.class);
-
- // Test for byte array value special case.
-// suite.addTestSuite(GridCacheLocalByteArrayValuesSelfTest.class);
- suite.addTestSuite(GridCacheNearPartitionedP2PEnabledByteArrayValuesSelfTest.class);
- suite.addTestSuite(GridCacheNearPartitionedP2PDisabledByteArrayValuesSelfTest.class);
- suite.addTestSuite(GridCachePartitionedOnlyP2PEnabledByteArrayValuesSelfTest.class);
- suite.addTestSuite(GridCachePartitionedOnlyP2PDisabledByteArrayValuesSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedP2PEnabledByteArrayValuesSelfTest.class);
- suite.addTestSuite(GridCacheReplicatedP2PDisabledByteArrayValuesSelfTest.class);
-
- // Near-only cache.
- suite.addTest(IgniteCacheNearOnlySelfTestSuite.suite());
-
- // Test cache with daemon nodes.
- suite.addTestSuite(GridCacheDaemonNodeLocalSelfTest.class);
- suite.addTestSuite(GridCacheDaemonNodePartitionedSelfTest.class);
- suite.addTestSuite(GridCacheDaemonNodeReplicatedSelfTest.class);
-
- // Write-behind.
- suite.addTest(IgniteCacheWriteBehindTestSuite.suite());
-
- // Transform.
- suite.addTestSuite(GridCachePartitionedTransformWriteThroughBatchUpdateSelfTest.class);
-
- suite.addTestSuite(GridCacheEntryVersionSelfTest.class);
- suite.addTestSuite(GridCacheVersionSelfTest.class);
-
- // Memory leak tests.
- suite.addTestSuite(GridCacheReferenceCleanupSelfTest.class);
- suite.addTestSuite(GridCacheReloadSelfTest.class);
-
- suite.addTestSuite(GridCacheMixedModeSelfTest.class);
-
- // Cache metrics.
- suite.addTest(IgniteCacheMetricsSelfTestSuite.suite());
-
- // Topology validator.
- suite.addTest(IgniteTopologyValidatorTestSuit.suite());
-
- // Eviction.
- suite.addTest(IgniteCacheEvictionSelfTestSuite.suite());
-
- // Iterators.
- suite.addTest(IgniteCacheIteratorsSelfTestSuite.suite());
-
- // Add tx recovery test suite.
- suite.addTest(IgniteCacheTxRecoverySelfTestSuite.suite());
-
- // Cache interceptor tests.
- suite.addTest(IgniteCacheInterceptorSelfTestSuite.suite());
-
- // Multi node update.
- suite.addTestSuite(GridCacheMultinodeUpdateSelfTest.class);
- // TODO: GG-5353.
- // suite.addTestSuite(GridCacheMultinodeUpdateNearEnabledSelfTest.class);
- // suite.addTestSuite(GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.class);
- suite.addTestSuite(GridCacheMultinodeUpdateAtomicSelfTest.class);
- suite.addTestSuite(GridCacheMultinodeUpdateAtomicNearEnabledSelfTest.class);
-
- suite.addTestSuite(IgniteCacheAtomicLoadAllTest.class);
- suite.addTestSuite(IgniteCacheAtomicLocalLoadAllTest.class);
- suite.addTestSuite(IgniteCacheTxLoadAllTest.class);
- suite.addTestSuite(IgniteCacheTxLocalLoadAllTest.class);
-
- suite.addTestSuite(IgniteCacheAtomicLoaderWriterTest.class);
- suite.addTestSuite(IgniteCacheTxLoaderWriterTest.class);
-
- suite.addTestSuite(IgniteCacheAtomicStoreSessionTest.class);
- suite.addTestSuite(IgniteCacheTxStoreSessionTest.class);
- suite.addTestSuite(IgniteCacheAtomicStoreSessionWriteBehindTest.class);
- suite.addTestSuite(IgniteCacheTxStoreSessionWriteBehindTest.class);
-
- suite.addTestSuite(IgniteCacheAtomicNoReadThroughTest.class);
- suite.addTestSuite(IgniteCacheAtomicNearEnabledNoReadThroughTest.class);
- suite.addTestSuite(IgniteCacheAtomicLocalNoReadThroughTest.class);
- suite.addTestSuite(IgniteCacheTxNoReadThroughTest.class);
- suite.addTestSuite(IgniteCacheTxNearEnabledNoReadThroughTest.class);
- suite.addTestSuite(IgniteCacheTxLocalNoReadThroughTest.class);
-
- suite.addTestSuite(IgniteCacheAtomicNoLoadPreviousValueTest.class);
- suite.addTestSuite(IgniteCacheAtomicNearEnabledNoLoadPreviousValueTest.class);
- suite.addTestSuite(IgniteCacheAtomicLocalNoLoadPreviousValueTest.class);
- suite.addTestSuite(IgniteCacheTxNoLoadPreviousValueTest.class);
- suite.addTestSuite(IgniteCacheTxNearEnabledNoLoadPreviousValueTest.class);
- suite.addTestSuite(IgniteCacheTxLocalNoLoadPreviousValueTest.class);
-
- suite.addTestSuite(IgniteCacheAtomicNoWriteThroughTest.class);
- suite.addTestSuite(IgniteCacheAtomicNearEnabledNoWriteThroughTest.class);
- suite.addTestSuite(IgniteCacheAtomicLocalNoWriteThroughTest.class);
- suite.addTestSuite(IgniteCacheTxNoWriteThroughTest.class);
- suite.addTestSuite(IgniteCacheTxNearEnabledNoWriteThroughTest.class);
- suite.addTestSuite(IgniteCacheTxLocalNoWriteThroughTest.class);
-
- suite.addTestSuite(IgniteCacheAtomicPeekModesTest.class);
- suite.addTestSuite(IgniteCacheAtomicNearPeekModesTest.class);
- suite.addTestSuite(IgniteCacheAtomicReplicatedPeekModesTest.class);
- suite.addTestSuite(IgniteCacheAtomicLocalPeekModesTest.class);
- suite.addTestSuite(IgniteCacheTxPeekModesTest.class);
- suite.addTestSuite(IgniteCacheTxNearPeekModesTest.class);
- suite.addTestSuite(IgniteCacheTxLocalPeekModesTest.class);
- suite.addTestSuite(IgniteCacheTxReplicatedPeekModesTest.class);
-
- // TODO: IGNITE-114.
- // suite.addTestSuite(IgniteCacheInvokeReadThroughTest.class);
- // suite.addTestSuite(GridCacheVersionMultinodeTest.class);
-
- suite.addTestSuite(IgniteCacheNearReadCommittedTest.class);
- suite.addTestSuite(IgniteCacheAtomicCopyOnReadDisabledTest.class);
- suite.addTestSuite(IgniteCacheTxCopyOnReadDisabledTest.class);
-
- suite.addTestSuite(IgniteCacheTxPreloadNoWriteTest.class);
-
- suite.addTestSuite(IgniteDynamicCacheStartSelfTest.class);
- suite.addTestSuite(IgniteCacheDynamicStopSelfTest.class);
- suite.addTestSuite(IgniteCacheConfigurationTemplateTest.class);
- suite.addTestSuite(IgniteCacheConfigurationDefaultTemplateTest.class);
-
- suite.addTestSuite(GridCacheTxLoadFromStoreOnLockSelfTest.class);
-
- suite.addTestSuite(GridCacheMarshallingNodeJoinSelfTest.class);
-
- suite.addTestSuite(IgniteCacheJdbcBlobStoreNodeRestartTest.class);
-
- suite.addTestSuite(IgniteCacheAtomicLocalStoreValueTest.class);
- suite.addTestSuite(IgniteCacheAtomicStoreValueTest.class);
- suite.addTestSuite(IgniteCacheAtomicNearEnabledStoreValueTest.class);
- suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.class);
- suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest.class);
- suite.addTestSuite(IgniteCacheTxLocalStoreValueTest.class);
- suite.addTestSuite(IgniteCacheTxStoreValueTest.class);
- suite.addTestSuite(IgniteCacheTxNearEnabledStoreValueTest.class);
-
- suite.addTestSuite(IgniteCacheLockFailoverSelfTest.class);
- suite.addTestSuite(IgniteCacheMultiTxLockSelfTest.class);
-
- suite.addTestSuite(IgniteInternalCacheTypesTest.class);
-
- suite.addTestSuite(IgniteExchangeFutureHistoryTest.class);
-
- suite.addTestSuite(CacheNoValueClassOnServerNodeTest.class);
-
return suite;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/acb9f1c6/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
new file mode 100644
index 0000000..dfd88a8
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
@@ -0,0 +1,141 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.distributed.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.*;
+import org.apache.ignite.internal.processors.cache.distributed.near.*;
+import org.apache.ignite.internal.processors.cache.distributed.replicated.*;
+import org.apache.ignite.internal.processors.cache.local.*;
+
+/**
+ * Test suite.
+ */
+public class IgniteCacheTestSuite2 extends TestSuite {
+ /**
+ * @return IgniteCache test suite.
+ * @throws Exception Thrown in case of the failure.
+ */
+ public static TestSuite suite() throws Exception {
+ TestSuite suite = new TestSuite("IgniteCache Test Suite part 2");
+
+ // Local cache.
+ suite.addTestSuite(GridCacheLocalBasicApiSelfTest.class);
+ suite.addTestSuite(GridCacheLocalBasicStoreSelfTest.class);
+ suite.addTestSuite(GridCacheLocalAtomicBasicStoreSelfTest.class);
+ suite.addTestSuite(GridCacheLocalGetAndTransformStoreSelfTest.class);
+ suite.addTestSuite(GridCacheLocalAtomicGetAndTransformStoreSelfTest.class);
+ suite.addTestSuite(GridCacheLocalLoadAllSelfTest.class);
+ suite.addTestSuite(GridCacheLocalLockSelfTest.class);
+ suite.addTestSuite(GridCacheLocalMultithreadedSelfTest.class);
+ suite.addTestSuite(GridCacheLocalTxSingleThreadedSelfTest.class);
+ suite.addTestSuite(GridCacheLocalTxTimeoutSelfTest.class);
+ suite.addTestSuite(GridCacheLocalEventSelfTest.class);
+ suite.addTestSuite(GridCacheLocalEvictionEventSelfTest.class);
+ suite.addTestSuite(GridCacheVariableTopologySelfTest.class);
+ suite.addTestSuite(GridCacheLocalTxMultiThreadedSelfTest.class);
+ suite.addTestSuite(GridCacheTransformEventSelfTest.class);
+ suite.addTestSuite(GridCacheLocalIsolatedNodesSelfTest.class);
+
+ // Partitioned cache.
+ suite.addTestSuite(GridCachePartitionedGetSelfTest.class);
+ suite.addTest(new TestSuite(GridCachePartitionedBasicApiTest.class));
+ suite.addTest(new TestSuite(GridCacheNearMultiGetSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheNearJobExecutionSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheNearOneNodeSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheNearMultiNodeSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheAtomicNearMultiNodeSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheNearReadersSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheAtomicNearReadersSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedAffinitySelfTest.class));
+ suite.addTest(new TestSuite(GridCacheRendezvousAffinityFunctionExcludeNeighborsSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheRendezvousAffinityClientSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedProjectionAffinitySelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedBasicOpSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedBasicStoreSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedGetAndTransformStoreSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedAtomicGetAndTransformStoreSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedBasicStoreMultiNodeSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedEventSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedLockSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedMultiNodeLockSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedMultiNodeSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedMultiThreadedPutGetSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedNodeFailureSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedExplicitLockNodeFailureSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedTxSingleThreadedSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheColocatedTxSingleThreadedSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedTxTimeoutSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheFinishPartitionsSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtEntrySelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtInternalEntrySelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtMappingSelfTest.class));
+// suite.addTest(new TestSuite(GridCachePartitionedTxMultiThreadedSelfTest.class)); TODO-gg-4066
+ suite.addTest(new TestSuite(GridCacheDhtPreloadSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtPreloadOffHeapSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtPreloadBigDataSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtPreloadPutGetSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtPreloadDisabledSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtPreloadMultiThreadedSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheColocatedPreloadRestartSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheNearPreloadRestartSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtPreloadStartStopSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtPreloadUnloadSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedAffinityFilterSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedPreloadLifecycleSelfTest.class));
+ suite.addTest(new TestSuite(CacheLoadingConcurrentGridStartSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtPreloadDelayedSelfTest.class));
+ suite.addTest(new TestSuite(GridPartitionedBackupLoadSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedLoadCacheSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionNotLoadedEventSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtEvictionsDisabledSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheNearEvictionEventSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheAtomicNearEvictionEventSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtEvictionSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheReplicatedEvictionSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtEvictionNearReadersSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheDhtAtomicEvictionNearReadersSelfTest.class));
+// suite.addTest(new TestSuite(GridCachePartitionedTopologyChangeSelfTest.class)); TODO-gg-5489
+ suite.addTest(new TestSuite(GridCachePartitionedPreloadEventsSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedUnloadEventsSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedAffinityHashIdResolverSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheColocatedOptimisticTransactionSelfTest.class));
+ suite.addTestSuite(GridCacheAtomicMessageCountSelfTest.class);
+ suite.addTest(new TestSuite(GridCacheNearPartitionedClearSelfTest.class));
+
+ suite.addTest(new TestSuite(GridCacheDhtExpiredEntriesPreloadSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheNearExpiredEntriesPreloadSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheAtomicExpiredEntriesPreloadSelfTest.class));
+
+ suite.addTest(new TestSuite(GridCacheOffheapUpdateSelfTest.class));
+
+ // TODO: GG-7242, GG-7243: Enabled when fixed.
+// suite.addTest(new TestSuite(GridCacheDhtRemoveFailureTest.class));
+// suite.addTest(new TestSuite(GridCacheNearRemoveFailureTest.class));
+ // TODO: GG-7201: Enable when fixed.
+ //suite.addTest(new TestSuite(GridCacheDhtAtomicRemoveFailureTest.class));
+
+ suite.addTest(new TestSuite(GridCacheNearPrimarySyncSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheColocatedPrimarySyncSelfTest.class));
+
+ return suite;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/acb9f1c6/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
new file mode 100644
index 0000000..2e56b7a
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.distributed.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
+import org.apache.ignite.internal.processors.cache.distributed.near.*;
+import org.apache.ignite.internal.processors.cache.distributed.replicated.*;
+import org.apache.ignite.internal.processors.cache.distributed.replicated.preloader.*;
+import org.apache.ignite.internal.processors.cache.local.*;
+
+/**
+ * Test suite.
+ */
+public class IgniteCacheTestSuite3 extends TestSuite {
+ /**
+ * @return IgniteCache test suite.
+ * @throws Exception Thrown in case of the failure.
+ */
+ public static TestSuite suite() throws Exception {
+ TestSuite suite = new TestSuite("IgniteCache Test Suite part 3");
+
+ // Value consistency tests.
+ suite.addTestSuite(GridCacheValueConsistencyAtomicSelfTest.class);
+ suite.addTestSuite(GridCacheValueConsistencyAtomicPrimaryWriteOrderSelfTest.class);
+ suite.addTestSuite(GridCacheValueConsistencyAtomicNearEnabledSelfTest.class);
+ suite.addTestSuite(GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.class);
+ suite.addTestSuite(GridCacheValueConsistencyTransactionalSelfTest.class);
+ suite.addTestSuite(GridCacheValueConsistencyTransactionalNearEnabledSelfTest.class);
+ suite.addTestSuite(GridCacheValueBytesPreloadingSelfTest.class);
+
+ // Replicated cache.
+ suite.addTestSuite(GridCacheReplicatedBasicApiTest.class);
+ suite.addTestSuite(GridCacheReplicatedBasicOpSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedBasicStoreSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedGetAndTransformStoreSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedAtomicGetAndTransformStoreSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedEventSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedSynchronousCommitTest.class);
+
+ // TODO: GG-7437.
+ // suite.addTestSuite(GridCacheReplicatedInvalidateSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedLockSelfTest.class);
+ // TODO: enable when GG-7437 is fixed.
+ //suite.addTestSuite(GridCacheReplicatedMultiNodeLockSelfTest.class);
+ //suite.addTestSuite(GridCacheReplicatedMultiNodeSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedNodeFailureSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedTxSingleThreadedSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedTxTimeoutSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedPreloadSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedPreloadOffHeapSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedPreloadLifecycleSelfTest.class);
+ suite.addTestSuite(GridCacheSyncReplicatedPreloadSelfTest.class);
+
+ suite.addTestSuite(GridCacheDeploymentSelfTest.class);
+ suite.addTestSuite(GridCacheDeploymentOffHeapSelfTest.class);
+
+ suite.addTestSuite(GridCachePutArrayValueSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedUnswapAdvancedSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedEvictionEventSelfTest.class);
+ // TODO: GG-7569.
+ // suite.addTestSuite(GridCacheReplicatedTxMultiThreadedSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedPreloadEventsSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedPreloadStartStopEventsSelfTest.class);
+ // TODO: GG-7434
+ // suite.addTestSuite(GridReplicatedTxPreloadTest.class);
+
+ suite.addTestSuite(IgniteTxReentryNearSelfTest.class);
+ suite.addTestSuite(IgniteTxReentryColocatedSelfTest.class);
+
+ suite.addTestSuite(GridCacheOrderedPreloadingSelfTest.class);
+
+ // Test for byte array value special case.
+// suite.addTestSuite(GridCacheLocalByteArrayValuesSelfTest.class);
+ suite.addTestSuite(GridCacheNearPartitionedP2PEnabledByteArrayValuesSelfTest.class);
+ suite.addTestSuite(GridCacheNearPartitionedP2PDisabledByteArrayValuesSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedOnlyP2PEnabledByteArrayValuesSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedOnlyP2PDisabledByteArrayValuesSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedP2PEnabledByteArrayValuesSelfTest.class);
+ suite.addTestSuite(GridCacheReplicatedP2PDisabledByteArrayValuesSelfTest.class);
+
+ // Near-only cache.
+ suite.addTest(IgniteCacheNearOnlySelfTestSuite.suite());
+
+ // Test cache with daemon nodes.
+ suite.addTestSuite(GridCacheDaemonNodeLocalSelfTest.class);
+ suite.addTestSuite(GridCacheDaemonNodePartitionedSelfTest.class);
+ suite.addTestSuite(GridCacheDaemonNodeReplicatedSelfTest.class);
+
+ // Write-behind.
+ suite.addTest(IgniteCacheWriteBehindTestSuite.suite());
+
+ // Transform.
+ suite.addTestSuite(GridCachePartitionedTransformWriteThroughBatchUpdateSelfTest.class);
+
+ suite.addTestSuite(GridCacheEntryVersionSelfTest.class);
+ suite.addTestSuite(GridCacheVersionSelfTest.class);
+
+ // Memory leak tests.
+ suite.addTestSuite(GridCacheReferenceCleanupSelfTest.class);
+ suite.addTestSuite(GridCacheReloadSelfTest.class);
+
+ suite.addTestSuite(GridCacheMixedModeSelfTest.class);
+
+ // Cache metrics.
+ suite.addTest(IgniteCacheMetricsSelfTestSuite.suite());
+
+ // Topology validator.
+ suite.addTest(IgniteTopologyValidatorTestSuit.suite());
+
+ // Eviction.
+ suite.addTest(IgniteCacheEvictionSelfTestSuite.suite());
+
+ // Iterators.
+ suite.addTest(IgniteCacheIteratorsSelfTestSuite.suite());
+
+ // Add tx recovery test suite.
+ suite.addTest(IgniteCacheTxRecoverySelfTestSuite.suite());
+
+ // Cache interceptor tests.
+ suite.addTest(IgniteCacheInterceptorSelfTestSuite.suite());
+
+ return suite;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/acb9f1c6/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
new file mode 100644
index 0000000..f7272d4
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java
@@ -0,0 +1,131 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.testsuites;
+
+import junit.framework.*;
+import org.apache.ignite.internal.processors.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.internal.processors.cache.distributed.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.*;
+import org.apache.ignite.internal.processors.cache.distributed.near.*;
+import org.apache.ignite.internal.processors.cache.integration.*;
+
+/**
+ * Test suite.
+ */
+public class IgniteCacheTestSuite4 extends TestSuite {
+ /**
+ * @return IgniteCache test suite.
+ * @throws Exception Thrown in case of the failure.
+ */
+ public static TestSuite suite() throws Exception {
+ TestSuite suite = new TestSuite("IgniteCache Test Suite part 4");
+
+ // Multi node update.
+ suite.addTestSuite(GridCacheMultinodeUpdateSelfTest.class);
+ // TODO: GG-5353.
+ // suite.addTestSuite(GridCacheMultinodeUpdateNearEnabledSelfTest.class);
+ // suite.addTestSuite(GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.class);
+ suite.addTestSuite(GridCacheMultinodeUpdateAtomicSelfTest.class);
+ suite.addTestSuite(GridCacheMultinodeUpdateAtomicNearEnabledSelfTest.class);
+
+ suite.addTestSuite(IgniteCacheAtomicLoadAllTest.class);
+ suite.addTestSuite(IgniteCacheAtomicLocalLoadAllTest.class);
+ suite.addTestSuite(IgniteCacheTxLoadAllTest.class);
+ suite.addTestSuite(IgniteCacheTxLocalLoadAllTest.class);
+
+ suite.addTestSuite(IgniteCacheAtomicLoaderWriterTest.class);
+ suite.addTestSuite(IgniteCacheTxLoaderWriterTest.class);
+
+ suite.addTestSuite(IgniteCacheAtomicStoreSessionTest.class);
+ suite.addTestSuite(IgniteCacheTxStoreSessionTest.class);
+ suite.addTestSuite(IgniteCacheAtomicStoreSessionWriteBehindTest.class);
+ suite.addTestSuite(IgniteCacheTxStoreSessionWriteBehindTest.class);
+
+ suite.addTestSuite(IgniteCacheAtomicNoReadThroughTest.class);
+ suite.addTestSuite(IgniteCacheAtomicNearEnabledNoReadThroughTest.class);
+ suite.addTestSuite(IgniteCacheAtomicLocalNoReadThroughTest.class);
+ suite.addTestSuite(IgniteCacheTxNoReadThroughTest.class);
+ suite.addTestSuite(IgniteCacheTxNearEnabledNoReadThroughTest.class);
+ suite.addTestSuite(IgniteCacheTxLocalNoReadThroughTest.class);
+
+ suite.addTestSuite(IgniteCacheAtomicNoLoadPreviousValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicNearEnabledNoLoadPreviousValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicLocalNoLoadPreviousValueTest.class);
+ suite.addTestSuite(IgniteCacheTxNoLoadPreviousValueTest.class);
+ suite.addTestSuite(IgniteCacheTxNearEnabledNoLoadPreviousValueTest.class);
+ suite.addTestSuite(IgniteCacheTxLocalNoLoadPreviousValueTest.class);
+
+ suite.addTestSuite(IgniteCacheAtomicNoWriteThroughTest.class);
+ suite.addTestSuite(IgniteCacheAtomicNearEnabledNoWriteThroughTest.class);
+ suite.addTestSuite(IgniteCacheAtomicLocalNoWriteThroughTest.class);
+ suite.addTestSuite(IgniteCacheTxNoWriteThroughTest.class);
+ suite.addTestSuite(IgniteCacheTxNearEnabledNoWriteThroughTest.class);
+ suite.addTestSuite(IgniteCacheTxLocalNoWriteThroughTest.class);
+
+ suite.addTestSuite(IgniteCacheAtomicPeekModesTest.class);
+ suite.addTestSuite(IgniteCacheAtomicNearPeekModesTest.class);
+ suite.addTestSuite(IgniteCacheAtomicReplicatedPeekModesTest.class);
+ suite.addTestSuite(IgniteCacheAtomicLocalPeekModesTest.class);
+ suite.addTestSuite(IgniteCacheTxPeekModesTest.class);
+ suite.addTestSuite(IgniteCacheTxNearPeekModesTest.class);
+ suite.addTestSuite(IgniteCacheTxLocalPeekModesTest.class);
+ suite.addTestSuite(IgniteCacheTxReplicatedPeekModesTest.class);
+
+ // TODO: IGNITE-114.
+ // suite.addTestSuite(IgniteCacheInvokeReadThroughTest.class);
+ // suite.addTestSuite(GridCacheVersionMultinodeTest.class);
+
+ suite.addTestSuite(IgniteCacheNearReadCommittedTest.class);
+ suite.addTestSuite(IgniteCacheAtomicCopyOnReadDisabledTest.class);
+ suite.addTestSuite(IgniteCacheTxCopyOnReadDisabledTest.class);
+
+ suite.addTestSuite(IgniteCacheTxPreloadNoWriteTest.class);
+
+ suite.addTestSuite(IgniteDynamicCacheStartSelfTest.class);
+ suite.addTestSuite(IgniteCacheDynamicStopSelfTest.class);
+ suite.addTestSuite(IgniteCacheConfigurationTemplateTest.class);
+ suite.addTestSuite(IgniteCacheConfigurationDefaultTemplateTest.class);
+
+ suite.addTestSuite(GridCacheTxLoadFromStoreOnLockSelfTest.class);
+
+ suite.addTestSuite(GridCacheMarshallingNodeJoinSelfTest.class);
+
+ suite.addTestSuite(IgniteCacheJdbcBlobStoreNodeRestartTest.class);
+
+ suite.addTestSuite(IgniteCacheAtomicLocalStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicNearEnabledStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheAtomicPrimaryWriteOrderNearEnabledStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheTxLocalStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheTxStoreValueTest.class);
+ suite.addTestSuite(IgniteCacheTxNearEnabledStoreValueTest.class);
+
+ suite.addTestSuite(IgniteCacheLockFailoverSelfTest.class);
+ suite.addTestSuite(IgniteCacheMultiTxLockSelfTest.class);
+
+ suite.addTestSuite(IgniteInternalCacheTypesTest.class);
+
+ suite.addTestSuite(IgniteExchangeFutureHistoryTest.class);
+
+ suite.addTestSuite(CacheNoValueClassOnServerNodeTest.class);
+
+ return suite;
+ }
+}
[4/6] incubator-ignite git commit: # Refactoring
TcpDiscoverySelfTest: replace TcpDiscovery.onBeforeMessageSentAcrossRing()
with listeners.
Posted by se...@apache.org.
# Refactoring TcpDiscoverySelfTest: replace TcpDiscovery.onBeforeMessageSentAcrossRing() with listeners.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bd7ae302
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bd7ae302
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bd7ae302
Branch: refs/heads/ignite-836_2
Commit: bd7ae302a11ddfe145ce85dd1fecc4403e5d2dc5
Parents: acb9f1c
Author: sevdokimov <se...@gridgain.com>
Authored: Wed May 6 16:14:06 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed May 6 16:14:20 2015 +0300
----------------------------------------------------------------------
.../spi/discovery/tcp/TcpDiscoverySpi.java | 22 ++++---
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 65 +++++++-------------
2 files changed, 38 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd7ae302/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index add83b3..46d90b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -288,6 +288,10 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
private ConcurrentLinkedDeque<String> debugLog;
+ /** */
+ private final CopyOnWriteArrayList<IgniteInClosure<TcpDiscoveryAbstractMessage>> sendMsgLsnrs =
+ new CopyOnWriteArrayList<>();
+
/** {@inheritDoc} */
@IgniteInstanceResource
@Override public void injectResources(Ignite ignite) {
@@ -2064,13 +2068,16 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
/**
* <strong>FOR TEST ONLY!!!</strong>
- * <p>
- * This method is intended for test purposes only.
- *
- * @param msg Message.
*/
- void onBeforeMessageSentAcrossRing(Serializable msg) {
- // No-op.
+ public void addSendMessageListener(IgniteInClosure<TcpDiscoveryAbstractMessage> msg) {
+ sendMsgLsnrs.add(msg);
+ }
+
+ /**
+ * <strong>FOR TEST ONLY!!!</strong>
+ */
+ public void removeSendMessageListener(IgniteInClosure<TcpDiscoveryAbstractMessage> msg) {
+ sendMsgLsnrs.remove(msg);
}
/**
@@ -2679,7 +2686,8 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
assert ring.hasRemoteNodes();
- onBeforeMessageSentAcrossRing(msg);
+ for (IgniteInClosure<TcpDiscoveryAbstractMessage> msgLsnr : sendMsgLsnrs)
+ msgLsnr.apply(msg);
if (redirectToClients(msg)) {
for (ClientMessageWorker clientMsgWorker : clientMsgWorkers.values())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd7ae302/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
index 7bea1eb..5648c31 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
@@ -70,14 +70,7 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- TcpDiscoverySpi spi;
-
- if (gridName.contains("FailBeforeNodeAddedSentSpi"))
- spi = new FailBeforeNodeAddedSentSpi();
- else if (gridName.contains("FailBeforeNodeLeftSentSpi"))
- spi = new FailBeforeNodeLeftSentSpi();
- else
- spi = new TcpDiscoverySpi();
+ TcpDiscoverySpi spi = new TcpDiscoverySpi();
discoMap.put(gridName, spi);
@@ -600,7 +593,17 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
}
}, EVT_NODE_JOINED, EVT_NODE_FAILED);
- startGrid("FailBeforeNodeAddedSentSpi");
+ final Ignite g = startGrid("FailBeforeNodeAddedSentSpi");
+
+ discoMap.get(g.name()).addSendMessageListener(new IgniteInClosure<TcpDiscoveryAbstractMessage>() {
+ @Override public void apply(TcpDiscoveryAbstractMessage msg) {
+ if (msg instanceof TcpDiscoveryNodeAddedMessage) {
+ discoMap.get(g.name()).simulateNodeFailure();
+
+ throw new RuntimeException("Avoid message sending: " + msg.getClass());
+ }
+ }
+ });
startGrid(3);
@@ -620,7 +623,17 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
startGrid(1);
startGrid(2);
- startGrid("FailBeforeNodeLeftSentSpi");
+ final Ignite g = startGrid("FailBeforeNodeLeftSentSpi");
+
+ discoMap.get(g.name()).addSendMessageListener(new IgniteInClosure<TcpDiscoveryAbstractMessage>() {
+ @Override public void apply(TcpDiscoveryAbstractMessage msg) {
+ if (msg instanceof TcpDiscoveryNodeLeftMessage) {
+ discoMap.get(g.name()).simulateNodeFailure();
+
+ throw new RuntimeException("Avoid message sending: " + msg.getClass());
+ }
+ }
+ });
Ignite g3 = startGrid(3);
@@ -954,36 +967,4 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
private Ignite startGridNoOptimize(String gridName) throws Exception {
return G.start(getConfiguration(gridName));
}
-
- /**
- *
- */
- private static class FailBeforeNodeAddedSentSpi extends TcpDiscoverySpi {
- /** */
- private int i;
-
- /** {@inheritDoc} */
- @Override void onBeforeMessageSentAcrossRing(Serializable msg) {
- if (msg instanceof TcpDiscoveryNodeAddedMessage)
- if (++i == 2) {
- simulateNodeFailure();
-
- throw new RuntimeException("Avoid message sending: " + msg.getClass());
- }
- }
- }
-
- /**
- *
- */
- private static class FailBeforeNodeLeftSentSpi extends TcpDiscoverySpi {
- /** {@inheritDoc} */
- @Override void onBeforeMessageSentAcrossRing(Serializable msg) {
- if (msg instanceof TcpDiscoveryNodeLeftMessage) {
- simulateNodeFailure();
-
- throw new RuntimeException("Avoid message sending: " + msg.getClass());
- }
- }
- }
}
[5/6] incubator-ignite git commit: # Merge ignite-sprint-5 into
ignite-709_2
Posted by se...@apache.org.
# Merge ignite-sprint-5 into ignite-709_2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bf80c27f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bf80c27f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bf80c27f
Branch: refs/heads/ignite-836_2
Commit: bf80c27f1b943096c143a5f8d4f50f7470d36bd2
Parents: 691c584 bd7ae30
Author: sevdokimov <se...@gridgain.com>
Authored: Wed May 6 16:22:01 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed May 6 16:22:01 2015 +0300
----------------------------------------------------------------------
dev-tools/build.gradle | 15 +-
dev-tools/src/main/groovy/jiraslurp.groovy | 15 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 22 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 65 ++--
.../ignite/testsuites/IgniteCacheTestSuite.java | 299 -------------------
.../testsuites/IgniteCacheTestSuite2.java | 141 +++++++++
.../testsuites/IgniteCacheTestSuite3.java | 143 +++++++++
.../testsuites/IgniteCacheTestSuite4.java | 131 ++++++++
8 files changed, 467 insertions(+), 364 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf80c27f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
[6/6] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-709_2' into ignite-836_2
Posted by se...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-836_2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0bfd42b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0bfd42b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0bfd42b4
Branch: refs/heads/ignite-836_2
Commit: 0bfd42b445525a2e3adc88f3d9b2d96faae14202
Parents: cff3c66 bf80c27
Author: sevdokimov <se...@gridgain.com>
Authored: Wed May 6 16:23:14 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed May 6 16:23:14 2015 +0300
----------------------------------------------------------------------
.../spi/discovery/tcp/TcpDiscoverySpi.java | 22 +-
...ientModesTcpClientDiscoveryAbstractTest.java | 10 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 65 ++--
.../ignite/testsuites/IgniteCacheTestSuite.java | 299 -------------------
.../testsuites/IgniteCacheTestSuite2.java | 141 +++++++++
.../testsuites/IgniteCacheTestSuite3.java | 143 +++++++++
.../testsuites/IgniteCacheTestSuite4.java | 131 ++++++++
7 files changed, 458 insertions(+), 353 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0bfd42b4/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
[2/6] incubator-ignite git commit: # IGNITE-709 Decrease dispersion
of test results.
Posted by se...@apache.org.
# IGNITE-709 Decrease dispersion of test results.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/691c584c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/691c584c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/691c584c
Branch: refs/heads/ignite-836_2
Commit: 691c584ccc5f64e33c2ac34509196015c17ed928
Parents: 619a644
Author: sevdokimov <se...@gridgain.com>
Authored: Wed May 6 11:53:51 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed May 6 11:53:51 2015 +0300
----------------------------------------------------------------------
...ridCacheClientModesTcpClientDiscoveryAbstractTest.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/691c584c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
index 9ebecab..d24afed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
@@ -19,10 +19,10 @@ package org.apache.ignite.internal.processors.cache.distributed;
import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import java.net.*;
import java.util.*;
import static org.apache.ignite.cache.CacheMode.*;
@@ -44,12 +44,12 @@ public abstract class GridCacheClientModesTcpClientDiscoveryAbstractTest extends
if (cfg.isClientMode() != null && cfg.isClientMode()) {
TcpDiscoveryVmIpFinder clientFinder = new TcpDiscoveryVmIpFinder();
- Collection<String> addrs = new ArrayList<>(ipFinder.getRegisteredAddresses().size());
+ String firstSrvAddr = F.first(ipFinder.getRegisteredAddresses()).toString();
- for (InetSocketAddress sockAddr : ipFinder.getRegisteredAddresses())
- addrs.add(sockAddr.getHostString() + ":" + sockAddr.getPort());
+ if (firstSrvAddr.startsWith("/"))
+ firstSrvAddr = firstSrvAddr.substring(1);
- clientFinder.setAddresses(addrs);
+ clientFinder.setAddresses(Collections.singletonList(firstSrvAddr));
TcpClientDiscoverySpi discoverySpi = new TcpClientDiscoverySpi();
discoverySpi.setIpFinder(clientFinder);