You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2018/12/11 08:29:13 UTC
[26/51] [partial] ignite git commit: IGNITE-10175 migrate core
modules tests from Junit 3 to 4 - Fixes #5562.
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
index 1d63587..d29b4ea 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
@@ -32,6 +32,9 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
@@ -42,6 +45,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
/**
* Tests that system transactions do not interact with user transactions.
*/
+@RunWith(JUnit4.class)
public class IgniteCacheSystemTransactionsSelfTest extends GridCommonAbstractTest {
/** */
private static final int NODES_CNT = 4;
@@ -80,6 +84,7 @@ public class IgniteCacheSystemTransactionsSelfTest extends GridCommonAbstractTes
/**
* @throws Exception If failed.
*/
+ @Test
public void testSystemTxInsideUserTx() throws Exception {
if (MvccFeatureChecker.forcedMvcc())
fail("https://issues.apache.org/jira/browse/IGNITE-10473");
@@ -120,6 +125,7 @@ public class IgniteCacheSystemTransactionsSelfTest extends GridCommonAbstractTes
/**
* @throws Exception If failed.
*/
+ @Test
public void testGridNearTxLocalDuplicateAsyncCommit() throws Exception {
IgniteKernal ignite = (IgniteKernal)grid(0);
@@ -185,4 +191,4 @@ public class IgniteCacheSystemTransactionsSelfTest extends GridCommonAbstractTes
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheThreadLocalTxTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheThreadLocalTxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheThreadLocalTxTest.java
index cab6c72..5cfae11 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheThreadLocalTxTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheThreadLocalTxTest.java
@@ -34,12 +34,16 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
/**
*
*/
+@RunWith(JUnit4.class)
public class IgniteCacheThreadLocalTxTest extends GridCommonAbstractTest {
/** */
private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -68,6 +72,7 @@ public class IgniteCacheThreadLocalTxTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testSingleNode() throws Exception {
threadLocalTx(startGrid(0));
}
@@ -75,6 +80,7 @@ public class IgniteCacheThreadLocalTxTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testMultiNode() throws Exception {
startGridsMultiThreaded(4);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java
index e5bb583..8c58309 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheTxIteratorSelfTest.java
@@ -36,10 +36,14 @@ import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
import javax.cache.Cache;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
*
*/
+@RunWith(JUnit4.class)
public class IgniteCacheTxIteratorSelfTest extends GridCommonAbstractTest {
/** */
public static final String CACHE_NAME = "testCache";
@@ -86,6 +90,7 @@ public class IgniteCacheTxIteratorSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception if failed.
*/
+ @Test
public void testModesSingleNode() throws Exception {
checkModes(1);
}
@@ -93,6 +98,7 @@ public class IgniteCacheTxIteratorSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception if failed.
*/
+ @Test
public void testModesMultiNode() throws Exception {
checkModes(3);
}
@@ -236,4 +242,4 @@ public class IgniteCacheTxIteratorSelfTest extends GridCommonAbstractTest {
return S.toString(TestClass.class, this);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
index 60c0837..85d6b75 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
@@ -41,10 +41,14 @@ 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;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
*
*/
+@RunWith(JUnit4.class)
public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest {
/** */
private static Map<String, CacheStore> firstStores = new ConcurrentHashMap<>();
@@ -122,6 +126,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testSameStore() throws Exception {
IgniteEx grid = grid(0);
@@ -174,6 +179,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testDifferentStores() throws Exception {
IgniteEx grid = grid(0);
@@ -229,6 +235,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testNonPersistentCache() throws Exception {
IgniteEx grid = grid(0);
@@ -387,4 +394,4 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest {
return secondStores.computeIfAbsent(igniteInstanceName, (k) -> new TestStore());
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteMvccTxTimeoutAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteMvccTxTimeoutAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteMvccTxTimeoutAbstractTest.java
index 15d23f4..16f84c2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteMvccTxTimeoutAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteMvccTxTimeoutAbstractTest.java
@@ -31,6 +31,9 @@ import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
import org.apache.ignite.transactions.TransactionTimeoutException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
@@ -38,6 +41,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
/**
* Simple cache test.
*/
+@RunWith(JUnit4.class)
public class IgniteMvccTxTimeoutAbstractTest extends GridCommonAbstractTest {
/** Random number generator. */
private static final Random RAND = new Random();
@@ -95,6 +99,7 @@ public class IgniteMvccTxTimeoutAbstractTest extends GridCommonAbstractTest {
/**
* @throws IgniteCheckedException If test failed.
*/
+ @Test
public void testPessimisticRepeatableRead() throws Exception {
checkTransactionTimeout(PESSIMISTIC, REPEATABLE_READ);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java
index 73a7dc1..9530194 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java
@@ -44,6 +44,9 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionIsolation;
import org.apache.ignite.transactions.TransactionTimeoutException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -58,6 +61,7 @@ import static org.apache.ignite.transactions.TransactionState.SUSPENDED;
/**
*
*/
+@RunWith(JUnit4.class)
public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest {
/** Transaction timeout. */
private static final long TX_TIMEOUT = 200;
@@ -177,6 +181,7 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest
*
* @throws Exception If failed.
*/
+ @Test
public void testResumeTxInAnotherThread() throws Exception {
executeTestForAllCaches(new CI2Exc<Ignite, IgniteCache<Integer, Integer>>() {
@Override public void applyx(Ignite ignite, final IgniteCache<Integer, Integer> cache) throws Exception {
@@ -238,6 +243,7 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest
*
* @throws Exception If failed.
*/
+ @Test
public void testCrossCacheTxInAnotherThread() throws Exception {
executeTestForAllCaches(new CI2Exc<Ignite, IgniteCache<Integer, Integer>>() {
@Override public void applyx(Ignite ignite, final IgniteCache<Integer, Integer> cache) throws Exception {
@@ -298,6 +304,7 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest
*
* @throws Exception If failed.
*/
+ @Test
public void testTxRollback() throws Exception {
executeTestForAllCaches(new CI2Exc<Ignite, IgniteCache<Integer, Integer>>() {
@Override public void applyx(Ignite ignite, final IgniteCache<Integer, Integer> cache) throws Exception {
@@ -348,6 +355,7 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest
*
* @throws Exception If failed.
*/
+ @Test
public void testMultiTxSuspendResume() throws Exception {
executeTestForAllCaches(new CI2Exc<Ignite, IgniteCache<Integer, Integer>>() {
@Override public void applyx(Ignite ignite, final IgniteCache<Integer, Integer> cache) throws Exception {
@@ -392,6 +400,7 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest
*
* @throws Exception If failed.
*/
+ @Test
public void testOpsProhibitedOnSuspendedTxFromOtherThread() throws Exception {
executeTestForAllCaches(new CI2Exc<Ignite, IgniteCache<Integer, Integer>>() {
@Override public void applyx(Ignite ignite, final IgniteCache<Integer, Integer> cache) throws Exception {
@@ -424,6 +433,7 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest
*
* @throws Exception If failed.
*/
+ @Test
public void testOpsProhibitedOnSuspendedTx() throws Exception {
executeTestForAllCaches(new CI2Exc<Ignite, IgniteCache<Integer, Integer>>() {
@Override public void applyx(Ignite ignite, final IgniteCache<Integer, Integer> cache) throws Exception {
@@ -452,6 +462,7 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest
*
* @throws Exception If failed.
*/
+ @Test
public void testTxTimeoutOnResumed() throws Exception {
executeTestForAllCaches(new CI2Exc<Ignite, IgniteCache<Integer, Integer>>() {
@Override public void applyx(Ignite ignite, final IgniteCache<Integer, Integer> cache) throws Exception {
@@ -491,6 +502,7 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest
*
* @throws Exception If failed.
*/
+ @Test
public void testTxTimeoutOnSuspend() throws Exception {
executeTestForAllCaches(new CI2Exc<Ignite, IgniteCache<Integer, Integer>>() {
@Override public void applyx(Ignite ignite, final IgniteCache<Integer, Integer> cache) throws Exception {
@@ -531,6 +543,7 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest
*
* @throws Exception If failed.
*/
+ @Test
public void testSuspendTxAndStartNew() throws Exception {
executeTestForAllCaches(new CI2Exc<Ignite, IgniteCache<Integer, Integer>>() {
@Override public void applyx(Ignite ignite, final IgniteCache<Integer, Integer> cache) throws Exception {
@@ -571,6 +584,7 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest
*
* @throws Exception If failed.
*/
+ @Test
public void testSuspendTxAndStartNewWithoutCommit() throws Exception {
executeTestForAllCaches(new CI2Exc<Ignite, IgniteCache<Integer, Integer>>() {
@Override public void applyx(Ignite ignite, final IgniteCache<Integer, Integer> cache) throws Exception {
@@ -619,6 +633,7 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest
*
* @throws Exception If failed.
*/
+ @Test
public void testSuspendTxAndResumeAfterTopologyChange() throws Exception {
Ignite srv = ignite(ThreadLocalRandom.current().nextInt(SERVER_CNT));
Ignite client = ignite(SERVER_CNT);
@@ -713,6 +728,7 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest
*
* @throws Exception If failed.
*/
+ @Test
public void testResumeActiveTx() throws Exception {
executeTestForAllCaches(new CI2Exc<Ignite, IgniteCache<Integer, Integer>>() {
@Override public void applyx(Ignite ignite, final IgniteCache<Integer, Integer> cache) throws Exception {
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgnitePessimisticTxSuspendResumeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgnitePessimisticTxSuspendResumeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgnitePessimisticTxSuspendResumeTest.java
index dba769d..81ec3fe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgnitePessimisticTxSuspendResumeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgnitePessimisticTxSuspendResumeTest.java
@@ -29,12 +29,16 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
*
*/
+@RunWith(JUnit4.class)
public class IgnitePessimisticTxSuspendResumeTest extends GridCommonAbstractTest {
/**
* Creates new cache configuration.
@@ -64,6 +68,7 @@ public class IgnitePessimisticTxSuspendResumeTest extends GridCommonAbstractTest
*
* @throws Exception If failed.
*/
+ @Test
public void testSuspendPessimisticTx() throws Exception {
try (Ignite g = startGrid()) {
IgniteCache<Integer, String> cache = jcache();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteRejectConnectOnNodeStopTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteRejectConnectOnNodeStopTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteRejectConnectOnNodeStopTest.java
index 97d685f..a354ffa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteRejectConnectOnNodeStopTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteRejectConnectOnNodeStopTest.java
@@ -35,12 +35,16 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static java.util.concurrent.TimeUnit.MINUTES;
/**
* Sanity test to check that node starts to reject connections when stop procedure started.
*/
+@RunWith(JUnit4.class)
public class IgniteRejectConnectOnNodeStopTest extends GridCommonAbstractTest {
/** */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
@@ -89,6 +93,7 @@ public class IgniteRejectConnectOnNodeStopTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testNodeStop() throws Exception {
Ignite srv = startGrid(0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCachePrimarySyncTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCachePrimarySyncTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCachePrimarySyncTest.java
index ceed9b8..7d43bc3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCachePrimarySyncTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCachePrimarySyncTest.java
@@ -65,6 +65,9 @@ import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
import org.jetbrains.annotations.NotNull;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
@@ -74,6 +77,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC
/**
*
*/
+@RunWith(JUnit4.class)
public class IgniteTxCachePrimarySyncTest extends GridCommonAbstractTest {
/** */
private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -135,6 +139,7 @@ public class IgniteTxCachePrimarySyncTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testSingleKeyCommitFromPrimary() throws Exception {
if (MvccFeatureChecker.forcedMvcc())
fail("https://issues.apache.org/jira/browse/IGNITE-10518");
@@ -264,6 +269,7 @@ public class IgniteTxCachePrimarySyncTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testSingleKeyPrimaryNodeFail1() throws Exception {
singleKeyPrimaryNodeLeft(cacheConfiguration(DEFAULT_CACHE_NAME, PRIMARY_SYNC, 1, true, false));
@@ -273,6 +279,7 @@ public class IgniteTxCachePrimarySyncTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testSingleKeyPrimaryNodeFail2() throws Exception {
singleKeyPrimaryNodeLeft(cacheConfiguration(DEFAULT_CACHE_NAME, PRIMARY_SYNC, 2, true, false));
@@ -399,6 +406,7 @@ public class IgniteTxCachePrimarySyncTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testSingleKeyCommit() throws Exception {
if (MvccFeatureChecker.forcedMvcc())
fail("https://issues.apache.org/jira/browse/IGNITE-10518");
@@ -558,6 +566,7 @@ public class IgniteTxCachePrimarySyncTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testWaitPrimaryResponse() throws Exception {
checkWaitPrimaryResponse(cacheConfiguration(DEFAULT_CACHE_NAME, PRIMARY_SYNC, 1, true, false));
@@ -710,6 +719,7 @@ public class IgniteTxCachePrimarySyncTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testOnePhaseMessages() throws Exception {
if (MvccFeatureChecker.forcedMvcc())
return; // Not supported. Commit flow differs for Mvcc mode.
@@ -819,6 +829,7 @@ public class IgniteTxCachePrimarySyncTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testTxSyncMode() throws Exception {
Ignite ignite = ignite(0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java
index 09a93cd..813b80d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java
@@ -53,6 +53,9 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionOptimisticException;
import org.jetbrains.annotations.NotNull;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
@@ -66,6 +69,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
/**
*
*/
+@RunWith(JUnit4.class)
public class IgniteTxCacheWriteSynchronizationModesMultithreadedTest extends GridCommonAbstractTest {
/** */
private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -105,9 +109,6 @@ public class IgniteTxCacheWriteSynchronizationModesMultithreadedTest extends Gri
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- if (MvccFeatureChecker.forcedMvcc())
- fail("https://issues.apache.org/jira/browse/IGNITE-9470");
-
super.beforeTestsStarted();
startGridsMultiThreaded(SRVS);
@@ -121,6 +122,12 @@ public class IgniteTxCacheWriteSynchronizationModesMultithreadedTest extends Gri
}
/** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ if (MvccFeatureChecker.forcedMvcc())
+ fail("https://issues.apache.org/jira/browse/IGNITE-9470");
+ }
+
+ /** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
stopAllGrids();
@@ -130,6 +137,7 @@ public class IgniteTxCacheWriteSynchronizationModesMultithreadedTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testMultithreadedPrimarySyncRestart() throws Exception {
multithreadedTests(PRIMARY_SYNC, true);
}
@@ -137,6 +145,7 @@ public class IgniteTxCacheWriteSynchronizationModesMultithreadedTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testMultithreadedPrimarySync() throws Exception {
multithreadedTests(PRIMARY_SYNC, false);
}
@@ -144,6 +153,7 @@ public class IgniteTxCacheWriteSynchronizationModesMultithreadedTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testMultithreadedFullSync() throws Exception {
multithreadedTests(FULL_SYNC, false);
}
@@ -151,6 +161,7 @@ public class IgniteTxCacheWriteSynchronizationModesMultithreadedTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testMultithreadedFullSyncRestart() throws Exception {
multithreadedTests(FULL_SYNC, true);
}
@@ -158,6 +169,7 @@ public class IgniteTxCacheWriteSynchronizationModesMultithreadedTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testMultithreadedFullAsync() throws Exception {
multithreadedTests(FULL_ASYNC, false);
}
@@ -165,6 +177,7 @@ public class IgniteTxCacheWriteSynchronizationModesMultithreadedTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testMultithreadedFullAsyncRestart() throws Exception {
multithreadedTests(FULL_ASYNC, true);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConcurrentRemoveObjectsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConcurrentRemoveObjectsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConcurrentRemoveObjectsTest.java
index cd5cbe6..5b5f714 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConcurrentRemoveObjectsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConcurrentRemoveObjectsTest.java
@@ -36,6 +36,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
@@ -46,6 +49,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
/**
*
*/
+@RunWith(JUnit4.class)
public class IgniteTxConcurrentRemoveObjectsTest extends GridCommonAbstractTest {
/** Cache partitions. */
private static final int CACHE_PARTITIONS = 16;
@@ -116,6 +120,7 @@ public class IgniteTxConcurrentRemoveObjectsTest extends GridCommonAbstractTest
/**
* @throws Exception If failed.
*/
+ @Test
public void testOptimisticTxLeavesObjectsInLocalPartition() throws Exception {
checkTxLeavesObjectsInLocalPartition(cacheConfiguration(), TransactionConcurrency.OPTIMISTIC, SERIALIZABLE);
}
@@ -123,6 +128,7 @@ public class IgniteTxConcurrentRemoveObjectsTest extends GridCommonAbstractTest
/**
* @throws Exception If failed.
*/
+ @Test
public void testPessimisticTxLeavesObjectsInLocalPartition() throws Exception {
checkTxLeavesObjectsInLocalPartition(cacheConfiguration(), TransactionConcurrency.PESSIMISTIC, SERIALIZABLE);
}
@@ -130,6 +136,7 @@ public class IgniteTxConcurrentRemoveObjectsTest extends GridCommonAbstractTest
/**
* @throws Exception If failed.
*/
+ @Test
public void testMvccTxLeavesObjectsInLocalPartition() throws Exception {
checkTxLeavesObjectsInLocalPartition(cacheConfiguration().setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT),
TransactionConcurrency.PESSIMISTIC, REPEATABLE_READ);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxConsistencyRestartAbstractSelfTest.java
----------------------------------------------------------------------
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 a530cab..390b2aa 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
@@ -38,6 +38,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
@@ -48,6 +51,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
/**
*
*/
+@RunWith(JUnit4.class)
public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCommonAbstractTest {
/** IP finder. */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
@@ -105,6 +109,7 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom
/**
* @throws Exception If failed.
*/
+ @Test
public void testTxConsistency() throws Exception {
startGridsMultiThreaded(GRID_CNT);
@@ -208,4 +213,4 @@ public abstract class IgniteTxConsistencyRestartAbstractSelfTest extends GridCom
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxGetAfterStopTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxGetAfterStopTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxGetAfterStopTest.java
index 837763f..0236ad2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxGetAfterStopTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxGetAfterStopTest.java
@@ -24,6 +24,9 @@ import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -32,6 +35,7 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED;
/**
*
*/
+@RunWith(JUnit4.class)
public class IgniteTxGetAfterStopTest extends IgniteCacheAbstractTest {
/** */
private CacheMode cacheMode;
@@ -74,6 +78,7 @@ public class IgniteTxGetAfterStopTest extends IgniteCacheAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testReplicated() throws Exception {
getAfterStop(REPLICATED, null);
}
@@ -81,6 +86,7 @@ public class IgniteTxGetAfterStopTest extends IgniteCacheAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testPartitioned() throws Exception {
getAfterStop(PARTITIONED, new NearCacheConfiguration());
}
@@ -88,6 +94,7 @@ public class IgniteTxGetAfterStopTest extends IgniteCacheAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testPartitionedNearDisabled() throws Exception {
getAfterStop(PARTITIONED, null);
}
@@ -130,4 +137,4 @@ public class IgniteTxGetAfterStopTest extends IgniteCacheAbstractTest {
assertEquals(key0, cache0.get(key0));
assertNull(cache1.get(key1));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java
index a7880a2..b127691 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java
@@ -48,12 +48,16 @@ import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.spi.IgniteSpiException;
import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
import org.apache.ignite.testframework.GridTestUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
/**
* Abstract test for originating node failure.
*/
+@RunWith(JUnit4.class)
public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends GridCacheAbstractSelfTest {
/** */
protected static final int GRID_CNT = 5;
@@ -67,6 +71,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testManyKeysCommit() throws Exception {
Collection<Integer> keys = new ArrayList<>(200);
@@ -79,6 +84,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testManyKeysRollback() throws Exception {
Collection<Integer> keys = new ArrayList<>(200);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
index 3f55e9c..5fbe8b1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java
@@ -61,6 +61,9 @@ import org.apache.ignite.spi.IgniteSpiException;
import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.transactions.Transaction;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
@@ -68,6 +71,7 @@ import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
/**
* Abstract test for originating node failure.
*/
+@RunWith(JUnit4.class)
public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest extends GridCacheAbstractSelfTest {
/** */
protected static final int GRID_CNT = 5;
@@ -84,6 +88,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest
/**
* @throws Exception If failed.
*/
+ @Test
public void testManyKeysCommit() throws Exception {
Collection<Integer> keys = new ArrayList<>(200);
@@ -96,6 +101,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest
/**
* @throws Exception If failed.
*/
+ @Test
public void testManyKeysRollback() throws Exception {
Collection<Integer> keys = new ArrayList<>(200);
@@ -108,6 +114,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest
/**
* @throws Exception If failed.
*/
+ @Test
public void testPrimaryNodeFailureCommit() throws Exception {
checkPrimaryNodeCrash(true);
}
@@ -115,6 +122,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest
/**
* @throws Exception If failed.
*/
+ @Test
public void testPrimaryNodeFailureRollback() throws Exception {
checkPrimaryNodeCrash(false);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java
index 65e9f37..c9f903e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java
@@ -37,6 +37,9 @@ import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheRebalanceMode.ASYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -46,6 +49,7 @@ import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
/**
* Tests transaction during cache preloading.
*/
+@RunWith(JUnit4.class)
public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfTest {
/** */
private static final int GRID_CNT = 6;
@@ -78,6 +82,7 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT
/**
* @throws Exception If failed.
*/
+ @Test
public void testRemoteTxPreloading() throws Exception {
if (MvccFeatureChecker.forcedMvcc())
fail("https://issues.apache.org/jira/browse/IGNITE-10391");
@@ -150,6 +155,7 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT
/**
* @throws Exception If failed.
*/
+ @Test
public void testLocalTxPreloadingOptimistic() throws Exception {
if (!MvccFeatureChecker.forcedMvcc()) // Do not check optimistic tx for mvcc.
testLocalTxPreloading(OPTIMISTIC);
@@ -158,6 +164,7 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT
/**
* @throws Exception If failed.
*/
+ @Test
public void testLocalTxPreloadingPessimistic() throws Exception {
if (MvccFeatureChecker.forcedMvcc())
fail("https://issues.apache.org/jira/browse/IGNITE-10391");
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxRemoveTimeoutObjectsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxRemoveTimeoutObjectsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxRemoveTimeoutObjectsTest.java
index bcc72e5..a005557 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxRemoveTimeoutObjectsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxRemoveTimeoutObjectsTest.java
@@ -35,6 +35,10 @@ import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionTimeoutException;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
@@ -42,6 +46,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
/**
* Test correctness of rollback a transaction with timeout during the grid stop.
*/
+@RunWith(JUnit4.class)
public class IgniteTxRemoveTimeoutObjectsTest extends GridCacheAbstractSelfTest {
/** */
private static final int PUT_CNT = 1000;
@@ -57,6 +62,7 @@ public class IgniteTxRemoveTimeoutObjectsTest extends GridCacheAbstractSelfTest
}
/** {@inheritDoc} */
+ @Before
@Override public void setUp() throws Exception {
if (MvccFeatureChecker.forcedMvcc())
fail("https://issues.apache.org/jira/browse/IGNITE-7388");
@@ -70,6 +76,7 @@ public class IgniteTxRemoveTimeoutObjectsTest extends GridCacheAbstractSelfTest
/**
* @throws Exception If failed.
*/
+ @Test
public void testTxRemoveTimeoutObjects() throws Exception {
IgniteCache<Integer, Integer> cache0 = grid(0).cache(DEFAULT_CACHE_NAME);
IgniteCache<Integer, Integer> cache1 = grid(1).cache(DEFAULT_CACHE_NAME);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
index 4cd64e3..326a174 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
@@ -31,6 +31,9 @@ import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
import org.apache.ignite.transactions.TransactionTimeoutException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
@@ -41,6 +44,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE;
/**
* Simple cache test.
*/
+@RunWith(JUnit4.class)
public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest {
/** Random number generator. */
private static final Random RAND = new Random();
@@ -96,6 +100,7 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest {
/**
* @throws IgniteCheckedException If test failed.
*/
+ @Test
public void testPessimisticReadCommitted() throws Exception {
checkTransactionTimeout(PESSIMISTIC, READ_COMMITTED);
}
@@ -103,6 +108,7 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest {
/**
* @throws IgniteCheckedException If test failed.
*/
+ @Test
public void testPessimisticRepeatableRead() throws Exception {
checkTransactionTimeout(PESSIMISTIC, REPEATABLE_READ);
}
@@ -110,6 +116,7 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest {
/**
* @throws IgniteCheckedException If test failed.
*/
+ @Test
public void testPessimisticSerializable() throws Exception {
checkTransactionTimeout(PESSIMISTIC, SERIALIZABLE);
}
@@ -117,6 +124,7 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest {
/**
* @throws IgniteCheckedException If test failed.
*/
+ @Test
public void testOptimisticReadCommitted() throws Exception {
checkTransactionTimeout(OPTIMISTIC, READ_COMMITTED);
}
@@ -124,6 +132,7 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest {
/**
* @throws IgniteCheckedException If test failed.
*/
+ @Test
public void testOptimisticRepeatableRead() throws Exception {
checkTransactionTimeout(OPTIMISTIC, REPEATABLE_READ);
}
@@ -131,6 +140,7 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest {
/**
* @throws IgniteCheckedException If test failed.
*/
+ @Test
public void testOptimisticSerializable() throws Exception {
checkTransactionTimeout(OPTIMISTIC, SERIALIZABLE);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheGetReadFromBackupFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheGetReadFromBackupFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheGetReadFromBackupFailoverTest.java
index 71cb4ed..53d33b7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheGetReadFromBackupFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheGetReadFromBackupFailoverTest.java
@@ -48,6 +48,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -57,6 +60,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
/**
* Test for getting values on unstable topology with read from backup enabled.
*/
+@RunWith(JUnit4.class)
public class CacheGetReadFromBackupFailoverTest extends GridCommonAbstractTest {
/** */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
@@ -138,6 +142,7 @@ public class CacheGetReadFromBackupFailoverTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testFailover() throws Exception {
Ignite ignite = ignite(0);
@@ -254,4 +259,4 @@ public class CacheGetReadFromBackupFailoverTest extends GridCommonAbstractTest {
fail("Test failed");
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CachePartitionPartialCountersMapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CachePartitionPartialCountersMapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CachePartitionPartialCountersMapSelfTest.java
index a4afbca..c594121 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CachePartitionPartialCountersMapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CachePartitionPartialCountersMapSelfTest.java
@@ -19,9 +19,14 @@ package org.apache.ignite.internal.processors.cache.distributed.dht;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.CachePartitionPartialCountersMap;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+@RunWith(JUnit4.class)
public class CachePartitionPartialCountersMapSelfTest extends GridCommonAbstractTest {
+ @Test
public void testAddAndRemove() throws Exception {
CachePartitionPartialCountersMap map = new CachePartitionPartialCountersMap(10);
@@ -54,4 +59,4 @@ public class CachePartitionPartialCountersMapSelfTest extends GridCommonAbstract
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java
index 45d6c0b..5ed637b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java
@@ -23,6 +23,9 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.processors.cache.distributed.GridCacheAbstractPartitionedByteArrayValuesSelfTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.junit.Assert.assertArrayEquals;
@@ -30,6 +33,7 @@ import static org.junit.Assert.assertArrayEquals;
/**
* Tests for byte array values in PARTITIONED-ONLY caches.
*/
+@RunWith(JUnit4.class)
public abstract class GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest extends
GridCacheAbstractPartitionedByteArrayValuesSelfTest {
/** */
@@ -90,6 +94,7 @@ public abstract class GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest ex
*
* @throws Exception If failed.
*/
+ @Test
public void testAtomic() throws Exception {
testAtomic0(cachesAtomic);
}
@@ -114,4 +119,4 @@ public abstract class GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest ex
assertNull(cache.get(KEY_1));
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java
index 1c1f3a5..c76b416 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java
@@ -35,6 +35,9 @@ import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -45,6 +48,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED
/**
* Tests write-through.
*/
+@RunWith(JUnit4.class)
public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends GridCommonAbstractTest {
/** Grid count. */
protected static final int GRID_CNT = 3;
@@ -150,6 +154,8 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
+ MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE);
+
super.beforeTest();
for (GridCacheGenericTestStore<String, Integer> store : stores)
@@ -159,6 +165,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testTransformOptimisticNearUpdate() throws Exception {
checkTransform(OPTIMISTIC, NEAR_NODE, OP_UPDATE);
}
@@ -166,6 +173,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testTransformOptimisticPrimaryUpdate() throws Exception {
checkTransform(OPTIMISTIC, PRIMARY_NODE, OP_UPDATE);
}
@@ -173,6 +181,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testTransformOptimisticBackupUpdate() throws Exception {
checkTransform(OPTIMISTIC, BACKUP_NODE, OP_UPDATE);
}
@@ -180,6 +189,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testTransformOptimisticNearDelete() throws Exception {
checkTransform(OPTIMISTIC, NEAR_NODE, OP_DELETE);
}
@@ -187,6 +197,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testTransformOptimisticPrimaryDelete() throws Exception {
checkTransform(OPTIMISTIC, PRIMARY_NODE, OP_DELETE);
}
@@ -194,6 +205,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testTransformOptimisticBackupDelete() throws Exception {
checkTransform(OPTIMISTIC, BACKUP_NODE, OP_DELETE);
}
@@ -201,6 +213,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testTransformPessimisticNearUpdate() throws Exception {
checkTransform(PESSIMISTIC, NEAR_NODE, OP_UPDATE);
}
@@ -208,6 +221,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testTransformPessimisticPrimaryUpdate() throws Exception {
checkTransform(PESSIMISTIC, PRIMARY_NODE, OP_UPDATE);
}
@@ -215,6 +229,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testTransformPessimisticBackupUpdate() throws Exception {
checkTransform(PESSIMISTIC, BACKUP_NODE, OP_UPDATE);
}
@@ -222,6 +237,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testTransformPessimisticNearDelete() throws Exception {
checkTransform(PESSIMISTIC, NEAR_NODE, OP_DELETE);
}
@@ -229,6 +245,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testTransformPessimisticPrimaryDelete() throws Exception {
checkTransform(PESSIMISTIC, PRIMARY_NODE, OP_DELETE);
}
@@ -236,6 +253,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri
/**
* @throws Exception If failed.
*/
+ @Test
public void testTransformPessimisticBackupDelete() throws Exception {
checkTransform(PESSIMISTIC, BACKUP_NODE, OP_DELETE);
}
@@ -337,4 +355,4 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri
return keys;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java
index b027aea..b83e1c1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicFullApiSelfTest.java
@@ -27,12 +27,16 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.processors.cache.distributed.near.GridCachePartitionedFullApiSelfTest;
import org.apache.ignite.testframework.GridTestUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
/**
* Multi node test for disabled near cache.
*/
+@RunWith(JUnit4.class)
public class GridCacheAtomicFullApiSelfTest extends GridCachePartitionedFullApiSelfTest {
/** {@inheritDoc} */
@Override protected CacheAtomicityMode atomicityMode() {
@@ -57,6 +61,7 @@ public class GridCacheAtomicFullApiSelfTest extends GridCachePartitionedFullApiS
/**
* @throws Exception If failed.
*/
+ @Test
public void testLock() throws Exception {
GridTestUtils.assertThrows(log, new Callable<Object>() {
@Override public Object call() throws Exception {
@@ -74,6 +79,7 @@ public class GridCacheAtomicFullApiSelfTest extends GridCachePartitionedFullApiS
/**
* @throws Exception In case of error.
*/
+ @Test
@Override public void testGetAll() throws Exception {
jcache().put("key1", 1);
jcache().put("key2", 2);
@@ -108,4 +114,4 @@ public class GridCacheAtomicFullApiSelfTest extends GridCachePartitionedFullApiS
assertEquals(2, (int)map2.get("key2"));
assertNull(map2.get("key9999"));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
index e7d9cb3..5d12465 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
@@ -45,6 +45,9 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -55,6 +58,7 @@ import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IGNITE_INSTAN
/**
* Tests near cache with various atomic cache configuration.
*/
+@RunWith(JUnit4.class)
public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
/** */
private static final int GRID_CNT = 4;
@@ -100,6 +104,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testNoBackups() throws Exception {
doStartGrids(0);
@@ -109,6 +114,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testWithBackups() throws Exception {
doStartGrids(2);
@@ -820,4 +826,4 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest {
return null;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
----------------------------------------------------------------------
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 92ea733..42a82a4 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
@@ -49,6 +49,9 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -60,6 +63,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
/**
* Tests for colocated cache.
*/
+@RunWith(JUnit4.class)
public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/** IP finder. */
private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -106,6 +110,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testSimplestPessimistic() throws Exception {
checkSinglePut(false, PESSIMISTIC, REPEATABLE_READ);
}
@@ -113,6 +118,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testSimpleOptimistic() throws Exception {
checkSinglePut(true, OPTIMISTIC, REPEATABLE_READ);
}
@@ -120,6 +126,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testReentry() throws Exception {
checkReentry(PESSIMISTIC, REPEATABLE_READ);
}
@@ -127,6 +134,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testDistributedInTxSeparatePessimistic() throws Exception {
checkDistributedPut(true, true, PESSIMISTIC, REPEATABLE_READ);
}
@@ -134,6 +142,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testDistributedInTxPessimistic() throws Exception {
checkDistributedPut(true, false, PESSIMISTIC, REPEATABLE_READ);
}
@@ -141,6 +150,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testDistributedSeparatePessimistic() throws Exception {
checkDistributedPut(false, true, PESSIMISTIC, REPEATABLE_READ);
}
@@ -148,6 +158,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testDistributedPessimistic() throws Exception {
checkDistributedPut(false, false, PESSIMISTIC, REPEATABLE_READ);
}
@@ -155,6 +166,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testDistributedNonLocalInTxSeparatePessimistic() throws Exception {
checkNonLocalPuts(true, true, PESSIMISTIC, REPEATABLE_READ);
}
@@ -162,6 +174,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testDistributedNonLocalInTxPessimistic() throws Exception {
checkNonLocalPuts(true, false, PESSIMISTIC, REPEATABLE_READ);
}
@@ -169,6 +182,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testDistributedNonLocalSeparatePessimistic() throws Exception {
checkNonLocalPuts(false, true, PESSIMISTIC, REPEATABLE_READ);
}
@@ -176,6 +190,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testDistributedNonLocalPessimistic() throws Exception {
checkNonLocalPuts(false, false, PESSIMISTIC, REPEATABLE_READ);
}
@@ -183,6 +198,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testRollbackSeparatePessimistic() throws Exception {
checkRollback(true, PESSIMISTIC, REPEATABLE_READ);
}
@@ -190,6 +206,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testDistributedInTxSeparateOptimistic() throws Exception {
checkDistributedPut(true, true, OPTIMISTIC, REPEATABLE_READ);
}
@@ -197,6 +214,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testDistributedInTxOptimistic() throws Exception {
checkDistributedPut(true, false, OPTIMISTIC, REPEATABLE_READ);
}
@@ -204,6 +222,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testDistributedNonLocalInTxSeparateOptimistic() throws Exception {
checkNonLocalPuts(true, true, OPTIMISTIC, REPEATABLE_READ);
}
@@ -211,6 +230,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testDistributedNonLocalInTxOptimistic() throws Exception {
checkNonLocalPuts(true, false, OPTIMISTIC, REPEATABLE_READ);
}
@@ -218,6 +238,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testRollbackSeparateOptimistic() throws Exception {
checkRollback(true, OPTIMISTIC, REPEATABLE_READ);
}
@@ -225,6 +246,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testRollback() throws Exception {
checkRollback(false, PESSIMISTIC, REPEATABLE_READ);
}
@@ -232,6 +254,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testPutsMultithreadedColocated() throws Exception {
checkPutsMultithreaded(true, false, 100000);
}
@@ -239,6 +262,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testPutsMultithreadedRemote() throws Exception {
checkPutsMultithreaded(false, true, 100000);
}
@@ -246,6 +270,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testPutsMultithreadedMixed() throws Exception {
checkPutsMultithreaded(true, true, 100000);
}
@@ -352,6 +377,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testLockLockedLocal() throws Exception {
checkLockLocked(true);
}
@@ -359,6 +385,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testLockLockedRemote() throws Exception {
checkLockLocked(false);
}
@@ -430,6 +457,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testPessimisticGet() throws Exception {
storeEnabled = false;
@@ -709,6 +737,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testWriteThrough() throws Exception {
storeEnabled = true;
@@ -894,6 +923,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testExplicitLocks() throws Exception {
storeEnabled = false;
@@ -920,6 +950,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ @Test
public void testExplicitLocksDistributed() throws Exception {
storeEnabled = false;
@@ -986,4 +1017,4 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest {
throw new IllegalArgumentException("Can not find key being primary for node: " + g.cluster().localNode().id());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
index 5ed6b38..ee557c2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java
@@ -27,6 +27,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -37,6 +40,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
/**
* Test ensuring that values are visible inside OPTIMISTIC transaction in co-located cache.
*/
+@RunWith(JUnit4.class)
public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonAbstractTest {
/** Grid count. */
private static final int GRID_CNT = 3;
@@ -110,6 +114,7 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA
*
* @throws Exception If failed.
*/
+ @Test
public void testOptimisticTransaction() throws Exception {
for (IgniteCache<Integer, String> cache : caches) {
Transaction tx = cache.unwrap(Ignite.class).transactions().txStart(OPTIMISTIC, REPEATABLE_READ);
@@ -148,4 +153,4 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
index 853763e..55f4709 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
@@ -40,6 +40,9 @@ 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.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -47,6 +50,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
* Unit tests for dht entry.
*/
+@RunWith(JUnit4.class)
public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest {
/** Grid count. */
private static final int GRID_CNT = 2;
@@ -79,8 +83,6 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.NEAR_CACHE);
-
super.beforeTestsStarted();
startGridsMultiThreaded(GRID_CNT);
@@ -89,6 +91,8 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@SuppressWarnings({"SizeReplaceableByIsEmpty"})
@Override protected void beforeTest() throws Exception {
+ MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.NEAR_CACHE);
+
for (int i = 0; i < GRID_CNT; i++) {
assert near(grid(i)).size() == 0 : "Near cache size is not zero for grid: " + i;
assert dht(grid(i)).size() == 0 : "DHT cache size is not zero for grid: " + i;
@@ -144,6 +148,7 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest {
}
/** @throws Exception If failed. */
+ @Test
public void testClearWithReaders() throws Exception {
Integer key = 1;
@@ -192,6 +197,7 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest {
}
/** @throws Exception If failed. */
+ @Test
public void testRemoveWithReaders() throws Exception {
Integer key = 1;
@@ -240,6 +246,7 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest {
}
/** @throws Exception If failed. */
+ @Test
public void testEvictWithReaders() throws Exception {
Integer key = 1;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
----------------------------------------------------------------------
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 ddb82c5..fbe48f2 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
@@ -41,6 +41,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -50,6 +53,7 @@ import static org.apache.ignite.events.EventType.EVT_CACHE_ENTRY_EVICTED;
/**
* Tests for dht cache eviction.
*/
+@RunWith(JUnit4.class)
public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractTest {
/** */
private static final int GRID_CNT = 4;
@@ -187,6 +191,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT
*
* @throws Exception If failed.
*/
+ @Test
public void testReaders() throws Exception {
Integer key = 1;
@@ -279,4 +284,4 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT
assertNull(localPeek(dhtOther, key));
assertNull(localPeek(nearOther, key));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
index d31015d..fffbe53 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java
@@ -25,6 +25,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -33,6 +36,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
/**
* Test cache closure execution.
*/
+@RunWith(JUnit4.class)
public class GridCacheDhtEvictionsDisabledSelfTest extends GridCommonAbstractTest {
/** */
private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -73,6 +77,7 @@ public class GridCacheDhtEvictionsDisabledSelfTest extends GridCommonAbstractTes
}
/** @throws Exception If failed. */
+ @Test
public void testOneNode() throws Exception {
checkNodes(startGridsMultiThreaded(1));
@@ -81,6 +86,7 @@ public class GridCacheDhtEvictionsDisabledSelfTest extends GridCommonAbstractTes
}
/** @throws Exception If failed. */
+ @Test
public void testTwoNodes() throws Exception {
checkNodes(startGridsMultiThreaded(2));
@@ -89,6 +95,7 @@ public class GridCacheDhtEvictionsDisabledSelfTest extends GridCommonAbstractTes
}
/** @throws Exception If failed. */
+ @Test
public void testThreeNodes() throws Exception {
checkNodes(startGridsMultiThreaded(3));
@@ -124,4 +131,4 @@ public class GridCacheDhtEvictionsDisabledSelfTest extends GridCommonAbstractTes
assertEquals(v1, v2);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
index 5456e4c..813a55d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
@@ -29,6 +29,9 @@ 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.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -37,6 +40,7 @@ import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
/**
* Tests dht mapping.
*/
+@RunWith(JUnit4.class)
public class GridCacheDhtMappingSelfTest extends GridCommonAbstractTest {
/** Number of key backups. */
private static final int BACKUPS = 1;
@@ -45,10 +49,8 @@ public class GridCacheDhtMappingSelfTest extends GridCommonAbstractTest {
private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
/** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
+ @Override protected void beforeTest() throws Exception {
MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.NEAR_CACHE);
-
- super.beforeTestsStarted();
}
/** {@inheritDoc} */
@@ -74,6 +76,7 @@ public class GridCacheDhtMappingSelfTest extends GridCommonAbstractTest {
}
/** @throws Exception If failed. */
+ @Test
public void testMapping() throws Exception {
int nodeCnt = 5;
@@ -103,4 +106,4 @@ public class GridCacheDhtMappingSelfTest extends GridCommonAbstractTest {
// Test key should be on primary and backup node only.
assertEquals(1 + BACKUPS, cnt);
}
-}
\ No newline at end of file
+}