http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java index 524d0fb..0270a41 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.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.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.MILLISECONDS; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; @@ -48,6 +51,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * */ +@RunWith(JUnit4.class) public class IgniteCacheEntryListenerExpiredEventsTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -74,6 +78,7 @@ public class IgniteCacheEntryListenerExpiredEventsTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testExpiredEventAtomic() throws Exception { checkExpiredEvents(cacheConfiguration(PARTITIONED, ATOMIC)); } @@ -81,6 +86,7 @@ public class IgniteCacheEntryListenerExpiredEventsTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testExpiredEventTx() throws Exception { checkExpiredEvents(cacheConfiguration(PARTITIONED, TRANSACTIONAL)); }
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java index 34f97a1..18fff3b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java @@ -34,6 +34,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.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -48,6 +51,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE; /** * */ +@RunWith(JUnit4.class) public class IgniteCacheEntryProcessorCallTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -100,6 +104,7 @@ public class IgniteCacheEntryProcessorCallTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testEntryProcessorCallOnAtomicCache() throws Exception { { CacheConfiguration<Integer, TestValue> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); @@ -123,6 +128,7 @@ public class IgniteCacheEntryProcessorCallTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testEntryProcessorCallOnTxCache() throws Exception { { CacheConfiguration<Integer, TestValue> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); @@ -146,6 +152,7 @@ public class IgniteCacheEntryProcessorCallTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testEntryProcessorCallOnMvccCache() throws Exception { { CacheConfiguration<Integer, TestValue> ccfg = new CacheConfiguration<>(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/IgniteCacheEntryProcessorNodeJoinTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorNodeJoinTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorNodeJoinTest.java index 5f99b55..b841013 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorNodeJoinTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorNodeJoinTest.java @@ -46,6 +46,9 @@ import org.apache.ignite.testframework.GridTestUtils.SF; import org.apache.ignite.testframework.MvccFeatureChecker; 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.CacheAtomicityMode.TRANSACTIONAL; @@ -56,6 +59,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Tests cache in-place modification logic with iterative value increment. */ +@RunWith(JUnit4.class) public class IgniteCacheEntryProcessorNodeJoinTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -128,6 +132,7 @@ public class IgniteCacheEntryProcessorNodeJoinTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testSingleEntryProcessorNodeJoin() throws Exception { checkEntryProcessorNodeJoin(false); } @@ -135,6 +140,7 @@ public class IgniteCacheEntryProcessorNodeJoinTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testAllEntryProcessorNodeJoin() throws Exception { checkEntryProcessorNodeJoin(true); } @@ -142,6 +148,7 @@ public class IgniteCacheEntryProcessorNodeJoinTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testEntryProcessorNodeLeave() throws Exception { if (MvccFeatureChecker.forcedMvcc()) fail("https://issues.apache.org/jira/browse/IGNITE-10254";); @@ -336,6 +343,7 @@ public class IgniteCacheEntryProcessorNodeJoinTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testReplaceNodeJoin() throws Exception { final AtomicReference<Throwable> error = new AtomicReference<>(); final int started = 6; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java index 5257a4a..501fe8a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.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.apache.ignite.transactions.Transaction; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; @@ -60,6 +63,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * */ +@RunWith(JUnit4.class) public class IgniteCacheExpireAndUpdateConsistencyTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -97,6 +101,7 @@ public class IgniteCacheExpireAndUpdateConsistencyTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testAtomic1() throws Exception { updateAndEventConsistencyTest(cacheConfiguration(ATOMIC, 0)); } @@ -104,6 +109,7 @@ public class IgniteCacheExpireAndUpdateConsistencyTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testAtomic2() throws Exception { updateAndEventConsistencyTest(cacheConfiguration(ATOMIC, 1)); } @@ -111,6 +117,7 @@ public class IgniteCacheExpireAndUpdateConsistencyTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testAtomic3() throws Exception { updateAndEventConsistencyTest(cacheConfiguration(ATOMIC, 2)); } @@ -118,6 +125,7 @@ public class IgniteCacheExpireAndUpdateConsistencyTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testTx1() throws Exception { updateAndEventConsistencyTest(cacheConfiguration(TRANSACTIONAL, 0)); } @@ -125,6 +133,7 @@ public class IgniteCacheExpireAndUpdateConsistencyTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testTx2() throws Exception { updateAndEventConsistencyTest(cacheConfiguration(TRANSACTIONAL, 1)); } @@ -132,6 +141,7 @@ public class IgniteCacheExpireAndUpdateConsistencyTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testTx3() throws Exception { updateAndEventConsistencyTest(cacheConfiguration(TRANSACTIONAL, 2)); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGetCustomCollectionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGetCustomCollectionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGetCustomCollectionsSelfTest.java index 9e6fd5a..3d79930 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGetCustomCollectionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGetCustomCollectionsSelfTest.java @@ -32,10 +32,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 IgniteCacheGetCustomCollectionsSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -67,6 +71,7 @@ public class IgniteCacheGetCustomCollectionsSelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testPutGet() throws Exception { startGrids(3); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java index e9999d7..18892e4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java @@ -102,6 +102,9 @@ import org.apache.ignite.testframework.GridTestUtils.SF; 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; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -119,6 +122,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE; * */ @SuppressWarnings({"unchecked", "ThrowableNotThrown"}) +@RunWith(JUnit4.class) public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -179,6 +183,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCloseCache1() throws Exception { startGrid(0); @@ -213,6 +218,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCreateDestroyCaches1() throws Exception { createDestroyCaches(1); } @@ -220,6 +226,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCreateDestroyCaches2() throws Exception { createDestroyCaches(5); } @@ -227,6 +234,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCreateCacheWithSameNameInAnotherGroup() throws Exception { startGridsMultiThreaded(2); @@ -245,6 +253,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCreateDestroyCachesAtomicPartitioned() throws Exception { createDestroyCaches(PARTITIONED, ATOMIC); } @@ -252,6 +261,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCreateDestroyCachesTxPartitioned() throws Exception { createDestroyCaches(PARTITIONED, TRANSACTIONAL); } @@ -259,6 +269,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCreateDestroyCachesMvccTxPartitioned() throws Exception { createDestroyCaches(PARTITIONED, TRANSACTIONAL_SNAPSHOT); } @@ -266,6 +277,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCreateDestroyCachesAtomicReplicated() throws Exception { createDestroyCaches(REPLICATED, ATOMIC); } @@ -273,6 +285,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCreateDestroyCachesTxReplicated() throws Exception { createDestroyCaches(REPLICATED, TRANSACTIONAL); } @@ -280,6 +293,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCreateDestroyCachesMvccTxReplicated() throws Exception { createDestroyCaches(REPLICATED, TRANSACTIONAL_SNAPSHOT); } @@ -287,6 +301,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryAtomicPartitioned() throws Exception { scanQuery(PARTITIONED, ATOMIC); } @@ -294,6 +309,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryTxPartitioned() throws Exception { scanQuery(PARTITIONED, TRANSACTIONAL); } @@ -301,6 +317,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryMvccTxPartitioned() throws Exception { scanQuery(PARTITIONED, TRANSACTIONAL_SNAPSHOT); } @@ -308,6 +325,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryAtomicReplicated() throws Exception { scanQuery(REPLICATED, ATOMIC); } @@ -315,6 +333,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryTxReplicated() throws Exception { scanQuery(REPLICATED, TRANSACTIONAL); } @@ -322,6 +341,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryMvccTxReplicated() throws Exception { scanQuery(REPLICATED, TRANSACTIONAL_SNAPSHOT); } @@ -330,6 +350,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryAtomicLocal() throws Exception { scanQuery(LOCAL, ATOMIC); } @@ -337,6 +358,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryTxLocal() throws Exception { scanQuery(LOCAL, TRANSACTIONAL); } @@ -344,6 +366,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryMvccTxLocal() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-9530";); @@ -353,6 +376,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testEntriesTtlAtomicPartitioned() throws Exception { entriesTtl(PARTITIONED, ATOMIC); } @@ -360,6 +384,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testEntriesTtlTxPartitioned() throws Exception { entriesTtl(PARTITIONED, TRANSACTIONAL); } @@ -367,6 +392,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testEntriesTtlMvccTxPartitioned() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-7311";); @@ -376,6 +402,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testEntriesTtlAtomicReplicated() throws Exception { entriesTtl(REPLICATED, ATOMIC); } @@ -383,6 +410,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testEntriesTtlTxReplicated() throws Exception { entriesTtl(REPLICATED, TRANSACTIONAL); } @@ -390,6 +418,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testEntriesTtlMvccTxReplicated() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-7311";); @@ -399,6 +428,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testEntriesTtlAtomicLocal() throws Exception { entriesTtl(LOCAL, ATOMIC); } @@ -406,6 +436,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testEntriesTtlTxLocal() throws Exception { entriesTtl(LOCAL, TRANSACTIONAL); } @@ -413,6 +444,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testEntriesTtlMvccTxLocal() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-9530";); fail("https://issues.apache.org/jira/browse/IGNITE-7311";); @@ -423,6 +455,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheIteratorAtomicPartitioned() throws Exception { cacheIterator(PARTITIONED, ATOMIC); } @@ -430,6 +463,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheIteratorTxPartitioned() throws Exception { cacheIterator(PARTITIONED, TRANSACTIONAL); } @@ -437,6 +471,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheIteratorMvccTxPartitioned() throws Exception { cacheIterator(PARTITIONED, TRANSACTIONAL_SNAPSHOT); } @@ -444,6 +479,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheIteratorAtomicReplicated() throws Exception { cacheIterator(REPLICATED, ATOMIC); } @@ -451,6 +487,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheIteratorTxReplicated() throws Exception { cacheIterator(REPLICATED, TRANSACTIONAL); } @@ -458,6 +495,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheIteratorMvccTxReplicated() throws Exception { cacheIterator(REPLICATED, TRANSACTIONAL_SNAPSHOT); } @@ -465,6 +503,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheIteratorAtomicLocal() throws Exception { cacheIterator(LOCAL, ATOMIC); } @@ -472,6 +511,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheIteratorTxLocal() throws Exception { cacheIterator(LOCAL, TRANSACTIONAL); } @@ -479,6 +519,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheIteratorMvccTxLocal() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-9530";); @@ -488,6 +529,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryMultiplePartitionsAtomicPartitioned() throws Exception { scanQueryMultiplePartitions(PARTITIONED, ATOMIC); } @@ -495,6 +537,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryMultiplePartitionsTxPartitioned() throws Exception { scanQueryMultiplePartitions(PARTITIONED, TRANSACTIONAL); } @@ -502,6 +545,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryMultiplePartitionsMvccTxPartitioned() throws Exception { scanQueryMultiplePartitions(PARTITIONED, TRANSACTIONAL_SNAPSHOT); } @@ -509,6 +553,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryMultiplePartitionsAtomicReplicated() throws Exception { scanQueryMultiplePartitions(REPLICATED, ATOMIC); } @@ -516,6 +561,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryMultiplePartitionsTxReplicated() throws Exception { scanQueryMultiplePartitions(REPLICATED, TRANSACTIONAL); } @@ -523,6 +569,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryMultiplePartitionsMvccTxReplicated() throws Exception { scanQueryMultiplePartitions(REPLICATED, TRANSACTIONAL_SNAPSHOT); } @@ -530,6 +577,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testContinuousQueryTxReplicated() throws Exception { continuousQuery(REPLICATED, TRANSACTIONAL); } @@ -537,6 +585,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testContinuousQueryMvccTxReplicated() throws Exception { continuousQuery(REPLICATED, TRANSACTIONAL_SNAPSHOT); } @@ -544,6 +593,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testContinuousQueryTxPartitioned() throws Exception { continuousQuery(PARTITIONED, TRANSACTIONAL); } @@ -551,6 +601,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testContinuousQueryMvccTxPartitioned() throws Exception { continuousQuery(PARTITIONED, TRANSACTIONAL_SNAPSHOT); } @@ -558,6 +609,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testContinuousQueryTxLocal() throws Exception { continuousQuery(LOCAL, TRANSACTIONAL); } @@ -565,6 +617,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testContinuousQueryMvccTxLocal() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-9530";); @@ -574,6 +627,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testContinuousQueryAtomicReplicated() throws Exception { continuousQuery(REPLICATED, ATOMIC); } @@ -581,6 +635,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testContinuousQueryAtomicPartitioned() throws Exception { continuousQuery(PARTITIONED, ATOMIC); } @@ -588,6 +643,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testContinuousQueryAtomicLocal() throws Exception { continuousQuery(LOCAL, ATOMIC); } @@ -1325,6 +1381,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDiscoveryDataConsistency1() throws Exception { ccfgs = staticConfigurations1(true); Ignite srv0 = startGrid(0); @@ -1419,6 +1476,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStartManyCaches() throws Exception { final int CACHES = SF.apply(5_000); @@ -1461,6 +1519,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRebalance1() throws Exception { Ignite srv0 = startGrid(0); @@ -1579,6 +1638,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRebalance2() throws Exception { Ignite srv0 = startGrid(0); @@ -1662,6 +1722,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNoKeyIntersectTx() throws Exception { testNoKeyIntersect(TRANSACTIONAL); } @@ -1669,6 +1730,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNoKeyIntersectMvccTx() throws Exception { testNoKeyIntersect(TRANSACTIONAL_SNAPSHOT); } @@ -1676,6 +1738,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNoKeyIntersectAtomic() throws Exception { testNoKeyIntersect(ATOMIC); } @@ -1987,6 +2050,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheApiTxPartitioned() throws Exception { cacheApiTest(PARTITIONED, TRANSACTIONAL); } @@ -1994,6 +2058,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheApiMvccTxPartitioned() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-7952";); @@ -2003,6 +2068,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheApiTxReplicated() throws Exception { cacheApiTest(REPLICATED, TRANSACTIONAL); } @@ -2010,6 +2076,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheApiMvccTxReplicated() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-7952";); @@ -2019,6 +2086,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheApiAtomicPartitioned() throws Exception { cacheApiTest(PARTITIONED, ATOMIC); } @@ -2026,6 +2094,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheApiAtomicReplicated() throws Exception { cacheApiTest(REPLICATED, ATOMIC); } @@ -2818,6 +2887,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLoadCacheAtomicPartitioned() throws Exception { loadCache(PARTITIONED, ATOMIC); } @@ -2825,6 +2895,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLoadCacheAtomicReplicated() throws Exception { loadCache(REPLICATED, ATOMIC); } @@ -2832,6 +2903,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLoadCacheTxPartitioned() throws Exception { loadCache(PARTITIONED, TRANSACTIONAL); } @@ -2839,6 +2911,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLoadCacheMvccTxPartitioned() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-7954";); @@ -2848,6 +2921,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLoadCacheTxReplicated() throws Exception { loadCache(REPLICATED, TRANSACTIONAL); } @@ -2855,6 +2929,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLoadCacheMvccTxReplicated() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-7954";); @@ -2864,6 +2939,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLoadCacheAtomicLocal() throws Exception { loadCache(LOCAL, ATOMIC); } @@ -2871,6 +2947,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLoadCacheTxLocal() throws Exception { loadCache(LOCAL, TRANSACTIONAL); } @@ -2878,6 +2955,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLoadCacheMvccTxLocal() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-9530";); @@ -2931,6 +3009,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testConcurrentOperationsSameKeys() throws Exception { final int SRVS = 4; final int CLIENTS = 4; @@ -3035,6 +3114,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testConcurrentOperationsAndCacheDestroy() throws Exception { final int SRVS = 4; final int CLIENTS = 4; @@ -3184,6 +3264,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStaticConfigurationsValidation() throws Exception { ccfgs = new CacheConfiguration[2]; @@ -3224,6 +3305,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheIdConflict() throws Exception { ccfgs = new CacheConfiguration[]{new CacheConfiguration("AaAaAa"), new CacheConfiguration("AaAaBB")}; @@ -3267,6 +3349,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheGroupIdConflict1() throws Exception { ccfgs = new CacheConfiguration[]{new CacheConfiguration(CACHE1).setGroupName("AaAaAa"), new CacheConfiguration(CACHE2).setGroupName("AaAaBB")}; @@ -3311,6 +3394,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheGroupIdConflict2() throws Exception { ccfgs = new CacheConfiguration[]{new CacheConfiguration("AaAaAa"), new CacheConfiguration(CACHE2).setGroupName("AaAaBB")}; @@ -3355,6 +3439,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheGroupIdConflict3() throws Exception { ccfgs = new CacheConfiguration[]{new CacheConfiguration(CACHE2).setGroupName("AaAaBB"), new CacheConfiguration("AaAaAa")}; @@ -3399,6 +3484,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheGroupNameConflict1() throws Exception { ccfgs = new CacheConfiguration[]{new CacheConfiguration("cache1"), new CacheConfiguration("cache2").setGroupName("cache1")}; @@ -3442,6 +3528,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheGroupNameConflict2() throws Exception { ccfgs = new CacheConfiguration[]{new CacheConfiguration("cache2").setGroupName("cache1"), new CacheConfiguration("cache1")}; @@ -3485,6 +3572,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testConfigurationConsistencyValidation() throws Exception { startGrids(2); @@ -3550,6 +3638,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testInterceptors() throws Exception { for (int i = 0; i < 4; i++) { ccfgs = interceptorConfigurations(); @@ -3615,6 +3704,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testCacheStores() throws Exception { for (int i = 0; i < 4; i++) { ccfgs = cacheStoreConfigurations(); @@ -3687,6 +3777,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAffinityMappers() throws Exception { for (int i = 0; i < 4; i++) { ccfgs = mapperConfigurations(); @@ -3749,6 +3840,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testContinuousQueriesMultipleGroups1() throws Exception { continuousQueriesMultipleGroups(1); } @@ -3756,6 +3848,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testContinuousQueriesMultipleGroups2() throws Exception { continuousQueriesMultipleGroups(4); } @@ -3802,6 +3895,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheIdSort() throws Exception { Ignite node = startGrid(0); @@ -3876,6 +3970,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDataCleanup() throws Exception { Ignite node = startGrid(0); @@ -3936,6 +4031,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRestartsAndCacheCreateDestroy() throws Exception { final int SRVS = 5; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheIncrementTxTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheIncrementTxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheIncrementTxTest.java index 918d655..d595cc9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheIncrementTxTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheIncrementTxTest.java @@ -39,6 +39,9 @@ import org.apache.ignite.testframework.GridTestUtils; 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.CacheWriteSynchronizationMode.FULL_SYNC; @@ -48,6 +51,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * */ +@RunWith(JUnit4.class) public class IgniteCacheIncrementTxTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -81,6 +85,7 @@ public class IgniteCacheIncrementTxTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testIncrementTxTopologyChange0() throws Exception { nodeJoin(cacheConfiguration(0)); } @@ -88,6 +93,7 @@ public class IgniteCacheIncrementTxTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testIncrementTxTopologyChange1() throws Exception { if (MvccFeatureChecker.forcedMvcc()) fail("https://issues.apache.org/jira/browse/IGNITE-10264";); @@ -98,6 +104,7 @@ public class IgniteCacheIncrementTxTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testIncrementTxTopologyChange2() throws Exception { if (MvccFeatureChecker.forcedMvcc()) fail("https://issues.apache.org/jira/browse/IGNITE-10264";); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java index 28d65f7..9557810 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java @@ -48,6 +48,9 @@ import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; 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.CacheAtomicityMode.TRANSACTIONAL; @@ -59,6 +62,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * */ +@RunWith(JUnit4.class) public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractTest { /** */ private Integer lastKey = 0; @@ -66,6 +70,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT /** * @throws Exception If failed. */ + @Test public void testInvoke() throws Exception { IgniteCache<Integer, Integer> cache = jcache(); @@ -82,6 +87,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT /** * @throws Exception If failed. */ + @Test public void testInternalInvokeNullable() throws Exception { IgniteInternalCache<Integer, Integer> cache = grid(0).cachex(DEFAULT_CACHE_NAME); @@ -232,6 +238,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT /** * @throws Exception If failed. */ + @Test public void testInvokeAll() throws Exception { IgniteCache<Integer, Integer> cache = jcache(); @@ -308,6 +315,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT /** * @throws Exception If failed. */ + @Test public void testInvokeAllAppliedOnceOnBinaryTypeRegistration() { IgniteCache<MyKey, Integer> cache = jcache(); @@ -999,4 +1007,4 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT return S.toString(TestValue.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/IgniteCacheInvokeReadThroughSingleNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughSingleNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughSingleNodeTest.java index cb4410a..f8c01d4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughSingleNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughSingleNodeTest.java @@ -17,6 +17,11 @@ package org.apache.ignite.internal.processors.cache; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + import org.apache.ignite.testframework.MvccFeatureChecker; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; @@ -29,8 +34,10 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED; /** * */ +@RunWith(JUnit4.class) public class IgniteCacheInvokeReadThroughSingleNodeTest extends IgniteCacheInvokeReadThroughAbstractTest { /** {@inheritDoc} */ + @Before @Override public void setUp() throws Exception { MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE); @@ -45,6 +52,7 @@ public class IgniteCacheInvokeReadThroughSingleNodeTest extends IgniteCacheInvok /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughAtomic() throws Exception { invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, 1, false)); } @@ -52,6 +60,7 @@ public class IgniteCacheInvokeReadThroughSingleNodeTest extends IgniteCacheInvok /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughAtomicNearCache() throws Exception { invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, 1, true)); } @@ -59,6 +68,7 @@ public class IgniteCacheInvokeReadThroughSingleNodeTest extends IgniteCacheInvok /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughAtomicReplicated() throws Exception { invokeReadThrough(cacheConfiguration(REPLICATED, ATOMIC, 0, false)); } @@ -66,6 +76,7 @@ public class IgniteCacheInvokeReadThroughSingleNodeTest extends IgniteCacheInvok /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughAtomicLocal() throws Exception { invokeReadThrough(cacheConfiguration(LOCAL, ATOMIC, 0, false)); } @@ -73,6 +84,7 @@ public class IgniteCacheInvokeReadThroughSingleNodeTest extends IgniteCacheInvok /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughTx() throws Exception { invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, 1, false)); } @@ -80,6 +92,7 @@ public class IgniteCacheInvokeReadThroughSingleNodeTest extends IgniteCacheInvok /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughTxNearCache() throws Exception { invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, 1, true)); } @@ -87,6 +100,7 @@ public class IgniteCacheInvokeReadThroughSingleNodeTest extends IgniteCacheInvok /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughTxReplicated() throws Exception { invokeReadThrough(cacheConfiguration(REPLICATED, TRANSACTIONAL, 0, false)); } @@ -94,6 +108,7 @@ public class IgniteCacheInvokeReadThroughSingleNodeTest extends IgniteCacheInvok /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughTxLocal() throws Exception { invokeReadThrough(cacheConfiguration(LOCAL, TRANSACTIONAL, 0, false)); } @@ -101,6 +116,7 @@ public class IgniteCacheInvokeReadThroughSingleNodeTest extends IgniteCacheInvok /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughMvccTx() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-8582";); @@ -110,6 +126,7 @@ public class IgniteCacheInvokeReadThroughSingleNodeTest extends IgniteCacheInvok /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughMvccTxNearCache() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-8582";); @@ -119,6 +136,7 @@ public class IgniteCacheInvokeReadThroughSingleNodeTest extends IgniteCacheInvok /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughMvccTxReplicated() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-8582";); @@ -128,6 +146,7 @@ public class IgniteCacheInvokeReadThroughSingleNodeTest extends IgniteCacheInvok /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughMvccTxLocal() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-8582";); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughTest.java index 3866a18..051ca63 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughTest.java @@ -17,6 +17,11 @@ package org.apache.ignite.internal.processors.cache; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + import org.apache.ignite.testframework.MvccFeatureChecker; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; @@ -28,8 +33,10 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED; /** * */ +@RunWith(JUnit4.class) public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThroughAbstractTest { /** {@inheritDoc} */ + @Before @Override public void setUp() throws Exception { MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE); @@ -48,6 +55,7 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThrou /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughAtomic0() throws Exception { invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, 0, false)); } @@ -55,6 +63,7 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThrou /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughAtomic1() throws Exception { invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, 1, false)); } @@ -62,6 +71,7 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThrou /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughAtomic2() throws Exception { invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, 2, false)); } @@ -69,6 +79,7 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThrou /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughAtomicNearCache() throws Exception { invokeReadThrough(cacheConfiguration(PARTITIONED, ATOMIC, 1, true)); } @@ -76,6 +87,7 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThrou /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughAtomicReplicated() throws Exception { invokeReadThrough(cacheConfiguration(REPLICATED, ATOMIC, 0, false)); } @@ -83,6 +95,7 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThrou /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughTx0() throws Exception { invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, 0, false)); } @@ -90,6 +103,7 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThrou /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughTx1() throws Exception { invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, 1, false)); } @@ -97,6 +111,7 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThrou /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughTx2() throws Exception { invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, 2, false)); } @@ -104,6 +119,7 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThrou /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughTxNearCache() throws Exception { invokeReadThrough(cacheConfiguration(PARTITIONED, TRANSACTIONAL, 1, true)); } @@ -111,6 +127,7 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThrou /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughTxReplicated() throws Exception { invokeReadThrough(cacheConfiguration(REPLICATED, TRANSACTIONAL, 0, false)); } @@ -118,6 +135,7 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThrou /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughMvccTx0() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-8582";); @@ -127,6 +145,7 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThrou /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughMvccTx1() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-8582";); @@ -136,6 +155,7 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThrou /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughMvccTx2() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-8582";); @@ -145,6 +165,7 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThrou /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughMvccTxNearCache() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-8582";); @@ -154,6 +175,7 @@ public class IgniteCacheInvokeReadThroughTest extends IgniteCacheInvokeReadThrou /** * @throws Exception If failed. */ + @Test public void testInvokeReadThroughMvccTxReplicated() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-8582";); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java index d545d09..73d8754 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLoadRebalanceEvictionSelfTest.java @@ -46,10 +46,14 @@ 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.jetbrains.annotations.Nullable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class IgniteCacheLoadRebalanceEvictionSelfTest extends GridCommonAbstractTest { /** */ public static final int LRU_MAX_SIZE = 10; @@ -95,6 +99,7 @@ public class IgniteCacheLoadRebalanceEvictionSelfTest extends GridCommonAbstract /** * @throws Exception If failed. */ + @Test public void testStartRebalancing() throws Exception { List<IgniteInternalFuture<Object>> futs = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheManyAsyncOperationsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheManyAsyncOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheManyAsyncOperationsTest.java index ca9d15b..856bea9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheManyAsyncOperationsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheManyAsyncOperationsTest.java @@ -29,6 +29,9 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.lang.IgniteFuture; +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; @@ -36,6 +39,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** * */ +@RunWith(JUnit4.class) public class IgniteCacheManyAsyncOperationsTest extends IgniteCacheAbstractTest { /** {@inheritDoc} */ @Override protected int gridCount() { @@ -70,6 +74,7 @@ public class IgniteCacheManyAsyncOperationsTest extends IgniteCacheAbstractTest /** * @throws Exception If failed. */ + @Test public void testManyAsyncOperations() throws Exception { try (Ignite client = startGrid(gridCount())) { assertTrue(client.configuration().isClientMode()); @@ -108,4 +113,4 @@ public class IgniteCacheManyAsyncOperationsTest extends IgniteCacheAbstractTest } } } -} \ 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/IgniteCacheNearLockValueSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java index 63d3ae8..5d0bbc7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java @@ -33,6 +33,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.transactions.TransactionConcurrency.PESSIMISTIC; import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ; @@ -40,6 +43,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * */ +@RunWith(JUnit4.class) public class IgniteCacheNearLockValueSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -74,6 +78,7 @@ public class IgniteCacheNearLockValueSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDhtVersion() throws Exception { CacheConfiguration<Object, Object> pCfg = new CacheConfiguration<>("partitioned"); @@ -117,4 +122,4 @@ public class IgniteCacheNearLockValueSelfTest extends GridCommonAbstractTest { } } } -} \ 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/IgniteCacheNoSyncForGetTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java index 6324df4..0ee05ae 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.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.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -54,6 +57,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; * */ @SuppressWarnings("unchecked") +@RunWith(JUnit4.class) public class IgniteCacheNoSyncForGetTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -92,6 +96,7 @@ public class IgniteCacheNoSyncForGetTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAtomicGet() throws Exception { getTest(ATOMIC); } @@ -99,6 +104,7 @@ public class IgniteCacheNoSyncForGetTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTxGet() throws Exception { getTest(TRANSACTIONAL); } @@ -106,6 +112,7 @@ public class IgniteCacheNoSyncForGetTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testMvccTxGet() throws Exception { getTest(TRANSACTIONAL_SNAPSHOT); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectPutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectPutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectPutSelfTest.java index f924e83..916d494 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectPutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectPutSelfTest.java @@ -25,10 +25,14 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor; 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 IgniteCacheObjectPutSelfTest extends GridCommonAbstractTest { /** */ public static final String CACHE_NAME = "partitioned"; @@ -58,6 +62,7 @@ public class IgniteCacheObjectPutSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPrimitiveValues() throws Exception { IgniteEx ignite = grid(0); @@ -100,6 +105,7 @@ public class IgniteCacheObjectPutSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testClassValues() throws Exception { IgniteEx ignite = grid(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java index 55ff31a..89f75a6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java @@ -32,10 +32,14 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.X; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Checks behavior on exception while unmarshalling key. */ +@RunWith(JUnit4.class) public class IgniteCacheP2pUnmarshallingErrorTest extends IgniteCacheAbstractTest { /** Allows to change behavior of readExternal method. */ protected static final AtomicInteger readCnt = new AtomicInteger(); @@ -152,6 +156,7 @@ public class IgniteCacheP2pUnmarshallingErrorTest extends IgniteCacheAbstractTes * * @throws Exception If failed. */ + @Test public void testResponseMessageOnUnmarshallingFailed() throws Exception { // GridNearAtomicFullUpdateRequest unmarshalling failed test. readCnt.set(1); @@ -281,4 +286,4 @@ public class IgniteCacheP2pUnmarshallingErrorTest extends IgniteCacheAbstractTes throw new IOException("Class can not be unmarshalled."); } } -} \ 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/IgniteCacheP2pUnmarshallingNearErrorTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java index 546ec06..5dca856 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java @@ -20,10 +20,14 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Checks behavior on exception while unmarshalling key. */ +@RunWith(JUnit4.class) public class IgniteCacheP2pUnmarshallingNearErrorTest extends IgniteCacheP2pUnmarshallingErrorTest { /** {@inheritDoc} */ @Override protected NearCacheConfiguration nearConfiguration() { @@ -43,6 +47,7 @@ public class IgniteCacheP2pUnmarshallingNearErrorTest extends IgniteCacheP2pUnma } /** {@inheritDoc} */ + @Test @Override public void testResponseMessageOnUnmarshallingFailed() throws InterruptedException { //GridCacheEvictionRequest unmarshalling failed test. readCnt.set(5); //2 for each put. @@ -55,4 +60,4 @@ public class IgniteCacheP2pUnmarshallingNearErrorTest extends IgniteCacheP2pUnma // Wait for eviction complete. Thread.sleep(1000); } -} \ 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/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java index 28fc31c..1183d6a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java @@ -24,10 +24,14 @@ import org.apache.ignite.cache.affinity.Affinity; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.U; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Checks behavior on exception while unmarshalling key. */ +@RunWith(JUnit4.class) public class IgniteCacheP2pUnmarshallingRebalanceErrorTest extends IgniteCacheP2pUnmarshallingErrorTest { /** {@inheritDoc} */ @Override protected int gridCount() { @@ -35,6 +39,7 @@ public class IgniteCacheP2pUnmarshallingRebalanceErrorTest extends IgniteCacheP2 } /** {@inheritDoc} */ + @Test @Override public void testResponseMessageOnUnmarshallingFailed() throws Exception { //GridDhtPartitionSupplyMessage unmarshalling failed test. readCnt.set(Integer.MAX_VALUE); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingTxErrorTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingTxErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingTxErrorTest.java index ba77c70..9fb14d2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingTxErrorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingTxErrorTest.java @@ -24,6 +24,9 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.internal.util.typedef.X; 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.OPTIMISTIC; import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC; @@ -32,6 +35,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * Checks behavior on exception while unmarshalling key. */ +@RunWith(JUnit4.class) public class IgniteCacheP2pUnmarshallingTxErrorTest extends IgniteCacheP2pUnmarshallingErrorTest { /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { @@ -77,6 +81,7 @@ public class IgniteCacheP2pUnmarshallingTxErrorTest extends IgniteCacheP2pUnmars } /** {@inheritDoc} */ + @Test @Override public void testResponseMessageOnUnmarshallingFailed() { //GridNearTxPrepareRequest unmarshalling failed test readCnt.set(2); @@ -100,4 +105,4 @@ public class IgniteCacheP2pUnmarshallingTxErrorTest extends IgniteCacheP2pUnmars jcache(0).put(new TestKey(String.valueOf(++key)), ""); //No failure at client side. } } -} \ 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/IgniteCachePartitionMapUpdateTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionMapUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionMapUpdateTest.java index 87549cf..1691906 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionMapUpdateTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionMapUpdateTest.java @@ -32,12 +32,16 @@ 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.CacheMode.PARTITIONED; /** * */ +@RunWith(JUnit4.class) public class IgniteCachePartitionMapUpdateTest extends GridCommonAbstractTest { /** */ protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -115,6 +119,7 @@ public class IgniteCachePartitionMapUpdateTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPartitionMapUpdate1() throws Exception { cache1 = false; cache2 = false; @@ -156,6 +161,7 @@ public class IgniteCachePartitionMapUpdateTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPartitionMapUpdate2() throws Exception { startClientCache = true; @@ -165,6 +171,7 @@ public class IgniteCachePartitionMapUpdateTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRandom() throws Exception { ThreadLocalRandom rnd = ThreadLocalRandom.current(); @@ -202,6 +209,7 @@ public class IgniteCachePartitionMapUpdateTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRandom2() throws Exception { startClientCache = true; @@ -227,4 +235,4 @@ public class IgniteCachePartitionMapUpdateTest extends GridCommonAbstractTest { return F.eq(node.attribute(attrName), "true"); } } -} \ 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/IgniteCachePeekModesAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java index ae1cf88..a813422 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java @@ -42,6 +42,9 @@ import org.apache.ignite.internal.util.GridEmptyCloseableIterator; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.spi.IgniteSpiCloseableIterator; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheMode.LOCAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -62,6 +65,7 @@ import static org.apache.ignite.cache.CachePeekMode.PRIMARY; * <li>{@link IgniteCache#localEntries(CachePeekMode...)}</li> * </ul> */ +@RunWith(JUnit4.class) public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstractTest { /** */ private static final int HEAP_ENTRIES = 30; @@ -106,6 +110,7 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra /** * @throws Exception If failed. */ + @Test public void testLocalPeek() throws Exception { if (cacheMode() == LOCAL) { checkAffinityLocalCache(); @@ -371,6 +376,7 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra /** * @throws Exception If failed. */ + @Test public void testSize() throws Exception { checkEmpty(); @@ -479,6 +485,7 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra /** * @throws Exception If failed. */ + @Test public void testLocalPartitionSize() throws Exception { if (cacheMode() != LOCAL) return; @@ -534,6 +541,7 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra /** * @throws InterruptedException If failed. */ + @Test public void testLocalPartitionSizeFlags() throws InterruptedException { if (true) // TODO GG-11148. return; @@ -595,6 +603,7 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra /** * @throws Exception If failed. */ + @Test public void testNonLocalPartitionSize() throws Exception { if (true) // TODO GG-11148. return; @@ -1280,6 +1289,7 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra /** * @throws Exception If failed. */ + @Test public void testLocalEntries() throws Exception { if (cacheMode() == LOCAL) { IgniteCache<Integer, String> cache0 = jcache(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java index c90030e..037bae0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java @@ -37,6 +37,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.TRANSACTIONAL; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -44,6 +47,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * */ +@RunWith(JUnit4.class) public class IgniteCachePutAllRestartTest extends GridCommonAbstractTest { /** Cache name. */ private static final String CACHE_NAME = "partitioned"; @@ -104,6 +108,7 @@ public class IgniteCachePutAllRestartTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStopNode() throws Exception { startGrids(NODES); @@ -165,6 +170,7 @@ public class IgniteCachePutAllRestartTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStopOriginatingNode() throws Exception { startGrids(NODES); @@ -222,4 +228,4 @@ public class IgniteCachePutAllRestartTest extends GridCommonAbstractTest { startGrid(node); } } -} \ 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/IgniteCachePutStackOverflowSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutStackOverflowSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutStackOverflowSelfTest.java index 86f34fe..f135f79 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutStackOverflowSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutStackOverflowSelfTest.java @@ -28,6 +28,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.transactions.TransactionConcurrency.PESSIMISTIC; @@ -36,6 +39,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * */ +@RunWith(JUnit4.class) public class IgniteCachePutStackOverflowSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -61,6 +65,7 @@ public class IgniteCachePutStackOverflowSelfTest extends GridCommonAbstractTest /** * @throws Exception if failed. */ + @Test public void testStackLocal() throws Exception { checkCache(CacheMode.LOCAL); } @@ -68,6 +73,7 @@ public class IgniteCachePutStackOverflowSelfTest extends GridCommonAbstractTest /** * @throws Exception if failed. */ + @Test public void testStackPartitioned() throws Exception { checkCache(CacheMode.PARTITIONED); } @@ -75,6 +81,7 @@ public class IgniteCachePutStackOverflowSelfTest extends GridCommonAbstractTest /** * @throws Exception if failed. */ + @Test public void testStackReplicated() throws Exception { checkCache(CacheMode.REPLICATED); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughEvictionSelfTest.java index fe186b7..335ac0d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughEvictionSelfTest.java @@ -37,11 +37,16 @@ import javax.cache.expiry.CreatedExpiryPolicy; import javax.cache.expiry.Duration; import javax.cache.expiry.ExpiryPolicy; import java.util.concurrent.TimeUnit; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ @SuppressWarnings("unchecked") +@RunWith(JUnit4.class) public class IgniteCacheReadThroughEvictionSelfTest extends IgniteCacheConfigVariationsAbstractTest { /** */ private static final int TIMEOUT = 400; @@ -50,6 +55,7 @@ public class IgniteCacheReadThroughEvictionSelfTest extends IgniteCacheConfigVar private static final int KEYS = 100; /** {@inheritDoc} */ + @Before @Override public void setUp() throws Exception { MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE); @@ -64,6 +70,7 @@ public class IgniteCacheReadThroughEvictionSelfTest extends IgniteCacheConfigVar /** * @throws Exception if failed. */ + @Test public void testReadThroughWithExpirePolicy() throws Exception { MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.EXPIRATION); @@ -106,6 +113,7 @@ public class IgniteCacheReadThroughEvictionSelfTest extends IgniteCacheConfigVar /** * @throws Exception if failed. */ + @Test public void testReadThroughExpirePolicyConfigured() throws Exception { MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.EXPIRATION); @@ -161,6 +169,7 @@ public class IgniteCacheReadThroughEvictionSelfTest extends IgniteCacheConfigVar /** * @throws Exception if failed. */ + @Test public void testReadThroughEvictionPolicy() throws Exception { MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.EVICTION); @@ -199,6 +208,7 @@ public class IgniteCacheReadThroughEvictionSelfTest extends IgniteCacheConfigVar /** * @throws Exception if failed. */ + @Test public void testReadThroughSkipStore() throws Exception { Ignite ig = testedGrid();
