Repository: ignite Updated Branches: refs/heads/master c63a60a39 -> 7577c8770
http://git-wip-us.apache.org/repos/asf/ignite/blob/7577c877/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java index 53122c7..e5d3b48 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalIsolatedNodesSelfTest.java @@ -23,6 +23,7 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.lang.IgnitePredicate; +import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.cache.CacheMode.LOCAL; @@ -31,6 +32,13 @@ import static org.apache.ignite.cache.CacheMode.LOCAL; * Isolated nodes LOCAL cache self test. */ public class GridCacheLocalIsolatedNodesSelfTest extends GridCommonAbstractTest { + /** {@inheritDoc} */ + @Override protected void beforeTestsStarted() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE); + + super.beforeTestsStarted(); + } + /** * */ http://git-wip-us.apache.org/repos/asf/ignite/blob/7577c877/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java index f10cefd..647027f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java @@ -27,6 +27,7 @@ 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.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.cache.CacheMode.LOCAL; @@ -35,6 +36,13 @@ import static org.apache.ignite.cache.CacheMode.LOCAL; * Load-All self test. */ public class GridCacheLocalLoadAllSelfTest extends GridCommonAbstractTest { + /** {@inheritDoc} */ + @Override public void setUp() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE); + + super.setUp(); + } + /** * */ http://git-wip-us.apache.org/repos/asf/ignite/blob/7577c877/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java index c7809df..8f27b1b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java @@ -28,6 +28,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestThread; +import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.Nullable; @@ -37,6 +38,13 @@ import static org.apache.ignite.cache.CacheMode.LOCAL; * Test cases for multi-threaded tests. */ public class GridCacheLocalLockSelfTest extends GridCommonAbstractTest { + /** {@inheritDoc} */ + @Override public void setUp() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE); + + super.setUp(); + } + /** Grid. */ private Ignite ignite; http://git-wip-us.apache.org/repos/asf/ignite/blob/7577c877/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java index f6dc535..4911631 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java @@ -34,6 +34,7 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestThread; import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.cache.CacheMode.LOCAL; @@ -42,6 +43,13 @@ import static org.apache.ignite.cache.CacheMode.LOCAL; * Multithreaded local cache locking test. */ public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest { + /** {@inheritDoc} */ + @Override public void setUp() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE); + + super.setUp(); + } + /** Cache. */ private IgniteCache<Integer, String> cache; http://git-wip-us.apache.org/repos/asf/ignite/blob/7577c877/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java index 6776550..816168f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java @@ -21,6 +21,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheProcessor; import org.apache.ignite.internal.processors.cache.IgniteTxMultiThreadedAbstractTest; +import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.log4j.Level; import org.apache.log4j.Logger; @@ -34,6 +35,14 @@ public class GridCacheLocalTxMultiThreadedSelfTest extends IgniteTxMultiThreaded private static final boolean CACHE_DEBUG = false; /** {@inheritDoc} */ + @Override protected void beforeTestsStarted() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE); + + super.beforeTestsStarted(); + } + + /** {@inheritDoc} */ + @SuppressWarnings({"ConstantConditions"}) @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration c = super.getConfiguration(igniteInstanceName); http://git-wip-us.apache.org/repos/asf/ignite/blob/7577c877/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java index 22809c7..27ce919 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java @@ -21,6 +21,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheProcessor; import org.apache.ignite.internal.processors.cache.IgniteTxSingleThreadedAbstractTest; +import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.log4j.Level; import org.apache.log4j.Logger; @@ -30,6 +31,13 @@ import static org.apache.ignite.cache.CacheMode.LOCAL; * Tests for local transactions. */ public class GridCacheLocalTxSingleThreadedSelfTest extends IgniteTxSingleThreadedAbstractTest { + /** {@inheritDoc} */ + @Override public void beforeTestsStarted() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE); + + super.beforeTestsStarted(); + } + /** Cache debug flag. */ private static final boolean CACHE_DEBUG = false; http://git-wip-us.apache.org/repos/asf/ignite/blob/7577c877/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java index 160e251..62af452 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java @@ -25,6 +25,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; @@ -42,6 +43,13 @@ import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE; * */ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest { + /** {@inheritDoc} */ + @Override public void setUp() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE); + + super.setUp(); + } + /** Grid. */ private Ignite ignite; http://git-wip-us.apache.org/repos/asf/ignite/blob/7577c877/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java b/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java new file mode 100644 index 0000000..ee9b02a --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java @@ -0,0 +1,137 @@ +/* + * 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.testframework; + +import org.apache.ignite.IgniteSystemProperties; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.transactions.TransactionConcurrency; +import org.apache.ignite.transactions.TransactionIsolation; + +import static org.apache.ignite.IgniteSystemProperties.IGNITE_FORCE_MVCC_MODE_IN_TESTS; +import static org.junit.Assert.fail; + +/** + * Provides checks for features supported when FORCE_MVCC mode is on. + */ +public class MvccFeatureChecker { + /** */ + private static final boolean FORCE_MVCC = + IgniteSystemProperties.getBoolean(IGNITE_FORCE_MVCC_MODE_IN_TESTS, false); + + /** */ + public enum Feature { + CACHE_STORE, + NEAR_CACHE, + LOCAL_CACHE, + ENTRY_LOCK, + CACHE_EVENTS, + EVICTION, + EXPIRATION + } + + /** + * Fails if feature is not supported. + * + * @param f feature. + * @throws AssertionError If failed. + */ + public static void failIfNotSupported(Feature f) { + if (!forcedMvcc()) + return; + + validateFeature(f); + } + + /** + * @return {@code True} if Mvcc mode is forced. + */ + public static boolean forcedMvcc() { + return FORCE_MVCC; + } + + /** + * Check if feature is supported. + * + * @param f Feature. + * @return {@code True} if feature is supported, {@code False} otherwise. + */ + public static boolean isSupported(Feature f) { + try { + validateFeature(f); + + return true; + } + catch (AssertionError ignore) { + return false; + } + } + + /** + * Check if Tx mode is supported. + * + * @param conc Transaction concurrency. + * @param iso Transaction isolation. + * @return {@code True} if feature is supported, {@code False} otherwise. + */ + public static boolean isSupported(TransactionConcurrency conc, TransactionIsolation iso) { + return conc == TransactionConcurrency.PESSIMISTIC && + iso == TransactionIsolation.REPEATABLE_READ; + } + + + /** + * Check if Cache mode is supported. + * + * @param mode Cache mode. + * @return {@code True} if feature is supported, {@code False} otherwise. + */ + public static boolean isSupported(CacheMode mode) { + return mode != CacheMode.LOCAL || isSupported(Feature.LOCAL_CACHE); + } + + /** + * Fails if feature is not supported in Mvcc mode. + * + * @param feature Mvcc feature. + * @throws AssertionError If failed. + */ + private static void validateFeature(Feature feature) { + switch (feature) { + case NEAR_CACHE: + fail("https://issues.apache.org/jira/browse/IGNITE-7187";); + + case LOCAL_CACHE: + fail("https://issues.apache.org/jira/browse/IGNITE-9530";); + + case CACHE_STORE: + fail("https://issues.apache.org/jira/browse/IGNITE-8582";); + + case ENTRY_LOCK: + fail("https://issues.apache.org/jira/browse/IGNITE-9324";); + + case CACHE_EVENTS: + fail("https://issues.apache.org/jira/browse/IGNITE-9321";); + + case EVICTION: + fail("https://issues.apache.org/jira/browse/IGNITE-7956";); + + case EXPIRATION: + fail("https://issues.apache.org/jira/browse/IGNITE-7311";); + } + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/7577c877/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite2.java new file mode 100644 index 0000000..e0d1eef --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite2.java @@ -0,0 +1,197 @@ +/* + * 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 java.util.HashSet; +import junit.framework.TestSuite; +import org.apache.ignite.IgniteSystemProperties; +import org.apache.ignite.cache.affinity.rendezvous.ClusterNodeAttributeAffinityBackupFilterSelfTest; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunctionBackupFilterSelfTest; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunctionExcludeNeighborsSelfTest; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunctionFastPowerOfTwoHashSelfTest; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunctionSelfTest; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunctionStandardHashSelfTest; +import org.apache.ignite.internal.IgniteReflectionFactorySelfTest; +import org.apache.ignite.internal.processors.cache.CacheComparatorTest; +import org.apache.ignite.internal.processors.cache.CacheConfigurationLeakTest; +import org.apache.ignite.internal.processors.cache.CacheEnumOperationsSingleNodeTest; +import org.apache.ignite.internal.processors.cache.CacheEnumOperationsTest; +import org.apache.ignite.internal.processors.cache.CacheExchangeMessageDuplicatedStateTest; +import org.apache.ignite.internal.processors.cache.CacheGroupLocalConfigurationSelfTest; +import org.apache.ignite.internal.processors.cache.CacheOptimisticTransactionsWithFilterSingleServerTest; +import org.apache.ignite.internal.processors.cache.CacheOptimisticTransactionsWithFilterTest; +import org.apache.ignite.internal.processors.cache.GridCacheAtomicMessageCountSelfTest; +import org.apache.ignite.internal.processors.cache.GridCachePartitionedProjectionAffinitySelfTest; +import org.apache.ignite.internal.processors.cache.IgniteAtomicCacheEntryProcessorNodeJoinTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheNoSyncForGetTest; +import org.apache.ignite.internal.processors.cache.IgniteCachePartitionMapUpdateTest; +import org.apache.ignite.internal.processors.cache.IgniteClientCacheStartFailoverTest; +import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheAndNodeStop; +import org.apache.ignite.internal.processors.cache.IgniteNearClientCacheCloseTest; +import org.apache.ignite.internal.processors.cache.IgniteOnePhaseCommitInvokeTest; +import org.apache.ignite.internal.processors.cache.IgniteOnePhaseCommitNearReadersTest; +import org.apache.ignite.internal.processors.cache.MemoryPolicyConfigValidationTest; +import org.apache.ignite.internal.processors.cache.NonAffinityCoordinatorDynamicStartStopTest; +import org.apache.ignite.internal.processors.cache.distributed.CacheLoadingConcurrentGridStartSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.CacheLoadingConcurrentGridStartSelfTestAllowOverwrite; +import org.apache.ignite.internal.processors.cache.distributed.CachePartitionStateTest; +import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionedNearDisabledMvccTxMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionedNearDisabledTxMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.GridCacheTransformEventSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodePartitionsExchangeTest; +import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheServerNodeConcurrentStart; +import org.apache.ignite.internal.processors.cache.distributed.dht.CachePartitionPartialCountersMapSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedMvccTxSingleThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedOptimisticTransactionSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedTxSingleThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtAtomicEvictionNearReadersSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadOnheapSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedUnloadEventsSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePartitionedBackupNodeFailureRecoveryTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearEvictionEventSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearMultiNodeSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearReadersSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearClientHitTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearJobExecutionSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearMultiGetSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearTxForceKeyTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedAffinitySelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedAtomicGetAndTransformStoreSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMultiThreadedPutGetSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMvccTxMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMvccTxSingleThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMvccTxTimeoutSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxSingleThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxTimeoutSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheRendezvousAffinityClientSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.NearCacheSyncUpdateTest; +import org.apache.ignite.internal.processors.cache.distributed.near.NoneRebalanceModeSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedJobExecutionTest; +import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicBasicStoreSelfTest; +import org.apache.ignite.internal.processors.cache.local.GridCacheLocalAtomicGetAndTransformStoreSelfTest; +import org.apache.ignite.internal.processors.cache.persistence.MemoryPolicyInitializationTest; +import org.apache.ignite.internal.processors.continuous.IgniteNoCustomEventsOnNodeStart; + +/** + * Test suite. + */ +public class IgniteCacheMvccTestSuite2 extends TestSuite { + /** + * @return IgniteCache test suite. + */ + public static TestSuite suite() { + System.setProperty(IgniteSystemProperties.IGNITE_FORCE_MVCC_MODE_IN_TESTS, "true"); + + HashSet<Class> ignoredTests = new HashSet<>(128); + + // Skip classes that already contains Mvcc tests + ignoredTests.add(GridCacheTransformEventSelfTest.class); + ignoredTests.add(IgniteClientCacheStartFailoverTest.class); + ignoredTests.add(IgniteNearClientCacheCloseTest.class); + ignoredTests.add(IgniteCacheNoSyncForGetTest.class); + ignoredTests.add(CacheEnumOperationsSingleNodeTest.class); + ignoredTests.add(CacheEnumOperationsTest.class); + ignoredTests.add(NearCacheSyncUpdateTest.class); + ignoredTests.add(GridCacheNearMultiGetSelfTest.class); + + // Optimistic tx tests. + ignoredTests.add(GridCacheColocatedOptimisticTransactionSelfTest.class); + ignoredTests.add(CacheOptimisticTransactionsWithFilterSingleServerTest.class); + ignoredTests.add(CacheOptimisticTransactionsWithFilterTest.class); + + // Irrelevant Tx tests. + ignoredTests.add(IgniteOnePhaseCommitInvokeTest.class); + ignoredTests.add(IgniteOnePhaseCommitNearReadersTest.class); + ignoredTests.add(GridCacheDhtPreloadOnheapSelfTest.class); + ignoredTests.add(GridCachePartitionedMultiThreadedPutGetSelfTest.class); // On-heap test. + + // Atomic cache tests. + ignoredTests.add(GridCacheLocalAtomicBasicStoreSelfTest.class); + ignoredTests.add(GridCacheLocalAtomicGetAndTransformStoreSelfTest.class); + ignoredTests.add(GridCacheAtomicNearMultiNodeSelfTest.class); + ignoredTests.add(GridCacheAtomicNearReadersSelfTest.class); + ignoredTests.add(GridCachePartitionedAtomicGetAndTransformStoreSelfTest.class); + ignoredTests.add(GridCacheAtomicNearEvictionEventSelfTest.class); + ignoredTests.add(GridCacheAtomicMessageCountSelfTest.class); + ignoredTests.add(IgniteAtomicCacheEntryProcessorNodeJoinTest.class); + ignoredTests.add(GridCacheDhtAtomicEvictionNearReadersSelfTest.class); + ignoredTests.add(GridCacheNearClientHitTest.class); + ignoredTests.add(GridCacheNearTxForceKeyTest.class); + ignoredTests.add(CacheLoadingConcurrentGridStartSelfTest.class); + ignoredTests.add(CacheLoadingConcurrentGridStartSelfTestAllowOverwrite.class); + ignoredTests.add(IgniteCachePartitionedBackupNodeFailureRecoveryTest.class); + + // Other non-tx tests. + ignoredTests.add(RendezvousAffinityFunctionSelfTest.class); + ignoredTests.add(RendezvousAffinityFunctionExcludeNeighborsSelfTest.class); + ignoredTests.add(RendezvousAffinityFunctionFastPowerOfTwoHashSelfTest.class); + ignoredTests.add(RendezvousAffinityFunctionStandardHashSelfTest.class); + ignoredTests.add(GridCachePartitionedAffinitySelfTest.class); + ignoredTests.add(GridCacheRendezvousAffinityClientSelfTest.class); + ignoredTests.add(GridCachePartitionedProjectionAffinitySelfTest.class); + ignoredTests.add(RendezvousAffinityFunctionBackupFilterSelfTest.class); + ignoredTests.add(ClusterNodeAttributeAffinityBackupFilterSelfTest.class); + ignoredTests.add(NonAffinityCoordinatorDynamicStartStopTest.class); + + ignoredTests.add(NoneRebalanceModeSelfTest.class); + ignoredTests.add(IgniteCachePartitionMapUpdateTest.class); + ignoredTests.add(IgniteCacheClientNodePartitionsExchangeTest.class); + ignoredTests.add(IgniteCacheServerNodeConcurrentStart.class); + + ignoredTests.add(GridCachePartitionedUnloadEventsSelfTest.class); + + ignoredTests.add(IgniteNoCustomEventsOnNodeStart.class); + ignoredTests.add(CacheExchangeMessageDuplicatedStateTest.class); + ignoredTests.add(IgniteDynamicCacheAndNodeStop.class); + + ignoredTests.add(GridCacheReplicatedJobExecutionTest.class); + ignoredTests.add(GridCacheNearJobExecutionSelfTest.class); + + ignoredTests.add(CacheConfigurationLeakTest.class); + ignoredTests.add(MemoryPolicyConfigValidationTest.class); + ignoredTests.add(MemoryPolicyInitializationTest.class); + ignoredTests.add(CacheGroupLocalConfigurationSelfTest.class); + + ignoredTests.add(CachePartitionStateTest.class); + ignoredTests.add(CacheComparatorTest.class); + ignoredTests.add(CachePartitionPartialCountersMapSelfTest.class); + ignoredTests.add(IgniteReflectionFactorySelfTest.class); + + // Skip classes which Mvcc implementations are added in this method below. + // TODO IGNITE-10175: refactor these tests (use assume) to support both mvcc and non-mvcc modes after moving to JUnit4/5. + ignoredTests.add(GridCachePartitionedTxSingleThreadedSelfTest.class); // See GridCachePartitionedMvccTxSingleThreadedSelfTest + ignoredTests.add(GridCacheColocatedTxSingleThreadedSelfTest.class); // See GridCacheColocatedMvccTxSingleThreadedSelfTest + ignoredTests.add(GridCachePartitionedTxMultiThreadedSelfTest.class); // See GridCachePartitionedMvccTxMultiThreadedSelfTest + ignoredTests.add(GridCachePartitionedNearDisabledTxMultiThreadedSelfTest.class); // See GridCachePartitionedNearDisabledMvccTxMultiThreadedSelfTest + ignoredTests.add(GridCachePartitionedTxTimeoutSelfTest.class); // See GridCachePartitionedMvccTxTimeoutSelfTest + + TestSuite suite = new TestSuite("IgniteCache Mvcc Test Suite part 2"); + + suite.addTest(IgniteCacheTestSuite2.suite(ignoredTests)); + + // Add Mvcc clones. + suite.addTestSuite(GridCachePartitionedMvccTxSingleThreadedSelfTest.class); + suite.addTestSuite(GridCacheColocatedMvccTxSingleThreadedSelfTest.class); + suite.addTestSuite(GridCachePartitionedMvccTxMultiThreadedSelfTest.class); + suite.addTestSuite(GridCachePartitionedNearDisabledMvccTxMultiThreadedSelfTest.class); + suite.addTestSuite(GridCachePartitionedMvccTxTimeoutSelfTest.class); + + return suite; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/7577c877/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 index fe09c07..179f5e9 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import java.util.HashSet; import junit.framework.TestSuite; import org.apache.ignite.cache.affinity.rendezvous.ClusterNodeAttributeAffinityBackupFilterSelfTest; import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunctionBackupFilterSelfTest; @@ -144,6 +145,7 @@ import org.apache.ignite.internal.processors.cache.local.GridCacheLocalTxSingleT import org.apache.ignite.internal.processors.cache.local.GridCacheLocalTxTimeoutSelfTest; import org.apache.ignite.internal.processors.cache.persistence.MemoryPolicyInitializationTest; import org.apache.ignite.internal.processors.continuous.IgniteNoCustomEventsOnNodeStart; +import org.apache.ignite.testframework.GridTestUtils; /** * Test suite. @@ -153,180 +155,197 @@ public class IgniteCacheTestSuite2 extends TestSuite { * @return IgniteCache test suite. * @throws Exception Thrown in case of the failure. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { + return suite(null); + } + + /** + * @param ignoredTests Ignored tests. + * @return IgniteCache test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite(HashSet<Class> ignoredTests) { TestSuite suite = new TestSuite("IgniteCache Test Suite part 2"); // Local cache. - suite.addTestSuite(GridCacheLocalBasicApiSelfTest.class); - suite.addTestSuite(GridCacheLocalBasicStoreSelfTest.class); - //suite.addTestSuite(GridCacheLocalBasicStoreMultithreadedSelfTest.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(GridCacheLocalTxReadTest.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); + GridTestUtils.addTestIfNeeded(suite, GridCacheLocalBasicApiSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheLocalBasicStoreSelfTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCacheLocalBasicStoreMultithreadedSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheLocalAtomicBasicStoreSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheLocalGetAndTransformStoreSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheLocalAtomicGetAndTransformStoreSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheLocalLoadAllSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheLocalLockSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheLocalMultithreadedSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheLocalTxSingleThreadedSelfTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCacheLocalTxReadTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheLocalTxTimeoutSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheLocalEventSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheLocalEvictionEventSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheLocalTxMultiThreadedSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheLocalIsolatedNodesSelfTest.class, ignoredTests); + + GridTestUtils.addTestIfNeeded(suite, GridCacheTransformEventSelfTest.class, ignoredTests); // Partitioned cache. - suite.addTestSuite(GridCachePartitionedGetSelfTest.class); - suite.addTest(new TestSuite(GridCachePartitionedBasicApiTest.class)); - suite.addTest(new TestSuite(GridCacheNearMultiGetSelfTest.class)); - suite.addTest(new TestSuite(NoneRebalanceModeSelfTest.class)); - suite.addTest(new TestSuite(GridCacheNearJobExecutionSelfTest.class)); - suite.addTest(new TestSuite(GridCacheReplicatedJobExecutionTest.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(GridCacheNearReaderPreloadSelfTest.class)); - suite.addTest(new TestSuite(GridCacheAtomicNearReadersSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedAffinitySelfTest.class)); - //suite.addTest(new TestSuite(RendezvousAffinityFunctionSelfTest.class)); - suite.addTest(new TestSuite(RendezvousAffinityFunctionExcludeNeighborsSelfTest.class)); - suite.addTest(new TestSuite(RendezvousAffinityFunctionFastPowerOfTwoHashSelfTest.class)); - suite.addTest(new TestSuite(RendezvousAffinityFunctionStandardHashSelfTest.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(GridCachePartitionedNearDisabledLockSelfTest.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(GridCachePartitionedEntryLockSelfTest.class)); - //suite.addTest(new TestSuite(GridCachePartitionedEvictionSelfTest.class)); - //suite.addTest(new TestSuite(GridCachePartitionedNestedTxTest.class)); - //suite.addTest(new TestSuite(GridCachePartitionedStorePutSelfTest.class)); - //suite.addTest(new TestSuite(GridCachePartitionedTxConcurrentGetTest.class)); - //suite.addTest(new TestSuite(GridCachePartitionedTxMultiNodeSelfTest.class)); - //suite.addTest(new TestSuite(GridCachePartitionedTxReadTest.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(GridCacheDhtMappingSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedTxMultiThreadedSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedNearDisabledTxMultiThreadedSelfTest.class)); - suite.addTest(new TestSuite(GridCacheDhtPreloadSelfTest.class)); - suite.addTest(new TestSuite(GridCacheDhtPreloadOnheapSelfTest.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(CacheDhtLocalPartitionAfterRemoveSelfTest.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(RendezvousAffinityFunctionBackupFilterSelfTest.class)); - suite.addTest(new TestSuite(ClusterNodeAttributeAffinityBackupFilterSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedPreloadLifecycleSelfTest.class)); - suite.addTest(new TestSuite(CacheLoadingConcurrentGridStartSelfTest.class)); - suite.addTest(new TestSuite(CacheLoadingConcurrentGridStartSelfTestAllowOverwrite.class)); - suite.addTest(new TestSuite(CacheTxLoadingConcurrentGridStartSelfTestAllowOverwrite.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)); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedGetSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedBasicApiTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedBasicOpSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheNearMultiGetSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, NoneRebalanceModeSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheNearOneNodeSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheNearMultiNodeSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheAtomicNearMultiNodeSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheNearReadersSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheNearReaderPreloadSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheAtomicNearReadersSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedGetAndTransformStoreSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedAtomicGetAndTransformStoreSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedBasicStoreSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridNearCacheStoreUpdateTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCachePartitionedStorePutSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedBasicStoreMultiNodeSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, CacheConcurrentReadThroughTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedLockSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedNearDisabledLockSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedMultiNodeLockSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedMultiNodeSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedMultiThreadedPutGetSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedNodeFailureSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedExplicitLockNodeFailureSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, CacheLockReleaseNodeLeaveTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCachePartitionedEntryLockSelfTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCachePartitionedNestedTxTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCachePartitionedTxConcurrentGetTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCachePartitionedTxMultiNodeSelfTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCachePartitionedTxReadTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedTxSingleThreadedSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheColocatedTxSingleThreadedSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedTxTimeoutSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheFinishPartitionsSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedTxMultiThreadedSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedNearDisabledTxMultiThreadedSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheDhtEntrySelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheDhtMappingSelfTest.class, ignoredTests); + + // Preload + GridTestUtils.addTestIfNeeded(suite, GridCacheDhtPreloadSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheDhtPreloadOnheapSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheDhtPreloadBigDataSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheDhtPreloadPutGetSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheDhtPreloadDisabledSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheDhtPreloadMultiThreadedSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheColocatedPreloadRestartSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheNearPreloadRestartSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheDhtPreloadStartStopSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheDhtPreloadUnloadSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedPreloadLifecycleSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheDhtPreloadDelayedSelfTest.class, ignoredTests); + + GridTestUtils.addTestIfNeeded(suite, CacheDhtLocalPartitionAfterRemoveSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, CacheLoadingConcurrentGridStartSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, CacheLoadingConcurrentGridStartSelfTestAllowOverwrite.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, CacheTxLoadingConcurrentGridStartSelfTestAllowOverwrite.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridPartitionedBackupLoadSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedLoadCacheSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedEventSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionNotLoadedEventSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheDhtEvictionsDisabledSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheNearEvictionEventSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheAtomicNearEvictionEventSelfTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCachePartitionedEvictionSelfTest.class, ignoredTests); + + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedTopologyChangeSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedUnloadEventsSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheColocatedOptimisticTransactionSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheAtomicMessageCountSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheNearPartitionedClearSelfTest.class, ignoredTests); - suite.addTest(new TestSuite(GridCachePartitionedTopologyChangeSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedUnloadEventsSelfTest.class)); - suite.addTest(new TestSuite(GridCacheColocatedOptimisticTransactionSelfTest.class)); - suite.addTestSuite(GridCacheAtomicMessageCountSelfTest.class); - suite.addTest(new TestSuite(GridCacheNearPartitionedClearSelfTest.class)); + GridTestUtils.addTestIfNeeded(suite, GridCacheOffheapUpdateSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheNearClientHitTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheNearPrimarySyncSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheColocatedPrimarySyncSelfTest.class, ignoredTests); - suite.addTest(new TestSuite(GridCacheOffheapUpdateSelfTest.class)); - suite.addTest(new TestSuite(GridCacheNearClientHitTest.class)); - suite.addTest(new TestSuite(GridCacheNearPrimarySyncSelfTest.class)); - suite.addTest(new TestSuite(GridCacheColocatedPrimarySyncSelfTest.class)); + GridTestUtils.addTestIfNeeded(suite, IgniteCachePartitionMapUpdateTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgniteCacheClientNodePartitionsExchangeTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgniteCacheClientNodeChangingTopologyTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgniteCacheServerNodeConcurrentStart.class, ignoredTests); - suite.addTest(new TestSuite(IgniteCachePartitionMapUpdateTest.class)); - suite.addTest(new TestSuite(IgniteCacheClientNodePartitionsExchangeTest.class)); - suite.addTest(new TestSuite(IgniteCacheClientNodeChangingTopologyTest.class)); - suite.addTest(new TestSuite(IgniteCacheServerNodeConcurrentStart.class)); + GridTestUtils.addTestIfNeeded(suite, IgniteCacheEntryProcessorNodeJoinTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgniteAtomicCacheEntryProcessorNodeJoinTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheNearTxForceKeyTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, CrossCacheTxRandomOperationsTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, CrossCacheTxNearEnabledRandomOperationsTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgniteDynamicCacheAndNodeStop.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, NearCacheSyncUpdateTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, CacheEnumOperationsSingleNodeTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, CacheEnumOperationsTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgniteCacheIncrementTxTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgniteCachePartitionedBackupNodeFailureRecoveryTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheVariableTopologySelfTest.class, ignoredTests); - suite.addTest(new TestSuite(IgniteCacheEntryProcessorNodeJoinTest.class)); - suite.addTest(new TestSuite(IgniteAtomicCacheEntryProcessorNodeJoinTest.class)); - suite.addTest(new TestSuite(GridCacheNearTxForceKeyTest.class)); - suite.addTest(new TestSuite(CrossCacheTxRandomOperationsTest.class)); - suite.addTest(new TestSuite(CrossCacheTxNearEnabledRandomOperationsTest.class)); - suite.addTest(new TestSuite(IgniteDynamicCacheAndNodeStop.class)); - suite.addTest(new TestSuite(CacheLockReleaseNodeLeaveTest.class)); - suite.addTest(new TestSuite(NearCacheSyncUpdateTest.class)); - suite.addTest(new TestSuite(CacheConfigurationLeakTest.class)); - suite.addTest(new TestSuite(MemoryPolicyConfigValidationTest.class)); - suite.addTest(new TestSuite(MemoryPolicyInitializationTest.class)); - suite.addTest(new TestSuite(CacheGroupLocalConfigurationSelfTest.class)); - suite.addTest(new TestSuite(CacheEnumOperationsSingleNodeTest.class)); - suite.addTest(new TestSuite(CacheEnumOperationsTest.class)); - suite.addTest(new TestSuite(IgniteCacheIncrementTxTest.class)); - suite.addTest(new TestSuite(IgniteCachePartitionedBackupNodeFailureRecoveryTest.class)); + GridTestUtils.addTestIfNeeded(suite, IgniteNoCustomEventsOnNodeStart.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, CacheExchangeMessageDuplicatedStateTest.class, ignoredTests); - suite.addTest(new TestSuite(IgniteNoCustomEventsOnNodeStart.class)); + //GridTestUtils.addTestIfNeeded(suite,NearCacheMultithreadedUpdateTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,NearCachePutAllMultinodeTest.class, ignoredTests); - suite.addTest(new TestSuite(CacheExchangeMessageDuplicatedStateTest.class)); - suite.addTest(new TestSuite(CacheConcurrentReadThroughTest.class)); + GridTestUtils.addTestIfNeeded(suite, IgniteOnePhaseCommitInvokeTest.class, ignoredTests); - suite.addTest(new TestSuite(GridNearCacheStoreUpdateTest.class)); - //suite.addTest(new TestSuite(NearCacheMultithreadedUpdateTest.class)); - //suite.addTest(new TestSuite(NearCachePutAllMultinodeTest.class)); + GridTestUtils.addTestIfNeeded(suite, IgniteCacheNoSyncForGetTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,IgniteCacheContainsKeyNearSelfTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,IgniteCacheNearTxRollbackTest.class, ignoredTests); - suite.addTest(new TestSuite(IgniteOnePhaseCommitInvokeTest.class)); + GridTestUtils.addTestIfNeeded(suite, IgniteOnePhaseCommitNearReadersTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgniteNearClientCacheCloseTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgniteClientCacheStartFailoverTest.class, ignoredTests); - suite.addTest(new TestSuite(IgniteCacheNoSyncForGetTest.class)); - //suite.addTest(new TestSuite(IgniteCacheContainsKeyNearSelfTest.class)); - //suite.addTest(new TestSuite(IgniteCacheNearTxRollbackTest.class)); + GridTestUtils.addTestIfNeeded(suite, CacheOptimisticTransactionsWithFilterSingleServerTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, CacheOptimisticTransactionsWithFilterTest.class, ignoredTests); - suite.addTest(new TestSuite(IgniteOnePhaseCommitNearReadersTest.class)); - suite.addTest(new TestSuite(IgniteNearClientCacheCloseTest.class)); - suite.addTest(new TestSuite(IgniteClientCacheStartFailoverTest.class)); + GridTestUtils.addTestIfNeeded(suite, NonAffinityCoordinatorDynamicStartStopTest.class, ignoredTests); - suite.addTest(new TestSuite(CacheOptimisticTransactionsWithFilterSingleServerTest.class)); - suite.addTest(new TestSuite(CacheOptimisticTransactionsWithFilterTest.class)); + GridTestUtils.addTestIfNeeded(suite, IgniteCacheClearDuringRebalanceTest.class, ignoredTests); - suite.addTest(new TestSuite(NonAffinityCoordinatorDynamicStartStopTest.class)); + //GridTestUtils.addTestIfNeeded(suite,GridCacheColocatedDebugTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite, GridCacheDhtAtomicEvictionNearReadersSelfTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCacheDhtEntrySetSelfTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCacheDhtEvictionNearReadersSelfTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCacheDhtMultiBackupTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCacheDhtPreloadMessageCountTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCachePartitionedNearDisabledMetricsSelfTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,IgniteCacheContainsKeyColocatedSelfTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,IgniteCrossCacheTxNearEnabledSelfTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,IgniteTxConsistencyColocatedRestartSelfTest.class, ignoredTests); - suite.addTest(new TestSuite(IgniteCacheClearDuringRebalanceTest.class)); + // Configuration validation + GridTestUtils.addTestIfNeeded(suite, CacheConfigurationLeakTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, MemoryPolicyConfigValidationTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, MemoryPolicyInitializationTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, CacheGroupLocalConfigurationSelfTest.class, ignoredTests); - suite.addTest(new TestSuite(CachePartitionStateTest.class)); + // Affinity and collocation + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedAffinitySelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedProjectionAffinitySelfTest.class, ignoredTests); - suite.addTest(new TestSuite(CacheComparatorTest.class)); + // Other tests. + GridTestUtils.addTestIfNeeded(suite, GridCacheNearJobExecutionSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheReplicatedJobExecutionTest.class, ignoredTests); - suite.addTest(new TestSuite(CachePartitionPartialCountersMapSelfTest.class)); + //GridTestUtils.addTestIfNeeded(suite,RendezvousAffinityFunctionSelfTest.class), ignoredTests); + GridTestUtils.addTestIfNeeded(suite, RendezvousAffinityFunctionExcludeNeighborsSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, RendezvousAffinityFunctionFastPowerOfTwoHashSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, RendezvousAffinityFunctionStandardHashSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheRendezvousAffinityClientSelfTest.class, ignoredTests); - suite.addTest(new TestSuite(IgniteReflectionFactorySelfTest.class)); + GridTestUtils.addTestIfNeeded(suite, RendezvousAffinityFunctionBackupFilterSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, ClusterNodeAttributeAffinityBackupFilterSelfTest.class, ignoredTests); - //suite.addTest(new TestSuite(GridCacheColocatedDebugTest.class)); - //suite.addTest(new TestSuite(GridCacheDhtAtomicEvictionNearReadersSelfTest.class)); - //suite.addTest(new TestSuite(GridCacheDhtEntrySetSelfTest.class)); - //suite.addTest(new TestSuite(GridCacheDhtEvictionNearReadersSelfTest.class)); - //suite.addTest(new TestSuite(GridCacheDhtMultiBackupTest.class)); - //suite.addTest(new TestSuite(GridCacheDhtPreloadMessageCountTest.class)); - //suite.addTest(new TestSuite(GridCachePartitionedNearDisabledMetricsSelfTest.class)); - //suite.addTest(new TestSuite(IgniteCacheContainsKeyColocatedSelfTest.class)); - //suite.addTest(new TestSuite(IgniteCrossCacheTxNearEnabledSelfTest.class)); - //suite.addTest(new TestSuite(IgniteTxConsistencyColocatedRestartSelfTest.class)); + GridTestUtils.addTestIfNeeded(suite, CachePartitionStateTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, CacheComparatorTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, CachePartitionPartialCountersMapSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgniteReflectionFactorySelfTest.class, ignoredTests); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/7577c877/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java index c5384b9..7bb476f 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java @@ -29,7 +29,6 @@ import org.apache.ignite.internal.processors.cache.ReplicatedTransactionalPessim import org.apache.ignite.internal.processors.cache.datastructures.IgniteExchangeLatchManagerCoordinatorFailTest; import org.apache.ignite.internal.processors.cache.distributed.CacheExchangeMergeTest; import org.apache.ignite.internal.processors.cache.distributed.CacheParallelStartTest; -import org.apache.ignite.internal.processors.cache.distributed.CachePartitionStateTest; import org.apache.ignite.internal.processors.cache.distributed.CacheTryLockMultithreadedTest; import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionEvictionDuringReadThroughSelfTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCache150ClientsTest; @@ -63,8 +62,6 @@ public class IgniteCacheTestSuite6 extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("IgniteCache Test Suite part 6"); - suite.addTestSuite(CachePartitionStateTest.class); - suite.addTestSuite(GridCachePartitionEvictionDuringReadThroughSelfTest.class); suite.addTestSuite(IgniteOptimisticTxSuspendResumeTest.class); suite.addTestSuite(IgniteOptimisticTxSuspendResumeMultiServerTest.class);
