Repository: ignite Updated Branches: refs/heads/master 957b59c35 -> 00e4dc0b1
http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMvccTxTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMvccTxTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMvccTxTimeoutSelfTest.java new file mode 100644 index 0000000..2f95323 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedMvccTxTimeoutSelfTest.java @@ -0,0 +1,44 @@ +/* + * 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.internal.processors.cache.distributed.replicated; + +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.processors.cache.distributed.IgniteMvccTxTimeoutAbstractTest; + +import static org.apache.ignite.cache.CacheMode.REPLICATED; + +/** + * Simple cache test. + */ +public class GridCacheReplicatedMvccTxTimeoutSelfTest extends IgniteMvccTxTimeoutAbstractTest { + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); + + CacheConfiguration ccfg = defaultCacheConfiguration(); + + ccfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT); + ccfg.setCacheMode(REPLICATED); + + cfg.setCacheConfiguration(ccfg); + + return cfg; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java index 0044581..a4f3117 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java @@ -20,12 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.TransactionConfiguration; -import org.apache.ignite.internal.processors.cache.GridCacheProcessor; import org.apache.ignite.internal.processors.cache.IgniteTxMultiThreadedAbstractTest; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; -import org.apache.log4j.Level; import static org.apache.ignite.cache.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -34,23 +29,12 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; * Tests for replicated transactions. */ public class GridCacheReplicatedTxMultiThreadedSelfTest extends IgniteTxMultiThreadedAbstractTest { - /** Cache debug flag. */ - private static final boolean CACHE_DEBUG = false; - - /** Log to file flag. */ - private static final boolean LOG_TO_FILE = true; - - /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); - /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration c = super.getConfiguration(igniteInstanceName); TransactionConfiguration tCfg = new TransactionConfiguration(); - tCfg.setTxSerializableEnabled(true); - c.setTransactionConfiguration(tCfg); CacheConfiguration cc = defaultCacheConfiguration(); @@ -63,15 +47,6 @@ public class GridCacheReplicatedTxMultiThreadedSelfTest extends IgniteTxMultiThr c.setCacheConfiguration(cc); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); - - spi.setIpFinder(ipFinder); - - c.setDiscoverySpi(spi); - - if (CACHE_DEBUG) - resetLog4j(Level.DEBUG, LOG_TO_FILE, GridCacheProcessor.class.getPackage().getName()); - return c; } http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java index c9f3aee..80b2f3b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java @@ -19,12 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated; 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.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; -import org.apache.log4j.Level; import static org.apache.ignite.cache.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -33,41 +28,19 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; * Tests for replicated transactions. */ public class GridCacheReplicatedTxSingleThreadedSelfTest extends IgniteTxSingleThreadedAbstractTest { - /** Cache debug flag. */ - private static final boolean CACHE_DEBUG = false; - - /** Log to file flag. */ - private static final boolean LOG_TO_FILE = true; - - /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); - - /** {@inheritDoc} */ + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { - IgniteConfiguration c = super.getConfiguration(igniteInstanceName); - - c.getTransactionConfiguration().setTxSerializableEnabled(true); - - CacheConfiguration cc = defaultCacheConfiguration(); - - cc.setCacheMode(REPLICATED); - - cc.setEvictionPolicy(null); - - cc.setWriteSynchronizationMode(FULL_SYNC); - - c.setCacheConfiguration(cc); - - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); - spi.setIpFinder(ipFinder); + CacheConfiguration ccfg = defaultCacheConfiguration(); - c.setDiscoverySpi(spi); + ccfg.setCacheMode(REPLICATED); + ccfg.setEvictionPolicy(null); + ccfg.setWriteSynchronizationMode(FULL_SYNC); - if (CACHE_DEBUG) - resetLog4j(Level.DEBUG, LOG_TO_FILE, GridCacheProcessor.class.getPackage().getName()); + cfg.setCacheConfiguration(ccfg); - return c; + return cfg; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java index 947fb1e..8101172 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java @@ -17,12 +17,9 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated.preloader; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.Random; import java.util.UUID; @@ -39,10 +36,7 @@ import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; import org.apache.ignite.cache.CachePeekMode; import org.apache.ignite.cache.CacheRebalanceMode; -import org.apache.ignite.cache.affinity.AffinityFunction; -import org.apache.ignite.cache.affinity.AffinityFunctionContext; import org.apache.ignite.cache.affinity.AffinityKeyMapper; -import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.events.Event; @@ -51,15 +45,17 @@ import org.apache.ignite.internal.binary.BinaryEnumObjectImpl; import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.processors.cache.GridCacheAdapter; import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; +import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.P2; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.plugin.CachePluginConfiguration; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.spi.eventstorage.memory.MemoryEventStorageSpi; +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.REPLICATED; @@ -85,9 +81,6 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { private int batchSize = 4096; /** */ - private int poolSize = 2; - - /** */ private volatile boolean extClassloadingAtCfg = false; /** */ @@ -119,6 +112,8 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); + cfg.setRebalanceThreadPoolSize(2); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(ipFinder); @@ -173,7 +168,6 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { cacheCfg.setWriteSynchronizationMode(FULL_SYNC); cacheCfg.setRebalanceMode(preloadMode); cacheCfg.setRebalanceBatchSize(batchSize); - cacheCfg.setRebalanceThreadPoolSize(poolSize); if (extClassloadingAtCfg) loadExternalClassesToCfg(cacheCfg); @@ -571,14 +565,17 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { * @throws Exception If test failed. */ public void testExternalClassesAtEventP2pDisabled() throws Exception { - testExternalClassesAtEvent0(true); + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_EVENTS); + testExternalClassesAtEvent0(true); } /** * @throws Exception If test failed. */ public void testExternalClassesAtEvent() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_EVENTS); + testExternalClassesAtEvent0(false); } @@ -656,19 +653,24 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { try { IgniteCache<Integer, String> cache1 = startGrid(1).cache(DEFAULT_CACHE_NAME); - int keyCnt = 2000; + final int keyCnt = 2000; for (int i = 0; i < keyCnt; i++) cache1.put(i, "val" + i); - IgniteCache<Integer, String> cache2 = startGrid(2).cache(DEFAULT_CACHE_NAME); + final IgniteCache<Integer, String> cache2 = startGrid(2).cache(DEFAULT_CACHE_NAME); int size = cache2.localSize(CachePeekMode.ALL); info("Size of cache2: " + size); - assert waitCacheSize(cache2, keyCnt, getTestTimeout()) : - "Actual cache size: " + cache2.localSize(CachePeekMode.ALL); + boolean awaitSize = GridTestUtils.waitForCondition(new GridAbsPredicate() { + @Override public boolean apply() { + return cache2.localSize(CachePeekMode.ALL) >= keyCnt; + } + }, getTestTimeout()); + + assertTrue("Actual cache size: " + cache2.localSize(CachePeekMode.ALL), awaitSize); } finally { stopAllGrids(); @@ -676,32 +678,6 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { } /** - * @param cache Cache. - * @param expSize Lower bound of expected size. - * @param timeout Timeout. - * @return {@code true} if success. - * @throws InterruptedException If thread was interrupted. - */ - @SuppressWarnings({"BusyWait"}) - private boolean waitCacheSize(IgniteCache<Integer, String> cache, int expSize, long timeout) - throws InterruptedException { - assert cache != null; - assert expSize > 0; - assert timeout >= 0; - - long end = System.currentTimeMillis() + timeout; - - while (cache.localSize(CachePeekMode.ALL) < expSize) { - Thread.sleep(50); - - if (end - System.currentTimeMillis() <= 0) - break; - } - - return cache.localSize(CachePeekMode.ALL) >= expSize; - } - - /** * @throws Exception If test failed. */ public void testBatchSize1() throws Exception { @@ -788,7 +764,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { info("Beginning data population..."); - int cnt = 2500; + final int cnt = 2500; Map<Integer, String> map = null; @@ -816,7 +792,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { info("Cache size is OK for grid index: " + gridIdx); } - IgniteCache<Integer, String> lastCache = startGrid(gridCnt).cache(DEFAULT_CACHE_NAME); + final IgniteCache<Integer, String> lastCache = startGrid(gridCnt).cache(DEFAULT_CACHE_NAME); // Let preloading start. Thread.sleep(1000); @@ -828,8 +804,15 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { stopGrid(idx); - assert waitCacheSize(lastCache, cnt, 20 * 1000) : - "Actual cache size: " + lastCache.localSize(CachePeekMode.ALL); + awaitPartitionMapExchange(true, true, null); + + boolean awaitSize = GridTestUtils.waitForCondition(new GridAbsPredicate() { + @Override public boolean apply() { + return lastCache.localSize(CachePeekMode.ALL) >= cnt; + } + }, 20_000); + + assertTrue("Actual cache size: " + lastCache.localSize(CachePeekMode.ALL), awaitSize); } finally { stopAllGrids(); @@ -867,64 +850,6 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { } /** - * Test affinity. - */ - private static class TestAffinityFunction implements AffinityFunction { - /** {@inheritDoc} */ - @Override public int partitions() { - return 2; - } - - /** {@inheritDoc} */ - @Override public int partition(Object key) { - if (key instanceof Number) - return ((Number)key).intValue() % 2; - - return key == null ? 0 : U.safeAbs(key.hashCode() % 2); - } - - /** {@inheritDoc} */ - @Override public List<List<ClusterNode>> assignPartitions(AffinityFunctionContext affCtx) { - List<List<ClusterNode>> res = new ArrayList<>(partitions()); - - for (int part = 0; part < partitions(); part++) - res.add(nodes(part, affCtx.currentTopologySnapshot())); - - return res; - } - - /** {@inheritDoc} */ - @SuppressWarnings({"RedundantTypeArguments"}) - public List<ClusterNode> nodes(int part, Collection<ClusterNode> nodes) { - Collection<ClusterNode> col = new HashSet<>(nodes); - - if (col.size() <= 1) - return new ArrayList<>(col); - - for (Iterator<ClusterNode> iter = col.iterator(); iter.hasNext(); ) { - ClusterNode node = iter.next(); - - boolean even = node.<Boolean>attribute("EVEN"); - - if ((even && part != 0) || (!even && part != 1)) - iter.remove(); - } - - return new ArrayList<>(col); - } - - /** {@inheritDoc} */ - @Override public void reset() { - // No-op. - } - - /** {@inheritDoc} */ - @Override public void removeNode(UUID nodeId) { - // No-op. - } - } - - /** * */ private static class MessageListener implements P2<UUID, Object> { http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java index 8578db7..aa63fe6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheDaemonNodeLocalSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.local; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.internal.processors.cache.GridCacheDaemonNodeAbstractSelfTest; +import org.apache.ignite.testframework.MvccFeatureChecker; import static org.apache.ignite.cache.CacheMode.LOCAL; @@ -27,6 +28,13 @@ import static org.apache.ignite.cache.CacheMode.LOCAL; */ public class GridCacheDaemonNodeLocalSelfTest extends GridCacheDaemonNodeAbstractSelfTest { /** {@inheritDoc} */ + @Override protected void beforeTestsStarted() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE); + + super.beforeTestsStarted(); + } + + /** {@inheritDoc} */ @Override protected CacheMode cacheMode() { return LOCAL; } http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java index a6be82b..e6c4771 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java @@ -26,6 +26,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.GridCacheAbstractByteArrayValuesSelfTest; import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.jetbrains.annotations.Nullable; @@ -67,6 +68,8 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE); + ignite = startGrid(1); cache = ignite.cache(CACHE_REGULAR); http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEventSelfTest.java index c0b6071..716e5dd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalEventSelfTest.java @@ -30,7 +30,7 @@ public class GridCacheLocalEventSelfTest extends GridCacheEventAbstractTest { /** {@inheritDoc} */ @Override public void beforeTestsStarted() throws Exception { MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE); - + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_EVENTS); super.beforeTestsStarted(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractTest.java index 1f0e45e..7463fa7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractTest.java @@ -34,6 +34,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheTestStore; import org.apache.ignite.internal.util.typedef.internal.U; 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.jetbrains.annotations.Nullable; @@ -52,6 +53,13 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb /** Cache store. */ private static final GridCacheTestStore store = new GridCacheTestStore(); + /** {@inheritDoc} */ + @Override public void setUp() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE); + + super.setUp(); + } + /** * */ http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreLocalTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreLocalTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreLocalTest.java index 59dd4b4..160203e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreLocalTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreLocalTest.java @@ -18,12 +18,20 @@ package org.apache.ignite.internal.processors.cache.store; import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.testframework.MvccFeatureChecker; /** * Tests {@link org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore} in grid configuration. */ public class GridCacheWriteBehindStoreLocalTest extends GridCacheWriteBehindStoreAbstractTest { /** {@inheritDoc} */ + @Override public void setUp() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE); + + super.setUp(); + } + + /** {@inheritDoc} */ @Override protected CacheMode cacheMode() { return CacheMode.LOCAL; } http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java index de61058..d60dc4a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java @@ -35,6 +35,7 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; @@ -93,6 +94,13 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC } /** {@inheritDoc} */ + @Override protected void beforeTestsStarted() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE); + + super.beforeTestsStarted(); + } + + /** {@inheritDoc} */ @Override protected void afterTestsStopped() throws Exception { stores = null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAbstractTest.java index a64104e..23bb781 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgnteCacheClientWriteBehindStoreAbstractTest.java @@ -28,12 +28,20 @@ import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractTest; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.MvccFeatureChecker; /** * Tests that write behind store is updated if client does not have store. */ public abstract class IgnteCacheClientWriteBehindStoreAbstractTest extends IgniteCacheAbstractTest { /** {@inheritDoc} */ + @Override protected void beforeTestsStarted() throws Exception { + MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE); + + super.beforeTestsStarted(); + } + + /** {@inheritDoc} */ @Override protected int gridCount() { return 3; } http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/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 index ee9b02a..2ea77b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java @@ -41,7 +41,8 @@ public class MvccFeatureChecker { ENTRY_LOCK, CACHE_EVENTS, EVICTION, - EXPIRATION + EXPIRATION, + INTERCEPTOR } /** @@ -132,6 +133,9 @@ public class MvccFeatureChecker { case EXPIRATION: fail("https://issues.apache.org/jira/browse/IGNITE-7311";); + + case INTERCEPTOR: + fail("https://issues.apache.org/jira/browse/IGNITE-9323";); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java index 0007813..8ab7c2c 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java @@ -17,9 +17,11 @@ package org.apache.ignite.testsuites; +import java.util.Collection; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryAtomicEntryProcessorDeploymentSelfTest; import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryTransactionalEntryProcessorDeploymentSelfTest; +import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.config.GridTestProperties; /** @@ -43,14 +45,22 @@ public class IgniteBinaryObjectsCacheTestSuite3 { * @return Test suite. * @throws Exception If failed. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { + return suite(null); + } + + /** + * @param ignoredTests Ignored tests. + * @return IgniteCache test suite. + */ + public static TestSuite suite(Collection<Class> ignoredTests) { GridTestProperties.setProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME, "org.apache.ignite.tests.p2p.CacheDeploymentBinaryEntryProcessor"); - TestSuite suite = IgniteCacheTestSuite3.suite(); + TestSuite suite = IgniteCacheTestSuite3.suite(ignoredTests); - suite.addTestSuite(GridCacheBinaryAtomicEntryProcessorDeploymentSelfTest.class); - suite.addTestSuite(GridCacheBinaryTransactionalEntryProcessorDeploymentSelfTest.class); + GridTestUtils.addTestIfNeeded(suite,GridCacheBinaryAtomicEntryProcessorDeploymentSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheBinaryTransactionalEntryProcessorDeploymentSelfTest.class, ignoredTests); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite3.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite3.java new file mode 100644 index 0000000..55dddbe --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite3.java @@ -0,0 +1,133 @@ +/* + * 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.internal.processors.cache.CacheInterceptorPartitionCounterLocalSanityTest; +import org.apache.ignite.internal.processors.cache.CacheInterceptorPartitionCounterRandomOperationsTest; +import org.apache.ignite.internal.processors.cache.GridCacheAtomicEntryProcessorDeploymentSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheEntryVersionSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheInterceptorAtomicNearEnabledSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheInterceptorAtomicRebalanceTest; +import org.apache.ignite.internal.processors.cache.GridCacheInterceptorAtomicReplicatedSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheInterceptorAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheInterceptorAtomicWithStoreReplicatedSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheInterceptorAtomicWithStoreSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheInterceptorLocalAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheInterceptorLocalAtomicWithStoreSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheValueBytesPreloadingSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheVersionSelfTest; +import org.apache.ignite.internal.processors.cache.GridCacheVersionTopologyChangeTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheGroupsTest; +import org.apache.ignite.internal.processors.cache.binary.GridCacheBinaryAtomicEntryProcessorDeploymentSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.CacheAsyncOperationsTest; +import org.apache.ignite.internal.processors.cache.distributed.GridCacheMixedModeSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheClientOnlySelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteTxReentryColocatedSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheValueConsistencyAtomicNearEnabledSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheValueConsistencyAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearOnlySelfTest; +import org.apache.ignite.internal.processors.cache.distributed.near.IgniteTxReentryNearSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedAtomicGetAndTransformStoreSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMvccTxMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMvccTxSingleThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMvccTxTimeoutSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxMultiThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxSingleThreadedSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxTimeoutSelfTest; +import org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStoreMultithreadedSelfTest; +import org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStoreSelfTest; +import org.apache.ignite.internal.processors.cache.store.IgnteCacheClientWriteBehindStoreAtomicTest; +import org.apache.ignite.internal.processors.cache.store.IgnteCacheClientWriteBehindStoreNonCoalescingTest; + +/** + * Test suite. + */ +public class IgniteCacheMvccTestSuite3 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<>(); + + // Skip classes that already contains Mvcc tests + ignoredTests.add(GridCacheEntryVersionSelfTest.class); + ignoredTests.add(GridCacheVersionTopologyChangeTest.class); + ignoredTests.add(CacheAsyncOperationsTest.class); + ignoredTests.add(CacheInterceptorPartitionCounterLocalSanityTest.class); + ignoredTests.add(CacheInterceptorPartitionCounterRandomOperationsTest.class); + ignoredTests.add(IgniteCacheGroupsTest.class); + + // Atomic caches + ignoredTests.add(GridCacheValueConsistencyAtomicSelfTest.class); + ignoredTests.add(GridCacheValueConsistencyAtomicNearEnabledSelfTest.class); + ignoredTests.add(GridCacheReplicatedAtomicGetAndTransformStoreSelfTest.class); + ignoredTests.add(GridCacheAtomicEntryProcessorDeploymentSelfTest.class); + ignoredTests.add(GridCacheValueBytesPreloadingSelfTest.class); + ignoredTests.add(GridCacheBinaryAtomicEntryProcessorDeploymentSelfTest.class); + + ignoredTests.add(GridCacheClientOnlySelfTest.CasePartitionedAtomic.class); + ignoredTests.add(GridCacheClientOnlySelfTest.CaseReplicatedAtomic.class); + ignoredTests.add(GridCacheNearOnlySelfTest.CasePartitionedAtomic.class); + ignoredTests.add(GridCacheNearOnlySelfTest.CaseReplicatedAtomic.class); + + ignoredTests.add(IgnteCacheClientWriteBehindStoreAtomicTest.class); + ignoredTests.add(IgnteCacheClientWriteBehindStoreNonCoalescingTest.class); + + ignoredTests.add(GridCacheInterceptorLocalAtomicSelfTest.class); + ignoredTests.add(GridCacheInterceptorLocalAtomicWithStoreSelfTest.class); + ignoredTests.add(GridCacheInterceptorAtomicSelfTest.class); + ignoredTests.add(GridCacheInterceptorAtomicNearEnabledSelfTest.class); + ignoredTests.add(GridCacheInterceptorAtomicWithStoreSelfTest.class); + ignoredTests.add(GridCacheInterceptorAtomicReplicatedSelfTest.class); + ignoredTests.add(GridCacheInterceptorAtomicWithStoreReplicatedSelfTest.class); + ignoredTests.add(GridCacheInterceptorAtomicRebalanceTest.class); + + // Irrelevant tx tests + ignoredTests.add(IgniteTxReentryNearSelfTest.class); + ignoredTests.add(IgniteTxReentryColocatedSelfTest.class); + + // Other non-tx tests + ignoredTests.add(GridCacheWriteBehindStoreSelfTest.class); + ignoredTests.add(GridCacheWriteBehindStoreMultithreadedSelfTest.class); + + ignoredTests.add(GridCacheVersionSelfTest.class); + ignoredTests.add(GridCacheMixedModeSelfTest.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(GridCacheReplicatedTxSingleThreadedSelfTest.class); // See GridCacheReplicatedMvccTxSingleThreadedSelfTest + ignoredTests.add(GridCacheReplicatedTxMultiThreadedSelfTest.class); // See GridCacheReplicatedMvccTxMultiThreadedSelfTest + ignoredTests.add(GridCacheReplicatedTxTimeoutSelfTest.class); // See GridCacheReplicatedMvccTxTimeoutSelfTest + + TestSuite suite = new TestSuite("IgniteCache Mvcc Test Suite part 3"); + + suite.addTest(IgniteBinaryObjectsCacheTestSuite3.suite(ignoredTests)); + + // Add Mvcc clones. + suite.addTestSuite(GridCacheReplicatedMvccTxSingleThreadedSelfTest.class); + suite.addTestSuite(GridCacheReplicatedMvccTxMultiThreadedSelfTest.class); + suite.addTestSuite(GridCacheReplicatedMvccTxTimeoutSelfTest.class); + + return suite; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheNearOnlySelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheNearOnlySelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheNearOnlySelfTestSuite.java index 087007e..1519baa 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheNearOnlySelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheNearOnlySelfTestSuite.java @@ -17,10 +17,12 @@ package org.apache.ignite.testsuites; +import java.util.Collection; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheClientOnlySelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearOnlySelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearOnlyTopologySelfTest; +import org.apache.ignite.testframework.GridTestUtils; /** * Test suite for near-only cache. @@ -28,22 +30,29 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNea public class IgniteCacheNearOnlySelfTestSuite { /** * @return Suite. - * @throws Exception If failed. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { + return suite(null); + } + + /** + * @param ignoredTests Ignored tests. + * @return IgniteCache test suite. + */ + public static TestSuite suite(Collection<Class> ignoredTests) { TestSuite suite = new TestSuite("Near-only cache test suite."); - suite.addTest(new TestSuite(GridCacheClientOnlySelfTest.CasePartitionedAtomic.class)); - suite.addTest(new TestSuite(GridCacheClientOnlySelfTest.CasePartitionedTransactional.class)); - suite.addTest(new TestSuite(GridCacheClientOnlySelfTest.CaseReplicatedAtomic.class)); - suite.addTest(new TestSuite(GridCacheClientOnlySelfTest.CaseReplicatedTransactional.class)); + GridTestUtils.addTestIfNeeded(suite,GridCacheClientOnlySelfTest.CasePartitionedAtomic.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheClientOnlySelfTest.CasePartitionedTransactional.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheClientOnlySelfTest.CaseReplicatedAtomic.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheClientOnlySelfTest.CaseReplicatedTransactional.class, ignoredTests); - suite.addTest(new TestSuite(GridCacheNearOnlyTopologySelfTest.class)); + GridTestUtils.addTestIfNeeded(suite,GridCacheNearOnlyTopologySelfTest.class, ignoredTests); - suite.addTest(new TestSuite(GridCacheNearOnlySelfTest.CasePartitionedAtomic.class)); - suite.addTest(new TestSuite(GridCacheNearOnlySelfTest.CasePartitionedTransactional.class)); - suite.addTest(new TestSuite(GridCacheNearOnlySelfTest.CaseReplicatedAtomic.class)); - suite.addTest(new TestSuite(GridCacheNearOnlySelfTest.CaseReplicatedTransactional.class)); + GridTestUtils.addTestIfNeeded(suite,GridCacheNearOnlySelfTest.CasePartitionedAtomic.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheNearOnlySelfTest.CasePartitionedTransactional.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheNearOnlySelfTest.CaseReplicatedAtomic.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheNearOnlySelfTest.CaseReplicatedTransactional.class, ignoredTests); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/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 179f5e9..0250d58 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,7 +17,7 @@ package org.apache.ignite.testsuites; -import java.util.HashSet; +import java.util.Collection; import junit.framework.TestSuite; import org.apache.ignite.cache.affinity.rendezvous.ClusterNodeAttributeAffinityBackupFilterSelfTest; import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunctionBackupFilterSelfTest; @@ -153,7 +153,6 @@ import org.apache.ignite.testframework.GridTestUtils; public class IgniteCacheTestSuite2 extends TestSuite { /** * @return IgniteCache test suite. - * @throws Exception Thrown in case of the failure. */ public static TestSuite suite() { return suite(null); @@ -162,9 +161,8 @@ public class IgniteCacheTestSuite2 extends TestSuite { /** * @param ignoredTests Ignored tests. * @return IgniteCache test suite. - * @throws Exception Thrown in case of the failure. */ - public static TestSuite suite(HashSet<Class> ignoredTests) { + public static TestSuite suite(Collection<Class> ignoredTests) { TestSuite suite = new TestSuite("IgniteCache Test Suite part 2"); // Local cache. http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/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 index 2c2c7ef..98778ca 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import java.util.Collection; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.CacheStartupInDeploymentModesTest; import org.apache.ignite.internal.processors.cache.GridCacheAtomicEntryProcessorDeploymentSelfTest; @@ -70,12 +71,12 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCa import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxSingleThreadedSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxTimeoutSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheSyncReplicatedPreloadSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.replicated.GridReplicatedTxPreloadTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.preloader.GridCacheReplicatedPreloadLifecycleSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.preloader.GridCacheReplicatedPreloadSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.preloader.GridCacheReplicatedPreloadStartStopEventsSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheDaemonNodeLocalSelfTest; import org.apache.ignite.internal.processors.cache.local.GridCacheLocalByteArrayValuesSelfTest; +import org.apache.ignite.testframework.GridTestUtils; /** * Test suite. @@ -83,110 +84,116 @@ import org.apache.ignite.internal.processors.cache.local.GridCacheLocalByteArray public class IgniteCacheTestSuite3 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. + */ + public static TestSuite suite(Collection<Class> ignoredTests) { TestSuite suite = new TestSuite("IgniteCache Test Suite part 3"); - suite.addTestSuite(IgniteCacheGroupsTest.class); + GridTestUtils.addTestIfNeeded(suite,IgniteCacheGroupsTest.class, ignoredTests); // Value consistency tests. - suite.addTestSuite(GridCacheValueConsistencyAtomicSelfTest.class); - suite.addTestSuite(GridCacheValueConsistencyAtomicNearEnabledSelfTest.class); - suite.addTestSuite(GridCacheValueConsistencyTransactionalSelfTest.class); - suite.addTestSuite(GridCacheValueConsistencyTransactionalNearEnabledSelfTest.class); - suite.addTestSuite(GridCacheValueBytesPreloadingSelfTest.class); + GridTestUtils.addTestIfNeeded(suite,GridCacheValueConsistencyAtomicSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheValueConsistencyAtomicNearEnabledSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheValueConsistencyTransactionalSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheValueConsistencyTransactionalNearEnabledSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheValueBytesPreloadingSelfTest.class, ignoredTests); // 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(GridCacheReplicatedEventDisabledSelfTest.class); - suite.addTestSuite(GridCacheReplicatedSynchronousCommitTest.class); - - suite.addTestSuite(GridCacheReplicatedLockSelfTest.class); - 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(GridCacheReplicatedPreloadLifecycleSelfTest.class); - suite.addTestSuite(GridCacheSyncReplicatedPreloadSelfTest.class); - - //suite.addTestSuite(GridCacheReplicatedEntrySetSelfTest.class); - //suite.addTestSuite(GridCacheReplicatedMarshallerTxTest.class); - //suite.addTestSuite(GridCacheReplicatedOnheapFullApiSelfTest.class); - //suite.addTestSuite(GridCacheReplicatedOnheapMultiNodeFullApiSelfTest.class); - //suite.addTestSuite(GridCacheReplicatedTxConcurrentGetTest.class); - //suite.addTestSuite(GridCacheReplicatedTxMultiNodeBasicTest.class); - //suite.addTestSuite(GridCacheReplicatedTxReadTest.class); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedBasicApiTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedBasicOpSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedBasicStoreSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedGetAndTransformStoreSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedAtomicGetAndTransformStoreSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedEventSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedEventDisabledSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedSynchronousCommitTest.class, ignoredTests); + + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedLockSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedMultiNodeLockSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedMultiNodeSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedNodeFailureSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedTxSingleThreadedSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedTxTimeoutSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedPreloadSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedPreloadLifecycleSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheSyncReplicatedPreloadSelfTest.class, ignoredTests); + + //GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedEntrySetSelfTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedMarshallerTxTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedOnheapFullApiSelfTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedOnheapMultiNodeFullApiSelfTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedTxConcurrentGetTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedTxMultiNodeBasicTest.class, ignoredTests); + //GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedTxReadTest.class, ignoredTests); // TODO GG-11141. -// suite.addTestSuite(GridCacheDeploymentSelfTest.class); -// suite.addTestSuite(GridCacheDeploymentOffHeapSelfTest.class); -// suite.addTestSuite(GridCacheDeploymentOffHeapValuesSelfTest.class); - suite.addTestSuite(CacheStartupInDeploymentModesTest.class); - suite.addTestSuite(GridCacheConditionalDeploymentSelfTest.class); - suite.addTestSuite(GridCacheAtomicEntryProcessorDeploymentSelfTest.class); - suite.addTestSuite(GridCacheTransactionalEntryProcessorDeploymentSelfTest.class); - suite.addTestSuite(IgniteCacheScanPredicateDeploymentSelfTest.class); - - suite.addTestSuite(GridCachePutArrayValueSelfTest.class); - suite.addTestSuite(GridCacheReplicatedEvictionEventSelfTest.class); - suite.addTestSuite(GridCacheReplicatedTxMultiThreadedSelfTest.class); - suite.addTestSuite(GridCacheReplicatedPreloadEventsSelfTest.class); - suite.addTestSuite(GridCacheReplicatedPreloadStartStopEventsSelfTest.class); - suite.addTestSuite(GridReplicatedTxPreloadTest.class); - - suite.addTestSuite(IgniteTxReentryNearSelfTest.class); - suite.addTestSuite(IgniteTxReentryColocatedSelfTest.class); +// GridTestUtils.addTestIfNeeded(suite,GridCacheDeploymentSelfTest.class, ignoredTests); +// GridTestUtils.addTestIfNeeded(suite,GridCacheDeploymentOffHeapSelfTest.class, ignoredTests); +// GridTestUtils.addTestIfNeeded(suite,GridCacheDeploymentOffHeapValuesSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,CacheStartupInDeploymentModesTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheConditionalDeploymentSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheAtomicEntryProcessorDeploymentSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheTransactionalEntryProcessorDeploymentSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,IgniteCacheScanPredicateDeploymentSelfTest.class, ignoredTests); + + GridTestUtils.addTestIfNeeded(suite,GridCachePutArrayValueSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedEvictionEventSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedTxMultiThreadedSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedPreloadEventsSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedPreloadStartStopEventsSelfTest.class, ignoredTests); + + GridTestUtils.addTestIfNeeded(suite,IgniteTxReentryNearSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,IgniteTxReentryColocatedSelfTest.class, ignoredTests); // 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); + GridTestUtils.addTestIfNeeded(suite,GridCacheLocalByteArrayValuesSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheNearPartitionedP2PEnabledByteArrayValuesSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheNearPartitionedP2PDisabledByteArrayValuesSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCachePartitionedOnlyP2PEnabledByteArrayValuesSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCachePartitionedOnlyP2PDisabledByteArrayValuesSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedP2PEnabledByteArrayValuesSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReplicatedP2PDisabledByteArrayValuesSelfTest.class, ignoredTests); // Near-only cache. - suite.addTest(IgniteCacheNearOnlySelfTestSuite.suite()); + suite.addTest(IgniteCacheNearOnlySelfTestSuite.suite(ignoredTests)); // Test cache with daemon nodes. - suite.addTestSuite(GridCacheDaemonNodeLocalSelfTest.class); - suite.addTestSuite(GridCacheDaemonNodePartitionedSelfTest.class); - suite.addTestSuite(GridCacheDaemonNodeReplicatedSelfTest.class); + GridTestUtils.addTestIfNeeded(suite,GridCacheDaemonNodeLocalSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheDaemonNodePartitionedSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheDaemonNodeReplicatedSelfTest.class, ignoredTests); // Write-behind. - suite.addTest(IgniteCacheWriteBehindTestSuite.suite()); + suite.addTest(IgniteCacheWriteBehindTestSuite.suite(ignoredTests)); // Transform. - suite.addTestSuite(GridCachePartitionedTransformWriteThroughBatchUpdateSelfTest.class); + GridTestUtils.addTestIfNeeded(suite,GridCachePartitionedTransformWriteThroughBatchUpdateSelfTest.class, ignoredTests); - suite.addTestSuite(GridCacheEntryVersionSelfTest.class); - suite.addTestSuite(GridCacheVersionSelfTest.class); - suite.addTestSuite(GridCacheVersionTopologyChangeTest.class); + GridTestUtils.addTestIfNeeded(suite,GridCacheEntryVersionSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheVersionSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheVersionTopologyChangeTest.class, ignoredTests); // Memory leak tests. - suite.addTestSuite(GridCacheReferenceCleanupSelfTest.class); - suite.addTestSuite(GridCacheReloadSelfTest.class); + GridTestUtils.addTestIfNeeded(suite,GridCacheReferenceCleanupSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,GridCacheReloadSelfTest.class, ignoredTests); - suite.addTestSuite(GridCacheMixedModeSelfTest.class); + GridTestUtils.addTestIfNeeded(suite,GridCacheMixedModeSelfTest.class, ignoredTests); // Cache interceptor tests. - suite.addTest(IgniteCacheInterceptorSelfTestSuite.suite()); + suite.addTest(IgniteCacheInterceptorSelfTestSuite.suite(ignoredTests)); - suite.addTestSuite(IgniteTxGetAfterStopTest.class); + GridTestUtils.addTestIfNeeded(suite,IgniteTxGetAfterStopTest.class, ignoredTests); - suite.addTestSuite(CacheAsyncOperationsTest.class); + GridTestUtils.addTestIfNeeded(suite,CacheAsyncOperationsTest.class, ignoredTests); - suite.addTestSuite(IgniteTxRemoveTimeoutObjectsTest.class); - suite.addTestSuite(IgniteTxRemoveTimeoutObjectsNearTest.class); + GridTestUtils.addTestIfNeeded(suite,IgniteTxRemoveTimeoutObjectsTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite,IgniteTxRemoveTimeoutObjectsNearTest.class, ignoredTests); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/00e4dc0b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheWriteBehindTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheWriteBehindTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheWriteBehindTestSuite.java index dff93ff..b4f6ae7 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheWriteBehindTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheWriteBehindTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import java.util.Collection; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.GridCachePartitionedWritesTest; import org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStoreLocalTest; @@ -28,6 +29,7 @@ import org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindSto import org.apache.ignite.internal.processors.cache.store.IgnteCacheClientWriteBehindStoreAtomicTest; import org.apache.ignite.internal.processors.cache.store.IgnteCacheClientWriteBehindStoreNonCoalescingTest; import org.apache.ignite.internal.processors.cache.store.IgnteCacheClientWriteBehindStoreTxTest; +import org.apache.ignite.testframework.GridTestUtils; /** * Test suite that contains all tests for {@link org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore}. @@ -35,22 +37,29 @@ import org.apache.ignite.internal.processors.cache.store.IgnteCacheClientWriteBe public class IgniteCacheWriteBehindTestSuite extends TestSuite { /** * @return Ignite Bamboo in-memory data grid 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. + */ + public static TestSuite suite(Collection<Class> ignoredTests) { TestSuite suite = new TestSuite("Write-Behind Store Test Suite"); // Write-behind tests. - suite.addTest(new TestSuite(GridCacheWriteBehindStoreSelfTest.class)); - suite.addTest(new TestSuite(GridCacheWriteBehindStoreMultithreadedSelfTest.class)); - suite.addTest(new TestSuite(GridCacheWriteBehindStoreLocalTest.class)); - suite.addTest(new TestSuite(GridCacheWriteBehindStoreReplicatedTest.class)); - suite.addTest(new TestSuite(GridCacheWriteBehindStorePartitionedTest.class)); - suite.addTest(new TestSuite(GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.class)); - suite.addTest(new TestSuite(GridCachePartitionedWritesTest.class)); - suite.addTest(new TestSuite(IgnteCacheClientWriteBehindStoreAtomicTest.class)); - suite.addTest(new TestSuite(IgnteCacheClientWriteBehindStoreTxTest.class)); - suite.addTest(new TestSuite(IgnteCacheClientWriteBehindStoreNonCoalescingTest.class)); + GridTestUtils.addTestIfNeeded(suite, GridCacheWriteBehindStoreSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheWriteBehindStoreMultithreadedSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheWriteBehindStoreLocalTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheWriteBehindStoreReplicatedTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheWriteBehindStorePartitionedTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, GridCachePartitionedWritesTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgnteCacheClientWriteBehindStoreAtomicTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgnteCacheClientWriteBehindStoreTxTest.class, ignoredTests); + GridTestUtils.addTestIfNeeded(suite, IgnteCacheClientWriteBehindStoreNonCoalescingTest.class, ignoredTests); return suite; }
