This is an automated email from the ASF dual-hosted git repository.
ilyak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 19fbf06 IGNITE-9217 Uncomment tests from Cache Suite 2, remove
obsoleted - Fixes #6576.
19fbf06 is described below
commit 19fbf061e611649d45737bd395acd203fa641191
Author: Ilya Kasnacheev <[email protected]>
AuthorDate: Thu Jul 4 18:26:32 2019 +0300
IGNITE-9217 Uncomment tests from Cache Suite 2, remove obsoleted - Fixes
#6576.
Signed-off-by: Ilya Kasnacheev <[email protected]>
---
.../processors/cache/GridCacheTtlManager.java | 4 +-
.../cache/persistence/GridCacheOffheapManager.java | 10 +-
.../RendezvousAffinityFunctionSelfTest.java | 52 ---------
.../CacheExchangeMessageDuplicatedStateTest.java | 5 +-
...idCacheBasicStoreMultithreadedAbstractTest.java | 24 ++++-
.../cache/IgniteTxMultiNodeAbstractTest.java | 89 ++++-----------
.../GridCacheEntrySetAbstractSelfTest.java | 119 ---------------------
...IgniteTxConsistencyRestartAbstractSelfTest.java | 8 +-
.../dht/GridCacheColocatedDebugTest.java | 20 ++--
.../dht/GridCacheDhtEntrySetSelfTest.java | 45 --------
.../GridCacheDhtEvictionNearReadersSelfTest.java | 31 +++---
.../dht/GridCacheDhtMultiBackupTest.java | 2 +-
.../dht/GridCacheDhtPreloadMessageCountTest.java | 1 +
...achePartitionedNearDisabledMetricsSelfTest.java | 61 ++++++++---
.../GridCachePartitionedEntryLockSelfTest.java | 38 -------
.../near/GridCachePartitionedEvictionSelfTest.java | 36 +++++--
.../GridCachePartitionedTxMultiNodeSelfTest.java | 47 +-------
.../near/NearCacheMultithreadedUpdateTest.java | 2 +-
.../near/NearCachePutAllMultinodeTest.java | 7 ++
.../GridCacheReplicatedEntrySetSelfTest.java | 33 ------
.../GridCacheReplicatedTxMultiNodeBasicTest.java | 47 +-------
.../testsuites/IgniteCacheMvccTestSuite2.java | 35 +++++-
.../ignite/testsuites/IgniteCacheTestSuite2.java | 64 +++++++----
.../ignite/testsuites/IgniteCacheTestSuite3.java | 2 -
.../ignite/testsuites/IgniteCacheTestSuite5.java | 2 -
.../IgniteBinaryCacheQueryTestSuite2.java | 7 +-
.../ignite/testsuites/IgniteSpringTestSuite.java | 3 +
27 files changed, 265 insertions(+), 529 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
index 17014fa..fa6385d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
@@ -44,7 +44,7 @@ public class GridCacheTtlManager extends
GridCacheManagerAdapter {
* Throttling timeout in millis which avoid excessive PendingTree access
on unwind
* if there is nothing to clean yet.
*/
- public static final long UNWIND_THROTTLING_TIMEOUT = Long.getLong(
+ private final long unwindThrottlingTimeout = Long.getLong(
IgniteSystemProperties.IGNITE_UNWIND_THROTTLING_TIMEOUT, 500L);
/** Entries pending removal. This collection tracks entries for near cache
only. */
@@ -237,7 +237,7 @@ public class GridCacheTtlManager extends
GridCacheManagerAdapter {
return true;
// There is nothing to clean, so the next clean up can be
postponed.
- nextCleanTime = U.currentTimeMillis() + UNWIND_THROTTLING_TIMEOUT;
+ nextCleanTime = U.currentTimeMillis() + unwindThrottlingTimeout;
if (amount != -1 && pendingEntries != null) {
EntryWrapper e = pendingEntries.firstx();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
index 8207b2b..4ebcf61 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
@@ -33,6 +33,7 @@ import javax.cache.processor.EntryProcessor;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.failure.FailureContext;
import org.apache.ignite.failure.FailureType;
import org.apache.ignite.internal.pagemem.FullPageId;
@@ -115,6 +116,13 @@ import static
org.apache.ignite.internal.processors.cache.distributed.dht.topolo
* Used when persistence enabled.
*/
public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl
implements DbCheckpointListener {
+ /**
+ * Throttling timeout in millis which avoid excessive PendingTree access
on unwind
+ * if there is nothing to clean yet.
+ */
+ private final long unwindThrottlingTimeout = Long.getLong(
+ IgniteSystemProperties.IGNITE_UNWIND_THROTTLING_TIMEOUT, 500L);
+
/** */
private IndexStorage indexStorage;
@@ -2626,7 +2634,7 @@ public class GridCacheOffheapManager extends
IgniteCacheOffheapManagerImpl imple
if (cleared < amount) {
lastThrottledCacheId = cctx.cacheId();
- nextStoreCleanTime = now +
GridCacheTtlManager.UNWIND_THROTTLING_TIMEOUT;
+ nextStoreCleanTime = now + unwindThrottlingTimeout;
}
return cleared;
diff --git
a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSelfTest.java
deleted file mode 100644
index d26f883..0000000
---
a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSelfTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.cache.affinity.rendezvous;
-
-import org.apache.ignite.Ignite;
-import org.apache.ignite.cache.affinity.AbstractAffinityFunctionSelfTest;
-import org.apache.ignite.cache.affinity.AffinityFunction;
-import org.apache.ignite.testframework.GridTestUtils;
-
-/**
- * Tests for {@link RendezvousAffinityFunction}.
- */
-public class RendezvousAffinityFunctionSelfTest extends
AbstractAffinityFunctionSelfTest {
- /** Ignite. */
- private static Ignite ignite;
-
- /** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
- ignite = startGrid();
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- ignite = null;
- }
-
- /** {@inheritDoc} */
- @Override protected AffinityFunction affinityFunction() {
- AffinityFunction aff = new RendezvousAffinityFunction();
-
- GridTestUtils.setFieldValue(aff, "ignite", ignite);
-
- return aff;
- }
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
index e806a36..1f1bc07 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.cache;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.apache.ignite.Ignite;
@@ -70,6 +71,8 @@ public class CacheExchangeMessageDuplicatedStateTest extends
GridCommonAbstractT
@Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+ cfg.setUserAttributes(Collections.singletonMap("name",
igniteInstanceName));
+
cfg.setClientMode(client);
TestRecordingCommunicationSpi commSpi = new
TestRecordingCommunicationSpi();
@@ -368,7 +371,7 @@ public class CacheExchangeMessageDuplicatedStateTest
extends GridCommonAbstractT
/** {@inheritDoc} */
@Override public boolean apply(ClusterNode node) {
// Do not start cache on coordinator.
- return node.order() > 1;
+ return !((String)node.attribute("name")).endsWith("0");
}
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
index e06fcca..2690fac 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java
@@ -26,6 +26,8 @@ import org.apache.ignite.cache.store.CacheStore;
import org.apache.ignite.cache.store.CacheStoreAdapter;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+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.junits.common.GridCommonAbstractTest;
@@ -37,6 +39,9 @@ import static
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
* Basic store test.
*/
public abstract class GridCacheBasicStoreMultithreadedAbstractTest extends
GridCommonAbstractTest {
+ /** */
+ private static final long DELAY = 100;
+
/** Cache store. */
private CacheStore<Integer, Integer> store;
@@ -97,7 +102,20 @@ public abstract class
GridCacheBasicStoreMultithreadedAbstractTest extends GridC
store = new CacheStoreAdapter<Integer, Integer>() {
@Override public Integer load(Integer key) {
- return cntr.incrementAndGet();
+ int res = cntr.incrementAndGet();
+
+ try {
+ U.sleep(DELAY);
+ }
+ catch (IgniteInterruptedCheckedException e) {
+ e.printStackTrace();
+
+ Thread.currentThread().interrupt();
+ }
+
+ cntr.decrementAndGet();
+
+ return res;
}
/** {@inheritDoc} */
@@ -123,12 +141,12 @@ public abstract class
GridCacheBasicStoreMultithreadedAbstractTest extends GridC
@Override public Object call() throws Exception {
barrier.await();
- cache.get(1);
+ assertEquals(1, (int)cache.get(1));
return null;
}
}, threads, "concurrent-get-worker");
- assertEquals(1, cntr.get());
+ assertEquals(0, cntr.get());
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
index 037e655..771e2e3 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
@@ -46,6 +46,7 @@ import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.jetbrains.annotations.Nullable;
+import org.junit.Ignore;
import org.junit.Test;
import static
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
@@ -137,12 +138,13 @@ public abstract class IgniteTxMultiNodeAbstractTest
extends GridCommonAbstractTe
/**
*
+ * @param kind Partition ownership to display in log.
* @param putCntr Put counter to cache.
* @param ignite Grid.
* @param itemKey Item key.
* @param retry Retry count.
*/
- private void onItemNear(boolean putCntr, Ignite ignite, String itemKey,
int retry) {
+ private void onItem(String kind, boolean putCntr, Ignite ignite, String
itemKey, int retry) {
IgniteCache<String, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
UUID locId = ignite.cluster().localNode().id();
@@ -153,7 +155,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends
GridCommonAbstractTe
try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC,
REPEATABLE_READ)) {
if (DEBUG)
- info("Before near get [retry=" + retry + ", xid=" + tx.xid() +
", node=" + ignite.name() +
+ info("Before " + kind + " get [retry=" + retry + ", xid=" +
tx.xid() + ", node=" + ignite.name() +
", isCntrPrimary=" + isCntrPrimary + ", nearId=" + locId +
", nearEntry=" + nearEntry(locId, CNTR_KEY) +
(isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId, CNTR_KEY)
: "") + ']');
@@ -164,7 +166,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends
GridCommonAbstractTe
if (putCntr) {
if (DEBUG)
- info("Before near put counter [retry=" + retry + ",
isCntrPrimary=" + isCntrPrimary +
+ info("Before " + kind + " put counter [retry=" + retry +
", isCntrPrimary=" + isCntrPrimary +
", cur=" + cntr + ", new=" + newVal + ", nearEntry=" +
nearEntry(locId, CNTR_KEY) +
(isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId,
CNTR_KEY) : "") + ']');
@@ -172,66 +174,16 @@ public abstract class IgniteTxMultiNodeAbstractTest
extends GridCommonAbstractTe
}
if (DEBUG)
- info("Before near put item [retry=" + retry + ", key=" +
itemKey + ", cur=" + cntr + ", new=" + newVal +
- ", nearEntry=" + nearEntry(locId, itemKey) + ", dhtEntry="
+ dhtEntry(itemPrimaryId, itemKey) + ']');
-
- cache.put(itemKey, newVal);
-
- if (DEBUG)
- info("After near put item [retry=" + retry + ", key=" +
itemKey + ", old=" + cntr + ", new=" + newVal +
- ", nearEntry=" + nearEntry(locId, itemKey) + ", dhtEntry"
+ dhtEntry(itemPrimaryId, itemKey) + ']');
-
- tx.commit();
- }
- }
-
- /**
- *
- * @param putCntr Put counter to cache.
- * @param ignite Grid.
- * @param itemKey Item key.
- * @param retry Retry count.
- */
- private void onItemPrimary(boolean putCntr, Ignite ignite, String itemKey,
int retry) {
- IgniteCache<String, Integer> cache = ignite.cache(DEFAULT_CACHE_NAME);
-
- UUID locId = ignite.cluster().localNode().id();
- UUID itemPrimaryId = primaryId(ignite, itemKey);
- UUID cntrPrimaryId = primaryId(ignite, CNTR_KEY);
-
- boolean isCntrPrimary = cntrPrimaryId.equals(locId);
-
- try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC,
REPEATABLE_READ)) {
- if (DEBUG)
- info("Before item primary get [retry=" + retry + ", xid=" +
tx.xid() + ", node=" + ignite.name() +
- ", isCntrPrimary=" + isCntrPrimary + ", nearId=" + locId +
- ", nearEntry=" + nearEntry(locId, CNTR_KEY) +
- (isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId, CNTR_KEY)
: "") + ']');
-
- Integer cntr = cache.get(CNTR_KEY);
-
- int newVal = cntr + 1;
-
- if (putCntr) {
- if (DEBUG)
- info("Before item primary put counter [retry=" + retry +
", isCntrPrimary=" + isCntrPrimary +
- ", cur=" + cntr + ", new=" + newVal + ", nearEntry=" +
nearEntry(locId, CNTR_KEY) +
- (isCntrPrimary ? ", dhtEntry=" + dhtEntry(locId,
CNTR_KEY) : "") + ']');
-
- cache.put(CNTR_KEY, newVal);
- }
-
- if (DEBUG)
- info("Before item primary put item [retry=" + retry + ", key="
+ itemKey + ", cur=" + cntr +
+ info("Before " + kind + " put item [retry=" + retry + ", key="
+ itemKey + ", cur=" + cntr +
", new=" + newVal + ", nearEntry=" + nearEntry(locId,
itemKey) +
- ", dhtEntry=" + dhtEntry(itemPrimaryId, itemKey) + ']');
+ ", dhtEntry=" + dhtEntry(itemPrimaryId, itemKey) + ']');
- cache.put(itemKey, cntr);
+ cache.put(itemKey, newVal);
if (DEBUG)
- info("After item primary put item [retry=" + retry + ", key="
+ itemKey + ", cur=" + cntr +
+ info("After " + kind + " put item [retry=" + retry + ", key="
+ itemKey + ", old=" + cntr +
", new=" + newVal + ", nearEntry=" + nearEntry(locId,
itemKey) +
- ", dhtEntry=" + dhtEntry(itemPrimaryId, itemKey) + ']');
+ ", dhtEntry" + dhtEntry(itemPrimaryId, itemKey) + ']');
tx.commit();
}
@@ -414,9 +366,9 @@ public abstract class IgniteTxMultiNodeAbstractTest extends
GridCommonAbstractTe
String itemKey = nodeId + "-#" + i;
if (nodeId.equals(primaryId(ignite, itemKey)))
- onItemPrimary(putCntr, ignite, itemKey, i);
+ onItem("primary", putCntr, ignite, itemKey, i);
else
- onItemNear(putCntr, ignite, itemKey, i);
+ onItem("near", putCntr, ignite, itemKey, i);
}
}
@@ -490,6 +442,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends
GridCommonAbstractTe
*
* @throws Exception If failed.
*/
+ @Ignore("https://issues.apache.org/jira/browse/IGNITE-11956";)
@Test
public void testPutTwoEntriesInTx() throws Exception {
// resetLog4j(Level.INFO, true, GridCacheTxManager.class.getName());
@@ -499,7 +452,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends
GridCommonAbstractTe
try {
grid(0).cache(DEFAULT_CACHE_NAME).put(CNTR_KEY, 0);
- grid(0).compute().call(new PutTwoEntriesInTxJob());
+ grid(0).compute().broadcast(new PutTwoEntriesInTxJob());
printCounter();
@@ -555,6 +508,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends
GridCommonAbstractTe
*
* @throws Exception If failed.
*/
+ @Ignore("https://issues.apache.org/jira/browse/IGNITE-11956";)
@Test
public void testPutTwoEntryInTxMultiThreaded() throws Exception {
// resetLog4j(Level.INFO, true, GridCacheTxManager.class.getName());
@@ -596,6 +550,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends
GridCommonAbstractTe
*
* @throws Exception If failed.
*/
+ @Ignore("https://issues.apache.org/jira/browse/IGNITE-11956";)
@Test
public void testRemoveInTxQueried() throws Exception {
//resetLog4j(Level.INFO, true,
GridCacheTxManager.class.getPackage().getName());
@@ -621,13 +576,13 @@ public abstract class IgniteTxMultiNodeAbstractTest
extends GridCommonAbstractTe
cntrRmvd.set(0);
- grid(0).compute().call(new RemoveInTxJobQueried());
+ grid(0).compute().broadcast(new RemoveInTxJobQueried());
for (int i = 0; i < GRID_CNT * RETRIES; i++)
for (int ii = 0; ii < GRID_CNT; ii++)
assertEquals(null,
grid(ii).cache(DEFAULT_CACHE_NAME).get(Integer.toString(i)));
- assertEquals(-GRID_CNT * RETRIES,
grid(0).cache(DEFAULT_CACHE_NAME).localPeek(RMVD_CNTR_KEY,
CachePeekMode.ONHEAP));
+ assertEquals(-GRID_CNT * RETRIES,
grid(0).cache(DEFAULT_CACHE_NAME).get(RMVD_CNTR_KEY));
}
finally {
stopAllGrids();
@@ -639,6 +594,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends
GridCommonAbstractTe
*
* @throws Exception If failed.
*/
+ @Ignore("https://issues.apache.org/jira/browse/IGNITE-11956";)
@Test
public void testRemoveInTxSimple() throws Exception {
startGrids(GRID_CNT);
@@ -662,7 +618,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends
GridCommonAbstractTe
cntrRmvd.set(0);
- grid(0).compute().call(new RemoveInTxJobSimple());
+ grid(0).compute().broadcast(new RemoveInTxJobSimple());
// Check using cache.
for (int i = 0; i < GRID_CNT * RETRIES; i++)
@@ -674,7 +630,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends
GridCommonAbstractTe
assertTrue(entries.isEmpty());
- assertEquals(-GRID_CNT * RETRIES,
grid(0).cache(DEFAULT_CACHE_NAME).localPeek(RMVD_CNTR_KEY,
CachePeekMode.ONHEAP));
+ assertEquals(-GRID_CNT * RETRIES,
grid(0).cache(DEFAULT_CACHE_NAME).get(RMVD_CNTR_KEY));
}
finally {
stopAllGrids();
@@ -686,6 +642,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends
GridCommonAbstractTe
*
* @throws Exception If failed.
*/
+ @Ignore("https://issues.apache.org/jira/browse/IGNITE-11956";)
@Test
public void testRemoveInTxQueriedMultiThreaded() throws Exception {
//resetLog4j(Level.INFO, true,
GridCacheTxManager.class.getPackage().getName());
@@ -763,7 +720,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends
GridCommonAbstractTe
assertEquals("Got invalid value from cache [gridIdx=" + ii
+ ", key=" + i + ']',
null,
grid(ii).cache(DEFAULT_CACHE_NAME).get(Integer.toString(i)));
- assertEquals(-GRID_CNT * RETRIES,
grid(0).cache(DEFAULT_CACHE_NAME).localPeek(RMVD_CNTR_KEY,
CachePeekMode.ONHEAP));
+ assertEquals(-GRID_CNT * RETRIES,
grid(0).cache(DEFAULT_CACHE_NAME).get(RMVD_CNTR_KEY));
}
finally {
stopAllGrids();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java
deleted file mode 100644
index f428bab..0000000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEntrySetAbstractSelfTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * 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;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicInteger;
-import javax.cache.Cache;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheWriteSynchronizationMode;
-import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest;
-import org.apache.ignite.testframework.GridTestUtils;
-import org.apache.ignite.transactions.Transaction;
-import org.junit.Test;
-
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
-import static
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
-import static
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
-
-/**
- *
- */
-public abstract class GridCacheEntrySetAbstractSelfTest extends
GridCacheAbstractSelfTest {
- /** */
- private static final int GRID_CNT = 2;
-
- /** */
- private static final String TX_KEY = "txKey";
-
- /** {@inheritDoc} */
- @Override protected int gridCount() {
- return GRID_CNT;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheWriteSynchronizationMode writeSynchronization() {
- return FULL_SYNC;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheAtomicityMode atomicityMode() {
- return TRANSACTIONAL;
- }
-
- /**
- * @throws Exception If failed.
- */
- @Test
- public void testEntrySet() throws Exception {
- for (int i = 0; i < 10; i++) {
- log.info("Iteration: " + i);
-
- final AtomicInteger cacheIdx = new AtomicInteger(0);
-
- GridTestUtils.runMultiThreaded(new Callable<Void>() {
- @Override public Void call() throws Exception {
- int idx = cacheIdx.getAndIncrement();
-
- log.info("Use cache " + idx);
-
- IgniteCache<Object, Object> cache =
grid(idx).cache(DEFAULT_CACHE_NAME);
-
- for (int i = 0; i < 100; i++)
- putAndCheckEntrySet(cache);
-
- return null;
- }
- }, GRID_CNT, "test");
-
- for (int j = 0; j < gridCount(); j++)
- jcache(j).removeAll();
- }
- }
-
- /**
- * @param cache Cache.
- * @throws Exception If failed.
- */
- private void putAndCheckEntrySet(IgniteCache<Object, Object> cache) throws
Exception {
- try (Transaction tx =
cache.unwrap(Ignite.class).transactions().txStart(PESSIMISTIC,
REPEATABLE_READ)) {
- Integer total = (Integer) cache.get(TX_KEY);
-
- if (total == null)
- total = 0;
-
- int cntr = 0;
-
- for (Cache.Entry e : cache) {
- if (e.getKey() instanceof Integer)
- cntr++;
- }
-
- assertEquals(total, (Integer)cntr);
-
- cache.put(cntr + 1, cntr + 1);
-
- cache.put(TX_KEY, cntr + 1);
-
- tx.commit();
- }
- }
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java
index 118c696..7c8cd6e 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java
@@ -51,7 +51,7 @@ public abstract class
IgniteTxConsistencyRestartAbstractSelfTest extends GridCom
private static final int GRID_CNT = 4;
/** Key range. */
- private static final int RANGE = 100_000;
+ private static final int RANGE = 10_000;
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
@@ -135,7 +135,7 @@ public abstract class
IgniteTxConsistencyRestartAbstractSelfTest extends GridCom
Random rnd = new Random();
// Make some iterations with 1-3 keys transactions.
- for (int i = 0; i < 50_000; i++) {
+ for (int i = 0; i < RANGE; i++) {
int idx = i % GRID_CNT;
if (i > 0 && i % 1000 == 0)
@@ -186,14 +186,14 @@ public abstract class
IgniteTxConsistencyRestartAbstractSelfTest extends GridCom
if
(grid.affinity(DEFAULT_CACHE_NAME).isPrimaryOrBackup(grid.localNode(), k)) {
if (val == null) {
- val = cache.localPeek(k, CachePeekMode.ONHEAP);
+ val = cache.localPeek(k, CachePeekMode.ALL);
assertNotNull("Failed to peek value for key: " + k,
val);
}
else
assertEquals("Failed to find value in cache [primary="
+
grid.affinity(DEFAULT_CACHE_NAME).isPrimary(grid.localNode(), k) + ']',
- val, cache.localPeek(k, CachePeekMode.ONHEAP));
+ val, cache.localPeek(k, CachePeekMode.ALL));
}
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
index 6f7d2da..f211587 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
@@ -33,6 +33,7 @@ import
org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.store.CacheStore;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
@@ -62,6 +63,9 @@ public class GridCacheColocatedDebugTest extends
GridCommonAbstractTest {
/** Test thread count. */
private static final int THREAD_CNT = 10;
+ /** Number of iterations (adjust for prolonged debugging). */
+ public static final int MAX_ITER_CNT = 10_000;
+
/** Store enable flag. */
private boolean storeEnabled;
@@ -241,7 +245,7 @@ public class GridCacheColocatedDebugTest extends
GridCommonAbstractTest {
*/
@Test
public void testPutsMultithreadedColocated() throws Exception {
- checkPutsMultithreaded(true, false, 100000);
+ checkPutsMultithreaded(true, false, MAX_ITER_CNT);
}
/**
@@ -249,7 +253,7 @@ public class GridCacheColocatedDebugTest extends
GridCommonAbstractTest {
*/
@Test
public void testPutsMultithreadedRemote() throws Exception {
- checkPutsMultithreaded(false, true, 100000);
+ checkPutsMultithreaded(false, true, MAX_ITER_CNT);
}
/**
@@ -257,7 +261,7 @@ public class GridCacheColocatedDebugTest extends
GridCommonAbstractTest {
*/
@Test
public void testPutsMultithreadedMixed() throws Exception {
- checkPutsMultithreaded(true, true, 100000);
+ checkPutsMultithreaded(true, true, MAX_ITER_CNT);
}
/**
@@ -791,9 +795,9 @@ public class GridCacheColocatedDebugTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
private void checkStore(Ignite ignite, Map<Integer, String> map) throws
Exception {
- String cacheName =
ignite.configuration().getCacheConfiguration()[0].getName();
+ String cacheName =
ignite.configuration().getCacheConfiguration()[1].getName();
- GridCacheContext ctx =
((IgniteKernal)grid()).context().cache().internalCache(cacheName).context();
+ GridCacheContext ctx =
((IgniteKernal)ignite).context().cache().internalCache(cacheName).context();
CacheStore store = ctx.store().configuredStore();
@@ -807,9 +811,11 @@ public class GridCacheColocatedDebugTest extends
GridCommonAbstractTest {
*/
private void clearStores(int cnt) {
for (int i = 0; i < cnt; i++) {
- String cacheName =
grid(i).configuration().getCacheConfiguration()[0].getName();
+ IgniteEx grid = grid(i);
+
+ String cacheName =
grid.configuration().getCacheConfiguration()[1].getName();
- GridCacheContext ctx =
((IgniteKernal)grid()).context().cache().internalCache(cacheName).context();
+ GridCacheContext ctx =
grid.context().cache().internalCache(cacheName).context();
CacheStore store = ctx.store().configuredStore();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySetSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySetSelfTest.java
deleted file mode 100644
index 711625d..0000000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySetSelfTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.dht;
-
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.configuration.CacheConfiguration;
-import
org.apache.ignite.internal.processors.cache.distributed.GridCacheEntrySetAbstractSelfTest;
-
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-
-/**
- *
- */
-public class GridCacheDhtEntrySetSelfTest extends
GridCacheEntrySetAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return PARTITIONED;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String
igniteInstanceName) throws Exception {
- CacheConfiguration cfg = super.cacheConfiguration(igniteInstanceName);
-
- cfg.setNearConfiguration(null);
-
- cfg.setBackups(gridCount());
-
- return cfg;
- }
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
index bf038ea..d515c49 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
@@ -35,7 +35,6 @@ import org.apache.ignite.internal.IgniteKernal;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.P1;
-import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
@@ -43,7 +42,6 @@ import org.junit.Test;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
-import static org.apache.ignite.events.EventType.EVT_CACHE_ENTRY_EVICTED;
/**
* Tests for dht cache eviction.
@@ -229,14 +227,15 @@ public class GridCacheDhtEvictionNearReadersSelfTest
extends GridCommonAbstractT
assert nearOther.peekEx(key) == null;
assert dhtOther.peekEx(key) == null;
- IgniteFuture<Event> futOther =
- waitForLocalEvent(grid(other).events(), nodeEvent(other.id()),
EVT_CACHE_ENTRY_EVICTED);
+ // Entry which has readers will not be evicted.
+ //IgniteFuture<Event> futOther =
+ // waitForLocalEvent(grid(other).events(), nodeEvent(other.id()),
EVT_CACHE_ENTRY_EVICTED);
- IgniteFuture<Event> futBackup =
- waitForLocalEvent(grid(backup).events(), nodeEvent(backup.id()),
EVT_CACHE_ENTRY_EVICTED);
+ //IgniteFuture<Event> futBackup =
+ // waitForLocalEvent(grid(backup).events(), nodeEvent(backup.id()),
EVT_CACHE_ENTRY_EVICTED);
- IgniteFuture<Event> futPrimary =
- waitForLocalEvent(grid(primary).events(), nodeEvent(primary.id()),
EVT_CACHE_ENTRY_EVICTED);
+ //IgniteFuture<Event> futPrimary =
+ // waitForLocalEvent(grid(primary).events(),
nodeEvent(primary.id()), EVT_CACHE_ENTRY_EVICTED);
// Get value on other node, it should be loaded to near cache.
assertEquals(val, nearOther.get(key, true, false));
@@ -255,17 +254,17 @@ public class GridCacheDhtEvictionNearReadersSelfTest
extends GridCommonAbstractT
// It will trigger dht eviction and eviction on backup node.
grid(primary).cache(DEFAULT_CACHE_NAME).localEvict(Collections.<Object>singleton(key));
- futOther.get(3000);
- futBackup.get(3000);
- futPrimary.get(3000);
+ //futOther.get(3000);
+ //futBackup.get(3000);
+ //futPrimary.get(3000);
- assertNull(localPeek(dhtPrimary, key));
- assertNull(localPeek(nearPrimary, key));
+ assertNotNull(localPeek(dhtPrimary, key));
+ assertNotNull(localPeek(nearPrimary, key));
- assertNull(localPeek(dhtBackup, key));
- assertNull(localPeek(nearBackup, key));
+ assertNotNull(localPeek(dhtBackup, key));
+ assertNotNull(localPeek(nearBackup, key));
assertNull(localPeek(dhtOther, key));
- assertNull(localPeek(nearOther, key));
+ assertNotNull(localPeek(nearOther, key));
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java
index 3b14eca..77e2071 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMultiBackupTest.java
@@ -45,7 +45,7 @@ public class GridCacheDhtMultiBackupTest extends
GridCommonAbstractTest {
@Test
public void testPut() throws Exception {
try {
- Ignite g = G.start("examples/config/example-cache.xml");
+ Ignite g =
G.start("modules/core/src/test/config/example-cache.xml");
if (g.cluster().nodes().size() < 5)
U.warn(log, "Topology is too small for this test. " +
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
index dcbbc6b..2ade329 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java
@@ -57,6 +57,7 @@ public class GridCacheDhtPreloadMessageCountTest extends
GridCommonAbstractTest
cc.setRebalanceMode(preloadMode);
cc.setAffinity(new RendezvousAffinityFunction(false, 521));
cc.setBackups(1);
+ cc.setOnheapCacheEnabled(true);
c.setCacheConfiguration(cc);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
index 1f6ef62..abbfb9e 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
@@ -22,8 +22,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheMetrics;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest;
-import org.junit.Ignore;
+import
org.apache.ignite.internal.processors.cache.GridCacheTransactionalAbstractMetricsSelfTest;
import org.junit.Test;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -33,7 +32,7 @@ import static
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
/**
* Metrics test for partitioned cache with disabled near cache.
*/
-public class GridCachePartitionedNearDisabledMetricsSelfTest extends
GridCacheAbstractSelfTest {
+public class GridCachePartitionedNearDisabledMetricsSelfTest extends
GridCacheTransactionalAbstractMetricsSelfTest {
/** */
private static final int GRID_CNT = 2;
@@ -64,22 +63,56 @@ public class
GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAb
return GRID_CNT;
}
- // TODO: extend from GridCacheTransactionalAbstractMetricsSelfTest and
uncomment:
+ /** {@inheritDoc} */
+ @Override protected int expectedReadsPerPut(boolean isPrimary) {
+ return 1;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected int expectedMissesPerPut(boolean isPrimary) {
+ return 1;
+ }
-// /** {@inheritDoc} */
-// @Override protected int expectedReadsPerPut(boolean isPrimary) {
-// return 1;
-// }
-//
-// /** {@inheritDoc} */
-// @Override protected int expectedMissesPerPut(boolean isPrimary) {
-// return 1;
-// }
+ /** {@inheritDoc} */
+ @Test
+ @Override public void testMisses() throws Exception {
+ IgniteCache<Integer, Integer> cache =
grid(0).cache(DEFAULT_CACHE_NAME);
+
+ int keyCnt = keyCount();
+
+ int expReads = 0;
+
+ // Get a few keys missed keys.
+ for (int i = 0; i < keyCnt; i++) {
+ assertNull("Value is not null for key: " + i, cache.get(i));
+
+ expReads++;
+ }
+
+ // Check metrics for the whole cache.
+ long puts = 0;
+ long reads = 0;
+ long hits = 0;
+ long misses = 0;
+
+ for (int i = 0; i < gridCount(); i++) {
+ CacheMetrics m = grid(i).cache(DEFAULT_CACHE_NAME).localMetrics();
+
+ puts += m.getCachePuts();
+ reads += m.getCacheGets();
+ hits += m.getCacheHits();
+ misses += m.getCacheMisses();
+ }
+
+ assertEquals(0, puts);
+ assertEquals(expReads, reads);
+ assertEquals(0, hits);
+ assertEquals(expReads, misses);
+ }
/**
* @throws Exception If failed.
*/
- @Ignore("https://issues.apache.org/jira/browse/IGNITE-819";)
@Test
public void testGettingRemovedKey() throws Exception {
IgniteCache<Integer, Integer> cache =
grid(0).cache(DEFAULT_CACHE_NAME);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java
deleted file mode 100644
index 39c60b0..0000000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.near;
-
-import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest;
-
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-
-/**
- * Test for asynchronous cache entry lock with timeout.
- */
-public class GridCachePartitionedEntryLockSelfTest extends
GridCacheAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected int gridCount() {
- return 3;
- }
-
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return PARTITIONED;
- }
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
index 9cbc533..f132d06 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
+import java.util.Arrays;
import javax.cache.expiry.Duration;
import javax.cache.expiry.TouchedExpiryPolicy;
import org.apache.ignite.IgniteCache;
@@ -30,6 +31,7 @@ import
org.apache.ignite.internal.processors.cache.GridCacheAbstractSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.testframework.junits.WithSystemProperty;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
@@ -47,11 +49,9 @@ import static
org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
/**
* Tests for partitioned cache automatic eviction.
*/
+@WithSystemProperty(key="IGNITE_UNWIND_THROTTLING_TIMEOUT", value="5")
public class GridCachePartitionedEvictionSelfTest extends
GridCacheAbstractSelfTest {
/** */
- private static final boolean TEST_INFO = true;
-
- /** */
private static final int GRID_CNT = 2;
/** */
@@ -179,9 +179,11 @@ public class GridCachePartitionedEvictionSelfTest extends
GridCacheAbstractSelfT
Affinity<String> aff = dht0.affinity();
- TouchedExpiryPolicy plc = new TouchedExpiryPolicy(new
Duration(MILLISECONDS, 10));
+ TouchedExpiryPolicy plc = new TouchedExpiryPolicy(new
Duration(MILLISECONDS, 37));
for (int kv = 0; kv < KEY_CNT; kv++) {
+ Thread.sleep(40);
+
String key = String.valueOf(kv);
ClusterNode node = aff.mapKeyToNode(key);
@@ -193,7 +195,7 @@ public class GridCachePartitionedEvictionSelfTest extends
GridCacheAbstractSelfT
try (Transaction tx = txs.txStart(concurrency, isolation)) {
assert c.get(key) == null;
- c.withExpiryPolicy(plc).put(key, 1);
+ c.withExpiryPolicy(plc).put(key, kv);
assertEquals(Integer.valueOf(kv), c.get(key));
@@ -201,22 +203,36 @@ public class GridCachePartitionedEvictionSelfTest extends
GridCacheAbstractSelfT
}
}
- if (TEST_INFO) {
+ boolean[] seen = {false, false, false, false};
+
+ long started = System.currentTimeMillis();
+
+ for (int i = 0; i < 1000; i++) {
+ long dht0Keys = 0, dht1Keys = 0;
+
+ seen[2] |= dht0.size() == EVICT_CACHE_SIZE;
+ seen[3] |= dht1.size() == EVICT_CACHE_SIZE;
+
info("Printing keys in dht0...");
for (String key : dht0.keySet())
info("[key=" + key + ", primary=" +
- F.eqNodes(grid(0).localNode(), aff.mapKeyToNode(key)) +
']');
+ F.eqNodes(grid(0).localNode(), aff.mapKeyToNode(key)) + ",
" + dht0Keys++ + ']');
info("Printing keys in dht1...");
for (String key : dht1.keySet())
info("[key=" + key + ", primary=" +
- F.eqNodes(grid(1).localNode(), aff.mapKeyToNode(key)) +
']');
+ F.eqNodes(grid(1).localNode(), aff.mapKeyToNode(key)) + ",
" + dht1Keys++ + ']');
+
+ seen[0] |= dht0Keys == EVICT_CACHE_SIZE;
+ seen[1] |= dht1Keys == EVICT_CACHE_SIZE;
+
+ if (seen[0] && seen[1] && seen[2] && seen[3] ||
System.currentTimeMillis() - started > 100)
+ break;
}
- assertEquals(EVICT_CACHE_SIZE, dht0.size());
- assertEquals(EVICT_CACHE_SIZE, dht1.size());
+ assertTrue(Arrays.toString(seen), seen[0] && seen[1] && seen[2] &&
seen[3]);
assertEquals(0, near(jcache(0)).nearSize());
assertEquals(0, near(jcache(1)).nearSize());
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java
index cea95e6..854753a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java
@@ -17,10 +17,11 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
+import java.util.Collections;
+import org.apache.ignite.cache.QueryEntity;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import
org.apache.ignite.internal.processors.cache.IgniteTxMultiNodeAbstractTest;
-import org.junit.Test;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -39,51 +40,11 @@ public class GridCachePartitionedTxMultiNodeSelfTest
extends IgniteTxMultiNodeAb
ccfg.setCacheMode(PARTITIONED);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setBackups(backups);
+ ccfg.setQueryEntities(Collections.singleton(new QueryEntity()
+
.setKeyType(String.class.getCanonicalName()).setValueType(Integer.class.getCanonicalName())));
cfg.setCacheConfiguration(ccfg);
return cfg;
}
-
- /** {@inheritDoc} */
- @Test
- @Override public void testPutOneEntryInTx() throws Exception {
- super.testPutOneEntryInTx();
- }
-
- /** {@inheritDoc} */
- @Test
- @Override public void testPutOneEntryInTxMultiThreaded() throws Exception {
- super.testPutOneEntryInTxMultiThreaded();
- }
-
- /** {@inheritDoc} */
- @Test
- @Override public void testPutTwoEntriesInTx() throws Exception {
- super.testPutTwoEntriesInTx();
- }
-
- /** {@inheritDoc} */
- @Test
- @Override public void testPutTwoEntryInTxMultiThreaded() throws Exception {
- super.testPutTwoEntryInTxMultiThreaded();
- }
-
- /** {@inheritDoc} */
- @Test
- @Override public void testRemoveInTxQueried() throws Exception {
- super.testRemoveInTxQueried();
- }
-
- /** {@inheritDoc} */
- @Test
- @Override public void testRemoveInTxQueriedMultiThreaded() throws
Exception {
- super.testRemoveInTxQueriedMultiThreaded();
- }
-
- /** {@inheritDoc} */
- @Test
- @Override public void testRemoveInTxSimple() throws Exception {
- super.testRemoveInTxSimple();
- }
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java
index ccb9206..87cbe93 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java
@@ -148,7 +148,7 @@ public class NearCacheMultithreadedUpdateTest extends
GridCommonAbstractTest {
}
try {
- long stopTime = System.currentTimeMillis() + 30_000;
+ long stopTime = System.currentTimeMillis() + 10_000;
int iter = 0;
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCachePutAllMultinodeTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCachePutAllMultinodeTest.java
index 20fdd6b..03d4c87 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCachePutAllMultinodeTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCachePutAllMultinodeTest.java
@@ -32,6 +32,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Ignore;
import org.junit.Test;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -53,6 +54,11 @@ public class NearCachePutAllMultinodeTest extends
GridCommonAbstractTest {
private boolean client;
/** {@inheritDoc} */
+ @Override protected long getTestTimeout() {
+ return 30_000;
+ }
+
+ /** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override protected final IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
@@ -101,6 +107,7 @@ public class NearCachePutAllMultinodeTest extends
GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Ignore("https://issues.apache.org/jira/browse/IGNITE-11877";)
@Test
public void testMultithreadedPutAll() throws Exception {
final AtomicInteger idx = new AtomicInteger();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEntrySetSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEntrySetSelfTest.java
deleted file mode 100644
index 9f31d35..0000000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEntrySetSelfTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.CacheMode;
-import
org.apache.ignite.internal.processors.cache.distributed.GridCacheEntrySetAbstractSelfTest;
-
-import static org.apache.ignite.cache.CacheMode.REPLICATED;
-
-/**
- *
- */
-public class GridCacheReplicatedEntrySetSelfTest extends
GridCacheEntrySetAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected CacheMode cacheMode() {
- return REPLICATED;
- }
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java
index cfc35a3..e442130 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java
@@ -17,10 +17,11 @@
package org.apache.ignite.internal.processors.cache.distributed.replicated;
+import java.util.Collections;
+import org.apache.ignite.cache.QueryEntity;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import
org.apache.ignite.internal.processors.cache.IgniteTxMultiNodeAbstractTest;
-import org.junit.Test;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -38,51 +39,11 @@ public class GridCacheReplicatedTxMultiNodeBasicTest
extends IgniteTxMultiNodeAb
ccfg.setCacheMode(REPLICATED);
ccfg.setWriteSynchronizationMode(FULL_SYNC);
+ ccfg.setQueryEntities(Collections.singleton(new QueryEntity()
+
.setKeyType(String.class.getCanonicalName()).setValueType(Integer.class.getCanonicalName())));
cfg.setCacheConfiguration(ccfg);
return cfg;
}
-
- /** {@inheritDoc} */
- @Test
- @Override public void testPutOneEntryInTx() throws Exception {
- super.testPutOneEntryInTx();
- }
-
- /** {@inheritDoc} */
- @Test
- @Override public void testPutTwoEntriesInTx() throws Exception {
- super.testPutTwoEntriesInTx();
- }
-
- /** {@inheritDoc} */
- @Test
- @Override public void testPutOneEntryInTxMultiThreaded() throws Exception {
- super.testPutOneEntryInTxMultiThreaded();
- }
-
- /** {@inheritDoc} */
- @Test
- @Override public void testPutTwoEntryInTxMultiThreaded() throws Exception {
- super.testPutTwoEntryInTxMultiThreaded();
- }
-
- /** {@inheritDoc} */
- @Test
- @Override public void testRemoveInTxQueried() throws Exception {
- super.testRemoveInTxQueried();
- }
-
- /** {@inheritDoc} */
- @Test
- @Override public void testRemoveInTxSimple() throws Exception {
- super.testRemoveInTxSimple();
- }
-
- /** {@inheritDoc} */
- @Test
- @Override public void testRemoveInTxQueriedMultiThreaded() throws
Exception {
- super.testRemoveInTxQueriedMultiThreaded();
- }
}
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
index 4f4bd81..cf0b664 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite2.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite2.java
@@ -25,7 +25,6 @@ import
org.apache.ignite.cache.affinity.rendezvous.ClusterNodeAttributeAffinityB
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;
@@ -57,14 +56,22 @@ import
org.apache.ignite.internal.processors.cache.distributed.GridCacheTransfor
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.GridCacheColocatedDebugTest;
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.GridCacheDhtEvictionNearReadersSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadMessageCountTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadOnheapSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledMetricsSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedSupplyEventsSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedUnloadEventsSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheContainsKeyColocatedSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePartitionedBackupNodeFailureRecoveryTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCrossCacheTxNearEnabledSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCacheContainsKeyColocatedAtomicSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCacheContainsKeyNearAtomicSelfTest;
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;
@@ -74,19 +81,27 @@ import
org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNea
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.GridCachePartitionedEvictionSelfTest;
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.GridCachePartitionedNestedTxTest;
+import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxConcurrentGetTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxMultiThreadedSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxReadTest;
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.IgniteCacheContainsKeyNearSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.near.NearCacheMultithreadedUpdateTest;
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.local.GridCacheLocalBasicStoreMultithreadedSelfTest;
+import
org.apache.ignite.internal.processors.cache.local.GridCacheLocalTxReadTest;
import
org.apache.ignite.internal.processors.cache.persistence.MemoryPolicyInitializationTest;
import
org.apache.ignite.internal.processors.continuous.IgniteContinuousQueryMetadataUpdateTest;
import
org.apache.ignite.internal.processors.continuous.IgniteNoCustomEventsOnNodeStart;
@@ -144,7 +159,6 @@ public class IgniteCacheMvccTestSuite2 {
ignoredTests.add(IgniteCachePartitionedBackupNodeFailureRecoveryTest.class);
// Other non-tx tests.
- ignoredTests.add(RendezvousAffinityFunctionSelfTest.class);
ignoredTests.add(RendezvousAffinityFunctionExcludeNeighborsSelfTest.class);
ignoredTests.add(RendezvousAffinityFunctionFastPowerOfTwoHashSelfTest.class);
ignoredTests.add(RendezvousAffinityFunctionStandardHashSelfTest.class);
@@ -189,6 +203,23 @@ public class IgniteCacheMvccTestSuite2 {
ignoredTests.add(GridCachePartitionedNearDisabledTxMultiThreadedSelfTest.class);
// See GridCachePartitionedNearDisabledMvccTxMultiThreadedSelfTest
ignoredTests.add(GridCachePartitionedTxTimeoutSelfTest.class); // See
GridCachePartitionedMvccTxTimeoutSelfTest
+ ignoredTests.add(GridCacheColocatedDebugTest.class);
+ ignoredTests.add(GridCacheDhtEvictionNearReadersSelfTest.class);
+ ignoredTests.add(GridCacheDhtPreloadMessageCountTest.class);
+ ignoredTests.add(GridCacheLocalBasicStoreMultithreadedSelfTest.class);
+ ignoredTests.add(GridCacheLocalTxReadTest.class);
+ ignoredTests.add(NearCacheMultithreadedUpdateTest.class);
+ ignoredTests.add(GridCachePartitionedEvictionSelfTest.class);
+
ignoredTests.add(GridCachePartitionedNearDisabledMetricsSelfTest.class);
+ ignoredTests.add(GridCachePartitionedNestedTxTest.class);
+ ignoredTests.add(GridCachePartitionedTxConcurrentGetTest.class);
+ ignoredTests.add(GridCachePartitionedTxReadTest.class);
+ ignoredTests.add(IgniteCrossCacheTxNearEnabledSelfTest.class);
+ ignoredTests.add(IgniteCacheContainsKeyColocatedSelfTest.class);
+ ignoredTests.add(IgniteCacheContainsKeyNearSelfTest.class);
+ ignoredTests.add(IgniteCacheContainsKeyColocatedAtomicSelfTest.class);
+ ignoredTests.add(IgniteCacheContainsKeyNearAtomicSelfTest.class);
+
List<Class<?>> suite = new
ArrayList<>(IgniteCacheTestSuite2.suite(ignoredTests));
// Add Mvcc clones.
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 5d67634..799ff80 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
@@ -69,16 +69,20 @@ import
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClient
import
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheServerNodeConcurrentStart;
import
org.apache.ignite.internal.processors.cache.distributed.dht.CacheGetReadFromBackupFailoverTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.CachePartitionPartialCountersMapSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedDebugTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedOptimisticTransactionSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedPreloadRestartSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheColocatedPrimarySyncSelfTest;
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.GridCacheDhtEntrySelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtEvictionNearReadersSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtEvictionsDisabledSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtMappingSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadBigDataSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadDelayedSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadDisabledSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadMessageCountTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadMultiThreadedSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadOnheapSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadPutGetSelfTest;
@@ -86,11 +90,17 @@ import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtP
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadStartStopSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtPreloadUnloadSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledLockSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedNearDisabledMetricsSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedSupplyEventsSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedTopologyChangeSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCachePartitionedUnloadEventsSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheClearDuringRebalanceTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheContainsKeyColocatedSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePartitionedBackupNodeFailureRecoveryTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCrossCacheTxNearEnabledSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.IgniteTxConsistencyColocatedRestartSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCacheContainsKeyColocatedAtomicSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCacheContainsKeyNearAtomicSelfTest;
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;
@@ -113,6 +123,7 @@ import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar
import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedBasicStoreMultiNodeSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedBasicStoreSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedEventSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedEvictionSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedExplicitLockNodeFailureSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedGetAndTransformStoreSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedLoadCacheSelfTest;
@@ -121,20 +132,28 @@ import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePar
import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMultiNodeSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedMultiThreadedPutGetSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedNestedTxTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedNodeFailureSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedPreloadLifecycleSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxConcurrentGetTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxMultiThreadedSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxReadTest;
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.GridNearCacheStoreUpdateTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridPartitionedBackupLoadSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheContainsKeyNearSelfTest;
+import
org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheNearTxRollbackTest;
+import
org.apache.ignite.internal.processors.cache.distributed.near.NearCacheMultithreadedUpdateTest;
+import
org.apache.ignite.internal.processors.cache.distributed.near.NearCachePutAllMultinodeTest;
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.local.GridCacheLocalBasicApiSelfTest;
+import
org.apache.ignite.internal.processors.cache.local.GridCacheLocalBasicStoreMultithreadedSelfTest;
import
org.apache.ignite.internal.processors.cache.local.GridCacheLocalBasicStoreSelfTest;
import
org.apache.ignite.internal.processors.cache.local.GridCacheLocalEventSelfTest;
import
org.apache.ignite.internal.processors.cache.local.GridCacheLocalEvictionEventSelfTest;
@@ -144,6 +163,7 @@ import
org.apache.ignite.internal.processors.cache.local.GridCacheLocalLoadAllSe
import
org.apache.ignite.internal.processors.cache.local.GridCacheLocalLockSelfTest;
import
org.apache.ignite.internal.processors.cache.local.GridCacheLocalMultithreadedSelfTest;
import
org.apache.ignite.internal.processors.cache.local.GridCacheLocalTxMultiThreadedSelfTest;
+import
org.apache.ignite.internal.processors.cache.local.GridCacheLocalTxReadTest;
import
org.apache.ignite.internal.processors.cache.local.GridCacheLocalTxSingleThreadedSelfTest;
import
org.apache.ignite.internal.processors.cache.local.GridCacheLocalTxTimeoutSelfTest;
import
org.apache.ignite.internal.processors.cache.persistence.MemoryPolicyInitializationTest;
@@ -175,7 +195,7 @@ public class IgniteCacheTestSuite2 {
// Local cache.
GridTestUtils.addTestIfNeeded(suite,
GridCacheLocalBasicApiSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
GridCacheLocalBasicStoreSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
GridCacheLocalBasicStoreMultithreadedSelfTest.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);
@@ -183,7 +203,7 @@ public class IgniteCacheTestSuite2 {
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, GridCacheLocalTxReadTest.class,
ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
GridCacheLocalTxTimeoutSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
GridCacheLocalEventSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
GridCacheLocalEvictionEventSelfTest.class, ignoredTests);
@@ -219,11 +239,9 @@ public class IgniteCacheTestSuite2 {
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,
GridCachePartitionedNestedTxTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
GridCachePartitionedTxConcurrentGetTest.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);
@@ -259,7 +277,7 @@ public class IgniteCacheTestSuite2 {
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,
GridCachePartitionedEvictionSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
GridCachePartitionedTopologyChangeSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
GridCachePartitionedUnloadEventsSelfTest.class, ignoredTests);
@@ -295,14 +313,18 @@ public class IgniteCacheTestSuite2 {
GridTestUtils.addTestIfNeeded(suite,
CacheExchangeMessageDuplicatedStateTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteContinuousQueryMetadataUpdateTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
NearCacheMultithreadedUpdateTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
NearCachePutAllMultinodeTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
NearCacheMultithreadedUpdateTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
NearCachePutAllMultinodeTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteOnePhaseCommitInvokeTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteCacheNoSyncForGetTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
IgniteCacheContainsKeyNearSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
IgniteCacheNearTxRollbackTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteCacheNearTxRollbackTest.class, ignoredTests);
+
+ GridTestUtils.addTestIfNeeded(suite,
IgniteCacheContainsKeyNearSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteCacheContainsKeyColocatedSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteCacheContainsKeyNearAtomicSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteCacheContainsKeyColocatedAtomicSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteOnePhaseCommitNearReadersTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteNearClientCacheCloseTest.class, ignoredTests);
@@ -315,16 +337,13 @@ public class IgniteCacheTestSuite2 {
GridTestUtils.addTestIfNeeded(suite,
IgniteCacheClearDuringRebalanceTest.class, ignoredTests);
- //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);
+ GridTestUtils.addTestIfNeeded(suite,
GridCacheColocatedDebugTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
GridCacheDhtAtomicEvictionNearReadersSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
GridCacheDhtEvictionNearReadersSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
GridCacheDhtPreloadMessageCountTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
GridCachePartitionedNearDisabledMetricsSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteCrossCacheTxNearEnabledSelfTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite,
IgniteTxConsistencyColocatedRestartSelfTest.class, ignoredTests);
// Configuration validation
GridTestUtils.addTestIfNeeded(suite, CacheConfigurationLeakTest.class,
ignoredTests);
@@ -340,7 +359,6 @@ public class IgniteCacheTestSuite2 {
GridTestUtils.addTestIfNeeded(suite,
GridCacheNearJobExecutionSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
GridCacheReplicatedJobExecutionTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
RendezvousAffinityFunctionSelfTest.class), ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
RendezvousAffinityFunctionExcludeNeighborsSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
RendezvousAffinityFunctionFastPowerOfTwoHashSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
RendezvousAffinityFunctionStandardHashSelfTest.class, ignoredTests);
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 9a238d7..ebe0b5a 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
@@ -132,12 +132,10 @@ public class IgniteCacheTestSuite3 {
GridTestUtils.addTestIfNeeded(suite,
CacheLockChangingTopologyTest.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);
GridTestUtils.addTestIfNeeded(suite,
CacheStartupInDeploymentModesTest.class, ignoredTests);
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
index 56d0b84..7190fd6 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
@@ -121,8 +121,6 @@ public class IgniteCacheTestSuite5 {
GridTestUtils.addTestIfNeeded(suite,
IgniteCacheReadThroughEvictionsVariationsSuite.class, ignoredTests);
//GridTestUtils.addTestIfNeeded(suite,
GridCacheAtomicPreloadSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
IgniteCacheContainsKeyColocatedAtomicSelfTest.class, ignoredTests);
- //GridTestUtils.addTestIfNeeded(suite,
IgniteCacheContainsKeyNearAtomicSelfTest.class, ignoredTests);
return suite;
}
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
index ce7b13d..7f93694 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite2.java
@@ -26,6 +26,7 @@ import
org.apache.ignite.internal.processors.cache.IgniteCacheQueryEvictsMultiTh
import
org.apache.ignite.internal.processors.cache.IgniteCacheQueryMultiThreadedSelfTest;
import
org.apache.ignite.internal.processors.cache.IgniteCacheSqlQueryMultiThreadedSelfTest;
import
org.apache.ignite.internal.processors.cache.QueryJoinWithDifferentNodeFiltersTest;
+import
org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedTxMultiNodeSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheClientQueryReplicatedNodeRestartSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryNodeFailTest;
@@ -35,6 +36,7 @@ import
org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQ
import
org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryNodeRestartTxSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheQueryStopOnCancelOrTimeoutDistributedJoinSelfTest;
import
org.apache.ignite.internal.processors.cache.distributed.near.IgniteSqlQueryWithBaselineTest;
+import
org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedTxMultiNodeBasicTest;
import
org.apache.ignite.internal.processors.cache.index.DynamicColumnsConcurrentAtomicPartitionedSelfTest;
import
org.apache.ignite.internal.processors.cache.index.DynamicColumnsConcurrentAtomicReplicatedSelfTest;
import
org.apache.ignite.internal.processors.cache.index.DynamicColumnsConcurrentTransactionalPartitionedSelfTest;
@@ -143,7 +145,10 @@ import org.junit.runners.Suite;
LocalQueryLazyTest.class,
LongRunningQueryTest.class,
- DmlBatchSizeDeadlockTest.class
+ DmlBatchSizeDeadlockTest.class,
+
+ GridCachePartitionedTxMultiNodeSelfTest.class,
+ GridCacheReplicatedTxMultiNodeBasicTest.class
})
public class IgniteBinaryCacheQueryTestSuite2 {
}
diff --git
a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
index f80073f..aed5389 100644
---
a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
+++
b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
@@ -24,6 +24,7 @@ import
org.apache.ignite.cache.spring.SpringCacheManagerContextInjectionTest;
import org.apache.ignite.cache.spring.SpringCacheTest;
import org.apache.ignite.encryption.SpringEncryptedCacheRestartClientTest;
import org.apache.ignite.encryption.SpringEncryptedCacheRestartTest;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtMultiBackupTest;
import
org.apache.ignite.spring.injection.IgniteSpringBeanSpringResourceInjectionTest;
import org.apache.ignite.internal.IgniteSpringBeanTest;
import org.apache.ignite.cache.store.jdbc.CacheJdbcBlobStoreFactorySelfTest;
@@ -95,6 +96,8 @@ import org.junit.runners.Suite;
GridSpringCacheManagerMultiJvmSelfTest.class,
GridCommandLineLoaderTest.class,
+
+ GridCacheDhtMultiBackupTest.class
})
public class IgniteSpringTestSuite {
}
