http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccOperationChecksTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccOperationChecksTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccOperationChecksTest.java index 49196d2..e9b1fd6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccOperationChecksTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccOperationChecksTest.java @@ -32,6 +32,9 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.lang.IgniteFuture; 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.TRANSACTIONAL_SNAPSHOT; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -39,6 +42,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** * */ +@RunWith(JUnit4.class) public class CacheMvccOperationChecksTest extends CacheMvccAbstractTest { /** Empty Class[]. */ private static final Class[] E = new Class[]{}; @@ -61,6 +65,7 @@ public class CacheMvccOperationChecksTest extends CacheMvccAbstractTest { /** * @throws Exception if failed. */ + @Test public void testClearOperationsUnsupported() throws Exception { checkOperationUnsupported("clear", m("Clear"), E); @@ -79,6 +84,7 @@ public class CacheMvccOperationChecksTest extends CacheMvccAbstractTest { /** * @throws Exception if failed. */ + @Test public void testLoadOperationsUnsupported() throws Exception { checkOperationUnsupported("loadCache", m("Load"), t(IgniteBiPredicate.class, Object[].class), P, new Object[]{ 1 }); @@ -96,6 +102,7 @@ public class CacheMvccOperationChecksTest extends CacheMvccAbstractTest { /** * @throws Exception if failed. */ + @Test public void testLockOperationsUnsupported() throws Exception { checkOperationUnsupported("lock", m("Lock"), t(Object.class), 1); @@ -105,6 +112,7 @@ public class CacheMvccOperationChecksTest extends CacheMvccAbstractTest { /** * @throws Exception if failed. */ + @Test public void testEvictOperationsUnsupported() throws Exception { checkOperationUnsupported("localEvict", m("Evict"), t(Collection.class), Collections.singleton(1)); } @@ -112,6 +120,7 @@ public class CacheMvccOperationChecksTest extends CacheMvccAbstractTest { /** * @throws Exception if failed. */ + @Test public void testWithExpiryPolicyUnsupported() throws Exception { checkOperationUnsupported("withExpiryPolicy", m("withExpiryPolicy"), t(ExpiryPolicy.class), EternalExpiryPolicy.factoryOf().create());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccPartitionedCoordinatorFailoverTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccPartitionedCoordinatorFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccPartitionedCoordinatorFailoverTest.java index 3425382..c8b4677 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccPartitionedCoordinatorFailoverTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccPartitionedCoordinatorFailoverTest.java @@ -21,6 +21,9 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.CacheConfiguration; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; import static org.apache.ignite.internal.processors.cache.mvcc.CacheMvccAbstractTest.ReadMode.GET; @@ -32,6 +35,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * Coordinator failover test for partitioned caches. */ +@RunWith(JUnit4.class) public class CacheMvccPartitionedCoordinatorFailoverTest extends CacheMvccAbstractCoordinatorFailoverTest { /** {@inheritDoc} */ @Override protected CacheMode cacheMode() { @@ -41,6 +45,7 @@ public class CacheMvccPartitionedCoordinatorFailoverTest extends CacheMvccAbstra /** * @throws Exception If failed. */ + @Test public void testAccountsTxGet_ClientServer_Backups2_CoordinatorFails_Persistence() throws Exception { persistence = true; @@ -51,6 +56,7 @@ public class CacheMvccPartitionedCoordinatorFailoverTest extends CacheMvccAbstra /** * @throws Exception If failed. */ + @Test public void testAccountsTxGet_Server_Backups1_CoordinatorFails() throws Exception { accountsTxReadAll(2, 0, 1, DFLT_PARTITION_COUNT, null, true, GET, PUT, DFLT_TEST_TIME, RestartMode.RESTART_CRD); @@ -59,6 +65,7 @@ public class CacheMvccPartitionedCoordinatorFailoverTest extends CacheMvccAbstra /** * @throws Exception If failed. */ + @Test public void testAccountsTxScan_ClientServer_Backups2_CoordinatorFails() throws Exception { accountsTxReadAll(4, 2, 2, DFLT_PARTITION_COUNT, null, true, SCAN, PUT, DFLT_TEST_TIME, RestartMode.RESTART_CRD); @@ -67,6 +74,7 @@ public class CacheMvccPartitionedCoordinatorFailoverTest extends CacheMvccAbstra /** * @throws Exception If failed. */ + @Test public void testAccountsTxScan_Server_Backups1_CoordinatorFails_Persistence() throws Exception { persistence = true; @@ -77,6 +85,7 @@ public class CacheMvccPartitionedCoordinatorFailoverTest extends CacheMvccAbstra /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_ClientServer_Backups2_RestartCoordinator_GetPut() throws Exception { putAllGetAll(RestartMode.RESTART_CRD, 4, 2, 2, DFLT_PARTITION_COUNT, null, GET, PUT); @@ -85,6 +94,7 @@ public class CacheMvccPartitionedCoordinatorFailoverTest extends CacheMvccAbstra /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_ClientServer_Backups1_RestartCoordinator_GetPut_Persistence() throws Exception { persistence = true; @@ -95,6 +105,7 @@ public class CacheMvccPartitionedCoordinatorFailoverTest extends CacheMvccAbstra /** * @throws Exception If failed. */ + @Test public void testUpdate_N_Objects_ClientServer_Backups1_PutGet_CoordinatorFails_Persistence() throws Exception { persistence = true; @@ -105,6 +116,7 @@ public class CacheMvccPartitionedCoordinatorFailoverTest extends CacheMvccAbstra /** * @throws Exception If failed. */ + @Test public void testUpdate_N_Objects_ClientServer_Backups1__PutGet_CoordinatorFails() throws Exception { updateNObjectsTest(10, 3, 2, 1, DFLT_PARTITION_COUNT, DFLT_TEST_TIME, null, GET, PUT, RestartMode.RESTART_CRD); @@ -114,6 +126,7 @@ public class CacheMvccPartitionedCoordinatorFailoverTest extends CacheMvccAbstra /** * @throws Exception If failed. */ + @Test public void testGetReadInProgressCoordinatorFails() throws Exception { readInProgressCoordinatorFails(false, false, PESSIMISTIC, REPEATABLE_READ, GET, PUT, null); } @@ -121,6 +134,7 @@ public class CacheMvccPartitionedCoordinatorFailoverTest extends CacheMvccAbstra /** * @throws Exception If failed. */ + @Test public void testGetReadInsideTxInProgressCoordinatorFails() throws Exception { readInProgressCoordinatorFails(false, true, PESSIMISTIC, REPEATABLE_READ, GET, PUT, null); } @@ -128,6 +142,7 @@ public class CacheMvccPartitionedCoordinatorFailoverTest extends CacheMvccAbstra /** * @throws Exception If failed. */ + @Test public void testGetReadInProgressCoordinatorFails_ReadDelay() throws Exception { readInProgressCoordinatorFails(true, false, PESSIMISTIC, REPEATABLE_READ, GET, PUT, null); } @@ -135,6 +150,7 @@ public class CacheMvccPartitionedCoordinatorFailoverTest extends CacheMvccAbstra /** * @throws Exception If failed. */ + @Test public void testGetReadInsideTxInProgressCoordinatorFails_ReadDelay() throws Exception { readInProgressCoordinatorFails(true, true, PESSIMISTIC, REPEATABLE_READ, GET, PUT, null); } @@ -142,6 +158,7 @@ public class CacheMvccPartitionedCoordinatorFailoverTest extends CacheMvccAbstra /** * @throws Exception If failed. */ + @Test public void testReadInProgressCoordinatorFailsSimple_FromServerPutGet() throws Exception { readInProgressCoordinatorFailsSimple(false, null, GET, PUT); } @@ -149,6 +166,7 @@ public class CacheMvccPartitionedCoordinatorFailoverTest extends CacheMvccAbstra /** * @throws Exception If failed. */ + @Test public void testActivateDeactivateCLuster() throws Exception { disableScheduledVacuum = true; persistence = true; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorLazyStartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorLazyStartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorLazyStartTest.java index 064e7bb..00439b5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorLazyStartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorLazyStartTest.java @@ -23,11 +23,15 @@ import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests for a lazy MVCC processor start. */ @SuppressWarnings("unchecked") +@RunWith(JUnit4.class) public class CacheMvccProcessorLazyStartTest extends CacheMvccAbstractTest { /** {@inheritDoc} */ @Override protected CacheMode cacheMode() { @@ -37,6 +41,7 @@ public class CacheMvccProcessorLazyStartTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPreconfiguredCacheMvccNotStarted() throws Exception { CacheConfiguration ccfg = cacheConfiguration(CacheMode.PARTITIONED, CacheWriteSynchronizationMode.FULL_SYNC, 0, 1); ccfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL); @@ -60,6 +65,7 @@ public class CacheMvccProcessorLazyStartTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPreconfiguredCacheMvccStarted() throws Exception { CacheConfiguration ccfg = cacheConfiguration(CacheMode.PARTITIONED, CacheWriteSynchronizationMode.FULL_SYNC, 0, 1); @@ -82,6 +88,7 @@ public class CacheMvccProcessorLazyStartTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testMvccRestartedWithDynamicCache() throws Exception { persistence = true; @@ -129,6 +136,7 @@ public class CacheMvccProcessorLazyStartTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testMvccStartedWithDynamicCache() throws Exception { IgniteEx node1 = startGrid(1); IgniteEx node2 = startGrid(2); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorTest.java index 7339a7d..657bc96 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorTest.java @@ -22,12 +22,16 @@ import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.processors.cache.mvcc.txlog.TxState; +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 CacheMvccProcessorTest extends CacheMvccAbstractTest { /** {@inheritDoc} */ @Override protected CacheMode cacheMode() { @@ -37,6 +41,7 @@ public class CacheMvccProcessorTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTreeWithPersistence() throws Exception { persistence = true; @@ -46,6 +51,7 @@ public class CacheMvccProcessorTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTreeWithoutPersistence() throws Exception { persistence = false; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccRemoteTxOnNearNodeStartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccRemoteTxOnNearNodeStartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccRemoteTxOnNearNodeStartTest.java index 592cff6..20ca8da 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccRemoteTxOnNearNodeStartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccRemoteTxOnNearNodeStartTest.java @@ -25,11 +25,15 @@ import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.affinity.Affinity; import org.apache.ignite.configuration.CacheConfiguration; 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.transactions.TransactionConcurrency.PESSIMISTIC; import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ; /** */ +@RunWith(JUnit4.class) public class CacheMvccRemoteTxOnNearNodeStartTest extends CacheMvccAbstractTest { /** {@inheritDoc} */ @Override protected CacheMode cacheMode() { @@ -41,6 +45,7 @@ public class CacheMvccRemoteTxOnNearNodeStartTest extends CacheMvccAbstractTest * when first request is sent to OWNING partition and second to MOVING partition. * @throws Exception if failed. */ + @Test public void testRemoteTxOnNearNodeIsStartedIfPartitionIsMoving() throws Exception { startGridsMultiThreaded(3); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccScanQueryWithConcurrentTransactionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccScanQueryWithConcurrentTransactionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccScanQueryWithConcurrentTransactionTest.java index 8af6a5b..f618b3f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccScanQueryWithConcurrentTransactionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccScanQueryWithConcurrentTransactionTest.java @@ -28,14 +28,19 @@ import org.apache.ignite.cache.query.ScanQuery; import org.apache.ignite.internal.util.lang.IgniteClosure2X; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiPredicate; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class CacheMvccScanQueryWithConcurrentTransactionTest extends CacheMvccAbstractFeatureTest { /** * @throws Exception if failed. */ + @Test public void testScanQuery() throws Exception { doTestConsistency(clo); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSizeWithConcurrentTransactionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSizeWithConcurrentTransactionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSizeWithConcurrentTransactionTest.java index 2b8b73e..54de755 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSizeWithConcurrentTransactionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccSizeWithConcurrentTransactionTest.java @@ -21,14 +21,19 @@ import java.util.concurrent.CountDownLatch; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.util.lang.IgniteClosure2X; import org.apache.ignite.internal.util.typedef.internal.U; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class CacheMvccSizeWithConcurrentTransactionTest extends CacheMvccAbstractFeatureTest { /** * @throws Exception if failed. */ + @Test public void testSize() throws Exception { doTestConsistency(clo); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java index 50c07cf..c2d89c4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java @@ -93,6 +93,9 @@ import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionIsolation; import org.jetbrains.annotations.Nullable; import org.junit.Assert; +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; @@ -109,6 +112,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA * TODO IGNITE-6739: test with cache groups. */ @SuppressWarnings("unchecked") +@RunWith(JUnit4.class) public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** {@inheritDoc} */ @Override protected CacheMode cacheMode() { @@ -118,6 +122,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception if failed. */ + @Test public void testEmptyTx() throws Exception { Ignite node = startGrids(2); @@ -137,6 +142,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception if failed. */ + @Test public void testImplicitTxOps() throws Exception { checkTxWithAllCaches(new CI1<IgniteCache<Integer, Integer>>() { @Override public void apply(IgniteCache<Integer, Integer> cache) { @@ -241,6 +247,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPessimisticTx1() throws Exception { checkTxWithAllCaches(new CI1<IgniteCache<Integer, Integer>>() { @Override public void apply(IgniteCache<Integer, Integer> cache) { @@ -281,6 +288,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPessimisticTx2() throws Exception { checkTxWithAllCaches(new CI1<IgniteCache<Integer, Integer>>() { @Override public void apply(IgniteCache<Integer, Integer> cache) { @@ -316,6 +324,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPessimisticTx3() throws Exception { checkTxWithAllCaches(new CI1<IgniteCache<Integer, Integer>>() { @Override public void apply(IgniteCache<Integer, Integer> cache) { @@ -404,6 +413,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testWithCacheGroups() throws Exception { Ignite srv0 = startGrid(0); @@ -462,6 +472,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheRecreate() throws Exception { cacheRecreate(null); } @@ -469,6 +480,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testActiveQueriesCleanup() throws Exception { activeQueriesCleanup(false); } @@ -476,6 +488,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testActiveQueriesCleanupTx() throws Exception { activeQueriesCleanup(true); } @@ -540,6 +553,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTxReadIsolationSimple() throws Exception { Ignite srv0 = startGrids(4); @@ -626,6 +640,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutGetAllSimple() throws Exception { Ignite node = startGrid(0); @@ -685,6 +700,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutRemoveSimple() throws Exception { putRemoveSimple(false); } @@ -692,6 +708,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutRemoveSimple_LargeKeys() throws Exception { putRemoveSimple(true); } @@ -826,6 +843,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testThreadUpdatesAreVisibleForThisThread() throws Exception { final Ignite ignite = startGrid(0); @@ -878,6 +896,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testWaitPreviousTxAck() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-9470";); @@ -969,6 +988,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPartialCommitResultNoVisible() throws Exception { testSpi = true; @@ -1072,6 +1092,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCleanupWaitsForGet1() throws Exception { boolean vals[] = {true, false}; @@ -1193,6 +1214,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCleanupWaitsForGet2() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-9470";); /* @@ -1301,6 +1323,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCleanupWaitsForGet3() throws Exception { for (int i = 0; i < 4; i++) { cleanupWaitsForGet3(i + 1); @@ -1434,6 +1457,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_SingleNode_GetAll() throws Exception { putAllGetAll(null, 1, 0, 0, 64, null, GET, PUT); } @@ -1441,6 +1465,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_SingleNode_SinglePartition_GetAll() throws Exception { putAllGetAll(null, 1, 0, 0, 1, null, GET, PUT); } @@ -1448,6 +1473,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_ClientServer_Backups0_GetAll() throws Exception { putAllGetAll(null, 4, 2, 0, 64, null, GET, PUT); } @@ -1455,6 +1481,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_ClientServer_Backups0_Persistence_GetAll() throws Exception { persistence = true; @@ -1464,6 +1491,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_ClientServer_Backups1_GetAll() throws Exception { putAllGetAll(null, 4, 2, 1, 64, null, GET, PUT); } @@ -1471,6 +1499,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_ClientServer_Backups2_GetAll() throws Exception { putAllGetAll(null, 4, 2, 2, 64, null, GET, PUT); } @@ -1478,6 +1507,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_ClientServer_Backups1_RestartCoordinator_GetAll() throws Exception { putAllGetAll(RestartMode.RESTART_CRD, 4, 2, 1, 64, null, GET, PUT); } @@ -1485,6 +1515,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_SingleNode_Scan() throws Exception { putAllGetAll(null, 1, 0, 0, 64, null, SCAN, PUT); } @@ -1492,6 +1523,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_SingleNode_SinglePartition_Scan() throws Exception { putAllGetAll(null, 1, 0, 0, 1, null, SCAN, PUT); } @@ -1499,6 +1531,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_ClientServer_Backups0_Scan() throws Exception { putAllGetAll(null, 4, 2, 0, 64, null, SCAN, PUT); } @@ -1506,6 +1539,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_ClientServer_Backups0_Persistence_Scan() throws Exception { persistence = true; @@ -1515,6 +1549,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_ClientServer_Backups1_Scan() throws Exception { putAllGetAll(null, 4, 2, 1, 64, null, SCAN, PUT); } @@ -1522,6 +1557,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_ClientServer_Backups2_Scan() throws Exception { putAllGetAll(null, 4, 2, 2, 64, null, SCAN, PUT); } @@ -1529,6 +1565,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_ClientServer_Backups1_RestartCoordinator_Scan() throws Exception { putAllGetAll(RestartMode.RESTART_CRD, 4, 2, 1, 64, null, SCAN, PUT); } @@ -1536,6 +1573,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllGetAll_ClientServer_Backups1_Restart_Scan() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-9774";); @@ -1545,6 +1583,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxGetAll_SingleNode() throws Exception { accountsTxReadAll(1, 0, 0, 64, null, false, GET, PUT); } @@ -1552,6 +1591,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxGetAll_WithRemoves_SingleNode() throws Exception { accountsTxReadAll(1, 0, 0, 64, null, true, GET, PUT); } @@ -1559,6 +1599,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxGetAll_SingleNode_SinglePartition() throws Exception { accountsTxReadAll(1, 0, 0, 1, null, false, GET, PUT); } @@ -1566,6 +1607,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxGetAll_WithRemoves_SingleNode_SinglePartition() throws Exception { accountsTxReadAll(1, 0, 0, 1, null, true, GET, PUT); } @@ -1573,6 +1615,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxGetAll_ClientServer_Backups0() throws Exception { accountsTxReadAll(4, 2, 0, 64, null, false, GET, PUT); } @@ -1580,6 +1623,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxGetAll_WithRemoves_ClientServer_Backups0() throws Exception { accountsTxReadAll(4, 2, 0, 64, null, true, GET, PUT); } @@ -1587,6 +1631,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxGetAll_ClientServer_Backups1() throws Exception { accountsTxReadAll(4, 2, 1, 64, null, false, GET, PUT); } @@ -1594,6 +1639,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxGetAll_WithRemoves_ClientServer_Backups1() throws Exception { accountsTxReadAll(4, 2, 1, 64, null, true, GET, PUT); } @@ -1601,6 +1647,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxGetAll_ClientServer_Backups2() throws Exception { accountsTxReadAll(4, 2, 2, 64, null, false, GET, PUT); } @@ -1608,6 +1655,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxGetAll_WithRemoves_ClientServer_Backups2() throws Exception { accountsTxReadAll(4, 2, 2, 64, null, true, GET, PUT); } @@ -1615,6 +1663,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxScan_SingleNode_SinglePartition() throws Exception { accountsTxReadAll(1, 0, 0, 1, null, false, SCAN, PUT); } @@ -1622,6 +1671,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxScan_WithRemoves_SingleNode_SinglePartition() throws Exception { accountsTxReadAll(1, 0, 0, 1, null, true, SCAN, PUT); } @@ -1629,6 +1679,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxScan_SingleNode() throws Exception { accountsTxReadAll(1, 0, 0, 64, null, false, SCAN, PUT); } @@ -1636,6 +1687,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxScan_WithRemoves_SingleNode() throws Exception { accountsTxReadAll(1, 0, 0, 64, null, true, SCAN, PUT); } @@ -1643,6 +1695,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxScan_ClientServer_Backups0() throws Exception { accountsTxReadAll(4, 2, 0, 64, null, false, SCAN, PUT); } @@ -1650,6 +1703,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxScan_WithRemoves_ClientServer_Backups0() throws Exception { accountsTxReadAll(4, 2, 0, 64, null, true, SCAN, PUT); } @@ -1657,6 +1711,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxScan_ClientServer_Backups1() throws Exception { accountsTxReadAll(4, 2, 1, 64, null, false, SCAN, PUT); } @@ -1664,6 +1719,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxScan_WithRemoves_ClientServer_Backups1() throws Exception { accountsTxReadAll(4, 2, 1, 64, null, true, SCAN, PUT); } @@ -1671,6 +1727,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxScan_ClientServer_Backups2() throws Exception { accountsTxReadAll(4, 2, 2, 64, null, false, SCAN, PUT); } @@ -1678,6 +1735,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAccountsTxScan_WithRemoves_ClientServer_Backups2() throws Exception { accountsTxReadAll(4, 2, 2, 64, null, true, SCAN, PUT); } @@ -1685,6 +1743,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPessimisticTxGetAllReadsSnapshot_SingleNode_SinglePartition() throws Exception { txReadsSnapshot(1, 0, 0, 1, GET); } @@ -1692,6 +1751,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPessimisticTxGetAllReadsSnapshot_ClientServer() throws Exception { txReadsSnapshot(4, 2, 1, 64, GET); } @@ -1699,6 +1759,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPessimisticTxScanReadsSnapshot_SingleNode_SinglePartition() throws Exception { txReadsSnapshot(1, 0, 0, 1, SCAN); } @@ -1706,6 +1767,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPessimisticTxScanReadsSnapshot_ClientServer() throws Exception { txReadsSnapshot(4, 2, 1, 64, SCAN); } @@ -1896,6 +1958,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed */ + @Test public void testOperationsSequenceScanConsistency_SingleNode_SinglePartition() throws Exception { operationsSequenceConsistency(1, 0, 0, 1, SCAN); } @@ -1903,6 +1966,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed */ + @Test public void testOperationsSequenceScanConsistency_SingleNode() throws Exception { operationsSequenceConsistency(1, 0, 0, 64, SCAN); } @@ -1910,6 +1974,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed */ + @Test public void testOperationsSequenceScanConsistency_ClientServer_Backups0() throws Exception { operationsSequenceConsistency(4, 2, 0, 64, SCAN); } @@ -1917,6 +1982,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed */ + @Test public void testOperationsSequenceScanConsistency_ClientServer_Backups1() throws Exception { operationsSequenceConsistency(4, 2, 1, 64, SCAN); } @@ -1924,6 +1990,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed */ + @Test public void testOperationsSequenceGetConsistency_SingleNode_SinglePartition() throws Exception { operationsSequenceConsistency(1, 0, 0, 1, GET); } @@ -1931,6 +1998,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed */ + @Test public void testOperationsSequenceGetConsistency_SingleNode() throws Exception { operationsSequenceConsistency(1, 0, 0, 64, GET); } @@ -1938,6 +2006,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed */ + @Test public void testOperationsSequenceGetConsistency_ClientServer_Backups0() throws Exception { operationsSequenceConsistency(4, 2, 0, 64, GET); } @@ -1945,6 +2014,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed */ + @Test public void testOperationsSequenceGetConsistency_ClientServer_Backups1() throws Exception { operationsSequenceConsistency(4, 2, 1, 64, GET); } @@ -2094,6 +2164,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNodesRestartNoHang() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-5935";); @@ -2211,6 +2282,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testActiveQueryCleanupOnNodeFailure() throws Exception { testSpi = true; @@ -2258,6 +2330,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRebalanceSimple() throws Exception { Ignite srv0 = startGrid(0); @@ -2337,6 +2410,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRebalanceWithRemovedValuesSimple() throws Exception { Ignite node = startGrid(0); @@ -2389,6 +2463,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTxPrepareFailureSimplePessimisticTx() throws Exception { testSpi = true; @@ -2462,6 +2537,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testMvccCoordinatorChangeSimple() throws Exception { Ignite srv0 = startGrid(0); @@ -2546,6 +2622,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testMvccCoordinatorInfoConsistency() throws Exception { for (int i = 0; i < 4; i++) { startGrid(i); @@ -2578,6 +2655,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testMvccCoordinatorInfoConsistency_Persistence() throws Exception { persistence = true; @@ -2608,6 +2686,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGetVersionRequestFailover() throws Exception { final int NODES = 5; @@ -2698,6 +2777,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLoadWithStreamer() throws Exception { startGridsMultiThreaded(5); @@ -2731,6 +2811,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUpdate_N_Objects_SingleNode_SinglePartition_Get() throws Exception { int[] nValues = {3, 5, 10}; @@ -2744,6 +2825,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUpdate_N_Objects_SingleNode_Get() throws Exception { int[] nValues = {3, 5, 10}; @@ -2757,6 +2839,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUpdate_N_Objects_SingleNode_SinglePartition_Scan() throws Exception { int[] nValues = {3, 5, 10}; @@ -2770,6 +2853,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUpdate_N_Objects_SingleNode_Scan() throws Exception { int[] nValues = {3, 5, 10}; @@ -2783,6 +2867,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUpdate_N_Objects_ClientServer_Backups2_Get() throws Exception { int[] nValues = {3, 5, 10}; @@ -2796,6 +2881,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUpdate_N_Objects_ClientServer_Backups1_Scan() throws Exception { int[] nValues = {3, 5, 10}; @@ -2809,6 +2895,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testImplicitPartsScan_SingleNode_SinglePartition() throws Exception { doImplicitPartsScanTest(1, 0, 0, 1, 10_000); } @@ -2816,6 +2903,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testImplicitPartsScan_SingleNode() throws Exception { doImplicitPartsScanTest(1, 0, 0, 64, 10_000); } @@ -2823,6 +2911,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testImplicitPartsScan_ClientServer_Backups0() throws Exception { doImplicitPartsScanTest(4, 2, 0, 64, 10_000); } @@ -2830,6 +2919,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testImplicitPartsScan_ClientServer_Backups1() throws Exception { doImplicitPartsScanTest(4, 2, 1, 64, 10_000); } @@ -2837,6 +2927,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testImplicitPartsScan_ClientServer_Backups2() throws Exception { doImplicitPartsScanTest(4, 2, 2, 64, 10_000); } @@ -3035,6 +3126,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testSize() throws Exception { Ignite node = startGrid(0); @@ -3198,6 +3290,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInternalApi() throws Exception { Ignite node = startGrid(0); @@ -3298,6 +3391,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testExpiration() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-7311";); @@ -3353,6 +3447,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testChangeExpireTime() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-7311";); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java index 7aae613..ba7b3c1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java @@ -40,10 +40,14 @@ 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; /** * Check Tx state recovery from WAL. */ +@RunWith(JUnit4.class) public class CacheMvccTxFailoverTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryVmIpFinder FINDER = new TcpDiscoveryVmIpFinder(true); @@ -88,6 +92,7 @@ public class CacheMvccTxFailoverTest extends GridCommonAbstractTest { /** * @throws Exception If fails. */ + @Test public void testSingleNodeTxMissedRollback() throws Exception { checkSingleNodeRestart(true, false, true); } @@ -95,6 +100,7 @@ public class CacheMvccTxFailoverTest extends GridCommonAbstractTest { /** * @throws Exception If fails. */ + @Test public void testSingleNodeTxMissedRollbackRecoverFromWAL() throws Exception { checkSingleNodeRestart(true, true, true); } @@ -102,6 +108,7 @@ public class CacheMvccTxFailoverTest extends GridCommonAbstractTest { /** * @throws Exception If fails. */ + @Test public void testSingleNodeTxMissedCommit() throws Exception { checkSingleNodeRestart(false, false, true); } @@ -109,6 +116,7 @@ public class CacheMvccTxFailoverTest extends GridCommonAbstractTest { /** * @throws Exception If fails. */ + @Test public void testSingleNodeTxMissedCommitRecoverFromWAL() throws Exception { checkSingleNodeRestart(false, true, true); } @@ -116,6 +124,7 @@ public class CacheMvccTxFailoverTest extends GridCommonAbstractTest { /** * @throws Exception If fails. */ + @Test public void testSingleNodeRollbackedTxRecoverFromWAL() throws Exception { checkSingleNodeRestart(true, true, false); } @@ -123,6 +132,7 @@ public class CacheMvccTxFailoverTest extends GridCommonAbstractTest { /** * @throws Exception If fails. */ + @Test public void testSingleNodeCommitedTxRecoverFromWAL() throws Exception { checkSingleNodeRestart(false, true, false); } @@ -208,6 +218,7 @@ public class CacheMvccTxFailoverTest extends GridCommonAbstractTest { /** * @throws Exception If fails. */ + @Test public void testLostRollbackOnBackup() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-10219";); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccVacuumTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccVacuumTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccVacuumTest.java index 0d1b207..29bb6e7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccVacuumTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccVacuumTest.java @@ -25,12 +25,16 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.worker.GridWorker; 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.CacheMode.PARTITIONED; /** * Vacuum test. */ +@RunWith(JUnit4.class) public class CacheMvccVacuumTest extends CacheMvccAbstractTest { /** {@inheritDoc} */ @Override protected CacheMode cacheMode() { @@ -40,6 +44,7 @@ public class CacheMvccVacuumTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStartStopVacuumInMemory() throws Exception { Ignite node0 = startGrid(0); Ignite node1 = startGrid(1); @@ -70,6 +75,7 @@ public class CacheMvccVacuumTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStartStopVacuumPersistence() throws Exception { persistence = true; @@ -131,6 +137,7 @@ public class CacheMvccVacuumTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testVacuumNotStartedWithoutMvcc() throws Exception { IgniteConfiguration cfg = getConfiguration("grid1"); @@ -142,6 +149,7 @@ public class CacheMvccVacuumTest extends CacheMvccAbstractTest { /** * @throws Exception If failed. */ + @Test public void testVacuumNotStartedWithoutMvccPersistence() throws Exception { persistence = true; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccCachePeekTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccCachePeekTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccCachePeekTest.java index 539283b..7bcce6a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccCachePeekTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccCachePeekTest.java @@ -26,12 +26,16 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; 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; import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ; /** */ +@RunWith(JUnit4.class) public class MvccCachePeekTest extends CacheMvccAbstractTest { /** */ private interface ThrowingRunnable { @@ -57,6 +61,7 @@ public class MvccCachePeekTest extends CacheMvccAbstractTest { /** * @throws Exception if failed. */ + @Test public void testPeek() throws Exception { doWithCache(this::checkPeekSerial); doWithCache(this::checkPeekDoesNotSeeAbortedVersions); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUnsupportedTxModesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUnsupportedTxModesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUnsupportedTxModesTest.java index bd82405..dc1f2cb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUnsupportedTxModesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/MvccUnsupportedTxModesTest.java @@ -28,6 +28,9 @@ import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionException; import org.apache.ignite.transactions.TransactionIsolation; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static java.util.Collections.singleton; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT; @@ -38,6 +41,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE; /** */ +@RunWith(JUnit4.class) public class MvccUnsupportedTxModesTest extends GridCommonAbstractTest { /** */ private static IgniteCache<Object, Object> cache; @@ -62,231 +66,277 @@ public class MvccUnsupportedTxModesTest extends GridCommonAbstractTest { } /** */ + @Test public void testGetAndPutIfAbsent() { checkOperation(() -> cache.getAndPutIfAbsent(1, 1)); } /** */ + @Test public void testGetAndPutIfAbsentAsync() { checkOperation(() -> cache.getAndPutIfAbsentAsync(1, 1)); } /** */ + @Test public void testGet() { checkOperation(() -> cache.get(1)); } /** */ + @Test public void testGetAsync() { checkOperation(() -> cache.getAsync(1)); } /** */ + @Test public void testGetEntry() { checkOperation(() -> cache.getEntry(1)); } /** */ + @Test public void testGetEntryAsync() { checkOperation(() -> cache.getEntryAsync(1)); } /** */ + @Test public void testGetAll() { checkOperation(() -> cache.getAll(singleton(1))); } /** */ + @Test public void testGetAllAsync() { checkOperation(() -> cache.getAllAsync(singleton(1))); } /** */ + @Test public void testGetEntries() { checkOperation(() -> cache.getEntries(singleton(1))); } /** */ + @Test public void testGetEntriesAsync() { checkOperation(() -> cache.getEntriesAsync(singleton(1))); } /** */ + @Test public void testContainsKey() { checkOperation(() -> cache.containsKey(1)); } /** */ + @Test public void testContainsKeyAsync() { checkOperation(() -> cache.containsKeyAsync(1)); } /** */ + @Test public void testContainsKeys() { checkOperation(() -> cache.containsKeys(singleton(1))); } /** */ + @Test public void testContainsKeysAsync() { checkOperation(() -> cache.containsKeysAsync(singleton(1))); } /** */ + @Test public void testPut() { checkOperation(() -> cache.put(1, 1)); } /** */ + @Test public void testPutAsync() { checkOperation(() -> cache.putAsync(1, 1)); } /** */ + @Test public void testGetAndPut() { checkOperation(() -> cache.getAndPut(1, 1)); } /** */ + @Test public void testGetAndPutAsync() { checkOperation(() -> cache.getAndPutAsync(1, 1)); } /** */ + @Test public void testPutAll() { checkOperation(() -> cache.putAll(ImmutableMap.of(1, 1))); } /** */ + @Test public void testPutAllAsync() { checkOperation(() -> cache.putAllAsync(ImmutableMap.of(1, 1))); } /** */ + @Test public void testPutIfAbsent() { checkOperation(() -> cache.putIfAbsent(1, 1)); } /** */ + @Test public void testPutIfAbsentAsync() { checkOperation(() -> cache.putIfAbsentAsync(1, 1)); } /** */ + @Test public void testRemove1() { checkOperation(() -> cache.remove(1)); } /** */ + @Test public void testRemoveAsync1() { checkOperation(() -> cache.removeAsync(1)); } /** */ + @Test public void testRemove2() { checkOperation(() -> cache.remove(1, 1)); } /** */ + @Test public void testRemoveAsync2() { checkOperation(() -> cache.removeAsync(1, 1)); } /** */ + @Test public void testGetAndRemove() { checkOperation(() -> cache.getAndRemove(1)); } /** */ + @Test public void testGetAndRemoveAsync() { checkOperation(() -> cache.getAndRemoveAsync(1)); } /** */ + @Test public void testReplace1() { checkOperation(() -> cache.replace(1, 1, 1)); } /** */ + @Test public void testReplaceAsync1() { checkOperation(() -> cache.replaceAsync(1, 1, 1)); } /** */ + @Test public void testReplace2() { checkOperation(() -> cache.replace(1, 1)); } /** */ + @Test public void testReplaceAsync2() { checkOperation(() -> cache.replaceAsync(1, 1)); } /** */ + @Test public void testGetAndReplace() { checkOperation(() -> cache.getAndReplace(1, 1)); } /** */ + @Test public void testGetAndReplaceAsync() { checkOperation(() -> cache.getAndReplaceAsync(1, 1)); } /** */ + @Test public void testRemoveAll1() { checkOperation(() -> cache.removeAll(singleton(1))); } /** */ + @Test public void testRemoveAllAsync1() { checkOperation(() -> cache.removeAllAsync(singleton(1))); } /** */ + @Test public void testInvoke1() { checkOperation(() -> cache.invoke(1, testEntryProcessor)); } /** */ + @Test public void testInvokeAsync1() { checkOperation(() -> cache.invokeAsync(1, testEntryProcessor)); } /** */ + @Test public void testInvoke2() { checkOperation(() -> cache.invoke(1, testEntryProcessor)); } /** */ + @Test public void testInvokeAsync2() { checkOperation(() -> cache.invokeAsync(1, testEntryProcessor)); } /** */ + @Test public void testInvokeAll1() { checkOperation(() -> cache.invokeAll(singleton(1), testEntryProcessor)); } /** */ + @Test public void testInvokeAllAsync1() { checkOperation(() -> cache.invokeAllAsync(singleton(1), testEntryProcessor)); } /** */ + @Test public void testInvokeAll2() { checkOperation(() -> cache.invokeAll(singleton(1), testEntryProcessor)); } /** */ + @Test public void testInvokeAllAsync2() { checkOperation(() -> cache.invokeAllAsync(singleton(1), testEntryProcessor)); } /** */ + @Test public void testInvokeAll3() { checkOperation(() -> cache.invokeAll(Collections.singletonMap(1, testEntryProcessor))); } /** */ + @Test public void testInvokeAllAsync3() { checkOperation(() -> cache.invokeAllAsync(Collections.singletonMap(1, testEntryProcessor))); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java index 838c732..35e71fb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java @@ -54,12 +54,16 @@ import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; 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.CacheMode.PARTITIONED; /** * */ +@RunWith(JUnit4.class) public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbstractTest { /** */ private String consId; @@ -117,6 +121,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst * (it is the node that once wasn't presented in branchingHistory but hasn't participated in any branching point) * joins the cluster after restart, cluster gets activated. */ + @Test public void testAutoActivationWithCompatibleOldNode() throws Exception { startGridWithConsistentId("A"); startGridWithConsistentId("B"); @@ -168,6 +173,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst * IgniteCluster::setBaselineTopology(long topVer) should throw an exception * when online node from current BaselineTopology is not presented in topology version. */ + @Test public void testBltChangeTopVerRemoveOnlineNodeFails() throws Exception { Ignite ignite = startGridWithConsistentId("A"); @@ -198,6 +204,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst /** * Verifies that online nodes cannot be removed from BaselineTopology (this may change in future). */ + @Test public void testOnlineNodesCannotBeRemovedFromBaselineTopology() throws Exception { Ignite nodeA = startGridWithConsistentId("A"); Ignite nodeB = startGridWithConsistentId("B"); @@ -224,6 +231,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst /** * */ + @Test public void testNodeFailsToJoinWithIncompatiblePreviousBaselineTopology() throws Exception { startGridWithConsistentId("A"); startGridWithConsistentId("B"); @@ -272,6 +280,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst * Verifies scenario when parts of grid were activated independently they are not allowed to join * into the same grid again (due to risks of incompatible data modifications). */ + @Test public void testIncompatibleBltNodeIsProhibitedToJoinCluster() throws Exception { startGridWithConsistentId("A"); startGridWithConsistentId("B"); @@ -315,6 +324,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst /** * Test verifies that node with out-of-data but still compatible Baseline Topology is allowed to join the cluster. */ + @Test public void testNodeWithOldBltIsAllowedToJoinCluster() throws Exception { final long expectedHash1 = (long)"A".hashCode() + "B".hashCode() + "C".hashCode(); @@ -376,6 +386,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst * * @throws Exception If failed. */ + @Test public void testNodeJoinsDuringPartitionMapExchange() throws Exception { startGridWithConsistentId("A"); startGridWithConsistentId("B"); @@ -477,6 +488,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst * * @throws Exception If failed. */ + @Test public void testNodeWithBltIsNotAllowedToJoinClusterDuringFirstActivation() throws Exception { Ignite nodeC = startGridWithConsistentId("C"); @@ -528,6 +540,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst * Verifies that when new node outside of baseline topology joins active cluster with BLT already set * it receives BLT from the cluster and stores it locally. */ + @Test public void testNewNodeJoinsToActiveCluster() throws Exception { Ignite nodeA = startGridWithConsistentId("A"); Ignite nodeB = startGridWithConsistentId("B"); @@ -561,6 +574,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst /** * */ + @Test public void testRemoveNodeFromBaselineTopology() throws Exception { final long expectedActivationHash = (long)"A".hashCode() + "C".hashCode(); @@ -615,6 +629,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst /** * */ + @Test public void testAddNodeToBaselineTopology() throws Exception { final long expectedActivationHash = (long)"A".hashCode() + "B".hashCode() + "C".hashCode() + "D".hashCode(); @@ -646,6 +661,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst /** * Verifies that baseline topology is removed successfully through baseline changing API. */ + @Test public void testRemoveBaselineTopology() throws Exception { BaselineTopologyVerifier verifier = new BaselineTopologyVerifier() { @Override public void verify(BaselineTopology blt) { @@ -705,6 +721,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst * Verifies that when new node joins already active cluster and new activation request is issued, * no changes to BaselineTopology branching history happen. */ + @Test public void testActivationHashIsNotUpdatedOnMultipleActivationRequests() throws Exception { final long expectedActivationHash = (long)"A".hashCode(); @@ -731,6 +748,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst * Verifies that grid is autoactivated when full BaselineTopology is preset even on one node * and then all other nodes from BaselineTopology are started. */ + @Test public void testAutoActivationWithBaselineTopologyPreset() throws Exception { Ignite ig = startGridWithConsistentId("A"); @@ -771,6 +789,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst } /** */ + @Test public void testAutoActivationSimple() throws Exception { startGrids(3); @@ -804,6 +823,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst /** * */ + @Test public void testNoAutoActivationOnJoinNewNodeToInactiveCluster() throws Exception { startGrids(2); @@ -829,6 +849,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst /** * Verifies that neither BaselineTopology nor BaselineTopologyHistory are changed when cluster is deactivated. */ + @Test public void testBaselineTopologyRemainsTheSameOnClusterDeactivation() throws Exception { startGrids(2); @@ -858,6 +879,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst /** * */ + @Test public void testBaselineHistorySyncWithNewNode() throws Exception { final long expectedBranchingHash = "A".hashCode() + "B".hashCode() + "C".hashCode(); @@ -899,6 +921,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst /** * */ + @Test public void testBaselineHistorySyncWithOldNodeWithCompatibleHistory() throws Exception { final long expectedBranchingHash0 = "A".hashCode() + "B".hashCode() + "C".hashCode(); @@ -955,6 +978,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst /** * @throws Exception if failed. */ + @Test public void testBaselineNotDeletedOnDeactivation() throws Exception { Ignite nodeA = startGridWithConsistentId("A"); startGridWithConsistentId("B"); @@ -990,6 +1014,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst /** * */ + @Test public void testNodeWithBltIsProhibitedToJoinNewCluster() throws Exception { BaselineTopologyVerifier nullVerifier = new BaselineTopologyVerifier() { @Override public void verify(BaselineTopology blt) { http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java index 0f5aef9..6815165 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java @@ -40,6 +40,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.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 org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -48,6 +51,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * */ +@RunWith(JUnit4.class) public class IgniteDataStorageMetricsSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -148,6 +152,7 @@ public class IgniteDataStorageMetricsSelfTest extends GridCommonAbstractTest { /** * @throws Exception if failed. */ + @Test public void testPersistenceMetrics() throws Exception { final IgniteEx ig = startGrid(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java index 9121cca..98d6751 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java @@ -42,10 +42,14 @@ import org.apache.ignite.configuration.WALMode; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; 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 IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstractTest { /** */ private static final String CACHE_NAME = "cache1"; @@ -116,6 +120,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr /** * @see <a href="https://issues.apache.org/jira/browse/IGNITE-7258";>IGNITE-7258</a> refer to the following JIRA for more context about the problem verified by the test. */ + @Test public void testUpdatedBinaryMetadataIsPreservedOnJoinToOldCoordinator() throws Exception { Ignite ignite0 = startGridInASeparateWorkDir("A"); Ignite ignite1 = startGridInASeparateWorkDir("B"); @@ -169,6 +174,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr /** * @see <a href="https://issues.apache.org/jira/browse/IGNITE-7258";>IGNITE-7258</a> refer to the following JIRA for more context about the problem verified by the test. */ + @Test public void testNewBinaryMetadataIsWrittenOnOldCoordinator() throws Exception { Ignite ignite0 = startGridInASeparateWorkDir("A"); Ignite ignite1 = startGridInASeparateWorkDir("B"); @@ -223,6 +229,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr * * @see <a href="https://issues.apache.org/jira/browse/IGNITE-7258";>IGNITE-7258</a> refer to the following JIRA for more context about the problem verified by the test. */ + @Test public void testNewBinaryMetadataIsPropagatedToAllOutOfDataNodes() throws Exception { Ignite igniteA = startGridInASeparateWorkDir("A"); startGridInASeparateWorkDir("B"); @@ -290,6 +297,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr * * @see <a href="https://issues.apache.org/jira/browse/IGNITE-7258";>IGNITE-7258</a> refer to the following JIRA for more context about the problem verified by the test. */ + @Test public void testNodeWithIncompatibleMetadataIsProhibitedToJoinTheCluster() throws Exception { final String decimalFieldName = "decField"; @@ -368,6 +376,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr * Test verifies that binary metadata from regular java classes is saved and restored correctly * on cluster restart. */ + @Test public void testStaticMetadataIsRestoredOnRestart() throws Exception { clientMode = false; @@ -443,6 +452,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr * Test verifies that metadata for binary types built with BinaryObjectBuilder is saved and updated correctly * on cluster restart. */ + @Test public void testDynamicMetadataIsRestoredOnRestart() throws Exception { clientMode = false; //1: start two nodes, add single BinaryObject @@ -509,6 +519,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr /** * */ + @Test public void testBinaryEnumMetadataIsRestoredOnRestart() throws Exception { clientMode = false; @@ -550,6 +561,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr /** * Test verifies that metadata is saved, stored and delivered to client nodes correctly. */ + @Test public void testMixedMetadataIsRestoredOnRestart() throws Exception { clientMode = false; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinarySortObjectFieldsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinarySortObjectFieldsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinarySortObjectFieldsTest.java index 70a0203..a2e21e3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinarySortObjectFieldsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinarySortObjectFieldsTest.java @@ -28,10 +28,14 @@ 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; /** * */ +@RunWith(JUnit4.class) public class IgnitePdsBinarySortObjectFieldsTest extends GridCommonAbstractTest { /** */ private static final String CACHE_NAME = "ignitePdsBinarySortObjectFieldsTestCache"; @@ -121,6 +125,7 @@ public class IgnitePdsBinarySortObjectFieldsTest extends GridCommonAbstractTest /** * @throws Exception if failed. */ + @Test public void testGivenCacheWithPojoValueAndPds_WhenPut_ThenNoHangup() throws Exception { System.setProperty("IGNITE_BINARY_SORT_OBJECT_FIELDS", "true"); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java index a68bc7b..7c7a538 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java @@ -47,6 +47,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; 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; @@ -56,6 +59,7 @@ import static org.apache.ignite.internal.processors.cache.persistence.GridCacheD /** * The test validates assignment after nodes restart with enabled persistence. */ +@RunWith(JUnit4.class) public class IgnitePdsCacheAssignmentNodeRestartsTest extends GridCommonAbstractTest { /** */ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -128,6 +132,7 @@ public class IgnitePdsCacheAssignmentNodeRestartsTest extends GridCommonAbstract /** * @throws Exception If failed. */ + @Test public void testAssignmentAfterRestarts() throws Exception { try { if (MvccFeatureChecker.forcedMvcc()) @@ -262,4 +267,4 @@ public class IgnitePdsCacheAssignmentNodeRestartsTest 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/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java index 74a3950..c422732 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java @@ -44,6 +44,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.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 org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.CACHE_DATA_FILENAME; import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.CACHE_DATA_TMP_FILENAME; @@ -51,6 +54,7 @@ import static org.apache.ignite.internal.processors.cache.persistence.file.FileP /** * Tests that ignite can start when caches' configurations with same name in different groups stored. */ +@RunWith(JUnit4.class) public class IgnitePdsCacheConfigurationFileConsistencyCheckTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -102,6 +106,7 @@ public class IgnitePdsCacheConfigurationFileConsistencyCheckTest extends GridCom * * @throws Exception If fails. */ + @Test public void testStartDuplicatedCacheConfigurations() throws Exception { IgniteEx ig0 = (IgniteEx)startGrids(NODES); @@ -129,6 +134,7 @@ public class IgnitePdsCacheConfigurationFileConsistencyCheckTest extends GridCom * * @throws Exception If failed. */ + @Test public void testTmpCacheConfigurationsDelete() throws Exception { IgniteEx ig0 = (IgniteEx)startGrids(NODES); @@ -168,6 +174,7 @@ public class IgnitePdsCacheConfigurationFileConsistencyCheckTest extends GridCom * * @throws Exception If failed. */ + @Test public void testCorruptedCacheConfigurationsValidation() throws Exception { IgniteEx ig0 = (IgniteEx)startGrids(NODES); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java index 279d3c8..dd0ba1a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java @@ -31,10 +31,14 @@ 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; /** * */ +@RunWith(JUnit4.class) public class IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -71,6 +75,7 @@ public class IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest extends GridComm * Tests that joining node metadata correctly handled on client. * @throws Exception If fails. */ + @Test public void testJoiningNodeBinaryMetaOnClient() throws Exception { IgniteEx ig0 = (IgniteEx)startGrids(2);
